git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #120141 from DavHau/davhau-nixFlakes-enable-flakes
commit9c19ef7cf2a4af99d13a1744a53d223edfc002f0 authorMaciej Krüger <mkg20001@gmail.com> dateWed 12 May 2021, 02:07 (6 years ago) parent00794f28865881
4 files changed+37−2
pkgs/tools/package-management/nix/default.nix+7−1 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+2−1
pkgs/tools/package-management/nix/default.nix+7−1
@@ -227,6 +227,12 @@ in rec {
227227 inherit storeDir stateDir confDir boehmgc;
228228 });
229229
230− nixFlakes = nixUnstable;
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+ });
231237
232238}
pkgs/tools/package-management/nix/enable-all-experimental.patchnew file+14
@@ -0,0 +1,14 @@
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.patchnew file+14
@@ -0,0 +1,14 @@
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+2−1
@@ -30190,7 +30190,8 @@ in
3019030190 nix
3019130191 nixStable
3019230192 nixUnstable
30193− nixFlakes;
30193+ nixFlakes
30194+ nixExperimental;
3019430195
3019530196 nixStatic = pkgsStatic.nix;
3019630197