[PATCH] packages: Add zip archive support to 'patch-and-repack'.

[PATCH] packages: Add zip archive support to 'patch-and-repack'.

[Eric Bavier]

* guix/packages.scm (%standard-patch-inputs): Add "unzip".
  (patch-and-repack)[decompression-type]: Detect zip archive.
  [build]: Invoke "unzip" when appropriate.
---
 guix/packages.scm |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index ca9d3a9..03adf89 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -335,6 +335,7 @@ corresponds to the arguments expected by `set-path-environment-variable'."
       ("bzip2" ,(ref '(gnu packages compression) 'bzip2))
       ("gzip"  ,(ref '(gnu packages compression) 'gzip))
       ("lzip"  ,(ref '(gnu packages compression) 'lzip))
+      ("unzip" ,(ref '(gnu packages zip) 'unzip))
       ("patch" ,(ref '(gnu packages base) 'patch))
       ("locales" ,(ref '(gnu packages commencement)
                        'glibc-utf8-locales-final)))))
@@ -384,6 +385,7 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET."
     (cond ((string-suffix? "gz" source-file-name)  "gzip")
           ((string-suffix? "bz2" source-file-name) "bzip2")
           ((string-suffix? "lz" source-file-name)  "lzip")
+          ((string-suffix? "zip" source-file-name) "unzip")
           (else "xz")))
 
   (define original-file-name
@@ -464,8 +466,10 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET."
                      (mkdir directory)
                      (copy-recursively #$source directory)
                      #t)
-                   (zero? (system* (string-append #$tar "/bin/tar")
-                                   "xvf" #$source)))
+                   #$@(if (string=? decompression-type "unzip")
+                          #~((zero? (system* "unzip" #$source)))
+                          #~((zero? (system* (string-append #$tar "/bin/tar")
+                                             "xvf" #$source)))))
                (let ((directory (first-file ".")))
                  (format (current-error-port)
                          "source is under '~a'~%" directory)
-- 
1.7.9.5

Re: [PATCH] packages: Add zip archive support to 'patch-and-repack'.

[Ludovic Courtès]

Eric Bavier <bavier@member.fsf.org> skribis:

> * guix/packages.scm (%standard-patch-inputs): Add "unzip".
>   (patch-and-repack)[decompression-type]: Detect zip archive.
>   [build]: Invoke "unzip" when appropriate.

Please add “Fixes <http://bugs.gnu.org/19830>.” right above, and email
19830-close@debbugs.gnu.org with the commit id afterwards.

> -                   (zero? (system* (string-append #$tar "/bin/tar")
> -                                   "xvf" #$source)))
> +                   #$@(if (string=? decompression-type "unzip")
> +                          #~((zero? (system* "unzip" #$source)))
> +                          #~((zero? (system* (string-append #$tar "/bin/tar")
> +                                             "xvf" #$source)))))

Simply:

  #$(if (string=? decompression-type "unzip")
        #~(zero? (system* "unzip" #$source))
        #~(zero? (system* (string-append #$tar "/bin/tar") ...)))

OK to push with these changes!

Thank you,
Ludo’.

Re: [PATCH] packages: Add zip archive support to 'patch-and-repack'.

[Mark H Weaver]

ludo@gnu.org (Ludovic Courtès) writes:

> Eric Bavier <bavier@member.fsf.org> skribis:
>
>> * guix/packages.scm (%standard-patch-inputs): Add "unzip".
>>   (patch-and-repack)[decompression-type]: Detect zip archive.
>>   [build]: Invoke "unzip" when appropriate.
>
> Please add “Fixes <http://bugs.gnu.org/19830>.” right above, and email
> 19830-close@debbugs.gnu.org with the commit id afterwards.
>
>> -                   (zero? (system* (string-append #$tar "/bin/tar")
>> -                                   "xvf" #$source)))
>> +                   #$@(if (string=? decompression-type "unzip")
>> +                          #~((zero? (system* "unzip" #$source)))
>> +                          #~((zero? (system* (string-append #$tar "/bin/tar")
>> +                                             "xvf" #$source)))))
>
> Simply:
>
>   #$(if (string=? decompression-type "unzip")
>         #~(zero? (system* "unzip" #$source))
>         #~(zero? (system* (string-append #$tar "/bin/tar") ...)))
>
> OK to push with these changes!

This is for core-updates, right?

       Mark

Re: [PATCH] packages: Add zip archive support to 'patch-and-repack'.

[Eric Bavier]

On 2015-03-25 08:03, Mark H Weaver wrote:
> ludo@gnu.org (Ludovic Courtès) writes:
> 
>> Eric Bavier <bavier@member.fsf.org> skribis:
>> 
>>> * guix/packages.scm (%standard-patch-inputs): Add "unzip".
>>>   (patch-and-repack)[decompression-type]: Detect zip archive.
>>>   [build]: Invoke "unzip" when appropriate.
[...]
>> 
>> OK to push with these changes!
> 
> This is for core-updates, right?

Yes, I pushed it on core-updates.  Mostly because it uses the 
gexp-rewrite that Ludo did on core-updates.

`~Eric