From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: Re: [PATCH] gnu: Add clojure. Date: Mon, 15 Aug 2016 14:20:42 +0200 Message-ID: <87inv21aw5.fsf@elephly.net> References: <87r3b7gc4d.fsf@gmail.com> <8737ndiln5.fsf@elephly.net> <87h9bs4amm.fsf@gmail.com> <87twfe7n6t.fsf@elephly.net> <87h9bc36wg.fsf@gmail.com> <87y44okw3r.fsf@elephly.net> <87bn1j60i5.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZGt1-0003IY-Bf for guix-devel@gnu.org; Mon, 15 Aug 2016 08:21:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bZGsw-0007Qb-Gv for guix-devel@gnu.org; Mon, 15 Aug 2016 08:20:59 -0400 Received: from sender163-mail.zoho.com ([74.201.84.163]:24545) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZGsw-0007QT-3N for guix-devel@gnu.org; Mon, 15 Aug 2016 08:20:54 -0400 In-reply-to: <87bn1j60i5.fsf@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Alex Vong Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Thanks for the patch. I went through it and tried to simplify it where possible. - removed unused module imports - merged some procedures - wrote an abstraction for submodules - changed comment style where necessary All proposed changes relative to your patch can be seen here: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=clojure-changes.diff diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5d36574..2f6d297 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -143,10 +143,18 @@ is implemented.") license:lgpl2.1+)))) (define-public clojure - (let ((remove-archives '(begin - (for-each delete-file - (find-files "./" ".*\\.(jar|zip)")) - #t))) + (let* ((remove-archives '(begin + (for-each delete-file + (find-files "." ".*\\.(jar|zip)")) + #t)) + (submodule (lambda (prefix version hash) + (origin + (method url-fetch) + (uri (string-append "https://github.com/clojure/" + prefix version ".tar.gz")) + (sha256 (base32 hash)) + (modules '((guix build utils))) + (snippet remove-archives))))) (package (name "clojure") (version "1.8.0") @@ -164,8 +172,6 @@ is implemented.") (arguments `(#:modules ((guix build ant-build-system) (guix build utils) - (ice-9 ftw) - (ice-9 regex) (srfi srfi-1) (srfi srfi-26)) #:test-target "test" @@ -173,134 +179,78 @@ is implemented.") (modify-phases %standard-phases (add-after 'unpack 'unpack-submodule-sources (lambda* (#:key inputs #:allow-other-keys) - (let ((unpack - (lambda (src-name) - (and (mkdir-p src-name) - (with-directory-excursion src-name - (zero? (system* "tar" - ;; Use xz for repacked tarball. - "--xz" - "--extract" - "--verbose" - "--file" (assoc-ref inputs - src-name) - "--strip-components=1")))))) - (copy (lambda (src-name) - (copy-recursively - (string-append src-name "/src/main/clojure/") - "src/clj/")))) - (every (lambda (src) - (unpack src) - (copy src)) - '("data-generators-src" "java-classpath-src" - "test-check-src" "test-generative-src" - "tools-namespace-src" "tools-reader-src"))))) - ;;; The javadoc target is not built by default. + (for-each + (lambda (name) + (mkdir-p name) + (with-directory-excursion name + (or (zero? (system* "tar" + ;; Use xz for repacked tarball. + "--xz" + "--extract" + "--verbose" + "--file" (assoc-ref inputs name) + "--strip-components=1")) + (error "failed to unpack tarball" name))) + (copy-recursively (string-append name "/src/main/clojure/") + "src/clj/")) + '("data-generators-src" + "java-classpath-src" + "test-check-src" + "test-generative-src" + "tools-namespace-src" + "tools-reader-src")) + #t)) + ;; The javadoc target is not built by default. (add-after 'build 'build-doc (lambda _ (zero? (system* "ant" "javadoc")))) - ;;; Needed since no install target is provided. + ;; Needed since no install target is provided. (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((java-dir (string-append (assoc-ref outputs "out") "/share/java/"))) - ;; Do not install clojure.jar to avoid collisions. + ;; Install versioned to avoid collisions. (install-file (string-append "clojure-" ,version ".jar") java-dir) #t))) - ;;; Needed since no install-doc target is provided. + ;; Needed since no install-doc target is provided. (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) (let ((doc-dir (string-append (assoc-ref outputs "out") "/share/doc/clojure-" ,version "/"))) - (and (copy-recursively "doc/clojure" doc-dir) - (copy-recursively "target/javadoc/" - (string-append doc-dir "javadoc/"))) + (copy-recursively "doc/clojure" doc-dir) + (copy-recursively "target/javadoc/" + (string-append doc-dir "javadoc/")) (for-each (cut install-file <> doc-dir) - (filter (cut string-match - ".*\\.(html|markdown|md|txt)" - <>) - (scandir "./"))) + (find-files "." ".*\\.(html|markdown|md|txt)")) #t)))))) ;; The native-inputs below are needed to run the tests. (native-inputs `(("data-generators-src" - ,(let ((version "0.1.2")) - (origin - (method url-fetch) - (uri (string-append "https://github.com/clojure" - "/data.generators/archive/data.generators-" - version ".tar.gz")) - (sha256 - (base32 - "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) - (modules '((guix build utils) - (ice-9 ftw))) - (snippet remove-archives)))) + ,(submodule "data.generators/archive/data.generators-" + "0.1.2" + "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) ("java-classpath-src" - ,(let ((version "0.2.3")) - (origin - (method url-fetch) - (uri - (string-append "https://github.com/clojure" - "/java.classpath/archive/java.classpath-" - version ".tar.gz")) - (sha256 - (base32 - "0sjymly9xh1lkvwn5ygygpsfwz4dabblnlq0c9bx76rkvq62fyng")) - (modules '((guix build utils))) - (snippet remove-archives)))) + ,(submodule "java.classpath/archive/java.classpath-" + "0.2.3" + "0sjymly9xh1lkvwn5ygygpsfwz4dabblnlq0c9bx76rkvq62fyng")) ("test-check-src" - ,(let ((version "0.9.0")) - (origin - (method url-fetch) - (uri - (string-append "https://github.com/clojure" - "/test.check/archive/test.check-" - version ".tar.gz")) - (sha256 - (base32 - "0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1md")) - (modules '((guix build utils))) - (snippet remove-archives)))) + ,(submodule "test.check/archive/test.check-" + "0.9.0" + "0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1md")) ("test-generative-src" - ,(let ((version "0.5.2")) - (origin - (method url-fetch) - (uri (string-append "https://github.com/clojure" - "/test.generative/archive/test.generative-" - version ".tar.gz")) - (sha256 - (base32 - "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) - (modules '((guix build utils))) - (snippet remove-archives)))) + ,(submodule "test.generative/archive/test.generative-" + "0.5.2" + "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) ("tools-namespace-src" - ,(let ((version "0.2.11")) - (origin - (method url-fetch) - (uri (string-append "https://github.com/clojure" - "/tools.namespace/archive/tools.namespace-" - version ".tar.gz")) - (sha256 - (base32 - "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")) - (modules '((guix build utils))) - (snippet remove-archives)))) + ,(submodule "tools.namespace/archive/tools.namespace-" + "0.2.11" + "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")) ("tools-reader-src" - ,(let ((version "0.10.0")) - (origin - (method url-fetch) - (uri - (string-append "https://github.com/clojure" - "/tools.reader/archive/tools.reader-" - version ".tar.gz")) - (sha256 - (base32 - "09i3lzbhr608h76mhdjm3932gg9xi8sflscla3c5f0v1nkc28cnr")) - (modules '((guix build utils))) - (snippet remove-archives)))))) + ,(submodule "tools.reader/archive/tools.reader-" + "0.10.0" + "09i3lzbhr608h76mhdjm3932gg9xi8sflscla3c5f0v1nkc28cnr")))) (home-page "https://clojure.org/") (synopsis "Lisp dialect running on the JVM") (description "Clojure is a dynamic, general-purpose programming language, --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Here’s a new patch incorporating the changes: --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-clojure.patch Content-Transfer-Encoding: 8bit >From f5d1a26196c1599647f85768b46a53a64eb0f45c Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Tue, 5 Jul 2016 16:24:20 +0800 Subject: [PATCH] gnu: Add clojure. * gnu/packages/java.scm (clojure): New variable. --- gnu/packages/java.scm | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e821607..2f6d297 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -142,6 +142,142 @@ is implemented.") license:mpl2.0 license:lgpl2.1+)))) +(define-public clojure + (let* ((remove-archives '(begin + (for-each delete-file + (find-files "." ".*\\.(jar|zip)")) + #t)) + (submodule (lambda (prefix version hash) + (origin + (method url-fetch) + (uri (string-append "https://github.com/clojure/" + prefix version ".tar.gz")) + (sha256 (base32 hash)) + (modules '((guix build utils))) + (snippet remove-archives))))) + (package + (name "clojure") + (version "1.8.0") + (source + (origin + (method url-fetch) + (uri + (string-append "http://repo1.maven.org/maven2/org/clojure/clojure/" + version "/clojure-" version ".zip")) + (sha256 + (base32 "1nip095fz5c492sw15skril60i1vd21ibg6szin4jcvyy3xr6cym")) + (modules '((guix build utils))) + (snippet remove-archives))) + (build-system ant-build-system) + (arguments + `(#:modules ((guix build ant-build-system) + (guix build utils) + (srfi srfi-1) + (srfi srfi-26)) + #:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-submodule-sources + (lambda* (#:key inputs #:allow-other-keys) + (for-each + (lambda (name) + (mkdir-p name) + (with-directory-excursion name + (or (zero? (system* "tar" + ;; Use xz for repacked tarball. + "--xz" + "--extract" + "--verbose" + "--file" (assoc-ref inputs name) + "--strip-components=1")) + (error "failed to unpack tarball" name))) + (copy-recursively (string-append name "/src/main/clojure/") + "src/clj/")) + '("data-generators-src" + "java-classpath-src" + "test-check-src" + "test-generative-src" + "tools-namespace-src" + "tools-reader-src")) + #t)) + ;; The javadoc target is not built by default. + (add-after 'build 'build-doc + (lambda _ + (zero? (system* "ant" "javadoc")))) + ;; Needed since no install target is provided. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((java-dir (string-append (assoc-ref outputs "out") + "/share/java/"))) + ;; Install versioned to avoid collisions. + (install-file (string-append "clojure-" ,version ".jar") + java-dir) + #t))) + ;; Needed since no install-doc target is provided. + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc-dir (string-append (assoc-ref outputs "out") + "/share/doc/clojure-" + ,version "/"))) + (copy-recursively "doc/clojure" doc-dir) + (copy-recursively "target/javadoc/" + (string-append doc-dir "javadoc/")) + (for-each (cut install-file <> doc-dir) + (find-files "." ".*\\.(html|markdown|md|txt)")) + #t)))))) + ;; The native-inputs below are needed to run the tests. + (native-inputs + `(("data-generators-src" + ,(submodule "data.generators/archive/data.generators-" + "0.1.2" + "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) + ("java-classpath-src" + ,(submodule "java.classpath/archive/java.classpath-" + "0.2.3" + "0sjymly9xh1lkvwn5ygygpsfwz4dabblnlq0c9bx76rkvq62fyng")) + ("test-check-src" + ,(submodule "test.check/archive/test.check-" + "0.9.0" + "0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1md")) + ("test-generative-src" + ,(submodule "test.generative/archive/test.generative-" + "0.5.2" + "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) + ("tools-namespace-src" + ,(submodule "tools.namespace/archive/tools.namespace-" + "0.2.11" + "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")) + ("tools-reader-src" + ,(submodule "tools.reader/archive/tools.reader-" + "0.10.0" + "09i3lzbhr608h76mhdjm3932gg9xi8sflscla3c5f0v1nkc28cnr")))) + (home-page "https://clojure.org/") + (synopsis "Lisp dialect running on the JVM") + (description "Clojure is a dynamic, general-purpose programming language, +combining the approachability and interactive development of a scripting +language with an efficient and robust infrastructure for multithreaded +programming. Clojure is a compiled language, yet remains completely dynamic +– every feature supported by Clojure is supported at runtime. Clojure +provides easy access to the Java frameworks, with optional type hints and type +inference, to ensure that calls to Java can avoid reflection. + +Clojure is a dialect of Lisp, and shares with Lisp the code-as-data philosophy +and a powerful macro system. Clojure is predominantly a functional programming +language, and features a rich set of immutable, persistent data structures. +When mutable state is needed, Clojure offers a software transactional memory +system and reactive Agent system that ensure clean, correct, multithreaded +designs.") + ;; Clojure is licensed under EPL1.0 + ;; ASM bytecode manipulation library is licensed under BSD-3 + ;; Guava Murmur3 hash implementation is licensed under under APL2.0 + ;; src/clj/repl.clj is licensed under under CPL1.0 + ;; + ;; See readme.html or readme.txt for details. + (license (list license:epl1.0 + license:bsd-3 + license:asl2.0 + license:cpl1.0))))) + (define-public ant (package (name "ant") -- 2.9.2 --=-=-= Content-Type: text/plain What do you think? ~~ Ricardo --=-=-=--