GNU bug report logs - #33600
[PATCH 0/3] Defaulting to ci.guix.info (aka. berlin.guixsd.org)

Previous Next

Package: guix-patches;

Reported by: Ludovic Courtès <ludo <at> gnu.org>

Date: Mon, 3 Dec 2018 15:45:02 UTC

Severity: normal

Tags: patch

Done: ludo <at> gnu.org (Ludovic Courtès)

Bug is archived. No further changes may be made.

Full log


Message #11 received at 33600 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: 33600 <at> debbugs.gnu.org
Cc: guix-devel <at> gnu.org, Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH 1/3] etc: Add "ci.guix.info.pub" public key file.
Date: Mon,  3 Dec 2018 16:53:33 +0100
* etc/substitutes/ci.guix.info.pub: New file.
* Makefile.am (dist_pkgdata_DATA): Add it.
* guix/self.scm (miscellaneous-files): Add
"share/guix/ci.guix.info.pub".
---
 Makefile.am                      | 3 ++-
 etc/substitutes/ci.guix.info.pub | 1 +
 guix/self.scm                    | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 120000 etc/substitutes/ci.guix.info.pub

diff --git a/Makefile.am b/Makefile.am
index 32cebd5917..6803666a57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -459,7 +459,8 @@ check-system: $(GOBJECTS)
 # Public key used to sign substitutes from hydra.gnu.org & co.
 dist_pkgdata_DATA =				\
   etc/substitutes/hydra.gnu.org.pub		\
-  etc/substitutes/berlin.guixsd.org.pub
+  etc/substitutes/berlin.guixsd.org.pub		\
+  etc/substitutes/ci.guix.info.pub
 
 # Bash completion file.
 dist_bashcompletion_DATA = etc/completion/bash/guix	\
diff --git a/etc/substitutes/ci.guix.info.pub b/etc/substitutes/ci.guix.info.pub
new file mode 120000
index 0000000000..b1d1e4d763
--- /dev/null
+++ b/etc/substitutes/ci.guix.info.pub
@@ -0,0 +1 @@
+berlin.guixsd.org.pub
\ No newline at end of file
diff --git a/guix/self.scm b/guix/self.scm
index 8476c422ec..f2db3dbf52 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -428,6 +428,9 @@ load path."
                    ,(file-append* source
                                   "/etc/substitutes/hydra.gnu.org.pub"))
                   ("share/guix/berlin.guixsd.org.pub"
+                   ,(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")))))
 
 (define* (whole-package name modules dependencies
-- 
2.19.2





This bug report was last modified 6 years and 132 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.