Revert nixFlake / nixExperimental (NixOS#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.
mkg20001 · May 21, 2021 · 21bfd3b · 21bfd3b
1 parent 224df69
commit 21bfd3b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 37 deletions.
diff --git 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
diff --git a/pkgs/tools/package-management/nix/enable-flakes.patch b/pkgs/tools/package-management/nix/enable-flakes.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -30322,8 +30322,7 @@ in
     nix
     nixStable
     nixUnstable
-    nixFlakes
-    nixExperimental;
+    nixFlakes;
 
   nixStatic = pkgsStatic.nix;