From af2f18534bd38703b98cb329d3110a8073d39fb6 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 25 Jan 2024 22:00:29 +0000 Subject: guix: Use source with complete git repository to build website. * .guix/ccwl-package.scm: Import git-minimal from (gnu packages version-control). (ccwl-source-with-git-repo): New variable. (ccwl-website-gexp): Make git visible via PATH. Use ccwl-source-with-git-repo. --- .guix/ccwl-package.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.guix/ccwl-package.scm b/.guix/ccwl-package.scm index a70e3e0..87eccca 100644 --- a/.guix/ccwl-package.scm +++ b/.guix/ccwl-package.scm @@ -20,6 +20,7 @@ #:use-module ((gnu packages bioinformatics) #:prefix guix:) #:use-module ((gnu packages emacs) #:select (emacs-minimal)) #:use-module ((gnu packages fonts) #:select (font-charter font-fira-code)) + #:use-module ((gnu packages version-control) #:select (git-minimal)) #:use-module ((guix build-system guile) #:select (%guile-build-system-modules)) #:use-module (guix gexp) #:use-module (guix git-download) @@ -36,6 +37,11 @@ #:select? (or (git-predicate (dirname (current-source-directory))) (const #t)))))) +(define ccwl-source-with-git-repo + (local-file ".." + "ccwl-checkout-with-git-repo" + #:recursive? #t)) + (define ccwl-website-gexp (let ((development-profile (profile @@ -47,7 +53,8 @@ (guix build utils)) (set-path-environment-variable - "PATH" (list "/bin") (list #$development-profile #$emacs-minimal)) + "PATH" (list "/bin") (list #$development-profile + #$emacs-minimal #$git-minimal)) (set-path-environment-variable "LIBRARY_PATH" (list "/lib") (list #$development-profile)) (set-path-environment-variable @@ -59,7 +66,7 @@ "GUILE_LOAD_COMPILED_PATH" (list (string-append "/lib/guile/" (target-guile-effective-version) "/site-ccache")) (list #$development-profile)) - (copy-recursively #$(package-source ccwl) + (copy-recursively #$ccwl-source-with-git-repo (getcwd)) ;; Emacs modifies README.org presumably for the contained ;; org dynamic block. So, grant write permissions. -- cgit v1.2.3