git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #123898 from edolstra/revert-nix-experimental

Revert nixExperimental / nixFlakes changes and deprecate nixFlakes attribute

commit7a2a68316ee29534f3e6c139f21370a3ce21e675 authorRobert Hensing <roberth@users.noreply.github.com> dateFri 21 May 2021, 16:05 (5 years ago) parent224df6962ee635
9 files changed+10−47
pkgs/development/tools/misc/hydra/default.nix+2−2 pkgs/tools/misc/nix-direnv/default.nix+2−2 pkgs/tools/package-management/nix-update/default.nix+2−2 pkgs/tools/package-management/nix/default.nix−8 pkgs/tools/package-management/nix/enable-all-experimental.patch−14 pkgs/tools/package-management/nix/enable-flakes.patch−14 pkgs/tools/package-management/nixpkgs-review/default.nix+2−2 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−3
pkgs/development/tools/misc/hydra/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }:
1+{ fetchFromGitHub, nixStable, callPackage, nixUnstable, nixosTests }:
22
33{
44 hydra-unstable = callPackage ./common.nix {
@@ -9,7 +9,7 @@
99 rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468";
1010 sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0=";
1111 };
12− nix = nixFlakes;
12+ nix = nixUnstable;
1313
1414 tests = {
1515 basic = nixosTests.hydra.hydra-unstable;
pkgs/tools/misc/nix-direnv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, gnugrep, nixFlakes }:
1+{ lib, stdenv, fetchFromGitHub, gnugrep, nixUnstable }:
22
33stdenv.mkDerivation rec {
44 pname = "nix-direnv";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 # Substitute instead of wrapping because the resulting file is
1515 # getting sourced, not executed:
1616 postPatch = ''
17− sed -i "1a NIX_BIN_PREFIX=${nixFlakes}/bin/" direnvrc
17+ sed -i "1a NIX_BIN_PREFIX=${nixUnstable}/bin/" direnvrc
1818 substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep"
1919 '';
2020
pkgs/tools/package-management/nix-update/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib
22, buildPythonApplication
33, fetchFromGitHub
4−, nixFlakes
4+, nixUnstable
55, nix-prefetch
66, nixpkgs-fmt
77, nixpkgs-review
@@ -19,7 +19,7 @@ buildPythonApplication rec {
1919 };
2020
2121 makeWrapperArgs = [
22− "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch nixpkgs-fmt nixpkgs-review ])
22+ "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable nix-prefetch nixpkgs-fmt nixpkgs-review ])
2323 ];
2424
2525 checkPhase = ''
pkgs/tools/package-management/nix/default.nix−8
@@ -227,12 +227,4 @@ 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− });
237−
238230}
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/tools/package-management/nixpkgs-review/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib
22, python3
33, fetchFromGitHub
4−, nixFlakes
4+, nixUnstable
55, git
66}:
77
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
1717 };
1818
1919 makeWrapperArgs = [
20− "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ])
20+ "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable git ])
2121 ];
2222
2323 doCheck = false;
pkgs/top-level/aliases.nix+1
@@ -492,6 +492,7 @@ mapAliases ({
492492 nginxUnstable = nginxMainline; # added 2018-04-25
493493 nilfs_utils = nilfs-utils; # added 2018-04-25
494494 nix-review = nixpkgs-review; # added 2019-12-22
495+ nixFlakes = nixUnstable; # added 2021-05-21
495496 nmap_graphical = nmap-graphical; # added 2017-01-19
496497 nologin = shadow; # added 2018-04-25
497498 nxproxy = nx-libs; # added 2019-02-15
pkgs/top-level/all-packages.nix+1−3
@@ -30321,9 +30321,7 @@ in
3032130321 })
3032230322 nix
3032330323 nixStable
30324− nixUnstable
30325− nixFlakes
30326− nixExperimental;
30324+ nixUnstable;
3032730325
3032830326 nixStatic = pkgsStatic.nix;
3032930327