about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPjotr Prins2015-09-18 14:22:46 +0900
committerPjotr Prins2015-09-18 14:22:46 +0900
commit3dabef24b6d27ca682f25fbff0d6e6fe7d7ccc2e (patch)
tree697b93f4fcfa47eda0e82ff35157d2960149612f
parenta77920bde1fa723166788344e73714e29c92d423 (diff)
downloadguix-bioinformatics-3dabef24b6d27ca682f25fbff0d6e6fe7d7ccc2e.tar.gz
CWL works
-rw-r--r--gn/packages/cwl.scm7
-rw-r--r--gn/packages/python.scm4
2 files changed, 7 insertions, 4 deletions
diff --git a/gn/packages/cwl.scm b/gn/packages/cwl.scm
index 2891346..8b32564 100644
--- a/gn/packages/cwl.scm
+++ b/gn/packages/cwl.scm
@@ -30,13 +30,14 @@
           (base32
             "1kqxc6nvq4nr8qdv39ycdi6fhzaipgjpmbghsz94ij6jhf5r3dq2"))))
     (build-system python-build-system)
-    (propagated-inputs
-     `(("python-schema-salad" ,python-schema-salad)
-       ))
     (inputs
      `(("python-setuptools" ,python-setuptools)
        ("python-pyparsing" ,python-pyparsing)
        ))
+    (propagated-inputs
+     `(("python-schema-salad" ,python-schema-salad)
+       ("python-html5lib" ,python-html5lib)
+       ))
     (arguments `(#:tests? #f)) ;; No tests.
     (home-page
       "https://github.com/common-workflow-language/common-workflow-language")
diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index f6c4e92..d1180d9 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -63,6 +63,7 @@
     (propagated-inputs
      `(("python-rdflib-4.2" ,python-rdflib-4.2)
        ("python-pyparsing" ,python-pyparsing)
+       ("python-html5lib" ,python-html5lib)
 ))
     (home-page
       "https://github.com/RDFLib/rdflib-jsonld")
@@ -99,6 +100,7 @@
         ("python-isodate" ,python-isodate)
         ("python-pyparsing" ,python-pyparsing)
         ("python-setuptools" ,python-setuptools)))
+    (arguments `(#:tests? #f)) ;; No tests.
     (home-page "https://github.com/RDFLib/rdflib")
     (synopsis
       "Python RDF library")
@@ -114,7 +116,7 @@ powerful language for representing information.")
       (inherit base)
       (inputs
         (append (package-inputs base)
-                `(("python2-nose" ,python2-nose))))
+                `(("python-nose" ,python-nose))))
       (arguments
         `(#:python ,python-2
           #:tests? #f))))) ; 3 tests fail, also outside Guix