diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-20 00:05:21 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-20 00:05:21 +0100 |
| commit | 24d4d6fdd67561e0de4b1cea6380e43e63d69646 (patch) | |
| tree | 9c3f946b6e7c3d67af44cdcd9710ad8320e90080 /gnu/packages/debian.scm | |
| parent | 92982ecca4efe857666d8b94ad95d2cc7d2ab54b (diff) | |
| parent | a512bbd23a2e129cf3d8e71255d504ce8bac77d3 (diff) | |
| download | guix-24d4d6fdd67561e0de4b1cea6380e43e63d69646.tar.gz | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/debian.scm')
| -rw-r--r-- | gnu/packages/debian.scm | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 728f2cc845..b0a0b9e5d3 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -149,15 +149,15 @@ contains the archive keys used for that.") (define-public ubuntu-keyring (package (name "ubuntu-keyring") - (version "2021.03.26") + (version "2023.11.28.1") (source (origin (method url-fetch) (uri (string-append "https://launchpad.net/ubuntu/+archive/primary/" - "+files/" name "_" version ".tar.gz")) + "+files/" name "_" version ".tar.xz")) (sha256 (base32 - "1ccvwh4s51viyhcg8gh189jmvbrhc5wv1bbp4minz3200rffsbj9")))) + "0bmafky67hrb79baaydmw7al21lz0wgi4ks5dqfkfqamw5d4bkdf")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -167,7 +167,7 @@ contains the archive keys used for that.") (apt (string-append out "/etc/apt/trusted.gpg.d/")) (key (string-append out "/share/keyrings/"))) (setenv "PATH" (string-append - (assoc-ref %build-inputs "gzip") "/bin:" + (assoc-ref %build-inputs "xz") "/bin:" (assoc-ref %build-inputs "tar") "/bin")) (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) (for-each (lambda (file) @@ -175,10 +175,9 @@ contains the archive keys used for that.") (find-files "." "ubuntu-[^am].*\\.gpg$")) (for-each (lambda (file) (install-file file key)) - (find-files "." "ubuntu-[am].*\\.gpg$"))) - #t))) + (find-files "." "ubuntu-[am].*\\.gpg$")))))) (native-inputs - (list tar gzip)) + (list tar xz)) (home-page "https://launchpad.net/ubuntu/+source/ubuntu-keyring") (synopsis "GnuPG keys of the Ubuntu archive") (description |