remove upstreamed packages

Julien LepillerFri May 04 11:03:09+0200 2018

19bf314

remove upstreamed packages

more/packages/gradle.scm

863863 
         ("groovy-bootstrap" ,groovy-bootstrap)
864864 
         ("java-apache-ivy" ,java-apache-ivy)
865865 
         ("java-asm-6" ,java-asm-6)
866-
         ("java-bouncycastle-bcprov" ,java-bouncycastle-bcprov)
866+
         ("java-bouncycastle" ,java-bouncycastle)
867867 
         ("java-commons-io" ,java-commons-io)
868868 
         ("java-commons-lang" ,java-commons-lang)
869869 
         ("java-gson" ,java-gson)

…

927927 
         ("gradle-reporting" ,gradle-reporting)
928928 
         ("groovy-bootstrap" ,groovy-bootstrap)
929929 
         ("java-asm-6" ,java-asm-6)
930-
         ("java-bouncycastle-bcprov" ,java-bouncycastle-bcprov)
930+
         ("java-bouncycastle" ,java-bouncycastle)
931931 
         ("java-commons-io" ,java-commons-io)
932932 
         ("java-commons-lang" ,java-commons-lang)
933933 
         ("java-guava-for-gradle" ,java-guava-for-gradle)

more/packages/java.scm

11221122 
from ORO, Inc.")
11231123 
    (license license:asl2.0)))
11241124 
1125-
(define-public java-bouncycastle-bctls
1126-
  (package
1127-
    (name "java-bouncycastle-bctls")
1128-
    (version "1.58")
1129-
    (source (origin
1130-
              (method url-fetch)
1131-
              (uri "https://bouncycastle.org/download/bctls-jdk15on-158.tar.gz")
1132-
              (sha256
1133-
               (base32
1134-
                "0riyd4iy9q9gk8spf0pqp64hrfihrdfm445aqr9n2zfb7n4jz2v3"))))
1135-
    (build-system ant-build-system)
1136-
    (arguments
1137-
     `(#:jar-name "bouncycastle.jar"
1138-
       #:tests? #f; no tests
1139-
       #:source-dir "src"))
1140-
    (inputs
1141-
     `(("java-bouncycastle-bcprov" ,java-bouncycastle-bcprov)
1142-
       ("java-bouncycastle-bcpkix" ,java-bouncycastle-bcpkix)))
1143-
    (native-inputs
1144-
     `(("java-junit" ,java-junit)))
1145-
    (home-page "https://www.bouncycastle.org")
1146-
    (synopsis "Cryptographic library")
1147-
    (description "")
1148-
    (license license:expat)))
1149-
1150-
;; TODO: remove tests from org/bouncycastle/openpgp/test
1151-
(define-public java-bouncycastle-bcpg
1152-
  (package
1153-
    (name "java-bouncycastle-bcpg")
1154-
    (version "1.58")
1155-
    (source (origin
1156-
              (method url-fetch)
1157-
              (uri "https://bouncycastle.org/download/bcpg-jdk15on-158.tar.gz")
1158-
              (sha256
1159-
               (base32
1160-
                "1qhjkgxqvmhv9z6ni95qfxwbhgwysb4llr2hb0w9d9av741myhal"))))
1161-
    (build-system ant-build-system)
1162-
    (arguments
1163-
     `(#:jar-name "bouncycastle-bcpg.jar"
1164-
       #:tests? #f; no tests
1165-
       #:phases
1166-
       (modify-phases %standard-phases
1167-
         (add-after 'unpack 'unzip
1168-
           (lambda _
1169-
             (mkdir-p "src")
1170-
             (with-directory-excursion "src"
1171-
               (system* "unzip" "../src.zip"))
1172-
             #t)))))
1173-
    (inputs
1174-
     `(("java-bouncycastle-bcprov" ,java-bouncycastle-bcprov)))
1175-
    (native-inputs
1176-
     `(("java-junit" ,java-junit)
1177-
       ("unzip" ,unzip)))
1178-
    (home-page "https://www.bouncycastle.org")
1179-
    (synopsis "Cryptographic library")
1180-
    (description "")
1181-
    (license license:expat)))
1182-
11831125 
(define-public java-jboss-annotations-api-spec
11841126 
  (package
11851127 
    (name "java-jboss-annotations-api-spec")
…
31233065 
    (description "")
31243066 
    (license license:asl2.0)))
31253067 
3126-
(define-public java-apache-ivy
3127-
  (package
3128-
    (name "java-apache-ivy")
3129-
    (version "2.4.0")
3130-
    (source (origin
3131-
              (method url-fetch)
3132-
              (uri (string-append "mirror://apache//ant/ivy/" version
3133-
                                  "/apache-ivy-" version "-src.tar.gz"))
3134-
              (sha256
3135-
               (base32
3136-
                "1xkfn57g2m7l6y0xdq75x5rnrgk52m9jx2xah70g3ggl8750hbr0"))
3137-
              (patches
3138-
                (search-patches
3139-
                  "java-apache-ivy-port-to-latest-bouncycastle.patch"))))
3140-
    (build-system ant-build-system)
3141-
    (arguments
3142-
     `(#:jar-name "ivy.jar"
3143-
       #:tests? #f
3144-
       #:phases
3145-
       (modify-phases %standard-phases
3146-
         (add-before 'build 'remove-example
3147-
           (lambda _
3148-
             (delete-file-recursively "src/example")
3149-
             #t))
3150-
         (add-before 'build 'fix-vfs
3151-
           (lambda _
3152-
             (substitute*
3153-
               '("src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java"
3154-
                 "src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java")
3155-
               (("import org.apache.commons.vfs") "import org.apache.commons.vfs2"))
3156-
             #t)))))
3157-
       ;#:make-flags (list "-Duser.home=/tmp")
3158-
       ;#:phases
3159-
       ;(modify-phases %standard-phases
3160-
       ;  (replace 'install
3161-
       ;    (install-jars ".")))))
3162-
    (inputs
3163-
     `(("java-bouncycastle-bcpkix" ,java-bouncycastle-bcpkix)
3164-
       ("java-bouncycastle-bcprov" ,java-bouncycastle-bcprov)
3165-
       ("java-bouncycastle-bcpg" ,java-bouncycastle-bcpg)
3166-
       ("java-commons-cli" ,java-commons-cli)
3167-
       ("java-commons-collections" ,java-commons-collections)
3168-
       ("java-commons-httpclient" ,java-commons-httpclient)
3169-
       ("java-commons-lang" ,java-commons-lang)
3170-
       ("java-commons-vfs" ,java-commons-vfs)
3171-
       ("java-jakarta-oro" ,java-jakarta-oro)
3172-
       ("java-jsch" ,java-jsch)
3173-
       ("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)
3174-
       ("java-jsch-agentproxy-connector-factory" ,java-jsch-agentproxy-connector-factory)
3175-
       ("java-jsch-agentproxy-jsch" ,java-jsch-agentproxy-jsch)
3176-
       ("java-junit" ,java-junit)))
3177-
    (home-page "https://ant.apache.org/ivy")
3178-
    (synopsis "")
3179-
    (description "")
3180-
    (license license:asl2.0)))
3181-
31823068 
(define-public ant-junit
31833069 
  (package
31843070 
    (inherit ant)
…
43554241 
    (native-inputs
43564242 
     `(("groovy" ,groovy)))))
43574243 
4358-
(define-public java-jsch-agentproxy-core
4359-
  (package
4360-
    (name "java-jsch-agentproxy-core")
4361-
    (version "0.0.8")
4362-
    (source (origin
4363-
              (method url-fetch)
4364-
              (uri (string-append "https://github.com/ymnk/jsch-agent-proxy/archive/"
4365-
                                  version ".tar.gz"))
4366-
              (file-name (string-append name "-" version ".tar.gz"))
4367-
              (sha256
4368-
               (base32
4369-
                "02iqg6jbc1kxvfzqcg6wy9ygqxfm82bw5rf6vnswqy4y572niz4q"))))
4370-
    (build-system ant-build-system)
4371-
    (arguments
4372-
     `(#:jar-name "jsch-agentproxy-core.jar"
4373-
       #:source-dir "jsch-agent-proxy-core/src/main/java"
4374-
       #:tests? #f)); no tests
4375-
    (home-page "")
4376-
    (synopsis "")
4377-
    (description "")
4378-
    (license license:bsd-3)))
4379-
4380-
(define-public java-jsch-agentproxy-sshagent
4381-
  (package
4382-
    (inherit java-jsch-agentproxy-core)
4383-
    (name "java-jsch-agentproxy-sshagent")
4384-
    (arguments
4385-
     `(#:jar-name "jsch-agentproxy-sshagent.jar"
4386-
       #:source-dir "jsch-agent-proxy-sshagent/src/main/java"
4387-
       #:tests? #f)); no tests
4388-
    (inputs
4389-
     `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)))))
4390-
4391-
(define-public java-jsch-agentproxy-usocket-jna
4392-
  (package
4393-
    (inherit java-jsch-agentproxy-core)
4394-
    (name "java-jsch-agentproxy-usocket-jna")
4395-
    (arguments
4396-
     `(#:jar-name "jsch-agentproxy-usocket-jna.jar"
4397-
       #:source-dir "jsch-agent-proxy-usocket-jna/src/main/java"
4398-
       #:tests? #f)); no tests
4399-
    (inputs
4400-
     `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)
4401-
       ("java-native-access" ,java-native-access)))))
4402-
4403-
(define-public java-jsch-agentproxy-pageant
4404-
  (package
4405-
    (inherit java-jsch-agentproxy-core)
4406-
    (name "java-jsch-agentproxy-pageant")
4407-
    (arguments
4408-
     `(#:jar-name "jsch-agentproxy-pageant.jar"
4409-
       #:source-dir "jsch-agent-proxy-pageant/src/main/java"
4410-
       #:tests? #f)); no tests
4411-
    (inputs
4412-
     `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)
4413-
       ("java-native-access" ,java-native-access)
4414-
       ("java-native-access-platform" ,java-native-access-platform)))))
4415-
4416-
(define-public java-jsch-agentproxy-usocket-nc
4417-
  (package
4418-
    (inherit java-jsch-agentproxy-core)
4419-
    (name "java-jsch-agentproxy-usocket-nc")
4420-
    (arguments
4421-
     `(#:jar-name "jsch-agentproxy-usocket-nc.jar"
4422-
       #:source-dir "jsch-agent-proxy-usocket-nc/src/main/java"
4423-
       #:tests? #f)); no tests
4424-
    (inputs
4425-
     `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)))))
4426-
4427-
(define-public java-jsch-agentproxy-connector-factory
4428-
  (package
4429-
    (inherit java-jsch-agentproxy-core)
4430-
    (name "java-jsch-agentproxy-connector-factory")
4431-
    (arguments
4432-
     `(#:jar-name "jsch-agentproxy-connector-factory.jar"
4433-
       #:source-dir "jsch-agent-proxy-connector-factory/src/main/java"
4434-
       #:tests? #f)); no tests
4435-
    (inputs
4436-
     `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)
4437-
       ("java-jsch-agentproxy-sshagent" ,java-jsch-agentproxy-sshagent)
4438-
       ("java-jsch-agentproxy-usocket-jna" ,java-jsch-agentproxy-usocket-jna)
4439-
       ("java-jsch-agentproxy-pageant" ,java-jsch-agentproxy-pageant)
4440-
       ("java-jsch-agentproxy-usocket-nc" ,java-jsch-agentproxy-usocket-nc)))))
4441-
4442-
(define-public java-jsch-agentproxy-jsch
4443-
  (package
4444-
    (inherit java-jsch-agentproxy-core)
4445-
    (name "java-jsch-agentproxy-jsch")
4446-
    (arguments
4447-
     `(#:jar-name "jsch-agentproxy-jsch.jar"
4448-
       #:source-dir "jsch-agent-proxy-jsch/src/main/java"
4449-
       #:tests? #f)); no tests
4450-
    (inputs
4451-
     `(("java-jsch" ,java-jsch)
4452-
       ("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)))))
4453-
44544244 
(define-public bazel
44554245 
  (package
44564246 
    (name "bazel")