diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-04 23:16:17 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-04 23:16:17 +0100 |
commit | ebb7cf9e21060105d9950dd5142c0eb918083666 (patch) | |
tree | 36c1607b80d92e27fb9d09029d1d3b57a1fd5065 /gnu/packages/gnupg.scm | |
parent | 0b870f7915f5da43758753fd088a22033936dc50 (diff) | |
parent | c2d7e800e6788277bc56f31d5836f9d507dc1506 (diff) | |
download | guix-ebb7cf9e21060105d9950dd5142c0eb918083666.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gnupg.scm')
-rw-r--r-- | gnu/packages/gnupg.scm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index f4478411e3..5d389d165c 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -470,7 +470,7 @@ gpgpme starting with version 1.7.") (sha256 (base32 "0n232iyayc46f7hywmjw0jr7pbmmz5h4b04jskhkzz9gxz0ci99c")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments ;; When cross-compiling, the bash script libgcrypt-config provided by @@ -1115,15 +1115,17 @@ over.") (define-public jetring (package (name "jetring") - (version "0.27") + (version "0.29") (source (origin - (method url-fetch) - (uri (string-append "mirror://debian/pool/main/j/" name "/" - name "_" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/debian/jetring") + (commit (string-append "debian/" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0jy0x5zj7v87xgyldlsx1knzp0mv10wzamblrw1b61i2m1ii4pxz")))) + "1acbx2vnbkms1c0wgcnh05d4g359sg5z0aiw541vx2qq9sgdhlv6")))) (build-system gnu-build-system) (arguments '(#:phases |