diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-21 10:39:34 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-21 10:39:34 -0700 |
commit | 5cd5b9b97fae6d65e16dff18598868b44ec1ef2d (patch) | |
tree | 43cd1c1fb0aa616271ce3dda408d2d210c1d09e9 /pkgs/tools/package-management | |
parent | 929b12e7b5b4f0f081e3ba735d39acb4ea6c858a (diff) | |
parent | fba98bad71596ffc963fb14140760d2e4abb0a4d (diff) | |
download | nixlib-5cd5b9b97fae6d65e16dff18598868b44ec1ef2d.tar nixlib-5cd5b9b97fae6d65e16dff18598868b44ec1ef2d.tar.gz nixlib-5cd5b9b97fae6d65e16dff18598868b44ec1ef2d.tar.bz2 nixlib-5cd5b9b97fae6d65e16dff18598868b44ec1ef2d.tar.lz nixlib-5cd5b9b97fae6d65e16dff18598868b44ec1ef2d.tar.xz nixlib-5cd5b9b97fae6d65e16dff18598868b44ec1ef2d.tar.zst nixlib-5cd5b9b97fae6d65e16dff18598868b44ec1ef2d.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/tools/kubie/default.nix
Diffstat (limited to 'pkgs/tools/package-management')
5 files changed, 4 insertions, 40 deletions
diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 296f3be49cc9..c205550b267d 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub -, nixFlakes +, nixUnstable , nix-prefetch , nixpkgs-fmt , nixpkgs-review @@ -19,7 +19,7 @@ buildPythonApplication rec { }; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch nixpkgs-fmt nixpkgs-review ]) + "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable nix-prefetch nixpkgs-fmt nixpkgs-review ]) ]; checkPhase = '' diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ec5099c5f6ee..159fc5b39c12 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -227,12 +227,4 @@ in rec { ]; }); - nixExperimental = nixUnstable.overrideAttrs (prev: { - patches = (prev.patches or []) ++ [ ./enable-all-experimental.patch ]; - }); - - nixFlakes = nixUnstable.overrideAttrs (prev: { - patches = (prev.patches or []) ++ [ ./enable-flakes.patch ]; - }); - } diff --git a/pkgs/tools/package-management/nix/enable-all-experimental.patch b/pkgs/tools/package-management/nix/enable-all-experimental.patch deleted file mode 100644 index 1712b7295a5e..000000000000 --- a/pkgs/tools/package-management/nix/enable-all-experimental.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc -index d3b27d7be..e7d002e1d 100644 ---- a/src/libstore/globals.cc -+++ b/src/libstore/globals.cc -@@ -172,8 +172,7 @@ MissingExperimentalFeature::MissingExperimentalFeature(std::string feature) - - void Settings::requireExperimentalFeature(const std::string & name) - { -- if (!isExperimentalFeatureEnabled(name)) -- throw MissingExperimentalFeature(name); -+ return; - } - - bool Settings::isWSL1() diff --git a/pkgs/tools/package-management/nix/enable-flakes.patch b/pkgs/tools/package-management/nix/enable-flakes.patch deleted file mode 100644 index 998067449b7f..000000000000 --- a/pkgs/tools/package-management/nix/enable-flakes.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh -index 3e4ead76c..81d407236 100644 ---- a/src/libstore/globals.hh -+++ b/src/libstore/globals.hh -@@ -923,7 +923,8 @@ public: - value. - )"}; - -- Setting<Strings> experimentalFeatures{this, {}, "experimental-features", -+ Setting<Strings> experimentalFeatures{ -+ this, {"flakes", "nix-command"}, "experimental-features", - "Experimental Nix features to enable."}; - - bool isExperimentalFeatureEnabled(const std::string & name); diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 2229e0c6a1de..3bfb89fe1050 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -1,7 +1,7 @@ { lib , python3 , fetchFromGitHub -, nixFlakes +, nixUnstable , git }: @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { }; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ]) + "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable git ]) ]; doCheck = false; |