Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/
Date: Tue, 18 Jul 2017 20:15:25
Message-Id: 1500408917.85eebb177aea25f8ac8f25b051aba6a77ba63c13.slyfox@gentoo
1 commit: 85eebb177aea25f8ac8f25b051aba6a77ba63c13
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 18 20:14:56 2017 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 18 20:15:17 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85eebb17
7
8 sys-apps/nix: drop old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 sys-apps/nix/Manifest | 2 -
13 sys-apps/nix/nix-1.11.10.ebuild | 130 ----------------------------------------
14 sys-apps/nix/nix-1.11.9.ebuild | 129 ---------------------------------------
15 3 files changed, 261 deletions(-)
16
17 diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
18 index 16ebdebdda4..7e6ea0a73e8 100644
19 --- a/sys-apps/nix/Manifest
20 +++ b/sys-apps/nix/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST nix-1.11.10.tar.xz 624972 SHA256 b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467 SHA512 dae5293092f80a723ade12317a7c86a286e4ec19ea4422010b24fbfd9b68d6d3ddbce1af6efe34869dae98a02697afca0bad66c7363c09e54a3da02534a45f14 WHIRLPOOL 375becabfb1ef4d779a173fc1c3dc6f1df3a08d7abb4c4320cfa33bf993e458700462ac7f721f5677cc91bf01c09ebea9c6b7a0d86859fcbb627f565e4e46d70
23 DIST nix-1.11.11.tar.xz 625248 SHA256 f5b9da21fb412e4c35b6e2bc771cfbf4ca44746be5d99868ff29d6e7604760e5 SHA512 b4652755860637dae0eacab3c536c43bb835614a802fd0bcc606f6140ae3f5c4db312d30ecb20dad62732d47cafb8101a8760b321be5ec4b331f298c59a79e4e WHIRLPOOL d4d8fc1d868832a9a0ca131bf26cfdd566279be00b56cd40d6e3035935dbdb55d5a77e460e96e77636b60542cd085ccd4e97e15f3c219ddf794b67eb3f3fd2d5
24 DIST nix-1.11.12.tar.xz 631940 SHA256 02e8d85cfc02494fb04c90d8443dfea433639b9f787989b18f54567fd9769dd2 SHA512 fc2a06841cfa70c2d0b69315b0b8e30530e1b982e8a6b72e8f41c84db4efe7fc89738dce97f356f47d28518860990870fd54eb688704c531ba08231d2a3dd012 WHIRLPOOL b99e213e68cd479f9b6f8104e5f328c9bc409883aa1a88c155acf3f0a49ee95981f1774eff0d803b21182c0a087434a2910a9631dcaa97aae1847697473b27ea
25 DIST nix-1.11.13.tar.xz 632224 SHA256 0913975e262f8069fde6e71a5fae757bb3aef558c51d1711034c525146ea5913 SHA512 7244b49a7c7416e6ecc7754abcf48028d650510ac27f26701ccc3954660e26ad8b083fdc4ae07de718d3df49ca2a6af3bf3261d537e962a90233f87b13cd1606 WHIRLPOOL a4af739a21e6080fccdfc885c24833e08765fae450fc7833484843f97fee7a4087619f67328075026b55efeda01a9cbf6bf80eb9918bdbbcee96414ee28d363c
26 -DIST nix-1.11.9.tar.xz 623020 SHA256 0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1 SHA512 1e557d61261f958f7fa94510e88c8d34c8ed7b237427a036cdc461aceff4eb34b8e0cdd859fa14c2e392f9094a489bfc663e3043df8bd22651aa42f809caba97 WHIRLPOOL 1bd56f99da5f7ea427c3afc0170f37aa4ffcb58d8f2c3fc4915e08c95f67745a4b7a0943116c1beae2f67155806c7a5c56deadaeaed7ff3ab17d7c59235df580
27
28 diff --git a/sys-apps/nix/nix-1.11.10.ebuild b/sys-apps/nix/nix-1.11.10.ebuild
29 deleted file mode 100644
30 index f8b026b00b9..00000000000
31 --- a/sys-apps/nix/nix-1.11.10.ebuild
32 +++ /dev/null
33 @@ -1,130 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit autotools flag-o-matic readme.gentoo-r1 user
40 -
41 -DESCRIPTION="A purely functional package manager"
42 -HOMEPAGE="https://nixos.org/nix"
43 -
44 -SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
45 -LICENSE="LGPL-2.1"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~x86"
48 -IUSE="+etc_profile +gc doc sodium"
49 -
50 -RDEPEND="
51 - app-arch/bzip2
52 - app-arch/xz-utils
53 - dev-db/sqlite
54 - dev-libs/openssl:0=
55 - net-misc/curl
56 - sys-libs/libseccomp
57 - sys-libs/zlib
58 - gc? ( dev-libs/boehm-gc[cxx] )
59 - doc? ( dev-libs/libxml2
60 - dev-libs/libxslt
61 - app-text/docbook-xsl-stylesheets
62 - )
63 - sodium? ( dev-libs/libsodium )
64 - dev-lang/perl:=
65 - dev-perl/DBD-SQLite
66 - dev-perl/WWW-Curl
67 - dev-perl/DBI
68 -"
69 -DEPEND="${RDEPEND}
70 - >=sys-devel/bison-2.6
71 - >=sys-devel/flex-2.5.35
72 - virtual/perl-ExtUtils-ParseXS
73 -"
74 -
75 -PATCHES=(
76 - "${FILESDIR}"/${PN}-1.11.6-systemd.patch
77 - "${FILESDIR}"/${PN}-1.11.6-per-user.patch
78 - "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
79 - "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
80 -)
81 -
82 -DISABLE_AUTOFORMATTING=yes
83 -DOC_CONTENTS=" Quick start user guide on Gentoo:
84 -
85 -[as root] enable nix-daemon service:
86 - [systemd] # systemctl enable nix-daemon
87 - [openrc] # rc-update add nix-daemon
88 -[as a user] relogin to get environment and profile update
89 -[as a user] fetch nixpkgs update:
90 - \$ nix-channel --update
91 -[as a user] install nix packages:
92 - \$ nix-env -i mc
93 -[as a user] configure environment:
94 - Somewhere in .bash_profile you might want to set
95 - LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
96 - but please read https://github.com/NixOS/nixpkgs/issues/21820
97 -
98 -Next steps:
99 - nix package manager user manual: http://nixos.org/nix/manual/
100 -"
101 -
102 -pkg_setup() {
103 - enewgroup nixbld
104 - for i in {1..10}; do
105 - # we list 'nixbld' twice to
106 - # both assign a primary group for user
107 - # and add a user to /etc/group
108 - enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
109 - done
110 -}
111 -
112 -src_prepare() {
113 - default
114 -
115 - eautoreconf
116 -}
117 -
118 -src_configure() {
119 - econf \
120 - --localstatedir="${EPREFIX}"/nix/var \
121 - $(use_enable gc)
122 -}
123 -
124 -src_compile() {
125 - local make_vars=(
126 - OPTIMIZE=0 # disable hardcoded -O3
127 - V=1 # verbose build
128 - )
129 - emake "${make_vars[@]}"
130 -}
131 -
132 -src_install() {
133 - # TODO: emacs highlighter
134 - default
135 -
136 - readme.gentoo_create_doc
137 -
138 - # here we use an eager variant of something that
139 - # is lazily done by nix-daemon and root nix-env
140 -
141 - # TODO: will need a tweak for prefix
142 - keepdir /nix/store
143 - fowners root:nixbld /nix/store
144 - fperms 1775 /nix/store
145 -
146 - keepdir /nix/var/nix/profiles/per-user
147 - fperms 1777 /nix/var/nix/profiles/per-user
148 -
149 - doenvd "${FILESDIR}"/60nix-remote-daemon
150 - newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
151 -
152 - if ! use etc_profile; then
153 - rm "${ED}"/etc/profile.d/nix.sh || die
154 - fi
155 -}
156 -
157 -pkg_postinst() {
158 - if ! use etc_profile; then
159 - ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
160 - fi
161 -
162 - readme.gentoo_print_elog
163 -}
164
165 diff --git a/sys-apps/nix/nix-1.11.9.ebuild b/sys-apps/nix/nix-1.11.9.ebuild
166 deleted file mode 100644
167 index c19c57bbdf8..00000000000
168 --- a/sys-apps/nix/nix-1.11.9.ebuild
169 +++ /dev/null
170 @@ -1,129 +0,0 @@
171 -# Copyright 1999-2017 Gentoo Foundation
172 -# Distributed under the terms of the GNU General Public License v2
173 -
174 -EAPI=6
175 -
176 -inherit autotools flag-o-matic readme.gentoo-r1 user
177 -
178 -DESCRIPTION="A purely functional package manager"
179 -HOMEPAGE="https://nixos.org/nix"
180 -
181 -SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
182 -LICENSE="LGPL-2.1"
183 -SLOT="0"
184 -KEYWORDS="~amd64 ~x86"
185 -IUSE="+etc_profile +gc doc sodium"
186 -
187 -RDEPEND="
188 - app-arch/bzip2
189 - app-arch/xz-utils
190 - dev-db/sqlite
191 - dev-libs/openssl:0=
192 - net-misc/curl
193 - sys-libs/zlib
194 - gc? ( dev-libs/boehm-gc[cxx] )
195 - doc? ( dev-libs/libxml2
196 - dev-libs/libxslt
197 - app-text/docbook-xsl-stylesheets
198 - )
199 - sodium? ( dev-libs/libsodium )
200 - dev-lang/perl:=
201 - dev-perl/DBD-SQLite
202 - dev-perl/WWW-Curl
203 - dev-perl/DBI
204 -"
205 -DEPEND="${RDEPEND}
206 - >=sys-devel/bison-2.6
207 - >=sys-devel/flex-2.5.35
208 - virtual/perl-ExtUtils-ParseXS
209 -"
210 -
211 -PATCHES=(
212 - "${FILESDIR}"/${PN}-1.11.6-systemd.patch
213 - "${FILESDIR}"/${PN}-1.11.6-per-user.patch
214 - "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
215 - "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
216 -)
217 -
218 -DISABLE_AUTOFORMATTING=yes
219 -DOC_CONTENTS=" Quick start user guide on Gentoo:
220 -
221 -[as root] enable nix-daemon service:
222 - [systemd] # systemctl enable nix-daemon
223 - [openrc] # rc-update add nix-daemon
224 -[as a user] relogin to get environment and profile update
225 -[as a user] fetch nixpkgs update:
226 - \$ nix-channel --update
227 -[as a user] install nix packages:
228 - \$ nix-env -i mc
229 -[as a user] configure environment:
230 - Somewhere in .bash_profile you might want to set
231 - LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
232 - but please read https://github.com/NixOS/nixpkgs/issues/21820
233 -
234 -Next steps:
235 - nix package manager user manual: http://nixos.org/nix/manual/
236 -"
237 -
238 -pkg_setup() {
239 - enewgroup nixbld
240 - for i in {1..10}; do
241 - # we list 'nixbld' twice to
242 - # both assign a primary group for user
243 - # and add a user to /etc/group
244 - enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
245 - done
246 -}
247 -
248 -src_prepare() {
249 - default
250 -
251 - eautoreconf
252 -}
253 -
254 -src_configure() {
255 - econf \
256 - --localstatedir="${EPREFIX}"/nix/var \
257 - $(use_enable gc)
258 -}
259 -
260 -src_compile() {
261 - local make_vars=(
262 - OPTIMIZE=0 # disable hardcoded -O3
263 - V=1 # verbose build
264 - )
265 - emake "${make_vars[@]}"
266 -}
267 -
268 -src_install() {
269 - # TODO: emacs highlighter
270 - default
271 -
272 - readme.gentoo_create_doc
273 -
274 - # here we use an eager variant of something that
275 - # is lazily done by nix-daemon and root nix-env
276 -
277 - # TODO: will need a tweak for prefix
278 - keepdir /nix/store
279 - fowners root:nixbld /nix/store
280 - fperms 1775 /nix/store
281 -
282 - keepdir /nix/var/nix/profiles/per-user
283 - fperms 1777 /nix/var/nix/profiles/per-user
284 -
285 - doenvd "${FILESDIR}"/60nix-remote-daemon
286 - newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
287 -
288 - if ! use etc_profile; then
289 - rm "${ED}"/etc/profile.d/nix.sh || die
290 - fi
291 -}
292 -
293 -pkg_postinst() {
294 - if ! use etc_profile; then
295 - ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
296 - fi
297 -
298 - readme.gentoo_print_elog
299 -}