diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-19 17:57:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-19 17:57:29 +0100 |
| commit | d473a706836012853193afc7000922601e4ada61 (patch) | |
| tree | 01c43bd6b2121d90bc97ead47dd7654d9402ea1d /sys-apps/nix | |
| parent | 420eeee727d39d869d864caddb04a80dafda7160 (diff) | |
gentoo resync : 19.10.2017
Diffstat (limited to 'sys-apps/nix')
| -rw-r--r-- | sys-apps/nix/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/nix/files/60nix-remote-daemon | 1 | ||||
| -rw-r--r-- | sys-apps/nix/files/nix-1.11.12-etc-fixes.patch | 24 | ||||
| -rw-r--r-- | sys-apps/nix/files/nix-1.11.14-etc-fixes.patch | 8 |
4 files changed, 0 insertions, 36 deletions
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest index 3aba3714d34b..49a0d1aea0f3 100644 --- a/sys-apps/nix/Manifest +++ b/sys-apps/nix/Manifest @@ -1,6 +1,3 @@ -AUX 60nix-remote-daemon 20 SHA256 0afe41dcbcc67939de658dedac9c305fe4e74978fc804c9ef9dd299d72e6861a SHA512 af3e8a4c0171fb52572d73b7111a07255c7768c765878cfc20e80a481a5a6f5d6c58643b3fdf8d9582bb0b903dee0e228b8e18f3e73d9479879f8f6862142363 WHIRLPOOL 406752b5c25e28c38a32ca5edcb99c8a1f2e3b16ccba2ad4121eb9b1af6844ac186cb0df52b6ffce69c379c6cf53e4680c06bef309d6fca66fe73707f0052c7e -AUX nix-1.11.12-etc-fixes.patch 1275 SHA256 ecc10dd1291712224560f2424b70120e08d8314541dcbd713b128512a49aa185 SHA512 f449877a92473a0b07f20131195d7cab23341068c370e18b618d7870223bf65d47bf9f96cfdfdb41fe0be2e4390a341bebb2bf5a565ba589d6ba6babbf076a2c WHIRLPOOL d2319df6c0540bb3a2ee060d68c4c022ec417b829c00ec88f1162fba9c3b26e465f1b0d9284819eff59958142589b27706c065694c3b2d5452dbb0a59fc97a30 -AUX nix-1.11.14-etc-fixes.patch 350 SHA256 c2a510768ba263abf2b6a1e48ba1d402d967a5fbb5227906ee4deaeb7995e8e3 SHA512 ec742ca9fedbdbbfbac152303e62ef34457c7e70dcc69954a38d63581c6513670eb66cd4f01048fa848469aa2d6c55dc2109e59fafecae85269a2f13ee2970e1 WHIRLPOOL bf182c28194ac7014bb2bea9523657a1a27097d5e20e28c624a863619060558b524a14b7258ae845598e918ef0d5d83db5753b3a150fd9b117e9aef4980612a2 AUX nix-1.11.14-glibc-2.26.patch 730 SHA256 464d76a9f76beef25bd972e53a5cb14a2e0f4d86be2cd9bb3ea4b289312a64a5 SHA512 2caae0b32f4be3a8b535e784628d4fc878645198adaa0d5440d768dc01cd3a7e43b11323eb75244d719b2eba0256c80415dcf081cbb05dcbb8250021106e95db WHIRLPOOL 443ae1942ec4f4f24dc53e016a6e0c5c90d78ecb301ae11b1bc6908a194fd9dd51d229e642d02102bafcbb92a76f84eafb1421c7dd3596986e50f4c0c74c36bb AUX nix-1.11.6-per-user.patch 554 SHA256 607d846262466e2f1ec4167e1396eab39309bf2c13dea0caeb9b7715d8778722 SHA512 ffc6b03ba9fa8a56cdb40caa271582b8648f9539d8abc69251d16356efa64c93902648bae29d06af938383dbf3be110fdaebbbd4af4635c112bb34d1077cb56a WHIRLPOOL 56540c433cdb420f6f366eb1151f1847593e99aa5771e976695e9f27a530350ac3db8b97176bef62af31505f8c21497cc6e29af34d2b324251230cd79b5d0f61 AUX nix-1.11.6-respect-CXXFLAGS.patch 164 SHA256 3723f9749504ad5eca69fc7f4864a89c4f0766d20cd13b89a38f638bcc5c8e87 SHA512 2508d26888050bb4099f1654cee91d44405b00ca4dfdd6c1b1cf0f24e004333b106cc461b306404b1d56f41bb928ed1069536c09f9390b5ba287ca70b9bcb0c6 WHIRLPOOL cb03fe5dd3e5b4f5e512652254f4d981f8be4b7c395a1081f26618be02be805cbb331deebd36f88b8c52cfcec48774013120e12fd4021c19e6af67c329fd75ba diff --git a/sys-apps/nix/files/60nix-remote-daemon b/sys-apps/nix/files/60nix-remote-daemon deleted file mode 100644 index 626058a94d15..000000000000 --- a/sys-apps/nix/files/60nix-remote-daemon +++ /dev/null @@ -1 +0,0 @@ -NIX_REMOTE="daemon" diff --git a/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch b/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch deleted file mode 100644 index 1973133e22bd..000000000000 --- a/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ -GNU coreutils has '-c' option for formatted output, not -f. -Don't spam stderr when directory gets created. -diff --git a/scripts/nix-profile-daemon.sh.in b/scripts/nix-profile-daemon.sh.in -index 7f46cc6..386f607 100644 ---- a/scripts/nix-profile-daemon.sh.in -+++ b/scripts/nix-profile-daemon.sh.in -@@ -15,3 +15,3 @@ export NIX_PROFILES="@localstatedir@/nix/profiles/default $HOME/.nix-profile" - mkdir -m 0755 -p $NIX_USER_PROFILE_DIR --if test "$(stat -f '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then -+if test "$(stat -c '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then - echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2 -@@ -37,3 +37,3 @@ if test -w $HOME; then - mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR -- if test "$(stat -f '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then -+ if test "$(stat -c '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then - echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2 -diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in -index 4f09b55..e93ef42 100644 ---- a/scripts/nix-profile.sh.in -+++ b/scripts/nix-profile.sh.in -@@ -5,3 +5,2 @@ if [ -n "$HOME" ]; then - if ! [ -L "$NIX_LINK" ]; then -- echo "creating $NIX_LINK" >&2 - _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile diff --git a/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch b/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch deleted file mode 100644 index 07962838a224..000000000000 --- a/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in -index 4f09b55..e93ef42 100644 ---- a/scripts/nix-profile.sh.in -+++ b/scripts/nix-profile.sh.in -@@ -5,3 +5,2 @@ if [ -n "$HOME" ]; then - if ! [ -L "$NIX_LINK" ]; then -- echo "creating $NIX_LINK" >&2 - _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile |