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