diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-08-04 13:41:27 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-08-04 13:41:27 +0200 |
| commit | f35d3132654bd1be5c7453f9eb43eb6e9de85a15 (patch) | |
| tree | f62c3a069153d1612a5c270e991eebe43c4f5cae /guix/scripts/build.scm | |
| parent | 1dff73acf908125b292de2ab2fc5b25155ad77d8 (diff) | |
| parent | e920037793faeebf8fb2a918b50a1751b125a0af (diff) | |
| download | guix-patches-f35d3132654bd1be5c7453f9eb43eb6e9de85a15.tar guix-patches-f35d3132654bd1be5c7453f9eb43eb6e9de85a15.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts/build.scm')
| -rw-r--r-- | guix/scripts/build.scm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index ec58ba871b..3ee0b737fe 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -341,10 +341,15 @@ strings like \"guile-next=cabba9e\" meaning that packages are built using (define (replace old url commit) (package (inherit old) - (version (string-append "git." - (if (< (string-length commit) 7) - commit - (string-take commit 7)))) + (version (if (and (> (string-length commit) 1) + (string-prefix? "v" commit) + (char-set-contains? char-set:digit + (string-ref commit 1))) + (string-drop commit 1) ;looks like a tag like "v1.0" + (string-append "git." + (if (< (string-length commit) 7) + commit + (string-take commit 7))))) (source (git-checkout (url url) (commit commit) (recursive? #t))))) |