[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: website: Pass the right directory name to 'git-predicate'.
From: |
Ludovic Courtès |
Subject: |
02/03: website: Pass the right directory name to 'git-predicate'. |
Date: |
Fri, 5 Jul 2019 06:29:05 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix-artwork.
commit 48ed3f20b99de1a201777e906ebb75672c6275dd
Author: Ludovic Courtès <address@hidden>
Date: Fri Jul 5 12:26:16 2019 +0200
website: Pass the right directory name to 'git-predicate'.
* website/.guix.scm (this-directory): New variable.
(source): Pass it to 'local-file' and to 'git-predicate'.
---
website/.guix.scm | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/website/.guix.scm b/website/.guix.scm
index 42fdeaa..8d99c65 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -1,5 +1,5 @@
;;; GNU Guix web site
-;;; Copyright © 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2017, 2019 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of the GNU Guix web site.
;;;
@@ -16,16 +16,20 @@
;;; You should have received a copy of the GNU General Public License
;;; along with the GNU Guix web site. If not, see
<http://www.gnu.org/licenses/>.
-;; Run 'guix build -f guix.scm' to build the web site.
+;; Run 'guix build -f .guix.scm' to build the web site.
(use-modules (guix) (gnu)
(guix modules)
- (guix git-download))
+ (guix git-download)
+ (ice-9 match))
+
+(define this-directory
+ (dirname (current-filename)))
(define source
- (local-file "." "guix-web-site"
+ (local-file this-directory "guix-web-site"
#:recursive? #t
- #:select? (git-predicate ".")))
+ #:select? (git-predicate this-directory)))
(define-syntax let-package
(syntax-rules ()