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