From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70E68139694 for ; Sat, 15 Jul 2017 11:30:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40A921FC092; Sat, 15 Jul 2017 11:29:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 12B581FC092 for ; Sat, 15 Jul 2017 11:29:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00A50341920 for ; Sat, 15 Jul 2017 11:29:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B13174BA for ; Sat, 15 Jul 2017 11:29:22 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1500118157.49ad8d2c53d2f21f4867e147b6ad97cbcb706c79.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/files/, sys-apps/nix/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/nix/files/nix-1.11.12-etc-fixes.patch sys-apps/nix/nix-1.11.12-r1.ebuild sys-apps/nix/nix-1.11.12.ebuild X-VCS-Directories: sys-apps/nix/files/ sys-apps/nix/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 49ad8d2c53d2f21f4867e147b6ad97cbcb706c79 X-VCS-Branch: master Date: Sat, 15 Jul 2017 11:29:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8509630e-a8b3-4ec4-8d5f-b96aca8a7418 X-Archives-Hash: b08d06f4d1bae414d62fd2401930e597 commit: 49ad8d2c53d2f21f4867e147b6ad97cbcb706c79 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Jul 15 11:27:59 2017 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Jul 15 11:29:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ad8d2c sys-apps/nix: added missing gcroots directory, bug #622658 Fixed two bugs here: - added missing /nix/var/nix/gcroots/per-user directory - fixed /etc/profile.d/nix-daemon.sh to use 'stat -c', not 'stat -f' Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/622658 Package-Manager: Portage-2.3.6, Repoman-2.3.2 sys-apps/nix/files/nix-1.11.12-etc-fixes.patch | 24 ++++++++++++++++++++++ .../{nix-1.11.12.ebuild => nix-1.11.12-r1.ebuild} | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..1973133e22b --- /dev/null +++ b/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch @@ -0,0 +1,24 @@ +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/nix-1.11.12.ebuild b/sys-apps/nix/nix-1.11.12-r1.ebuild similarity index 91% rename from sys-apps/nix/nix-1.11.12.ebuild rename to sys-apps/nix/nix-1.11.12-r1.ebuild index f8b026b00b9..61cf9a2de1c 100644 --- a/sys-apps/nix/nix-1.11.12.ebuild +++ b/sys-apps/nix/nix-1.11.12-r1.ebuild @@ -44,6 +44,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.11.6-per-user.patch "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch + "${FILESDIR}"/${PN}-1.11.12-etc-fixes.patch ) DISABLE_AUTOFORMATTING=yes @@ -113,11 +114,15 @@ src_install() { keepdir /nix/var/nix/profiles/per-user fperms 1777 /nix/var/nix/profiles/per-user - doenvd "${FILESDIR}"/60nix-remote-daemon + # setup directories nix-daemon: /etc/profile.d/nix-daemon.sh + keepdir /nix/var/nix/gcroots/per-user + fperms 1777 /nix/var/nix/gcroots/per-user + newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon if ! use etc_profile; then rm "${ED}"/etc/profile.d/nix.sh || die + rm "${ED}"/etc/profile.d/nix-daemon.sh || die fi }