diff mbox

gnu: Remove redundancy where mkdir-p <dir> is followed by install-file <file> <dir>.

Message ID 5cf95ba2b20f58e0bfa9392ea0eb92cf@mykolab.ch
State New
Headers show

Commit Message

Petter Nov. 20, 2016, 3:28 p.m. UTC
Forgot the patch in the initial message :/

Comments

Leo Famulari Nov. 20, 2016, 5:05 p.m. UTC | #1
On Sun, Nov 20, 2016 at 04:28:29PM +0100, Petter wrote:
> From 595d438789c7c9a293ae7fac500ace7422073624 Mon Sep 17 00:00:00 2001
> From: Petter <petter@mykolab.ch>
> Date: Sun, 20 Nov 2016 13:39:13 +0100
> Subject: [PATCH] gnu: Remove redundancy where mkdir-p <dir> is followed by
>  install-file <file> <dir>.
> 
> * gnu/packages/bioinformatics.scm (bwa)[source]: Remove redundant mkdir-p.
> * gnu/packages/bioinformatics.scm (eigensoft)[source]: Likewise.
> * gnu/packages/bioinformatics.scm (snap-aligner)[source]: Likewise.
> * gnu/packages/bioinformatics.scm (pardre)[source]: Likewise.
> * gnu/packages/bioinformatics.scm (piranha)[source]: Likewise.
> * gnu/packages/maths.scm (hypre)[source]: Likewise.
> * gnu/packages/mp3.scm (mpc123)[source]: Likewise.
> * gnu/packages/music.scm (tuxguitar)[source]: Likewise.
> * gnu/packages/pdf.scm (impressive)[source]: Likewise.
> * gnu/packages/qemu.scm (qemu)[source]: Likewise.
> * gnu/packages/tls.scm (openssl)[source]: Likewise.

Thanks! A few requests...

First, I think that most, if not all, of these changes are not in the
[source] field of the changed package definitions. I bet that they are
all in the [arguments] field. Can you send a revised patch with an
updated commit message?

Second, we can't change the OpenSSL package on the master branch,
because many things depend on it:

$ guix refresh -l openssl@1.0.2
Building the following 1090 packages would ensure 2981 dependent packages are rebuilt
[...]

We do non-security related changes to that sort of "core" package on the
core-updates branch, which is merged into master every couple months.
Otherwise, we'd be rebuilding everything constantly, and users would be
unhappy.

So, will you submit a separate patch for the OpenSSL change? Make sure
it applies cleanly to the core-updates branch. You don't need to try
building this; it will take forever, as you noticed.
Ludovic Courtès Nov. 21, 2016, 2:22 p.m. UTC | #2
Hi Petter,

Sounds like a good idea.

Petter <petter@mykolab.ch> skribis:

> From 595d438789c7c9a293ae7fac500ace7422073624 Mon Sep 17 00:00:00 2001
> From: Petter <petter@mykolab.ch>
> Date: Sun, 20 Nov 2016 13:39:13 +0100
> Subject: [PATCH] gnu: Remove redundancy where mkdir-p <dir> is followed by
>  install-file <file> <dir>.
>
> * gnu/packages/bioinformatics.scm (bwa)[source]: Remove redundant mkdir-p.
> * gnu/packages/bioinformatics.scm (eigensoft)[source]: Likewise.
> * gnu/packages/bioinformatics.scm (snap-aligner)[source]: Likewise.
> * gnu/packages/bioinformatics.scm (pardre)[source]: Likewise.
> * gnu/packages/bioinformatics.scm (piranha)[source]: Likewise.

Nitpick: no need to repeat the file name for each entry here.

> * gnu/packages/maths.scm (hypre)[source]: Likewise.
> * gnu/packages/mp3.scm (mpc123)[source]: Likewise.
> * gnu/packages/music.scm (tuxguitar)[source]: Likewise.
> * gnu/packages/pdf.scm (impressive)[source]: Likewise.
> * gnu/packages/qemu.scm (qemu)[source]: Likewise.
> * gnu/packages/tls.scm (openssl)[source]: Likewise.

The only question here before we can apply is how much gets rebuilt as a
consequence of this change.

Changing openssl would rebuild too much for instance, so that would go
to the ‘core-updates’ branch.

The rest looks OK for master, but could you check with ‘guix refresh -l’
and submit separate patches accordingly?  See
<https://lists.gnu.org/archive/html/guix-devel/2016-10/msg00933.html>
on how to choose a branch.

Thank you!

Ludo’.
diff mbox

Patch

From 595d438789c7c9a293ae7fac500ace7422073624 Mon Sep 17 00:00:00 2001
From: Petter <petter@mykolab.ch>
Date: Sun, 20 Nov 2016 13:39:13 +0100
Subject: [PATCH] gnu: Remove redundancy where mkdir-p <dir> is followed by
 install-file <file> <dir>.

* gnu/packages/bioinformatics.scm (bwa)[source]: Remove redundant mkdir-p.
* gnu/packages/bioinformatics.scm (eigensoft)[source]: Likewise.
* gnu/packages/bioinformatics.scm (snap-aligner)[source]: Likewise.
* gnu/packages/bioinformatics.scm (pardre)[source]: Likewise.
* gnu/packages/bioinformatics.scm (piranha)[source]: Likewise.
* gnu/packages/maths.scm (hypre)[source]: Likewise.
* gnu/packages/mp3.scm (mpc123)[source]: Likewise.
* gnu/packages/music.scm (tuxguitar)[source]: Likewise.
* gnu/packages/pdf.scm (impressive)[source]: Likewise.
* gnu/packages/qemu.scm (qemu)[source]: Likewise.
* gnu/packages/tls.scm (openssl)[source]: Likewise.
---
 gnu/packages/bioinformatics.scm | 7 -------
 gnu/packages/maths.scm          | 1 -
 gnu/packages/mp3.scm            | 1 -
 gnu/packages/music.scm          | 1 -
 gnu/packages/pdf.scm            | 1 -
 gnu/packages/qemu.scm           | 1 -
 gnu/packages/tls.scm            | 1 -
 7 files changed, 13 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 64c7bba..97d3e48 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -1261,9 +1261,6 @@  splice junctions between exons.")
                       (assoc-ref outputs "out") "/share/doc/bwa"))
                 (man (string-append
                       (assoc-ref outputs "out") "/share/man/man1")))
-            (mkdir-p bin)
-            (mkdir-p doc)
-            (mkdir-p man)
             (install-file "bwa" bin)
             (install-file "README.md" doc)
             (install-file "bwa.1" man)))
@@ -2155,7 +2152,6 @@  of nucleic acid binding proteins.")
              (lambda* (#:key outputs #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))
                       (bin  (string-append out "/bin")))
-                 (mkdir-p bin)
                  (for-each (lambda (file)
                              (install-file file bin))
                            (find-files "../bin" ".*"))
@@ -4834,7 +4830,6 @@  optionally compressed by gzip.")
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin")))
-               (mkdir-p bin)
                (install-file "snap-aligner" bin)
                (install-file "SNAPCommand" bin)
                #t))))))
@@ -5694,7 +5689,6 @@  Needleman-Wunsch).")
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
-               (mkdir-p bin)
                (install-file "ParDRe" bin)
                #t))))))
     (inputs
@@ -7572,7 +7566,6 @@  intervals (e.g. genes, sequence alignments).")
              (lambda* (#:key outputs #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))
                       (bin (string-append out "/bin")))
-                 (mkdir-p bin)
                  (for-each (lambda (file)
                              (install-file file bin))
                            (find-files "bin" ".*")))
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index a1bd784..0c51f6d 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2723,7 +2723,6 @@  set.")
              ;; Custom install because docs/Makefile doesn't honor ${docdir}.
              (let* ((doc (assoc-ref outputs "doc"))
                     (docdir (string-append doc "/share/doc/hypre-" ,version)))
-               (mkdir-p docdir)
                (with-directory-excursion "docs"
                  (for-each (lambda (base)
                              (install-file (string-append base ".pdf") docdir)
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index ceef896..7f0099e 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -441,7 +441,6 @@  format.")
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin")))
-               (mkdir-p bin)
                (install-file "mpc123" bin)))))
        #:tests? #f))
     (native-inputs
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 4ec6d6e..1a2a33f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1216,7 +1216,6 @@  is subjective.")
                     (lib   (string-append share "/java"))
                     (swt   (assoc-ref inputs "java-swt")))
                (mkdir-p bin)
-               (mkdir-p lib)
                ;; install all jars
                (for-each (lambda (file)
                            (install-file file lib))
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 9c6e9a9..39f4d02 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -701,7 +701,6 @@  vector formats.")
                             (,(string-append sdl "/lib")))
                           `("PATH" ":" prefix     ;for pdftoppm
                             (,(string-append xpdf "/bin"))))
-                        (mkdir-p man1)
                         (install-file "impressive.1" man1)
                         #t))))))
     (home-page "http://impressive.sourceforge.net")
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
index f6e34ca..3c48b7a 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/qemu.scm
@@ -117,7 +117,6 @@ 
                  (let ((out (assoc-ref outputs "out")))
                    (and (zero? (system* "make" "info"))
                         (let ((infodir (string-append out "/share/info")))
-                          (mkdir-p infodir)
                           (for-each (lambda (info)
                                       (install-file info infodir))
                                     (find-files "." "\\.info$"))
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 74cc25b..bea15fa 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -294,7 +294,6 @@  required structures.")
                    (lib    (string-append out "/lib"))
                    (static (assoc-ref outputs "static"))
                    (slib   (string-append static "/lib")))
-              (mkdir-p slib)
               (for-each (lambda (file)
                           (install-file file slib)
                           (delete-file file))
-- 
2.10.1