Compare commits

..
Author SHA1 Message Date
Eelco Dolstra 73b3ba878a Merge pull request #6819 from NixOS/backport-6812-to-2.10-maintenance
[Backport 2.10-maintenance] fix(libstore): allow Nix to access all Rosetta 2 paths on MacOS
2022-09-06 14:51:30 +02:00
Alex Wied 942f715a90 fix(libstore): allow Nix to access all Rosetta 2 paths on MacOS
Fixes: #5884
(cherry picked from commit b88fb50e21)
2022-07-18 12:10:22 +00:00
Eelco Dolstra 0b62dab6db Disable auto-chroot if $NIX_STATE_DIR is set
Issue #6732.

(cherry picked from commit 3bcd7a5474)
2022-07-15 14:01:52 +02:00
Eelco Dolstra 1722de647b Disable auto-chroot if $NIX_STORE_DIR is set
Fixes #6732.

(cherry picked from commit ff49c75502)
2022-07-15 14:01:46 +02:00
Eelco Dolstra b48683b7fd Bump version 2022-07-15 12:25:01 +02:00
Domen Kožar 1258f2b7f8 curl: patch for netrc regression in Nix
(cherry picked from commit 99208bb8cc)
Signed-off-by: Domen Kožar <domen@dev.si>
2022-07-14 19:30:35 -05:00
Eelco Dolstra e79b38ef59 Bump version 2022-07-14 13:56:13 +02:00
Domen Kožar 39b996ca0c bump nixpkgs to fix netrc regression in curl 2022-07-13 15:28:57 -05:00
5 changed files with 16 additions and 9 deletions

No files matched your search

+1 -1
View File
@@ -1 +1 @@
2.10.1
2.10.3
Generated
+3 -3
View File
@@ -18,11 +18,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1653988320,
"narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=",
"lastModified": 1657693803,
"narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1",
"rev": "365e1b3a859281cf11b94f87231adeabbdd878a2",
"type": "github"
},
"original": {
+2 -2
View File
@@ -108,7 +108,7 @@
++ lib.optionals stdenv.hostPlatform.isLinux [(buildPackages.util-linuxMinimal or buildPackages.utillinuxMinimal)];
buildDeps =
[ curl
[ (curl.override { patchNetrcRegression = true; })
bzip2 xz brotli editline
openssl sqlite
libarchive
@@ -363,7 +363,7 @@
buildInputs =
[ nix
curl
(curl.override { patchNetrcRegression = true; })
bzip2
xz
pkgs.perl
+4 -2
View File
@@ -98,7 +98,9 @@
(allow file*
(literal "/private/var/select/sh"))
; Allow Rosetta 2 to run x86_64 binaries on aarch64-darwin.
; Allow Rosetta 2 to run x86_64 binaries on aarch64-darwin (and vice versa).
(allow file-read*
(subpath "/Library/Apple/usr/libexec/oah")
(subpath "/System/Library/Apple/usr/libexec/oah"))
(subpath "/System/Library/Apple/usr/libexec/oah")
(subpath "/System/Library/LaunchDaemons/com.apple.oahd.plist")
(subpath "/Library/Apple/System/Library/LaunchDaemons/com.apple.oahd.plist"))
+6 -1
View File
@@ -1321,7 +1321,12 @@ std::shared_ptr<Store> openFromNonUri(const std::string & uri, const Store::Para
else if (pathExists(settings.nixDaemonSocketFile))
return std::make_shared<UDSRemoteStore>(params);
#if __linux__
else if (!pathExists(stateDir) && params.empty() && getuid() != 0) {
else if (!pathExists(stateDir)
&& params.empty()
&& getuid() != 0
&& !getEnv("NIX_STORE_DIR").has_value()
&& !getEnv("NIX_STATE_DIR").has_value())
{
/* If /nix doesn't exist, there is no daemon socket, and
we're not root, then automatically set up a chroot
store in ~/.local/share/nix/root. */