diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-11-15 20:11:35 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-15 20:11:35 +0100 |
commit | f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242 (patch) | |
tree | 80c815216a3717cf00b615c9cb8840c113eaf79f /gnu/packages/jrnl.scm | |
parent | 2c9d34166983565120f831284df57a07e2edd2f9 (diff) | |
parent | 528b52390d216d8a8cd13dfcd1e6e40a6448e6c2 (diff) | |
download | guix-f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/jrnl.scm')
-rw-r--r-- | gnu/packages/jrnl.scm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gnu/packages/jrnl.scm b/gnu/packages/jrnl.scm index 6393ea9105..e5e2a4ba4f 100644 --- a/gnu/packages/jrnl.scm +++ b/gnu/packages/jrnl.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Eric Bavier <address@hidden> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,7 +22,7 @@ (define-module (gnu packages jrnl) #:use-module (guix packages) #:use-module (guix licenses) - #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system python) #:use-module (gnu packages check) #:use-module (gnu packages python) @@ -35,13 +36,13 @@ (version "1.9.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/maebert/jrnl/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0mfq7hhw5np2dj9jlxpyyk2cg9i0xgz2brb894d928hczszy97bq")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/maebert/jrnl.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bjjyfc3fnsy0h299s3jj42wnigj43xdyp5ppi1cvkqbwl369935")))) (build-system python-build-system) (native-inputs `(("behave" ,behave))) |