diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-05-25 00:25:15 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-05-25 00:25:15 +0200 |
commit | 57df83e07d4b5e78d9a54c1a88d05b4a9ed65714 (patch) | |
tree | 76684e63965e9ad6e37d9d45bc3159e6c9782cd0 /guix/self.scm | |
parent | 43d9ed7792808638eabb43aa6133f1d6186c520b (diff) | |
parent | 136b7d81f0eb713783e9ea7cf7f260a2b6252dfd (diff) | |
download | guix-patches-57df83e07d4b5e78d9a54c1a88d05b4a9ed65714.tar guix-patches-57df83e07d4b5e78d9a54c1a88d05b4a9ed65714.tar.gz |
Merge branch 'staging' into core-updates
Diffstat (limited to 'guix/self.scm')
-rw-r--r-- | guix/self.scm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/guix/self.scm b/guix/self.scm index 68b87051e9..6d7569ec19 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -377,12 +377,6 @@ TRANSLATIONS, an alist of msgid and msgstr." (define (info-manual source) "Return the Info manual built from SOURCE." - (define po4a - (specification->package "po4a")) - - (define gettext - (specification->package "gettext")) - (define texinfo (module-ref (resolve-interface '(gnu packages texinfo)) 'texinfo)) @@ -588,6 +582,8 @@ load path." ("share/guix/berlin.guixsd.org.pub" ,(file-append* source "/etc/substitutes/berlin.guixsd.org.pub")) + ("share/guix/ci.guix.gnu.org.pub" ;alias + ,(file-append* source "/etc/substitutes/berlin.guixsd.org.pub")) ("share/guix/ci.guix.info.pub" ;alias ,(file-append* source "/etc/substitutes/berlin.guixsd.org.pub"))))) @@ -923,6 +919,7 @@ Info manual." %store-database-directory %config-directory %libz + ;; TODO: %liblz %gzip %bzip2 %xz)) |