aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2024-06-29news: Add entry for stumpwm:lib removal....* etc/news.scm: Add entry. Change-Id: Iff23c3f1d251cd23b0227b09eb1f05614b132dfb Guillaume Le Vaillant
2024-06-29gnu: stumpwm: Use a single output....This is a warkaround for the excess library grafts issue that can prevent stumpwm from working properly. See <https://issues.guix.gnu.org/47115> and <https://issues.guix.gnu.org/62890>. * gnu/packages/wm.scm (stumpwm)[outputs]: Remove "lib" output. [arguments]: Remove references to the "lib" output from phases. (stumpwm+slynk, stumpwm-contrib, sbcl-stumpwm-pamixer, sbcl-stumpwm-ttf-fonts, sbcl-stumpwm-stumptray, sbcl-stumpwm-disk, sbcl-stumpwm-screenshot, sbcl-stumpwm-notify, sbcl-stumpwm-battery-portable)[inputs]: Replace '(stumpwm "lib")' with 'stumpwm'. Change-Id: I3d8f025057965032c40ea833d3ebe62f9700071d Guillaume Le Vaillant
2024-06-29gnu: emacs-nano-modeline: Update to 1.1.0....* gnu/packages/emacs-xyz.scm (emacs-nano-modeline): Update to 1.1.0. Change-Id: I18938a941a6f3018323c37ba2fc35bacbb1c3257 Nicolas Goaziou
2024-06-29gnu: emacs-context-transient: Update to 1.0.1....* gnu/packages/emacs-xyz.scm (emacs-context-transient): Update to 1.0.1. Change-Id: Ie77367c0f5d65218d0b2d5a9fef28cd7e4156a91 Nicolas Goaziou
2024-06-29gnu: emacs-beframe: Update to 1.1.1....* gnu/packages/emacs-xyz.scm (emacs-beframe): Update to 1.1.1. Change-Id: If78580fbdb5575ee369fd6e87b99da98343e4a16 Nicolas Goaziou
2024-06-29gnu: emacs-orglink: Update to 1.2.3....* gnu/packages/emacs-xyz.scm (emacs-orglink): Update to 1.2.3. Change-Id: Ic79c31a5d1e0c2ccddec9db12f94c058b14d42b5 Nicolas Goaziou
2024-06-29gnu: emacs-no-littering: Update to 1.7.0....* gnu/packages/emacs-xyz.scm (emacs-no-littering): Update to 1.7.0. Change-Id: Ic0bd155bc1b06828ffb6fc48ff2eb9953cfdad9e Nicolas Goaziou
2024-06-29gnu: emacs-casual-dired: Update to 1.5.0....* gnu/packages/emacs-xyz.scm (emacs-casual-dired): Update to 1.5.0. Change-Id: I129a54757e2d45b19a4af835631120bc36916da3 Nicolas Goaziou
2024-06-29gnu: Add emacs-casual-lib....* gnu/packages/emacs-xyz.scm (emacs-casual-lib): New variable. Change-Id: I7b5baa39985c55ef51281baeb2df65a8c11879b4 Nicolas Goaziou
2024-06-29gnu: emacs-transient: Update to 0.7.2....* gnu/packages/emacs-xyz.scm (emacs-transient): Update to 0.7.2. Change-Id: I1d52921d0850dfe77c81d82417d84ecc2e2f865d Nicolas Goaziou
2024-06-29gnu: emacs-notmuch-maildir: Update to 0.2.3....* gnu/packages/emacs-xyz.scm (emacs-notmuch-maildir): Update to 0.2.3. Change-Id: I44e9f4d45618ecfa932d722b1515ba48cd5783f9 Nicolas Goaziou
2024-06-29gnu: emacs-dtrt-indent: Update to 1.18....* gnu/packages/emacs-xyz.scm (emacs-dtrt-indent): Update to 1.18. Change-Id: I0fd8854ae7c1f7a5e98821943c3d2d5e520c2c18 Nicolas Goaziou
2024-06-29gnu: emacs-deadgrep: Update to 0.13....* gnu/packages/emacs-xyz.scm (emacs-deadgrep): Update to 0.13. Change-Id: Iffe8590632318925efb3a943d8751624d0ee2f90 Nicolas Goaziou
2024-06-29gnu: emacs-org-ql: Update to 0.8.7....* gnu/packages/emacs-xyz.scm (emacs-org-ql): Update to 0.8.7. Change-Id: I592f482984dd32e5077d011ad98a2c92236e2116 Nicolas Goaziou
2024-06-29gnu: emacs-pg: Update to 0.36....* gnu/packages/emacs-xyz.scm (emacs-pg): Update to 0.36. Change-Id: I88fee173c945d1be8d1644d1b87d6eeb240fc0cf Nicolas Goaziou
2024-06-29gnu: emacs-org: Update to 9.7.6....* gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.7.6. Change-Id: I56d201408b22e02e600274b3f1037d432153275e Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr> Suhail Singh
2024-06-29gnu: emacs-hl-todo: Update to 3.7.0....* gnu/packages/emacs-xyz.scm (emacs-hl-todo): Update to 3.7.0. Change-Id: I645df86a3a8d5c59d4db45033a42d4c1a3e6c445 Nicolas Goaziou
2024-06-29gnu: emacs-jinx: Update to 1.8....* gnu/packages/emacs-xyz.scm (emacs-jinx): Update to 1.8. Change-Id: Ide349dcc87b2693a01732a1fddf04168da40a641 Nicolas Goaziou
2024-06-29gnu: emacs-slime, sbcl-slime-swank: Update to 2.30....* gnu/packages/emacs-xyz.scm (emacs-slime): Update to 2.30. * gnu/packages/lisp-xyz.scm (sbcl-slime-swank): Update to 2.30. Change-Id: Id64f3bd4dda8a91dc420a919eab676f00e6e982f Nicolas Goaziou
2024-06-29gnu: emacs-ol-notmuch: Update to 2.0.2....* gnu/packages/emacs-xyz.scm (emacs-ol-notmuch): Update to 2.0.2. Change-Id: Iacd6415c00234a72dc28c09d80d0af91acd91832 Nicolas Goaziou
2024-06-29gnu: emacs-paren-face: Update to 1.1.1....* gnu/packages/emacs-xyz.scm (emacs-paren-face): Update to 1.1.1. Change-Id: I626e0d7c308c609f126f3556b374d1c21dd506e4 Nicolas Goaziou
2024-06-29gnu: emacs-auto-compile: Update to 2.0.2....* gnu/packages/emacs-xyz.scm (emacs-auto-compile): Update to 2.0.2. Change-Id: I71ff8076e17886dcad04421ceb709280d1a0e728 Nicolas Goaziou
2024-06-29gnu: emacs-moody: Update to 1.1.0....* gnu/packages/emacs-xyz.scm (emacs-moody): Update to 1.1.0. Change-Id: I8e22e59378e93791e33f3323df6e7be589ccfa44 Nicolas Goaziou
2024-06-29gnu: emacs-minions: Update to 1.0.1....* gnu/packages/emacs-xyz.scm (emacs-minions): Update to 1.0.1. Change-Id: I3ba9eeed4f613dc4a476ff94913ce29f539671e4 Nicolas Goaziou
2024-06-29gnu: emacs-with-editor: Update to 3.3.4....* gnu/packages/emacs-xyz.scm (emacs-with-editor): Update to 3.3.4. Change-Id: I8e01e1f87e57bc5acef065aa146f4e4ab39b0ac6 Nicolas Goaziou
2024-06-29gnu: emacs-gptel: Update to 0.9.0....* gnu/packages/emacs-xyz.scm (emacs-gptel): Update to 0.9.0. Change-Id: I6128353e2ec1b3851adf302bb87c218985ab96b9 Nicolas Goaziou
2024-06-29gnu: matterbridge: Swap to go-build-system....* gnu/packages/messaging.scm (matterbridge): Adjust package style. [build-system]: Swap to go-build-system. [arguments]: <#:go>: Use go-1.21. Change-Id: I839f1a0c369a143e8d36d6f919e1751a915c524a Sharlatan Hellseher
2024-06-29gnu: go-golang-org-x-crypto: Update to 0.14.0....* gnu/packages/golang-build.scm (go-golang-org-x-crypto): Update to 0.14.0. [propagated-inputs]: Add go-golang-org-x-net, go-golang-org-x-term and go-golang-org-x-text. Change-Id: I0b064137070be75545f012fc7a89280522855e27 Sharlatan Hellseher
2024-06-29gnu: go-golang-org-x-sys: Fix indentation....* gnu/packages/golang-build.scm (go-golang-org-x-sys): Re indent. Change-Id: I63f95e9fb8d6d633fbb0642100c60d5df9121730 Sharlatan Hellseher
2024-06-29gnu: go-golang-org-x-sys: Update to 0.21.0....* gnu/packages/golang-build.scm (go-golang-org-x-sys): Update to 0.21.0. Change-Id: I0509e9aad319f55641807a28ebbd32b50cf34ede Sharlatan Hellseher
2024-06-29gnu: go-golang-org-x-sys: Enable tests....* gnu/packages/golang-build.scm (go-golang-org-x-sys) [arguments]: <#:tests>: Enable them. <#:phases>: Add custom 'check phase. Change-Id: Ie58ea6f0aa677742307d18cfaafcf6ec381c85c9 Sharlatan Hellseher
2024-06-29gnu: go-golang-org-x-sync: Improve description....* gnu/packages/golang-build.scm (go-golang-org-x-sync) [description]: Extend and improve description. Change-Id: Ie5b48230d7bc7bbd03e2af76d3a3660960282291 Sharlatan Hellseher
2024-06-29gnu: go-golang-org-x-sync: Fix indentation....* gnu/packages/golang-build.scm (go-golang-org-x-sync): Re indent. Change-Id: I0399635dc8ddd2917b2f5920da883fa0459e7e30 Sharlatan Hellseher
2024-06-29gnu: go-golang-org-x-sync: Update to 0.7.0....* gnu/packages/golang-build.scm (go-golang-org-x-sync): Update to 0.7.0. Change-Id: Ifd4e2035b2d6e2e9cec93342a8871cf0ed9f0443 Sharlatan Hellseher
2024-06-29gnu: go-golang-org-x-sync: Enable tests....* gnu/packages/golang-build.scm (go-golang-org-x-sync): Refresh package style. [arguments]: <#:phases>: Add custom 'check phase. Change-Id: Ibee36b53934faed80561d461090cfcfea32b5bfa Sharlatan Hellseher
2024-06-29gnu: Remove go-golang.org-x-sync-semaphore....* gnu/packages/golang-build.scm (go-golang.org-x-sync-semaphore): Delete variable. * gnu/packages/check.scm (actionlint): Adjust inputs. [inputs]: Remove go-golang.org-x-sync-semaphore. * gnu/packages/version-control.scm (git-lfs): Likewise. [propagated-inputs]: Remove go-golang.org-x-sync-semaphore; add go-golang-org-x-sync. Change-Id: Icf3edfc46696c8b9af79787ff77f7e65852bfef4 Sharlatan Hellseher
2024-06-29gnu: Remove go-golang.org-x-sync-errgroup....* gnu/packages/golang-build.scm (go-golang.org-x-sync-errgroup): Delete variable. * gnu/packages/check.scm (actionlint): Adjust inputs. [inputs]: Remove go-golang.org-x-sync-errgroup; add go-golang-org-x-sync. * gnu/packages/golang.scm (gotestsum): Likewise. [native-inputs]: Remove go-golang.org-x-sync-errgroup; add go-golang-org-x-sync. * gnu/packages/golang.scm (go-github-com-prometheus-procfs): Likewise. [propagated-inputs]: Remove go-golang.org-x-sync-errgroup; add go-golang-org-x-sync. * gnu/packages/terminals.scm (go-github-com-junegunn-fzf): Likewise. [inputs]: Remove go-golang.org-x-sync-errgroup; add go-golang-org-x-sync. * gnu/packages/version-control.scm (ghq): Likewise. [inputs]: Remove go-golang.org-x-sync-errgroup; add go-golang-org-x-sync. Change-Id: If64c30da47ed9cd043798f427f2927b76394f3c4 Sharlatan Hellseher
2024-06-29gnu: dstask: Apply "-trimpath" flag....* gnu/packages/task-management.scm (dstask) [arguments]: <#:phases>: Apply "-trimpath" flag to custom 'build phase. Change-Id: I71b145cc4cae587fa898d479e1d5580b5f3750da Sharlatan Hellseher
2024-06-29gnu: nncp: Apply "-trimpath" flag....* gnu/packages/uucp.scm (nncp) [arguments]: <#:phases>: Remove 'remove-go-references phase. Set BUILDFLAGS=-trimpath to replace 'remove-go-references phase in 'configure phase. Change-Id: I7cfe14174e38708d36329d8e33ed6bb1ce0ae220 Sharlatan Hellseher
2024-06-29gnu: docker: Apply "-trimpath" flag....* gnu/packages/docker.scm (docker) [arguments]: <#:phases>: Remove 'remove-go-references phase. Set BUILDFLAGS=-trimpath to replace 'remove-go-references phase in 'build phase. Change-Id: Iada1a8764808d26e476ca8ca87a23061834f78be Sharlatan Hellseher
2024-06-29gnu: skopeo: Apply "-trimpath" flag....* gnu/packages/virtualization.scm (skopeo) [arguments]: <#:make-flags>: Add "-trimpath" to replace 'remove-go-references phase. <#:phases>: Remove 'remove-go-references phase. Change-Id: Idab669576282c81d55ec989dc1a64e87b89699ee Sharlatan Hellseher
2024-06-29gnu: go-github-com-golang-protobuf-proto: Adjust package name....Rename go-github-com-golang-protobuf-proto to the Golang module name as seen in go.mod. Due to lack of support of building submodules in go-build-system 'build phase is omitted and 'check phase is substituted by custom one providing nested path tests. * gnu/packages/golang.scm (go-github-com-golang-protobuf-proto): Rename to... (go-github-com-golang-protobuf): ... this. <#:unpack-path>: Remove argument. <#:phases>: Delete 'build phase. Add custom 'check phase and run tests for all submodules. (go-github-com-prometheus-common, go-github-com-matttproud-golang-protobuf-extensions-pbutil) [propagated-inputs]: Adjust accordingly. * gnu/packages/golang-check.scm (go-github-com-onsi-gomega) [propagated-inputs]: Likewise * gnu/packages/golang-web.scm (go-github-com-golang-groupcache, go-github-com-quic-go-quic-go) [propagated-inputs]: Likewise * gnu/packages/golang-xyz.scm (go-github-com-prometheus-client-model) [propagated-inputs]: Likewise * gnu/packages/syncthing.scm (go-github-com-matttproud-golang-protobuf-extensions-pbutil) [propagated-inputs]: Likewise Change-Id: I28c11739247a5ebafefd032d04a548a683fa0454 Co-authored-by: Hilton Chain <hako@ultrarare.space> Sharlatan Hellseher
2024-06-29gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3....* gnu/packages/golang.scm (go-github-com-golang-protobuf-proto): Update to 1.5.3. [arguments]: Enable tests. [propagated-inputs]: Add go-google-golang-org-protobuf. Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com> Hilton Chain
2024-06-29gnu: go-google-golang-org-protobuf: Update to 1.31.0....* gnu/packages/golang.scm (go-google-golang-org-protobuf): Update to 1.31.0. [arguments]: <#:phases>: Remove 'build phase. Add custom 'check phase. [propagated-inputs]: Remove go-github-com-golang-protobuf-proto. Co-authored-by: Sharlatan Hellseher <sharlatanus@gmail.com> Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com> Change-Id: Iba7fe94b2a2fa245e24d17affa5edb1531ac835b Hilton Chain
2024-06-29gnu: go-1.22: Disable flakey tests....* gnu/packages/golang.scm (go-1.22): Disable flakey tests. Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com> Change-Id: Iae54b66ca9e330a8a6fafdba23869fccf875aab4 Katherine Cox-Buday
2024-06-29gnu: go-1.22: Update to 1.22.2....* gnu/packages/golang.scm (go-1.22): Update to 1.22.2. Change-Id: I2f30d9d851e97399be771e878a9158b56ff08e1b Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com> Brennan Vincent
2024-06-29gnu: go-1.22: Update to 1.22.1....* gnu/packages/golang.scm (go-1.22): Update to 1.22.1. Change-Id: I4c007f43448b391dfa53c932b6adf8622efc9e43 Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com> Brennan Vincent
2024-06-29build/go: Use trimpath go flag....Go 1.13 introduced[1] a new "trimpath" flag in charge of removing the references to the go toolchain in the produced ELFs. We used to remove these references using the "remove-go-reference" function. This function was executed after go install. By using this new trimpath flag, we don't have to remove any store path from the ELFs produced by go install. We're not using any go older than 1.13 anymore, it's safe to remove these functions. [1] https://go.dev/doc/go1.13 -trimpath remove all file system paths from the resulting executable. Instead of absolute file system paths, the recorded file names will begin either a module path@version (when using modules), or a plain import path (when using the standard library, or GOPATH). * guix/build/go-build-system.scm (build): Add -trimpath (%standard-phases): Remove remove-go-references. (remove-go-references): Remove. Change-Id: Idcae366d226da5ce095693f81fd33133fd1d70d6 Co-authored-by: Picnoir <picnoir@alternativebit.fr> Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com> Ekaitz Zarraga
2024-06-29build/go: Don't use set!...This causes build failures on powerpc-linux. * guix/build/go-build-system.scm (unpack): When the unpack-path is unset use the import-path but don't redefine the unpack-path. Change-Id: I2b5a36eb738abb14307941d388038139dbaf2bdf Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com> Efraim Flashner
2024-06-29gnu: Remove go-golang-org-x-net-html....golang.org/x/net is distributed as a single module according to provided go.mod file. This changes remove the last reference to golang.org/x/net/html. * gnu/packages/golang-build.scm (go-golang-org-x-net) [propagated-inputs]: Add go-golang-org-x-sys, go-golang-org-x-term and go-golang-org-x-text. (go-golang-org-x-net-html): Remove variable. * gnu/packages/version-control.scm (ghq) [inputs]: Remove go-golang-org-x-net-html. Add go-golang-org-x-net. * gnu/packages/textutils.scm (vale) [inputs]: Remove go-golang-org-x-net-html. Add go-golang-org-x-net. Change-Id: Ic275f2f7ccd145edfd376d65bd24599a550e849a Sharlatan Hellseher
quot; (signature-field %narinfo #:public-key %wrong-public-key)) %main-substitute-directory (with-http-server `((200 ,(string-append %narinfo "Signature: " (signature-field %narinfo #:public-key %wrong-public-key))) (404 "Sorry, nar is missing!")) (let ((url1 (%local-url))) (parameterize ((%http-server-port 0)) (with-http-server `((200 ,(string-append %narinfo "Signature: " (signature-field %narinfo))) (404 "Sorry, nar is missing!")) (let ((url2 (%local-url))) (dynamic-wind (const #t) (lambda () (parameterize ((substitute-urls (list url1 url2 (string-append "file://" %main-substitute-directory)))) (request-substitution (string-append (%store-prefix) "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo") "substitute-retrieved")) (call-with-input-file "substitute-retrieved" get-string-all)) (lambda () (false-if-exception (delete-file "substitute-retrieved"))))))))))) (test-equal "substitute, preferred nar URL is 404, other is 200" "Substitutable data." (with-narinfo* (string-append %narinfo "Signature: " (signature-field %narinfo)) %main-substitute-directory (with-http-server `((200 ,(string-append %narinfo "Signature: " (signature-field %narinfo) "\n" "URL: example.nar.lz\n" "Compression: lzip\n")) (404 "Sorry, nar.lz is missing!") (200 ,(call-with-input-file (string-append %main-substitute-directory "/example.nar") get-bytevector-all))) (dynamic-wind (const #t) (lambda () (parameterize ((substitute-urls (list (%local-url)))) (request-substitution (string-append (%store-prefix) "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo") "substitute-retrieved")) (call-with-input-file "substitute-retrieved" get-string-all)) (lambda () (false-if-exception (delete-file "substitute-retrieved"))))))) (test-equal "substitute, previous partial download around" "Substitutable data." (with-narinfo* (string-append %narinfo "Signature: " (signature-field %narinfo)) %main-substitute-directory (with-http-server `((200 ,(string-append %narinfo "Signature: " (signature-field %narinfo))) (200 ,(call-with-input-file (string-append %main-substitute-directory "/example.nar") get-bytevector-all))) (dynamic-wind (const #t) (lambda () (parameterize ((substitute-urls (list (%local-url)))) (mkdir-p "substitute-retrieved/a/b/c/d") ;add stale data (request-substitution (string-append (%store-prefix) "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo") "substitute-retrieved")) (call-with-input-file "substitute-retrieved" get-string-all)) (lambda () (false-if-exception (delete-file "substitute-retrieved"))))))) (test-equal "substitute, narinfo is available but nar is missing" "not-found\n" (let ((port (open-output-string))) (parameterize ((current-output-port port)) (with-narinfo* (string-append %narinfo "Signature: " (signature-field %narinfo #:public-key %wrong-public-key)) %main-substitute-directory (with-http-server `((200 ,(string-append %narinfo "Signature: " (signature-field %narinfo))) (404 "Sorry, nar is missing!")) (parameterize ((substitute-urls (list (%local-url) (string-append "file://" %main-substitute-directory)))) (delete-file (string-append %main-substitute-directory "/example.nar")) (request-substitution (string-append (%store-prefix) "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo") "substitute-retrieved") (and (not (file-exists? "substitute-retrieved")) (get-output-string port)))))))) (test-equal "substitute, first narinfo is unsigned and has wrong hash" "Substitutable data." (with-narinfo* (regexp-substitute #f (string-match "NarHash: [[:graph:]]+" %narinfo) 'pre "NarHash: sha256:" (bytevector->nix-base32-string (make-bytevector 32)) 'post) %alternate-substitute-directory (with-narinfo* (string-append %narinfo "Signature: " (signature-field %narinfo)) %main-substitute-directory (dynamic-wind (const #t) (lambda () ;; This time remove the file so that the substitute can only be ;; retrieved from %MAIN-SUBSTITUTE-DIRECTORY. (delete-file (string-append %alternate-substitute-directory "/example.nar")) (parameterize ((substitute-urls (map (cut string-append "file://" <>) (list %alternate-substitute-directory %main-substitute-directory)))) (request-substitution (string-append (%store-prefix) "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo") "substitute-retrieved")) (call-with-input-file "substitute-retrieved" get-string-all)) (lambda () (false-if-exception (delete-file "substitute-retrieved"))))))) (test-equal "substitute, first narinfo is unsigned and has wrong refs" "Substitutable data." (with-narinfo* (regexp-substitute #f (string-match "References: ([^\n]+)\n" %narinfo) 'pre "References: " 1 " wrong set of references\n" 'post) %alternate-substitute-directory (with-narinfo* (string-append %narinfo "Signature: " (signature-field %narinfo)) %main-substitute-directory (dynamic-wind (const #t) (lambda () ;; This time remove the file so that the substitute can only be ;; retrieved from %MAIN-SUBSTITUTE-DIRECTORY. (delete-file (string-append %alternate-substitute-directory "/example.nar")) (parameterize ((substitute-urls (map (cut string-append "file://" <>) (list %alternate-substitute-directory %main-substitute-directory)))) (request-substitution (string-append (%store-prefix) "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo") "substitute-retrieved")) (call-with-input-file "substitute-retrieved" get-string-all)) (lambda () (false-if-exception (delete-file "substitute-retrieved"))))))) (test-quit "substitute, two invalid narinfos" "no valid substitute" (with-narinfo* %narinfo ;not signed %alternate-substitute-directory (with-narinfo* (string-append %narinfo "Signature: " ;unauthorized (signature-field %narinfo #:public-key %wrong-public-key)) %main-substitute-directory (with-input-from-string (string-append "substitute " (%store-prefix) "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo" " substitute-retrieved\n") (lambda () (guix-substitute "--substitute")))))) (test-equal "substitute, narinfo with several URLs" "Substitutable data." (let ((narinfo (string-append "StorePath: " (%store-prefix) "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo URL: example.nar.gz Compression: gzip URL: example.nar.lz Compression: lzip URL: example.nar Compression: none NarHash: sha256:" (bytevector->nix-base32-string (sha256 (string->utf8 "Substitutable data."))) " NarSize: 42 References: bar baz Deriver: " (%store-prefix) "/foo.drv System: mips64el-linux\n"))) (with-narinfo (string-append narinfo "Signature: " (signature-field narinfo)) (dynamic-wind (const #t) (lambda () (define (compress input output compression) (call-with-output-file output (lambda (port) (call-with-compressed-output-port compression port (lambda (port) (call-with-input-file input (lambda (input) (dump-port input port)))))))) (let ((nar (string-append %main-substitute-directory "/example.nar"))) (compress nar (string-append nar ".gz") 'gzip) (compress nar (string-append nar ".lz") 'lzip)) (parameterize ((substitute-urls (list (string-append "file://" %main-substitute-directory)))) (request-substitution (string-append (%store-prefix) "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo") "substitute-retrieved")) (call-with-input-file "substitute-retrieved" get-string-all)) (lambda () (false-if-exception (delete-file "substitute-retrieved"))))))) (test-end "substitute") ;;; Local Variables: ;;; eval: (put 'with-narinfo 'scheme-indent-function 1) ;;; eval: (put 'with-narinfo* 'scheme-indent-function 2) ;;; eval: (put 'test-quit 'scheme-indent-function 2) ;;; End: