nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Remove now unneeded 'unpack' phases for unzip. 

This is a followup to commit cd0385b.

* gnu/packages/bioinformatics.scm (hisat)[arguments]: Remove 'unpack'
  phase.
* gnu/packages/image.scm (freeimage): Likewise.
* gnu/packages/python.scm (python2-cssutils): Likewise.
This commit is contained in:
Ludovic Courtès 2015-02-27 14:40:21 +01:00
parent e8c9f0498f
commit da6dd842d0
3 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/bioinformatics.scm
View File

@ -265,11 +265,6 @@ Illumina, Roche 454, and the SOLiD platform.")
'() '()
'("POPCNT_CAPABILITY=0"))) '("POPCNT_CAPABILITY=0")))
#:phases #:phases
(alist-replace
'unpack
(lambda* (#:key source #:allow-other-keys)
(and (zero? (system* "unzip" source))
(chdir "hisat-0.1.4-beta")))
(alist-cons-after (alist-cons-after
'unpack 'patch-sources 'unpack 'patch-sources
(lambda _ (lambda _
@ -293,7 +288,7 @@ Illumina, Roche 454, and the SOLiD platform.")
(find-files (find-files
"." "."
"hisat(-(build|align|inspect)(-(s|l)(-debug)*)*)*$")))) "hisat(-(build|align|inspect)(-(s|l)(-debug)*)*)*$"))))
(alist-delete 'configure %standard-phases)))))) (alist-delete 'configure %standard-phases)))))
(native-inputs (native-inputs
`(("unzip" ,unzip))) `(("unzip" ,unzip)))
(inputs (inputs

9
gnu/packages/image.scm
View File

@ -385,12 +385,7 @@ supplies a generic doubly-linked list and some string functions.")
"0q1gnjnxgphsh4l8i9rfly4bi8xsczsb9ryzbm8hf38lc3fk5bq3")))) "0q1gnjnxgphsh4l8i9rfly4bi8xsczsb9ryzbm8hf38lc3fk5bq3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-replace '(#:phases (alist-delete
'unpack
(lambda* (#:key source #:allow-other-keys)
(and (zero? (system* "unzip" source))
(chdir "FreeImage")))
(alist-delete
'configure 'configure
(alist-cons-before (alist-cons-before
'build 'patch-makefile 'build 'patch-makefile
@ -398,7 +393,7 @@ supplies a generic doubly-linked list and some string functions.")
(substitute* "Makefile.gnu" (substitute* "Makefile.gnu"
(("/usr") (assoc-ref outputs "out")) (("/usr") (assoc-ref outputs "out"))
(("-o root -g root") ""))) (("-o root -g root") "")))
%standard-phases))) %standard-phases))
#:make-flags '("CC=gcc") #:make-flags '("CC=gcc")
#:tests? #f)) ; no check target #:tests? #f)) ; no check target
(native-inputs (native-inputs

10
gnu/packages/python.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
@ -3129,13 +3129,7 @@ capabilities to the Python interpreter.")
(arguments (arguments
`(#:python ,python-2 ; Otherwise tests fail with a syntax error. `(#:python ,python-2 ; Otherwise tests fail with a syntax error.
#:tests? #f ; The tests apparently download an external URL. #:tests? #f ; The tests apparently download an external URL.
#:phases ))
(alist-replace
'unpack
(lambda* (#:key source #:allow-other-keys)
(and (zero? (system* "unzip" source))
(chdir "cssutils-1.0")))
%standard-phases)))
(home-page "http://cthedot.de/cssutils/") (home-page "http://cthedot.de/cssutils/")
(synopsis (synopsis
"CSS Cascading Style Sheets library for Python") "CSS Cascading Style Sheets library for Python")