From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Vong Subject: Re: [PATCH] gnu: Add clojure. Date: Thu, 14 Jul 2016 21:22:57 +0800 Message-ID: <87h9bs4amm.fsf@gmail.com> References: <87r3b7gc4d.fsf@gmail.com> <8737ndiln5.fsf@elephly.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNgbh-0008HV-3L for guix-devel@gnu.org; Thu, 14 Jul 2016 09:23:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNgbc-0004jw-12 for guix-devel@gnu.org; Thu, 14 Jul 2016 09:23:12 -0400 Received: from mail-pa0-x236.google.com ([2607:f8b0:400e:c03::236]:34547) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNgbb-0004in-LW for guix-devel@gnu.org; Thu, 14 Jul 2016 09:23:07 -0400 Received: by mail-pa0-x236.google.com with SMTP id fi15so28719646pac.1 for ; Thu, 14 Jul 2016 06:23:07 -0700 (PDT) In-Reply-To: <8737ndiln5.fsf@elephly.net> (Ricardo Wurmus's message of "Wed, 13 Jul 2016 17:49:02 +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; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ricardo Wurmus writes: > Hi Alex, > >> This patch adds clojure 1.6 to 1.8. > > Wow. Thanks! > Thanks for the review too! > Usually, we just keep the latest version unless there are packages that > dependend on an older version. In the case of the IcedTea packages, for > example, we need version 6 to be able to bootstrap the others. > > In my opinion we should just add Clojure version 1.8 for now. In any > case (if other people decide that we should have more than one version) > please only add one package per patch. It=E2=80=99s a little tedious to = split > stuff up, I know, but it makes handling repository history and partial > reverts much easier.=20 > I see. So the general policy here is to be lazy and packaged by need :) This time only version 1.8 is added. Does this apply to splitting bundled libraries as well? I see clojure has some java libraries bundled such as ASM. Currently, I suppose no other packages depend on it. > I see that you added a very large patch to make this work. In Guix we > usually avoid patching upstream software unless it=E2=80=99s absolutely > necessary. Have you thought about submitting your patch upstream to > enable compilation with GCJ? I think we should not add extensive > patches like that unless they are considered by the upstream developers. > > It=E2=80=99s also not so pretty that you have to call =E2=80=9Cgcj=E2=80= =9D and =E2=80=9Cg++=E2=80=9D in a > somewhat complicated build phase =E2=80=9Cbuild-native=E2=80=9D. If you = can get > upstream to accept your patches to build with GCJ maybe you can slip in > a patch to add a new Makefile target as well? This would greatly > simplify the build phases. > I see clojure is written only in java and clojure. I will ask for upstream advice on this one. > Mmyeah=E2=80=A6 this is really not pretty. Also: wrapping the whole pack= age > expression in this =E2=80=9Cget-version=E2=80=9D let-binding is not nice. > > Have you thought of instead writing a procedure that produces a Clojure > package given a particular version? Similar to the =E2=80=9Ccustom-gcc= =E2=80=9D > procedure maybe? > Now only version 1.8 is added, the problem has gone temporarily. But it is interesting to know how the gcc package solves this problem. > Again, thanks a lot for the effort! I really hope we can add Clojure to > Guix soon. > > ~~ Ricardo Thanks, Alex --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-clojure.patch Content-Transfer-Encoding: quoted-printable >From 69cb51c65014083a5838238bff688d7652e862a2 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 variables. --- gnu/packages/java.scm | 202 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 202 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 753fb77..0a8956b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages ghostscript) ;lcms #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages haskell) #:use-module (gnu packages image) #:use-module (gnu packages linux) ;alsa #:use-module (gnu packages wget) @@ -141,6 +142,207 @@ 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))) + (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) + (let ((unpack + (lambda (src-name) + (and (mkdir-p src-name) + (with-directory-excursion src-name + (zero? (system* "tar" + ;; Use xz since tarball is = repacked. + "--xz" + "--extract" + "--verbose" + "--file" (assoc-ref inputs + src-nam= e) + "--strip-components=3D1")))= ))) + (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"))))) + (add-after 'build 'build-doc + (lambda _ + (let* ((markdown-regex "(.*)\\.(md|markdown|txt)") + (gsub regexp-substitute/global) + (markdown->html (lambda (src-name) + (zero? (system* + "pandoc" + "--output" (gsub #f + markdown-= regex + src-name + 1 ".html") + "--verbose" + "--from" "markdown_github" + "--to" "html" + src-name))))) + (every markdown->html + (find-files "./" markdown-regex))))) + (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-file (string-append "clojure-" ,version ".jar") + java-dir) + #t))) + (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-file-to-dir (lambda (file dir) + (copy-file file + (string-append dir + file)))= )) + (for-each delete-file + (find-files "doc/clojure/" + ".*\\.(md|markdown|txt)")) + (copy-recursively "doc/clojure/" doc-dir) + (for-each (cut copy-file-to-dir <> doc-dir) + (filter (cut string-match ".*\\.(html|txt)" <>) + (scandir "./"))) + #t)))))) + (native-inputs + `(("ghc-pandoc" ,ghc-pandoc) + ;; The native-inputs below are needed to run the tests. + ("data-generators-src" + ,(let ((version "0.1.2")) + (origin + (method url-fetch) + (uri (string-append "https://github.com/clojure" + "/data.generators/archive/data.generato= rs-" + version ".tar.gz")) + (sha256 + (base32 + "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) + (modules '((guix build utils) + (ice-9 ftw))) + (snippet remove-archives)))) + ("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)))) + ("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)))) + ("test-generative-src" + ,(let ((version "0.5.2")) + (origin + (method url-fetch) + (uri (string-append "https://github.com/clojure" + "/test.generative/archive/test.generati= ve-" + version ".tar.gz")) + (sha256 + (base32 + "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) + (modules '((guix build utils))) + (snippet remove-archives)))) + ("tools-namespace-src" + ,(let ((version "0.2.11")) + (origin + (method url-fetch) + (uri (string-append "https://github.com/clojure" + "/tools.namespace/archive/tools.namespa= ce-" + version ".tar.gz")) + (sha256 + (base32 + "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")) + (modules '((guix build utils))) + (snippet remove-archives)))) + ("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)))))) + (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 dynamic +=E2=80=93 every feature supported by Clojure is supported at runtime. Cloj= ure 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 program= ming +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 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") --=20 2.9.0 --=-=-=--