Use guix convention for commit versions
This commit is contained in:
parent
7fbdf7283d
commit
aedd58ce31
|
@ -36,22 +36,24 @@
|
||||||
;;;
|
;;;
|
||||||
|
|
||||||
(define-public emacs-treemacs-20201225
|
(define-public emacs-treemacs-20201225
|
||||||
(package
|
(let ((commit "6b045fd585421ab3c9e1185c2508d34af700490b")
|
||||||
(inherit emacs-treemacs)
|
(revision "1"))
|
||||||
(version "6b045fd585421ab3c9e1185c2508d34af700490b")
|
(package
|
||||||
(name "emacs-treemacs-20201225")
|
(inherit emacs-treemacs)
|
||||||
(source (origin
|
(version (git-version "2.8.0" revision commit))
|
||||||
(method git-fetch)
|
(name "emacs-treemacs-20201225")
|
||||||
(uri (git-reference
|
(source (origin
|
||||||
(url "https://github.com/Alexander-Miller/treemacs")
|
(method git-fetch)
|
||||||
(commit version)))
|
(uri (git-reference
|
||||||
(file-name (git-file-name name version))
|
(url "https://github.com/Alexander-Miller/treemacs")
|
||||||
(sha256
|
(commit commit)))
|
||||||
(base32
|
(file-name (git-file-name name version))
|
||||||
"0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj"))))
|
(sha256
|
||||||
(arguments (substitute-keyword-arguments (package-arguments emacs-treemacs)
|
(base32
|
||||||
((#:phases phases)
|
"0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj"))))
|
||||||
`(alist-delete 'check ,phases))))))
|
(arguments (substitute-keyword-arguments (package-arguments emacs-treemacs)
|
||||||
|
((#:phases phases)
|
||||||
|
`(alist-delete 'check ,phases)))))))
|
||||||
|
|
||||||
(define-public emacs-treemacs-extra-20201225
|
(define-public emacs-treemacs-extra-20201225
|
||||||
(package
|
(package
|
||||||
|
@ -75,41 +77,45 @@
|
||||||
(copy-recursively "../extra" ".")))))))))
|
(copy-recursively "../extra" ".")))))))))
|
||||||
|
|
||||||
(define-public emacs-all-the-icons-20201225
|
(define-public emacs-all-the-icons-20201225
|
||||||
(package
|
(let ((commit "6917b08f64dd8487e23769433d6cb9ba11f4152f")
|
||||||
(inherit emacs-all-the-icons)
|
(revision "1"))
|
||||||
(version "6917b08f64dd8487e23769433d6cb9ba11f4152f")
|
(package
|
||||||
(name "emacs-all-the-icons-20201225")
|
(inherit emacs-all-the-icons)
|
||||||
(source (origin
|
(version (git-version "4.0.1" revision commit))
|
||||||
(method git-fetch)
|
(name "emacs-all-the-icons-20201225")
|
||||||
(uri (git-reference
|
(source (origin
|
||||||
(url "https://github.com/domtronn/all-the-icons.el")
|
(method git-fetch)
|
||||||
(commit version)))
|
(uri (git-reference
|
||||||
(file-name (git-file-name name version))
|
(url "https://github.com/domtronn/all-the-icons.el")
|
||||||
(sha256
|
(commit commit)))
|
||||||
(base32
|
(file-name (git-file-name name version))
|
||||||
"0jzpil1k5brg4dvy0fxibbwwb2hkni5fkxng4n0wfv6099b2zc68"))))))
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0jzpil1k5brg4dvy0fxibbwwb2hkni5fkxng4n0wfv6099b2zc68")))))))
|
||||||
|
|
||||||
(define-public emacs-doom-themes-20201225
|
(define-public emacs-doom-themes-20201225
|
||||||
(package
|
(let ((commit "3761dfce75144e49789b6576e187acd82e2731ee")
|
||||||
(inherit emacs-doom-themes)
|
(revision "1"))
|
||||||
(version "3761dfce75144e49789b6576e187acd82e2731ee")
|
(package
|
||||||
(name "emacs-doom-themes-20201225")
|
(inherit emacs-doom-themes)
|
||||||
(source (origin
|
(version (git-version "2.1.6" revision commit))
|
||||||
(method git-fetch)
|
(name "emacs-doom-themes-20201225")
|
||||||
(uri (git-reference
|
(source (origin
|
||||||
(url "https://github.com/hlissner/emacs-doom-themes")
|
(method git-fetch)
|
||||||
(commit version)))
|
(uri (git-reference
|
||||||
(file-name (git-file-name name version))
|
(url "https://github.com/hlissner/emacs-doom-themes")
|
||||||
(sha256
|
(commit commit)))
|
||||||
(base32 "0a0lz9kkaaxj2r8xkcgyczz9pxq5hb4kd8mivqxmcj9572xs6v1r"))))
|
(file-name (git-file-name name version))
|
||||||
(arguments
|
(sha256
|
||||||
(substitute-keyword-arguments
|
(base32 "0a0lz9kkaaxj2r8xkcgyczz9pxq5hb4kd8mivqxmcj9572xs6v1r"))))
|
||||||
(package-arguments emacs-doom-themes)
|
(arguments
|
||||||
((#:phases phases)
|
(substitute-keyword-arguments
|
||||||
`(modify-phases ,phases
|
(package-arguments emacs-doom-themes)
|
||||||
(add-after 'unpack 'remove-broken-themes
|
((#:phases phases)
|
||||||
(lambda _
|
`(modify-phases ,phases
|
||||||
(delete-file "themes/doom-plain-theme.el")))))))))
|
(add-after 'unpack 'remove-broken-themes
|
||||||
|
(lambda _
|
||||||
|
(delete-file "themes/doom-plain-theme.el"))))))))))
|
||||||
|
|
||||||
(define-public emacs-helm-tramp
|
(define-public emacs-helm-tramp
|
||||||
(package
|
(package
|
||||||
|
@ -530,60 +536,62 @@ See perspective.el on github: https://github.com/nex3/perspective-el
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public emacs-helm-rg
|
(define-public emacs-helm-rg
|
||||||
(package
|
(let ((commit "ee0a3c09da0c843715344919400ab0a0190cc9dc")
|
||||||
(name "emacs-helm-rg")
|
(revision "1"))
|
||||||
(version "ee0a3c09da0c843715344919400ab0a0190cc9dc")
|
(package
|
||||||
(source (origin
|
(name "emacs-helm-rg")
|
||||||
(method git-fetch)
|
(version (git-version "0.1" revision commit))
|
||||||
(uri (git-reference
|
(source (origin
|
||||||
(url "https://github.com/cosmicexplorer/helm-rg")
|
(method git-fetch)
|
||||||
(commit version)))
|
(uri (git-reference
|
||||||
(file-name (git-file-name name version))
|
(url "https://github.com/cosmicexplorer/helm-rg")
|
||||||
(sha256
|
(commit commit)))
|
||||||
(base32
|
(file-name (git-file-name name version))
|
||||||
"0m4l894345n0zkbgl0ar4c93v8pyrhblk9zbrjrdr9cfz40bx2kd"))))
|
(sha256
|
||||||
(build-system gnu-build-system)
|
(base32
|
||||||
(arguments
|
"0m4l894345n0zkbgl0ar4c93v8pyrhblk9zbrjrdr9cfz40bx2kd"))))
|
||||||
`(#:modules ((guix build gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
((guix build emacs-build-system) #:prefix emacs:)
|
(arguments
|
||||||
(guix build utils)
|
`(#:modules ((guix build gnu-build-system)
|
||||||
(srfi srfi-1))
|
((guix build emacs-build-system) #:prefix emacs:)
|
||||||
#:imported-modules (,@%gnu-build-system-modules
|
(guix build utils)
|
||||||
(guix build emacs-build-system)
|
(srfi srfi-1))
|
||||||
(guix build emacs-utils))
|
#:imported-modules (,@%gnu-build-system-modules
|
||||||
#:phases
|
(guix build emacs-build-system)
|
||||||
(modify-phases %standard-phases
|
(guix build emacs-utils))
|
||||||
(delete 'configure)
|
#:phases
|
||||||
(replace 'build
|
(modify-phases %standard-phases
|
||||||
(lambda _
|
(delete 'configure)
|
||||||
(invoke "make" "compile-all")
|
(replace 'build
|
||||||
#t))
|
(lambda _
|
||||||
(replace 'check
|
(invoke "make" "compile-all")
|
||||||
(lambda _
|
#t))
|
||||||
(invoke "make" "test-noninteractive")
|
(replace 'check
|
||||||
#t))
|
(lambda _
|
||||||
(replace 'install
|
(invoke "make" "test-noninteractive")
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
#t))
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(replace 'install
|
||||||
(target (string-append out "/share/emacs/site-lisp")))
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(mkdir-p target)
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
(for-each
|
(target (string-append out "/share/emacs/site-lisp")))
|
||||||
(lambda (f) (install-file f target))
|
(mkdir-p target)
|
||||||
(filter (lambda (f)
|
(for-each
|
||||||
(not (or (string-contains f "test")
|
(lambda (f) (install-file f target))
|
||||||
(string-contains f "checkdoc"))))
|
(filter (lambda (f)
|
||||||
(find-files "." "\\.elc?$"))))))
|
(not (or (string-contains f "test")
|
||||||
(add-after 'install 'make-autoloads
|
(string-contains f "checkdoc"))))
|
||||||
(assoc-ref emacs:%standard-phases 'make-autoloads))
|
(find-files "." "\\.elc?$"))))))
|
||||||
(delete 'strip))))
|
(add-after 'install 'make-autoloads
|
||||||
(native-inputs
|
(assoc-ref emacs:%standard-phases 'make-autoloads))
|
||||||
`(("emacs" ,emacs-minimal)))
|
(delete 'strip))))
|
||||||
(propagated-inputs
|
(native-inputs
|
||||||
`(("emacs-dash" ,emacs-dash)
|
`(("emacs" ,emacs-minimal)))
|
||||||
("emacs-helm" ,emacs-helm)))
|
(propagated-inputs
|
||||||
(home-page
|
`(("emacs-dash" ,emacs-dash)
|
||||||
"https://github.com/cosmicexplorer/helm-rg")
|
("emacs-helm" ,emacs-helm)))
|
||||||
(synopsis "Helm interface to ripgrep")
|
(home-page
|
||||||
(description
|
"https://github.com/cosmicexplorer/helm-rg")
|
||||||
"Helm interface for ripgrep.")
|
(synopsis "Helm interface to ripgrep")
|
||||||
(license license:gpl3+)))
|
(description
|
||||||
|
"Helm interface for ripgrep.")
|
||||||
|
(license license:gpl3+))))
|
||||||
|
|
Loading…
Reference in New Issue