From 23299c23a303b6e4ad905f95b9653b2e1810b3c9 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 22 Jul 2024 12:48:54 -0300 Subject: packages.scm: Upgrade binder(8) and add its extra inputs --- src/guix/packages.scm | 17 ++++++++++++----- src/versions/binder/sha256 | 2 +- src/versions/binder/version | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/guix/packages.scm b/src/guix/packages.scm index ce67d79..e422ecb 100644 --- a/src/guix/packages.scm +++ b/src/guix/packages.scm @@ -1,6 +1,7 @@ (define-module (packages) #:use-module ((ice-9 textual-ports) #:prefix textual-ports:) #:use-module ((guix licenses) #:prefix licenses:) + #:use-module ((org euandre packages) #:prefix packages:) #:use-module ((json) #:prefix json:) #:use-module (json) #:use-module (gnu) @@ -9,8 +10,10 @@ #:use-module (guix packages) #:use-module (guix utils)) (use-package-modules + lsof golang golang-xyz + networking sqlite) @@ -59,7 +62,7 @@ (home-page #f) (license licenses:agpl3+))) -(define (go-package-1 name) +(define (go-package-1 name extra-inputs) (let ((base (go-package-0 name))) (package (inherit base) (arguments @@ -83,11 +86,15 @@ "euandre.org/gobang/src" "# euandre.org/gobang => ../gobang"))))))))) (native-inputs - (modify-inputs (package-native-inputs base) - (append gobang)))))) + (append + (package-native-inputs base) + `(("gobang" ,gobang "out")) + (map (lambda (p) + `(,(package-name p) ,p "out")) + extra-inputs)))))) (define (go-package-2 name) - (let ((base (go-package-1 name))) + (let ((base (go-package-1 name '()))) (package (inherit base) (arguments (substitute-keyword-arguments (package-arguments base) @@ -117,7 +124,7 @@ (define-public gobang (go-package-0 "gobang")) -(define-public binder (go-package-1 "binder")) +(define-public binder (go-package-1 "binder" (list packages:eut lsof socat))) (define-public papod (go-package-2 "papod")) (list diff --git a/src/versions/binder/sha256 b/src/versions/binder/sha256 index 488f1bd..2526e37 100644 --- a/src/versions/binder/sha256 +++ b/src/versions/binder/sha256 @@ -1 +1 @@ -0rjnfpmf709n392fdjd3sbai6dkcf5ga51jgvq89fwbs7xykv114 +1xsx0wvdyk0p2i0w9p2g55k0dkpw8hc9g0j4npclz0h7d7bq01y9 diff --git a/src/versions/binder/version b/src/versions/binder/version index fa91f01..2be45b6 100644 --- a/src/versions/binder/version +++ b/src/versions/binder/version @@ -1 +1 @@ -31fe7be099fb8f463be3a3db4a4b799501f66571 +dbdde42b3ef983c0ede6942119f716c1e2eb6ff3 -- cgit v1.2.3