summary refs log tree commit diff
diff options
context:
space:
mode:
authorArun Isaac2024-01-25 22:00:29 +0000
committerArun Isaac2024-01-25 22:00:29 +0000
commitaf2f18534bd38703b98cb329d3110a8073d39fb6 (patch)
tree623568d1e0782c9a65b07eb2333b9678e53e3d6d
parent763d01a80a36482d69b3bd548cdb30766fb68b08 (diff)
downloadccwl-af2f18534bd38703b98cb329d3110a8073d39fb6.tar.gz
ccwl-af2f18534bd38703b98cb329d3110a8073d39fb6.tar.lz
ccwl-af2f18534bd38703b98cb329d3110a8073d39fb6.zip
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.
-rw-r--r--.guix/ccwl-package.scm11
1 files 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.