summary refs log tree commit diff
diff options
context:
space:
mode:
authorJulien Lepiller <julien@lepiller.eu>2020-06-27 17:05:07 +0200
committerJulien Lepiller <julien@lepiller.eu>2020-07-17 04:15:05 +0200
commit29534ff7f30e434e9d4177f8fcbec40a154d72e5 (patch)
treefba5e1f87a785dc4b60a5a2925d4d2cacbffd6a0
parent159e6d9fe33b8a76ae650d3b6b1f3d708eb6baaa (diff)
downloadguix-29534ff7f30e434e9d4177f8fcbec40a154d72e5.tar.gz
gnu: java-modello-core: Propagate inputs.
* gnu/packages/java.scm (java-modello-core): Propagate inputs.
(java-modello-plugins-java, java-modello-plugins-xml, java-modello-xpp3):
Remove java-modello-core's inputs and propagate.
-rw-r--r--gnu/packages/java.scm15
1 files changed, 6 insertions, 9 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index dfb84fc410..4db1a3b199 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -4554,7 +4554,7 @@ project and determining what files need to be rebuilt.")
                               "modello/core/io/ModelReaderTest.java")
                  (("src/test") "modello-core/src/test")))
              #t)))))
-    (inputs
+    (propagated-inputs
      `(("java-plexus-utils" ,java-plexus-utils)
        ("java-plexus-container-default" ,java-plexus-container-default)
        ("java-sisu-build-api" ,java-sisu-build-api)))
@@ -4603,8 +4603,7 @@ XSD and documentation.")
                                "build/classes")
              #t)))))
     (inputs
-     `(("java-modello-core" ,java-modello-core)
-       ,@(package-inputs java-modello-core)))
+     `(("java-modello-core" ,java-modello-core)))
     (synopsis "Modello Java Plugin")
     (description "Modello Java Plugin generates Java objects for the model.")))
 
@@ -4633,10 +4632,9 @@ XSD and documentation.")
                  "java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java"
                  (("src/test") "modello-plugins/modello-plugin-xml/src/test")))
              #t)))))
-    (inputs
+    (propagated-inputs
      `(("java-modello-core" ,java-modello-core)
-       ("java-modello-plugins-java" ,java-modello-plugins-java)
-       ,@(package-inputs java-modello-core)))
+       ("java-modello-plugins-java" ,java-modello-plugins-java)))
     (synopsis "Modello XML Plugin")
     (description "Modello XML Plugin contains shared code for every plugins
 working on XML representation of the model.")))
@@ -4679,11 +4677,10 @@ every feature for every plugin.")))
              (copy-recursively "modello-plugins/modello-plugin-xpp3/src/main/resources"
                                "build/classes")
              #t)))))
-    (inputs
+    (propagated-inputs
      `(("java-modello-core" ,java-modello-core)
        ("java-modello-plugins-java" ,java-modello-plugins-java)
-       ("java-modello-plugins-xml" ,java-modello-plugins-xml)
-       ,@(package-inputs java-modello-core)))
+       ("java-modello-plugins-xml" ,java-modello-plugins-xml)))
     (native-inputs
      `(("java-xmlunit" ,java-xmlunit)
        ("java-modello-test" ,java-modello-test)