* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2017-02-02 21:15 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2017-02-02 21:15 UTC (permalink / raw
To: gentoo-commits
commit: e6d632b3e0c1aa62f7e076131347c1f6bf6cff24
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 21:15:18 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Feb 2 21:15:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6d632b3
sys-apps/guix: make ebuild FEATURES=network-sandbox friendly, bug #607988
In order to shrink tarball size guix does not ship
prebuilt guile for supported targets. Instead it
downloaded those binaries and verified hashes in
gnu/local.mk file.
Fix it by pulling all external dependencies into SRC_URI.
Found by Toralf Förster on a tinderbox with FEATURES=network-sandbox
While at it disabled parallel builds as it occasionally
causes guile to run bad code.
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/607988
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-apps/guix/Manifest | 4 ++++
sys-apps/guix/guix-0.12.0-r1.ebuild | 42 ++++++++++++++++++++++++++++++++++++-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 1cef361..e4df132 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1 +1,5 @@
DIST guix-0.12.0.tar.gz 15823786 SHA256 6201e21186a7098af256d97562662d95353b1047799b9b216e1dd6e7692dfec9 SHA512 d61cb289d3773977400fa3c49869f30a3feb5e0364368017b9b8eaadee814c5c31897be398d6ff142349337334eb51cb6d0354bee27c0365de69ce1a09e858d3 WHIRLPOOL 9515967a05a449f24da49e95340a60fb91cc471fcc532ce6cfaaea82c9161e3a65a1adc4d95e9997f019565243ca385845edc484981adfc5956112092687a0ec
+DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 SHA256 e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6 SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337 WHIRLPOOL c8aa4c4743768477d3a495fbdbe9d4818e9860411f4df73843a149c8659105f921501d0a5dfc2d121fa872a23f543174c84f864dce1eff69d175c456bdb5efb9
+DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 SHA256 b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c WHIRLPOOL 270f3602e8ea10f28ab003aed28b3d19ab971c69029d1d71f7fe9601d5120222baf245e3e48910dbeedf1469227d59beb8190f23bdd2ef070390467e3f49b8c9
+DIST guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2734180 SHA256 994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b SHA512 8c4be098a31f63d56e7d35c174ce4095ba8317662c365d44c005980b38ba499461926754a4659e699ab271bb841c9da514f1a36b812d881c212a5f12177d73c0 WHIRLPOOL f247e65cc558057ba65aa7c554f07d9ec76de2fcc4828038b1d1d89b8c5449a803fd7942812e85fced8200f1af5d981b5cff7fa53cd026335c0ba906ced251f4
+DIST guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2885996 SHA256 037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0 SHA512 96efc583f42f6c7647bc026e2d2a96d603e7bea12ca02f6bcc65e819b9966082ac4c9f7e42f64536ff42a988e4766e695d87a82c73dd97d80745975a05badb23 WHIRLPOOL 61b623c961dc3b9f4c59f4d208c1302ea98d640b915cc53dce90551c3f48f9844381bb674d4d835421a44a71d903dc90c38a0f7a17ccc049ec388a4e948239b6
diff --git a/sys-apps/guix/guix-0.12.0-r1.ebuild b/sys-apps/guix/guix-0.12.0-r1.ebuild
index 104b21d..1cdbf8f 100644
--- a/sys-apps/guix/guix-0.12.0-r1.ebuild
+++ b/sys-apps/guix/guix-0.12.0-r1.ebuild
@@ -9,7 +9,40 @@ inherit autotools readme.gentoo-r1 user
DESCRIPTION="GNU package manager (nix sibling)"
HOMEPAGE="https://www.gnu.org/software/guix/"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
+# taken from gnu/local.mk
+BOOT_GUILE=(
+ "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ "i686-linux 20131110 guile-2.0.9.tar.xz"
+ "mips64el-linux 20131110 guile-2.0.9.tar.xz"
+ "x86_64-linux 20131110 guile-2.0.9.tar.xz"
+)
+
+binary_src_uris() {
+ local system_date_guilep uri
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
+ # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
+ echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
+ done
+}
+
+# copy bootstrap binaries from DISTDIR to ${S}
+copy_boot_guile_binaries() {
+ local system_date_guilep
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
+ done
+}
+
+SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
+ $(binary_src_uris)"
+
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
@@ -65,11 +98,18 @@ pkg_setup() {
}
src_prepare() {
+ copy_boot_guile_binaries
+
default
eautoreconf
}
+src_compile() {
+ # guile occasionally fails with 'bad address'
+ emake -j1
+}
+
src_install() {
# TODO: emacs highlighter
default
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2017-02-02 21:18 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2017-02-02 21:18 UTC (permalink / raw
To: gentoo-commits
commit: 36135c29520f8b775060b41a9ac894d0daa5fcd1
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 21:18:03 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Feb 2 21:18:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36135c29
sys-apps/guix: change maintainer from haskell <AT> g.o to slyfox@g.o
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-apps/guix/metadata.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-apps/guix/metadata.xml b/sys-apps/guix/metadata.xml
index b787881..c529899 100644
--- a/sys-apps/guix/metadata.xml
+++ b/sys-apps/guix/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
+ <maintainer type="person">
+ <email>slyfox@gentoo.org</email>
+ <name>Sergei Trofimovich</name>
</maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2017-02-08 22:05 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2017-02-08 22:05 UTC (permalink / raw
To: gentoo-commits
commit: ddd177639dfede578d97a4dba8d3526ac6cfcb02
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 8 21:49:40 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 22:05:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd17763
sys-apps/guix: fix 'localstatedir' to poin to /var/guix
The path is used by /gnu/store binaries and is expected
location for ebuild itself.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-apps/guix/{guix-0.12.0-r1.ebuild => guix-0.12.0-r2.ebuild} | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/sys-apps/guix/guix-0.12.0-r1.ebuild b/sys-apps/guix/guix-0.12.0-r2.ebuild
similarity index 95%
rename from sys-apps/guix/guix-0.12.0-r1.ebuild
rename to sys-apps/guix/guix-0.12.0-r2.ebuild
index 1cdbf8f156..5acef29608 100644
--- a/sys-apps/guix/guix-0.12.0-r1.ebuild
+++ b/sys-apps/guix/guix-0.12.0-r2.ebuild
@@ -97,6 +97,12 @@ pkg_setup() {
done
}
+src_configure() {
+ # to be compatible with guix from /gnu/store
+ econf \
+ --localstatedir="${EPREFIX}"/var
+}
+
src_prepare() {
copy_boot_guile_binaries
@@ -116,6 +122,7 @@ src_install() {
readme.gentoo_create_doc
+ keepdir /etc/guix
# TODO: will need a tweak for prefix
keepdir /gnu/store
fowners root:guixbuild /gnu/store
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2017-04-22 11:30 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2017-04-22 11:30 UTC (permalink / raw
To: gentoo-commits
commit: 0617e82fe44d635e2a4dc34878bfd139840dd96c
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 11:29:49 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 11:30:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0617e82f
sys-apps/guix: add dev-scheme/guile-json to DEPENDs
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sys-apps/guix/{guix-0.12.0-r2.ebuild => guix-0.12.0-r3.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-apps/guix/guix-0.12.0-r2.ebuild b/sys-apps/guix/guix-0.12.0-r3.ebuild
similarity index 99%
rename from sys-apps/guix/guix-0.12.0-r2.ebuild
rename to sys-apps/guix/guix-0.12.0-r3.ebuild
index a1ae6f6727b..8437139191d 100644
--- a/sys-apps/guix/guix-0.12.0-r2.ebuild
+++ b/sys-apps/guix/guix-0.12.0-r3.ebuild
@@ -52,6 +52,7 @@ RESTRICT=test # complains about size of config.log and refuses to start tests
RDEPEND="
dev-libs/libgcrypt:0=
>=dev-scheme/guile-2
+ dev-scheme/guile-json
sys-libs/zlib
app-arch/bzip2
dev-db/sqlite
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2017-05-07 13:10 Michał Górny
0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2017-05-07 13:10 UTC (permalink / raw
To: gentoo-commits
commit: aa8677a8cbb029221be19b25b08fe8cdc9f24eb3
Author: kballou <kballou <AT> devnulllabs <DOT> io>
AuthorDate: Wed Apr 26 20:52:04 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 7 13:10:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa8677a8
sys-apps/guix: Fix small grammar issues in doc contents
Closes: https://github.com/gentoo/gentoo/pull/4493
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-apps/guix/guix-0.12.0-r3.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-apps/guix/guix-0.12.0-r3.ebuild b/sys-apps/guix/guix-0.12.0-r3.ebuild
index 8437139191d..7002f0e94d0 100644
--- a/sys-apps/guix/guix-0.12.0-r3.ebuild
+++ b/sys-apps/guix/guix-0.12.0-r3.ebuild
@@ -76,10 +76,10 @@ DOC_CONTENTS="Quick start user guide on Gentoo:
[as root] enable guix-daemon service:
[systemd] # systemctl enable guix-daemon
[openrc] # rc-update add guix-daemon
-[as an user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
-[as an user] install guix packages:
+[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
+[as a user] install guix packages:
\$ guix package -i hello
-[as an user] configure environment:
+[as a user] configure environment:
Somewhere in .bash_profile you might want to set
export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
@@ -92,7 +92,7 @@ pkg_setup() {
for i in {1..10}; do
# we list 'guixbuild' twice to
# both assign a primary group for user
- # and add an user to /etc/group
+ # and add a user to /etc/group
enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
done
}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2017-05-08 20:17 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2017-05-08 20:17 UTC (permalink / raw
To: gentoo-commits
commit: c113f1ebdfc7ba5e0518247561ea26262233ef34
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon May 8 20:17:23 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon May 8 20:17:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c113f1eb
sys-apps/guix: require USE="regex networking threads" from guile, bug #617874
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/show_bug.cgi?id=617874
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sys-apps/guix/guix-0.12.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/guix/guix-0.12.0-r3.ebuild b/sys-apps/guix/guix-0.12.0-r3.ebuild
index 7002f0e94d0..3aea5c64be8 100644
--- a/sys-apps/guix/guix-0.12.0-r3.ebuild
+++ b/sys-apps/guix/guix-0.12.0-r3.ebuild
@@ -51,7 +51,7 @@ RESTRICT=test # complains about size of config.log and refuses to start tests
RDEPEND="
dev-libs/libgcrypt:0=
- >=dev-scheme/guile-2
+ >=dev-scheme/guile-2[regex,networking,threads]
dev-scheme/guile-json
sys-libs/zlib
app-arch/bzip2
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2017-07-15 11:29 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2017-07-15 11:29 UTC (permalink / raw
To: gentoo-commits
commit: 031759cc08e31936f9f5b9d03d2a6372c21236e5
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 11:01:50 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 11:29:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031759cc
sys-apps/guix: run automake from src_prepare, bug #625166
guix build system is very eager to run automake on
minor changes in .in files and breaks.
Run 'automake' unconditionally in src_prepare() to
workaround the failure.
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/625166
Package-Manager: Portage-2.3.6, Repoman-2.3.2
sys-apps/guix/guix-0.13.0.ebuild | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/sys-apps/guix/guix-0.13.0.ebuild b/sys-apps/guix/guix-0.13.0.ebuild
index cedb13c2759..54b553a520c 100644
--- a/sys-apps/guix/guix-0.13.0.ebuild
+++ b/sys-apps/guix/guix-0.13.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit readme.gentoo-r1 user
+inherit autotools readme.gentoo-r1 user
DESCRIPTION="GNU package manager (nix sibling)"
HOMEPAGE="https://www.gnu.org/software/guix/"
@@ -96,16 +96,18 @@ pkg_setup() {
done
}
-src_configure() {
- # to be compatible with guix from /gnu/store
- econf \
- --localstatedir="${EPREFIX}"/var
-}
-
src_prepare() {
copy_boot_guile_binaries
default
+ # build system is very eager to run automake itself: bug #625166
+ eautomake
+}
+
+src_configure() {
+ # to be compatible with guix from /gnu/store
+ econf \
+ --localstatedir="${EPREFIX}"/var
}
src_compile() {
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2017-12-03 18:24 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2017-12-03 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 1bb2ae1d9f2d908914e1f0bbb4754b722e5f9c58
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 18:23:36 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 18:23:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb2ae1d
sys-apps/guix: pin to guile subslot
Even though guix works against runtime guile-2.2
when built against-guile-2.0 it becomes very slow
because it has to discard all precompiled files.
Package-Manager: Portage-2.3.16, Repoman-2.3.6
sys-apps/guix/Manifest | 14 +++++++-------
.../guix/{guix-0.13.0.ebuild => guix-0.13.0-r1.ebuild} | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index e15e1eb103f..73c4b6ccf56 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,7 +1,7 @@
-DIST guix-0.12.0.tar.gz 15823786 SHA256 6201e21186a7098af256d97562662d95353b1047799b9b216e1dd6e7692dfec9 SHA512 d61cb289d3773977400fa3c49869f30a3feb5e0364368017b9b8eaadee814c5c31897be398d6ff142349337334eb51cb6d0354bee27c0365de69ce1a09e858d3 WHIRLPOOL 9515967a05a449f24da49e95340a60fb91cc471fcc532ce6cfaaea82c9161e3a65a1adc4d95e9997f019565243ca385845edc484981adfc5956112092687a0ec
-DIST guix-0.13.0.tar.gz 18490387 SHA256 b28d52c25ba2fff53be51d7b0027f69ca52416c26b4a0100a40221b73d63a3be SHA512 39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf WHIRLPOOL 365b1a74fe63bbb30605b13697d13703cbc10d12af925baefedb74d0694329ca1219630b9931e07394404c41c79d48554b61af57d408d0bdfa753e4055e0093a
-DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 SHA256 3939909f24dcb955621aa7f81ecde6844bea8a083969c2d275c55699af123ebe SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27 WHIRLPOOL 12c7a27f1fcc6491f95fb663bf630b844a33068460a71827cf67e2cfb579ba4021d7cc41b151b4d9073a9ec3b1406688426c8d8b998163b2e01ad473a0b16b96
-DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 SHA256 e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6 SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337 WHIRLPOOL c8aa4c4743768477d3a495fbdbe9d4818e9860411f4df73843a149c8659105f921501d0a5dfc2d121fa872a23f543174c84f864dce1eff69d175c456bdb5efb9
-DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 SHA256 b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c WHIRLPOOL 270f3602e8ea10f28ab003aed28b3d19ab971c69029d1d71f7fe9601d5120222baf245e3e48910dbeedf1469227d59beb8190f23bdd2ef070390467e3f49b8c9
-DIST guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2734180 SHA256 994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b SHA512 8c4be098a31f63d56e7d35c174ce4095ba8317662c365d44c005980b38ba499461926754a4659e699ab271bb841c9da514f1a36b812d881c212a5f12177d73c0 WHIRLPOOL f247e65cc558057ba65aa7c554f07d9ec76de2fcc4828038b1d1d89b8c5449a803fd7942812e85fced8200f1af5d981b5cff7fa53cd026335c0ba906ced251f4
-DIST guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2885996 SHA256 037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0 SHA512 96efc583f42f6c7647bc026e2d2a96d603e7bea12ca02f6bcc65e819b9966082ac4c9f7e42f64536ff42a988e4766e695d87a82c73dd97d80745975a05badb23 WHIRLPOOL 61b623c961dc3b9f4c59f4d208c1302ea98d640b915cc53dce90551c3f48f9844381bb674d4d835421a44a71d903dc90c38a0f7a17ccc049ec388a4e948239b6
+DIST guix-0.12.0.tar.gz 15823786 BLAKE2B 96e1156a4ee32ec1500afd5529bade5408f538ea5280817efb1c31b6563e8aeefb554e82e9e4227198bf43e7b440aa062dd31cb607974f22859097e8f072dc84 SHA512 d61cb289d3773977400fa3c49869f30a3feb5e0364368017b9b8eaadee814c5c31897be398d6ff142349337334eb51cb6d0354bee27c0365de69ce1a09e858d3
+DIST guix-0.13.0.tar.gz 18490387 BLAKE2B e146f7a414f91076eafebe122c0abd772c1c2a562da015e952f978e97528c099905c1e7157e659633e644cbbd7066feac021550d52cb76d5999ff464fb685f2f SHA512 39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf
+DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
+DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337
+DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c
+DIST guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2734180 BLAKE2B 8ac6d9cfb59b1e2214c112fa7bfe865966cd06cb0214f360dc337a54e16cb59e4e3aa6da0662a52e6bceedfbb2a9ebb0eb62fe08491e5761912e2ee17b7ecd48 SHA512 8c4be098a31f63d56e7d35c174ce4095ba8317662c365d44c005980b38ba499461926754a4659e699ab271bb841c9da514f1a36b812d881c212a5f12177d73c0
+DIST guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2885996 BLAKE2B c16595fcb821468d5d293201046642dd4f0b149bb5e64f7b784f29f513ce26243b9747a8eefee3128e813a9b4b27a6a60a1693706b3fcb8cbb238fb4ad6e56c1 SHA512 96efc583f42f6c7647bc026e2d2a96d603e7bea12ca02f6bcc65e819b9966082ac4c9f7e42f64536ff42a988e4766e695d87a82c73dd97d80745975a05badb23
diff --git a/sys-apps/guix/guix-0.13.0.ebuild b/sys-apps/guix/guix-0.13.0-r1.ebuild
similarity index 98%
rename from sys-apps/guix/guix-0.13.0.ebuild
rename to sys-apps/guix/guix-0.13.0-r1.ebuild
index 54b553a520c..1c93756b4d8 100644
--- a/sys-apps/guix/guix-0.13.0.ebuild
+++ b/sys-apps/guix/guix-0.13.0-r1.ebuild
@@ -52,7 +52,7 @@ RESTRICT=test # complains about size of config.log and refuses to start tests
RDEPEND="
dev-libs/libgcrypt:0=
- >=dev-scheme/guile-2[regex,networking,threads]
+ >=dev-scheme/guile-2:=[regex,networking,threads]
dev-scheme/guile-json
net-libs/gnutls[guile]
sys-libs/zlib
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2018-01-20 11:23 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2018-01-20 11:23 UTC (permalink / raw
To: gentoo-commits
commit: d649b8ac48664410cef23928afb69e85401931ef
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 11:21:10 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 11:23:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d649b8ac
sys-apps/guix: bump up to 0.14.0, bug #644866
Reported-by: Cddr
Closes: https://bugs.gentoo.org/644866
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-apps/guix/Manifest | 1 +
sys-apps/guix/guix-0.14.0.ebuild | 140 +++++++++++++++++++++++++++++++++++++++
2 files changed, 141 insertions(+)
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 73c4b6ccf56..f3e7839ab6b 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,5 +1,6 @@
DIST guix-0.12.0.tar.gz 15823786 BLAKE2B 96e1156a4ee32ec1500afd5529bade5408f538ea5280817efb1c31b6563e8aeefb554e82e9e4227198bf43e7b440aa062dd31cb607974f22859097e8f072dc84 SHA512 d61cb289d3773977400fa3c49869f30a3feb5e0364368017b9b8eaadee814c5c31897be398d6ff142349337334eb51cb6d0354bee27c0365de69ce1a09e858d3
DIST guix-0.13.0.tar.gz 18490387 BLAKE2B e146f7a414f91076eafebe122c0abd772c1c2a562da015e952f978e97528c099905c1e7157e659633e644cbbd7066feac021550d52cb76d5999ff464fb685f2f SHA512 39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf
+DIST guix-0.14.0.tar.gz 19852695 BLAKE2B 257050ebebc35e7d6c82a30c3bb974da3d3eae9ca7c95dd8d98da6c60a68585330e5665b5343738188a058d84217d3c85731492e16afbd80c23771d40725b31c SHA512 635f6131c3ffa1ea5d18500fabc1d9d86d604a5cd3c8134d0f99dc44e171eef5d15f7ffa008c0e0726cf93fd0886afff0e9a5949014545d6919f8e8dba80eb69
DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337
DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c
diff --git a/sys-apps/guix/guix-0.14.0.ebuild b/sys-apps/guix/guix-0.14.0.ebuild
new file mode 100644
index 00000000000..98b94e6fb00
--- /dev/null
+++ b/sys-apps/guix/guix-0.14.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools readme.gentoo-r1 user
+
+DESCRIPTION="GNU package manager (nix sibling)"
+HOMEPAGE="https://www.gnu.org/software/guix/"
+
+# taken from gnu/local.mk and build-aux/download.scm
+BOOT_GUILE=(
+ "aarch64-linux 20170217 guile-2.0.14.tar.xz"
+ "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ "i686-linux 20131110 guile-2.0.9.tar.xz"
+ "mips64el-linux 20131110 guile-2.0.9.tar.xz"
+ "x86_64-linux 20131110 guile-2.0.9.tar.xz"
+)
+
+binary_src_uris() {
+ local system_date_guilep uri
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
+ # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
+ echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
+ done
+}
+
+# copy bootstrap binaries from DISTDIR to ${S}
+copy_boot_guile_binaries() {
+ local system_date_guilep
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
+ done
+}
+
+SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
+ $(binary_src_uris)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # complains about size of config.log and refuses to start tests
+
+RDEPEND="
+ dev-libs/libgcrypt:0=
+ >=dev-scheme/guile-2:=[regex,networking,threads]
+ dev-scheme/bytestructures
+ dev-scheme/guile-git
+ dev-scheme/guile-json
+ net-libs/gnutls[guile]
+ sys-libs/zlib
+ app-arch/bzip2
+ dev-db/sqlite
+"
+
+DEPEND="${RDEPEND}
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.13.0-default-daemon.patch)
+
+QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS="Quick start user guide on Gentoo:
+
+[as root] allow binary substitution to be downloaded (optional)
+ # guix archive --authorize < /usr/share/guix/hydra.gnu.org.pub
+[as root] enable guix-daemon service:
+ [systemd] # systemctl enable guix-daemon
+ [openrc] # rc-update add guix-daemon
+[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
+[as a user] install guix packages:
+ \$ guix package -i hello
+[as a user] configure environment:
+ Somewhere in .bash_profile you might want to set
+ export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
+
+Next steps:
+ guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
+"
+
+pkg_setup() {
+ enewgroup guixbuild
+ for i in {1..10}; do
+ # we list 'guixbuild' twice to
+ # both assign a primary group for user
+ # and add a user to /etc/group
+ enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
+ done
+}
+
+src_prepare() {
+ copy_boot_guile_binaries
+
+ default
+ # build system is very eager to run automake itself: bug #625166
+ eautomake
+}
+
+src_configure() {
+ # to be compatible with guix from /gnu/store
+ econf \
+ --localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+ # guile occasionally fails with 'bad address'
+ emake -j1
+}
+
+src_install() {
+ # TODO: emacs highlighter
+ default
+
+ readme.gentoo_create_doc
+
+ keepdir /etc/guix
+ # TODO: will need a tweak for prefix
+ keepdir /gnu/store
+ fowners root:guixbuild /gnu/store
+ fperms 1775 /gnu/store
+
+ keepdir /var/guix/profiles/per-user
+ fperms 1777 /var/guix/profiles/per-user
+
+ newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2018-01-21 13:50 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2018-01-21 13:50 UTC (permalink / raw
To: gentoo-commits
commit: 651f557f9302d29aa0de5ea10ef4e575b686fb21
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 13:50:10 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 13:50:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=651f557f
sys-apps/guix: fix build failure when older version of guix is already installed
Pasting comment note as-is:
"""
guile is trying to avoid recompilation by checking if file
/usr/lib64/guile/2.2/site-ccache/guix/modules.go
is newer than
guix/modules.scm
In case it is instead of using 'guix/modules.scm' guile
loads system one (from potentially older version of guix).
To work it around we bump last modification timestamp of
'*.scm' files.
"""
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-apps/guix/guix-0.14.0.ebuild | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/sys-apps/guix/guix-0.14.0.ebuild b/sys-apps/guix/guix-0.14.0.ebuild
index 98b94e6fb00..fee128e9630 100644
--- a/sys-apps/guix/guix-0.14.0.ebuild
+++ b/sys-apps/guix/guix-0.14.0.ebuild
@@ -104,6 +104,16 @@ src_prepare() {
default
# build system is very eager to run automake itself: bug #625166
eautomake
+
+ # guile is trying to avoid recompilation by checking if file
+ # /usr/lib64/guile/2.2/site-ccache/guix/modules.go
+ # is newer than
+ # guix/modules.scm
+ # In case it is instead of using 'guix/modules.scm' guile
+ # loads system one (from potentially older version of guix).
+ # To work it around we bump last modification timestamp of
+ # '*.scm' files.
+ find "${S}" -name "*.scm" -exec touch {} + || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2018-05-24 19:30 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2018-05-24 19:30 UTC (permalink / raw
To: gentoo-commits
commit: 9080c992d30ea9d51d476a87d0c6d150c34c8fde
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 19:30:09 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu May 24 19:30:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9080c992
sys-apps/guix: run full eautoreconf, not just eautomake
eautomake is not enough when automake does not match the version
aclocal.m4 was built with (1.15). Run full eautoreconf to tolerate
the failure.
Package-Manager: Portage-2.3.38, Repoman-2.3.9
sys-apps/guix/guix-0.14.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/guix/guix-0.14.0.ebuild b/sys-apps/guix/guix-0.14.0.ebuild
index fee128e9630..31fd035cf39 100644
--- a/sys-apps/guix/guix-0.14.0.ebuild
+++ b/sys-apps/guix/guix-0.14.0.ebuild
@@ -103,7 +103,7 @@ src_prepare() {
default
# build system is very eager to run automake itself: bug #625166
- eautomake
+ eautoreconf
# guile is trying to avoid recompilation by checking if file
# /usr/lib64/guile/2.2/site-ccache/guix/modules.go
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2018-07-06 22:33 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2018-07-06 22:33 UTC (permalink / raw
To: gentoo-commits
commit: 8a8acff70a555851946a478742ca154372a8e041
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 6 21:20:59 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 6 22:33:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a8acff7
sys-apps/guix: bump up to 0.15.0
Package-Manager: Portage-2.3.41, Repoman-2.3.9
sys-apps/guix/Manifest | 1 +
sys-apps/guix/guix-0.15.0.ebuild | 151 +++++++++++++++++++++++++++++++++++++++
2 files changed, 152 insertions(+)
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 72cad7890cc..df9a23319f5 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,5 +1,6 @@
DIST guix-0.13.0.tar.gz 18490387 BLAKE2B e146f7a414f91076eafebe122c0abd772c1c2a562da015e952f978e97528c099905c1e7157e659633e644cbbd7066feac021550d52cb76d5999ff464fb685f2f SHA512 39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf
DIST guix-0.14.0.tar.gz 19852695 BLAKE2B 257050ebebc35e7d6c82a30c3bb974da3d3eae9ca7c95dd8d98da6c60a68585330e5665b5343738188a058d84217d3c85731492e16afbd80c23771d40725b31c SHA512 635f6131c3ffa1ea5d18500fabc1d9d86d604a5cd3c8134d0f99dc44e171eef5d15f7ffa008c0e0726cf93fd0886afff0e9a5949014545d6919f8e8dba80eb69
+DIST guix-0.15.0.tar.gz 22704560 BLAKE2B 6abd50c0436abedaa3a20ba9649ccf8af0efeeac8d975171befb4e9a231be99bfcebed34f08d66b4ddaedfd64a9916f176e96bf810dba3bbc13cc6856828b5be SHA512 5e85ed03cde979d625df11d02d4f2ac7128bd944d11a763754e10a8e980f1eaeb721053fa12547bbc4289b33b3c7818bf992c7bfe79233f3a9555c96b8d52d7f
DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337
DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c
diff --git a/sys-apps/guix/guix-0.15.0.ebuild b/sys-apps/guix/guix-0.15.0.ebuild
new file mode 100644
index 00000000000..45aca6b4d2c
--- /dev/null
+++ b/sys-apps/guix/guix-0.15.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools readme.gentoo-r1 user
+
+DESCRIPTION="GNU package manager (nix sibling)"
+HOMEPAGE="https://www.gnu.org/software/guix/"
+
+# taken from gnu/local.mk and gnu/packages/bootstrap.scm
+BOOT_GUILE=(
+ "aarch64-linux 20170217 guile-2.0.14.tar.xz"
+ "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ "i686-linux 20131110 guile-2.0.9.tar.xz"
+ "mips64el-linux 20131110 guile-2.0.9.tar.xz"
+ "x86_64-linux 20131110 guile-2.0.9.tar.xz"
+)
+
+binary_src_uris() {
+ local system_date_guilep uri
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
+ # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
+ echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
+ done
+}
+
+# copy bootstrap binaries from DISTDIR to ${S}
+copy_boot_guile_binaries() {
+ local system_date_guilep
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
+ done
+}
+
+SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
+ $(binary_src_uris)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # complains about size of config.log and refuses to start tests
+
+RDEPEND="
+ dev-libs/libgcrypt:0=
+ >=dev-scheme/guile-2:=[regex,networking,threads]
+ dev-scheme/bytestructures
+ dev-scheme/guile-git
+ dev-scheme/guile-json
+ dev-scheme/guile-sqlite3
+ net-libs/gnutls[guile]
+ sys-libs/zlib
+ app-arch/bzip2
+ dev-db/sqlite
+"
+
+DEPEND="${RDEPEND}
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.13.0-default-daemon.patch)
+
+QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS="Quick start user guide on Gentoo:
+
+[as root] allow binary substitution to be downloaded (optional)
+ # guix archive --authorize < /usr/share/guix/hydra.gnu.org.pub
+[as root] enable guix-daemon service:
+ [systemd] # systemctl enable guix-daemon
+ [openrc] # rc-update add guix-daemon
+[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
+[as a user] install guix packages:
+ \$ guix package -i hello
+[as a user] configure environment:
+ Somewhere in .bash_profile you might want to set
+ export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
+
+Next steps:
+ guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
+"
+
+pkg_setup() {
+ enewgroup guixbuild
+ for i in {1..10}; do
+ # we list 'guixbuild' twice to
+ # both assign a primary group for user
+ # and add a user to /etc/group
+ enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
+ done
+}
+
+src_prepare() {
+ copy_boot_guile_binaries
+
+ default
+ # build system is very eager to run automake itself: bug #625166
+ eautoreconf
+
+ # guile is trying to avoid recompilation by checking if file
+ # /usr/lib64/guile/2.2/site-ccache/guix/modules.go
+ # is newer than
+ # guix/modules.scm
+ # In case it is instead of using 'guix/modules.scm' guile
+ # loads system one (from potentially older version of guix).
+ # To work it around we bump last modification timestamp of
+ # '*.scm' files.
+ find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_configure() {
+ # to be compatible with guix from /gnu/store
+ econf \
+ --localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+ # guile occasionally fails with 'bad address'
+ emake -j1
+}
+
+src_install() {
+ # TODO: emacs highlighter
+ default
+
+ readme.gentoo_create_doc
+
+ keepdir /etc/guix
+ # TODO: will need a tweak for prefix
+ keepdir /gnu/store
+ fowners root:guixbuild /gnu/store
+ fperms 1775 /gnu/store
+
+ keepdir /var/guix/profiles/per-user
+ fperms 1777 /var/guix/profiles/per-user
+
+ newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2018-12-06 22:55 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2018-12-06 22:55 UTC (permalink / raw
To: gentoo-commits
commit: d52abb92cf194446aea2f54612b472052d5921c0
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 6 22:21:57 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Dec 6 22:55:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52abb92
sys-apps/guix: drop old
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/guix/Manifest | 2 -
sys-apps/guix/guix-0.13.0-r1.ebuild | 138 ---------------------------------
sys-apps/guix/guix-0.14.0.ebuild | 150 ------------------------------------
3 files changed, 290 deletions(-)
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 402815554d2..88c1ca8fc61 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,5 +1,3 @@
-DIST guix-0.13.0.tar.gz 18490387 BLAKE2B e146f7a414f91076eafebe122c0abd772c1c2a562da015e952f978e97528c099905c1e7157e659633e644cbbd7066feac021550d52cb76d5999ff464fb685f2f SHA512 39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf
-DIST guix-0.14.0.tar.gz 19852695 BLAKE2B 257050ebebc35e7d6c82a30c3bb974da3d3eae9ca7c95dd8d98da6c60a68585330e5665b5343738188a058d84217d3c85731492e16afbd80c23771d40725b31c SHA512 635f6131c3ffa1ea5d18500fabc1d9d86d604a5cd3c8134d0f99dc44e171eef5d15f7ffa008c0e0726cf93fd0886afff0e9a5949014545d6919f8e8dba80eb69
DIST guix-0.15.0.tar.gz 22704560 BLAKE2B 6abd50c0436abedaa3a20ba9649ccf8af0efeeac8d975171befb4e9a231be99bfcebed34f08d66b4ddaedfd64a9916f176e96bf810dba3bbc13cc6856828b5be SHA512 5e85ed03cde979d625df11d02d4f2ac7128bd944d11a763754e10a8e980f1eaeb721053fa12547bbc4289b33b3c7818bf992c7bfe79233f3a9555c96b8d52d7f
DIST guix-0.16.0.tar.gz 24365691 BLAKE2B 7581f21fc9ccd4813b5e35b6a56980ffcd1ef9b02d5091679c33aaa91edf80acdc2bb9bd1a73acdde71b74d88e990ebbd824267756d9e7b27f94061cfd5a1429 SHA512 fdfa431547a283947147fde67e0dab27361a34caf7862c10659b17f74c63a07e6e834281be48a3dbe05cccd8ef46db5b8a19a6d42668ae2258d696058283724f
DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
diff --git a/sys-apps/guix/guix-0.13.0-r1.ebuild b/sys-apps/guix/guix-0.13.0-r1.ebuild
deleted file mode 100644
index 1c93756b4d8..00000000000
--- a/sys-apps/guix/guix-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools readme.gentoo-r1 user
-
-DESCRIPTION="GNU package manager (nix sibling)"
-HOMEPAGE="https://www.gnu.org/software/guix/"
-
-# taken from gnu/local.mk and build-aux/download.scm
-BOOT_GUILE=(
- "aarch64-linux 20170217 guile-2.0.14.tar.xz"
- "armhf-linux 20150101 guile-2.0.11.tar.xz"
- "i686-linux 20131110 guile-2.0.9.tar.xz"
- "mips64el-linux 20131110 guile-2.0.9.tar.xz"
- "x86_64-linux 20131110 guile-2.0.9.tar.xz"
-)
-
-binary_src_uris() {
- local system_date_guilep uri
- for system_date_guilep in "${BOOT_GUILE[@]}"; do
- # $1 $2 $3
- # "armhf-linux 20150101 guile-2.0.11.tar.xz"
- set -- ${system_date_guilep}
- uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
- # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
- echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
- done
-}
-
-# copy bootstrap binaries from DISTDIR to ${S}
-copy_boot_guile_binaries() {
- local system_date_guilep
- for system_date_guilep in "${BOOT_GUILE[@]}"; do
- # $1 $2 $3
- # "armhf-linux 20150101 guile-2.0.11.tar.xz"
- set -- ${system_date_guilep}
- cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
- done
-}
-
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
- $(binary_src_uris)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # complains about size of config.log and refuses to start tests
-
-RDEPEND="
- dev-libs/libgcrypt:0=
- >=dev-scheme/guile-2:=[regex,networking,threads]
- dev-scheme/guile-json
- net-libs/gnutls[guile]
- sys-libs/zlib
- app-arch/bzip2
- dev-db/sqlite
-"
-
-DEPEND="${RDEPEND}
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.13.0-default-daemon.patch)
-
-QA_PREBUILT="usr/share/guile/site/2.0/gnu/packages/bootstrap/*"
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS="Quick start user guide on Gentoo:
-
-[as root] allow binary substitution to be downloaded (optional)
- # guix archive --authorize < /usr/share/guix/hydra.gnu.org.pub
-[as root] enable guix-daemon service:
- [systemd] # systemctl enable guix-daemon
- [openrc] # rc-update add guix-daemon
-[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
-[as a user] install guix packages:
- \$ guix package -i hello
-[as a user] configure environment:
- Somewhere in .bash_profile you might want to set
- export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
-
-Next steps:
- guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
-"
-
-pkg_setup() {
- enewgroup guixbuild
- for i in {1..10}; do
- # we list 'guixbuild' twice to
- # both assign a primary group for user
- # and add a user to /etc/group
- enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
- done
-}
-
-src_prepare() {
- copy_boot_guile_binaries
-
- default
- # build system is very eager to run automake itself: bug #625166
- eautomake
-}
-
-src_configure() {
- # to be compatible with guix from /gnu/store
- econf \
- --localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
- # guile occasionally fails with 'bad address'
- emake -j1
-}
-
-src_install() {
- # TODO: emacs highlighter
- default
-
- readme.gentoo_create_doc
-
- keepdir /etc/guix
- # TODO: will need a tweak for prefix
- keepdir /gnu/store
- fowners root:guixbuild /gnu/store
- fperms 1775 /gnu/store
-
- keepdir /var/guix/profiles/per-user
- fperms 1777 /var/guix/profiles/per-user
-
- newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sys-apps/guix/guix-0.14.0.ebuild b/sys-apps/guix/guix-0.14.0.ebuild
deleted file mode 100644
index 31fd035cf39..00000000000
--- a/sys-apps/guix/guix-0.14.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools readme.gentoo-r1 user
-
-DESCRIPTION="GNU package manager (nix sibling)"
-HOMEPAGE="https://www.gnu.org/software/guix/"
-
-# taken from gnu/local.mk and build-aux/download.scm
-BOOT_GUILE=(
- "aarch64-linux 20170217 guile-2.0.14.tar.xz"
- "armhf-linux 20150101 guile-2.0.11.tar.xz"
- "i686-linux 20131110 guile-2.0.9.tar.xz"
- "mips64el-linux 20131110 guile-2.0.9.tar.xz"
- "x86_64-linux 20131110 guile-2.0.9.tar.xz"
-)
-
-binary_src_uris() {
- local system_date_guilep uri
- for system_date_guilep in "${BOOT_GUILE[@]}"; do
- # $1 $2 $3
- # "armhf-linux 20150101 guile-2.0.11.tar.xz"
- set -- ${system_date_guilep}
- uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
- # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
- echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
- done
-}
-
-# copy bootstrap binaries from DISTDIR to ${S}
-copy_boot_guile_binaries() {
- local system_date_guilep
- for system_date_guilep in "${BOOT_GUILE[@]}"; do
- # $1 $2 $3
- # "armhf-linux 20150101 guile-2.0.11.tar.xz"
- set -- ${system_date_guilep}
- cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
- done
-}
-
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
- $(binary_src_uris)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # complains about size of config.log and refuses to start tests
-
-RDEPEND="
- dev-libs/libgcrypt:0=
- >=dev-scheme/guile-2:=[regex,networking,threads]
- dev-scheme/bytestructures
- dev-scheme/guile-git
- dev-scheme/guile-json
- net-libs/gnutls[guile]
- sys-libs/zlib
- app-arch/bzip2
- dev-db/sqlite
-"
-
-DEPEND="${RDEPEND}
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.13.0-default-daemon.patch)
-
-QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS="Quick start user guide on Gentoo:
-
-[as root] allow binary substitution to be downloaded (optional)
- # guix archive --authorize < /usr/share/guix/hydra.gnu.org.pub
-[as root] enable guix-daemon service:
- [systemd] # systemctl enable guix-daemon
- [openrc] # rc-update add guix-daemon
-[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
-[as a user] install guix packages:
- \$ guix package -i hello
-[as a user] configure environment:
- Somewhere in .bash_profile you might want to set
- export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
-
-Next steps:
- guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
-"
-
-pkg_setup() {
- enewgroup guixbuild
- for i in {1..10}; do
- # we list 'guixbuild' twice to
- # both assign a primary group for user
- # and add a user to /etc/group
- enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
- done
-}
-
-src_prepare() {
- copy_boot_guile_binaries
-
- default
- # build system is very eager to run automake itself: bug #625166
- eautoreconf
-
- # guile is trying to avoid recompilation by checking if file
- # /usr/lib64/guile/2.2/site-ccache/guix/modules.go
- # is newer than
- # guix/modules.scm
- # In case it is instead of using 'guix/modules.scm' guile
- # loads system one (from potentially older version of guix).
- # To work it around we bump last modification timestamp of
- # '*.scm' files.
- find "${S}" -name "*.scm" -exec touch {} + || die
-}
-
-src_configure() {
- # to be compatible with guix from /gnu/store
- econf \
- --localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
- # guile occasionally fails with 'bad address'
- emake -j1
-}
-
-src_install() {
- # TODO: emacs highlighter
- default
-
- readme.gentoo_create_doc
-
- keepdir /etc/guix
- # TODO: will need a tweak for prefix
- keepdir /gnu/store
- fowners root:guixbuild /gnu/store
- fperms 1775 /gnu/store
-
- keepdir /var/guix/profiles/per-user
- fperms 1777 /var/guix/profiles/per-user
-
- newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2018-12-06 22:55 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2018-12-06 22:55 UTC (permalink / raw
To: gentoo-commits
commit: f40d658bcd24ad42117dc8a97ef69a8c827a31d8
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 6 22:54:25 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Dec 6 22:55:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40d658b
sys-apps/guix: switch to new ci.guix.info substitute server
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/guix/guix-0.16.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/guix/guix-0.16.0.ebuild b/sys-apps/guix/guix-0.16.0.ebuild
index b9b041113f0..8ebbad00846 100644
--- a/sys-apps/guix/guix-0.16.0.ebuild
+++ b/sys-apps/guix/guix-0.16.0.ebuild
@@ -75,7 +75,7 @@ DISABLE_AUTOFORMATTING=yes
DOC_CONTENTS="Quick start user guide on Gentoo:
[as root] allow binary substitution to be downloaded (optional)
- # guix archive --authorize < /usr/share/guix/hydra.gnu.org.pub
+ # guix archive --authorize < /usr/share/guix/ci.guix.info.pub
[as root] enable guix-daemon service:
[systemd] # systemctl enable guix-daemon
[openrc] # rc-update add guix-daemon
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2019-05-03 9:14 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2019-05-03 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 5942fca28577976e174abda2dc86445206590fd0
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri May 3 08:53:54 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri May 3 09:14:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5942fca2
sys-apps/guix: bump up to 1.0.0
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/guix/Manifest | 1 +
sys-apps/guix/guix-1.0.0.ebuild | 152 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 153 insertions(+)
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 88c1ca8fc61..28dc1b1ce3a 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,5 +1,6 @@
DIST guix-0.15.0.tar.gz 22704560 BLAKE2B 6abd50c0436abedaa3a20ba9649ccf8af0efeeac8d975171befb4e9a231be99bfcebed34f08d66b4ddaedfd64a9916f176e96bf810dba3bbc13cc6856828b5be SHA512 5e85ed03cde979d625df11d02d4f2ac7128bd944d11a763754e10a8e980f1eaeb721053fa12547bbc4289b33b3c7818bf992c7bfe79233f3a9555c96b8d52d7f
DIST guix-0.16.0.tar.gz 24365691 BLAKE2B 7581f21fc9ccd4813b5e35b6a56980ffcd1ef9b02d5091679c33aaa91edf80acdc2bb9bd1a73acdde71b74d88e990ebbd824267756d9e7b27f94061cfd5a1429 SHA512 fdfa431547a283947147fde67e0dab27361a34caf7862c10659b17f74c63a07e6e834281be48a3dbe05cccd8ef46db5b8a19a6d42668ae2258d696058283724f
+DIST guix-1.0.0.tar.gz 30707058 BLAKE2B 061aaa7068b2da641a613c36838d9853eeefd6ab6a2d9d9645a86fbeb9a7dcd370cc6a0d2ff45469235c2296edde540471675ed858522dcd6351e853a8617ff8 SHA512 45af6f80d1d4f4a63d00741070904acbb4986241561f52b4e81ce92fcdab6806a9ee10cbabfb6eddf88c4132cf9d678640d3a2c9895f170f8e6cbbf4d2128419
DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337
DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c
diff --git a/sys-apps/guix/guix-1.0.0.ebuild b/sys-apps/guix/guix-1.0.0.ebuild
new file mode 100644
index 00000000000..218eb8858e5
--- /dev/null
+++ b/sys-apps/guix/guix-1.0.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 user
+
+DESCRIPTION="GNU package manager (nix sibling)"
+HOMEPAGE="https://www.gnu.org/software/guix/"
+
+# taken from gnu/local.mk and gnu/packages/bootstrap.scm
+BOOT_GUILE=(
+ "aarch64-linux 20170217 guile-2.0.14.tar.xz"
+ "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ "i686-linux 20131110 guile-2.0.9.tar.xz"
+ "mips64el-linux 20131110 guile-2.0.9.tar.xz"
+ "x86_64-linux 20131110 guile-2.0.9.tar.xz"
+)
+
+binary_src_uris() {
+ local system_date_guilep uri
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
+ # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
+ echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
+ done
+}
+
+# copy bootstrap binaries from DISTDIR to ${S}
+copy_boot_guile_binaries() {
+ local system_date_guilep
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
+ done
+}
+
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+ $(binary_src_uris)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # complains about size of config.log and refuses to start tests
+
+RDEPEND="
+ dev-libs/libgcrypt:0=
+ >=dev-scheme/guile-2.2:=[regex,networking,threads]
+ dev-scheme/bytestructures
+ dev-scheme/guile-gcrypt
+ >=dev-scheme/guile-git-0.2.0
+ dev-scheme/guile-json
+ dev-scheme/guile-sqlite3
+ net-libs/gnutls[guile]
+ sys-libs/zlib
+ app-arch/bzip2
+ dev-db/sqlite
+"
+
+DEPEND="${RDEPEND}
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
+
+QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS="Quick start user guide on Gentoo:
+
+[as root] allow binary substitution to be downloaded (optional)
+ # guix archive --authorize < /usr/share/guix/ci.guix.info.pub
+[as root] enable guix-daemon service:
+ [systemd] # systemctl enable guix-daemon
+ [openrc] # rc-update add guix-daemon
+[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
+[as a user] install guix packages:
+ \$ guix package -i hello
+[as a user] configure environment:
+ Somewhere in .bash_profile you might want to set
+ export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
+
+Next steps:
+ guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
+"
+
+pkg_setup() {
+ enewgroup guixbuild
+ for i in {1..10}; do
+ # we list 'guixbuild' twice to
+ # both assign a primary group for user
+ # and add a user to /etc/group
+ enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
+ done
+}
+
+src_prepare() {
+ copy_boot_guile_binaries
+
+ default
+ # build system is very eager to run automake itself: bug #625166
+ eautoreconf
+
+ # guile is trying to avoid recompilation by checking if file
+ # /usr/lib64/guile/2.2/site-ccache/guix/modules.go
+ # is newer than
+ # guix/modules.scm
+ # In case it is instead of using 'guix/modules.scm' guile
+ # loads system one (from potentially older version of guix).
+ # To work it around we bump last modification timestamp of
+ # '*.scm' files.
+ find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_configure() {
+ # to be compatible with guix from /gnu/store
+ econf \
+ --localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+ # guile occasionally fails with 'bad address'
+ emake -j1
+}
+
+src_install() {
+ # TODO: emacs highlighter
+ default
+
+ readme.gentoo_create_doc
+
+ keepdir /etc/guix
+ # TODO: will need a tweak for prefix
+ keepdir /gnu/store
+ fowners root:guixbuild /gnu/store
+ fperms 1775 /gnu/store
+
+ keepdir /var/guix/profiles/per-user
+ fperms 1777 /var/guix/profiles/per-user
+
+ newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2019-07-14 22:13 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2019-07-14 22:13 UTC (permalink / raw
To: gentoo-commits
commit: c0b9c927141e0b63ca015742af9c8e419ad866be
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 22:09:53 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 22:12:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b9c927
sys-apps/guix: install systemd files into /lib, not /lib64
Build system hardcodes $(libdir) for .service files.
sed it out with gentoo's default until we get the
./configure option upstream.
Reported-by: Nathan Dehnel
Closes: https://bugs.gentoo.org/689772
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/guix/guix-1.0.0-r1.ebuild | 156 +++++++++++++++++++++++++++++++++++++
1 file changed, 156 insertions(+)
diff --git a/sys-apps/guix/guix-1.0.0-r1.ebuild b/sys-apps/guix/guix-1.0.0-r1.ebuild
new file mode 100644
index 00000000000..475d3bba8b8
--- /dev/null
+++ b/sys-apps/guix/guix-1.0.0-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 systemd user
+
+DESCRIPTION="GNU package manager (nix sibling)"
+HOMEPAGE="https://www.gnu.org/software/guix/"
+
+# taken from gnu/local.mk and gnu/packages/bootstrap.scm
+BOOT_GUILE=(
+ "aarch64-linux 20170217 guile-2.0.14.tar.xz"
+ "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ "i686-linux 20131110 guile-2.0.9.tar.xz"
+ "mips64el-linux 20131110 guile-2.0.9.tar.xz"
+ "x86_64-linux 20131110 guile-2.0.9.tar.xz"
+)
+
+binary_src_uris() {
+ local system_date_guilep uri
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
+ # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
+ echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
+ done
+}
+
+# copy bootstrap binaries from DISTDIR to ${S}
+copy_boot_guile_binaries() {
+ local system_date_guilep
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
+ done
+}
+
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+ $(binary_src_uris)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # complains about size of config.log and refuses to start tests
+
+RDEPEND="
+ dev-libs/libgcrypt:0=
+ >=dev-scheme/guile-2.2:=[regex,networking,threads]
+ dev-scheme/bytestructures
+ dev-scheme/guile-gcrypt
+ >=dev-scheme/guile-git-0.2.0
+ dev-scheme/guile-json
+ dev-scheme/guile-sqlite3
+ net-libs/gnutls[guile]
+ sys-libs/zlib
+ app-arch/bzip2
+ dev-db/sqlite
+"
+
+DEPEND="${RDEPEND}
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
+
+QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS="Quick start user guide on Gentoo:
+
+[as root] allow binary substitution to be downloaded (optional)
+ # guix archive --authorize < /usr/share/guix/ci.guix.info.pub
+[as root] enable guix-daemon service:
+ [systemd] # systemctl enable guix-daemon
+ [openrc] # rc-update add guix-daemon
+[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
+[as a user] install guix packages:
+ \$ guix package -i hello
+[as a user] configure environment:
+ Somewhere in .bash_profile you might want to set
+ export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
+
+Next steps:
+ guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
+"
+
+pkg_setup() {
+ enewgroup guixbuild
+ for i in {1..10}; do
+ # we list 'guixbuild' twice to
+ # both assign a primary group for user
+ # and add a user to /etc/group
+ enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
+ done
+}
+
+src_prepare() {
+ copy_boot_guile_binaries
+
+ default
+ # build system is very eager to run automake itself: bug #625166
+ eautoreconf
+
+ # guile is trying to avoid recompilation by checking if file
+ # /usr/lib64/guile/2.2/site-ccache/guix/modules.go
+ # is newer than
+ # guix/modules.scm
+ # In case it is instead of using 'guix/modules.scm' guile
+ # loads system one (from potentially older version of guix).
+ # To work it around we bump last modification timestamp of
+ # '*.scm' files.
+ find "${S}" -name "*.scm" -exec touch {} + || die
+
+ # Gentoo stores systemd unit files in lib, never in lib64: bug #689772
+ sed -i nix/local.mk \
+ -e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || die
+}
+
+src_configure() {
+ # to be compatible with guix from /gnu/store
+ econf \
+ --localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+ # guile occasionally fails with 'bad address'
+ emake -j1
+}
+
+src_install() {
+ # TODO: emacs highlighter
+ default
+
+ readme.gentoo_create_doc
+
+ keepdir /etc/guix
+ # TODO: will need a tweak for prefix
+ keepdir /gnu/store
+ fowners root:guixbuild /gnu/store
+ fperms 1775 /gnu/store
+
+ keepdir /var/guix/profiles/per-user
+ fperms 1777 /var/guix/profiles/per-user
+
+ newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2019-07-21 9:51 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2019-07-21 9:51 UTC (permalink / raw
To: gentoo-commits
commit: f18ca9ed434330caf5a9471fbbbe9d6273e47db9
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 09:02:28 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 09:51:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f18ca9ed
sys-apps/guix: bump up to 1.0.1
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/guix/Manifest | 1 +
sys-apps/guix/guix-1.0.1.ebuild | 156 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 157 insertions(+)
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 055e5cf67d2..f0fa4f7ed23 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,5 +1,6 @@
DIST guix-0.16.0.tar.gz 24365691 BLAKE2B 7581f21fc9ccd4813b5e35b6a56980ffcd1ef9b02d5091679c33aaa91edf80acdc2bb9bd1a73acdde71b74d88e990ebbd824267756d9e7b27f94061cfd5a1429 SHA512 fdfa431547a283947147fde67e0dab27361a34caf7862c10659b17f74c63a07e6e834281be48a3dbe05cccd8ef46db5b8a19a6d42668ae2258d696058283724f
DIST guix-1.0.0.tar.gz 30707058 BLAKE2B 061aaa7068b2da641a613c36838d9853eeefd6ab6a2d9d9645a86fbeb9a7dcd370cc6a0d2ff45469235c2296edde540471675ed858522dcd6351e853a8617ff8 SHA512 45af6f80d1d4f4a63d00741070904acbb4986241561f52b4e81ce92fcdab6806a9ee10cbabfb6eddf88c4132cf9d678640d3a2c9895f170f8e6cbbf4d2128419
+DIST guix-1.0.1.tar.gz 31992360 BLAKE2B 84ef9ffba36d72f3a99167e0089a02f54172c9e8dd95e74aa55467383698aba3b26dc38992dc159903608b0623a707065b129b359e83338f5f361ce0e98e6ea4 SHA512 b884a4c6e099bf12bee547f5b247ac1bfb0d10a227712079ca1a857f75c3cf20d40d2c90780a8b486f5ee8e40366de44487d3f8429e570c561a72073506ac588
DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337
DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c
diff --git a/sys-apps/guix/guix-1.0.1.ebuild b/sys-apps/guix/guix-1.0.1.ebuild
new file mode 100644
index 00000000000..475d3bba8b8
--- /dev/null
+++ b/sys-apps/guix/guix-1.0.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 systemd user
+
+DESCRIPTION="GNU package manager (nix sibling)"
+HOMEPAGE="https://www.gnu.org/software/guix/"
+
+# taken from gnu/local.mk and gnu/packages/bootstrap.scm
+BOOT_GUILE=(
+ "aarch64-linux 20170217 guile-2.0.14.tar.xz"
+ "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ "i686-linux 20131110 guile-2.0.9.tar.xz"
+ "mips64el-linux 20131110 guile-2.0.9.tar.xz"
+ "x86_64-linux 20131110 guile-2.0.9.tar.xz"
+)
+
+binary_src_uris() {
+ local system_date_guilep uri
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
+ # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
+ echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
+ done
+}
+
+# copy bootstrap binaries from DISTDIR to ${S}
+copy_boot_guile_binaries() {
+ local system_date_guilep
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
+ done
+}
+
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+ $(binary_src_uris)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # complains about size of config.log and refuses to start tests
+
+RDEPEND="
+ dev-libs/libgcrypt:0=
+ >=dev-scheme/guile-2.2:=[regex,networking,threads]
+ dev-scheme/bytestructures
+ dev-scheme/guile-gcrypt
+ >=dev-scheme/guile-git-0.2.0
+ dev-scheme/guile-json
+ dev-scheme/guile-sqlite3
+ net-libs/gnutls[guile]
+ sys-libs/zlib
+ app-arch/bzip2
+ dev-db/sqlite
+"
+
+DEPEND="${RDEPEND}
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
+
+QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS="Quick start user guide on Gentoo:
+
+[as root] allow binary substitution to be downloaded (optional)
+ # guix archive --authorize < /usr/share/guix/ci.guix.info.pub
+[as root] enable guix-daemon service:
+ [systemd] # systemctl enable guix-daemon
+ [openrc] # rc-update add guix-daemon
+[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
+[as a user] install guix packages:
+ \$ guix package -i hello
+[as a user] configure environment:
+ Somewhere in .bash_profile you might want to set
+ export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
+
+Next steps:
+ guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
+"
+
+pkg_setup() {
+ enewgroup guixbuild
+ for i in {1..10}; do
+ # we list 'guixbuild' twice to
+ # both assign a primary group for user
+ # and add a user to /etc/group
+ enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
+ done
+}
+
+src_prepare() {
+ copy_boot_guile_binaries
+
+ default
+ # build system is very eager to run automake itself: bug #625166
+ eautoreconf
+
+ # guile is trying to avoid recompilation by checking if file
+ # /usr/lib64/guile/2.2/site-ccache/guix/modules.go
+ # is newer than
+ # guix/modules.scm
+ # In case it is instead of using 'guix/modules.scm' guile
+ # loads system one (from potentially older version of guix).
+ # To work it around we bump last modification timestamp of
+ # '*.scm' files.
+ find "${S}" -name "*.scm" -exec touch {} + || die
+
+ # Gentoo stores systemd unit files in lib, never in lib64: bug #689772
+ sed -i nix/local.mk \
+ -e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || die
+}
+
+src_configure() {
+ # to be compatible with guix from /gnu/store
+ econf \
+ --localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+ # guile occasionally fails with 'bad address'
+ emake -j1
+}
+
+src_install() {
+ # TODO: emacs highlighter
+ default
+
+ readme.gentoo_create_doc
+
+ keepdir /etc/guix
+ # TODO: will need a tweak for prefix
+ keepdir /gnu/store
+ fowners root:guixbuild /gnu/store
+ fperms 1775 /gnu/store
+
+ keepdir /var/guix/profiles/per-user
+ fperms 1777 /var/guix/profiles/per-user
+
+ newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2019-07-21 9:51 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2019-07-21 9:51 UTC (permalink / raw
To: gentoo-commits
commit: cb785cc5fb28c47c8e7616574388fd9abdff560f
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 09:03:02 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 09:51:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb785cc5
sys-apps/guix: drop old
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/guix/Manifest | 1 -
sys-apps/guix/guix-0.16.0.ebuild | 152 ---------------------------------------
2 files changed, 153 deletions(-)
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index f0fa4f7ed23..2581e4a979e 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,4 +1,3 @@
-DIST guix-0.16.0.tar.gz 24365691 BLAKE2B 7581f21fc9ccd4813b5e35b6a56980ffcd1ef9b02d5091679c33aaa91edf80acdc2bb9bd1a73acdde71b74d88e990ebbd824267756d9e7b27f94061cfd5a1429 SHA512 fdfa431547a283947147fde67e0dab27361a34caf7862c10659b17f74c63a07e6e834281be48a3dbe05cccd8ef46db5b8a19a6d42668ae2258d696058283724f
DIST guix-1.0.0.tar.gz 30707058 BLAKE2B 061aaa7068b2da641a613c36838d9853eeefd6ab6a2d9d9645a86fbeb9a7dcd370cc6a0d2ff45469235c2296edde540471675ed858522dcd6351e853a8617ff8 SHA512 45af6f80d1d4f4a63d00741070904acbb4986241561f52b4e81ce92fcdab6806a9ee10cbabfb6eddf88c4132cf9d678640d3a2c9895f170f8e6cbbf4d2128419
DIST guix-1.0.1.tar.gz 31992360 BLAKE2B 84ef9ffba36d72f3a99167e0089a02f54172c9e8dd95e74aa55467383698aba3b26dc38992dc159903608b0623a707065b129b359e83338f5f361ce0e98e6ea4 SHA512 b884a4c6e099bf12bee547f5b247ac1bfb0d10a227712079ca1a857f75c3cf20d40d2c90780a8b486f5ee8e40366de44487d3f8429e570c561a72073506ac588
DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
diff --git a/sys-apps/guix/guix-0.16.0.ebuild b/sys-apps/guix/guix-0.16.0.ebuild
deleted file mode 100644
index 8ebbad00846..00000000000
--- a/sys-apps/guix/guix-0.16.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools readme.gentoo-r1 user
-
-DESCRIPTION="GNU package manager (nix sibling)"
-HOMEPAGE="https://www.gnu.org/software/guix/"
-
-# taken from gnu/local.mk and gnu/packages/bootstrap.scm
-BOOT_GUILE=(
- "aarch64-linux 20170217 guile-2.0.14.tar.xz"
- "armhf-linux 20150101 guile-2.0.11.tar.xz"
- "i686-linux 20131110 guile-2.0.9.tar.xz"
- "mips64el-linux 20131110 guile-2.0.9.tar.xz"
- "x86_64-linux 20131110 guile-2.0.9.tar.xz"
-)
-
-binary_src_uris() {
- local system_date_guilep uri
- for system_date_guilep in "${BOOT_GUILE[@]}"; do
- # $1 $2 $3
- # "armhf-linux 20150101 guile-2.0.11.tar.xz"
- set -- ${system_date_guilep}
- uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
- # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
- echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
- done
-}
-
-# copy bootstrap binaries from DISTDIR to ${S}
-copy_boot_guile_binaries() {
- local system_date_guilep
- for system_date_guilep in "${BOOT_GUILE[@]}"; do
- # $1 $2 $3
- # "armhf-linux 20150101 guile-2.0.11.tar.xz"
- set -- ${system_date_guilep}
- cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
- done
-}
-
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
- $(binary_src_uris)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # complains about size of config.log and refuses to start tests
-
-RDEPEND="
- dev-libs/libgcrypt:0=
- >=dev-scheme/guile-2:=[regex,networking,threads]
- dev-scheme/bytestructures
- dev-scheme/guile-gcrypt
- dev-scheme/guile-git
- dev-scheme/guile-json
- dev-scheme/guile-sqlite3
- net-libs/gnutls[guile]
- sys-libs/zlib
- app-arch/bzip2
- dev-db/sqlite
-"
-
-DEPEND="${RDEPEND}
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
-
-QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS="Quick start user guide on Gentoo:
-
-[as root] allow binary substitution to be downloaded (optional)
- # guix archive --authorize < /usr/share/guix/ci.guix.info.pub
-[as root] enable guix-daemon service:
- [systemd] # systemctl enable guix-daemon
- [openrc] # rc-update add guix-daemon
-[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
-[as a user] install guix packages:
- \$ guix package -i hello
-[as a user] configure environment:
- Somewhere in .bash_profile you might want to set
- export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
-
-Next steps:
- guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
-"
-
-pkg_setup() {
- enewgroup guixbuild
- for i in {1..10}; do
- # we list 'guixbuild' twice to
- # both assign a primary group for user
- # and add a user to /etc/group
- enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
- done
-}
-
-src_prepare() {
- copy_boot_guile_binaries
-
- default
- # build system is very eager to run automake itself: bug #625166
- eautoreconf
-
- # guile is trying to avoid recompilation by checking if file
- # /usr/lib64/guile/2.2/site-ccache/guix/modules.go
- # is newer than
- # guix/modules.scm
- # In case it is instead of using 'guix/modules.scm' guile
- # loads system one (from potentially older version of guix).
- # To work it around we bump last modification timestamp of
- # '*.scm' files.
- find "${S}" -name "*.scm" -exec touch {} + || die
-}
-
-src_configure() {
- # to be compatible with guix from /gnu/store
- econf \
- --localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
- # guile occasionally fails with 'bad address'
- emake -j1
-}
-
-src_install() {
- # TODO: emacs highlighter
- default
-
- readme.gentoo_create_doc
-
- keepdir /etc/guix
- # TODO: will need a tweak for prefix
- keepdir /gnu/store
- fowners root:guixbuild /gnu/store
- fperms 1775 /gnu/store
-
- keepdir /var/guix/profiles/per-user
- fperms 1777 /var/guix/profiles/per-user
-
- newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2019-10-13 12:04 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2019-10-13 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 1f5d243e81b1b22ac61fb6c2dfd5a4b571661a36
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 12:04:08 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 12:04:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f5d243e
sys-apps/guix: add check for USER_NS
guix-daemon uses user namespaces to build derivations
and create interactive environments in
'guix environment --container'.
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/guix/guix-1.0.1.ebuild | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sys-apps/guix/guix-1.0.1.ebuild b/sys-apps/guix/guix-1.0.1.ebuild
index 475d3bba8b8..cb8689ab871 100644
--- a/sys-apps/guix/guix-1.0.1.ebuild
+++ b/sys-apps/guix/guix-1.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools readme.gentoo-r1 systemd user
+inherit autotools linux-info readme.gentoo-r1 systemd user
DESCRIPTION="GNU package manager (nix sibling)"
HOMEPAGE="https://www.gnu.org/software/guix/"
@@ -90,6 +90,13 @@ Next steps:
guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
"
+pkg_pretend() {
+ # USER_NS is used to run builders in a default setting in linux
+ # and for 'guix environment --container'.
+ local CONFIG_CHECK="~USER_NS"
+ check_extra_config
+}
+
pkg_setup() {
enewgroup guixbuild
for i in {1..10}; do
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2019-11-07 23:39 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2019-11-07 23:39 UTC (permalink / raw
To: gentoo-commits
commit: 3e826423b7973836f33152a06c5100a5e71ecf90
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 7 23:37:36 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Nov 7 23:39:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e826423
sys-apps/guix: add a reference to 'touch' hack
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/guix/guix-1.0.1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-apps/guix/guix-1.0.1.ebuild b/sys-apps/guix/guix-1.0.1.ebuild
index cb8689ab871..309d371d09c 100644
--- a/sys-apps/guix/guix-1.0.1.ebuild
+++ b/sys-apps/guix/guix-1.0.1.ebuild
@@ -122,6 +122,7 @@ src_prepare() {
# loads system one (from potentially older version of guix).
# To work it around we bump last modification timestamp of
# '*.scm' files.
+ # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
find "${S}" -name "*.scm" -exec touch {} + || die
# Gentoo stores systemd unit files in lib, never in lib64: bug #689772
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2019-11-07 23:39 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2019-11-07 23:39 UTC (permalink / raw
To: gentoo-commits
commit: 64770a3f8b68eaa6f601b7ae73cc3598df667c2d
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 7 23:38:00 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Nov 7 23:39:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64770a3f
sys-apps/guix: drop old
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/guix/Manifest | 1 -
sys-apps/guix/guix-1.0.0-r1.ebuild | 156 -------------------------------------
sys-apps/guix/guix-1.0.0.ebuild | 152 ------------------------------------
3 files changed, 309 deletions(-)
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 2581e4a979e..6d34e6fd4d0 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,4 +1,3 @@
-DIST guix-1.0.0.tar.gz 30707058 BLAKE2B 061aaa7068b2da641a613c36838d9853eeefd6ab6a2d9d9645a86fbeb9a7dcd370cc6a0d2ff45469235c2296edde540471675ed858522dcd6351e853a8617ff8 SHA512 45af6f80d1d4f4a63d00741070904acbb4986241561f52b4e81ce92fcdab6806a9ee10cbabfb6eddf88c4132cf9d678640d3a2c9895f170f8e6cbbf4d2128419
DIST guix-1.0.1.tar.gz 31992360 BLAKE2B 84ef9ffba36d72f3a99167e0089a02f54172c9e8dd95e74aa55467383698aba3b26dc38992dc159903608b0623a707065b129b359e83338f5f361ce0e98e6ea4 SHA512 b884a4c6e099bf12bee547f5b247ac1bfb0d10a227712079ca1a857f75c3cf20d40d2c90780a8b486f5ee8e40366de44487d3f8429e570c561a72073506ac588
DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337
diff --git a/sys-apps/guix/guix-1.0.0-r1.ebuild b/sys-apps/guix/guix-1.0.0-r1.ebuild
deleted file mode 100644
index 475d3bba8b8..00000000000
--- a/sys-apps/guix/guix-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 systemd user
-
-DESCRIPTION="GNU package manager (nix sibling)"
-HOMEPAGE="https://www.gnu.org/software/guix/"
-
-# taken from gnu/local.mk and gnu/packages/bootstrap.scm
-BOOT_GUILE=(
- "aarch64-linux 20170217 guile-2.0.14.tar.xz"
- "armhf-linux 20150101 guile-2.0.11.tar.xz"
- "i686-linux 20131110 guile-2.0.9.tar.xz"
- "mips64el-linux 20131110 guile-2.0.9.tar.xz"
- "x86_64-linux 20131110 guile-2.0.9.tar.xz"
-)
-
-binary_src_uris() {
- local system_date_guilep uri
- for system_date_guilep in "${BOOT_GUILE[@]}"; do
- # $1 $2 $3
- # "armhf-linux 20150101 guile-2.0.11.tar.xz"
- set -- ${system_date_guilep}
- uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
- # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
- echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
- done
-}
-
-# copy bootstrap binaries from DISTDIR to ${S}
-copy_boot_guile_binaries() {
- local system_date_guilep
- for system_date_guilep in "${BOOT_GUILE[@]}"; do
- # $1 $2 $3
- # "armhf-linux 20150101 guile-2.0.11.tar.xz"
- set -- ${system_date_guilep}
- cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
- done
-}
-
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
- $(binary_src_uris)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # complains about size of config.log and refuses to start tests
-
-RDEPEND="
- dev-libs/libgcrypt:0=
- >=dev-scheme/guile-2.2:=[regex,networking,threads]
- dev-scheme/bytestructures
- dev-scheme/guile-gcrypt
- >=dev-scheme/guile-git-0.2.0
- dev-scheme/guile-json
- dev-scheme/guile-sqlite3
- net-libs/gnutls[guile]
- sys-libs/zlib
- app-arch/bzip2
- dev-db/sqlite
-"
-
-DEPEND="${RDEPEND}
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
-
-QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS="Quick start user guide on Gentoo:
-
-[as root] allow binary substitution to be downloaded (optional)
- # guix archive --authorize < /usr/share/guix/ci.guix.info.pub
-[as root] enable guix-daemon service:
- [systemd] # systemctl enable guix-daemon
- [openrc] # rc-update add guix-daemon
-[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
-[as a user] install guix packages:
- \$ guix package -i hello
-[as a user] configure environment:
- Somewhere in .bash_profile you might want to set
- export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
-
-Next steps:
- guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
-"
-
-pkg_setup() {
- enewgroup guixbuild
- for i in {1..10}; do
- # we list 'guixbuild' twice to
- # both assign a primary group for user
- # and add a user to /etc/group
- enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
- done
-}
-
-src_prepare() {
- copy_boot_guile_binaries
-
- default
- # build system is very eager to run automake itself: bug #625166
- eautoreconf
-
- # guile is trying to avoid recompilation by checking if file
- # /usr/lib64/guile/2.2/site-ccache/guix/modules.go
- # is newer than
- # guix/modules.scm
- # In case it is instead of using 'guix/modules.scm' guile
- # loads system one (from potentially older version of guix).
- # To work it around we bump last modification timestamp of
- # '*.scm' files.
- find "${S}" -name "*.scm" -exec touch {} + || die
-
- # Gentoo stores systemd unit files in lib, never in lib64: bug #689772
- sed -i nix/local.mk \
- -e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || die
-}
-
-src_configure() {
- # to be compatible with guix from /gnu/store
- econf \
- --localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
- # guile occasionally fails with 'bad address'
- emake -j1
-}
-
-src_install() {
- # TODO: emacs highlighter
- default
-
- readme.gentoo_create_doc
-
- keepdir /etc/guix
- # TODO: will need a tweak for prefix
- keepdir /gnu/store
- fowners root:guixbuild /gnu/store
- fperms 1775 /gnu/store
-
- keepdir /var/guix/profiles/per-user
- fperms 1777 /var/guix/profiles/per-user
-
- newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sys-apps/guix/guix-1.0.0.ebuild b/sys-apps/guix/guix-1.0.0.ebuild
deleted file mode 100644
index 218eb8858e5..00000000000
--- a/sys-apps/guix/guix-1.0.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 user
-
-DESCRIPTION="GNU package manager (nix sibling)"
-HOMEPAGE="https://www.gnu.org/software/guix/"
-
-# taken from gnu/local.mk and gnu/packages/bootstrap.scm
-BOOT_GUILE=(
- "aarch64-linux 20170217 guile-2.0.14.tar.xz"
- "armhf-linux 20150101 guile-2.0.11.tar.xz"
- "i686-linux 20131110 guile-2.0.9.tar.xz"
- "mips64el-linux 20131110 guile-2.0.9.tar.xz"
- "x86_64-linux 20131110 guile-2.0.9.tar.xz"
-)
-
-binary_src_uris() {
- local system_date_guilep uri
- for system_date_guilep in "${BOOT_GUILE[@]}"; do
- # $1 $2 $3
- # "armhf-linux 20150101 guile-2.0.11.tar.xz"
- set -- ${system_date_guilep}
- uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
- # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
- echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
- done
-}
-
-# copy bootstrap binaries from DISTDIR to ${S}
-copy_boot_guile_binaries() {
- local system_date_guilep
- for system_date_guilep in "${BOOT_GUILE[@]}"; do
- # $1 $2 $3
- # "armhf-linux 20150101 guile-2.0.11.tar.xz"
- set -- ${system_date_guilep}
- cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
- done
-}
-
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
- $(binary_src_uris)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # complains about size of config.log and refuses to start tests
-
-RDEPEND="
- dev-libs/libgcrypt:0=
- >=dev-scheme/guile-2.2:=[regex,networking,threads]
- dev-scheme/bytestructures
- dev-scheme/guile-gcrypt
- >=dev-scheme/guile-git-0.2.0
- dev-scheme/guile-json
- dev-scheme/guile-sqlite3
- net-libs/gnutls[guile]
- sys-libs/zlib
- app-arch/bzip2
- dev-db/sqlite
-"
-
-DEPEND="${RDEPEND}
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
-
-QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS="Quick start user guide on Gentoo:
-
-[as root] allow binary substitution to be downloaded (optional)
- # guix archive --authorize < /usr/share/guix/ci.guix.info.pub
-[as root] enable guix-daemon service:
- [systemd] # systemctl enable guix-daemon
- [openrc] # rc-update add guix-daemon
-[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
-[as a user] install guix packages:
- \$ guix package -i hello
-[as a user] configure environment:
- Somewhere in .bash_profile you might want to set
- export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
-
-Next steps:
- guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
-"
-
-pkg_setup() {
- enewgroup guixbuild
- for i in {1..10}; do
- # we list 'guixbuild' twice to
- # both assign a primary group for user
- # and add a user to /etc/group
- enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
- done
-}
-
-src_prepare() {
- copy_boot_guile_binaries
-
- default
- # build system is very eager to run automake itself: bug #625166
- eautoreconf
-
- # guile is trying to avoid recompilation by checking if file
- # /usr/lib64/guile/2.2/site-ccache/guix/modules.go
- # is newer than
- # guix/modules.scm
- # In case it is instead of using 'guix/modules.scm' guile
- # loads system one (from potentially older version of guix).
- # To work it around we bump last modification timestamp of
- # '*.scm' files.
- find "${S}" -name "*.scm" -exec touch {} + || die
-}
-
-src_configure() {
- # to be compatible with guix from /gnu/store
- econf \
- --localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
- # guile occasionally fails with 'bad address'
- emake -j1
-}
-
-src_install() {
- # TODO: emacs highlighter
- default
-
- readme.gentoo_create_doc
-
- keepdir /etc/guix
- # TODO: will need a tweak for prefix
- keepdir /gnu/store
- fowners root:guixbuild /gnu/store
- fperms 1775 /gnu/store
-
- keepdir /var/guix/profiles/per-user
- fperms 1777 /var/guix/profiles/per-user
-
- newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
@ 2019-11-14 8:38 Sergei Trofimovich
0 siblings, 0 replies; 22+ messages in thread
From: Sergei Trofimovich @ 2019-11-14 8:38 UTC (permalink / raw
To: gentoo-commits
commit: ab70df33658cbb2f8b06e786da70e5a88a838685
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 08:38:33 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 08:38:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab70df33
sys-apps/guix: add guixbuild* users to kvm group
Commands like
$ guix system vm vm.scm
assume qemu supports '-enable-kvm' flag. Let's add
guixbuild* users to kvm group by default.
Reported-by: Nathan Dehnel
Closes: https://bugs.gentoo.org/699642
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-apps/guix/guix-1.0.1-r1.ebuild | 166 +++++++++++++++++++++++++++++++++++++
1 file changed, 166 insertions(+)
diff --git a/sys-apps/guix/guix-1.0.1-r1.ebuild b/sys-apps/guix/guix-1.0.1-r1.ebuild
new file mode 100644
index 00000000000..0ab61861e61
--- /dev/null
+++ b/sys-apps/guix/guix-1.0.1-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info readme.gentoo-r1 systemd user
+
+DESCRIPTION="GNU package manager (nix sibling)"
+HOMEPAGE="https://www.gnu.org/software/guix/"
+
+# taken from gnu/local.mk and gnu/packages/bootstrap.scm
+BOOT_GUILE=(
+ "aarch64-linux 20170217 guile-2.0.14.tar.xz"
+ "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ "i686-linux 20131110 guile-2.0.9.tar.xz"
+ "mips64el-linux 20131110 guile-2.0.9.tar.xz"
+ "x86_64-linux 20131110 guile-2.0.9.tar.xz"
+)
+
+binary_src_uris() {
+ local system_date_guilep uri
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
+ # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
+ echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
+ done
+}
+
+# copy bootstrap binaries from DISTDIR to ${S}
+copy_boot_guile_binaries() {
+ local system_date_guilep
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
+ done
+}
+
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+ $(binary_src_uris)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # complains about size of config.log and refuses to start tests
+
+RDEPEND="
+ dev-libs/libgcrypt:0=
+ >=dev-scheme/guile-2.2:=[regex,networking,threads]
+ dev-scheme/bytestructures
+ dev-scheme/guile-gcrypt
+ >=dev-scheme/guile-git-0.2.0
+ dev-scheme/guile-json
+ dev-scheme/guile-sqlite3
+ net-libs/gnutls[guile]
+ sys-libs/zlib
+ app-arch/bzip2
+ dev-db/sqlite
+"
+
+DEPEND="${RDEPEND}
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
+
+QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS="Quick start user guide on Gentoo:
+
+[as root] allow binary substitution to be downloaded (optional)
+ # guix archive --authorize < /usr/share/guix/ci.guix.info.pub
+[as root] enable guix-daemon service:
+ [systemd] # systemctl enable guix-daemon
+ [openrc] # rc-update add guix-daemon
+[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
+[as a user] install guix packages:
+ \$ guix package -i hello
+[as a user] configure environment:
+ Somewhere in .bash_profile you might want to set
+ export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
+
+Next steps:
+ guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
+"
+
+pkg_pretend() {
+ # USER_NS is used to run builders in a default setting in linux
+ # and for 'guix environment --container'.
+ local CONFIG_CHECK="~USER_NS"
+ check_extra_config
+}
+
+pkg_setup() {
+ enewgroup guixbuild
+ for i in {1..10}; do
+ # we list 'guixbuild' twice to
+ # both assign a primary group for user
+ # and add a user to /etc/group
+ # 'kvm' is used to make 'guix system vm <system.scm>'
+ # work by default: bug #699642
+ enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild,kvm
+ done
+}
+
+src_prepare() {
+ copy_boot_guile_binaries
+
+ default
+ # build system is very eager to run automake itself: bug #625166
+ eautoreconf
+
+ # guile is trying to avoid recompilation by checking if file
+ # /usr/lib64/guile/2.2/site-ccache/guix/modules.go
+ # is newer than
+ # guix/modules.scm
+ # In case it is instead of using 'guix/modules.scm' guile
+ # loads system one (from potentially older version of guix).
+ # To work it around we bump last modification timestamp of
+ # '*.scm' files.
+ # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+ find "${S}" -name "*.scm" -exec touch {} + || die
+
+ # Gentoo stores systemd unit files in lib, never in lib64: bug #689772
+ sed -i nix/local.mk \
+ -e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || die
+}
+
+src_configure() {
+ # to be compatible with guix from /gnu/store
+ econf \
+ --localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+ # guile occasionally fails with 'bad address'
+ emake -j1
+}
+
+src_install() {
+ # TODO: emacs highlighter
+ default
+
+ readme.gentoo_create_doc
+
+ keepdir /etc/guix
+ # TODO: will need a tweak for prefix
+ keepdir /gnu/store
+ fowners root:guixbuild /gnu/store
+ fperms 1775 /gnu/store
+
+ keepdir /var/guix/profiles/per-user
+ fperms 1777 /var/guix/profiles/per-user
+
+ newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
^ permalink raw reply related [flat|nested] 22+ messages in thread
end of thread, other threads:[~2019-11-14 8:39 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-06 22:55 [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2019-11-14 8:38 Sergei Trofimovich
2019-11-07 23:39 Sergei Trofimovich
2019-11-07 23:39 Sergei Trofimovich
2019-10-13 12:04 Sergei Trofimovich
2019-07-21 9:51 Sergei Trofimovich
2019-07-21 9:51 Sergei Trofimovich
2019-07-14 22:13 Sergei Trofimovich
2019-05-03 9:14 Sergei Trofimovich
2018-12-06 22:55 Sergei Trofimovich
2018-07-06 22:33 Sergei Trofimovich
2018-05-24 19:30 Sergei Trofimovich
2018-01-21 13:50 Sergei Trofimovich
2018-01-20 11:23 Sergei Trofimovich
2017-12-03 18:24 Sergei Trofimovich
2017-07-15 11:29 Sergei Trofimovich
2017-05-08 20:17 Sergei Trofimovich
2017-05-07 13:10 Michał Górny
2017-04-22 11:30 Sergei Trofimovich
2017-02-08 22:05 Sergei Trofimovich
2017-02-02 21:18 Sergei Trofimovich
2017-02-02 21:15 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox