branch: externals/srht
commit 65e791cce0fa7cbddd5ea79beefdbd0ae3531619
Author: Aleksandr Vityazev <[email protected]>
Commit: Aleksandr Vityazev <[email protected]>
Move Elisp files to the lisp dir.
* .envrc: Add envrc.
* Makefile: Add makefile.
* guix: (last-commit-hash): New procedure.
(emacs-srht)[source]: Change to ./lisp.
---
.envrc | 1 +
Makefile | 2 ++
guix.scm | 17 ++++++++++++++---
srht-paste.el => lisp/srht-paste.el | 0
srht-pkg.el => lisp/srht-pkg.el | 0
srht.el => lisp/srht.el | 0
6 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000000..170ff41b9e
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use guix --ad-hoc make
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..87e2b36ac9
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,2 @@
+build:
+ guix build -f guix.scm
diff --git a/guix.scm b/guix.scm
index 5c57789323..b4cb6ed3b0 100644
--- a/guix.scm
+++ b/guix.scm
@@ -23,7 +23,10 @@
(guix git-download)
(guix build-system emacs)
((guix licenses) #:prefix license:)
- (gnu packages emacs))
+ (gnu packages emacs)
+ (ice-9 receive)
+ (ice-9 popen)
+ (ice-9 rdelim))
(define-public emacs-plz
(let ((commit "1d3efc036c9fdb7242499575e4d6bdcc928b0539")
@@ -48,14 +51,22 @@
(description #f)
(license license:gpl3+))))
+(define (last-commit-hash)
+ (receive (in out pids)
+ (pipeline `(("git" "rev-parse" "HEAD")))
+ (let ((val (read-line in)))
+ (close in)
+ (close out)
+ val)))
+
(define-public emacs-srht
- (let ((commit "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
+ (let ((commit (last-commit-hash))
(revision "0")
(version "0.1.0"))
(package
(name "emacs-srht")
(version (git-version version revision commit))
- (source (local-file "" #:recursive? #t))
+ (source (local-file "./lisp" #:recursive? #t))
(build-system emacs-build-system)
(arguments (list #:emacs emacs-next))
(propagated-inputs (list emacs-plz))
diff --git a/srht-paste.el b/lisp/srht-paste.el
similarity index 100%
rename from srht-paste.el
rename to lisp/srht-paste.el
diff --git a/srht-pkg.el b/lisp/srht-pkg.el
similarity index 100%
rename from srht-pkg.el
rename to lisp/srht-pkg.el
diff --git a/srht.el b/lisp/srht.el
similarity index 100%
rename from srht.el
rename to lisp/srht.el