Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
 pkgs/development/tools/kubie/default.nix

pkgs/tools/misc/nix-direnv/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gnugrep, nixFlakes }:
+{ lib, stdenv, fetchFromGitHub, gnugrep, nixUnstable }:
 
 stdenv.mkDerivation rec {
   pname = "nix-direnv";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   # Substitute instead of wrapping because the resulting file is
   # getting sourced, not executed:
   postPatch = ''
-    sed -i "1a NIX_BIN_PREFIX=${nixFlakes}/bin/" direnvrc
+    sed -i "1a NIX_BIN_PREFIX=${nixUnstable}/bin/" direnvrc
     substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep"
   '';
 

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 = ''

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 ];
-  });
-
 }

pkgs/tools/package-management/nix/enable-all-experimental.patch

@@ -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()

pkgs/tools/package-management/nix/enable-flakes.patch

@@ -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);

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;