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 C2E3D13908F for ; Wed, 1 Feb 2017 22:18:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15D1221C205; Wed, 1 Feb 2017 22:18:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DA56021C205 for ; Wed, 1 Feb 2017 22:18:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF0DE33BEBE for ; Wed, 1 Feb 2017 22:18:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78A143DAA for ; Wed, 1 Feb 2017 22:18:30 +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: <1485987496.5050debfedd9ef939113ab1c2e3f0de3be6e15c0.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/nix/nix-1.11.6-r1.ebuild sys-apps/nix/nix-1.11.6-r2.ebuild sys-apps/nix/nix-1.11.6-r3.ebuild X-VCS-Directories: sys-apps/nix/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 5050debfedd9ef939113ab1c2e3f0de3be6e15c0 X-VCS-Branch: master Date: Wed, 1 Feb 2017 22:18:30 +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: 08bd0842-24b5-4cd8-b06f-638647c3d63d X-Archives-Hash: 009e01ac0a9543bb427d8960a6460c87 commit: 5050debfedd9ef939113ab1c2e3f0de3be6e15c0 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Feb 1 22:10:46 2017 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Feb 1 22:18:16 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5050debf sys-apps/nix: don't hardcode UID/GID for nix internal groups Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-apps/nix/nix-1.11.6-r1.ebuild | 114 --------------------- .../{nix-1.11.6-r2.ebuild => nix-1.11.6-r3.ebuild} | 4 +- 2 files changed, 2 insertions(+), 116 deletions(-) diff --git a/sys-apps/nix/nix-1.11.6-r1.ebuild b/sys-apps/nix/nix-1.11.6-r1.ebuild deleted file mode 100644 index 4553ec6..00000000 --- a/sys-apps/nix/nix-1.11.6-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit readme.gentoo-r1 user - -DESCRIPTION="A purely functional package manager" -HOMEPAGE="https://nixos.org/nix" - -SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+etc_profile +gc doc sodium" - -RDEPEND=" - app-arch/bzip2 - app-arch/xz-utils - dev-db/sqlite - dev-libs/openssl:0= - net-misc/curl - sys-libs/zlib - gc? ( dev-libs/boehm-gc ) - doc? ( dev-libs/libxml2 - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - ) - sodium? ( dev-libs/libsodium ) - dev-lang/perl:= - dev-perl/DBD-SQLite - dev-perl/WWW-Curl - dev-perl/DBI -" -DEPEND="${RDEPEND} - >=sys-devel/bison-2.6 - >=sys-devel/flex-2.5.35 - virtual/perl-ExtUtils-ParseXS -" - -PATCHES=( - "${FILESDIR}"/${P}-systemd.patch - "${FILESDIR}"/${P}-per-user.patch -) - -DISABLE_AUTOFORMATTING=yes -DOC_CONTENTS=" Quick start user guide on Gentoo: - -[as root] enable nix-daemon service: - [systemd] # systemctl enable nix-daemon - [openrc] # rc-update add nix-daemon -[as an user] relogin to get environment and profile update -[as an user] fetch nixpkgs update: - \$ nix-channel --update -[as an user] install nix packages: - \$ nix-env -i mc -[as an user] configure environment: - Somewhere in .bash_profile you might want to set - LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive - but please read https://github.com/NixOS/nixpkgs/issues/21820 - -Next steps: - nix package manager user manual: http://nixos.org/nix/manual/ -" - -pkg_setup() { - enewgroup nixbld 30000 - for i in {1..10}; do - # we list 'nixbld' twice to - # both assign a primary group for user - # and add an user to /etc/group - enewuser nixbld${i} $((30000 +$i)) -1 /var/empty nixbld,nixbld - done -} - -src_configure() { - econf \ - --localstatedir="${EPREFIX}"/nix/var \ - $(use_enable gc) -} - -src_install() { - # TODO: emacs highlighter - default - - readme.gentoo_create_doc - - # here we an eager variant of something that - # is lazily done by nix-daemo and root nix-env - - # TODO: will need a tweak for prefix - keepdir /nix/store - fowners root:nixbld /nix/store - fperms 1775 /nix/store - - keepdir /nix/var/nix/profiles/per-user - fperms 1777 /nix/var/nix/profiles/per-user - - doenvd "${FILESDIR}"/60nix-remote-daemon - newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon - - if ! use etc_profile; then - rm "${ED}"/etc/profile.d/nix.sh || die - fi -} - -pkg_postinst() { - if ! use etc_profile; then - ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)." - fi - - readme.gentoo_print_elog -} diff --git a/sys-apps/nix/nix-1.11.6-r2.ebuild b/sys-apps/nix/nix-1.11.6-r3.ebuild similarity index 96% rename from sys-apps/nix/nix-1.11.6-r2.ebuild rename to sys-apps/nix/nix-1.11.6-r3.ebuild index c9c976b..d7eec9b 100644 --- a/sys-apps/nix/nix-1.11.6-r2.ebuild +++ b/sys-apps/nix/nix-1.11.6-r3.ebuild @@ -67,12 +67,12 @@ Next steps: " pkg_setup() { - enewgroup nixbld 30000 + enewgroup nixbld for i in {1..10}; do # we list 'nixbld' twice to # both assign a primary group for user # and add an user to /etc/group - enewuser nixbld${i} $((30000 +$i)) -1 /var/empty nixbld,nixbld + enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld done }