commit: 7517e0d93b740467bcb6b7731ebd9988372aa33e Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Sep 28 18:36:41 2017 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Tue Oct 17 17:52:07 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7517e0d9
sys-apps/nix: remove unused patches/file Closes: https://github.com/gentoo/gentoo/pull/5817 sys-apps/nix/files/60nix-remote-daemon | 1 - sys-apps/nix/files/nix-1.11.12-etc-fixes.patch | 24 ------------------------ sys-apps/nix/files/nix-1.11.14-etc-fixes.patch | 8 -------- 3 files changed, 33 deletions(-) diff --git a/sys-apps/nix/files/60nix-remote-daemon b/sys-apps/nix/files/60nix-remote-daemon deleted file mode 100644 index 626058a94d1..00000000000 --- 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 1973133e22b..00000000000 --- 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 07962838a22..00000000000 --- 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
