From e09758962c51334a326b9709a380c4bd9c199b03 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Wed, 8 May 2024 07:24:21 -0700 Subject: [PATCH 1/2] refactor: move simple overrides to a function --- overlay.nix | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/overlay.nix b/overlay.nix index 4d8a326..d7e66b9 100644 --- a/overlay.nix +++ b/overlay.nix @@ -25,8 +25,22 @@ let boehmgc-nix = boehmgc-patched; }); + # These packages depend on Nix features that Lix does not support + overridelist_2_18 = [ + "nix-init" + "nix-prefetch-git" + "nixos-option" + "nurl" + "prefetch-yarn-deps" # force these onto upstream so we are not regularly rebuilding electron + ]; + override_2_18 = prev.lib.genAttrs overridelist_2_18 ( + name: prev.${name}.override { + nix = final.nixVersions.nix_2_18_upstream; + }); + inherit (prev) lib; in +override_2_18 // { # used for things that one wouldn't necessarily want to update, but we # nevertheless shove it in the overlay and fixed-point it in case one *does* @@ -52,11 +66,6 @@ in ninjaFlags = old.ninjaFlags or [ ] ++ [ "-v" ]; }); - # force these onto upstream so we are not regularly rebuilding electron - prefetch-yarn-deps = prev.prefetch-yarn-deps.override { - nix = final.nixVersions.nix_2_18_upstream; - }; - # support both having and missing https://github.com/NixOS/nixpkgs/pull/304913 prefetch-npm-deps = if (lib.functionArgs prev.prefetch-npm-deps.override) ? nix @@ -65,21 +74,5 @@ in } else prev.prefetch-npm-deps; - nix-prefetch-git = prev.nix-prefetch-git.override { - nix = final.nixVersions.nix_2_18_upstream; - }; - - nixos-option = prev.nixos-option.override { - nix = final.nixVersions.nix_2_18_upstream; - }; - nix-doc = prev.callPackage ./nix-doc/package.nix { withPlugin = false; }; - - nix-init = prev.nix-init.override { - nix = final.nixVersions.nix_2_18_upstream; - }; - - nurl = prev.nurl.override { - nix = final.nixVersions.nix_2_18_upstream; - }; } From 5ef5fe6a67a46dda14867ffeb23f710e47d9c5b8 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Wed, 8 May 2024 07:50:45 -0700 Subject: [PATCH 2/2] feat: add reported broken packages --- overlay.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/overlay.nix b/overlay.nix index d7e66b9..eddd85a 100644 --- a/overlay.nix +++ b/overlay.nix @@ -27,6 +27,8 @@ let # These packages depend on Nix features that Lix does not support overridelist_2_18 = [ + "attic-client" + "nix-du" "nix-init" "nix-prefetch-git" "nixos-option"