packages.scm: Build all packages with "go tool"

16 files changed, 75 insertions, 78 deletions

diff --git a/Makefile b/Makefile
index 66993db..ed30ce6 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ src/config/tld.txt: Makefile
 	echo '$(TLD)' > $@
 
 packages system: src/guix/packages.scm src/guix/system.scm
-	rm -f $@
+	rm -f $@*
 	guix build -r $@ -v3 -Kf src/guix/$@.scm
 
 .SUFFIXES: .stripped
diff --git a/src/guix/packages.scm b/src/guix/packages.scm
index 2f48ec9..2fd97bd 100644
--- a/src/guix/packages.scm
+++ b/src/guix/packages.scm
@@ -2,6 +2,7 @@
   #:use-module ((ice-9 textual-ports) #:prefix textual-ports:)
   #:use-module ((guix licenses) #:prefix licenses:)
   #:use-module ((org euandre packages) #:prefix packages:)
+  #:use-module ((org euandre queue) #:prefix queue:)
   #:use-module (gnu)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
@@ -16,13 +17,29 @@
 
 
 
+(define (format-inputs l)
+  (map (lambda (p)
+         (list (package-name p)
+               p
+               "out"))
+       l))
+
+(define (normalize-inputs l)
+  (map (compose (lambda (l)
+                  (cons (package-name (car l))
+                        l))
+                list
+                specification->package+output
+                symbol->string)
+       l))
+
 (define (slurp f)
   (string-trim-both
    (call-with-input-file
     f
     textual-ports:get-string-all)))
 
-(define (go-package-0 name)
+(define (go-package name inputs)
   (package
     (name name)
     (version (slurp (string-append "src/versions/" name "/version")))
@@ -42,91 +59,63 @@
     (build-system gnu-build-system)
     (arguments
       (list
+       #:strip-binaries? #f
        #:make-flags
        #~(list
-          (string-append "PREFIX=" %output))
+          (string-append "PREFIX=" #$output)
+          (string-append "CC=" #$(cc-for-target)))
        #:phases
        #~(modify-phases %standard-phases
            (delete 'configure)
            (add-before 'build 'setenv-golang
              (lambda _
-               (setenv "CGO_ENABLED" "0")
-               (setenv "GOCACHE"
-                       (string-append (getenv "TMPDIR") "/GOCACHE")))))))
+               (define (path->flags option)
+                 (let ((search-path (getenv "GOLIBPACKPATH")))
+                   (string-join
+                    (map (lambda (path)
+                           (string-append option " " path))
+                         (if search-path
+                           (string-split search-path #\:)
+                           '()))
+                    " ")))
+               (setenv "GOCFLAGS"  (path->flags "-I"))
+               (setenv "GOLDFLAGS" (path->flags "-L")))))))
     (native-inputs
+      (append
+       (format-inputs
+        (list queue:go-full))
+       inputs))
+    (native-search-paths
       (list
-       go-1.22))
-    (synopsis    #f)
-    (description #f)
-    (home-page   #f)
+       (search-path-specification
+         (variable "GOLIBPACKPATH")
+         (files
+           (list "lib/go")))))
+    (synopsis    #f) ;; FIXME: get
+    (description #f) ;;        from
+    (home-page   #f) ;;        tarball!
     (license licenses:agpl3+)))
 
-(define (go-package-1 name extra-inputs)
-  (let ((base (go-package-0 name)))
-    (package (inherit base)
-      (arguments
-        (substitute-keyword-arguments (package-arguments base)
-          ((#:phases phases)
-           #~(modify-phases #$phases
-               (add-before 'build 'add-gobang-vendored-dependency
-                 (lambda _
-                   (mkdir-p "vendor/euandre.org/gobang/src")
-                   (copy-file
-                    (string-append #$(this-package-native-input "gobang")
-                                   "/src/gobang/lib.go")
-                    "vendor/euandre.org/gobang/src/lib.go")
-                   (call-with-output-file
-                    "vendor/modules.txt"
-                    (lambda (port)
-                      (format port
-                              "~a~%~a~%~a~%~a~%"
-                              "# euandre.org/gobang v0.1.0 => ../gobang"
-                              "## explicit; go 1.21.5"
-                              "euandre.org/gobang/src"
-                              "# euandre.org/gobang => ../gobang")))))))))
-      (native-inputs
-        (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 '())))
-    (package (inherit base)
-      (arguments
-        (substitute-keyword-arguments (package-arguments base)
-          ((#:phases phases)
-           #~(modify-phases #$phases
-               (add-before 'build 'add-gosqlite3-vendored-dependency
-                 (lambda _
-                   (copy-recursively
-                    (string-append #$(this-package-native-input
-                                      "go-github-com-mattn-go-sqlite3")
-                                   "/src")
-                    "vendor")
-                   (call-with-output-file
-                    "vendor/modules.txt"
-                    (lambda (port)
-                      (format port
-                              "~a~%~a~%~a~%"
-                              "# github.com/mattn/go-sqlite3 v1.14.22"
-                              "## explicit; go 1.19"
-                              "github.com/mattn/go-sqlite3")))))))))
-      (native-inputs
-        (modify-inputs (package-native-inputs base)
-          (append
-           go-github-com-mattn-go-sqlite3
-           `(,sqlite "out")
-           `(,sqlite "static")))))))
 
+(define gobang (go-package "gobang" '()))
+(define golite (go-package "golite" (normalize-inputs '(sqlite))))
+(define binder (go-package "binder" (append (format-inputs     (list gobang))
+                                            (normalize-inputs '(eut socat lsof)))))
+(define wscat  (go-package "wscat"  (append (format-inputs     (list gobang))
+                                            (normalize-inputs '(eut)))))
+(define glaze  (go-package "glaze"  (append (format-inputs     (list gobang))
+                                            (normalize-inputs '(eut)))))
+(define untls  (go-package "untls"  (append (format-inputs     (list gobang))
+                                            (normalize-inputs '(eut)))))
+(define papod  (go-package "papod"  (append (format-inputs     (list gobang golite))
+                                            (normalize-inputs '(sqlite sqlite:static)))))
 
-(define-public gobang (go-package-0 "gobang"))
-(define-public binder (go-package-1 "binder" (list packages:eut socat lsof)))
-(define-public papod  (go-package-2 "papod"))
 
 (list
  gobang
+ golite
  binder
+ wscat
+ glaze
+ untls
  papod)
diff --git a/src/versions/binder/sha256 b/src/versions/binder/sha256
index 9d80869..d6e0730 100644
--- a/src/versions/binder/sha256
+++ b/src/versions/binder/sha256
@@ -1 +1 @@
-0didsx2hbggm6j93mj0kkkp9y3yh449dwk30haqpvsvzz5agsgp3
+15fg1kiw61n7mg4ajdw7xfa025msygbpzg29wrq0nsxr20h76f3l
diff --git a/src/versions/binder/version b/src/versions/binder/version
index 4337112..af478cf 100644
--- a/src/versions/binder/version
+++ b/src/versions/binder/version
@@ -1 +1 @@
-44437e16ef4ba68890acc221fbde062ab3a478c0
+50920be443fa1b8c037639ba6177f78614164e66
diff --git a/src/versions/glaze/sha256 b/src/versions/glaze/sha256
new file mode 100644
index 0000000..3750641
--- /dev/null
+++ b/src/versions/glaze/sha256
@@ -0,0 +1 @@
+0qkal3vq5x53p18vs6kd5hvx3qmr6fg9jbg5v6kfywirq7rdd9kj
diff --git a/src/versions/glaze/version b/src/versions/glaze/version
new file mode 100644
index 0000000..c66f031
--- /dev/null
+++ b/src/versions/glaze/version
@@ -0,0 +1 @@
+4f158d23acf78fe6055b6a0da7ce1bf083012cf9
diff --git a/src/versions/gobang/sha256 b/src/versions/gobang/sha256
index a49f7ff..e6297b9 100644
--- a/src/versions/gobang/sha256
+++ b/src/versions/gobang/sha256
@@ -1 +1 @@
-18kd549kw3lfbx0sf6rw9f5ij5yxn3kn2jy95qnxgaqmydix0k0x
+0j0wryw4fclscm550k8s71g84gims2j32b85pfx65whr7x918cq6
diff --git a/src/versions/gobang/version b/src/versions/gobang/version
index 1c26b75..6fdb2b8 100644
--- a/src/versions/gobang/version
+++ b/src/versions/gobang/version
@@ -1 +1 @@
-2bfae015eed2267c079ace3beac35de46b91f73d
+80d46c35103889506f80e780ee89a05624f643ad
diff --git a/src/versions/golite/sha256 b/src/versions/golite/sha256
new file mode 100644
index 0000000..fa34eed
--- /dev/null
+++ b/src/versions/golite/sha256
@@ -0,0 +1 @@
+0cdvcj03sajcqdpm3js1n0ygv2h6ibl18ynwk4cwal77d54bc5hv
diff --git a/src/versions/golite/version b/src/versions/golite/version
new file mode 100644
index 0000000..52ba3bc
--- /dev/null
+++ b/src/versions/golite/version
@@ -0,0 +1 @@
+4509b2480c7e50136715e4a7a8a1dca809ea2906
diff --git a/src/versions/papod/sha256 b/src/versions/papod/sha256
index 241499e..4d5fe15 100644
--- a/src/versions/papod/sha256
+++ b/src/versions/papod/sha256
@@ -1 +1 @@
-0xji40x9hbjjhazinmgc7isiryfd4k4512k1hhgkx4gskh6r1d28
+17x76322x8h951pmww3jl06sciyp8wvz4wg5dgp4syzcmqclbsix
diff --git a/src/versions/papod/version b/src/versions/papod/version
index 73174c7..ff17422 100644
--- a/src/versions/papod/version
+++ b/src/versions/papod/version
@@ -1 +1 @@
-256e16b04802b4600cee00c39fbad26d1af3ab06
+80cdec3927ea866aea27ec356ae1d3f525ae94d7
diff --git a/src/versions/untls/sha256 b/src/versions/untls/sha256
new file mode 100644
index 0000000..ff5dd1b
--- /dev/null
+++ b/src/versions/untls/sha256
@@ -0,0 +1 @@
+031vjpxzar4dg9m9jn2y54fdnnrfkb85f9ra47f01w6p551chbf5
diff --git a/src/versions/untls/version b/src/versions/untls/version
new file mode 100644
index 0000000..16b0c9b
--- /dev/null
+++ b/src/versions/untls/version
@@ -0,0 +1 @@
+2f531c582990ac991db9abbcacfa53db23febc1d
diff --git a/src/versions/wscat/sha256 b/src/versions/wscat/sha256
new file mode 100644
index 0000000..e0401b9
--- /dev/null
+++ b/src/versions/wscat/sha256
@@ -0,0 +1 @@
+1skfyrrpgsvjka5bwkajcns8sy2hm860xgd3hh40x1l81wl2lx6n
diff --git a/src/versions/wscat/version b/src/versions/wscat/version
new file mode 100644
index 0000000..dccc399
--- /dev/null
+++ b/src/versions/wscat/version
@@ -0,0 +1 @@
+eb77ba72e08e367581f77388a7ffda147da1da56