01/02: packages: patch-and-repack: Build tarballs deterministically.

[Mark H. Weaver]

mhw pushed a commit to branch core-updates
in repository guix.

commit 2e9511dfbdb5ddd78c2f205c4ca7fc23738d79f8
Author: Mark H Weaver <address@hidden>
Date:   Tue Jul 14 19:41:20 2015 -0400

    packages: patch-and-repack: Build tarballs deterministically.
    
    * guix/packages.scm (patch-and-repack)[build]: When invoking 'tar' to repack
      the archive, pass "address@hidden", "--owner=root:0", and 
"--group=root:0".
---
 guix/packages.scm |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index 3422272..3983d14 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
-;;; Copyright © 2014 Mark H Weaver <address@hidden>
+;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -480,7 +480,11 @@ IMPORTED-MODULES specify modules to use/import for use by 
SNIPPET."
 
                       (begin (chdir "..") #t)
                       (zero? (system* (string-append #+tar "/bin/tar")
-                                      "cvfa" #$output directory)))))))
+                                      "cvfa" #$output directory
+                                      ;; avoid non-determinism in the archive
+                                      "address@hidden"
+                                      "--owner=root:0"
+                                      "--group=root:0")))))))
 
     (let ((name    (tarxz-name original-file-name))
           (modules (delete-duplicates (cons '(guix build utils) modules))))