Revert nixFlake / nixExperimental (#120141)

Usage of the nixFlakes attribute obscures the fact that it's an
experimental feature. Providing a nixExperimental attribute (which
people will inevitably start using on their production machines) makes
it too easy to enable all experimental features, when you should
explicitly opt in to the features that you want to try out.

Also, upstream Nix doesn't provide an "enable all experimental
features" patch so neither should Nixpkgs.

3 files changed, 1 insertions, 35 deletions

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index ec5099c5f6e..0d93d1d7b1b 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -227,12 +227,6 @@ 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 ];
-  });
+  nixFlakes = nixUnstable;
 
 }
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 1712b7295a5..00000000000
--- 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 998067449b7..00000000000
--- 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);