1 |
commit: b10038f9a6499045ae001c99921be6ea81fba4a4 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 7 07:52:26 2019 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 7 08:03:54 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b10038f9 |
7 |
|
8 |
sys-apps/nix: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
12 |
|
13 |
sys-apps/nix/Manifest | 2 - |
14 |
sys-apps/nix/nix-2.0.4.ebuild | 143 ------------------------------------------ |
15 |
sys-apps/nix/nix-2.1.3.ebuild | 142 ----------------------------------------- |
16 |
3 files changed, 287 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest |
19 |
index 5f5d2661d76..61c8f635ed0 100644 |
20 |
--- a/sys-apps/nix/Manifest |
21 |
+++ b/sys-apps/nix/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a |
24 |
-DIST nix-2.1.3.tar.xz 816396 BLAKE2B 9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760 SHA512 d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b |
25 |
DIST nix-2.2.2.tar.xz 818408 BLAKE2B f13bf79596d6292bea9897805421b388241d670f2b36bc13882f610901a9bb9aa1dc977d7a7d9314139791f20be38ca85becf5c4e863b22fc0b39503a7a4a079 SHA512 c8b1d5f246c53f13cfa25cba0d0721a2628329c10f67fcccbd9a55279cf475170a105156559d0a62638822a8e972f85e8a58769444d51f94ba15e2af7f90e220 |
26 |
DIST nix-2.3.tar.xz 844640 BLAKE2B 09707ae6c50c118375cdf2469a3ca19fbd940454bb80b7bccd74824deb3e370107acca99d7bf69bc93a168521a8d4928e3ac73fcfe1eeb53801d8e5f18574096 SHA512 45cb0c195f220a57cef80ad79def5e65b85588a2fc390f9b5e2ac4309698cc3065a23ee4f836913b642348afb1ee625072538bfedb5b26f9626344bbe784b425 |
27 |
|
28 |
diff --git a/sys-apps/nix/nix-2.0.4.ebuild b/sys-apps/nix/nix-2.0.4.ebuild |
29 |
deleted file mode 100644 |
30 |
index 26192138b60..00000000000 |
31 |
--- a/sys-apps/nix/nix-2.0.4.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,143 +0,0 @@ |
34 |
-# Copyright 1999-2019 Gentoo Authors |
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 s3 +sodium" |
49 |
- |
50 |
-RDEPEND=" |
51 |
- app-arch/brotli |
52 |
- app-arch/bzip2 |
53 |
- app-arch/xz-utils |
54 |
- dev-db/sqlite |
55 |
- dev-libs/openssl:0= |
56 |
- net-misc/curl |
57 |
- sys-libs/libseccomp |
58 |
- sys-libs/zlib |
59 |
- gc? ( dev-libs/boehm-gc[cxx] ) |
60 |
- doc? ( dev-libs/libxml2 |
61 |
- dev-libs/libxslt |
62 |
- app-text/docbook-xsl-stylesheets |
63 |
- ) |
64 |
- s3? ( dev-libs/aws-sdk-cpp ) |
65 |
- sodium? ( dev-libs/libsodium:0= ) |
66 |
-" |
67 |
-DEPEND="${RDEPEND} |
68 |
- >=sys-devel/bison-2.6 |
69 |
- >=sys-devel/flex-2.5.35 |
70 |
-" |
71 |
- |
72 |
-PATCHES=( |
73 |
- "${FILESDIR}"/${PN}-1.11.6-systemd.patch |
74 |
- "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch |
75 |
- "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch |
76 |
- "${FILESDIR}"/${PN}-2.0-user-path.patch |
77 |
- "${FILESDIR}"/${PN}-2.0.4-bdwgc-8.patch |
78 |
-) |
79 |
- |
80 |
-DISABLE_AUTOFORMATTING=yes |
81 |
-DOC_CONTENTS=" Quick start user guide on Gentoo: |
82 |
- |
83 |
-[as root] enable nix-daemon service: |
84 |
- [systemd] # systemctl enable nix-daemon |
85 |
- [openrc] # rc-update add nix-daemon |
86 |
-[as a user] relogin to get environment and profile update |
87 |
-[as a user] fetch nixpkgs update: |
88 |
- \$ nix-channel --update |
89 |
-[as a user] install nix packages: |
90 |
- \$ nix-env -i mc |
91 |
-[as a user] configure environment: |
92 |
- Somewhere in .bash_profile you might want to set |
93 |
- LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive |
94 |
- but please read https://github.com/NixOS/nixpkgs/issues/21820 |
95 |
- |
96 |
-Next steps: |
97 |
- nix package manager user manual: http://nixos.org/nix/manual/ |
98 |
-" |
99 |
- |
100 |
-pkg_setup() { |
101 |
- enewgroup nixbld |
102 |
- for i in {1..10}; do |
103 |
- # we list 'nixbld' twice to |
104 |
- # both assign a primary group for user |
105 |
- # and add a user to /etc/group |
106 |
- enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld |
107 |
- done |
108 |
-} |
109 |
- |
110 |
-src_prepare() { |
111 |
- default |
112 |
- |
113 |
- eautoreconf |
114 |
-} |
115 |
- |
116 |
-src_configure() { |
117 |
- local econf_args=() |
118 |
- |
119 |
- if ! use s3; then |
120 |
- # Disable automagic depend: bug #670256 |
121 |
- export ac_cv_header_aws_s3_S3Client_h=no |
122 |
- fi |
123 |
- |
124 |
- econf \ |
125 |
- --localstatedir="${EPREFIX}"/nix/var \ |
126 |
- $(use_enable gc) \ |
127 |
- "${args[@]}" |
128 |
-} |
129 |
- |
130 |
-src_compile() { |
131 |
- local make_vars=( |
132 |
- OPTIMIZE=0 # disable hardcoded -O3 |
133 |
- V=1 # verbose build |
134 |
- ) |
135 |
- emake "${make_vars[@]}" |
136 |
-} |
137 |
- |
138 |
-src_install() { |
139 |
- # TODO: emacs highlighter |
140 |
- default |
141 |
- |
142 |
- readme.gentoo_create_doc |
143 |
- |
144 |
- # here we use an eager variant of something that |
145 |
- # is lazily done by nix-daemon and root nix-env |
146 |
- |
147 |
- # TODO: will need a tweak for prefix |
148 |
- keepdir /nix/store |
149 |
- fowners root:nixbld /nix/store |
150 |
- fperms 1775 /nix/store |
151 |
- |
152 |
- keepdir /nix/var/nix/channel-cache |
153 |
- fperms 0777 /nix/var/nix/channel-cache |
154 |
- |
155 |
- keepdir /nix/var/nix/profiles/per-user |
156 |
- fperms 1777 /nix/var/nix/profiles/per-user |
157 |
- |
158 |
- # setup directories nix-daemon: /etc/profile.d/nix-daemon.sh |
159 |
- keepdir /nix/var/nix/gcroots/per-user |
160 |
- fperms 1777 /nix/var/nix/gcroots/per-user |
161 |
- |
162 |
- newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon |
163 |
- |
164 |
- if ! use etc_profile; then |
165 |
- rm "${ED}"/etc/profile.d/nix.sh || die |
166 |
- rm "${ED}"/etc/profile.d/nix-daemon.sh || die |
167 |
- fi |
168 |
-} |
169 |
- |
170 |
-pkg_postinst() { |
171 |
- if ! use etc_profile; then |
172 |
- ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)." |
173 |
- fi |
174 |
- |
175 |
- readme.gentoo_print_elog |
176 |
-} |
177 |
|
178 |
diff --git a/sys-apps/nix/nix-2.1.3.ebuild b/sys-apps/nix/nix-2.1.3.ebuild |
179 |
deleted file mode 100644 |
180 |
index d6e2b56ec29..00000000000 |
181 |
--- a/sys-apps/nix/nix-2.1.3.ebuild |
182 |
+++ /dev/null |
183 |
@@ -1,142 +0,0 @@ |
184 |
-# Copyright 1999-2019 Gentoo Authors |
185 |
-# Distributed under the terms of the GNU General Public License v2 |
186 |
- |
187 |
-EAPI=7 |
188 |
- |
189 |
-inherit autotools flag-o-matic readme.gentoo-r1 user |
190 |
- |
191 |
-DESCRIPTION="A purely functional package manager" |
192 |
-HOMEPAGE="https://nixos.org/nix" |
193 |
- |
194 |
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz" |
195 |
-LICENSE="LGPL-2.1" |
196 |
-SLOT="0" |
197 |
-KEYWORDS="~amd64 ~x86" |
198 |
-IUSE="+etc_profile +gc doc s3 +sodium" |
199 |
- |
200 |
-RDEPEND=" |
201 |
- app-arch/brotli |
202 |
- app-arch/bzip2 |
203 |
- app-arch/xz-utils |
204 |
- dev-db/sqlite |
205 |
- dev-libs/openssl:0= |
206 |
- >=dev-libs/boost-1.66:0=[context] |
207 |
- net-misc/curl |
208 |
- sys-libs/libseccomp |
209 |
- sys-libs/zlib |
210 |
- gc? ( dev-libs/boehm-gc[cxx] ) |
211 |
- doc? ( dev-libs/libxml2 |
212 |
- dev-libs/libxslt |
213 |
- app-text/docbook-xsl-stylesheets |
214 |
- ) |
215 |
- s3? ( dev-libs/aws-sdk-cpp ) |
216 |
- sodium? ( dev-libs/libsodium:0= ) |
217 |
-" |
218 |
-DEPEND="${RDEPEND} |
219 |
- >=sys-devel/bison-2.6 |
220 |
- >=sys-devel/flex-2.5.35 |
221 |
-" |
222 |
- |
223 |
-PATCHES=( |
224 |
- "${FILESDIR}"/${PN}-1.11.6-systemd.patch |
225 |
- "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch |
226 |
- "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch |
227 |
- "${FILESDIR}"/${PN}-2.0-user-path.patch |
228 |
-) |
229 |
- |
230 |
-DISABLE_AUTOFORMATTING=yes |
231 |
-DOC_CONTENTS=" Quick start user guide on Gentoo: |
232 |
- |
233 |
-[as root] enable nix-daemon service: |
234 |
- [systemd] # systemctl enable nix-daemon |
235 |
- [openrc] # rc-update add nix-daemon |
236 |
-[as a user] relogin to get environment and profile update |
237 |
-[as a user] fetch nixpkgs update: |
238 |
- \$ nix-channel --update |
239 |
-[as a user] install nix packages: |
240 |
- \$ nix-env -i mc |
241 |
-[as a user] configure environment: |
242 |
- Somewhere in .bash_profile you might want to set |
243 |
- LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive |
244 |
- but please read https://github.com/NixOS/nixpkgs/issues/21820 |
245 |
- |
246 |
-Next steps: |
247 |
- nix package manager user manual: http://nixos.org/nix/manual/ |
248 |
-" |
249 |
- |
250 |
-pkg_setup() { |
251 |
- enewgroup nixbld |
252 |
- for i in {1..10}; do |
253 |
- # we list 'nixbld' twice to |
254 |
- # both assign a primary group for user |
255 |
- # and add a user to /etc/group |
256 |
- enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld |
257 |
- done |
258 |
-} |
259 |
- |
260 |
-src_prepare() { |
261 |
- default |
262 |
- |
263 |
- eautoreconf |
264 |
-} |
265 |
- |
266 |
-src_configure() { |
267 |
- local econf_args=() |
268 |
- |
269 |
- if ! use s3; then |
270 |
- # Disable automagic depend: bug #670256 |
271 |
- export ac_cv_header_aws_s3_S3Client_h=no |
272 |
- fi |
273 |
- econf \ |
274 |
- --localstatedir="${EPREFIX}"/nix/var \ |
275 |
- $(use_enable gc) \ |
276 |
- "${args[@]}" |
277 |
-} |
278 |
- |
279 |
-src_compile() { |
280 |
- local make_vars=( |
281 |
- OPTIMIZE=0 # disable hardcoded -O3 |
282 |
- V=1 # verbose build |
283 |
- ) |
284 |
- emake "${make_vars[@]}" |
285 |
-} |
286 |
- |
287 |
-src_install() { |
288 |
- # TODO: emacs highlighter |
289 |
- default |
290 |
- |
291 |
- readme.gentoo_create_doc |
292 |
- |
293 |
- # here we use an eager variant of something that |
294 |
- # is lazily done by nix-daemon and root nix-env |
295 |
- |
296 |
- # TODO: will need a tweak for prefix |
297 |
- keepdir /nix/store |
298 |
- fowners root:nixbld /nix/store |
299 |
- fperms 1775 /nix/store |
300 |
- |
301 |
- keepdir /nix/var/nix/channel-cache |
302 |
- fperms 0777 /nix/var/nix/channel-cache |
303 |
- |
304 |
- keepdir /nix/var/nix/profiles/per-user |
305 |
- fperms 1777 /nix/var/nix/profiles/per-user |
306 |
- |
307 |
- # setup directories nix-daemon: /etc/profile.d/nix-daemon.sh |
308 |
- keepdir /nix/var/nix/gcroots/per-user |
309 |
- fperms 1777 /nix/var/nix/gcroots/per-user |
310 |
- |
311 |
- newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon |
312 |
- |
313 |
- if ! use etc_profile; then |
314 |
- rm "${ED}"/etc/profile.d/nix.sh || die |
315 |
- rm "${ED}"/etc/profile.d/nix-daemon.sh || die |
316 |
- fi |
317 |
-} |
318 |
- |
319 |
-pkg_postinst() { |
320 |
- if ! use etc_profile; then |
321 |
- ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to USE=-etc_profile)." |
322 |
- fi |
323 |
- |
324 |
- readme.gentoo_print_elog |
325 |
-} |