aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Isaac2024-01-25 23:12:13 +0000
committerArun Isaac2024-01-25 23:12:13 +0000
commit5299c0fef21441348e6942836645dd6e14d9196c (patch)
treea0e98adeac99787327fad862f9e28e950d4330b7
parenta72e4e91580fc716c86c7d9bce5aa8be72b7b78e (diff)
downloadccwl-5299c0fef21441348e6942836645dd6e14d9196c.tar.gz
ccwl-5299c0fef21441348e6942836645dd6e14d9196c.tar.lz
ccwl-5299c0fef21441348e6942836645dd6e14d9196c.zip
Revert "guix: Use source with complete git repo to build website."
This reverts commit af2f18534bd38703b98cb329d3110a8073d39fb6. When building as a Guix channel, the complete git repository is not available anyway.
-rw-r--r--.guix/ccwl-package.scm11
1 files changed, 2 insertions, 9 deletions
diff --git a/.guix/ccwl-package.scm b/.guix/ccwl-package.scm
index 87eccca..a70e3e0 100644
--- a/.guix/ccwl-package.scm
+++ b/.guix/ccwl-package.scm
@@ -20,7 +20,6 @@
#: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)
@@ -37,11 +36,6 @@
#: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
@@ -53,8 +47,7 @@
(guix build utils))
(set-path-environment-variable
- "PATH" (list "/bin") (list #$development-profile
- #$emacs-minimal #$git-minimal))
+ "PATH" (list "/bin") (list #$development-profile #$emacs-minimal))
(set-path-environment-variable
"LIBRARY_PATH" (list "/lib") (list #$development-profile))
(set-path-environment-variable
@@ -66,7 +59,7 @@
"GUILE_LOAD_COMPILED_PATH"
(list (string-append "/lib/guile/" (target-guile-effective-version) "/site-ccache"))
(list #$development-profile))
- (copy-recursively #$ccwl-source-with-git-repo
+ (copy-recursively #$(package-source ccwl)
(getcwd))
;; Emacs modifies README.org presumably for the contained
;; org dynamic block. So, grant write permissions.