update nix

This commit is contained in:
Dmitriy Kholkin 2021-10-27 14:22:26 +03:00
parent 8bdc6d2707
commit 436c747686
3 changed files with 34 additions and 2 deletions

View File

@ -7,6 +7,7 @@
"https://nix-community.cachix.org"
];
binaryCachePublicKeys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
@ -20,8 +21,9 @@
autoOptimiseStore = false;
package = inputs.nix.packages.${system}.nix.overrideAttrs (oa: {
patches = [ ./nix.patch ] ++ oa.patches or [];
package = inputs.nix.defaultPackage.x86_64-linux.overrideAttrs (oa: {
patches = [ ./nix.patch ./unset-is-macho.patch ] ++ oa.patches or [ ];
doInstallCheck = false;
});
extraOptions = ''

View File

@ -40,3 +40,20 @@ index e04954d45..5649bd01a 100644
globals.dryRun = false;
globals.preserveInstalled = false;
globals.removeAll = false;
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index f27331534..386a664d9 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -1862,9 +1862,9 @@ static void addPath(
if (state.store->isInStore(path)) {
auto [storePath, subPath] = state.store->toStorePath(path);
auto info = state.store->queryPathInfo(storePath);
- if (!info->references.empty())
- throw EvalError("store path '%s' is not allowed to have references",
- state.store->printStorePath(storePath));
+ // if (!info->references.empty())
+ // throw EvalError("store path '%s' is not allowed to have references",
+ // state.store->printStorePath(storePath));
path = state.store->toRealPath(storePath) + subPath;
}

View File

@ -0,0 +1,13 @@
diff --git a/src/nix/get-env.sh b/src/nix/get-env.sh
index 42c806450..a8563c772 100644
--- a/src/nix/get-env.sh
+++ b/src/nix/get-env.sh
@@ -8,6 +8,8 @@ if [[ -n $stdenv ]]; then
source $stdenv/setup
fi
+unset -f isMachO
+
# Better to use compgen, but stdenv bash doesn't have it.
__vars="$(declare -p)"
__functions="$(declare -F)"