| 1 |
commit: 7517e0d93b740467bcb6b7731ebd9988372aa33e |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Sep 28 18:36:41 2017 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 17 17:52:07 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7517e0d9 |
| 7 |
|
| 8 |
sys-apps/nix: remove unused patches/file |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/5817 |
| 11 |
|
| 12 |
sys-apps/nix/files/60nix-remote-daemon | 1 - |
| 13 |
sys-apps/nix/files/nix-1.11.12-etc-fixes.patch | 24 ------------------------ |
| 14 |
sys-apps/nix/files/nix-1.11.14-etc-fixes.patch | 8 -------- |
| 15 |
3 files changed, 33 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/nix/files/60nix-remote-daemon b/sys-apps/nix/files/60nix-remote-daemon |
| 18 |
deleted file mode 100644 |
| 19 |
index 626058a94d1..00000000000 |
| 20 |
--- a/sys-apps/nix/files/60nix-remote-daemon |
| 21 |
+++ /dev/null |
| 22 |
@@ -1 +0,0 @@ |
| 23 |
-NIX_REMOTE="daemon" |
| 24 |
|
| 25 |
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 |
| 26 |
deleted file mode 100644 |
| 27 |
index 1973133e22b..00000000000 |
| 28 |
--- a/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,24 +0,0 @@ |
| 31 |
-GNU coreutils has '-c' option for formatted output, not -f. |
| 32 |
-Don't spam stderr when directory gets created. |
| 33 |
-diff --git a/scripts/nix-profile-daemon.sh.in b/scripts/nix-profile-daemon.sh.in |
| 34 |
-index 7f46cc6..386f607 100644 |
| 35 |
---- a/scripts/nix-profile-daemon.sh.in |
| 36 |
-+++ b/scripts/nix-profile-daemon.sh.in |
| 37 |
-@@ -15,3 +15,3 @@ export NIX_PROFILES="@localstatedir@/nix/profiles/default $HOME/.nix-profile" |
| 38 |
- mkdir -m 0755 -p $NIX_USER_PROFILE_DIR |
| 39 |
--if test "$(stat -f '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then |
| 40 |
-+if test "$(stat -c '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then |
| 41 |
- echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2 |
| 42 |
-@@ -37,3 +37,3 @@ if test -w $HOME; then |
| 43 |
- mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR |
| 44 |
-- if test "$(stat -f '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then |
| 45 |
-+ if test "$(stat -c '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then |
| 46 |
- echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2 |
| 47 |
-diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in |
| 48 |
-index 4f09b55..e93ef42 100644 |
| 49 |
---- a/scripts/nix-profile.sh.in |
| 50 |
-+++ b/scripts/nix-profile.sh.in |
| 51 |
-@@ -5,3 +5,2 @@ if [ -n "$HOME" ]; then |
| 52 |
- if ! [ -L "$NIX_LINK" ]; then |
| 53 |
-- echo "creating $NIX_LINK" >&2 |
| 54 |
- _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile |
| 55 |
|
| 56 |
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 |
| 57 |
deleted file mode 100644 |
| 58 |
index 07962838a22..00000000000 |
| 59 |
--- a/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch |
| 60 |
+++ /dev/null |
| 61 |
@@ -1,8 +0,0 @@ |
| 62 |
-diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in |
| 63 |
-index 4f09b55..e93ef42 100644 |
| 64 |
---- a/scripts/nix-profile.sh.in |
| 65 |
-+++ b/scripts/nix-profile.sh.in |
| 66 |
-@@ -5,3 +5,2 @@ if [ -n "$HOME" ]; then |
| 67 |
- if ! [ -L "$NIX_LINK" ]; then |
| 68 |
-- echo "creating $NIX_LINK" >&2 |
| 69 |
- _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile |
Archives