diff --git a/flake.lock b/flake.lock index 01b06f6d..3c536ea0 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1713105314, - "narHash": "sha256-X3URKbcgIy4UaQGrsy3DmY5x+fePQ5IYaa76YewoUE0=", + "lastModified": 1713701427, + "narHash": "sha256-v6z8hz/UDaC/rbnkH+hxGFUxlNyseVntRetVpSxLU6c=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "f347ed9a1cab12c27541ed4d173e2f2d5c9bc0bb", + "rev": "3b32a98eb3053f8c8ca55497d1881443ef2996e6", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1713055793, - "narHash": "sha256-vIrZQykYW32RnlI2lT/gCcB59BOIqqrAmPirBdiirrc=", + "lastModified": 1713660444, + "narHash": "sha256-2bVnrEGyWJhRNKspzfTJmVD/fsH9HQURD4cWpz79Ulw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "361d8a4f443bbfab20bd6d222f9022b8c6665906", + "rev": "6882347415e352cfc9c277cc01f73e0f5cb7b93c", "type": "github" }, "original": { @@ -167,11 +167,11 @@ }, "nixpkgs-next-unpatched": { "locked": { - "lastModified": 1713509686, - "narHash": "sha256-+KTWLlpdMWm4NB84FckwXSOlSQqMe0VfO15961OAkOs=", + "lastModified": 1713765666, + "narHash": "sha256-Y9LHRavMtz+y/v+9sxGH6U41qy7NzjOF8Fab1xGdMOQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6ad1fe08582fcdfedb2cb7c31b4a016a227bd38a", + "rev": "fe2b7d6a922c875221671df6aa360b6e73d47e2f", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1713434076, - "narHash": "sha256-+/p5edwlkqKZc6GDAQl+92Hoe1f3NNbUF9uj+X9H3pU=", + "lastModified": 1713638189, + "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8494ae076b7878d61a7d2d25e89a847fe8f8364c", + "rev": "74574c38577914733b4f7a775dd77d24245081dd", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1713509575, - "narHash": "sha256-dmScKTWcg0ws1NS1X97KwYZvlIfHzRjlJk+rhZZ8pCY=", + "lastModified": 1713778917, + "narHash": "sha256-L0W9tsC1wFWMO4cMwflSZpFmmMCax2l+GdNvj8J7/20=", "owner": "nixos", "repo": "nixpkgs", - "rev": "40d15ed86dd08eff6a29e0a9abc416001d19cd67", + "rev": "8a3f95b79ba3083cfff90752296ef8a52a6bec9a", "type": "github" }, "original": { @@ -223,11 +223,11 @@ ] }, "locked": { - "lastModified": 1713511008, - "narHash": "sha256-sYDbRU/A5a3c9wbBvRPPuRLX8Sbc8bTxQSPahHxTIv8=", + "lastModified": 1713777467, + "narHash": "sha256-GuIeJSb3zU2iHvPyaW/RJcgjbEiUxG3Xj+EEbEBKh3c=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "ab0f8d391a960764348935e6497fc62ba0d2378d", + "rev": "f01c36f09cc5c2d77cbab4475528e06d6641bff4", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1713457024, - "narHash": "sha256-31MpStyXedDL1fvuOvn6iz3JURSVShDtDVMyP1PTjtc=", + "lastModified": 1713775152, + "narHash": "sha256-xyP8h9jLQ0AmyPy40sIwL7/D03oVpXG9YHoYJ4ecYWA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b94c6edbb8355756c53efc8ca3874c63622f287a", + "rev": "4371a1301c4d36cc791069d90ae522613a3a335e", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 564a375a..7749b3c7 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -33,21 +33,9 @@ in [ # and can be found with `nix-repl > :lf . > lastModifiedDate` (fetchpatch' { - # NECESSARY FOR DINO CALLS TO WORK ON AARCH64: - prUrl = "https://github.com/NixOS/nixpkgs/pull/291661"; - title = "orc: 0.4.36 -> 0.4.38"; - hash = "sha256-ULav0vt3QlI8lKcCVKP986H/GjBZqUYLwOHJ3XppAeo="; - merged.staging = "20240406000000"; - merged.staging-next = "20240418000000"; - }) - - (fetchpatch' { - prUrl = "https://github.com/NixOS/nixpkgs/pull/298001"; - saneCommit = "d599839060400762a67d2c01d15b102ffe75e703"; - title = "gnupg: fix cross compilation"; - hash = "sha256-d3kD2/UyMzzdBkiEdWtCibbWiPWBZLUWRry1TMkS25g="; - merged.staging = "20240326000000"; - merged.staging-next = "20240418000000"; + title = "libjxl: fix cross compilation by only conditionally enabling plugins"; + saneCommit = "044b3342d1500fb2b741e87e4d10894f4d8fd716"; + hash = "sha256-0U1xjihj8pnpJMAN+RxtWz6mujY6AZxgvfRQbfYYD4o="; }) (fetchpatch' { diff --git a/overlays/cross.nix b/overlays/cross.nix index 2afa3109..e1a2e5e7 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -2086,38 +2086,4 @@ in with final; { # 2023/07/30: upstreaming is blocked on unar (gnustep), unless i also make that optional xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver; - - xdg-utils = let - buildResholve = buildPackages.resholve.overrideAttrs (resholve': { - meta = (resholve'.meta or { }) // { knownVulnerabilities = [ ]; }; - }); - in (prev.xdg-utils.override { - resholve = buildResholve; - }).overrideAttrs (xdg-utils': let - patchedResholve = buildResholve.overrideAttrs (resholve': { - # resholve tries to exec `sed` and `awk`. this triggers inscrutable python2.7-specific errors. - postPatch = (resholve'.postPatch or "") + '' - substituteInPlace resholve \ - --replace-fail 'p = Popen(' 'return False; p = Popen(' - ''; - }); - in { - # postPatch = (xdg-utils'.postPatch or "") + '' - # substituteInPlace scripts/xdg-screensaver.in \ - # --replace-fail 'lockfile_command=`command -v lockfile`' 'lockfile_command=' - # ''; - - # have to patch all `resholve` invocations AGAIN because even though `buildPackages.resholve` is the right architecture now, - # the `resholve` passthru args refer to itself, in a way which `overrideAttrs` can't patch. - # also, xdg-screensaver resholve fails because `perl -e` is treated differently on native v.s. cross, - # so "fake" it as external and then manually patch it (resholve has a better way to do that, but not easily patchable from here). - preFixup = (lib.replaceStrings - [ "${buildResholve}/bin/resholve" "RESHOLVE_FAKE='external:" ] - [ "${patchedResholve}/bin/resholve" "RESHOLVE_FAKE='external:perl;" ] - xdg-utils'.preFixup) + '' - substituteInPlace $out/bin/xdg-screensaver \ - --replace-fail ' perl -e' ' ${perl}/bin/perl -e' - ''; - } - ); }