From baa1a0165ca3662a9e247e562205208f12df6c8b Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 17 Aug 2018 01:34:12 +0200 Subject: guix: fix git filter and source-dir --- contrib/guix/gnu/packages/gnunet.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/guix/gnu/packages/gnunet.scm b/contrib/guix/gnu/packages/gnunet.scm index 3a1943757..a91c69a11 100644 --- a/contrib/guix/gnu/packages/gnunet.scm +++ b/contrib/guix/gnu/packages/gnunet.scm @@ -245,8 +245,14 @@ supports HTTP, HTTPS and GnuTLS.") "See COPYING in the distribution.")) (home-page "https://gnunet.org/gnurl"))) -(define %source-dir (dirname (current-filename))) +(define (repeat f n) + (if (= n 1) + f + (lambda (x) (f ((repeat f (- n 1)) x))))) + +(define %source-dir ((repeat dirname 5) (current-filename))) + (define (git-output . args) "Execute 'git ARGS ...' command and return its output without trailing newspace." @@ -260,7 +266,7 @@ newspace." (git-output "describe" "--tags")) (define (git-sources) - (local-file (dirname (dirname (dirname (dirname %source-dir)))) + (local-file %source-dir #:recursive? #t #:select? (git-predicate %source-dir))) -- cgit v1.2.3