From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Vong Subject: Re: [PATCH] gnu: Add clojure. Date: Tue, 16 Aug 2016 21:28:33 +0800 Message-ID: <87bn0sc072.fsf@gmail.com> 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> <87inv21aw5.fsf@elephly.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZeQA-0003FU-4x for guix-devel@gnu.org; Tue, 16 Aug 2016 09:28:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bZeQ5-00005S-PU for guix-devel@gnu.org; Tue, 16 Aug 2016 09:28:44 -0400 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]:34455) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZeQ5-00005N-E4 for guix-devel@gnu.org; Tue, 16 Aug 2016 09:28:41 -0400 Received: by mail-pa0-x231.google.com with SMTP id fi15so26613119pac.1 for ; Tue, 16 Aug 2016 06:28:41 -0700 (PDT) In-Reply-To: <87inv21aw5.fsf@elephly.net> (Ricardo Wurmus's message of "Mon, 15 Aug 2016 14:20:42 +0200") 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: Ricardo Wurmus Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Hi Ricardo, Thanks for the review too. The changes looks good to me, excepts that it seems 'find-files' will find all files with name matching the regex recursively, but `scandir' will only list the files on the 1st level. Should we change 'find-files so that it supports the concept of depth as well? Also, I realize there is a typo in my original patch. It should be 'under' instead of 'under under' in the comment. Here is the changes I make: 1 file changed, 8 insertions(+), 3 deletions(-) gnu/packages/java.scm | 11 ++++++++--- modified gnu/packages/java.scm @@ -172,6 +172,8 @@ 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" @@ -223,7 +225,10 @@ is implemented.") (copy-recursively "target/javadoc/" (string-append doc-dir "javadoc/")) (for-each (cut install-file <> doc-dir) - (find-files "." ".*\\.(html|markdown|md|txt)")) + (filter (cut string-match + ".*\\.(html|markdown|md|txt)" + <>) + (scandir "./"))) #t)))))) ;; The native-inputs below are needed to run the tests. (native-inputs @@ -269,8 +274,8 @@ 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 + ;; Guava Murmur3 hash implementation is licensed under APL2.0 + ;; src/clj/repl.clj is licensed under CPL1.0 ;; ;; See readme.html or readme.txt for details. (license (list license:epl1.0 Here is the whole patch: --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-clojure.patch Content-Transfer-Encoding: quoted-printable >From 8c0bdc35a168d6c1102ba81a6f26c847bb47c47e 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 | 141 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 141 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e821607..3e0b034 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -142,6 +142,147 @@ is implemented.") license:mpl2.0 license:lgpl2.1+)))) =20 +(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/clojur= e/" + 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) + (ice-9 ftw) + (ice-9 regex) + (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=3D1")) + (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) + (filter (cut string-match + ".*\\.(html|markdown|md|txt)" + <>) + (scandir "./"))) + #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" + "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp= 1")) + ("java-classpath-src" + ,(submodule "java.classpath/archive/java.classpath-" + "0.2.3" + "0sjymly9xh1lkvwn5ygygpsfwz4dabblnlq0c9bx76rkvq62fyn= g")) + ("test-check-src" + ,(submodule "test.check/archive/test.check-" + "0.9.0" + "0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1m= d")) + ("test-generative-src" + ,(submodule "test.generative/archive/test.generative-" + "0.5.2" + "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f= 8")) + ("tools-namespace-src" + ,(submodule "tools.namespace/archive/tools.namespace-" + "0.2.11" + "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy= 0")) + ("tools-reader-src" + ,(submodule "tools.reader/archive/tools.reader-" + "0.10.0" + "09i3lzbhr608h76mhdjm3932gg9xi8sflscla3c5f0v1nkc28cn= r")))) + (home-page "https://clojure.org/") + (synopsis "Lisp dialect running on the JVM") + (description "Clojure is a dynamic, general-purpose programming lang= uage, +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 dynam= ic +=E2=80=93 every feature supported by Clojure is supported at runtime. Clo= jure +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 philos= ophy +and a powerful macro system. Clojure is predominantly a functional progra= mming +language, and features a rich set of immutable, persistent data structures. +When mutable state is needed, Clojure offers a software transactional memo= ry +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 APL2.0 + ;; src/clj/repl.clj is licensed 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") --=20 2.9.2 --=-=-= Content-Type: text/plain Cheers, Alex --=-=-=--