summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2023-04-29 16:34:17 +0200
committerRicardo Wurmus <rekado@elephly.net>2023-04-29 20:28:08 +0200
commit376c52a949d86f5da5f665cc0b5f852adb8edc1c (patch)
tree47147f64885e936c85ca24ceefd3d48931e077ba
parent46d78bf04508617cd14c17235c89bc831309be45 (diff)
downloadguix-376c52a949d86f5da5f665cc0b5f852adb8edc1c.tar.gz
gnu: r-rliger: Strip jar timestamps.
* gnu/packages/cran.scm (r-rliger)[arguments]: Add phase
'strip-jar-timestamps; remove trailing #T; add ant-build-system modules.
[source]: Simplify snippet.
[native-inputs]: Add zip.
-rw-r--r--gnu/packages/cran.scm22
1 files changed, 14 insertions, 8 deletions
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 36a25e9611..329cf7c1e9 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -24654,21 +24654,26 @@ multiple plots.")
          "16dzwwcpw6n78pxlc5w3kraigki35ix7zhd2cbx5f3y60bbkhlmx"))
        (modules '((guix build utils)))
        (snippet
-        '(begin
-           (delete-file "inst/java/ModularityOptimizer.jar")
-           #t))))
+        '(delete-file "inst/java/ModularityOptimizer.jar"))))
     (build-system r-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
+     (list
+      #:modules '((guix build r-build-system)
+                  ((guix build ant-build-system) #:prefix ant:)
+                  (guix build utils))
+      #:imported-modules `((guix build ant-build-system)
+                           ,@%r-build-system-modules)
+      #:phases
+      '(modify-phases %standard-phases
          (add-after 'unpack 'build-java-part
            (lambda* (#:key inputs #:allow-other-keys)
              (invoke "unzip" (assoc-ref inputs "optimizer-src"))
              (for-each (lambda (file) (invoke "javac" file))
                        (find-files "." "\\.java$"))
              (apply invoke "jar" "cf" "inst/java/ModularityOptimizer.jar"
-                    (find-files "." "\\.class$"))
-             #t)))))
+                    (find-files "." "\\.class$"))))
+         (add-after 'install 'strip-jar-timestamps
+           (assoc-ref ant:%standard-phases 'strip-jar-timestamps)))))
     (propagated-inputs
      (list r-cowplot
            r-dosnow
@@ -24702,7 +24707,8 @@ multiple plots.")
             (base32
              "01hmm6sapcmldvayknqx2w4cav3qv71mwwkdkwj4qgq6dss09g18"))))
        ("unzip" ,unzip)
-       ("r-knitr" ,r-knitr))) ; for vignettes
+       ("zip" ,zip)
+       ("r-knitr" ,r-knitr)))           ; for vignettes
     (home-page "https://github.com/MacoskoLab/liger")
     (synopsis "Integrate and analyze multiple single-cell datasets")
     (description