git.iko.soy/typeable/nixpkgs
on master help sign in
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.

commit21bfd3bbce10afb5b7718a9ee51436f3a6b34efd authorEelco Dolstra <edolstra@gmail.com> dateFri 21 May 2021, 15:16 (5 years ago) parent224df69
4 files changed+2−37
pkgs/tools/package-management/nix/default.nix+1−7 pkgs/tools/package-management/nix/enable-all-experimental.patch−14 pkgs/tools/package-management/nix/enable-flakes.patch−14 pkgs/top-level/all-packages.nix+1−2
pkgs/tools/package-management/nix/default.nix+1−7
@@ -227,12 +227,6 @@ in rec {
227227 ];
228228 });
229229
230− nixExperimental = nixUnstable.overrideAttrs (prev: {
231− patches = (prev.patches or []) ++ [ ./enable-all-experimental.patch ];
232− });
233−
234− nixFlakes = nixUnstable.overrideAttrs (prev: {
235− patches = (prev.patches or []) ++ [ ./enable-flakes.patch ];
236− });
230+ nixFlakes = nixUnstable;
237231
238232}
pkgs/tools/package-management/nix/enable-all-experimental.patchdeleted−14
@@ -1,14 +0,0 @@
1−diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
2−index d3b27d7be..e7d002e1d 100644
3−--- a/src/libstore/globals.cc
4−+++ b/src/libstore/globals.cc
5−@@ -172,8 +172,7 @@ MissingExperimentalFeature::MissingExperimentalFeature(std::string feature)
6−
7− void Settings::requireExperimentalFeature(const std::string & name)
8− {
9−- if (!isExperimentalFeatureEnabled(name))
10−- throw MissingExperimentalFeature(name);
11−+ return;
12− }
13−
14− bool Settings::isWSL1()
pkgs/tools/package-management/nix/enable-flakes.patchdeleted−14
@@ -1,14 +0,0 @@
1−diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
2−index 3e4ead76c..81d407236 100644
3−--- a/src/libstore/globals.hh
4−+++ b/src/libstore/globals.hh
5−@@ -923,7 +923,8 @@ public:
6− value.
7− )"};
8−
9−- Setting<Strings> experimentalFeatures{this, {}, "experimental-features",
10−+ Setting<Strings> experimentalFeatures{
11−+ this, {"flakes", "nix-command"}, "experimental-features",
12− "Experimental Nix features to enable."};
13−
14− bool isExperimentalFeatureEnabled(const std::string & name);
pkgs/top-level/all-packages.nix+1−2
@@ -30322,8 +30322,7 @@ in
3032230322 nix
3032330323 nixStable
3032430324 nixUnstable
30325− nixFlakes
30326− nixExperimental;
30325+ nixFlakes;
3032730326
3032830327 nixStatic = pkgsStatic.nix;
3032930328