public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/
Date: Thu, 10 Oct 2019 22:35:08 +0000 (UTC)	[thread overview]
Message-ID: <1570746880.4941639439d99ab7452524f59ac55c6eb4cc7d41.slyfox@gentoo> (raw)

commit:     4941639439d99ab7452524f59ac55c6eb4cc7d41
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 22:34:40 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 22:34:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49416394

sys-apps/nix: bump up to 2.3.1

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-apps/nix/Manifest         |   1 +
 sys-apps/nix/nix-2.3.1.ebuild | 137 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 61c8f635ed0..ea731077030 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,2 +1,3 @@
 DIST nix-2.2.2.tar.xz 818408 BLAKE2B f13bf79596d6292bea9897805421b388241d670f2b36bc13882f610901a9bb9aa1dc977d7a7d9314139791f20be38ca85becf5c4e863b22fc0b39503a7a4a079 SHA512 c8b1d5f246c53f13cfa25cba0d0721a2628329c10f67fcccbd9a55279cf475170a105156559d0a62638822a8e972f85e8a58769444d51f94ba15e2af7f90e220
+DIST nix-2.3.1.tar.xz 844608 BLAKE2B a5c8e97aad8bd8dea644f8aa04665cc078a69c7203891c469900ca1b1450a5714281209235bcaedbc6f3f128e0c11aff41850f3b0815ef657e13de3364ff0188 SHA512 791c377082cf8dd17a24d927caa4127eeb20bd03d479424861928437eb352cb4650beb7f36d92d85ce6a7404f4fbfc5a36a342d09061e88dbafd1b51463eb15f
 DIST nix-2.3.tar.xz 844640 BLAKE2B 09707ae6c50c118375cdf2469a3ca19fbd940454bb80b7bccd74824deb3e370107acca99d7bf69bc93a168521a8d4928e3ac73fcfe1eeb53801d8e5f18574096 SHA512 45cb0c195f220a57cef80ad79def5e65b85588a2fc390f9b5e2ac4309698cc3065a23ee4f836913b642348afb1ee625072538bfedb5b26f9626344bbe784b425

diff --git a/sys-apps/nix/nix-2.3.1.ebuild b/sys-apps/nix/nix-2.3.1.ebuild
new file mode 100644
index 00000000000..bbfe27eb976
--- /dev/null
+++ b/sys-apps/nix/nix-2.3.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic 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 s3 +sodium"
+
+# sys-apps/busybox is needed for sandbox mount of /bin/sh
+RDEPEND="
+	app-arch/brotli
+	app-arch/bzip2
+	app-arch/xz-utils
+	sys-apps/busybox[static]
+	dev-db/sqlite
+	dev-libs/editline:0=
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.66:0=[context]
+	net-misc/curl
+	sys-libs/libseccomp
+	sys-libs/zlib
+	gc? ( dev-libs/boehm-gc[cxx] )
+	doc? ( dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	s3? ( dev-libs/aws-sdk-cpp )
+	sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-2.6
+	>=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-libpaths.patch
+	"${FILESDIR}"/${PN}-2.3-bootstrap.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 a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+	\$ nix-channel --update
+[as a user] install nix packages:
+	\$ nix-env -i mc
+[as a 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
+	for i in {1..10}; do
+		# we list 'nixbld' twice to
+		# both assign a primary group for user
+		# and add a user to /etc/group
+		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+	done
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	if ! use s3; then
+		# Disable automagic depend: bug #670256
+		export ac_cv_header_aws_s3_S3Client_h=no
+	fi
+	econf \
+		--localstatedir="${EPREFIX}"/nix/var \
+		$(use_enable gc) \
+		--with-sandbox-shell=/bin/busybox
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	# TODO: emacs highlighter
+	default
+
+	readme.gentoo_create_doc
+
+	# here we use an eager variant of something that
+	# is lazily done by nix-daemon 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/channel-cache
+	fperms 0777         /nix/var/nix/channel-cache
+
+	keepdir             /nix/var/nix/profiles/per-user
+	fperms 1777         /nix/var/nix/profiles/per-user
+
+	# 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
+}
+
+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
+}


             reply	other threads:[~2019-10-10 22:35 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-10 22:35 Sergei Trofimovich [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-10-13 11:57 [gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/ Sergei Trofimovich
2019-10-10 22:35 Sergei Trofimovich
2019-09-20 22:44 Sergei Trofimovich
2019-09-07  8:03 Sergei Trofimovich
2019-08-11 11:20 David Seifert
2019-06-30 20:35 Sergei Trofimovich
2019-06-30 20:35 Sergei Trofimovich
2019-05-15  7:21 Sergei Trofimovich
2019-04-26 15:47 Sergei Trofimovich
2019-02-11 23:36 Sergei Trofimovich
2019-01-12 12:59 Sergei Trofimovich
2018-11-04 22:50 Sergei Trofimovich
2018-10-02 21:29 Sergei Trofimovich
2018-10-02 21:29 Sergei Trofimovich
2018-09-19 22:59 Sergei Trofimovich
2018-09-19 22:59 Sergei Trofimovich
2018-09-06 22:37 Sergei Trofimovich
2018-09-06 22:37 Sergei Trofimovich
2018-09-04  8:19 Sergei Trofimovich
2018-06-08 15:31 Sergei Trofimovich
2018-06-08 15:31 Sergei Trofimovich
2018-05-04 22:24 Sergei Trofimovich
2018-04-20 22:16 Sergei Trofimovich
2017-12-21  8:01 Sergei Trofimovich
2017-09-15 20:50 Sergei Trofimovich
2017-09-15 20:50 Sergei Trofimovich
2017-07-18 20:15 Sergei Trofimovich
2017-07-18 20:15 Sergei Trofimovich
2017-07-13 18:42 Sergei Trofimovich
2017-06-19 20:27 Sergei Trofimovich
2017-06-12 21:23 Sergei Trofimovich
2017-05-07 13:10 Michał Górny
2017-05-07 11:22 Sergei Trofimovich
2017-05-07 11:22 Sergei Trofimovich
2017-04-17 17:38 Sergei Trofimovich
2017-02-02 21:18 Sergei Trofimovich
2017-02-01 22:18 Sergei Trofimovich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1570746880.4941639439d99ab7452524f59ac55c6eb4cc7d41.slyfox@gentoo \
    --to=slyfox@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox