about summary refs log tree commit diff
diff options
context:
space:
mode:
authorArun Isaac2026-03-23 18:10:18 +0000
committerArun Isaac2026-03-23 18:30:06 +0000
commit5e72ce99af835f79a5783daa8ddd83167c147f51 (patch)
tree28380db3c7e3f37e2da30e35e723baec4c95b603
parent41db9dc5ab7e14c8c0fb7d669a615c62c4008916 (diff)
downloadravanan-5e72ce99af835f79a5783daa8ddd83167c147f51.tar.gz
ravanan-5e72ce99af835f79a5783daa8ddd83167c147f51.tar.lz
ravanan-5e72ce99af835f79a5783daa8ddd83167c147f51.zip
guix: Use ccwl from upstream Guix.
ccwl 0.5.0 has been released and the upstream Guix package has been
updated.
-rw-r--r--.guix/e2e-tests.scm25
-rw-r--r--manifest.scm4
2 files changed, 3 insertions, 26 deletions
diff --git a/.guix/e2e-tests.scm b/.guix/e2e-tests.scm
index 201d482..962942b 100644
--- a/.guix/e2e-tests.scm
+++ b/.guix/e2e-tests.scm
@@ -18,33 +18,10 @@
 
 (define-module (e2e-tests)
   #:use-module ((cwl-conformance) #:select (cwltest-suite-gexp))
-  #:use-module ((gnu packages bioinformatics) #:select (ccwl) #:prefix guix:)
-  #:use-module ((gnu packages guile-xyz) #:select (guile-run64))
+  #:use-module ((gnu packages bioinformatics) #:select (ccwl))
   #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module (guix packages)
   #:use-module (ice-9 match))
 
-(define-public ccwl
-  (let ((commit "4f757fc0a4d4af067e0d22ad4020c1b18cc3fd24")
-        (revision "2"))
-    (package
-      (inherit guix:ccwl)
-      (name "ccwl")
-      (version (git-version "0.4.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://git.systemreboot.net/ccwl")
-                       (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "0jch7pr85r2cd9g4b4gq748mbnbi5jg0dqyp8ixhhwac2yqbmyqh"))))
-      (native-inputs
-       (modify-inputs (package-native-inputs guix:ccwl)
-         (prepend guile-run64))))))
-
 (define (e2e-tools-gexp sources-directory doc-hello-world)
   (with-imported-modules '((guix build utils))
     #~(begin
diff --git a/manifest.scm b/manifest.scm
index 206d0a4..464686c 100644
--- a/manifest.scm
+++ b/manifest.scm
@@ -1,6 +1,6 @@
-(use-modules ((gnu packages guile-xyz) #:select (guile-ares-rs))
+(use-modules ((gnu packages bioinformatics) #:select (ccwl))
+             ((gnu packages guile-xyz) #:select (guile-ares-rs))
              ((cwltest-package) #:select (cwltest))
-             ((e2e-tests) #:select (ccwl))
              ((ravanan-package) #:select (ravanan))
              (srfi srfi-1))