packages.scm: Differentiate gopkgsbs from gopkg + package updates

1 files changed, 55 insertions, 47 deletions

diff --git a/src/org/euandre/packages.scm b/src/org/euandre/packages.scm
index 9c70f6b..00df0e6 100644
--- a/src/org/euandre/packages.scm
+++ b/src/org/euandre/packages.scm
@@ -334,7 +334,7 @@
                 symbol->string)
        l))
 
-(define-public (gopkg name inputs version checksum)
+(define-public (gopkgbs name inputs version checksum)
   (let ((p (pkg name version checksum)))
     (package
       (inherit p)
@@ -375,115 +375,123 @@
 
 
 (define-public gotext
-  (gopkg
+  (gopkgbs
    "gotext"
-   (append
-    (format-inputs '())
-    (normalize-inputs '()))
-   "a9f0f0ad4a2c185083bec12aa03a00e387642037"
-   "1cq23arrvq830mz2ydnhdwb7488dlv69dpmf01v9vdy0xfr484ig"))
+   (format-inputs (list))
+   "ff638c75f4b588724b6c90345a58c7bad468a752"
+   "1sjn4hg4agdfh84qp11jcgyspc3dlfq50ch9bkf1zapll63lrkvg"))
 
 (define-public uuid
-  (gopkg
+  (gopkgbs
    "uuid"
    (format-inputs (list gotext))
-   "89dd1690cc4fb429318dfbbd1ae3318354d42107"
-   "1v0b7wpf4m8hrly443im7g6j7xxd3spnz6w60vmj4j1z70xmbbrl"))
+   "40039d355287b43ccd42c58443bec914c8e57067"
+   "1sn5m1zhx2bzcd03sifn3sd546g5fbzhf9d65rgdbnqzmrk9zvzf"))
 
 (define-public gobang
-  (gopkg
+  (gopkgbs
    "gobang"
    (format-inputs (list gotext uuid))
-   "55b109185bc1718e3e5743b123fcf8cca0e81f58"
-   "067v94rs2w5z24b6srmi7rwddxd7x6hzcnwzvl67z84yq9742s9m"))
+   "bc682800eb4bc77b4e63a0cc84e69bf2b41cb624"
+   "1x67vbb30bv2dz5c38v7h8pw6nsg750hcxmd2rdk5vfn4kgqhi0f"))
+
+
+(define-public (gopkg name inputs version checksum)
+  (gopkgbs
+   name
+   (append inputs (format-inputs (list gotext uuid gobang)))
+   version
+   checksum))
+
 
 (define-public pds
   (gopkg
    "pds"
-   (format-inputs (list gotext uuid gobang))
-   "d092ca36e1c5fca9ab8bb6f4fd69aa1e3699e868"
-   "1ypvb7vb581wy9r7jw0ghb423kgwn35r5mvakd3vcp1y7kv3va6w"))
+   (format-inputs (list))
+   "60602427e3b543502266e10ce8486ae448fe9605"
+   "1yyan5jq59ksk4704z6yg4vjp5rkdzsjxh6vljn23vq2rrxaq503"))
+
+(define-public urubu
+  (gopkg
+   "urubu"
+   (format-inputs (list))
+   "0a31f4cf617a1c8b0ccce4d96d314c889dea849c"
+   "0vksj4nlllib6szxq1pnz8hi873kjlfvflibgya2bvzpmlywx56k"))
 
 (define-public stm
   (gopkg
    "stm"
-   (format-inputs (list gotext uuid gobang pds))
+   (format-inputs (list pds))
    "093884c5fdd71d9f96e7bd1f70eef61368ad949a"
    "080qql9l46d2417fdp5s21aq2gk530l5ph0yg5r06y4aagag3xav"))
 
 (define-public scrypt
   (gopkg
    "scrypt"
-   (format-inputs (list gotext uuid gobang q:scryptkdf eut))
-   "69212bd433f2bf029ad7b2e22f669c9664470d73"
-   "06rdhmzw5sd2qhh9sqzi9spm3cjyid80mrdhiv0gh6r9vhimvbpp"))
+   (format-inputs (list q:scryptkdf))
+   "16d3688f8c9f71ede4121d7d77a535c53f20ee49"
+   "1gz6rz89vh3rkgqif1ycdgjy8r2n0znd1m65r80hipmvd54db2fl"))
 
 (define-public golite
   (gopkg
    "golite"
-   (format-inputs (list gotext uuid gobang q:sqlitex))
-   "aff80f58ac79b07964d999744fe9ec6cb45ed69b"
-   "1x1bc3vryq65wg7xqwmz4m9can1l1p9ibxpv6i7bjjg7k1vbndkg"))
-
-(define-public urubu
-  (gopkg
-   "urubu"
-   '()
-   #;
-   (format-inputs (list gotext uuid gobang q:sqlitex))
-   "63c768bd4922a3014056803849d85447f04ecdc9"
-   "163s7j0axsswgpjbkzywc31lx6fn37x3jzssa020pxgk0m1lryqp"))
+   (format-inputs (list q:sqlitex))
+   "3c7e8c4b1de3414e4ff43e4ba694a2b56c4be4b0"
+   "0smzqjd5hwi8blvjpfxsw9n36fx9ifc3pr59b1gxyvzrw4k1mkax"))
 
 (define-public fiinha
-  (gopkg "fiinha"
-   (format-inputs (list gotext uuid gobang q:sqlitex golite))
+  (gopkg
+   "fiinha"
+   (format-inputs (list q:sqlitex golite))
    "ed6d86c6b72e4cd279600394ebf57c1bd926df85"
    "13nrvcparkl3xh9k04f58n7hh2c9z0zz3vpy4ld30bh7m21bhig8"))
 
 (define-public cracha
-  (gopkg "cracha"
-   (format-inputs (list gotext uuid gobang q:sqlitex golite q:scryptkdf scrypt fiinha))
-   "6cd5a524cbe9489c355366b69cba9d45dd6ede95"
-   "0kd84fqq7vv6f6c7f2b175dkjxdbmb9v0ynz7xqdv0zml4gpjjbw"))
+  (gopkg
+   "cracha"
+   (format-inputs (list q:sqlitex golite q:scryptkdf scrypt fiinha))
+   "bce8179d4ee6f1d97c9928e38d56ca053302284d"
+   "1i069w07bvp3j9hv9m6vw25f5sx7jlrra7v0324k0dn2cwpc1vlb"))
 
 (define-public binder
   (gopkg
    "binder"
-   (append (format-inputs     (list gotext uuid gobang eut))
-           (normalize-inputs '(socat lsof)))
+   (normalize-inputs '(socat lsof))
    "5a6bf54df0d12d130e767d0e8ba65075d0144ae3"
    "1idnl0ap9qjnms0p0dj91xaj5ww1kac7qwjxjgkqqmvdjxb7a43b"))
 
 (define-public glaze
   (gopkg
    "glaze"
-   (format-inputs (list gotext uuid gobang))
+   (format-inputs (list))
    "0fa2a2c8e0221beb3f356a240e10435c4afe614f"
    "1q99chx0c78mljh27v2ja5ksfdmq8wbairkq0ax8v8zzvyhvbi9w"))
 
 (define-public hsts
   (gopkg
    "hsts"
-   (format-inputs (list gotext uuid gobang))
+   (format-inputs (list))
    "17351ac6cb396ba24a0e0c56996152c4b11e6b04"
    "00hr17dxrxr927n6z39lpg4xki1mfdkqzhibrcib5wj02im2zwhs"))
 
 (define-public untls
   (gopkg
    "untls"
-   (format-inputs (list gotext uuid gobang eut))
+   (format-inputs (list))
    "99d5f060ddd22422e8404f48aa3f461540fb8250"
    "14qvpkb87n8nxz29bh4fd9j85yvggx5k5p32lc2ahx1wh2rmc0rn"))
 
 (define-public wscat
-  (gopkg "wscat"
-   (format-inputs (list gotext uuid gobang eut))
+  (gopkg
+   "wscat"
+   (format-inputs (list))
    "2f5609c616e78570bef450c18501c92f49fc77d3"
    "0ydm09ypwrszl0h8kx1riz1wa89bynvxyk7313v4v89nzb4s2f78"))
 
 (define-public gistatic
-  (gopkg "gistatic"
-   (format-inputs (list gotext uuid gobang eut))
+  (gopkg
+   "gistatic"
+   (format-inputs (list))
    "fdd9d91574a486e867a88596bd98878c97177534"
    "1vrxma44vlvzp2dxnw254iwfvjv9wmlb74cr5lp6z3z0hz973vyx"))