From 96c462105627569ae4b82cdc0e0059806f855ba6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 28 Aug 2015 22:22:22 +0200 Subject: gnu: Use 'install-file' instead of 'mkdir-p' and 'copy-file' in obvious cases. * gnu/packages/bioinformatics.scm (bedtools, bowtie, bwa, hisat, samtools, plink, star): Use 'install-file' instead of 'mkdir-p' + 'copy-file'. * gnu/packages/check.scm (catch-framework): Likewise. * gnu/packages/code.scm (global): Likewise. * gnu/packages/emacs.scm (magit-svn, haskell-mode, emacs-pdf-tools): Likewise. * gnu/packages/engineering.scm (fastcap, fasthenry): Likewise. * gnu/packages/gnuzilla.scm (nss): Likewise. * gnu/packages/guile.scm (guile-minikanren): Likewise. * gnu/packages/java.scm (swt): Likewise. * gnu/packages/make-bootstrap.scm (%static-binaries): Likewise. * gnu/packages/maths.scm (lpsolve): Likewise. * gnu/packages/mp3.scm (mpc123): Likewise. * gnu/packages/ninja.scm (ninja): Likewise. * gnu/packages/python.scm (python-numpy, python-pyparsing): Likewise. * gnu/packages/screen.scm (dtach): Likewise. * gnu/packages/synergy.scm (synergy): Likewise. * gnu/packages/textutils.scm (utf8proc): Likewise. * gnu/packages/version-control.scm (git-test-sequence): Likewise. * gnu/packages/wicd.scm (wicd): Likewise. --- gnu/packages/make-bootstrap.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages/make-bootstrap.scm') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 07e8b5160..904aaedb7 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -253,10 +253,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; But of course, there are exceptions to this rule. (let ((grep (assoc-ref %build-inputs "grep"))) - (copy-file (string-append grep "/bin/fgrep") - (string-append bin "/fgrep")) - (copy-file (string-append grep "/bin/egrep") - (string-append bin "/egrep"))) + (install-file (string-append grep "/bin/fgrep") bin) + (install-file (string-append grep "/bin/egrep") bin)) ;; Clear references to the store path. (for-each remove-store-references -- cgit v1.3 From 92226a470ddc980e54863632e5b179bf40444bd7 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 3 Sep 2015 12:51:47 -0400 Subject: Build tarballs with deterministic file ordering. * guix/packages.scm (patch-and-repack)[build], gnu/system/install.scm (self-contained-tarball)[build], gnu/packages/make-bootstrap.scm (tarball-package), gnu/packages/admin.scm (isc-dhcp), gnu/packages/video.scm (avidemux): Pass "--sort=name" to 'tar'. --- gnu/packages/admin.scm | 1 + gnu/packages/make-bootstrap.scm | 3 ++- gnu/packages/video.scm | 3 ++- gnu/system/install.scm | 7 ++++++- guix/packages.scm | 1 + 5 files changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu/packages/make-bootstrap.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 53cf65e11..512d60498 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -428,6 +428,7 @@ connection alive.") (zero? (system* "tar" "cf" "bind.tar.gz" "bind-9.9.5-P1" ;; avoid non-determinism in the archive + "--sort=name" "--mtime=@0" "--owner=root:0" "--group=root:0")))) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 904aaedb7..d215a02ff 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -629,7 +629,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ".tar.xz") "." ;; avoid non-determinism in the archive - "--mtime=@0" "--owner=root:0" "--group=root:0")))))))))) + "--sort=name" "--mtime=@0" + "--owner=root:0" "--group=root:0")))))))))) (define %bootstrap-binaries-tarball ;; A tarball with the statically-linked bootstrap binaries. diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 79119ef43..c2f88e22c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1015,7 +1015,8 @@ for use with HTML5 video.") (("#! /bin/sh") (string-append "#!" (which "bash")))) (system* "tar" "cjf" "ffmpeg-2.6.1.tar.bz2" "ffmpeg-2.6.1" ;; avoid non-determinism in the archive - "--mtime=@0" "--owner=root:0" "--group=root:0") + "--sort=name" "--mtime=@0" + "--owner=root:0" "--group=root:0") (delete-file-recursively "ffmpeg-2.6.1"))) (alist-replace 'configure (lambda _ diff --git a/gnu/system/install.scm b/gnu/system/install.scm index e7e5d4ae9..880236861 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -74,8 +74,13 @@ under /root/.guix-profile where GUIX is installed." ;; length limitation. (with-directory-excursion %root (zero? (system* "tar" "--xz" "--format=gnu" - "--owner=root:0" "--group=root:0" + + ;; avoid non-determinism in the archive + "--sort=name" "--mtime=@0" ;for files in /var/guix + "--owner=root:0" + "--group=root:0" + "--check-links" "-cvf" #$output ;; Avoid adding / and /var to the tarball, diff --git a/guix/packages.scm b/guix/packages.scm index d338ad230..d73e6b0ab 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -482,6 +482,7 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET." (zero? (system* (string-append #+tar "/bin/tar") "cvfa" #$output directory ;; avoid non-determinism in the archive + "--sort=name" "--mtime=@0" "--owner=root:0" "--group=root:0"))))))) -- cgit v1.3 From 70db9576f467a09ddcc08a7d590dc88f9822e68b Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Tue, 9 Jun 2015 01:14:03 +0300 Subject: gnu: make-bootstrap: Remove unneeded configure flag from %gcc-static. With this commit "guix build bootstrap-tarballs --target=i686-pc-gnu" works. * gnu/packages/make-bootstrap.scm (%gcc-static): Remove unneeded --disable-decimal-float. --- gnu/packages/make-bootstrap.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/make-bootstrap.scm') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index d215a02ff..a12f4c15a 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -423,8 +423,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." "--disable-libcilkrts" "--disable-libvtv" "--disable-libssp" - "--disable-libquadmath" - "--disable-decimal-float") + "--disable-libquadmath") (remove (cut string-match "--(.*plugin|enable-languages)" <>) ,flags))) ((#:phases phases) -- cgit v1.3 From f24931d841bc7879708cdeec93f9b79cee3dc670 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 3 Sep 2015 11:12:28 +0300 Subject: gnu: bash-light: Rename to bash-minimal. * gnu/packages/bash.scm (bash-light): Rename to ... (bash-minimal): ...this. (static-bash): Use it. * gnu/packages/make-bootstrap.scm (%bash-static): Use it. --- gnu/packages/bash.scm | 6 +++--- gnu/packages/make-bootstrap.scm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/make-bootstrap.scm') diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index fcfa337fa..180c64e87 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -214,10 +214,10 @@ without modification.") (license gpl3+) (home-page "http://www.gnu.org/software/bash/")))) -(define-public bash-light +(define-public bash-minimal ;; A stripped-down Bash for non-interactive use. (package (inherit bash) - (name "bash-light") + (name "bash-minimal") (inputs '()) ; no readline, no curses (arguments (let ((args `(#:modules ((guix build gnu-build-system) @@ -242,7 +242,7 @@ without modification.") (define-public static-bash ;; Statically-linked Bash that contains nothing but the 'bash' binary and ;; 'sh' symlink, without any reference. - (let ((bash (static-package bash-light))) + (let ((bash (static-package bash-minimal))) (package (inherit bash) (name "bash-static") diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index a12f4c15a..91f8bf895 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -115,7 +115,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #:native-inputs native-inputs)) (define %bash-static - (static-package bash-light)) + (static-package bash-minimal)) (define %static-inputs ;; Packages that are to be used as %BOOTSTRAP-INPUTS. -- cgit v1.3