Patchwork gnu: Add clojure.

login
register
mail settings
Submitter Alex Vong
Date Aug. 16, 2016, 1:28 p.m.
Message ID <87bn0sc072.fsf@gmail.com>
Download mbox | patch
Permalink /patch/14611/
State New
Headers show

Comments

Alex Vong - Aug. 16, 2016, 1:28 p.m.
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:
Cheers,
Alex
Ricardo Wurmus - Aug. 16, 2016, 6:45 p.m.
Alex Vong <alexvong1995@gmail.com> writes:

> 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.

Ah, I didn’t notice that this is what you were trying to do there.
Using “scandir” is fine then.

> Also, I realize there is a typo in my original patch. It should be
> 'under' instead of 'under under' in the comment.

Excellent!  Pushed to master as
8293b116e64f543848f4845723208973aeb993f9.  Thank you for your
perseverance!

~~ Ricardo
Pjotr Prins - Aug. 16, 2016, 6:56 p.m.
On Tue, Aug 16, 2016 at 08:45:17PM +0200, Ricardo Wurmus wrote:
> 
> Alex Vong <alexvong1995@gmail.com> writes:
> 
> > 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.
> 
> Ah, I didn’t notice that this is what you were trying to do there.
> Using “scandir” is fine then.
> 
> > Also, I realize there is a typo in my original patch. It should be
> > 'under' instead of 'under under' in the comment.
> 
> Excellent!  Pushed to master as
> 8293b116e64f543848f4845723208973aeb993f9.  Thank you for your
> perseverance!

Awesome. Another compiler gone in!

--

Patch

From 8c0bdc35a168d6c1102ba81a6f26c847bb47c47e Mon Sep 17 00:00:00 2001
From: Alex Vong <alexvong1995@gmail.com>
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+))))
 
+(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)
+                    (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=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)
+                           (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"
+                      "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 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")
-- 
2.9.2