From c68a881754b126948381ee174048fceda9d2460f Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 17 Aug 2018 00:55:20 +0200 Subject: fix guix git version --- contrib/guix/gnu/packages/gnunet.scm | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'contrib') diff --git a/contrib/guix/gnu/packages/gnunet.scm b/contrib/guix/gnu/packages/gnunet.scm index 4f006769d..b24b58282 100644 --- a/contrib/guix/gnu/packages/gnunet.scm +++ b/contrib/guix/gnu/packages/gnunet.scm @@ -24,6 +24,8 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages gnunet) + #:use-module (ice-9 popen) + #:use-module (ice-9 rdelim) #:use-module (gnu packages) #:use-module (gnu packages file) #:use-module (gnu packages base) @@ -61,6 +63,7 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages backup) #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix build utils) #:prefix build-utils:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) @@ -244,12 +247,27 @@ supports HTTP, HTTPS and GnuTLS.") (define %source-dir (dirname (current-filename))) +(define (git-output . args) + "Execute 'git ARGS ...' command and return its output without trailing +newspace." + (build-utils:with-directory-excursion %source-dir + (let* ((port (apply open-pipe* OPEN_READ "git" args)) + (output (read-string port))) + (close-port port) + (string-trim-right output #\newline)))) + +(define (current-git-version) + (git-output "describe" "--tags")) + +(define (git-sources) + (local-file (dirname (dirname (dirname (dirname %source-dir)))) + #:recursive? #t)) + (define-public gnunet (package (name "gnunet") - (version "0.10.1") - (source (local-file (dirname (dirname (dirname %source-dir))) - #:recursive? #t)) + (version (current-git-version)) + (source (git-sources)) (build-system gnu-build-system) (inputs `(("glpk" ,glpk) -- cgit v1.2.3