src/guix/packages.scm: Inherit package definitions from upstream channel

1 files changed, 28 insertions, 85 deletions

diff --git a/src/guix/packages.scm b/src/guix/packages.scm
index 4e38fb7..7458488 100644
--- a/src/guix/packages.scm
+++ b/src/guix/packages.scm
@@ -2,14 +2,14 @@
   #: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 ((org euandre queue) #:prefix q:)
+  #:use-module ((org euandre packages) #:prefix pkg:)
   #:use-module (gnu)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
   #:use-module (guix packages)
   #:use-module (guix utils))
 (use-package-modules
-  lsof
   golang
   golang-xyz
   networking
@@ -17,36 +17,24 @@
 
 
 
-(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 name inputs)
-  (let ((version (slurp (string-append "src/versions/" name "/version"))))
-    (package
-      (name name)
+(define (file name s)
+  (slurp (string-append "src/versions/" name "/" s)))
+
+(define (go-latest package)
+  (let* ((name     (package-name package))
+         (version  (file name "version"))
+         (checksum (file name "sha256")))
+    (package/inherit package
       (version version)
       (source
         (origin
-          (method url-fetch)
+          (inherit (package-source package))
           (uri
             (string-append "https://papo.im/git/"
                            name
@@ -56,68 +44,23 @@
                            version
                            ".tar.xz"))
           (sha256
-            (base32 (slurp (string-append "src/versions/" name "/sha256"))))))
-      (build-system gnu-build-system)
+            (base32 checksum))))
       (arguments
-        (list
-         #:strip-binaries? #f
-         #:make-flags
-         #~(list
-            (string-append "PREFIX=" #$output)
-            (string-append "VERSION=" #$version)
-            (string-append "CC=" #$(cc-for-target)))
-         #:phases
-         #~(modify-phases %standard-phases
-             (delete 'configure)
-             (add-before 'build 'setenv-golang
-               (lambda _
-                 (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
-         (search-path-specification
-           (variable "GOLIBPACKPATH")
-           (files
-             (list "lib/go")))))
-      (synopsis    #f) ;; FIXME: get
-      (description #f) ;;        from
-      (home-page   #f) ;;        tarball!
-      (license licenses:agpl3+))))
-
-
-(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)))))
+        (substitute-keyword-arguments (package-arguments package)
+          ((#:make-flags _flags)
+           #~(list
+              "-e"
+              (string-append "PREFIX=" #$output)
+              (string-append "VERSION=" #$version)
+              (string-append "CC=" #$(cc-for-target)))))))))
 
 
-(list
- gobang
- golite
- binder
- wscat
- glaze
- untls
- papod)
+(map go-latest
+     (list
+      pkg:gobang
+      pkg:golite
+      pkg:binder
+      pkg:glaze
+      pkg:untls
+      pkg:wscat
+      pkg:papod))