me/guix
Archived
1
0
Fork 0
Code Activity

gnu: nar-herder: Update to 0-21.53682fa.

Browse source 
* gnu/packages/package-management.scm (nar-herder): Update to 0-21.53682fa.
[arguments]: Update style.
This commit is contained in:
Christopher Baines 2023-07-26 10:45:16 +01:00
parent ad9bcc1361
commit a62c8a80cb
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
gnu/packages/package-management.scm
View file

@ -1653,8 +1653,8 @@ in an isolated environment, in separate namespaces.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public nar-herder (define-public nar-herder
(let ((commit "b27ca4dc0efbb0d9c397fc39347af9b8e8734ab9") (let ((commit "53682fac7e00cd2801406edbd014922c1720c347")
(revision "20")) (revision "21"))
(package (package
(name "nar-herder") (name "nar-herder")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -1665,64 +1665,64 @@ in an isolated environment, in separate namespaces.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"075acihpxvw4rkmbn7wiswqixv2afla8d8x7mgxqc26hba090404")) "18mzrpc5ni8d6xbp1bg0nzdj0brmnji4jm1gyiq77dm17c118zyz"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules (((guix build guile-build-system) (list
#:modules `(((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:imported-modules ((guix build guile-build-system) #:imported-modules `((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'build 'set-GUILE_AUTO_COMPILE (add-before 'build 'set-GUILE_AUTO_COMPILE
(lambda _ (lambda _
;; To avoid warnings relating to 'guild'. ;; To avoid warnings relating to 'guild'.
(setenv "GUILE_AUTO_COMPILE" "0"))) (setenv "GUILE_AUTO_COMPILE" "0")))
(add-after 'install 'wrap-executable (add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs target #:allow-other-keys) (lambda* (#:key inputs outputs target #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(guile (assoc-ref inputs "guile")) (guile (assoc-ref inputs "guile"))
(version (target-guile-effective-version)) (version (target-guile-effective-version))
(scm (string-append out "/share/guile/site/" version)) (scm (string-append out "/share/guile/site/" version))
(go (string-append out "/lib/guile/" version "/site-ccache"))) (go (string-append out "/lib/guile/" version "/site-ccache")))
(for-each (for-each
(lambda (file) (lambda (file)
(simple-format (current-error-port) "wrapping: ~A\n" file) (simple-format (current-error-port) "wrapping: ~A\n" file)
(let ((guile-inputs (list (let ((guile-inputs (list
"guile-json" "guile-json"
"guile-gcrypt" "guile-gcrypt"
"guix" "guix"
"guile-lib" "guile-lib"
"guile-lzlib" "guile-lzlib"
"guile-zstd" "guile-zstd"
"guile-prometheus" "guile-prometheus"
"guile-sqlite3" "guile-sqlite3"
"guile-gnutls" "guile-gnutls"
"guile-fibers"))) "guile-fibers")))
(wrap-program file (wrap-program file
`("GUILE_LOAD_PATH" ":" prefix `("GUILE_LOAD_PATH" ":" prefix
(,scm ,(string-join (,scm ,(string-join
(map (lambda (input)
(string-append
(assoc-ref inputs input)
"/share/guile/site/"
version))
guile-inputs)
":")))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,go ,(string-join
(map (lambda (input) (map (lambda (input)
(string-append (string-append
(assoc-ref inputs input) (assoc-ref inputs input)
"/share/guile/site/" "/lib/guile/" version "/site-ccache"))
version))
guile-inputs) guile-inputs)
":"))) ":"))))))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (find-files bin)))))
(,go ,(string-join (delete 'strip)))) ; As the .go files aren't compatible
(map (lambda (input)
(string-append
(assoc-ref inputs input)
"/lib/guile/" version "/site-ccache"))
guile-inputs)
":"))))))
(find-files bin)))
#t))
(delete 'strip)))) ; As the .go files aren't compatible
(native-inputs (native-inputs
(list pkg-config (list pkg-config
autoconf autoconf