diff --git a/third_party/nixpkgs/patches/pr157310.patch b/third_party/nixpkgs/patches/pr157310.patch new file mode 100644 index 0000000000..6b793a3705 --- /dev/null +++ b/third_party/nixpkgs/patches/pr157310.patch @@ -0,0 +1,24 @@ +From e3d8cc81b37a566d781199dab9d342822393b91f Mon Sep 17 00:00:00 2001 +From: sternenseemann +Date: Sat, 29 Jan 2022 21:41:49 +0100 +Subject: [PATCH] nixos/nix-daemon: fix config validation with 2.3 + +--option experimental-features is no understood by Nix 2.3. +--- + nixos/modules/services/misc/nix-daemon.nix | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix +index cd4408cef411d..111a2ad504069 100644 +--- a/nixos/modules/services/misc/nix-daemon.nix ++++ b/nixos/modules/services/misc/nix-daemon.nix +@@ -69,7 +69,8 @@ let + set -e + set +o pipefail + NIX_CONF_DIR=$PWD \ +- ${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net --option experimental-features nix-command"} \ ++ ${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net"} \ ++ ${optionalString (isNixAtLeast "2.4pre") "--option experimental-features nix-command"} \ + |& sed -e 's/^warning:/error:/' \ + | (! grep '${if cfg.checkConfig then "^error:" else "^error: unknown setting"}') + set -o pipefail diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index f2cc68009d..8d5e5022ac 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,3 +1,4 @@ pomerium-fix.patch pomerium-fix2.patch nvidia-sideband-socket.patch +pr157310.patch