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

gnu: Rely on 'file' implicit input and 'patch-usr-bin-file'. 

* gnu/packages/admin.scm (sudo):
* gnu/packages/gawk.scm (gawk): Remove workaround on MIPS.

* gnu/packages/mcrypt.scm (mcrypt, libmhash):
* gnu/packages/file.scm (file): Remove 'file' from native-inputs.

* gnu/packages/mc.scm (mc):
* gnu/packages/pretty-print.scm (a2ps, trueprint, source-highlight):
* gnu/packages/image.scm (libtiff): Remove 'file' from native-inputs.
  Remove 'patch-configure' phase.
This commit is contained in:
Mark H Weaver 2014-08-21 22:39:18 -04:00
parent 8a0576f175
commit c198872b99
7 changed files with 51 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/admin.scm
View File

@ -648,18 +648,7 @@ system administrator.")
"") "")
(("^install: (.*)install-sudoers(.*)" _ before after) (("^install: (.*)install-sudoers(.*)" _ before after)
;; Don't try to create /etc/sudoers. ;; Don't try to create /etc/sudoers.
(string-append "install: " before after "\n"))) (string-append "install: " before after "\n"))))
;; XXX FIXME sudo 1.8.10p3 was bootstrapped with a
;; prerelease libtool, which fails on MIPS in the absence
;; of /usr/bin/file. As a temporary workaround, we patch
;; the configure script to hardcode use of the little
;; endian N32 ABI on MIPS.
,@(if (equal? "mips64el-linux" (or (%current-target-system)
(%current-system)))
'((substitute* "configure"
(("\\$emul") "elf32ltsmipn32")))
'()))
%standard-phases) %standard-phases)
;; XXX: The 'testsudoers' test series expects user 'root' to exist, but ;; XXX: The 'testsudoers' test series expects user 'root' to exist, but

3
gnu/packages/file.scm
View File

@ -35,9 +35,6 @@
(sha256 (base32 (sha256 (base32
"01xz106biz6x4h5ilymg5v3367djvgnfp4lm87132cjqdmqgn6b5")))) "01xz106biz6x4h5ilymg5v3367djvgnfp4lm87132cjqdmqgn6b5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs
;; This package depends upon a native install of itself.
(if (%current-target-system) `(("file" ,file)) '() ))
(synopsis "file, a file type guesser") (synopsis "file, a file type guesser")
(description (description
"The file command is a file type guesser, a command-line tool that tells "The file command is a file type guesser, a command-line tool that tells

11
gnu/packages/gawk.scm
View File

@ -55,17 +55,6 @@
'((substitute* "extension/Makefile.in" '((substitute* "extension/Makefile.in"
(("^.*: check-for-shared-lib-support" match) (("^.*: check-for-shared-lib-support" match)
(string-append "### " match)))) (string-append "### " match))))
'())
;; XXX FIXME gawk 4.1.1 was bootstrapped with a prerelease
;; libtool, which fails on MIPS in the absence of
;; /usr/bin/file. As a temporary workaround, we patch
;; the configure script to hardcode use of the little
;; endian N32 ABI on MIPS.
,@(if (equal? "mips64el-linux" (or (%current-target-system)
(%current-system)))
'((substitute* "extension/configure"
(("\\$emul") "elf32ltsmipn32")))
'()))) '())))
%standard-phases))) %standard-phases)))
(inputs `(("libsigsegv" ,libsigsegv) (inputs `(("libsigsegv" ,libsigsegv)

12
gnu/packages/image.scm
View File

@ -19,7 +19,6 @@
(define-module (gnu packages image) (define-module (gnu packages image)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages file)
#:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:)) #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
@ -97,20 +96,11 @@ image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats.")
(inputs `(("zlib" ,zlib) (inputs `(("zlib" ,zlib)
("libjpeg-8" ,libjpeg-8))) ("libjpeg-8" ,libjpeg-8)))
;; currently does not compile with libjpeg version 9 ;; currently does not compile with libjpeg version 9
(native-inputs `(("file" ,file)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-jpeg-include-dir=" (list (string-append "--with-jpeg-include-dir="
(assoc-ref %build-inputs "libjpeg-8") (assoc-ref %build-inputs "libjpeg-8")
"/include")) "/include"))))
#:phases
(alist-cons-before
'configure 'patch-configure
(lambda _
(substitute* "configure"
(("`/usr/bin/file")
(string-append "`" (which "file")))))
%standard-phases)))
(synopsis "Libtiff, a library for handling TIFF files") (synopsis "Libtiff, a library for handling TIFF files")
(description (description
"Libtiff provides support for the Tag Image File Format (TIFF), a format "Libtiff provides support for the Tag Image File Format (TIFF), a format

11
gnu/packages/mc.scm
View File

@ -28,7 +28,6 @@
#:use-module (gnu packages ssh) #:use-module (gnu packages ssh)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages file)
#:use-module (gnu packages perl)) #:use-module (gnu packages perl))
(define-public mc (define-public mc
@ -46,7 +45,6 @@
(patches (list (search-patch "mc-fix-ncurses-build.patch"))))) (patches (list (search-patch "mc-fix-ncurses-build.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("file" ,file)
("perl" ,perl))) ("perl" ,perl)))
(inputs `(("aspell" ,aspell) (inputs `(("aspell" ,aspell)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
@ -55,14 +53,7 @@
("check" ,check))) ("check" ,check)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
'("--with-screen=ncurses" "--enable-aspell") '("--with-screen=ncurses" "--enable-aspell")))
#:phases
(alist-cons-before
'configure 'patch-configure
(lambda _
(substitute* "configure"
(("/usr/bin/file") (which "file"))))
%standard-phases)))
(home-page "http://www.midnight-commander.org") (home-page "http://www.midnight-commander.org")
(synopsis "Graphical file manager") (synopsis "Graphical file manager")
(description (description

7
gnu/packages/mcrypt.scm
View File

@ -23,8 +23,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages perl) #:use-module (gnu packages perl))
#:use-module (gnu packages file))
(define-public mcrypt (define-public mcrypt
(package (package
@ -68,7 +67,6 @@ them.")
(base32 (base32
"0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4")))) "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("file" ,file)))
(home-page "http://mcrypt.sourceforge.net/") (home-page "http://mcrypt.sourceforge.net/")
(synopsis "Encryption algorithm library") (synopsis "Encryption algorithm library")
(description (description
@ -95,8 +93,7 @@ XTEA, 3WAY, TWOFISH, BLOWFISH, ARCFOUR, WAKE and more.")
(patches (list (search-patch "mhash-keygen-test-segfault.patch"))))) (patches (list (search-patch "mhash-keygen-test-segfault.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("file" ,file) `(("perl" ,perl))) ;for tests
("perl" ,perl))) ;for tests
(home-page "http://mhash.sourceforge.net/") (home-page "http://mhash.sourceforge.net/")
(synopsis "Thread-safe hash library") (synopsis "Thread-safe hash library")
(description (description

112
gnu/packages/pretty-print.scm
View File

@ -30,8 +30,7 @@
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages gperf) #:use-module (gnu packages gperf)
#:use-module (gnu packages perl) #:use-module (gnu packages perl))
#:use-module (gnu packages file))
(define-public a2ps (define-public a2ps
(package (package
@ -53,45 +52,39 @@
("imagemagick" ,imagemagick))) ("imagemagick" ,imagemagick)))
(native-inputs (native-inputs
`(("gperf" ,gperf) `(("gperf" ,gperf)
("perl" ,perl) ("perl" ,perl)))
("file" ,file)))
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases (alist-cons-before
'configure 'patch-configure 'build 'patch-scripts
(lambda _ (lambda _
(substitute* "configure" (substitute*
(("/usr/bin/file") (which "file")))) '("afm/make_fonts_map.sh"
"tests/defs"
"tests/backup.tst"
"tests/styles.tst")
(("/bin/rm") (which "rm"))))
(alist-cons-before (alist-cons-before
'build 'patch-scripts 'check 'patch-test-files
(lambda _ ;; Alternatively, we could unpatch the shebangs in tstfiles
(substitute* (lambda* (#:key inputs #:allow-other-keys)
'("afm/make_fonts_map.sh" (let ((perl (assoc-ref inputs "perl")))
"tests/defs" (substitute* '("tests/ps-ref/includeres.ps"
"tests/backup.tst" "tests/gps-ref/includeres.ps")
"tests/styles.tst") (("/usr/local/bin/perl")
(("/bin/rm") (which "rm")))) (string-append perl "/bin/perl"))))
(alist-cons-before ;; Some of the reference postscript contain a 'version 3'
'check 'patch-test-files ;; string that in inconsistent with the source text in the
;; Alternatively, we could unpatch the shebangs in tstfiles ;; tstfiles directory. Erroneous search-and-replace?
(lambda* (#:key inputs #:allow-other-keys) (substitute* '("tests/ps-ref/InsertBlock.ps"
(let ((perl (assoc-ref inputs "perl"))) "tests/gps-ref/InsertBlock.ps"
(substitute* '("tests/ps-ref/includeres.ps" "tests/ps-ref/bookie.ps"
"tests/gps-ref/includeres.ps") "tests/gps-ref/bookie.ps")
(("/usr/local/bin/perl") (("version 3") "version 2"))
(string-append perl "/bin/perl")))) (substitute* '("tests/ps-ref/psmandup.ps"
;; Some of the reference postscript contain a 'version 3' "tests/gps-ref/psmandup.ps")
;; string that in inconsistent with the source text in the (("#! */bin/sh") (string-append
;; tstfiles directory. Erroneous search-and-replace? "#!" (which "sh")))))
(substitute* '("tests/ps-ref/InsertBlock.ps" %standard-phases))))
"tests/gps-ref/InsertBlock.ps"
"tests/ps-ref/bookie.ps"
"tests/gps-ref/bookie.ps")
(("version 3") "version 2"))
(substitute* '("tests/ps-ref/psmandup.ps"
"tests/gps-ref/psmandup.ps")
(("#! */bin/sh") (string-append
"#!" (which "sh")))))
%standard-phases)))))
(home-page "http://www.gnu.org/software/a2ps") (home-page "http://www.gnu.org/software/a2ps")
(synopsis "Any file to PostScript, including pretty-printing") (synopsis "Any file to PostScript, including pretty-printing")
(description (description
@ -115,16 +108,9 @@ special cases, such as pretty-printing \"--help\" output.")
(base32 (base32
"13rkc0fga10xyf56yy9dnq95zndnfadkhxflnp24skszj21y8jqh")))) "13rkc0fga10xyf56yy9dnq95zndnfadkhxflnp24skszj21y8jqh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("file" ,file)))
(arguments (arguments
;; Must define DIFF_CMD for tests to pass ;; Must define DIFF_CMD for tests to pass
'(#:configure-flags '("CPPFLAGS=-DDIFF_CMD=\\\"diff\\\"") '(#:configure-flags '("CPPFLAGS=-DDIFF_CMD=\\\"diff\\\"")))
#:phases (alist-cons-before
'configure 'patch-configure
(lambda _
(substitute* "configure"
(("/usr/bin/file") (which "file"))))
%standard-phases)))
(home-page "http://www.gnu.org/software/trueprint") (home-page "http://www.gnu.org/software/trueprint")
(synopsis "Pretty-print C sources and other plain text to PostScript") (synopsis "Pretty-print C sources and other plain text to PostScript")
(description (description
@ -178,34 +164,28 @@ different programming languages.")
`(("boost" ,boost))) `(("boost" ,boost)))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
("flex" ,flex) ("flex" ,flex)))
("file" ,file)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-boost=" (list (string-append "--with-boost="
(assoc-ref %build-inputs "boost"))) (assoc-ref %build-inputs "boost")))
#:parallel-tests? #f ;There appear to be race conditions #:parallel-tests? #f ;There appear to be race conditions
#:phases (alist-cons-before #:phases (alist-cons-before
'configure 'patch-configure 'check 'patch-test-files
(lambda _ (lambda _
(substitute* "configure" ;; Unpatch shebangs in test input so that source-highlight
(("/usr/bin/file") (which "file")))) ;; is still able to infer input language
(alist-cons-before (substitute* '("tests/test.sh"
'check 'patch-test-files "tests/test2.sh"
(lambda _ "tests/test.tcl")
;; Unpatch shebangs in test input so that source-highlight (((string-append "#! *" (which "sh"))) "#!/bin/sh"))
;; is still able to infer input language ;; Initial patching unrecoverably removes whitespace, so
(substitute* '("tests/test.sh" ;; remove it also in the comparison output.
"tests/test2.sh" (substitute* '("tests/test.sh.html"
"tests/test.tcl") "tests/test2.sh.html"
(((string-append "#! *" (which "sh"))) "#!/bin/sh")) "tests/test.tcl.html")
;; Initial patching unrecoverably removes whitespace, so (("#! */bin/sh") "#!/bin/sh")))
;; remove it also in the comparison output. %standard-phases)))
(substitute* '("tests/test.sh.html"
"tests/test2.sh.html"
"tests/test.tcl.html")
(("#! */bin/sh") "#!/bin/sh")))
%standard-phases))))
(home-page "http://www.gnu.org/software/src-highlite") (home-page "http://www.gnu.org/software/src-highlite")
(synopsis "Produce a document with syntax highlighting from a source file") (synopsis "Produce a document with syntax highlighting from a source file")
(description (description