* [bug#52699] [PATCH] gnu: Add nar-herder.
@ 2021-12-21 10:27 Christopher Baines
2021-12-21 11:02 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Christopher Baines @ 2021-12-21 10:27 UTC (permalink / raw)
To: 52699
* gnu/packages/package-management.scm (nar-herder): New variable.
---
gnu/packages/package-management.scm | 109 ++++++++++++++++++++++++++++
1 file changed, 109 insertions(+)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 12736c6caf..feb56f2a9b 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1441,6 +1441,115 @@ (define-public guix-jupyter
in an isolated environment, in separate namespaces.")
(license license:gpl3+)))
+(define-public nar-herder
+ (let ((commit "049dfec287fa948cac6682d0a047bc0ed356f0bf")
+ (revision "1"))
+ (package
+ (name "nar-herder")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.cbaines.net/git/guix/nar-herder")
+ (commit commit)))
+ (sha256
+ (base32
+ "1bkn6avcyp2rcrqaync65b8yn9dvxlkjpk3mdk5nsy527dzhs5ws"))
+ (file-name (string-append name "-" version "-checkout"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:modules (((guix build guile-build-system)
+ #:select (target-guile-effective-version))
+ ,@%gnu-build-system-modules)
+ #:imported-modules ((guix build guile-build-system)
+ ,@%gnu-build-system-modules)
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'set-GUILE_AUTO_COMPILE
+ (lambda _
+ ;; To avoid warnings relating to 'guild'.
+ (setenv "GUILE_AUTO_COMPILE" "0")
+ #t))
+ (add-after 'install 'wrap-executable
+ (lambda* (#:key inputs outputs target #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (guile (assoc-ref inputs "guile"))
+ (version (target-guile-effective-version))
+ (scm (string-append out "/share/guile/site/" version))
+ (go (string-append out "/lib/guile/" version "/site-ccache")))
+ (for-each
+ (lambda (file)
+ (simple-format (current-error-port) "wrapping: ~A\n" file)
+ (let ((guile-inputs (list
+ "guile-json"
+ "guile-gcrypt"
+ "guix"
+ "guile-lib"
+ "guile-sqlite3"
+ "gnutls"
+ "guile-fibers")))
+ (wrap-program file
+ `("GUILE_LOAD_PATH" ":" prefix
+ (,scm ,(string-join
+ (map (lambda (input)
+ (simple-format
+ #f "~A/share/guile/site/~A"
+ (assoc-ref inputs input)
+ version))
+ guile-inputs)
+ ":")))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+ (,go ,(string-join
+ (map (lambda (input)
+ (simple-format
+ #f "~A/lib/guile/~A/site-ccache"
+ (assoc-ref inputs input)
+ version))
+ guile-inputs)
+ ":"))))))
+ (find-files bin)))
+ #t))
+ (delete 'strip)))) ; As the .go files aren't compatible
+ (native-inputs
+ (list pkg-config
+ autoconf
+ automake
+ gnutls
+
+ ;; Guile libraries are needed here for cross-compilation.
+ guile-3.0
+ guile-json-4
+ guile-gcrypt
+ guix
+ guile-fibers
+ guile-lib
+ guile-sqlite3))
+ (inputs
+ (list bash-minimal
+ guile-3.0))
+ (propagated-inputs
+ (list guile-json-4
+ guile-gcrypt
+ guix
+ guile-fibers
+ guile-lib
+ guile-sqlite3
+ gnutls))
+ (home-page "https://git.cbaines.net/guix/nar-herder")
+ (synopsis "Utility for managing and serving nars")
+ (description
+ "The Nar Herder is a utility for managing a collection of
+nars (normalized archives, in the context of Guix) along with the
+corresponding narinfo files which contain some signed metadata.
+
+It can assist in serving a collection of nars, moving them between machines,
+or mirroring an existing collection of nars.
+
+It's currently a working prototype, many designed features aren't implemented,
+and the error handling is very rough.")
+ (license license:gpl3+))))
+
(define-public gcab
(package
(name "gcab")
--
2.33.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#52699] [PATCH] gnu: Add nar-herder.
2021-12-21 10:27 [bug#52699] [PATCH] gnu: Add nar-herder Christopher Baines
@ 2021-12-21 11:02 ` Ludovic Courtès
2021-12-21 11:23 ` bug#52699: " Christopher Baines
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2021-12-21 11:02 UTC (permalink / raw)
To: Christopher Baines; +Cc: 52699
Hello!
Christopher Baines <mail@cbaines.net> skribis:
> * gnu/packages/package-management.scm (nar-herder): New variable.
[...]
> + (add-before 'build 'set-GUILE_AUTO_COMPILE
> + (lambda _
> + ;; To avoid warnings relating to 'guild'.
> + (setenv "GUILE_AUTO_COMPILE" "0")
> + #t))
You can omit trailing #t’s.
> + (add-after 'install 'wrap-executable
> + (lambda* (#:key inputs outputs target #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out"))
> + (bin (string-append out "/bin"))
> + (guile (assoc-ref inputs "guile"))
> + (version (target-guile-effective-version))
> + (scm (string-append out "/share/guile/site/" version))
> + (go (string-append out "/lib/guile/" version "/site-ccache")))
> + (for-each
> + (lambda (file)
> + (simple-format (current-error-port) "wrapping: ~A\n" file)
> + (let ((guile-inputs (list
> + "guile-json"
> + "guile-gcrypt"
> + "guix"
> + "guile-lib"
> + "guile-sqlite3"
> + "gnutls"
> + "guile-fibers")))
> + (wrap-program file
> + `("GUILE_LOAD_PATH" ":" prefix
> + (,scm ,(string-join
> + (map (lambda (input)
> + (simple-format
> + #f "~A/share/guile/site/~A"
> + (assoc-ref inputs input)
> + version))
> + guile-inputs)
> + ":")))
> + `("GUILE_LOAD_COMPILED_PATH" ":" prefix
> + (,go ,(string-join
> + (map (lambda (input)
> + (simple-format
> + #f "~A/lib/guile/~A/site-ccache"
> + (assoc-ref inputs input)
> + version))
> + guile-inputs)
> + ":"))))))
I’d use ‘string-append’ rather than ‘format’.
(It’d be nice to have a streamlined solution to wrap those Guile
executables…)
> + (license license:gpl3+))))
I believe it’s ‘agpl3+’ (though GPLv3+ would make it easier to share
code with Guix; something worth considering).
Otherwise LGTM, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#52699: [PATCH] gnu: Add nar-herder.
2021-12-21 11:02 ` Ludovic Courtès
@ 2021-12-21 11:23 ` Christopher Baines
0 siblings, 0 replies; 3+ messages in thread
From: Christopher Baines @ 2021-12-21 11:23 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 52699-done
[-- Attachment #1: Type: text/plain, Size: 3268 bytes --]
Ludovic Courtès <ludo@gnu.org> writes:
> Hello!
>
> Christopher Baines <mail@cbaines.net> skribis:
>
>> * gnu/packages/package-management.scm (nar-herder): New variable.
>
> [...]
>
>> + (add-before 'build 'set-GUILE_AUTO_COMPILE
>> + (lambda _
>> + ;; To avoid warnings relating to 'guild'.
>> + (setenv "GUILE_AUTO_COMPILE" "0")
>> + #t))
>
> You can omit trailing #t’s.
>
>> + (add-after 'install 'wrap-executable
>> + (lambda* (#:key inputs outputs target #:allow-other-keys)
>> + (let* ((out (assoc-ref outputs "out"))
>> + (bin (string-append out "/bin"))
>> + (guile (assoc-ref inputs "guile"))
>> + (version (target-guile-effective-version))
>> + (scm (string-append out "/share/guile/site/" version))
>> + (go (string-append out "/lib/guile/" version "/site-ccache")))
>> + (for-each
>> + (lambda (file)
>> + (simple-format (current-error-port) "wrapping: ~A\n" file)
>> + (let ((guile-inputs (list
>> + "guile-json"
>> + "guile-gcrypt"
>> + "guix"
>> + "guile-lib"
>> + "guile-sqlite3"
>> + "gnutls"
>> + "guile-fibers")))
>> + (wrap-program file
>> + `("GUILE_LOAD_PATH" ":" prefix
>> + (,scm ,(string-join
>> + (map (lambda (input)
>> + (simple-format
>> + #f "~A/share/guile/site/~A"
>> + (assoc-ref inputs input)
>> + version))
>> + guile-inputs)
>> + ":")))
>> + `("GUILE_LOAD_COMPILED_PATH" ":" prefix
>> + (,go ,(string-join
>> + (map (lambda (input)
>> + (simple-format
>> + #f "~A/lib/guile/~A/site-ccache"
>> + (assoc-ref inputs input)
>> + version))
>> + guile-inputs)
>> + ":"))))))
>
> I’d use ‘string-append’ rather than ‘format’.
>
> (It’d be nice to have a streamlined solution to wrap those Guile
> executables…)
>
>> + (license license:gpl3+))))
>
> I believe it’s ‘agpl3+’ (though GPLv3+ would make it easier to share
> code with Guix; something worth considering).
>
> Otherwise LGTM, thanks!
Thanks for taking a look! I've pushed as
6f76678cb7575072395198c343a9fecc52839513 with the changes you mentioned
above.
Thanks,
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-21 11:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-21 10:27 [bug#52699] [PATCH] gnu: Add nar-herder Christopher Baines
2021-12-21 11:02 ` Ludovic Courtès
2021-12-21 11:23 ` bug#52699: " Christopher Baines
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).