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

Merge branch 'staging'

This commit is contained in:
Marius Bakke 2017-10-10 21:44:32 +02:00
parent 565e24c4e4 ffb4da7ad5
commit 1c055d7258
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
96 changed files with 2264 additions and 2500 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/local.mk
View File

@ -543,7 +543,6 @@ dist_patch_DATA = \
%D%/packages/patches/binutils-ld-new-dtags.patch \ %D%/packages/patches/binutils-ld-new-dtags.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/blast+-fix-makefile.patch \ %D%/packages/patches/blast+-fix-makefile.patch \
%D%/packages/patches/bluez-CVE-2017-1000250.patch \
%D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/cairo-CVE-2016-9082.patch \ %D%/packages/patches/cairo-CVE-2016-9082.patch \
%D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \
@ -640,11 +639,8 @@ dist_patch_DATA = \
%D%/packages/patches/gcc-6-cross-environment-variables.patch \ %D%/packages/patches/gcc-6-cross-environment-variables.patch \
%D%/packages/patches/gcr-disable-failing-tests.patch \ %D%/packages/patches/gcr-disable-failing-tests.patch \
%D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch \ %D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch \
%D%/packages/patches/gdk-pixbuf-list-dir.patch \
%D%/packages/patches/gd-fix-gd2-read-test.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-freetype-test-failure.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \
%D%/packages/patches/gd-php-73968-Fix-109-XBM-reading.patch \
%D%/packages/patches/gegl-CVE-2012-4433.patch \ %D%/packages/patches/gegl-CVE-2012-4433.patch \
%D%/packages/patches/gemma-intel-compat.patch \ %D%/packages/patches/gemma-intel-compat.patch \
%D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/geoclue-config.patch \

74
gnu/packages/admin.scm
View File

@ -361,16 +361,15 @@ login, passwd, su, groupadd, and useradd.")
"05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g")))) "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-replace 'configure `(#:phases
(lambda* (#:key inputs outputs (modify-phases %standard-phases
#:allow-other-keys) (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(man8 (string-append (man8 (string-append out "/share/man/man8"))
out "/share/man/man8"))
(sbin (string-append out "/sbin")) (sbin (string-append out "/sbin"))
(shadow (assoc-ref inputs "shadow")) (shadow (assoc-ref inputs "shadow"))
(login (string-append shadow (login (string-append shadow "/bin/login")))
"/bin/login")))
(substitute* "Makefile" (substitute* "Makefile"
(("^SBINDIR.*") (("^SBINDIR.*")
(string-append "SBINDIR = " out (string-append "SBINDIR = " out
@ -385,8 +384,8 @@ login, passwd, su, groupadd, and useradd.")
(string-append "\"" login "\""))) (string-append "\"" login "\"")))
(mkdir-p sbin) (mkdir-p sbin)
(mkdir-p man8))) (mkdir-p man8))
%standard-phases) #t)))
#:tests? #f)) ; no tests #:tests? #f)) ; no tests
(inputs `(("shadow" ,shadow))) (inputs `(("shadow" ,shadow)))
@ -725,8 +724,8 @@ by bandwidth they use.")
("perl-x11-protocol" ,perl-x11-protocol))) ("perl-x11-protocol" ,perl-x11-protocol)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'install 'set-load-paths (add-after 'install 'set-load-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Put the perl-tk and perl-x11-protocol modules in the perl inc ;; Put the perl-tk and perl-x11-protocol modules in the perl inc
;; path for PROG ;; path for PROG
@ -742,8 +741,8 @@ by bandwidth they use.")
"/x86_64-linux"))) "/x86_64-linux")))
(wrap-program (wrap-program
prog prog
`("PERL5LIB" ":" prefix (,x11-inc ,tk-inc))))) `("PERL5LIB" ":" prefix (,x11-inc ,tk-inc))))
%standard-phases))) #t)))))
;; The clusterssh.sourceforge.net address requires login to view ;; The clusterssh.sourceforge.net address requires login to view
(home-page "https://sourceforge.net/projects/clusterssh/") (home-page "https://sourceforge.net/projects/clusterssh/")
(synopsis "Secure concurrent multi-server terminal control") (synopsis "Secure concurrent multi-server terminal control")
@ -908,8 +907,9 @@ commands and their arguments.")
"0l0l5gz3d5j9bqjsbjlfcv4w4jwndllp9fmyai4x9kg6qhs6v4xl")))) "0l0l5gz3d5j9bqjsbjlfcv4w4jwndllp9fmyai4x9kg6qhs6v4xl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-replace '(#:phases
'configure (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(chdir "wpa_supplicant") (chdir "wpa_supplicant")
(copy-file "defconfig" ".config") (copy-file "defconfig" ".config")
@ -924,10 +924,8 @@ commands and their arguments.")
CFLAGS += $(shell pkg-config libnl-3.0 --cflags) CFLAGS += $(shell pkg-config libnl-3.0 --cflags)
CONFIG_LIBNL32=y CONFIG_LIBNL32=y
CONFIG_READLINE=y\n" port) CONFIG_READLINE=y\n" port)
(close-port port))) (close-port port))))
(add-after 'install 'install-man-pages
(alist-cons-after
'install 'install-man-pages
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man")) (man (string-append out "/share/man"))
@ -942,8 +940,7 @@ commands and their arguments.")
(find-files "doc/docbook" "\\.5")) (find-files "doc/docbook" "\\.5"))
(for-each (copy-man-page man8) (for-each (copy-man-page man8)
(find-files "doc/docbook" "\\.8")) (find-files "doc/docbook" "\\.8"))
#t)) #t))))
%standard-phases))
#:make-flags (list "CC=gcc" #:make-flags (list "CC=gcc"
(string-append "BINDIR=" (assoc-ref %outputs "out") (string-append "BINDIR=" (assoc-ref %outputs "out")
@ -980,8 +977,8 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments wpa-supplicant-minimal) (substitute-keyword-arguments (package-arguments wpa-supplicant-minimal)
((#:phases phases) ((#:phases phases)
`(alist-cons-after `(modify-phases ,phases
'configure 'configure-for-dbus (add-after 'configure 'configure-for-dbus
(lambda _ (lambda _
(let ((port (open-file ".config" "al"))) (let ((port (open-file ".config" "al")))
(display " (display "
@ -989,16 +986,15 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_NEW=y
CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port) CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port)
(close-port port)) (close-port port))
#t) #t))
(alist-cons-after (add-after 'install-man-pages 'install-dbus-conf
'install-man-pages 'install-dbus-conf
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(dir (string-append out "/etc/dbus-1/system.d"))) (dir (string-append out "/etc/dbus-1/system.d")))
(mkdir-p dir) (mkdir-p dir)
(copy-file "dbus/dbus-wpa_supplicant.conf" (copy-file "dbus/dbus-wpa_supplicant.conf"
(string-append dir "/wpa_supplicant.conf")))) (string-append dir "/wpa_supplicant.conf")))
,phases))))))) #t))))))))
(define-public wakelan (define-public wakelan
(package (package
@ -1014,8 +1010,9 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
"0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x")))) "0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-replace '(#:phases
'configure (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/bin")) (mkdir-p (string-append out "/bin"))
@ -1028,8 +1025,7 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
(system* "./configure" (system* "./configure"
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "--mandir=" out (string-append "--mandir=" out
"/share/man"))))) "/share/man")))))))
%standard-phases)
#:tests? #f)) #:tests? #f))
(home-page "http://kernel.org") ; really, no home page (home-page "http://kernel.org") ; really, no home page
(synopsis "Send a wake-on-LAN packet") (synopsis "Send a wake-on-LAN packet")
@ -1088,7 +1084,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
"HOST=_LINUX" "HOST=_LINUX"
"OPT_CFLAGS=-Wall -fno-strict-aliasing") "OPT_CFLAGS=-Wall -fno-strict-aliasing")
#:tests? #f ; no 'check' target. #:tests? #f ; no 'check' target.
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(home-page "http://acpica.org/") (home-page "http://acpica.org/")
(synopsis "Tools for the development and debug of ACPI tables") (synopsis "Tools for the development and debug of ACPI tables")
(description (description
@ -1198,7 +1194,7 @@ recover lost partitions and/or make non-booting disks bootable again.")
(base32 "04kviw799qxly08zb8n5mgxfd96gyis6x69q2qiw86jnh87c4mv9")))) (base32 "04kviw799qxly08zb8n5mgxfd96gyis6x69q2qiw86jnh87c4mv9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-delete 'configure %standard-phases) '(#:phases (modify-phases %standard-phases (delete 'configure))
#:tests? #f ; no check target #:tests? #f ; no check target
#:make-flags (let ((out (assoc-ref %outputs "out"))) #:make-flags (let ((out (assoc-ref %outputs "out")))
(list (string-append "prefix=" out))))) (list (string-append "prefix=" out)))))
@ -1227,8 +1223,9 @@ environment variable is set and output is to tty.")
"#!$SHELL"))))) "#!$SHELL")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases
'build 'patch-/bin/sh (modify-phases %standard-phases
(add-before 'build 'patch-/bin/sh
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Use the right shell when executing the watcher and ;; Use the right shell when executing the watcher and
;; user-provided shell commands. ;; user-provided shell commands.
@ -1242,8 +1239,7 @@ environment variable is set and output is to tty.")
(("SHELL=/bin/sh") (("SHELL=/bin/sh")
(string-append "SHELL=" bash "/bin/sh"))) (string-append "SHELL=" bash "/bin/sh")))
#t)) #t))))))
%standard-phases)))
(home-page "https://www.gnu.org/software/direvent/") (home-page "https://www.gnu.org/software/direvent/")
(synopsis "Daemon to monitor directories for events such as file removal") (synopsis "Daemon to monitor directories for events such as file removal")
(description (description
@ -1700,7 +1696,7 @@ results (ndiff), and a packet generation and response analysis tool (nping).")
(list (string-append "DESTDIR=" out) (list (string-append "DESTDIR=" out)
"prefix=/")) "prefix=/"))
;; no configure script ;; no configure script
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs `(("python-2" ,python-2))) (inputs `(("python-2" ,python-2)))
(synopsis "Versatile resource statistics tool") (synopsis "Versatile resource statistics tool")
(description "Dstat is a versatile replacement for @command{vmstat}, (description "Dstat is a versatile replacement for @command{vmstat},

7
gnu/packages/algebra.scm
View File

@ -334,8 +334,8 @@ fast arithmetic.")
("mpfr" ,mpfr))) ("mpfr" ,mpfr)))
(arguments (arguments
`(#:phases `(#:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(flint (assoc-ref inputs "flint")) (flint (assoc-ref inputs "flint"))
@ -348,8 +348,7 @@ fast arithmetic.")
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "--with-flint=" flint) (string-append "--with-flint=" flint)
(string-append "--with-gmp=" gmp) (string-append "--with-gmp=" gmp)
(string-append "--with-mpfr=" mpfr))))) (string-append "--with-mpfr=" mpfr)))))))))
%standard-phases)))
(synopsis "Arbitrary precision floating-point ball arithmetic") (synopsis "Arbitrary precision floating-point ball arithmetic")
(description (description
"Arb is a C library for arbitrary-precision floating-point ball "Arb is a C library for arbitrary-precision floating-point ball

7
gnu/packages/apr.scm
View File

@ -80,8 +80,8 @@ around or take advantage of platform-specific deficiencies or features.")
`(("expat" ,expat))) `(("expat" ,expat)))
(arguments (arguments
'(#:phases '(#:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(apr (assoc-ref inputs "apr")) (apr (assoc-ref inputs "apr"))
@ -91,8 +91,7 @@ around or take advantage of platform-specific deficiencies or features.")
(system* "./configure" (system* "./configure"
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "--with-apr=" apr) (string-append "--with-apr=" apr)
(string-append "--with-expat=" expat))))) (string-append "--with-expat=" expat)))))))
%standard-phases)
;; There are race conditions during 'make check'. Typically, the ;; There are race conditions during 'make check'. Typically, the
;; 'testall' executable is not built yet by the time 'make check' tries ;; 'testall' executable is not built yet by the time 'make check' tries

97
gnu/packages/audio.scm
View File

@ -620,23 +620,21 @@ language and software synthesizer.")
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'patch-makefile-and-enter-directory (add-after 'unpack 'patch-makefile-and-enter-directory
(lambda _ (lambda _
(substitute* "libs/Makefile" (substitute* "libs/Makefile"
(("/sbin/ldconfig") "true") (("/sbin/ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n")) (("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs") (chdir "libs")
#t) #t))
(alist-cons-after (add-after 'install 'install-symlink
'install
'install-symlink
(lambda _ (lambda _
(symlink "libclalsadrv.so" (symlink "libclalsadrv.so"
(string-append (assoc-ref %outputs "out") (string-append (assoc-ref %outputs "out")
"/lib/libclalsadrv.so.2"))) "/lib/libclalsadrv.so.2"))))
;; no configure script ;; no configure script
(alist-delete 'configure %standard-phases))))) (delete 'configure))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("fftw" ,fftw))) ("fftw" ,fftw)))
@ -975,11 +973,9 @@ follower.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack (add-after 'unpack 'remove-broken-symlinks
'remove-broken-symlinks (lambda _ (delete-file-recursively "m4") #t)))))
(lambda _ (delete-file-recursively "m4") #t)
%standard-phases)))
(inputs (inputs
`(("libsndfile" ,libsndfile) `(("libsndfile" ,libsndfile)
("alsa-lib" ,alsa-lib) ("alsa-lib" ,alsa-lib)
@ -1018,12 +1014,11 @@ also play midifiles using a Soundfont.")
("unzip" ,unzip))) ("unzip" ,unzip)))
(arguments (arguments
'(#:phases '(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'bootstrap (add-after 'unpack 'bootstrap
(lambda _ (lambda _
(substitute* "bootstrap" (("\r\n") "\n")) (substitute* "bootstrap" (("\r\n") "\n"))
(zero? (system* "sh" "bootstrap"))) (zero? (system* "sh" "bootstrap")))))))
%standard-phases)))
(home-page "http://www.audiocoding.com/faad2.html") (home-page "http://www.audiocoding.com/faad2.html")
(synopsis "MPEG-4 and MPEG-2 AAC decoder") (synopsis "MPEG-4 and MPEG-2 AAC decoder")
(description (description
@ -1677,7 +1672,7 @@ software.")
"TYPE=mdaPiano" "TYPE=mdaPiano"
(string-append "PREFIX=" (assoc-ref %outputs "out"))) (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
`(("lv2" ,lv2) `(("lv2" ,lv2)
("lvtk" ,lvtk))) ("lvtk" ,lvtk)))
@ -1700,7 +1695,7 @@ software.")
"TYPE=mdaEPiano" "TYPE=mdaEPiano"
(string-append "PREFIX=" (assoc-ref %outputs "out"))) (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(home-page "http://elephly.net/lv2/mdaepiano.html") (home-page "http://elephly.net/lv2/mdaepiano.html")
(synopsis "LV2 port of the mda EPiano plugin") (synopsis "LV2 port of the mda EPiano plugin")
(description "An LV2 port of the mda EPiano VSTi."))) (description "An LV2 port of the mda EPiano VSTi.")))
@ -2093,8 +2088,8 @@ Suil currently supports every combination of Gtk 2, Qt 4, and X11.")
(string-append "--with-default-path=" (string-append "--with-default-path="
(assoc-ref %outputs "out") "/etc/timidity")) (assoc-ref %outputs "out") "/etc/timidity"))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'install 'install-config (add-after 'install 'install-config
(lambda _ (lambda _
(let ((out (string-append (assoc-ref %outputs "out") (let ((out (string-append (assoc-ref %outputs "out")
"/etc/timidity"))) "/etc/timidity")))
@ -2104,8 +2099,8 @@ Suil currently supports every combination of Gtk 2, Qt 4, and X11.")
(lambda (port) (lambda (port)
(format port (string-append "source " (format port (string-append "source "
(assoc-ref %build-inputs "freepats") (assoc-ref %build-inputs "freepats")
"/share/freepats/freepats.cfg")))))) "/share/freepats/freepats.cfg")))))
%standard-phases))) #t)))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("ao" ,ao) ("ao" ,ao)
@ -2144,16 +2139,15 @@ disks as various audio file formats.")
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'install 'remove-libvamp-hostsdk.la (add-after 'install 'remove-libvamp-hostsdk.la
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; https://bugs.launchpad.net/ubuntu/+source/vamp-plugin-sdk/+bug/1253656 ;; https://bugs.launchpad.net/ubuntu/+source/vamp-plugin-sdk/+bug/1253656
(for-each delete-file (for-each delete-file
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(list (string-append out "/lib/libvamp-sdk.la") (list (string-append out "/lib/libvamp-sdk.la")
(string-append out "/lib/libvamp-hostsdk.la")))) (string-append out "/lib/libvamp-hostsdk.la"))))
#t) #t)))))
%standard-phases)))
(inputs (inputs
`(("libsndfile" ,libsndfile))) `(("libsndfile" ,libsndfile)))
(native-inputs (native-inputs
@ -2315,11 +2309,10 @@ Tracker 3 S3M and Impulse Tracker IT files.")
("file" ,file))) ("file" ,file)))
(arguments (arguments
'(#:phases '(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'bootstrap (add-after 'unpack 'bootstrap
(lambda _ (lambda _
(zero? (system* "sh" "bootstrap"))) (zero? (system* "sh" "bootstrap")))))))
%standard-phases)))
(home-page "http://www.surina.net/soundtouch/") (home-page "http://www.surina.net/soundtouch/")
(synopsis (synopsis
"Audio processing library for changing tempo, pitch and playback rate") "Audio processing library for changing tempo, pitch and playback rate")
@ -2453,11 +2446,10 @@ portions of LAME.")
'(#:phases '(#:phases
;; Autoreconf is necessary because the audacity-compat patch modifies ;; Autoreconf is necessary because the audacity-compat patch modifies
;; .in files. ;; .in files.
(alist-cons-after (modify-phases %standard-phases
'unpack 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vif"))) (zero? (system* "autoreconf" "-vif")))))
%standard-phases)
#:tests? #f)) ;no 'check' target #:tests? #f)) ;no 'check' target
(home-page "http://www.portaudio.com/") (home-page "http://www.portaudio.com/")
(synopsis "Audio I/O library") (synopsis "Audio I/O library")
@ -2521,14 +2513,13 @@ synthesizer written in C++.")
("pulseaudio" ,pulseaudio))) ("pulseaudio" ,pulseaudio)))
(arguments (arguments
'(#:phases '(#:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(setenv "CC" "gcc") (setenv "CC" "gcc")
(zero? (zero?
(system* "./configure" (system* "./configure"
(string-append "--prefix=" (assoc-ref outputs "out"))))) (string-append "--prefix=" (assoc-ref outputs "out")))))))
%standard-phases)
;; No 'check' target. ;; No 'check' target.
#:tests? #f)) #:tests? #f))
(home-page "http://themaister.net/rsound.html") (home-page "http://themaister.net/rsound.html")
@ -2595,22 +2586,20 @@ result.")
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'patch-makefile-and-enter-directory (add-after 'unpack 'patch-makefile-and-enter-directory
(lambda _ (lambda _
(substitute* "libs/Makefile" (substitute* "libs/Makefile"
(("ldconfig") "true") (("ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n")) (("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs") #t) (chdir "libs") #t))
(alist-cons-after (add-after 'install 'install-symlink
'install
'install-symlink
(lambda _ (lambda _
(symlink "libzita-convolver.so" (symlink "libzita-convolver.so"
(string-append (assoc-ref %outputs "out") (string-append (assoc-ref %outputs "out")
"/lib/libzita-convolver.so.3"))) "/lib/libzita-convolver.so.3"))))
;; no configure script ;; no configure script
(alist-delete 'configure %standard-phases))))) (delete 'configure))))
(inputs `(("fftwf" ,fftwf))) (inputs `(("fftwf" ,fftwf)))
(home-page "http://kokkinizita.linuxaudio.org") (home-page "http://kokkinizita.linuxaudio.org")
(synopsis "Fast, partitioned convolution engine library") (synopsis "Fast, partitioned convolution engine library")
@ -2685,23 +2674,21 @@ provide high-quality sample rate conversion.")
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'patch-makefile-and-enter-directory (add-after 'unpack 'patch-makefile-and-enter-directory
(lambda _ (lambda _
(substitute* "libs/Makefile" (substitute* "libs/Makefile"
(("ldconfig") "true") (("ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n")) (("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs") (chdir "libs")
#t) #t))
(alist-cons-after (add-after 'install 'install-symlink
'install
'install-symlink
(lambda _ (lambda _
(symlink "libzita-alsa-pcmi.so" (symlink "libzita-alsa-pcmi.so"
(string-append (assoc-ref %outputs "out") (string-append (assoc-ref %outputs "out")
"/lib/libzita-alsa-pcmi.so.0"))) "/lib/libzita-alsa-pcmi.so.0"))))
;; no configure script ;; no configure script
(alist-delete 'configure %standard-phases))))) (delete 'configure))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("fftw" ,fftw))) ("fftw" ,fftw)))

22
gnu/packages/backup.scm
View File

@ -293,20 +293,20 @@ random access nor for in-place modification.")
("nettle" ,nettle))) ("nettle" ,nettle)))
(arguments (arguments
`(#:parallel-build? #f ;race conditions `(#:parallel-build? #f ;race conditions
#:phases (alist-cons-before #:phases
'build 'remove-Werror (modify-phases %standard-phases
(add-before 'build 'remove-Werror
;; rdup uses a deprecated function from libarchive ;; rdup uses a deprecated function from libarchive
(lambda _ (lambda _
(substitute* "GNUmakefile" (substitute* "GNUmakefile"
(("^(CFLAGS=.*)-Werror" _ front) front))) (("^(CFLAGS=.*)-Werror" _ front) front))
(alist-cons-before #t))
'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))
(substitute* "testsuite/rdup/rdup.rdup-up-t-with-file.exp" (substitute* "testsuite/rdup/rdup.rdup-up-t-with-file.exp"
(("/bin/cat") (which "cat")))) (("/bin/cat") (which "cat")))
#t)))))
%standard-phases))))
(home-page "http://archive.miek.nl/projects/rdup/index.html") (home-page "http://archive.miek.nl/projects/rdup/index.html")
(synopsis "Provide a list of files to backup") (synopsis "Provide a list of files to backup")
(description (description
@ -336,9 +336,9 @@ list and implement the backup strategy.")
"CC=gcc") "CC=gcc")
#:tests? #f ;test input not distributed #:tests? #f ;test input not distributed
#:phases #:phases
(alist-delete ;; no configure phase
'configure ;no configure phase (modify-phases %standard-phases
%standard-phases))) (delete 'configure))))
(home-page "http://viric.name/cgi-bin/btar/doc/trunk/doc/home.wiki") (home-page "http://viric.name/cgi-bin/btar/doc/trunk/doc/home.wiki")
(synopsis "Tar-compatible archiver") (synopsis "Tar-compatible archiver")
(description (description

88
gnu/packages/bioinformatics.scm
View File

@ -369,8 +369,8 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.")
'(#:tests? #f '(#:tests? #f
#:make-flags (list (string-append "BINDIR=" %output "/bin")) #:make-flags (list (string-append "BINDIR=" %output "/bin"))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'unpack-tarballs (add-after 'unpack 'unpack-tarballs
(lambda _ (lambda _
;; FIXME: Bedops includes tarballs of minimally patched upstream ;; FIXME: Bedops includes tarballs of minimally patched upstream
;; libraries jansson, zlib, and bzip2. We cannot just use stock ;; libraries jansson, zlib, and bzip2. We cannot just use stock
@ -393,8 +393,9 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.")
(("^\tbzcat .*") "\t@echo \"not unpacking\"\n") (("^\tbzcat .*") "\t@echo \"not unpacking\"\n")
(("\\./configure") "CONFIG_SHELL=bash ./configure")) (("\\./configure") "CONFIG_SHELL=bash ./configure"))
(substitute* "third-party/zlib-1.2.7/Makefile.in" (substitute* "third-party/zlib-1.2.7/Makefile.in"
(("^SHELL=.*$") "SHELL=bash\n"))) (("^SHELL=.*$") "SHELL=bash\n"))
(alist-delete 'configure %standard-phases)))) #t))
(delete 'configure))))
(home-page "https://github.com/bedops/bedops") (home-page "https://github.com/bedops/bedops")
(synopsis "Tools for high-performance genomic feature operations") (synopsis "Tools for high-performance genomic feature operations")
(description (description
@ -1325,8 +1326,8 @@ splice junctions between exons.")
(arguments (arguments
'(#:tests? #f ;no "check" target '(#:tests? #f ;no "check" target
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (let ((bin (string-append
(assoc-ref outputs "out") "/bin")) (assoc-ref outputs "out") "/bin"))
@ -1336,9 +1337,10 @@ splice junctions between exons.")
(assoc-ref outputs "out") "/share/man/man1"))) (assoc-ref outputs "out") "/share/man/man1")))
(install-file "bwa" bin) (install-file "bwa" bin)
(install-file "README.md" doc) (install-file "README.md" doc)
(install-file "bwa.1" man))) (install-file "bwa.1" man))
#t))
;; no "configure" script ;; no "configure" script
(alist-delete 'configure %standard-phases)))) (delete 'configure))))
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
;; Non-portable SSE instructions are used so building fails on platforms ;; Non-portable SSE instructions are used so building fails on platforms
;; other than x86_64. ;; other than x86_64.
@ -1815,10 +1817,9 @@ time.")
(arguments (arguments
`(#:python ,python-2 `(#:python ,python-2
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'set-env (add-after 'unpack 'set-env
(lambda _ (setenv "CROSSMAP_USE_SYSTEM_PYSAM" "1")) (lambda _ (setenv "CROSSMAP_USE_SYSTEM_PYSAM" "1") #t)))))
%standard-phases)))
(inputs (inputs
`(("python-numpy" ,python2-numpy) `(("python-numpy" ,python2-numpy)
("python-pysam" ,python2-pysam) ("python-pysam" ,python2-pysam)
@ -2365,8 +2366,8 @@ dynamic programming or a variety of heuristics.")
(arguments (arguments
`(#:tests? #f ;no "check" target `(#:tests? #f ;no "check" target
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'use-shared-boost-libs-and-set-bamtools-paths (add-after 'unpack 'use-shared-boost-libs-and-set-bamtools-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("set\\(Boost_USE_STATIC_LIBS ON\\)") (("set\\(Boost_USE_STATIC_LIBS ON\\)")
@ -2376,8 +2377,7 @@ dynamic programming or a variety of heuristics.")
(substitute* "src/CMakeLists.txt" (substitute* "src/CMakeLists.txt"
(("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/\\.\\./bamtools/lib") (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/\\.\\./bamtools/lib")
(string-append (assoc-ref inputs "bamtools") "/lib/bamtools"))) (string-append (assoc-ref inputs "bamtools") "/lib/bamtools")))
#t) #t)))))
%standard-phases)))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("bamtools" ,bamtools) ("bamtools" ,bamtools)
@ -2544,15 +2544,15 @@ results. The FASTX-Toolkit tools perform some of these preprocessing tasks.")
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/bin/")) "/bin/"))
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'check (replace 'check
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(setenv "PATH" (string-append (setenv "PATH" (string-append
(assoc-ref outputs "out") "/bin:" (assoc-ref outputs "out") "/bin:"
(getenv "PATH"))) (getenv "PATH")))
(chdir "../flexbar_v2.5_src/test") (chdir "../flexbar_v2.5_src/test")
(zero? (system* "bash" "flexbar_validate.sh"))) (zero? (system* "bash" "flexbar_validate.sh"))))
(alist-delete 'install %standard-phases)))) (delete 'install))))
(inputs (inputs
`(("tbb" ,tbb) `(("tbb" ,tbb)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -2788,8 +2788,8 @@ association studies (GWAS).")
(arguments (arguments
`(#:python ,python-2 `(#:python ,python-2
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'generate-from-cython-sources (add-after 'unpack 'generate-from-cython-sources
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Delete these C files to force fresh generation from pyx sources. ;; Delete these C files to force fresh generation from pyx sources.
(delete-file "grit/sparsify_support_fns.c") (delete-file "grit/sparsify_support_fns.c")
@ -2801,8 +2801,8 @@ association studies (GWAS).")
(string-append "pyx\", ], include_dirs = ['" (string-append "pyx\", ], include_dirs = ['"
(assoc-ref inputs "python-numpy") (assoc-ref inputs "python-numpy")
"/lib/python2.7/site-packages/numpy/core/include/" "/lib/python2.7/site-packages/numpy/core/include/"
"']"))) #t) "']")))
%standard-phases))) #t)))))
(inputs (inputs
`(("python-scipy" ,python2-scipy) `(("python-scipy" ,python2-scipy)
("python-numpy" ,python2-numpy) ("python-numpy" ,python2-numpy)
@ -2845,8 +2845,8 @@ estimates transcript expression.")
'() '()
'("POPCNT_CAPABILITY=0"))) '("POPCNT_CAPABILITY=0")))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'patch-sources (add-after 'unpack 'patch-sources
(lambda _ (lambda _
;; XXX Cannot use snippet because zip files are not supported ;; XXX Cannot use snippet because zip files are not supported
(substitute* "Makefile" (substitute* "Makefile"
@ -2856,17 +2856,18 @@ estimates transcript expression.")
(("-DBUILD_HOST=.*") "-DBUILD_HOST=\"\\\"guix\\\"\"") (("-DBUILD_HOST=.*") "-DBUILD_HOST=\"\\\"guix\\\"\"")
(("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\"")) (("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\""))
(substitute* '("hisat-build" "hisat-inspect") (substitute* '("hisat-build" "hisat-inspect")
(("/usr/bin/env") (which "env")))) (("/usr/bin/env") (which "env")))
(alist-replace #t))
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) (let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
(for-each (lambda (file) (for-each (lambda (file)
(install-file file bin)) (install-file file bin))
(find-files (find-files
"." "."
"hisat(-(build|align|inspect)(-(s|l)(-debug)*)*)*$")))) "hisat(-(build|align|inspect)(-(s|l)(-debug)*)*)*$")))
(alist-delete 'configure %standard-phases))))) #t))
(delete 'configure))))
(native-inputs (native-inputs
`(("unzip" ,unzip))) `(("unzip" ,unzip)))
(inputs (inputs
@ -4680,8 +4681,8 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.")
`(#:parallel-build? #f ; not supported `(#:parallel-build? #f ; not supported
#:tests? #f ; no "check" target #:tests? #f ; no "check" target
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
;; Allow 'konfigure.perl' to find 'package.prl'. ;; Allow 'konfigure.perl' to find 'package.prl'.
@ -4692,11 +4693,9 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.")
;; '--enable-fast-install'. ;; '--enable-fast-install'.
(zero? (system* "./configure" (zero? (system* "./configure"
(string-append "--build-prefix=" (getcwd) "/build") (string-append "--build-prefix=" (getcwd) "/build")
(string-append "--prefix=" out))))) (string-append "--prefix=" out))))))
(alist-cons-after (add-after 'unpack 'enter-dir
'unpack 'enter-dir (lambda _ (chdir "ngs-sdk") #t)))))
(lambda _ (chdir "ngs-sdk") #t)
%standard-phases))))
(native-inputs `(("perl" ,perl))) (native-inputs `(("perl" ,perl)))
;; According to the test ;; According to the test
;; unless ($MARCH =~ /x86_64/i || $MARCH =~ /i?86/i) ;; unless ($MARCH =~ /x86_64/i || $MARCH =~ /i?86/i)
@ -5460,17 +5459,16 @@ sequences.")
"-f" "Makefile.Linux" "-f" "Makefile.Linux"
"CC=gcc ${CCFLAGS}") "CC=gcc ${CCFLAGS}")
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'enter-dir (add-after 'unpack 'enter-dir
(lambda _ (chdir "src") #t) (lambda _ (chdir "src") #t))
(alist-replace (replace 'install
'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) (let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
(mkdir-p bin) (mkdir-p bin)
(copy-recursively "../bin" bin))) (copy-recursively "../bin" bin))))
;; no "configure" script ;; no "configure" script
(alist-delete 'configure %standard-phases))))) (delete 'configure))))
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
(home-page "http://bioinf.wehi.edu.au/subread-package/") (home-page "http://bioinf.wehi.edu.au/subread-package/")
(synopsis "Tool kit for processing next-gen sequencing data") (synopsis "Tool kit for processing next-gen sequencing data")

9
gnu/packages/bittorrent.scm
View File

@ -74,8 +74,9 @@
"gui")) ; graphical user interface "gui")) ; graphical user interface
(arguments (arguments
'(#:glib-or-gtk-wrap-excluded-outputs '("out") '(#:glib-or-gtk-wrap-excluded-outputs '("out")
#:phases (alist-cons-after #:phases
'install 'move-gui (modify-phases %standard-phases
(add-after 'install 'move-gui
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Move the GUI to its own output, so that "out" doesn't ;; Move the GUI to its own output, so that "out" doesn't
;; depend on GTK+. ;; depend on GTK+.
@ -89,8 +90,8 @@
;; Move the '.desktop' file as well. ;; Move the '.desktop' file as well.
(mkdir (string-append gui "/share")) (mkdir (string-append gui "/share"))
(rename-file (string-append out "/share/applications") (rename-file (string-append out "/share/applications")
(string-append gui "/share/applications")))) (string-append gui "/share/applications")))
%standard-phases))) #t)))))
(inputs (inputs
`(("inotify-tools" ,inotify-tools) `(("inotify-tools" ,inotify-tools)
("libevent" ,libevent) ("libevent" ,libevent)

2
gnu/packages/cdrom.scm
View File

@ -454,7 +454,7 @@ the data.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f '(#:tests? #f
#:phases (alist-delete 'configure %standard-phases) #:phases (modify-phases %standard-phases (delete 'configure))
#:make-flags (list "CC=gcc" #:make-flags (list "CC=gcc"
(string-append "PREFIX=" (string-append "PREFIX="
(assoc-ref %outputs "out"))))) (assoc-ref %outputs "out")))))

7
gnu/packages/check.scm
View File

@ -93,11 +93,10 @@ source code editors and IDEs.")
"057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm")))) "057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:phases (arguments '(#:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'autoconf (add-before 'configure 'autoconf
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi"))) (zero? (system* "autoreconf" "-vfi")))))))
%standard-phases)))
(native-inputs (native-inputs
`(("automake" ,automake) `(("automake" ,automake)
("autoconf" ,autoconf) ("autoconf" ,autoconf)

10
gnu/packages/compression.scm
View File

@ -470,7 +470,7 @@ some compression ratio).")
(description (description
"Lzip is a lossless data compressor with a user interface similar to the "Lzip is a lossless data compressor with a user interface similar to the
one of gzip or bzip2. Lzip decompresses almost as fast as gzip and compresses one of gzip or bzip2. Lzip decompresses almost as fast as gzip and compresses
more than bzip2, which makes it well suited for software distribution and data more than bzip2, which makes it well-suited for software distribution and data
archiving. Lzip is a clean implementation of the LZMA algorithm.") archiving. Lzip is a clean implementation of the LZMA algorithm.")
(license license:gpl3+))) (license license:gpl3+)))
@ -521,14 +521,14 @@ decompressors when faced with corrupted input.")
`(("which" ,which))) `(("which" ,which)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'patch-source-shebangs 'unpatch-source-shebang (add-after 'patch-source-shebangs 'unpatch-source-shebang
;; revert the patch-shebang phase on a script which is ;; revert the patch-shebang phase on a script which is
;; in fact test data ;; in fact test data
(lambda _ (lambda _
(substitute* "tests/shar-1.ok" (substitute* "tests/shar-1.ok"
(((which "sh")) "/bin/sh"))) (((which "sh")) "/bin/sh"))
%standard-phases))) #t)))))
(home-page "https://www.gnu.org/software/sharutils/") (home-page "https://www.gnu.org/software/sharutils/")
(synopsis "Archives in shell scripts, uuencode/uudecode") (synopsis "Archives in shell scripts, uuencode/uudecode")
(description (description

13
gnu/packages/conky.scm
View File

@ -50,22 +50,21 @@
;; TODO: add 'ncurses.pc' to the ncurses package. ;; TODO: add 'ncurses.pc' to the ncurses package.
"-DBUILD_NCURSES=false") "-DBUILD_NCURSES=false")
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'add-freetype-to-search-path (add-after 'unpack 'add-freetype-to-search-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "cmake/ConkyPlatformChecks.cmake" (substitute* "cmake/ConkyPlatformChecks.cmake"
(("set\\(INCLUDE_SEARCH_PATH") (("set\\(INCLUDE_SEARCH_PATH")
(string-append (string-append
"set(INCLUDE_SEARCH_PATH " "set(INCLUDE_SEARCH_PATH "
(assoc-ref inputs "freetype") "/include/freetype2 "))) (assoc-ref inputs "freetype") "/include/freetype2 ")))
#t) #t))
(alist-replace (replace 'install
'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(mkdir-p bin) (mkdir-p bin)
(install-file "src/conky" bin))) (install-file "src/conky" bin))
%standard-phases)))) #t)))))
(inputs (inputs
`(("freetype" ,freetype) `(("freetype" ,freetype)
("ncurses" ,ncurses) ("ncurses" ,ncurses)

40
gnu/packages/cups.scm
View File

@ -57,7 +57,7 @@
(define-public cups-filters (define-public cups-filters
(package (package
(name "cups-filters") (name "cups-filters")
(version "1.14.1") (version "1.17.7")
(source(origin (source(origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -65,7 +65,7 @@
"cups-filters-" version ".tar.xz")) "cups-filters-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0175jhqpsyn7bkh7w43ydhyws5zsdak05hr1fsadvzslvwqkffgi")) "1mg397kgfx0rs9j852f8ppmvaz2al5l75ildbgiqg6j3gwq5jssw"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; install backends, banners and filters to cups-filters output ;; install backends, banners and filters to cups-filters output
@ -93,6 +93,13 @@
#:configure-flags #:configure-flags
`("--disable-driverless" ; TODO: enable this `("--disable-driverless" ; TODO: enable this
"--disable-mutool" ; depends on yet another PDF library (mupdf) "--disable-mutool" ; depends on yet another PDF library (mupdf)
;; Look for the "domain socket of CUPS" in /var/run/cups.
"--localstatedir=/var"
;; Free software for the win.
"--with-acroread-path=evince"
,(string-append "--with-test-font-path=" ,(string-append "--with-test-font-path="
(assoc-ref %build-inputs "font-dejavu") (assoc-ref %build-inputs "font-dejavu")
"/share/fonts/truetype/DejaVuSans.ttf") "/share/fonts/truetype/DejaVuSans.ttf")
@ -103,7 +110,34 @@
(assoc-ref %build-inputs "bash") (assoc-ref %build-inputs "bash")
"/bin/bash") "/bin/bash")
,(string-append "--with-rcdir=" ,(string-append "--with-rcdir="
(assoc-ref %outputs "out") "/etc/rc.d")))) (assoc-ref %outputs "out") "/etc/rc.d"))
#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-foomatic-hardcoded-file-names
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Foomatic has hardcoded file names we need to fix.
(let ((out (assoc-ref outputs "out"))
(gs (assoc-ref inputs "ghostscript")))
(substitute* "filter/foomatic-rip/foomaticrip.c"
(("/usr/local/lib/cups/filter")
(string-append out "/lib/cups/filter")))
#t)))
(add-after 'install 'wrap-filters
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Some filters expect to find 'gs' in $PATH. We cannot
;; just hard-code its absolute file name in the source
;; because foomatic-rip, for example, has tests like
;; 'startswith(cmd, "gs")'.
(let ((out (assoc-ref outputs "out"))
(ghostscript (assoc-ref inputs "ghostscript")))
(for-each (lambda (file)
(wrap-program file
`("PATH" ":" prefix
(,(string-append ghostscript
"/bin")))))
(find-files (string-append
out "/lib/cups/filter")))
#t))))))
(native-inputs (native-inputs
`(("glib" ,glib "bin") ; for gdbus-codegen `(("glib" ,glib "bin") ; for gdbus-codegen
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))

6
gnu/packages/curl.scm
View File

@ -42,15 +42,15 @@
(define-public curl (define-public curl
(package (package
(name "curl") (name "curl")
(version "7.55.1")
(replacement curl-7.56.0) (replacement curl-7.56.0)
(version "7.54.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-" (uri (string-append "https://curl.haxx.se/download/curl-"
version ".tar.lzma")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0vnv3cz0s1l5cjby86hm0x6pgzqijmdm97qa9q5px200956z6yib")))) "1dvbcwcar3dv488h9378hy145ma3ws2fwpbr6mgszd7chipcmbry"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ;1.2 MiB of man3 pages "doc")) ;1.2 MiB of man3 pages

18
gnu/packages/databases.scm
View File

@ -157,14 +157,14 @@ and provides interfaces to the traditional file format.")
(define-public bdb (define-public bdb
(package (package
(name "bdb") (name "bdb")
(version "6.2.23") (version "6.2.32")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.oracle.com/berkeley-db/db-" (uri (string-append "http://download.oracle.com/berkeley-db/db-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7")))) "1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" ; programs, libraries, headers (outputs '("out" ; programs, libraries, headers
"doc")) ; 94 MiB of HTML docs "doc")) ; 94 MiB of HTML docs
@ -172,8 +172,8 @@ and provides interfaces to the traditional file format.")
'(#:tests? #f ; no check target available '(#:tests? #f ; no check target available
#:disallowed-references ("doc") #:disallowed-references ("doc")
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))) (doc (assoc-ref outputs "doc")))
@ -198,8 +198,7 @@ and provides interfaces to the traditional file format.")
;; The following flag is needed so that the inclusion ;; The following flag is needed so that the inclusion
;; of db_cxx.h into C++ files works; it leads to ;; of db_cxx.h into C++ files works; it leads to
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
"--enable-cxx")))) "--enable-cxx"))))))))
%standard-phases)))
(synopsis "Berkeley database") (synopsis "Berkeley database")
(description (description
"Berkeley DB is an embeddable database allowing developers the choice of "Berkeley DB is an embeddable database allowing developers the choice of
@ -227,8 +226,8 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
`(#:tests? #f ; no check target available `(#:tests? #f ; no check target available
#:disallowed-references ("doc") #:disallowed-references ("doc")
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))) (doc (assoc-ref outputs "doc")))
@ -258,8 +257,7 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
;; The following flag is needed so that the inclusion ;; The following flag is needed so that the inclusion
;; of db_cxx.h into C++ files works; it leads to ;; of db_cxx.h into C++ files works; it leads to
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
"--enable-cxx")))) "--enable-cxx"))))))))))
%standard-phases)))))
(define-public es-dump-restore (define-public es-dump-restore
(package (package

18
gnu/packages/debug.scm
View File

@ -58,8 +58,8 @@
`(("perl" ,perl))) `(("perl" ,perl)))
(arguments (arguments
`(#:phases `(#:phases
(alist-replace (modify-phases %standard-phases
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Makefile contains no install target ;; Makefile contains no install target
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -73,8 +73,9 @@
`("License.txt" ,@(find-files "www" ".*\\.html"))) `("License.txt" ,@(find-files "www" ".*\\.html")))
(for-each (lambda (b) (for-each (lambda (b)
(install-file b bin)) (install-file b bin))
`("delta" "multidelta" "topformflat"))))) `("delta" "multidelta" "topformflat"))))
(alist-delete 'configure %standard-phases)))) #t))
(delete 'configure))))
(home-page "http://delta.tigris.org/") (home-page "http://delta.tigris.org/")
(synopsis "Heuristical file minimizer") (synopsis "Heuristical file minimizer")
(description (description
@ -114,8 +115,9 @@ program to exhibit a bug.")
("sys-cpu" ,perl-sys-cpu) ("sys-cpu" ,perl-sys-cpu)
("term-readkey" ,perl-term-readkey))) ("term-readkey" ,perl-term-readkey)))
(arguments (arguments
`(#:phases (alist-cons-after `(#:phases
'install 'set-load-paths (modify-phases %standard-phases
(add-after 'install 'set-load-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Tell creduce where to find the perl modules it needs. ;; Tell creduce where to find the perl modules it needs.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -129,8 +131,8 @@ program to exhibit a bug.")
,(package-version perl))) ,(package-version perl)))
'("term-readkey" "exporter-lite" '("term-readkey" "exporter-lite"
"file-which" "getopt-tabular" "file-which" "getopt-tabular"
"regex-common" "sys-cpu")))))) "regex-common" "sys-cpu")))))
%standard-phases))) #t)))))
(home-page "http://embed.cs.utah.edu/creduce") (home-page "http://embed.cs.utah.edu/creduce")
(synopsis "Reducer for interesting code") (synopsis "Reducer for interesting code")
(description (description

9
gnu/packages/display-managers.scm
View File

@ -337,8 +337,9 @@ GTK+, lets you select a desktop session and log in to it.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases
'configure 'set-new-etc-location (modify-phases %standard-phases
(add-before 'configure 'set-new-etc-location
(lambda _ (lambda _
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("/etc") (("/etc")
@ -346,8 +347,8 @@ GTK+, lets you select a desktop session and log in to it.")
(("install.*systemd.*") (("install.*systemd.*")
;; The build system's logic here is: if "Linux", then ;; The build system's logic here is: if "Linux", then
;; "systemd". Strip that. ;; "systemd". Strip that.
""))) ""))
%standard-phases) #t)))
#:configure-flags '("-DUSE_PAM=yes" #:configure-flags '("-DUSE_PAM=yes"
"-DUSE_CONSOLEKIT=no") "-DUSE_CONSOLEKIT=no")
#:tests? #f)) #:tests? #f))

2
gnu/packages/dns.scm
View File

@ -75,7 +75,7 @@
`(("dbus" ,dbus))) `(("dbus" ,dbus)))
(arguments (arguments
`(#:phases `(#:phases
(alist-delete 'configure %standard-phases) (modify-phases %standard-phases (delete 'configure))
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc" "CC=gcc"
"COPTS=\"-DHAVE_DBUS\"") "COPTS=\"-DHAVE_DBUS\"")

38
gnu/packages/emacs.scm
View File

@ -304,14 +304,15 @@ editor (without an X toolkit)" )
"0phz9d8wjk4p13vqannv0003fwh8qqrp0gfzcs2hgq1mrmv1srss")))) "0phz9d8wjk4p13vqannv0003fwh8qqrp0gfzcs2hgq1mrmv1srss"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases
'install 'post-install (modify-phases %standard-phases
(add-after 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(symlink "geiser-install.el" (symlink "geiser-install.el"
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp/" "/share/emacs/site-lisp/"
"geiser-autoloads.el"))) "geiser-autoloads.el"))
%standard-phases))) #t)))))
(inputs `(("guile" ,guile-2.0))) (inputs `(("guile" ,guile-2.0)))
(native-inputs `(("emacs" ,emacs-minimal))) (native-inputs `(("emacs" ,emacs-minimal)))
(home-page "http://nongnu.org/geiser/") (home-page "http://nongnu.org/geiser/")
@ -770,25 +771,25 @@ provides an optional IDE-like error list.")
(guix build emacs-utils)) (guix build emacs-utils))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile" (substitute* "Makefile"
(("/usr/local") (assoc-ref outputs "out")) (("/usr/local") (assoc-ref outputs "out"))
(("/site-lisp/emacs-wget") "/site-lisp"))) (("/site-lisp/emacs-wget") "/site-lisp"))
(alist-cons-before #t))
'build 'patch-exec-paths (add-before 'build 'patch-exec-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((wget (assoc-ref inputs "wget"))) (let ((wget (assoc-ref inputs "wget")))
(emacs-substitute-variables "wget.el" (emacs-substitute-variables "wget.el"
("wget-command" (string-append wget "/bin/wget"))))) ("wget-command" (string-append wget "/bin/wget"))))
(alist-cons-after #t))
'install 'post-install (add-after 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(emacs-generate-autoloads (emacs-generate-autoloads
"wget" (string-append (assoc-ref outputs "out") "wget" (string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp/"))) "/share/emacs/site-lisp/"))
%standard-phases))))) #t)))))
(home-page "http://www.emacswiki.org/emacs/EmacsWget") (home-page "http://www.emacswiki.org/emacs/EmacsWget")
(synopsis "Simple file downloader for Emacs based on wget") (synopsis "Simple file downloader for Emacs based on wget")
(description (description
@ -992,15 +993,16 @@ within a specified width. It is useful for displaying long track titles.")
"doc_DATA =\n"))))) "doc_DATA =\n")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases
'install 'post-install (modify-phases %standard-phases
(add-after 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Add an autoloads file with the right name for guix.el. ;; Add an autoloads file with the right name for guix.el.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(site (string-append out "/share/emacs/site-lisp"))) (site (string-append out "/share/emacs/site-lisp")))
(with-directory-excursion site (with-directory-excursion site
(symlink "bbdb-loaddefs.el" "bbdb-autoloads.el")))) (symlink "bbdb-loaddefs.el" "bbdb-autoloads.el")))
%standard-phases))) #t)))))
(native-inputs `(("emacs" ,emacs-minimal))) (native-inputs `(("emacs" ,emacs-minimal)))
(home-page "http://savannah.nongnu.org/projects/bbdb/") (home-page "http://savannah.nongnu.org/projects/bbdb/")
(synopsis "Contact management utility for Emacs") (synopsis "Contact management utility for Emacs")

19
gnu/packages/engineering.scm
View File

@ -192,13 +192,13 @@ utilities.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'use-wish8.6 (add-after 'unpack 'use-wish8.6
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
(("wish85") "wish8.6"))) (("wish85") "wish8.6"))
(alist-cons-after #t))
'install 'wrap (add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a ;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a
;; fix of the mesa package we wrap the pcb executable such that ;; fix of the mesa package we wrap the pcb executable such that
@ -206,14 +206,13 @@ utilities.")
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(path (string-append (assoc-ref inputs "udev") "/lib"))) (path (string-append (assoc-ref inputs "udev") "/lib")))
(wrap-program (string-append out "/bin/pcb") (wrap-program (string-append out "/bin/pcb")
`("LD_LIBRARY_PATH" ":" prefix (,path))))) `("LD_LIBRARY_PATH" ":" prefix (,path))))
(alist-cons-before #t))
'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
(system "Xvfb :1 &") (system "Xvfb :1 &")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
#t) #t)))))
%standard-phases)))))
(inputs (inputs
`(("dbus" ,dbus) `(("dbus" ,dbus)
("mesa" ,mesa) ("mesa" ,mesa)

14
gnu/packages/firmware.scm
View File

@ -52,8 +52,9 @@
(patches (search-patches "ath9k-htc-firmware-objcopy.patch")))) (patches (search-patches "ath9k-htc-firmware-objcopy.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases
'configure 'pre-configure (modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(chdir "target_firmware") (chdir "target_firmware")
@ -63,9 +64,9 @@
(("^TOOLCHAIN=.*$") (("^TOOLCHAIN=.*$")
(string-append "TOOLCHAIN=" (string-append "TOOLCHAIN="
(assoc-ref inputs "cross-gcc") (assoc-ref inputs "cross-gcc")
"\n")))) "\n")))
(alist-replace #t))
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(fw-dir (string-append out "/lib/firmware"))) (fw-dir (string-append out "/lib/firmware")))
@ -75,8 +76,7 @@
(string-append fw-dir "/" (string-append fw-dir "/"
(basename file)))) (basename file))))
(find-files "." "\\.fw$")) (find-files "." "\\.fw$"))
#t)) #t))))
%standard-phases))
#:tests? #f)) #:tests? #f))
;; The firmware is cross-compiled using a "bare bones" compiler (no libc.) ;; The firmware is cross-compiled using a "bare bones" compiler (no libc.)

11
gnu/packages/flashing-tools.scm
View File

@ -66,17 +66,16 @@
"CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no") "CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no")
#:tests? #f ; no 'check' target #:tests? #f ; no 'check' target
#:phases #:phases
(alist-delete (modify-phases %standard-phases
'configure (delete 'configure)
(alist-cons-before (add-before 'build 'patch-exec-paths
'build 'patch-exec-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "dmi.c" (substitute* "dmi.c"
(("\"dmidecode\"") (("\"dmidecode\"")
(format #f "~S" (format #f "~S"
(string-append (assoc-ref inputs "dmidecode") (string-append (assoc-ref inputs "dmidecode")
"/sbin/dmidecode"))))) "/sbin/dmidecode"))))
%standard-phases)))) #t)))))
(home-page "http://flashrom.org/") (home-page "http://flashrom.org/")
(synopsis "Identify, read, write, erase, and verify ROM/flash chips") (synopsis "Identify, read, write, erase, and verify ROM/flash chips")
(description (description

14
gnu/packages/fltk.scm
View File

@ -63,13 +63,13 @@
(list "--enable-shared" (list "--enable-shared"
(string-append "DSOFLAGS=-Wl,-rpath=" %output "/lib")) (string-append "DSOFLAGS=-Wl,-rpath=" %output "/lib"))
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'patch-makeinclude (add-before 'configure 'patch-makeinclude
(lambda _ (lambda _
(substitute* "makeinclude.in" (substitute* "makeinclude.in"
(("/bin/sh") (which "sh")))) (("/bin/sh") (which "sh")))
(alist-cons-after #t))
'install 'patch-config (add-after 'install 'patch-config
;; Provide -L flags for image libraries when querying fltk-config to ;; Provide -L flags for image libraries when querying fltk-config to
;; avoid propagating inputs. ;; avoid propagating inputs.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -82,8 +82,8 @@
(substitute* conf (substitute* conf
(("-ljpeg") (string-append "-L" jpeg "/lib -ljpeg")) (("-ljpeg") (string-append "-L" jpeg "/lib -ljpeg"))
(("-lpng") (string-append "-L" png "/lib -lpng")) (("-lpng") (string-append "-L" png "/lib -lpng"))
(("-lz") (string-append "-L" zlib "/lib -lz"))))) (("-lz") (string-append "-L" zlib "/lib -lz"))))
%standard-phases)))) #t)))))
(home-page "http://www.fltk.org") (home-page "http://www.fltk.org")
(synopsis "3D C++ GUI library") (synopsis "3D C++ GUI library")
(description "FLTK is a C++ GUI toolkit providing modern GUI functionality (description "FLTK is a C++ GUI toolkit providing modern GUI functionality

27
gnu/packages/fontutils.scm
View File

@ -325,33 +325,24 @@ X11-system or any other graphical user interface.")
(define-public teckit (define-public teckit
(package (package
(name "teckit") (name "teckit")
(version "2.5.4") (version "2.5.7")
(source (origin (source (origin
;; Downloaded tarballs vary with each download, so we use an (method url-fetch)
;; svn snapshot. The 2.5.4 release seems to be made in r128, (uri (string-append
;; but r132 updates additional files to contain the correct "https://github.com/silnrsi/teckit/releases/download/v"
;; version number (r129 to r131 do not concern TRUNK). version "/teckit-" version ".tar.gz"))
(method svn-fetch)
(uri (svn-reference
(url "https://scripts.sil.org/svn-public/teckit/TRUNK")
(revision 132)))
(file-name (string-append name "-" version))
(sha256 (sha256
(base32 (base32
"1xqkqgw30pb24snh46srmjs2j4zhz2dfi5pf7znia0k34mrpwivz")))) "1pbp97vcpj6x4yixx6ww0vsi1rrr99fksxdjafs6gdargzd24cj4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("zlib" ,zlib))) (inputs
`(("zlib" ,zlib)
("expat" ,expat)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool) ("libtool" ,libtool)
("perl" ,perl))) ; for the tests ("perl" ,perl))) ; for the tests
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'autogen
(lambda _
(zero? (system* "sh" "autogen.sh")))))))
(synopsis "Toolkit for encoding conversions") (synopsis "Toolkit for encoding conversions")
(description (description
"TECkit is a low-level toolkit intended to be used by other applications "TECkit is a low-level toolkit intended to be used by other applications

21
gnu/packages/freedesktop.scm
View File

@ -357,8 +357,8 @@ manager for the current system.")
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
(alist-replace (modify-phases %standard-phases
'check (replace 'check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "XDG_DATA_DIRS" (setenv "XDG_DATA_DIRS"
(string-append (assoc-ref inputs "shared-mime-info") (string-append (assoc-ref inputs "shared-mime-info")
@ -375,8 +375,7 @@ manager for the current system.")
;; AssertionError: 'x-apple-ios-png' != 'png' ;; AssertionError: 'x-apple-ios-png' != 'png'
(substitute* "test/test-mime.py" (substitute* "test/test-mime.py"
(("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#")) (("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#"))
(zero? (system* "nosetests" "-v"))) (zero? (system* "nosetests" "-v")))))))
%standard-phases)))
(native-inputs (native-inputs
`(("shared-mime-info" ,shared-mime-info) ;for tests `(("shared-mime-info" ,shared-mime-info) ;for tests
("hicolor-icon-theme" ,hicolor-icon-theme) ;for tests ("hicolor-icon-theme" ,hicolor-icon-theme) ;for tests
@ -403,7 +402,19 @@ Python.")
(base32 (base32
"0lgywr1m0d79vr4s8aimj8a307nss29hhy68gjpqj7m667055c39")))) "0lgywr1m0d79vr4s8aimj8a307nss29hhy68gjpqj7m667055c39"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments `(#:parallel-tests? #f)) (arguments
`(#:parallel-tests? #f
#:phases
(modify-phases %standard-phases
;; Remove record shapes to workaround graphviz 2.40.1 problems.
;; http://www.graphviz.org/content/i-havent-been-able-render-these-files-graphviz-226
;; This will likely be fixed upstream in the next release.
;; https://lists.freedesktop.org/archives/wayland-devel/2017-June/034218.html
(add-before 'build 'fix-graphviz
(lambda _
(substitute* "doc/doxygen/dot/x-architecture.gv"
(("Mrecord") "none"))
#t)))))
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
("graphviz" ,graphviz) ("graphviz" ,graphviz)

36
gnu/packages/gd.scm
View File

@ -38,11 +38,10 @@
(define-public gd (define-public gd
(package (package
(name "gd") (name "gd")
(replacement gd-2.2.5)
;; Note: With libgd.org now pointing to github.com, genuine old ;; Note: With libgd.org now pointing to github.com, genuine old
;; tarballs are no longer available. Notably, versions 2.0.x are ;; tarballs are no longer available. Notably, versions 2.0.x are
;; missing. ;; missing.
(version "2.2.4") (version "2.2.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -50,11 +49,9 @@
version "/libgd-" version ".tar.xz")) version "/libgd-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1rp4v7n1dq38b92kl7gkvpvqqkw7nvdfnz6d5kip5klkxfki6zqk")) "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c"))
(patches (search-patches "gd-fix-gd2-read-test.patch" (patches (search-patches "gd-fix-tests-on-i686.patch"
"gd-fix-tests-on-i686.patch" "gd-freetype-test-failure.patch"))))
"gd-freetype-test-failure.patch"
"gd-php-73968-Fix-109-XBM-reading.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding ;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding
@ -93,22 +90,6 @@ most common applications of GD involve website development.")
"See COPYING file in the distribution.")) "See COPYING file in the distribution."))
(properties '((cpe-name . "libgd"))))) (properties '((cpe-name . "libgd")))))
;; For CVE-2017-6362 and CVE-2017-7890.
(define-public gd-2.2.5
(package
(inherit gd)
(version "2.2.5")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/libgd/libgd/releases/download/gd-"
version "/libgd-" version ".tar.xz"))
(patches (search-patches "gd-fix-tests-on-i686.patch"
"gd-freetype-test-failure.patch"))
(sha256
(base32
"0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c"))))))
(define-public perl-gd (define-public perl-gd
(package (package
(name "perl-gd") (name "perl-gd")
@ -141,15 +122,16 @@ most common applications of GD involve website development.")
(assoc-ref %build-inputs i))) (assoc-ref %build-inputs i)))
'("zlib" "png" "ft" "jpeg" "fontconfig")) '("zlib" "png" "ft" "jpeg" "fontconfig"))
#:tests? #f ;; Failed 1/2 test programs. 1/12 subtests failed. #:tests? #f ;; Failed 1/2 test programs. 1/12 subtests failed.
#:phases (alist-cons-after #:phases
'configure 'clear-autogenerated-files (modify-phases %standard-phases
(add-after 'configure 'clear-autogenerated-files
(lambda _ (lambda _
;; This file is autogenerated by its .PLS script at build ;; This file is autogenerated by its .PLS script at build
;; time, but file creation fails because that file already ;; time, but file creation fails because that file already
;; exists in the distribution with non-writable ;; exists in the distribution with non-writable
;; permissions, so delete it first. ;; permissions, so delete it first.
(delete-file "bdf_scripts/bdf2gdfont.pl")) (delete-file "bdf_scripts/bdf2gdfont.pl")
%standard-phases))) #t)))))
(home-page "http://search.cpan.org/dist/GD") (home-page "http://search.cpan.org/dist/GD")
(synopsis "Perl interface to the GD graphics library") (synopsis "Perl interface to the GD graphics library")
(description "GD.pm is an autoloadable interface module for libgd, a (description "GD.pm is an autoloadable interface module for libgd, a

5
gnu/packages/gkrellm.scm
View File

@ -49,10 +49,7 @@
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:tests? #f ; there is no check target `(#:tests? #f ; there is no check target
#:phases #:phases (modify-phases %standard-phases (delete 'configure))
(alist-delete
'configure
%standard-phases)
#:make-flags #:make-flags
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
(list (string-append "INSTALLROOT=" out) (list (string-append "INSTALLROOT=" out)

25
gnu/packages/gl.scm
View File

@ -217,17 +217,19 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa (define-public mesa
(package (package
(name "mesa") (name "mesa")
(version "17.1.4") (version "17.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "ftp://ftp.freedesktop.org/pub/mesa/" (uri (list (string-append "https://mesa.freedesktop.org/archive/"
"mesa-" version ".tar.xz")
(string-append "ftp://ftp.freedesktop.org/pub/mesa/"
"mesa-" version ".tar.xz") "mesa-" version ".tar.xz")
(string-append "ftp://ftp.freedesktop.org/pub/mesa/" (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
version "/mesa-" version ".tar.xz"))) version "/mesa-" version ".tar.xz")))
(sha256 (sha256
(base32 (base32
"1bcwxin7nmbnv92xav381b6qxscsx1zzc71ryfvj03cglbkb1wq6")) "07msr6xismw2jq87irwhz7vygvzj6hi38d71paij9zvwh8bmsf3p"))
(patches (patches
(search-patches "mesa-wayland-egl-symbols-check-mips.patch" (search-patches "mesa-wayland-egl-symbols-check-mips.patch"
"mesa-skip-disk-cache-test.patch")))) "mesa-skip-disk-cache-test.patch"))))
@ -253,13 +255,14 @@ also known as DXTn or DXTC) for Mesa.")
("libxvmc" ,libxvmc) ("libxvmc" ,libxvmc)
,@(match (%current-system) ,@(match (%current-system)
((or "x86_64-linux" "i686-linux") ((or "x86_64-linux" "i686-linux")
`(("llvm" ,llvm))) `(("llvm" ,llvm-3.9.1))) ; exactly 3.9.0 or 3.9.1 for swrast
(_ (_
`())) `()))
("makedepend" ,makedepend) ("makedepend" ,makedepend)
("presentproto" ,presentproto) ("presentproto" ,presentproto)
("s2tc" ,s2tc) ("s2tc" ,s2tc)
("wayland" ,wayland))) ("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("python" ,python-2) ("python" ,python-2)
@ -267,13 +270,17 @@ also known as DXTn or DXTC) for Mesa.")
(arguments (arguments
`(#:configure-flags `(#:configure-flags
'(,@(match (%current-system) '(,@(match (%current-system)
((or "armhf-linux" "aarch64-linux") ("armhf-linux"
'("--with-gallium-drivers=freedreno,nouveau,r300,r600,svga,swrast,vc4,virgl")) ;; TODO: Add etnaviv when enabled in libdrm.
'("--with-gallium-drivers=freedreno,imx,nouveau,r300,r600,svga,swrast,vc4,virgl"))
("aarch64-linux"
;; TODO: Fix svga driver for aarch64.
'("--with-gallium-drivers=freedreno,nouveau,r300,r600,swrast,vc4,virgl"))
(_ (_
'("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,virgl"))) '("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,virgl")))
;; Enable various optional features. TODO: opencl requires libclc, ;; Enable various optional features. TODO: opencl requires libclc,
;; omx requires libomxil-bellagio ;; omx requires libomxil-bellagio
"--with-egl-platforms=x11,drm,wayland" "--with-platforms=x11,drm,wayland,surfaceless"
"--enable-glx-tls" ;Thread Local Storage, improves performance "--enable-glx-tls" ;Thread Local Storage, improves performance
;; "--enable-opencl" ;; "--enable-opencl"
;; "--enable-omx" ;; "--enable-omx"
@ -422,7 +429,7 @@ glxgears, glxheads, and glxinfo.")
(("/lib64") "/lib"))))) (("/lib64") "/lib")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-delete 'configure %standard-phases) '(#:phases (modify-phases %standard-phases (delete 'configure))
#:make-flags (list (string-append "GLEW_PREFIX=" #:make-flags (list (string-append "GLEW_PREFIX="
(assoc-ref %outputs "out")) (assoc-ref %outputs "out"))
(string-append "GLEW_DEST=" (string-append "GLEW_DEST="

17
gnu/packages/glib.scm
View File

@ -67,7 +67,7 @@
(define dbus (define dbus
(package (package
(name "dbus") (name "dbus")
(version "1.10.18") (version "1.10.22")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -75,7 +75,7 @@
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0")) "15vv9gz5i4f5l7h0d045qz5iyvl89hjk2k83lb4vbizd7qg41cg2"))
(patches (search-patches "dbus-helper-search-path.patch")))) (patches (search-patches "dbus-helper-search-path.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -137,7 +137,7 @@ shared NFS home directories.")
(define glib (define glib
(package (package
(name "glib") (name "glib")
(version "2.52.2") (version "2.52.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" (uri (string-append "mirror://gnome/sources/"
@ -145,7 +145,7 @@ shared NFS home directories.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1l65kab6jr9zlllgbjcbvrbgah3sdd577fpw4pdb2j195ag5s3ph")) "0a71wkkhkvad84gm30w13micxxgqqw3sxhybj7nd9z60lwspdvi5"))
(patches (search-patches "glib-tests-timer.patch")))) (patches (search-patches "glib-tests-timer.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" ; everything (outputs '("out" ; everything
@ -504,8 +504,9 @@ has an ease of use unmatched by other C++ callback libraries.")
"1926b3adx903hzvdp8glblsgjyadzqnwgkj8hg605d4wv98m1n0z")))) "1926b3adx903hzvdp8glblsgjyadzqnwgkj8hg605d4wv98m1n0z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases
'build 'pre-build (modify-phases %standard-phases
(add-before 'build 'pre-build
(lambda _ (lambda _
;; This test uses /etc/fstab as an example file to read ;; This test uses /etc/fstab as an example file to read
;; from; choose a better example. ;; from; choose a better example.
@ -518,8 +519,8 @@ has an ease of use unmatched by other C++ callback libraries.")
;; to open a TLS session; just skip it. ;; to open a TLS session; just skip it.
(substitute* "tests/giomm_tls_client/main.cc" (substitute* "tests/giomm_tls_client/main.cc"
(("Gio::init.*$") (("Gio::init.*$")
"return 77;\n"))) "return 77;\n"))
%standard-phases))) #t)))))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("glib" ,glib "bin"))) ("glib" ,glib "bin")))
(propagated-inputs (propagated-inputs

71
gnu/packages/gnome.scm
View File

@ -812,16 +812,16 @@ for settings shared by various components of the GNOME desktop.")
("perl-xml-simple" ,perl-xml-simple))) ("perl-xml-simple" ,perl-xml-simple)))
(arguments (arguments
'(#:phases '(#:phases
(alist-cons-after (modify-phases %standard-phases
'install 'set-load-paths (add-after 'install 'set-load-paths
;; Tell 'icon-name-mapping' where XML::Simple is. ;; Tell 'icon-name-mapping' where XML::Simple is.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(prog (string-append out "/libexec/icon-name-mapping"))) (prog (string-append out "/libexec/icon-name-mapping")))
(wrap-program (wrap-program
prog prog
`("PERL5LIB" = ,(list (getenv "PERL5LIB")))))) `("PERL5LIB" = ,(list (getenv "PERL5LIB")))))
%standard-phases))) #t)))))
(home-page "http://tango.freedesktop.org/Standard_Icon_Naming_Specification") (home-page "http://tango.freedesktop.org/Standard_Icon_Naming_Specification")
(synopsis (synopsis
"Utility to implement the Freedesktop Icon Naming Specification") "Utility to implement the Freedesktop Icon Naming Specification")
@ -1165,7 +1165,7 @@ dealing with different structured file formats.")
(define-public librsvg (define-public librsvg
(package (package
(name "librsvg") (name "librsvg")
(version "2.40.17") (version "2.40.18")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -1173,7 +1173,7 @@ dealing with different structured file formats.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1k39gyf7f5m9x0jvpcxvfcqswdb04xhm1lbwbjabn1f4xk5wbxp6")))) "0k2nbd4g31qinkdfd8r5c5ih2ixl85fbkgkqqh9747lwr24c9j5z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1263,12 +1263,12 @@ functionality was designed to be as reusable and portable as possible.")
'("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") '("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS")
;; ... which they then completly ignore !! ;; ... which they then completly ignore !!
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'ignore-deprecations (add-before 'configure 'ignore-deprecations
(lambda _ (lambda _
(substitute* "linc2/src/Makefile.in" (substitute* "linc2/src/Makefile.in"
(("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))) (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))
%standard-phases))) #t)))))
(inputs `(("glib" ,glib) (inputs `(("glib" ,glib)
("libidl" ,libidl))) ("libidl" ,libidl)))
(native-inputs (native-inputs
@ -1303,12 +1303,12 @@ featuring mature C, C++ and Python bindings.")
'("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") '("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS")
;; ... which they then completly ignore !! ;; ... which they then completly ignore !!
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'ignore-deprecations (add-before 'configure 'ignore-deprecations
(lambda _ (lambda _
(substitute* "activation-server/Makefile.in" (substitute* "activation-server/Makefile.in"
(("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))) (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))
%standard-phases))) #t)))))
(inputs `(("popt" ,popt) (inputs `(("popt" ,popt)
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))
;; The following are Required by the .pc file ;; The following are Required by the .pc file
@ -1411,19 +1411,18 @@ designed to be accessed through the MIME functions in GnomeVFS.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'ignore-deprecations (add-before 'configure 'ignore-deprecations
(lambda _ (lambda _
(substitute* '("libgnomevfs/Makefile.in" (substitute* '("libgnomevfs/Makefile.in"
"daemon/Makefile.in") "daemon/Makefile.in")
(("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS")) (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))
#t) #t))
(alist-cons-before (add-before 'configure 'patch-test-async-cancel-to-never-fail
'configure 'patch-test-async-cancel-to-never-fail
(lambda _ (lambda _
(substitute* "test/test-async-cancel.c" (substitute* "test/test-async-cancel.c"
(("EXIT_FAILURE") "77"))) (("EXIT_FAILURE") "77"))
%standard-phases)))) #t)))))
(inputs `(("libxml2" ,libxml2) (inputs `(("libxml2" ,libxml2)
("dbus-glib" ,dbus-glib) ("dbus-glib" ,dbus-glib)
("gconf" ,gconf) ("gconf" ,gconf)
@ -1458,12 +1457,12 @@ to access local and remote files with a single consistent API.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'enable-deprecated (add-before 'configure 'enable-deprecated
(lambda _ (lambda _
(substitute* "libgnome/Makefile.in" (substitute* "libgnome/Makefile.in"
(("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))) (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))
%standard-phases))) #t)))))
(inputs `(("libxml2" ,libxml2))) (inputs `(("libxml2" ,libxml2)))
(native-inputs (native-inputs
`(("glib" ,glib "bin") ; for glib-mkenums, etc. `(("glib" ,glib "bin") ; for glib-mkenums, etc.
@ -1698,8 +1697,8 @@ since ca. 2006, when GTK+ itself incorporated printing support.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'check 'start-xserver (add-before 'check 'start-xserver
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((xorg-server (assoc-ref inputs "xorg-server")) (let ((xorg-server (assoc-ref inputs "xorg-server"))
(disp ":1")) (disp ":1"))
@ -1708,8 +1707,7 @@ since ca. 2006, when GTK+ itself incorporated printing support.")
(setenv "DISPLAY" disp) (setenv "DISPLAY" disp)
;; There must be a running X server and make check doesn't start one. ;; There must be a running X server and make check doesn't start one.
;; Therefore we must do it. ;; Therefore we must do it.
(zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp))))) (zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp)))))))))
%standard-phases)))
;; Mentioned as Required by the .pc file ;; Mentioned as Required by the .pc file
(propagated-inputs `(("libxml2" ,libxml2))) (propagated-inputs `(("libxml2" ,libxml2)))
(inputs (inputs
@ -1823,14 +1821,13 @@ Hints specification (EWMH).")
(base32 "05fvzbs5bin05bbsr4dp79aiva3lnq0a3a40zq55i13vnsz70l0n")))) (base32 "05fvzbs5bin05bbsr4dp79aiva3lnq0a3a40zq55i13vnsz70l0n"))))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'fix-pcre-check (add-after 'unpack 'fix-pcre-check
(lambda _ (lambda _
;; Only glib.h can be included directly. See ;; Only glib.h can be included directly. See
;; https://bugzilla.gnome.org/show_bug.cgi?id=670316 ;; https://bugzilla.gnome.org/show_bug.cgi?id=670316
(substitute* "configure" (substitute* "configure"
(("glib/gregex\\.h") "glib.h")) #t) (("glib/gregex\\.h") "glib.h")) #t)))
%standard-phases)
,@(package-arguments goffice))) ,@(package-arguments goffice)))
(propagated-inputs (propagated-inputs
@ -2203,8 +2200,8 @@ and RDP protocols.")
(assoc-ref %outputs "out") "/lib") (assoc-ref %outputs "out") "/lib")
"--disable-gtk-doc-html") ; FIXME: requires gtk-doc "--disable-gtk-doc-html") ; FIXME: requires gtk-doc
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'fix-docbook (add-before 'configure 'fix-docbook
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "docs/Makefile.in" (substitute* "docs/Makefile.in"
(("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
@ -2214,8 +2211,8 @@ and RDP protocols.")
"/manpages/docbook.xsl"))) "/manpages/docbook.xsl")))
(setenv "XML_CATALOG_FILES" (setenv "XML_CATALOG_FILES"
(string-append (assoc-ref inputs "docbook-xml") (string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/catalog.xml"))) "/xml/dtd/docbook/catalog.xml"))
%standard-phases))) #t)))))
(home-page "https://developer.gnome.org/dconf") (home-page "https://developer.gnome.org/dconf")
(synopsis "Low-level GNOME configuration system") (synopsis "Low-level GNOME configuration system")
(description "Dconf is a low-level configuration system. Its main purpose (description "Dconf is a low-level configuration system. Its main purpose

9
gnu/packages/gprolog.scm
View File

@ -41,14 +41,15 @@
`(#:configure-flags `(#:configure-flags
(list (string-append (list (string-append
"--with-install-dir=" %output "/share/gprolog")) "--with-install-dir=" %output "/share/gprolog"))
#:phases (alist-cons-before #:phases
'configure 'change-dir-n-fix-shells (modify-phases %standard-phases
(add-before 'configure 'change-dir-n-fix-shells
(lambda _ (lambda _
(chdir "src") (chdir "src")
(substitute* "configure" (substitute* "configure"
(("-/bin/sh") (string-append "-" (which "sh"))) (("-/bin/sh") (string-append "-" (which "sh")))
(("= /bin/sh") (string-append "= " (which "sh"))))) (("= /bin/sh") (string-append "= " (which "sh"))))
%standard-phases))) #t)))))
(home-page "https://www.gnu.org/software/gprolog/") (home-page "https://www.gnu.org/software/gprolog/")
(synopsis "Prolog compiler") (synopsis "Prolog compiler")
(description (description

9
gnu/packages/gps.scm
View File

@ -102,15 +102,16 @@ manipulate maps.")
"006a6l8p38a4h7y2959sqrmjjn29d8pd50zj9nypcp5ph18nybjb")))) "006a6l8p38a4h7y2959sqrmjjn29d8pd50zj9nypcp5ph18nybjb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-replace `(#:phases
'configure (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; This is a rudimentary build system. ;; This is a rudimentary build system.
(substitute* "Makefile" (substitute* "Makefile"
(("prefix[[:blank:]]*=.*$") (("prefix[[:blank:]]*=.*$")
(string-append "prefix = " (assoc-ref outputs "out") (string-append "prefix = " (assoc-ref outputs "out")
"\n")))) "\n")))
%standard-phases) #t)))
#:tests? #f)) #:tests? #f))
(inputs (inputs
`(("gtk+" ,gtk+-2) `(("gtk+" ,gtk+-2)

7
gnu/packages/graphics.scm
View File

@ -630,13 +630,12 @@ and understanding different BRDFs (and other component functions).")
(string-append "--x-libraries=" (assoc-ref %build-inputs "libx11") (string-append "--x-libraries=" (assoc-ref %build-inputs "libx11")
"/lib")) "/lib"))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (lambda _
;; let's call configure from configure phase and not now ;; let's call configure from configure phase and not now
(substitute* "autogen.sh" (("./configure") "# ./configure")) (substitute* "autogen.sh" (("./configure") "# ./configure"))
(zero? (system* "sh" "autogen.sh"))) (zero? (system* "sh" "autogen.sh")))))))
%standard-phases)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("libtool" ,libtool) ("libtool" ,libtool)

28
gnu/packages/graphviz.scm
View File

@ -44,7 +44,7 @@
(define-public graphviz (define-public graphviz
(package (package
(name "graphviz") (name "graphviz")
(version "2.38.0") (version "2.40.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -52,32 +52,22 @@
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1")))) "08d4ygkxz2f553bxj6087da56a23kx1khv0j8ycxa102vvx1hlna"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; FIXME: rtest/rtest.sh is a ksh script (!). Add ksh as an input. ;; FIXME: rtest/rtest.sh is a ksh script (!). Add ksh as an input.
'(#:tests? #f '(#:tests? #f
#:phases
#:phases (alist-cons-before (modify-phases %standard-phases
'build 'pre-build (add-after 'install 'move-docs
(lambda _
;; Work around bogus makefile when using an external
;; libltdl. Failing to do so, one hits this error:
;; "No rule to make target `-lltdl', needed by `libgvc.la'."
(substitute* "lib/gvc/Makefile"
(("am__append_5 *=.*")
"am_append_5 =\n")))
(alist-cons-after
'install 'move-docs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))) (doc (assoc-ref outputs "doc")))
(mkdir-p (string-append doc "/share/graphviz")) (mkdir-p (string-append doc "/share/graphviz"))
(rename-file (string-append out "/share/graphviz/doc") (rename-file (string-append out "/share/graphviz/doc")
(string-append doc "/share/graphviz/doc")) (string-append doc "/share/graphviz/doc"))
#t)) #t)))
(alist-cons-after (add-after 'move-docs 'move-guile-bindings
'move-docs 'move-guile-bindings
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib")) (lib (string-append out "/lib"))
@ -87,8 +77,8 @@
(rename-file (string-append (rename-file (string-append
lib "/graphviz/guile/libgv_guile.so") lib "/graphviz/guile/libgv_guile.so")
(string-append extdir (string-append extdir
"/libgv_guile.so")))) "/libgv_guile.so"))
%standard-phases))))) #t))))))
(inputs (inputs
`(("libXrender" ,libxrender) `(("libXrender" ,libxrender)
("libX11" ,libx11) ("libX11" ,libx11)

73
gnu/packages/gtk.scm
View File

@ -105,14 +105,14 @@ tools have full access to view and control running applications.")
(define-public cairo (define-public cairo
(package (package
(name "cairo") (name "cairo")
(version "1.14.8") (version "1.14.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://cairographics.org/releases/cairo-" (uri (string-append "https://cairographics.org/releases/cairo-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"082ypjlh03ss5616amgjp9ap3xwwccyh2knyyrj1a4d4x65dkwni")) "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy"))
(patches (search-patches "cairo-CVE-2016-9082.patch")))) (patches (search-patches "cairo-CVE-2016-9082.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
@ -171,7 +171,7 @@ affine transformation (scale, rotation, shear, etc.).")
(define-public harfbuzz (define-public harfbuzz
(package (package
(name "harfbuzz") (name "harfbuzz")
(version "1.4.6") (version "1.5.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.freedesktop.org/software/" (uri (string-append "https://www.freedesktop.org/software/"
@ -179,7 +179,7 @@ affine transformation (scale, rotation, shear, etc.).")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"14yj514yfy373np3gxk930a443j1zgnwg6mm0kdzzjr0rn0qp9r1")))) "0lbwzif7ndvx1iqzp7wxv6j3ilal6di2vj33cy3bha97mpyqv0sn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"bin")) ; 160K, only hb-view depend on cairo "bin")) ; 160K, only hb-view depend on cairo
@ -209,7 +209,7 @@ affine transformation (scale, rotation, shear, etc.).")
(define-public pango (define-public pango
(package (package
(name "pango") (name "pango")
(version "1.40.6") (version "1.40.12")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/" (uri (string-append "mirror://gnome/sources/pango/"
@ -217,7 +217,7 @@ affine transformation (scale, rotation, shear, etc.).")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0wz5b5knpw4gfvz3ny8l6h2ca3bpqqyh55mffkyzgsd1hdrjn5fa")))) "1z0w2vrx3qh3aryfkbfijkcxxr3yjbxc2l4b0yy8rcp2wjlakwbm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("cairo" ,cairo) `(("cairo" ,cairo)
@ -279,16 +279,17 @@ functions which were removed.")
"0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l")))) "0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases
'configure 'set-flags (modify-phases %standard-phases
(add-before 'configure 'set-flags
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Compile with C++11, required by gtkmm. ;; Compile with C++11, required by gtkmm.
(setenv "CXXFLAGS" "-std=c++11") (setenv "CXXFLAGS" "-std=c++11")
;; Allow 'bin/ganv_bench' to find libganv-1.so. ;; Allow 'bin/ganv_bench' to find libganv-1.so.
(setenv "LDFLAGS" (setenv "LDFLAGS"
(string-append "-Wl,-rpath=" (string-append "-Wl,-rpath="
(assoc-ref outputs "out") "/lib"))) (assoc-ref outputs "out") "/lib"))
%standard-phases) #t)))
#:tests? #f)) ; no check target #:tests? #f)) ; no check target
(inputs (inputs
`(("gtk" ,gtk+-2) `(("gtk" ,gtk+-2)
@ -349,8 +350,8 @@ diagrams.")
`(#:phases `(#:phases
;; Unfortunately, some of the tests in "make check" are highly dependent ;; Unfortunately, some of the tests in "make check" are highly dependent
;; on the environment therefore, some black magic is required. ;; on the environment therefore, some black magic is required.
(alist-cons-before (modify-phases %standard-phases
'check 'start-xserver (add-before 'check 'start-xserver
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((xorg-server (assoc-ref inputs "xorg-server")) (let ((xorg-server (assoc-ref inputs "xorg-server"))
(mime (assoc-ref inputs "shared-mime-info"))) (mime (assoc-ref inputs "shared-mime-info")))
@ -365,8 +366,8 @@ diagrams.")
(setenv "XDG_DATA_HOME" (getcwd)) (setenv "XDG_DATA_HOME" (getcwd))
;; Finally, the mimetypes must be available. ;; Finally, the mimetypes must be available.
(setenv "XDG_DATA_DIRS" (string-append mime "/share/")) )) (setenv "XDG_DATA_DIRS" (string-append mime "/share/")))
%standard-phases))) #t)))))
(synopsis "Widget that extends the standard GTK+ 2.x 'GtkTextView' widget") (synopsis "Widget that extends the standard GTK+ 2.x 'GtkTextView' widget")
(description (description
"GtkSourceView is a portable C library that extends the standard GTK+ "GtkSourceView is a portable C library that extends the standard GTK+
@ -427,8 +428,7 @@ highlighting and other features typical of a source code editor.")
(define-public gdk-pixbuf (define-public gdk-pixbuf
(package (package
(name "gdk-pixbuf") (name "gdk-pixbuf")
(replacement gdk-pixbuf-2.36.10) (version "2.36.10")
(version "2.36.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -436,8 +436,7 @@ highlighting and other features typical of a source code editor.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"034279k49ydawnagqd7b1rz741n20k4y3grybzwp26zd146bjpj5")) "1klsjkdbashd8yb8xjsc9ff3bz32n2id5s79nrrmqiw9df4zmxpq"))))
(patches (search-patches "gdk-pixbuf-list-dir.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--with-x11") '(#:configure-flags '("--with-x11")
@ -484,7 +483,6 @@ in the GNOME project.")
(define-public gdk-pixbuf+svg (define-public gdk-pixbuf+svg
(package (inherit gdk-pixbuf) (package (inherit gdk-pixbuf)
(name "gdk-pixbuf+svg") (name "gdk-pixbuf+svg")
(replacement gdk-pixbuf+svg-2.36.10)
(inputs (inputs
`(("librsvg" ,librsvg) `(("librsvg" ,librsvg)
,@(package-inputs gdk-pixbuf))) ,@(package-inputs gdk-pixbuf)))
@ -508,26 +506,6 @@ in the GNOME project.")
(synopsis (synopsis
"GNOME image loading and manipulation library, with SVG support"))) "GNOME image loading and manipulation library, with SVG support")))
;; Graft replacement packages to fix these vulnerabilities.
;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-2862
;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-2870
;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6311
(define-public gdk-pixbuf-2.36.10
(package (inherit gdk-pixbuf)
(version "2.36.A")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gdk-pixbuf/2.36/"
"gdk-pixbuf-2.36.10.tar.xz"))
(sha256
(base32
"1klsjkdbashd8yb8xjsc9ff3bz32n2id5s79nrrmqiw9df4zmxpq"))))))
(define-public gdk-pixbuf+svg-2.36.10
(package (inherit gdk-pixbuf+svg)
(version "2.36.A")
(source (origin (inherit (package-source gdk-pixbuf-2.36.10))))))
(define-public at-spi2-core (define-public at-spi2-core
(package (package
(name "at-spi2-core") (name "at-spi2-core")
@ -676,7 +654,7 @@ application suites.")
(name "gtk+") (name "gtk+")
;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in
;; mate.scm will also need to be updated. ;; mate.scm will also need to be updated.
(version "3.22.15") (version "3.22.21")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -684,7 +662,7 @@ application suites.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1nqgb71vx222g9fd2p017948hqybnyi69xs3n2d64clim7115868")) "11vb1shgr4rlayfk0b858gz986jsn2mpjlxvr89b2kgvbjlc3lqv"))
(patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
(outputs '("out" "bin" "doc")) (outputs '("out" "bin" "doc"))
@ -898,8 +876,9 @@ images onto Cairo surfaces.")
"godir = $(moddir)\n"))))) "godir = $(moddir)\n")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases
'install 'post-install (modify-phases %standard-phases
(add-after 'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
@ -908,8 +887,8 @@ images onto Cairo surfaces.")
(("guile") (("guile")
(string-append guile "/bin/guile -L " (string-append guile "/bin/guile -L "
out "/share/guile/site/2.0 -C " out "/share/guile/site/2.0 -C "
out "/share/guile/site/2.0 "))))) out "/share/guile/site/2.0 "))))
%standard-phases))) #t)))))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2)))
(propagated-inputs (propagated-inputs
@ -1183,7 +1162,7 @@ extensive documentation, including API reference and a tutorial.")
`(#:python ,python-2 `(#:python ,python-2
,@(substitute-keyword-arguments (package-arguments python-pycairo) ,@(substitute-keyword-arguments (package-arguments python-pycairo)
((#:phases phases) ((#:phases phases)
`(alist-delete 'patch-waf ,phases)) `(modify-phases ,phases (delete 'patch-waf)))
((#:native-inputs native-inputs) ((#:native-inputs native-inputs)
`(alist-delete "python-waf" ,native-inputs))))) `(alist-delete "python-waf" ,native-inputs)))))
;; Dual-licensed under LGPL 2.1 or Mozilla Public License 1.1 ;; Dual-licensed under LGPL 2.1 or Mozilla Public License 1.1
@ -1277,7 +1256,7 @@ write GNOME applications.")
#:test-target "test" #:test-target "test"
#:tests? #f ; Tests fail with "Gtk cannot open display:" #:tests? #f ; Tests fail with "Gtk cannot open display:"
#:phases #:phases
(alist-delete 'configure %standard-phases))) (modify-phases %standard-phases (delete 'configure))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://pwmt.org/projects/girara/") (home-page "https://pwmt.org/projects/girara/")
(synopsis "Library for minimalistic gtk+3 user interfaces") (synopsis "Library for minimalistic gtk+3 user interfaces")

21
gnu/packages/guile-wm.scm
View File

@ -83,17 +83,18 @@ dependencies.")
#:configure-flags (list (string-append "--datadir=" #:configure-flags (list (string-append "--datadir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/guile/site/2.0")) "/share/guile/site/2.0"))
#:phases (alist-cons-before #:phases
'configure 'set-go-directory (modify-phases %standard-phases
(add-before 'configure 'set-go-directory
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Install .go files to $out/share/guile/site/2.0. ;; Install .go files to $out/share/guile/site/2.0.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* "module/Makefile.in" (substitute* "module/Makefile.in"
(("^wmdir = .*$") (("^wmdir = .*$")
(string-append "wmdir = " out (string-append "wmdir = " out
"/share/guile/site/2.0\n"))))) "/share/guile/site/2.0\n"))))
(alist-cons-after #t))
'install 'set-load-path (add-after 'install 'set-load-path
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Put Guile-XCB's and Guile-WM's modules in the ;; Put Guile-XCB's and Guile-WM's modules in the
;; search path of PROG. ;; search path of PROG.
@ -108,9 +109,9 @@ dependencies.")
prog prog
`("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb)) `("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix `("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,mods ,xcb))))) (,mods ,xcb))))
(alist-cons-after #t))
'install 'install-xsession (add-after 'install 'install-xsession
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; add a .desktop file to xsessions ;; add a .desktop file to xsessions
(let ((xsessions (string-append (let ((xsessions (string-append
@ -125,8 +126,8 @@ dependencies.")
Comment=~a~@ Comment=~a~@
Exec=~a/bin/guile-wm~@ Exec=~a/bin/guile-wm~@
Type=Application~%" Type=Application~%"
,name ,synopsis %output))))) ,name ,synopsis %output))))
%standard-phases))))) #t)))))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.0) (inputs `(("guile" ,guile-2.0)
("guile-xcb" ,guile-xcb))) ("guile-xcb" ,guile-xcb)))

10
gnu/packages/guile.scm
View File

@ -95,9 +95,9 @@
(arguments '(#:configure-flags '("--disable-error-on-warning") (arguments '(#:configure-flags '("--disable-error-on-warning")
;; Insert a phase before `configure' to patch things up. ;; Insert a phase before `configure' to patch things up.
#:phases (alist-cons-before #:phases
'configure (modify-phases %standard-phases
'patch-stuff (add-before 'configure 'patch-stuff
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Add a call to `lt_dladdsearchdir' so that ;; Add a call to `lt_dladdsearchdir' so that
;; `libguile-readline.so' & co. are in the ;; `libguile-readline.so' & co. are in the
@ -111,8 +111,8 @@
;; The usual /bin/sh... ;; The usual /bin/sh...
(substitute* "ice-9/popen.scm" (substitute* "ice-9/popen.scm"
(("/bin/sh") (which "sh")))) (("/bin/sh") (which "sh")))
%standard-phases))) #t)))))
(inputs `(("gawk" ,gawk) (inputs `(("gawk" ,gawk)
("readline" ,readline))) ("readline" ,readline)))

9
gnu/packages/hugs.scm
View File

@ -39,8 +39,9 @@
"1mdy4aq4campgmnpc2qwq7bsbfhaxfsqdghbyyz2wms4lnfcmyma")))) "1mdy4aq4campgmnpc2qwq7bsbfhaxfsqdghbyyz2wms4lnfcmyma"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases
'configure 'fix-sh-n-cp (modify-phases %standard-phases
(add-before 'configure 'fix-sh-n-cp
(lambda _ (lambda _
(substitute* (substitute*
'("configure" '("configure"
@ -67,8 +68,8 @@
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
(substitute* '("demos/Makefile.in" (substitute* '("demos/Makefile.in"
"libraries/Makefile.in") "libraries/Makefile.in")
(("/bin/cp") (which "cp")))) (("/bin/cp") (which "cp")))
%standard-phases) #t)))
#:tests? #f)) ; no test target #:tests? #f)) ; no test target
;; FIXME: Fails to build with GCC 5. ;; FIXME: Fails to build with GCC 5.
(native-inputs `(("gcc" ,gcc-4.9))) (native-inputs `(("gcc" ,gcc-4.9)))

32
gnu/packages/hurd.scm
View File

@ -56,14 +56,13 @@
"02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f")))) "02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-replace `(#:phases
'install (modify-phases %standard-phases
(replace 'install
(lambda _ (lambda _
(zero? (zero?
(system* "make" "install-data"))) (system* "make" "install-data"))))
(alist-delete (delete 'build))
'build
%standard-phases))
;; GNU Mach supports only IA32 currently, so cheat so that we can at ;; GNU Mach supports only IA32 currently, so cheat so that we can at
;; least install its headers. ;; least install its headers.
@ -125,11 +124,12 @@ communication.")
(native-inputs (native-inputs
`(("mig" ,mig))) `(("mig" ,mig)))
(arguments (arguments
`(#:phases (alist-replace `(#:phases
'install (modify-phases %standard-phases
(replace 'install
(lambda _ (lambda _
(zero? (system* "make" "install-headers" "no_deps=t"))) (zero? (system* "make" "install-headers" "no_deps=t"))))
(alist-delete 'build %standard-phases)) (delete 'build))
#:configure-flags '(;; Pretend we're on GNU/Hurd; 'configure' wants #:configure-flags '(;; Pretend we're on GNU/Hurd; 'configure' wants
;; that. ;; that.
@ -164,8 +164,8 @@ Library and other user programs.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments hurd-headers) (substitute-keyword-arguments (package-arguments hurd-headers)
((#:phases _) ((#:phases _)
'(alist-replace '(modify-phases %standard-phases
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
;; We need to copy libihash.a to the output directory manually, ;; We need to copy libihash.a to the output directory manually,
@ -176,12 +176,10 @@ Library and other user programs.")
(mkdir-p (string-append out "/lib")) (mkdir-p (string-append out "/lib"))
(copy-file "libihash/libihash.a" (copy-file "libihash/libihash.a"
(string-append out "/lib/libihash.a")) (string-append out "/lib/libihash.a"))
#t)) #t)))
(alist-replace (replace 'build
'build
(lambda _ (lambda _
(zero? (system* "make" "-Clibihash" "libihash.a"))) (zero? (system* "make" "-Clibihash" "libihash.a"))))))))
%standard-phases)))))
(home-page "https://www.gnu.org/software/hurd/hurd.html") (home-page "https://www.gnu.org/software/hurd/hurd.html")
(synopsis "GNU Hurd libraries") (synopsis "GNU Hurd libraries")
(description (description

7
gnu/packages/image-viewers.scm
View File

@ -65,7 +65,7 @@
"0azgpr4al2pi4858z4xh4lfz84cvzxw3n426fn7rz6cdj34q212j")))) "0azgpr4al2pi4858z4xh4lfz84cvzxw3n426fn7rz6cdj34q212j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-delete 'configure %standard-phases) '(#:phases (modify-phases %standard-phases (delete 'configure))
#:tests? #f ;FIXME: Requires 'perl-test-command'. #:tests? #f ;FIXME: Requires 'perl-test-command'.
#:make-flags #:make-flags
(list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")))))
@ -178,9 +178,8 @@ It is the default image viewer on LXDE desktop environment.")
'(#:tests? #f ; no check target '(#:tests? #f ; no check target
#:make-flags (list (string-append "PREFIX=" %output) #:make-flags (list (string-append "PREFIX=" %output)
"CC=gcc") "CC=gcc")
#:phases (alist-delete ;; no configure phase
'configure ; no configure phase #:phases (modify-phases %standard-phases (delete 'configure))))
%standard-phases)))
(inputs (inputs
`(("libx11" ,libx11) `(("libx11" ,libx11)
("imlib2" ,imlib2) ("imlib2" ,imlib2)

11
gnu/packages/inkscape.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2014, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -50,6 +51,16 @@
(uri (string-append "https://media.inkscape.org/dl/" (uri (string-append "https://media.inkscape.org/dl/"
"resources/file/" "resources/file/"
"inkscape-" version ".tar.bz2")) "inkscape-" version ".tar.bz2"))
(patches
(list
;; Fix compatibility with poppler >= 0.58.
(origin
(method url-fetch)
(uri (string-append "https://gitlab.com/inkscape/inkscape/commit/"
"9418824967eb4c53371ef8588243fed4cab496e0.patch"))
(sha256
(base32
"0wwyhkqb1qyazz5f6wqrc223l6k8qnmadiw28q8gihlgvh38rvll")))))
(sha256 (sha256
(base32 (base32
"01chr3vh728dkg7l7lilwgmh5nrp784khdhjgpqjbq9dh2zhax15")))) "01chr3vh728dkg7l7lilwgmh5nrp784khdhjgpqjbq9dh2zhax15"))))

8
gnu/packages/libcanberra.scm
View File

@ -79,15 +79,15 @@
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'build 'patch-default-sounds-directory (add-before 'build 'patch-default-sounds-directory
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/sound-theme-spec.c" (substitute* "src/sound-theme-spec.c"
(("@SOUND_THEME_DIRECTORY@") (("@SOUND_THEME_DIRECTORY@")
(string-append (string-append
(assoc-ref inputs "sound-theme-freedesktop") (assoc-ref inputs "sound-theme-freedesktop")
"/share")))) "/share")))
%standard-phases))) #t)))))
(home-page "http://0pointer.de/lennart/projects/libcanberra/") (home-page "http://0pointer.de/lennart/projects/libcanberra/")
(synopsis (synopsis
"Implementation of the XDG Sound Theme and Name Specifications") "Implementation of the XDG Sound Theme and Name Specifications")

9
gnu/packages/libevent.scm
View File

@ -121,15 +121,14 @@ programs.")
(define-public libuv (define-public libuv
(package (package
(name "libuv") (name "libuv")
(version "1.12.0") (version "1.14.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/libuv/libuv/archive/v" (uri (string-append "https://dist.libuv.org/dist/v" version
version ".tar.gz")) "/libuv-v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0l0jrb5q3i8br10c8skc6xdwlxkmlpn3n0kngaqd68fsi1593kj1")))) "08kx4mzjsdv90n9pivqxqjxlxk5vaf9p33zzvx661dwfmp9468pk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases (alist-cons-after

113
gnu/packages/linux.scm
View File

@ -511,7 +511,7 @@ providing the system administrator with some help in common tasks.")
(define-public util-linux (define-public util-linux
(package (package
(name "util-linux") (name "util-linux")
(version "2.30") (version "2.30.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/linux/utils/" (uri (string-append "mirror://kernel.org/linux/utils/"
@ -519,7 +519,7 @@ providing the system administrator with some help in common tasks.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"13d0ax8bcapga8phj2nclx86w57ddqxbr98ajibpzjq6d7zs8262")) "0hdq2fz405a89fyha4bgwg0rx8b65inxq17w8fg8qhmcj4x3dr0v"))
(patches (search-patches "util-linux-tests.patch")) (patches (search-patches "util-linux-tests.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -1434,8 +1434,9 @@ Linux-based operating systems.")
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake))) ("automake" ,automake)))
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases
'unpack 'bootstrap (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _ (lambda _
;; Fix "field ‘ip6’ has incomplete type" errors. ;; Fix "field ‘ip6’ has incomplete type" errors.
(substitute* "libbridge/libbridge.h" (substitute* "libbridge/libbridge.h"
@ -1448,8 +1449,7 @@ Linux-based operating systems.")
(("\\$\\(MAKE\\) \\$\\(MFLAGS\\) -C \\$\\$x ;") (("\\$\\(MAKE\\) \\$\\(MFLAGS\\) -C \\$\\$x ;")
"$(MAKE) $(MFLAGS) -C $$x || exit 1;")) "$(MAKE) $(MFLAGS) -C $$x || exit 1;"))
(zero? (system* "autoreconf" "-vf"))) (zero? (system* "autoreconf" "-vf")))))
%standard-phases)
#:tests? #f)) ; no 'check' target #:tests? #f)) ; no 'check' target
(home-page (home-page
@ -1554,7 +1554,7 @@ configuration and monitoring interfaces.")
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc") "CC=gcc")
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(home-page "https://wireless.wiki.kernel.org/") (home-page "https://wireless.wiki.kernel.org/")
(synopsis "Tool for configuring wireless devices") (synopsis "Tool for configuring wireless devices")
(description (description
@ -1687,8 +1687,9 @@ processes currently causing I/O.")
(string-append "UDEV_RULES_PATH=" (string-append "UDEV_RULES_PATH="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib/udev/rules.d")) "/lib/udev/rules.d"))
#:phases (alist-cons-before #:phases
'build 'set-file-names (modify-phases %standard-phases
(add-before 'build 'set-file-names
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; libfuse calls out to mount(8) and umount(8). Make sure ;; libfuse calls out to mount(8) and umount(8). Make sure
;; it refers to the right ones. ;; it refers to the right ones.
@ -1706,8 +1707,8 @@ processes currently causing I/O.")
;; it's not setuid. ;; it's not setuid.
(substitute* "lib/Makefile" (substitute* "lib/Makefile"
(("-DFUSERMOUNT_DIR=[[:graph:]]+") (("-DFUSERMOUNT_DIR=[[:graph:]]+")
"-DFUSERMOUNT_DIR=\\\"/var/empty\\\""))) "-DFUSERMOUNT_DIR=\\\"/var/empty\\\""))
%standard-phases))) #t)))))
(home-page "https://github.com/libfuse/libfuse") (home-page "https://github.com/libfuse/libfuse")
(synopsis "Support file systems implemented in user space") (synopsis "Support file systems implemented in user space")
(description (description
@ -1785,8 +1786,9 @@ UnionFS-FUSE additionally supports copy-on-write.")
(arguments (arguments
'(#:tests? #f '(#:tests? #f
#:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-static") #:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-static")
#:phases (alist-cons-after #:phases
'install 'post-install (modify-phases %standard-phases
(add-after 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(exe (string-append out "/bin/unionfs"))) (exe (string-append out "/bin/unionfs")))
@ -1797,8 +1799,7 @@ UnionFS-FUSE additionally supports copy-on-write.")
;; 'unionfsctl' has references to glibc as well. Since ;; 'unionfsctl' has references to glibc as well. Since
;; we don't need it, remove it. ;; we don't need it, remove it.
(delete-file (string-append out "/bin/unionfsctl")) (delete-file (string-append out "/bin/unionfsctl"))
#t)) #t))))))
%standard-phases)))
(inputs `(("fuse" ,fuse-static))))) (inputs `(("fuse" ,fuse-static)))))
(define-public sshfs-fuse (define-public sshfs-fuse
@ -2378,10 +2379,9 @@ country-specific regulations for the wireless spectrum.")
(string-append "MANDIR=" %output "/share/man") (string-append "MANDIR=" %output "/share/man")
(string-append "LIBDIR=" (assoc-ref %outputs "lib") "/lib")) (string-append "LIBDIR=" (assoc-ref %outputs "lib") "/lib"))
#:phases #:phases
(alist-delete (modify-phases %standard-phases
'configure (delete 'configure)
(alist-cons-before (add-before 'build 'patch-exec-paths
'build 'patch-exec-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "prog/detect/sensors-detect" (substitute* "prog/detect/sensors-detect"
(("`uname") (("`uname")
@ -2413,8 +2413,8 @@ country-specific regulations for the wireless spectrum.")
"/bin/sleep ")) "/bin/sleep "))
(("readlink -f") (("readlink -f")
(string-append (assoc-ref inputs "coreutils") (string-append (assoc-ref inputs "coreutils")
"/bin/readlink -f")))) "/bin/readlink -f")))
%standard-phases)))) #t)))))
(home-page "http://jdelvare.nerim.net/devel.html#lmsensors") (home-page "http://jdelvare.nerim.net/devel.html#lmsensors")
(synopsis "Utilities to read temperature/voltage/fan sensors") (synopsis "Utilities to read temperature/voltage/fan sensors")
(description (description
@ -2441,7 +2441,7 @@ It works with most newer systems.")
#:make-flags (list (string-append "prefix=" %output) #:make-flags (list (string-append "prefix=" %output)
"CC=gcc") "CC=gcc")
;; no configure script ;; no configure script
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
`(("perl" ,perl))) `(("perl" ,perl)))
(home-page "http://jdelvare.nerim.net/devel.html#i2ctools") (home-page "http://jdelvare.nerim.net/devel.html#i2ctools")
@ -2470,18 +2470,19 @@ SMBus access.")
("gtk" ,gtk+-2))) ("gtk" ,gtk+-2)))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases
'configure 'enable-deprecated (modify-phases %standard-phases
(add-before 'configure 'enable-deprecated
(lambda _ (lambda _
(substitute* "src/Makefile.in" (substitute* "src/Makefile.in"
(("-DGDK_DISABLE_DEPRECATED") "") (("-DGDK_DISABLE_DEPRECATED") "")
(("-DGTK_DISABLE_DEPRECATED") ""))) (("-DGTK_DISABLE_DEPRECATED") ""))
(alist-cons-before #t))
'configure 'remove-Werror (add-before 'configure 'remove-Werror
(lambda _ (lambda _
(substitute* '("configure" "src/Makefile.in") (substitute* '("configure" "src/Makefile.in")
(("-Werror") ""))) (("-Werror") ""))
%standard-phases)))) #t)))))
(home-page "http://www.linuxhardware.org/xsensors/") (home-page "http://www.linuxhardware.org/xsensors/")
(synopsis "Hardware health information viewer") (synopsis "Hardware health information viewer")
(description (description
@ -2497,12 +2498,13 @@ in a digital read-out.")
(source (package-source linux-libre)) (source (package-source linux-libre))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-replace '(#:phases
'configure (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "SHELL_PATH" (which "bash")) (setenv "SHELL_PATH" (which "bash"))
(chdir "tools/perf")) (chdir "tools/perf")
%standard-phases) #t)))
#:make-flags (list (string-append "DESTDIR=" #:make-flags (list (string-append "DESTDIR="
(assoc-ref %outputs "out")) (assoc-ref %outputs "out"))
"WERROR=0" "WERROR=0"
@ -2841,22 +2843,23 @@ MPEG-2 and audio over Linux IEEE 1394.")
(string-append "BINDIR=" out "/sbin") (string-append "BINDIR=" out "/sbin")
(string-append "MANDIR=" out "/share/man") (string-append "MANDIR=" out "/share/man")
(string-append "UDEVDIR=" out "/lib/udev"))) (string-append "UDEVDIR=" out "/lib/udev")))
#:phases (alist-cons-before #:phases
'build 'patch-program-paths (modify-phases %standard-phases
(add-before 'build 'patch-program-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((coreutils (assoc-ref inputs "coreutils"))) (let ((coreutils (assoc-ref inputs "coreutils")))
(substitute* "udev-md-raid-arrays.rules" (substitute* "udev-md-raid-arrays.rules"
(("/usr/bin/(readlink|basename)" all program) (("/usr/bin/(readlink|basename)" all program)
(string-append coreutils "/bin/" program))))) (string-append coreutils "/bin/" program))))
(alist-cons-before #t))
'build 'remove-W-error (add-before 'build 'remove-W-error
(lambda _ (lambda _
;; We cannot build with -Werror on i686 due to a ;; We cannot build with -Werror on i686 due to a
;; 'sign-compare' warning in util.c. ;; 'sign-compare' warning in util.c.
(substitute* "Makefile" (substitute* "Makefile"
(("-Werror") "")) (("-Werror") ""))
#t) #t))
(alist-delete 'configure %standard-phases))) (delete 'configure))
;;tests must be done as root ;;tests must be done as root
#:tests? #f)) #:tests? #f))
(home-page "http://neil.brown.name/blog/mdadm") (home-page "http://neil.brown.name/blog/mdadm")
@ -2991,7 +2994,7 @@ Linux Device Mapper multipathing driver:
(list "CC=gcc" (string-append "prefix=" %output)) (list "CC=gcc" (string-append "prefix=" %output))
#:test-target "partcheck" ; need root for a full 'check' #:test-target "partcheck" ; need root for a full 'check'
#:phases #:phases
(alist-delete 'configure %standard-phases))) ; no configure script (modify-phases %standard-phases (delete 'configure)))) ; no configure script
(home-page "http://lse.sourceforge.net/io/aio.html") (home-page "http://lse.sourceforge.net/io/aio.html")
(synopsis "Linux-native asynchronous I/O access library") (synopsis "Linux-native asynchronous I/O access library")
(description (description
@ -3026,8 +3029,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
(define-public bluez (define-public bluez
(package (package
(name "bluez") (name "bluez")
(version "5.45") (version "5.47")
(replacement bluez/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -3035,7 +3037,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1sb4aflgyrl7apricjipa8wx95qm69yja0lmn2f19g560c3v1b2c")))) "1j22hfjz0fp4pgclgz9mfcwjbr4wqgah3gd2qhfg4r6msmybyxfg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -3089,20 +3091,6 @@ Bluetooth audio output devices like headphones or loudspeakers.")
is flexible, efficient and uses a modular implementation.") is flexible, efficient and uses a modular implementation.")
(license license:gpl2+))) (license license:gpl2+)))
(define bluez/fixed
(package
(inherit bluez)
(version "5.45")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://kernel.org/linux/bluetooth/bluez-"
version ".tar.xz"))
(sha256
(base32
"1sb4aflgyrl7apricjipa8wx95qm69yja0lmn2f19g560c3v1b2c"))
(patches (search-patches "bluez-CVE-2017-1000250.patch"))))))
(define-public fuse-exfat (define-public fuse-exfat
(package (package
(name "fuse-exfat") (name "fuse-exfat")
@ -3662,13 +3650,14 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.")
;; FIXME: The upstream tarball lacks man pages, and building them would ;; FIXME: The upstream tarball lacks man pages, and building them would
;; require DocBook & co. We used to use Gentoo's pre-built man pages, ;; require DocBook & co. We used to use Gentoo's pre-built man pages,
;; but they vanished. In the meantime, fake it. ;; but they vanished. In the meantime, fake it.
'(#:phases (alist-cons-before '(#:phases
'configure 'fake-docbook (modify-phases %standard-phases
(add-before 'configure 'fake-docbook
(lambda _ (lambda _
(substitute* "Makefile.in" (substitute* "Makefile.in"
(("^DOCBOOKTOMAN.*$") (("^DOCBOOKTOMAN.*$")
"DOCBOOKTOMAN = true\n"))) "DOCBOOKTOMAN = true\n"))
%standard-phases))) #t)))))
(home-page "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/") (home-page "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/")
(synopsis "Tools for loading and managing Linux kernel modules") (synopsis "Tools for loading and managing Linux kernel modules")
(description (description

21
gnu/packages/lisp.scm
View File

@ -455,15 +455,13 @@ statistical profiler, a code coverage tool, and many other extensions.")
(guix build utils) (guix build utils)
(guix build gnu-build-system)) (guix build gnu-build-system))
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'unpack (replace 'unpack
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(and (zero? (system* "tar" "xzvf" (assoc-ref inputs "ccl"))) (and (zero? (system* "tar" "xzvf" (assoc-ref inputs "ccl")))
(begin (chdir "ccl") #t))) (begin (chdir "ccl") #t))))
(alist-delete (delete 'configure)
'configure (add-before 'build 'pre-build
(alist-cons-before
'build 'pre-build
;; Enter the source directory for the current platform's lisp ;; Enter the source directory for the current platform's lisp
;; kernel, and run 'make clean' to remove the precompiled one. ;; kernel, and run 'make clean' to remove the precompiled one.
(lambda _ (lambda _
@ -480,11 +478,10 @@ statistical profiler, a code coverage tool, and many other extensions.")
(substitute* '("Makefile") (substitute* '("Makefile")
(("/bin/rm") "rm")) (("/bin/rm") "rm"))
(setenv "CC" "gcc") (setenv "CC" "gcc")
(zero? (system* "make" "clean"))) (zero? (system* "make" "clean"))))
;; XXX Do we need to recompile the heap image as well for Guix? ;; XXX Do we need to recompile the heap image as well for Guix?
;; For now just use the one we already got in the tarball. ;; For now just use the one we already got in the tarball.
(alist-replace (replace 'install
'install
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
;; The lisp kernel built by running 'make' in lisp-kernel/$system ;; The lisp kernel built by running 'make' in lisp-kernel/$system
;; is put back into the original directory, so go back. The heap ;; is put back into the original directory, so go back. The heap
@ -523,8 +520,8 @@ statistical profiler, a code coverage tool, and many other extensions.")
"CCL_DEFAULT_DIRECTORY=" libdir "\n" "CCL_DEFAULT_DIRECTORY=" libdir "\n"
"export CCL_DEFAULT_DIRECTORY\n" "export CCL_DEFAULT_DIRECTORY\n"
"exec " libdir kernel "\n")))) "exec " libdir kernel "\n"))))
(chmod wrapper #o755))) (chmod wrapper #o755))
%standard-phases)))))) #t)))))
(supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux"))
(home-page "http://ccl.clozure.com/") (home-page "http://ccl.clozure.com/")
(synopsis "Common Lisp implementation") (synopsis "Common Lisp implementation")

2
gnu/packages/lua.scm
View File

@ -124,7 +124,7 @@ for configuration, scripting, and rapid prototyping.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ;luajit is distributed without tests '(#:tests? #f ;luajit is distributed without tests
#:phases (alist-delete 'configure %standard-phases) #:phases (modify-phases %standard-phases (delete 'configure))
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))))
(home-page "http://www.luajit.org/") (home-page "http://www.luajit.org/")
(synopsis "Just in time compiler for Lua programming language version 5.1") (synopsis "Just in time compiler for Lua programming language version 5.1")

22
gnu/packages/machine-learning.scm
View File

@ -376,8 +376,8 @@ sample proximities between pairs of cases.")
(arguments (arguments
'(#:tests? #f ;no check target '(#:tests? #f ;no check target
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'delete-broken-symlinks (add-after 'unpack 'delete-broken-symlinks
(lambda _ (lambda _
(for-each delete-file '("applications/arts/data" (for-each delete-file '("applications/arts/data"
"applications/asp/data" "applications/asp/data"
@ -394,9 +394,8 @@ sample proximities between pairs of cases.")
"tests/integration/matlab_static" "tests/integration/matlab_static"
"tests/integration/octave_static" "tests/integration/octave_static"
"tests/integration/python_modular/tests")) "tests/integration/python_modular/tests"))
#t) #t))
(alist-cons-after (add-after 'unpack 'change-R-target-path
'unpack 'change-R-target-path
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* '("src/interfaces/r_modular/CMakeLists.txt" (substitute* '("src/interfaces/r_modular/CMakeLists.txt"
"src/interfaces/r_static/CMakeLists.txt" "src/interfaces/r_static/CMakeLists.txt"
@ -404,9 +403,8 @@ sample proximities between pairs of cases.")
(("\\$\\{R_COMPONENT_LIB_PATH\\}") (("\\$\\{R_COMPONENT_LIB_PATH\\}")
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/lib/R/library/"))) "/lib/R/library/")))
#t) #t))
(alist-cons-after (add-after 'unpack 'fix-octave-modules
'unpack 'fix-octave-modules
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* '("src/interfaces/octave_modular/CMakeLists.txt" (substitute* '("src/interfaces/octave_modular/CMakeLists.txt"
"src/interfaces/octave_static/CMakeLists.txt") "src/interfaces/octave_static/CMakeLists.txt")
@ -418,12 +416,10 @@ sample proximities between pairs of cases.")
(("\\$\\{OCTAVE_OCT_LOCAL_API_FILE_DIR\\}") (("\\$\\{OCTAVE_OCT_LOCAL_API_FILE_DIR\\}")
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/share/octave/packages"))) "/share/octave/packages")))
#t) #t))
(alist-cons-before (add-before 'build 'set-HOME
'build 'set-HOME
;; $HOME needs to be set at some point during the build phase ;; $HOME needs to be set at some point during the build phase
(lambda _ (setenv "HOME" "/tmp") #t) (lambda _ (setenv "HOME" "/tmp") #t)))
%standard-phases))))
#:configure-flags #:configure-flags
(list "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE" (list "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
"-DUSE_SVMLIGHT=OFF" ;disable proprietary SVMLIGHT "-DUSE_SVMLIGHT=OFF" ;disable proprietary SVMLIGHT

14
gnu/packages/mail.scm
View File

@ -1034,8 +1034,8 @@ delivery.")
("perl" ,perl))) ("perl" ,perl)))
(arguments (arguments
'(#:phases '(#:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
;; We'd use #:make-flags but the top-level Makefile calls others ;; We'd use #:make-flags but the top-level Makefile calls others
;; recursively, so just set all variables this way. ;; recursively, so just set all variables this way.
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
@ -1067,9 +1067,9 @@ delivery.")
(("'zcat'") (string-append "'" gzip "/bin/zcat'")) (("'zcat'") (string-append "'" gzip "/bin/zcat'"))
(("'bzcat'") (string-append "'" bzip2 "/bin/bzcat'")) (("'bzcat'") (string-append "'" bzip2 "/bin/bzcat'"))
(("'xzcat'") (string-append "'" xz "/bin/xzcat'")) (("'xzcat'") (string-append "'" xz "/bin/xzcat'"))
(("'lzma'") (string-append "'" xz "/bin/lzma'"))))) (("'lzma'") (string-append "'" xz "/bin/lzma'"))))
(alist-cons-before #t))
'build 'fix-sh-paths (add-before 'build 'fix-sh-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* '("scripts/lookups-Makefile" "scripts/reversion") (substitute* '("scripts/lookups-Makefile" "scripts/reversion")
(("SHELL=/bin/sh") "SHELL=sh")) (("SHELL=/bin/sh") "SHELL=sh"))
@ -1077,8 +1077,8 @@ delivery.")
(("\\| /bin/sh") "| sh")) (("\\| /bin/sh") "| sh"))
(let ((bash (assoc-ref inputs "bash"))) (let ((bash (assoc-ref inputs "bash")))
(substitute* '("scripts/Configure-eximon") (substitute* '("scripts/Configure-eximon")
(("#!/bin/sh") (string-append "#!" bash "/bin/sh"))))) (("#!/bin/sh") (string-append "#!" bash "/bin/sh"))))
%standard-phases)) #t)))
#:make-flags '("INSTALL_ARG=-no_chown") #:make-flags '("INSTALL_ARG=-no_chown")
;; No 'check' target. ;; No 'check' target.
#:tests? #f)) #:tests? #f))

4
gnu/packages/man.scm
View File

@ -154,7 +154,7 @@ the traditional flat-text whatis databases.")
"1gri0rm9i3a6w5dvsmwawhwzywl5x80dwq05d2v8l92knv2hbh6m")))) "1gri0rm9i3a6w5dvsmwawhwzywl5x80dwq05d2v8l92knv2hbh6m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-delete 'configure %standard-phases) '(#:phases (modify-phases %standard-phases (delete 'configure))
;; The 'all' target depends on three targets that directly populate ;; The 'all' target depends on three targets that directly populate
;; $(MANDIR) based on its current contents. Doing that in parallel ;; $(MANDIR) based on its current contents. Doing that in parallel
@ -220,7 +220,7 @@ automatically.")
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")))
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
`(("gawk" ,gawk))) `(("gawk" ,gawk)))
(home-page "https://github.com/mvertes/txt2man") (home-page "https://github.com/mvertes/txt2man")

44
gnu/packages/maths.scm
View File

@ -458,13 +458,14 @@ large scale eigenvalue problems.")
;; Build the 'LAPACKE_clatms' functions. ;; Build the 'LAPACKE_clatms' functions.
"-DLAPACKE_WITH_TMG=ON") "-DLAPACKE_WITH_TMG=ON")
#:phases (alist-cons-before #:phases
'check 'patch-python (modify-phases %standard-phases
(add-before 'check 'patch-python
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((python (assoc-ref inputs "python"))) (let ((python (assoc-ref inputs "python")))
(substitute* "lapack_testing.py" (substitute* "lapack_testing.py"
(("/usr/bin/env python") python)))) (("/usr/bin/env python") python)))
%standard-phases))) #t)))))
(synopsis "Library for numerical linear algebra") (synopsis "Library for numerical linear algebra")
(description (description
"LAPACK is a Fortran 90 library for solving the most commonly occurring "LAPACK is a Fortran 90 library for solving the most commonly occurring
@ -1996,8 +1997,8 @@ void mc64ad_ (int *a, int *b, int *c, int *d, int *e, double *f, int *g,
(arguments (arguments
`(#:parallel-build? #f ;race conditions using ar `(#:parallel-build? #f ;race conditions using ar
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(call-with-output-file "make.inc" (call-with-output-file "make.inc"
(lambda (port) (lambda (port)
@ -2027,31 +2028,30 @@ CDEFS = -DAdd_"
(getcwd) (getcwd)
(assoc-ref outputs "out") (assoc-ref outputs "out")
(assoc-ref inputs "lapack") (assoc-ref inputs "lapack")
(assoc-ref inputs "pt-scotch"))))) (assoc-ref inputs "pt-scotch"))))
(alist-cons-after #t))
'unpack 'remove-broken-symlinks (add-after 'unpack 'remove-broken-symlinks
(lambda _ (lambda _
(for-each delete-file (for-each delete-file
(find-files "MAKE_INC" "\\.#make\\..*"))) (find-files "MAKE_INC" "\\.#make\\..*"))
(alist-cons-before #t))
'build 'create-install-directories (add-before 'build 'create-install-directories
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(for-each (for-each
(lambda (dir) (lambda (dir)
(mkdir-p (string-append (assoc-ref outputs "out") (mkdir-p (string-append (assoc-ref outputs "out")
"/" dir))) "/" dir)))
'("lib" "include"))) '("lib" "include"))
(alist-replace #t))
'check (replace 'check
(lambda _ (lambda _
(with-directory-excursion "EXAMPLE" (with-directory-excursion "EXAMPLE"
(and (and
(zero? (system* "mpirun" "-n" "2" (zero? (system* "mpirun" "-n" "2"
"./pddrive" "-r" "1" "-c" "2" "g20.rua")) "./pddrive" "-r" "1" "-c" "2" "g20.rua"))
(zero? (system* "mpirun" "-n" "2" (zero? (system* "mpirun" "-n" "2"
"./pzdrive" "-r" "1" "-c" "2" "cg20.cua"))))) "./pzdrive" "-r" "1" "-c" "2" "cg20.cua"))))))
(alist-replace (replace 'install
'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Library is placed in lib during the build phase. Copy over ;; Library is placed in lib during the build phase. Copy over
;; headers to include. ;; headers to include.
@ -2063,8 +2063,8 @@ CDEFS = -DAdd_"
base incdir) base incdir)
(copy-file file (copy-file file
(string-append incdir "/" base)))) (string-append incdir "/" base))))
(find-files "SRC" ".*\\.h$")))) (find-files "SRC" ".*\\.h$")))
%standard-phases))))))) #t)))))
(home-page (package-home-page superlu)) (home-page (package-home-page superlu))
(synopsis "Parallel supernodal direct solver") (synopsis "Parallel supernodal direct solver")
(description (description
@ -2751,7 +2751,7 @@ access to BLIS implementations via traditional BLAS routine calls.")
(list (string-append "prefix=" (assoc-ref %outputs "out"))) (list (string-append "prefix=" (assoc-ref %outputs "out")))
#:phases #:phases
;; no configure script ;; no configure script
(alist-delete 'configure %standard-phases) (modify-phases %standard-phases (delete 'configure))
#:tests? #f)) ;the tests are part of the default target #:tests? #f)) ;the tests are part of the default target
(home-page "http://openlibm.org/") (home-page "http://openlibm.org/")
(synopsis "Portable C mathematical library (libm)") (synopsis "Portable C mathematical library (libm)")
@ -2790,7 +2790,7 @@ environments.")
#:make-flags #:make-flags
(list (string-append "prefix=" (assoc-ref %outputs "out"))) (list (string-append "prefix=" (assoc-ref %outputs "out")))
;; no configure script ;; no configure script
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
`(("fortran" ,gfortran))) `(("fortran" ,gfortran)))
(home-page "https://github.com/JuliaLang/openspecfun") (home-page "https://github.com/JuliaLang/openspecfun")

13
gnu/packages/messaging.scm
View File

@ -143,20 +143,19 @@ keys, no previous conversation is compromised.")
("python" ,python-2) ("python" ,python-2)
("perl" ,perl))) ("perl" ,perl)))
(arguments (arguments
`(#:phases (alist-cons-after `(#:phases
'install 'install-etc (modify-phases %standard-phases
(add-after 'install 'install-etc
(lambda* (#:key (make-flags '()) #:allow-other-keys) (lambda* (#:key (make-flags '()) #:allow-other-keys)
(zero? (apply system* "make" "install-etc" make-flags))) (zero? (apply system* "make" "install-etc" make-flags))))
(alist-replace (replace 'configure
'configure
;; bitlbee's configure script does not tolerate many of the ;; bitlbee's configure script does not tolerate many of the
;; variable settings that Guix would pass to it. ;; variable settings that Guix would pass to it.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "./configure" (zero? (system* "./configure"
(string-append "--prefix=" (string-append "--prefix="
(assoc-ref outputs "out")) (assoc-ref outputs "out"))
"--otr=1"))) "--otr=1")))))))
%standard-phases))))
(synopsis "IRC to instant messaging gateway") (synopsis "IRC to instant messaging gateway")
(description "BitlBee brings IM (instant messaging) to IRC clients, for (description "BitlBee brings IM (instant messaging) to IRC clients, for
people who have an IRC client running all the time and don't want to run an people who have an IRC client running all the time and don't want to run an

37
gnu/packages/mp3.scm
View File

@ -66,12 +66,12 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'remove-unsupported-gcc-flags (add-before 'configure 'remove-unsupported-gcc-flags
(lambda _ (lambda _
;; remove option that is not supported by gcc any more ;; remove option that is not supported by gcc any more
(substitute* "configure" ((" -fforce-mem") ""))) (substitute* "configure" ((" -fforce-mem") ""))
%standard-phases))) #t)))))
(synopsis "MPEG audio decoder") (synopsis "MPEG audio decoder")
(description (description
"MAD (MPEG Audio Decoder) supports MPEG-1 and the MPEG-2 extension to "MAD (MPEG Audio Decoder) supports MPEG-1 and the MPEG-2 extension to
@ -123,8 +123,8 @@ versions of ID3v2.")
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'apply-patches (add-before 'configure 'apply-patches
;; TODO: create a patch for origin instead? ;; TODO: create a patch for origin instead?
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
@ -135,8 +135,8 @@ versions of ID3v2.")
(substitute* "include/id3/writers.h" (substitute* "include/id3/writers.h"
(("//\\#include <string.h>") "#include <cstring>")) (("//\\#include <string.h>") "#include <cstring>"))
(substitute* "examples/test_io.cpp" (substitute* "examples/test_io.cpp"
(("dami;") "dami;\nusing namespace std;"))) (("dami;") "dami;\nusing namespace std;"))
%standard-phases))) #t)))))
(synopsis "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags") (synopsis "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags")
(description (description
"Id3lib is a cross-platform software development library for reading, "Id3lib is a cross-platform software development library for reading,
@ -194,29 +194,30 @@ Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files.")
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "gui")) ;GTK+ interface in "gui" (outputs '("out" "gui")) ;GTK+ interface in "gui"
(arguments (arguments
'(#:phases (alist-replace '(#:phases
'configure (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* "Makefile" (substitute* "Makefile"
(("prefix=.*") (("prefix=.*")
(string-append "prefix := " out "\n"))))) (string-append "prefix := " out "\n"))))
(alist-cons-before #t))
'install 'pre-install (add-before 'install 'pre-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/bin")) (mkdir-p (string-append out "/bin"))
(mkdir-p (string-append out "/share/man/man1")))) (mkdir-p (string-append out "/share/man/man1")))
(alist-cons-after #t))
'install 'post-install (add-after 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Move the GTK+ interface to "gui". ;; Move the GTK+ interface to "gui".
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(gui (assoc-ref outputs "gui"))) (gui (assoc-ref outputs "gui")))
(mkdir-p (string-append gui "/bin")) (mkdir-p (string-append gui "/bin"))
(rename-file (string-append out "/bin/gmp3info") (rename-file (string-append out "/bin/gmp3info")
(string-append gui "/bin/gmp3info")))) (string-append gui "/bin/gmp3info")))
%standard-phases))) #t)))
#:tests? #f)) #:tests? #f))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

32
gnu/packages/music.scm
View File

@ -871,8 +871,8 @@ complete studio.")
`(#:tests? #f ; xmllint attempts to download DTD `(#:tests? #f ; xmllint attempts to download DTD
#:test-target "test" #:test-target "test"
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'fix-configuration (add-after 'unpack 'fix-configuration
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "default.config" (substitute* "default.config"
(("csound=csound") (("csound=csound")
@ -890,17 +890,17 @@ complete studio.")
"/bin/mpg123")) "/bin/mpg123"))
(("/usr/bin/ogg123") (("/usr/bin/ogg123")
(string-append (assoc-ref inputs "ogg123") (string-append (assoc-ref inputs "ogg123")
"/bin/ogg123")))) "/bin/ogg123")))
(alist-cons-before #t))
'build 'patch-python-shebangs (add-before 'build 'patch-python-shebangs
(lambda _ (lambda _
;; Two python scripts begin with a Unicode BOM, so patch-shebang ;; Two python scripts begin with a Unicode BOM, so patch-shebang
;; has no effect. ;; has no effect.
(substitute* '("solfege/parsetree.py" (substitute* '("solfege/parsetree.py"
"solfege/presetup.py") "solfege/presetup.py")
(("#!/usr/bin/python") (string-append "#!" (which "python"))))) (("#!/usr/bin/python") (string-append "#!" (which "python"))))
(alist-cons-before #t))
'build 'add-sitedirs (add-before 'build 'add-sitedirs
;; .pth files are not automatically interpreted unless the ;; .pth files are not automatically interpreted unless the
;; directories containing them are added as "sites". The directories ;; directories containing them are added as "sites". The directories
;; are then added to those in the PYTHONPATH. This is required for ;; are then added to those in the PYTHONPATH. This is required for
@ -909,22 +909,22 @@ complete studio.")
(substitute* "run-solfege.py" (substitute* "run-solfege.py"
(("import os") (("import os")
"import os, site "import os, site
for path in [path for path in sys.path if 'site-packages' in path]: site.addsitedir(path)"))) for path in [path for path in sys.path if 'site-packages' in path]: site.addsitedir(path)"))
(alist-cons-before #t))
'build 'adjust-config-file-prefix (add-before 'build 'adjust-config-file-prefix
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "run-solfege.py" (substitute* "run-solfege.py"
(("prefix = os.path.*$") (("prefix = os.path.*$")
(string-append "prefix = " (assoc-ref outputs "out"))))) (string-append "prefix = " (assoc-ref outputs "out"))))
(alist-cons-after #t))
'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'solfege' runs with the correct PYTHONPATH. ;; Make sure 'solfege' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(path (getenv "PYTHONPATH"))) (path (getenv "PYTHONPATH")))
(wrap-program (string-append out "/bin/solfege") (wrap-program (string-append out "/bin/solfege")
`("PYTHONPATH" ":" prefix (,path))))) `("PYTHONPATH" ":" prefix (,path))))
%standard-phases))))))) #t)))))
(inputs (inputs
`(("python" ,python-2) `(("python" ,python-2)
("pygtk" ,python2-pygtk) ("pygtk" ,python2-pygtk)

19
gnu/packages/noweb.scm
View File

@ -35,14 +35,14 @@
"10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9")))) "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases
'install 'pre-install (modify-phases %standard-phases
(add-before 'install 'pre-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/share/texmf/tex/latex")) (mkdir-p (string-append out "/share/texmf/tex/latex"))
#t)) #t)))
(alist-cons-after (add-after 'install 'post-install
'install 'post-install
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(cu (assoc-ref inputs "coreutils")) (cu (assoc-ref inputs "coreutils"))
@ -64,9 +64,8 @@
(substitute* "bin/cpif" (substitute* "bin/cpif"
(("^PATH=.*$") (("^PATH=.*$")
(string-append "PATH=" cu "/bin:" du "/bin\n")))) (string-append "PATH=" cu "/bin:" du "/bin\n"))))
#t)) #t)))
(alist-replace (replace 'configure
'configure
(lambda _ (lambda _
;; Jump in the source. ;; Jump in the source.
(chdir "src") (chdir "src")
@ -74,8 +73,8 @@
;; The makefile reads "source: FAQ", but FAQ isn't ;; The makefile reads "source: FAQ", but FAQ isn't
;; available. ;; available.
(substitute* "Makefile" (substitute* "Makefile"
(("FAQ") ""))) (("FAQ") ""))
%standard-phases))) #t)))
#:make-flags (let ((out (assoc-ref %outputs "out"))) #:make-flags (let ((out (assoc-ref %outputs "out")))
(list (string-append "BIN=" out "/bin") (list (string-append "BIN=" out "/bin")
(string-append "LIB=" out "/lib") (string-append "LIB=" out "/lib")

42
gnu/packages/patches/bluez-CVE-2017-1000250.patch
View File

@ -1,42 +0,0 @@
Description: CVE-2017-1000250: information disclosure vulnerability in service_search_attr_req
Origin: vendor
Bug-Debian: https://bugs.debian.org/875633
Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1489446
Bug-SuSE: https://bugzilla.suse.com/show_bug.cgi?id=1057342
Forwarded: no
Author: Armis Security <security@armis.com>
Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
Last-Update: 2017-09-13
--- a/src/sdpd-request.c
+++ b/src/sdpd-request.c
@@ -918,15 +918,20 @@ static int service_search_attr_req(sdp_r
/* continuation State exists -> get from cache */
sdp_buf_t *pCache = sdp_get_cached_rsp(cstate);
if (pCache) {
- uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.maxBytesSent);
- pResponse = pCache->data;
- memcpy(buf->data, pResponse + cstate->cStateValue.maxBytesSent, sent);
- buf->data_size += sent;
- cstate->cStateValue.maxBytesSent += sent;
- if (cstate->cStateValue.maxBytesSent == pCache->data_size)
- cstate_size = sdp_set_cstate_pdu(buf, NULL);
- else
- cstate_size = sdp_set_cstate_pdu(buf, cstate);
+ if (cstate->cStateValue.maxBytesSent >= pCache->data_size) {
+ status = SDP_INVALID_CSTATE;
+ SDPDBG("Got bad cstate with invalid size");
+ } else {
+ uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.maxBytesSent);
+ pResponse = pCache->data;
+ memcpy(buf->data, pResponse + cstate->cStateValue.maxBytesSent, sent);
+ buf->data_size += sent;
+ cstate->cStateValue.maxBytesSent += sent;
+ if (cstate->cStateValue.maxBytesSent == pCache->data_size)
+ cstate_size = sdp_set_cstate_pdu(buf, NULL);
+ else
+ cstate_size = sdp_set_cstate_pdu(buf, cstate);
+ }
} else {
status = SDP_INVALID_CSTATE;
SDPDBG("Non-null continuation state, but null cache buffer");

14
gnu/packages/patches/gd-fix-gd2-read-test.patch
View File

@ -1,14 +0,0 @@
Fix a 'maybe-uninitialized' warning (turned error)
which occurs on non-Intel platforms.
--- libgd-2.2.3/tests/gd2/gd2_read.c 2016-07-21 01:21:16.000000000 -0400
+++ libgd-2.2.3/tests/gd2/gd2_read.c 2016-07-29 15:52:03.806405312 -0400
@@ -5,7 +5,7 @@
int main(int argc, char *argv[])
{
- int error, i = 0;
+ int error = 0, i = 0;
gdImagePtr im, exp;
FILE *fp;
char *path[] = {

121
gnu/packages/patches/gd-php-73968-Fix-109-XBM-reading.patch
View File

@ -1,121 +0,0 @@
This bug was first reported to php on https://bugs.php.net/bug.php?id=73968.
php then reported it to gd in https://github.com/libgd/libgd/issues/109.
Patch adapted from upstream source repository:
https://github.com/libgd/libgd/commit/082c5444838ea0d84f9fb6441aefdb44d78d9bba
Binary diffs have been removed from the patch because our patch
procedure doesn't support them.
From 082c5444838ea0d84f9fb6441aefdb44d78d9bba Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Fri, 20 Jan 2017 22:48:20 +0100
Subject: [PATCH] Fix #109: XBM reading fails with printed error
When calculating the number of required bytes of an XBM image, we have
to take the line padding into account.
---
src/gd_xbm.c | 2 +-
tests/xbm/CMakeLists.txt | 1 +
tests/xbm/Makemodule.am | 5 ++++-
tests/xbm/github_bug_109.c | 35 +++++++++++++++++++++++++++++++++++
tests/xbm/github_bug_109.xbm | 5 +++++
5 files changed, 47 insertions(+), 2 deletions(-)
create mode 100644 tests/xbm/github_bug_109.c
create mode 100644 tests/xbm/github_bug_109.xbm
create mode 100644 tests/xbm/github_bug_109_exp.png
diff --git a/src/gd_xbm.c b/src/gd_xbm.c
index 5f09b56..c2ba2ad 100644
--- a/src/gd_xbm.c
+++ b/src/gd_xbm.c
@@ -108,7 +108,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromXbm(FILE * fd)
max_bit = 32768;
}
if (max_bit) {
- bytes = (width * height / 8) + 1;
+ bytes = (width + 7) / 8 * height;
if (!bytes) {
return 0;
}
diff --git a/tests/xbm/CMakeLists.txt b/tests/xbm/CMakeLists.txt
index 183cf5e..08576e0 100644
--- a/tests/xbm/CMakeLists.txt
+++ b/tests/xbm/CMakeLists.txt
@@ -1,4 +1,5 @@
LIST(APPEND TESTS_FILES
+ github_bug_109
github_bug_170
)
diff --git a/tests/xbm/Makemodule.am b/tests/xbm/Makemodule.am
index ba1eabd..0f5beb6 100644
--- a/tests/xbm/Makemodule.am
+++ b/tests/xbm/Makemodule.am
@@ -1,5 +1,8 @@
libgd_test_programs += \
+ xbm/github_bug_109 \
xbm/github_bug_170
EXTRA_DIST += \
- xbm/CMakeLists.txt
+ xbm/CMakeLists.txt \
+ xbm/github_bug_109.xbm \
+ xbm/github_bug_109_exp.png
diff --git a/tests/xbm/github_bug_109.c b/tests/xbm/github_bug_109.c
new file mode 100644
index 0000000..1a020c6
--- /dev/null
+++ b/tests/xbm/github_bug_109.c
@@ -0,0 +1,35 @@
+/**
+ * Test reading of XBM images with a width that is not a multiple of 8
+ *
+ * We're reading such an XBM image, and check that we got what we've expected,
+ * instead of an error message.
+ *
+ * See also <https://github.com/libgd/libgd/issues/109>.
+ */
+
+
+#include "gd.h"
+#include "gdtest.h"
+
+
+int main()
+{
+ gdImagePtr im;
+ FILE *fp;
+ char *path;
+
+ fp = gdTestFileOpen2("xbm", "github_bug_109.xbm");
+ im = gdImageCreateFromXbm(fp);
+ fclose(fp);
+ gdTestAssert(im != NULL);
+ gdTestAssert(gdImageGetTrueColorPixel(im, 0, 0) == 0);
+ gdTestAssert(gdImageGetTrueColorPixel(im, 0, 1) == 0xffffff);
+
+ path = gdTestFilePath2("xbm", "github_bug_109_exp.png");
+ gdAssertImageEqualsToFile(path, im);
+ gdFree(path);
+
+ gdImageDestroy(im);
+
+ return gdNumFailures();
+}
diff --git a/tests/xbm/github_bug_109.xbm b/tests/xbm/github_bug_109.xbm
new file mode 100644
index 0000000..f427d86
--- /dev/null
+++ b/tests/xbm/github_bug_109.xbm
@@ -0,0 +1,5 @@
+#define test_width 10
+#define test_height 10
+static unsigned char test_bits[] = {
+ 0xFF, 0x03, 0x00, 0x00, 0xFF, 0x03, 0x00, 0x00, 0xFF, 0x03, 0x00, 0x00,
+ 0xFF, 0x03, 0x00, 0x00, 0xFF, 0x03, 0x00, 0x00};
--
2.7.4

35
gnu/packages/patches/gdk-pixbuf-list-dir.patch
View File

@ -1,35 +0,0 @@
Sort directory entries so that the output of
‘gdk-pixbuf-query-loaders’ is deterministic.
See: https://bugzilla.gnome.org/show_bug.cgi?id=777332
--- gdk-pixbuf-2.34.0/gdk-pixbuf/queryloaders.c.orig 2017-01-11 00:17:32.865843062 +0100
+++ gdk-pixbuf-2.34.0/gdk-pixbuf/queryloaders.c 2017-01-16 16:12:03.420667874 +0100
@@ -354,16 +354,27 @@
dir = g_dir_open (path, 0, NULL);
if (dir) {
+ GList *entries = NULL;
const char *dent;
while ((dent = g_dir_read_name (dir))) {
gint len = strlen (dent);
if (len > SOEXT_LEN &&
strcmp (dent + len - SOEXT_LEN, SOEXT) == 0) {
- query_module (contents, path, dent);
+ entries = g_list_append (entries, g_strdup (dent));
}
}
g_dir_close (dir);
+ /* Sort directory entries so that the output of
+ ‘gdk-pixbuf-query-loaders’ is deterministic. */
+ entries = g_list_sort (entries, (GCompareFunc) strcmp);
+ GList *xentries;
+ for (xentries = entries; xentries; xentries = g_list_next (xentries)) {
+ dent = xentries->data;
+ query_module (contents, path, dent);
+ g_free (xentries->data);
+ }
+ g_list_free (entries);
}
#else
g_string_append_printf (contents, "# dynamic loading of modules not supported\n");

4
gnu/packages/patches/mesa-skip-disk-cache-test.patch
View File

@ -9,11 +9,11 @@ for now.
unsetenv("MESA_GLSL_CACHE_DIR"); unsetenv("MESA_GLSL_CACHE_DIR");
unsetenv("XDG_CACHE_HOME"); unsetenv("XDG_CACHE_HOME");
- cache = disk_cache_create("test", "make_check"); - cache = disk_cache_create("test", "make_check", 0);
- expect_non_null(cache, "disk_cache_create with no environment variables"); - expect_non_null(cache, "disk_cache_create with no environment variables");
- -
- disk_cache_destroy(cache); - disk_cache_destroy(cache);
- -
/* Test with XDG_CACHE_HOME set */ /* Test with XDG_CACHE_HOME set */
setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1); setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1);
cache = disk_cache_create("test", "make_check"); cache = disk_cache_create("test", "make_check", 0);

34
gnu/packages/patchutils.scm
View File

@ -53,15 +53,16 @@
(inputs `(("perl" ,perl))) (inputs `(("perl" ,perl)))
(arguments (arguments
'(#:parallel-tests? #f '(#:parallel-tests? #f
#:phases (alist-cons-before #:phases
'check 'patch-test-scripts (modify-phases %standard-phases
(add-before 'check 'patch-test-scripts
(lambda _ (lambda _
(let ((echo (which "echo"))) (let ((echo (which "echo")))
(substitute* (substitute*
(find-files "tests" "^run-test$") (find-files "tests" "^run-test$")
(("/bin/echo") echo)))) (("/bin/echo") echo)))
(alist-cons-after #t))
'install 'wrap-program (add-after 'install 'wrap-program
;; Point installed scripts to the utilities they need. ;; Point installed scripts to the utilities they need.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -75,8 +76,8 @@
,(map (lambda (dir) ,(map (lambda (dir)
(string-append dir "/bin")) (string-append dir "/bin"))
(list diffutils sed gawk))))) (list diffutils sed gawk)))))
'("dehtmldiff" "editdiff" "espdiff")))) '("dehtmldiff" "editdiff" "espdiff")))
%standard-phases)))) #t)))))
(home-page "http://cyberelk.net/tim/software/patchutils") (home-page "http://cyberelk.net/tim/software/patchutils")
(synopsis "Collection of tools for manipulating patch files") (synopsis "Collection of tools for manipulating patch files")
(description (description
@ -106,17 +107,17 @@ listing the files modified by a patch.")
(arguments (arguments
'(#:parallel-tests? #f '(#:parallel-tests? #f
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'check 'patch-tests (add-before 'check 'patch-tests
(lambda _ (lambda _
(substitute* (substitute*
'("test/run" '("test/run"
"test/edit.test") "test/edit.test")
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
;; TODO: Run the mail tests once the mail feature can be supported. ;; TODO: Run the mail tests once the mail feature can be supported.
(delete-file "test/mail.test")) (delete-file "test/mail.test")
(alist-cons-after #t))
'install 'wrap-program (add-after 'install 'wrap-program
;; quilt's configure checks for the absolute path to the utilities it ;; quilt's configure checks for the absolute path to the utilities it
;; needs, but uses only the name when invoking them, so we need to ;; needs, but uses only the name when invoking them, so we need to
;; make sure the quilt script can find those utilities when run. ;; make sure the quilt script can find those utilities when run.
@ -136,8 +137,8 @@ listing the files modified by a patch.")
,(map (lambda (dir) ,(map (lambda (dir)
(string-append dir "/bin")) (string-append dir "/bin"))
(list coreutils diffutils findutils (list coreutils diffutils findutils
less file ed sed bash grep)))))) less file ed sed bash grep)))))
%standard-phases)))) #t)))))
(home-page "https://savannah.nongnu.org/projects/quilt/") (home-page "https://savannah.nongnu.org/projects/quilt/")
(synopsis "Script for managing patches to software") (synopsis "Script for managing patches to software")
(description (description
@ -164,8 +165,9 @@ refreshed, and more.")
#:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))
"INSTALL_DIR=/bin" "MAN_DIR=/share/man/man1") "INSTALL_DIR=/bin" "MAN_DIR=/share/man/man1")
#:phases #:phases
(alist-delete 'configure (modify-phases %standard-phases
(alist-delete 'build %standard-phases)))) (delete 'configure)
(delete 'build))))
(inputs (inputs
`(("perl" ,perl) `(("perl" ,perl)
("xmlto" ,xmlto))) ("xmlto" ,xmlto)))

39
gnu/packages/pdf.scm
View File

@ -76,14 +76,14 @@
(define-public poppler (define-public poppler
(package (package
(name "poppler") (name "poppler")
(version "0.56.0") (version "0.59.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://poppler.freedesktop.org/poppler-" (uri (string-append "https://poppler.freedesktop.org/poppler-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0wviayidfv2ix2ql0d4nl9r1ia6qi5kc1nybd9vjx27dk7gvm7c6")))) "0hcnghliyr8pr887qza18qfgaclw5jr889g1cjcglkni9jr2dmm3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; FIXME: ;; FIXME:
;; use libcurl: no ;; use libcurl: no
@ -300,8 +300,8 @@ reading and editing of existing PDF files.")
(assoc-ref %build-inputs "freetype") (assoc-ref %build-inputs "freetype")
"/include/freetype2")) "/include/freetype2"))
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'install (replace 'install
(lambda* (#:key outputs inputs #:allow-other-keys #:rest args) (lambda* (#:key outputs inputs #:allow-other-keys #:rest args)
(let* ((install (assoc-ref %standard-phases 'install)) (let* ((install (assoc-ref %standard-phases 'install))
(out (assoc-ref outputs "out")) (out (assoc-ref outputs "out"))
@ -311,8 +311,8 @@ reading and editing of existing PDF files.")
(substitute* xpdfrc (substitute* xpdfrc
(("/usr/local/share/ghostscript/fonts") (("/usr/local/share/ghostscript/fonts")
(string-append gs-fonts "/share/fonts/type1/ghostscript")) (string-append gs-fonts "/share/fonts/type1/ghostscript"))
(("#fontFile") "fontFile")))) (("#fontFile") "fontFile")))
%standard-phases))) #t)))))
(synopsis "Viewer for PDF files based on the Motif toolkit") (synopsis "Viewer for PDF files based on the Motif toolkit")
(description (description
"Xpdf is a viewer for Portable Document Format (PDF) files.") "Xpdf is a viewer for Portable Document Format (PDF) files.")
@ -343,7 +343,7 @@ reading and editing of existing PDF files.")
"CC=gcc") "CC=gcc")
#:tests? #f ; Package does not contain tests. #:tests? #f ; Package does not contain tests.
#:phases #:phases
(alist-delete 'configure %standard-phases))) (modify-phases %standard-phases (delete 'configure))))
(home-page "https://pwmt.org/projects/zathura-cb/") (home-page "https://pwmt.org/projects/zathura-cb/")
(synopsis "Comic book support for zathura (libarchive backend)") (synopsis "Comic book support for zathura (libarchive backend)")
(description "The zathura-cb plugin adds comic book support to zathura (description "The zathura-cb plugin adds comic book support to zathura
@ -374,7 +374,7 @@ using libarchive.")
"CC=gcc") "CC=gcc")
#:tests? #f ; Package does not contain tests. #:tests? #f ; Package does not contain tests.
#:phases #:phases
(alist-delete 'configure %standard-phases))) (modify-phases %standard-phases (delete 'configure))))
(home-page "https://pwmt.org/projects/zathura-ps/") (home-page "https://pwmt.org/projects/zathura-ps/")
(synopsis "PS support for zathura (libspectre backend)") (synopsis "PS support for zathura (libspectre backend)")
(description "The zathura-ps plugin adds PS support to zathura (description "The zathura-ps plugin adds PS support to zathura
@ -406,7 +406,7 @@ using libspectre.")
"CC=gcc") "CC=gcc")
#:tests? #f ; Package does not contain tests. #:tests? #f ; Package does not contain tests.
#:phases #:phases
(alist-delete 'configure %standard-phases))) (modify-phases %standard-phases (delete 'configure))))
(home-page "https://pwmt.org/projects/zathura-djvu/") (home-page "https://pwmt.org/projects/zathura-djvu/")
(synopsis "DjVu support for zathura (DjVuLibre backend)") (synopsis "DjVu support for zathura (DjVuLibre backend)")
(description "The zathura-djvu plugin adds DjVu support to zathura (description "The zathura-djvu plugin adds DjVu support to zathura
@ -439,7 +439,7 @@ using the DjVuLibre library.")
"CC=gcc") "CC=gcc")
#:tests? #f ; Package does not include tests. #:tests? #f ; Package does not include tests.
#:phases #:phases
(alist-delete 'configure %standard-phases))) (modify-phases %standard-phases (delete 'configure))))
(home-page "https://pwmt.org/projects/zathura-pdf-poppler/") (home-page "https://pwmt.org/projects/zathura-pdf-poppler/")
(synopsis "PDF support for zathura (poppler backend)") (synopsis "PDF support for zathura (poppler backend)")
(description "The zathura-pdf-poppler plugin adds PDF support to zathura (description "The zathura-pdf-poppler plugin adds PDF support to zathura
@ -477,7 +477,7 @@ by using the poppler rendering engine.")
#:tests? #f ; Tests fail: "Gtk cannot open display". #:tests? #f ; Tests fail: "Gtk cannot open display".
#:test-target "test" #:test-target "test"
#:phases #:phases
(alist-delete 'configure %standard-phases))) (modify-phases %standard-phases (delete 'configure))))
(home-page "https://pwmt.org/projects/zathura/") (home-page "https://pwmt.org/projects/zathura/")
(synopsis "Lightweight keyboard-driven PDF viewer") (synopsis "Lightweight keyboard-driven PDF viewer")
(description "Zathura is a customizable document viewer. It provides a (description "Zathura is a customizable document viewer. It provides a
@ -510,14 +510,14 @@ interaction.")
`(#:configure-flags '("-DPODOFO_BUILD_SHARED=ON" `(#:configure-flags '("-DPODOFO_BUILD_SHARED=ON"
"-DPODOFO_BUILD_STATIC=ON") "-DPODOFO_BUILD_STATIC=ON")
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'patch (add-before 'configure 'patch
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((freetype (assoc-ref inputs "freetype"))) (let ((freetype (assoc-ref inputs "freetype")))
;; Look for freetype include files in the correct place. ;; Look for freetype include files in the correct place.
(substitute* "cmake/modules/FindFREETYPE.cmake" (substitute* "cmake/modules/FindFREETYPE.cmake"
(("/usr/local") freetype)))) (("/usr/local") freetype)))
%standard-phases))) #t)))))
(home-page "http://podofo.sourceforge.net") (home-page "http://podofo.sourceforge.net")
(synopsis "Tools to work with the PDF file format") (synopsis "Tools to work with the PDF file format")
(description (description
@ -763,12 +763,13 @@ the PDF pages.")
"0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk")))) "0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases
'unpack 'patch-ldconfig (modify-phases %standard-phases
(add-after 'unpack 'patch-ldconfig
(lambda _ (lambda _
(substitute* "mk/Autoconf.mk" (substitute* "mk/Autoconf.mk"
(("/sbin/ldconfig -p") "echo lib")) #t) (("/sbin/ldconfig -p") "echo lib")) #t))
(alist-delete 'configure %standard-phases)) (delete 'configure))
#:tests? #f #:tests? #f
#:make-flags (list "CC=gcc" #:make-flags (list "CC=gcc"
(string-append "prefix=" (assoc-ref %outputs "out"))))) (string-append "prefix=" (assoc-ref %outputs "out")))))

17
gnu/packages/perl.scm
View File

@ -3166,11 +3166,9 @@ at the end of the scope.")
(build-system perl-build-system) (build-system perl-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'cd (add-after 'unpack 'cd
(lambda* _ (lambda _ (chdir "List") #t)))))
(chdir "List"))
%standard-phases)))
(license (package-license perl)) (license (package-license perl))
(synopsis "Perl extension for crawling directory trees and compiling (synopsis "Perl extension for crawling directory trees and compiling
lists of files") lists of files")
@ -7342,16 +7340,17 @@ contents of a file is equal to a particular string.")
"0chiqnzmna2mglm37nzxvn9qhq2j31iwz3i9isqjs7bf3k449gb9")))) "0chiqnzmna2mglm37nzxvn9qhq2j31iwz3i9isqjs7bf3k449gb9"))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases
'check 'patch-test (modify-phases %standard-phases
(add-before 'check 'patch-test
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; This test looks for "#!/usr/bin/perl" in some source. ;; This test looks for "#!/usr/bin/perl" in some source.
;; Patch what the test looks for. ;; Patch what the test looks for.
(substitute* "t/source.t" (substitute* "t/source.t"
(("#!/usr/bin/perl") (("#!/usr/bin/perl")
(string-append "#!" (assoc-ref inputs "perl") (string-append "#!" (assoc-ref inputs "perl")
"/bin/perl")))) "/bin/perl")))
%standard-phases))) #t)))))
(home-page "http://search.cpan.org/dist/Test-Harness") (home-page "http://search.cpan.org/dist/Test-Harness")
(synopsis "Run Perl standard test scripts with statistics") (synopsis "Run Perl standard test scripts with statistics")
(description "Simple test harness which allows tests to be run and results (description "Simple test harness which allows tests to be run and results

9
gnu/packages/photo.scm
View File

@ -152,13 +152,14 @@ from digital cameras.")
("libexif" ,libexif) ("libexif" ,libexif)
("libgphoto2" ,libgphoto2))) ("libgphoto2" ,libgphoto2)))
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases
'check 'pre-check (modify-phases %standard-phases
(add-before 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* (find-files "tests/data" "\\.param$") (substitute* (find-files "tests/data" "\\.param$")
(("/usr/bin/env") (("/usr/bin/env")
(which "env")))) (which "env")))
%standard-phases) #t)))
;; FIXME: There are 2 test failures, most likely related to the build ;; FIXME: There are 2 test failures, most likely related to the build
;; environment. ;; environment.

2
gnu/packages/php.scm
View File

@ -282,7 +282,7 @@
("curl" ,curl) ("curl" ,curl)
("cyrus-sasl" ,cyrus-sasl) ("cyrus-sasl" ,cyrus-sasl)
("freetype" ,freetype) ("freetype" ,freetype)
("gd" ,gd-2.2.5) ("gd" ,gd)
("gdbm" ,gdbm) ("gdbm" ,gdbm)
("glibc" ,glibc) ("glibc" ,glibc)
("gmp" ,gmp) ("gmp" ,gmp)

9
gnu/packages/popt.scm
View File

@ -66,14 +66,15 @@ line syntax.")
"1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77")))) "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases
'configure 'patch-test (modify-phases %standard-phases
(add-before 'configure 'patch-test
(lambda _ (lambda _
(substitute* "test-poptrc.in" (substitute* "test-poptrc.in"
(("/bin/echo") (which "echo"))) (("/bin/echo") (which "echo")))
(substitute* "testit.sh" ; don't expect old libtool names (substitute* "testit.sh" ; don't expect old libtool names
(("lt-test1") "test1"))) (("lt-test1") "test1"))
%standard-phases))) #t)))))
(home-page "http://rpm5.org/files/popt/") (home-page "http://rpm5.org/files/popt/")
(synopsis "Command line option parsing library") (synopsis "Command line option parsing library")
(description (description

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

@ -205,8 +205,9 @@ to @code{IOStreams}.")
(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
'check 'patch-test-files (modify-phases %standard-phases
(add-before 'check 'patch-test-files
(lambda _ (lambda _
;; Unpatch shebangs in test input so that source-highlight ;; Unpatch shebangs in test input so that source-highlight
;; is still able to infer input language ;; is still able to infer input language
@ -219,8 +220,8 @@ to @code{IOStreams}.")
(substitute* '("tests/test.sh.html" (substitute* '("tests/test.sh.html"
"tests/test2.sh.html" "tests/test2.sh.html"
"tests/test.tcl.html") "tests/test.tcl.html")
(("#! */bin/sh") "#!/bin/sh"))) (("#! */bin/sh") "#!/bin/sh"))
%standard-phases))) #t)))))
(home-page "https://www.gnu.org/software/src-highlite/") (home-page "https://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
@ -292,11 +293,11 @@ highlighting. Language definitions and color themes are customizable.")
#:make-flags (list (string-append "prefix=" %output) #:make-flags (list (string-append "prefix=" %output)
"INSTALL=install" "INSTALL=install"
"all") "all")
#:phases (alist-replace #:phases
'configure (modify-phases %standard-phases
(lambda _ (chdir "build/gcc")) (replace 'configure
(alist-cons-after (lambda _ (chdir "build/gcc") #t))
'install 'install-libs (add-after 'install 'install-libs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Libraries are not installed by default ;; Libraries are not installed by default
(let* ((output (assoc-ref outputs "out")) (let* ((output (assoc-ref outputs "out"))
@ -306,8 +307,8 @@ highlighting. Language definitions and color themes are customizable.")
(for-each (lambda (l) (for-each (lambda (l)
(copy-file (copy-file
l (string-append libdir "/" (basename l)))) l (string-append libdir "/" (basename l))))
(find-files "bin" "lib*"))))) (find-files "bin" "lib*"))))
%standard-phases)))) #t)))))
(home-page "http://astyle.sourceforge.net/") (home-page "http://astyle.sourceforge.net/")
(synopsis "Source code indenter, formatter, and beautifier") (synopsis "Source code indenter, formatter, and beautifier")
(description (description

4
gnu/packages/pulseaudio.scm
View File

@ -120,7 +120,7 @@ rates.")
(define-public pulseaudio (define-public pulseaudio
(package (package
(name "pulseaudio") (name "pulseaudio")
(version "10.0") (version "11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -128,7 +128,7 @@ rates.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0mrg8qvpwm4ifarzphl3749p7p050kdx1l6mvsaj03czvqj6h653")) "0sf92knqkvqmfhrbz4vlsagzqlps72wycpmln5dygicg07a0a8q7"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Disable console-kit support by default since it's deprecated ;; Disable console-kit support by default since it's deprecated

9
gnu/packages/pumpio.scm
View File

@ -42,8 +42,9 @@
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-replace '(#:phases
'configure (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Fix dependency tests. ;; Fix dependency tests.
(substitute* "pumpa.pro" (substitute* "pumpa.pro"
@ -56,8 +57,8 @@
;; Run qmake with proper installation prefix. ;; Run qmake with proper installation prefix.
(let ((prefix (string-append "PREFIX=" (let ((prefix (string-append "PREFIX="
(assoc-ref outputs "out")))) (assoc-ref outputs "out"))))
(zero? (system* "qmake" prefix)))) (zero? (system* "qmake" prefix)))
%standard-phases))) #t)))))
(inputs (inputs
`(("aspell" ,aspell) `(("aspell" ,aspell)
("qtbase" ,qtbase) ("qtbase" ,qtbase)

39
gnu/packages/python.scm
View File

@ -485,11 +485,10 @@ pidof, tty, taskset, pmap.")
`(("python-py-bcrypt" ,python-py-bcrypt))) `(("python-py-bcrypt" ,python-py-bcrypt)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'check 'set-PYTHON_EGG_CACHE (add-before 'check 'set-PYTHON_EGG_CACHE
;; some tests require access to "$HOME/.cython" ;; some tests require access to "$HOME/.cython"
(lambda* _ (setenv "PYTHON_EGG_CACHE" "/tmp")) (lambda* _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t)))))
%standard-phases)))
(home-page "https://bitbucket.org/ecollins/passlib") (home-page "https://bitbucket.org/ecollins/passlib")
(synopsis (synopsis
"Comprehensive password hashing framework") "Comprehensive password hashing framework")
@ -1079,12 +1078,10 @@ multiple Unicode code points, e.g. \"G\" + acute-accent)
("gmp" ,gmp))) ("gmp" ,gmp)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'build 'set-build-env (add-before 'build 'set-build-env
;; pycrypto runs an autoconf configure script behind the scenes ;; pycrypto runs an autoconf configure script behind the scenes
(lambda _ (lambda _ (setenv "CONFIG_SHELL" (which "bash")) #t)))))
(setenv "CONFIG_SHELL" (which "bash")))
%standard-phases)))
(home-page "http://www.pycrypto.org/") (home-page "http://www.pycrypto.org/")
(synopsis "Cryptographic modules for Python") (synopsis "Cryptographic modules for Python")
(description (description
@ -1496,11 +1493,11 @@ other Python program.")
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:python ,python-2 `(#:python ,python-2
#:phases (alist-replace #:phases
'check (modify-phases %standard-phases
(replace 'check
(lambda _ (lambda _
(zero? (system* "./test.sh"))) (zero? (system* "./test.sh")))))))
%standard-phases)))
(home-page "http://www.alcyone.com/software/empy/") (home-page "http://www.alcyone.com/software/empy/")
(synopsis "Templating system for Python") (synopsis "Templating system for Python")
(description (description
@ -4721,10 +4718,10 @@ as the original project seems to have been abandoned circa 2007.")
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("python-mock" ,python-mock))) ;for tests ("python-mock" ,python-mock))) ;for tests
(arguments (arguments
`(#:phases (alist-replace `(#:phases
'check (modify-phases %standard-phases
(lambda _ (zero? (system* "py.test"))) (replace 'check
%standard-phases))) (lambda _ (zero? (system* "py.test")))))))
(home-page "http://www.sqlalchemy.org") (home-page "http://www.sqlalchemy.org")
(synopsis "Database abstraction library") (synopsis "Database abstraction library")
(description (description
@ -8635,10 +8632,10 @@ automatically detect a wide range of file encodings.")
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest))) `(("python-pytest" ,python-pytest)))
(arguments (arguments
`(#:phases (alist-replace `(#:phases
'check (modify-phases %standard-phases
(lambda _ (zero? (system* "py.test"))) (replace 'check
%standard-phases))) (lambda _ (zero? (system* "py.test")))))))
(home-page "http://docopt.org") (home-page "http://docopt.org")
(synopsis "Command-line interface description language for Python") (synopsis "Command-line interface description language for Python")
(description "This library allows the user to define a command-line (description "This library allows the user to define a command-line

16
gnu/packages/rdf.scm
View File

@ -127,12 +127,9 @@ Java Lucene text search engine API to C++.")
"18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s")))) "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases
'remove-out-of-tree-references 'autoreconf (modify-phases %standard-phases
(lambda _ (add-after 'unpack 'remove-out-of-tree-references
(zero? (system* "autoreconf" "-vfi")))
(alist-cons-after
'unpack 'remove-out-of-tree-references
(lambda _ (lambda _
;; remove symlinks to files in /usr/ ;; remove symlinks to files in /usr/
(delete-file-recursively "m4") (delete-file-recursively "m4")
@ -145,8 +142,11 @@ Java Lucene text search engine API to C++.")
;; remove_test depends on an out-of-tree RDF file ;; remove_test depends on an out-of-tree RDF file
(substitute* "examples/Makefile.am" (substitute* "examples/Makefile.am"
(("instances_test remove_test") "instances_test") (("instances_test remove_test") "instances_test")
(("\\$\\(TESTS\\) remove_test") "$(TESTS)"))) (("\\$\\(TESTS\\) remove_test") "$(TESTS)"))
%standard-phases)))) #t))
(add-after 'remove-out-of-tree-references 'autoreconf
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(inputs (inputs
`(("raptor" ,raptor2) `(("raptor" ,raptor2)
("cyrus-sasl" ,cyrus-sasl) ("cyrus-sasl" ,cyrus-sasl)

8
gnu/packages/regex.scm
View File

@ -85,16 +85,16 @@ Python. It is a C++ library.")
"0n36cgqys59r2gmb7jzbqiwsy790v8nbxk82d2n2saz0rp145ild")))) "0n36cgqys59r2gmb7jzbqiwsy790v8nbxk82d2n2saz0rp145ild"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases
'check 'install-locales (modify-phases %standard-phases
(add-before 'check 'install-locales
(lambda _ (lambda _
;; The tests require the availability of the ;; The tests require the availability of the
;; 'en_US.ISO-8859-1' locale. ;; 'en_US.ISO-8859-1' locale.
(setenv "LOCPATH" (getcwd)) (setenv "LOCPATH" (getcwd))
(zero? (system* "localedef" "--no-archive" (zero? (system* "localedef" "--no-archive"
"--prefix" (getcwd) "-i" "en_US" "--prefix" (getcwd) "-i" "en_US"
"-f" "ISO-8859-1" "./en_US.ISO-8859-1"))) "-f" "ISO-8859-1" "./en_US.ISO-8859-1")))))))
%standard-phases)))
(synopsis "Approximate regex matching library and agrep utility") (synopsis "Approximate regex matching library and agrep utility")
(description "Superset of the POSIX regex API, enabling approximate (description "Superset of the POSIX regex API, enabling approximate
matching. Also ships a version of the agrep utility which behaves similar to matching. Also ships a version of the agrep utility which behaves similar to

9
gnu/packages/rrdtool.scm
View File

@ -53,15 +53,16 @@
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("groff" ,groff))) ("groff" ,groff)))
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases
'configure 'pre-configure (modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda _ (lambda _
(substitute* "libtool" (substitute* "libtool"
(("/bin/sed") (which "sed"))) (("/bin/sed") (which "sed")))
(substitute* "src/Makefile.in" (substitute* "src/Makefile.in"
(("^rrdcached_LDADD = librrd_th.la") (("^rrdcached_LDADD = librrd_th.la")
"rrdcached_LDADD = librrd_th.la -lglib-2.0"))) "rrdcached_LDADD = librrd_th.la -lglib-2.0"))
%standard-phases))) #t)))))
(home-page "http://oss.oetiker.ch/rrdtool/") (home-page "http://oss.oetiker.ch/rrdtool/")
(synopsis "Time-series data storage and display system") (synopsis "Time-series data storage and display system")
(description (description

60
gnu/packages/ruby.scm
View File

@ -49,8 +49,7 @@
(define-public ruby (define-public ruby
(package (package
(name "ruby") (name "ruby")
(replacement ruby-2.4.2) (version "2.4.2")
(version "2.4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -59,7 +58,7 @@
"/ruby-" version ".tar.xz")) "/ruby-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"141nnsdk2q83c23p5kl404id8gy1ap261gin48rbjj5sbksgx1rs")) "0dgp4ypk3smrsbh2c249n5pl6nqhpd2igq9484dbsh81sf08k2kl"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet `(begin (snippet `(begin
;; Remove bundled libffi ;; Remove bundled libffi
@ -103,26 +102,6 @@ a focus on simplicity and productivity.")
(home-page "https://ruby-lang.org") (home-page "https://ruby-lang.org")
(license license:ruby))) (license license:ruby)))
(define-public ruby-2.4.2
(package
(inherit ruby)
(name "ruby")
(version "2.4.2")
(source
(origin
(method url-fetch)
(uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
(version-major+minor version)
"/ruby-" version ".tar.xz"))
(sha256
(base32
"0dgp4ypk3smrsbh2c249n5pl6nqhpd2igq9484dbsh81sf08k2kl"))
(modules '((guix build utils)))
(snippet `(begin
;; Remove bundled libffi
(delete-file-recursively "ext/fiddle/libffi-3.2.1")
#t))))))
(define-public ruby-2.3 (define-public ruby-2.3
(package (package
(inherit ruby) (inherit ruby)
@ -171,16 +150,16 @@ a focus on simplicity and productivity.")
`(#:test-target "test" `(#:test-target "test"
#:parallel-tests? #f #:parallel-tests? #f
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'replace-bin-sh (add-before 'configure 'replace-bin-sh
(lambda _ (lambda _
(substitute* '("Makefile.in" (substitute* '("Makefile.in"
"ext/pty/pty.c" "ext/pty/pty.c"
"io.c" "io.c"
"lib/mkmf.rb" "lib/mkmf.rb"
"process.c") "process.c")
(("/bin/sh") (which "sh")))) (("/bin/sh") (which "sh")))
%standard-phases))) #t)))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "GEM_PATH") (variable "GEM_PATH")
@ -205,16 +184,21 @@ a focus on simplicity and productivity.")
`(#:test-target "test" `(#:test-target "test"
#:parallel-tests? #f #:parallel-tests? #f
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'replace-bin-sh (add-before 'configure 'replace-bin-sh
(lambda _ (lambda _
(substitute* '("Makefile.in" (substitute* '("Makefile.in"
"ext/pty/pty.c" "ext/pty/pty.c"
"io.c" "io.c"
"lib/mkmf.rb" "lib/mkmf.rb"
"process.c") "process.c")
(("/bin/sh") (which "sh")))) (("/bin/sh") (which "sh")))
%standard-phases))))) #t)))))))
(define (gem-directory ruby-version)
"Return the relative gem install directory for RUBY-VERSION."
(string-append "/lib/ruby/gems/" (version-major+minor ruby-version)
".0/gems"))
(define-public ruby-highline (define-public ruby-highline
(package (package
@ -3800,10 +3784,9 @@ requests either using arguments or with an interactive prompt.")
(add-before 'validate-runpath 'replace-broken-symlink (add-before 'validate-runpath 'replace-broken-symlink
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(file (string-append out "/lib/ruby/gems/" (file (string-append out
,(package-version ruby) ,(gem-directory (package-version ruby))
"/gems/ansi-" ,version "/ansi-" ,version "/lib/ansi.yml")))
"/lib/ansi.yml")))
;; XXX: This symlink is broken since ruby 2.4. ;; XXX: This symlink is broken since ruby 2.4.
;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html ;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html
(delete-file file) (delete-file file)
@ -4001,10 +3984,9 @@ requirement specifications systems like Cucumber.")
(add-before 'validate-runpath 'replace-broken-symlink (add-before 'validate-runpath 'replace-broken-symlink
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(file (string-append out "/lib/ruby/gems/" (file (string-append out
,(package-version ruby) ,(gem-directory (package-version ruby))
"/gems/ae-" ,version "/ae-" ,version "/lib/ae.yml")))
"/lib/ae.yml")))
;; XXX: This symlink is broken since ruby 2.4. ;; XXX: This symlink is broken since ruby 2.4.
;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html ;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html
(delete-file file) (delete-file file)

14
gnu/packages/sawfish.scm
View File

@ -138,16 +138,16 @@ backend of Sawfish.")
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'patch-exec-rep (add-before 'configure 'patch-exec-rep
(lambda _ (lambda _
(substitute* '("lisp/sawfish/cfg/main.jl.in" (substitute* '("lisp/sawfish/cfg/main.jl.in"
"scripts/sawfish-about.jl.in" "scripts/sawfish-about.jl.in"
"scripts/sawfish-client.jl" "scripts/sawfish-client.jl"
"scripts/sawfish-menu.jl") "scripts/sawfish-menu.jl")
(("exec rep") (string-append "exec " (which "rep"))))) (("exec rep") (string-append "exec " (which "rep"))))
(alist-cons-after #t))
'install 'wrap-scripts (add-after 'install 'wrap-scripts
;; Wrap scripts with REP_DL_LOAD_PATH for finding rep-gtk ;; Wrap scripts with REP_DL_LOAD_PATH for finding rep-gtk
;; and sawfish.client. ;; and sawfish.client.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -161,8 +161,8 @@ backend of Sawfish.")
(list "/bin/sawfish-about" (list "/bin/sawfish-about"
"/bin/sawfish-client" "/bin/sawfish-client"
"/bin/sawfish-config" "/bin/sawfish-config"
"/lib/sawfish/sawfish-menu"))) "/lib/sawfish/sawfish-menu"))
%standard-phases)))) #t)))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
("makeinfo" ,texinfo) ("makeinfo" ,texinfo)

14
gnu/packages/scheme.scm
View File

@ -417,8 +417,8 @@ implementation techniques and as an expository tool.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'pre-configure (add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Patch dynamically loaded libraries with their absolute paths. ;; Patch dynamically loaded libraries with their absolute paths.
(let* ((library-path (search-path-as-string->list (let* ((library-path (search-path-as-string->list
@ -477,13 +477,13 @@ implementation techniques and as an expository tool.")
("libGL")) ("libGL"))
("share/pkgs/sgl/gl.rkt" ("share/pkgs/sgl/gl.rkt"
("libGL" "libGLU"))))) ("libGL" "libGLU")))))
(chdir "src")) (chdir "src")
(alist-cons-after #t))
'unpack 'patch-/bin/sh (add-after 'unpack 'patch-/bin/sh
(lambda _ (lambda _
(substitute* "collects/racket/system.rkt" (substitute* "collects/racket/system.rkt"
(("/bin/sh") (which "sh")))) (("/bin/sh") (which "sh")))
%standard-phases)) #t)))
#:tests? #f ; XXX: how to run them? #:tests? #f ; XXX: how to run them?
)) ))
(inputs (inputs

14
gnu/packages/sdl.scm
View File

@ -411,8 +411,8 @@ directory.")
(assoc-ref %build-inputs "sdl-union"))) (assoc-ref %build-inputs "sdl-union")))
#:parallel-build? #f ; parallel build fails #:parallel-build? #f ; parallel build fails
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'fix-env-and-patch (add-before 'configure 'fix-env-and-patch
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "GUILE_AUTO_COMPILE" "0") (setenv "GUILE_AUTO_COMPILE" "0")
;; SDL_image needs to dlopen libjpeg in the test suite. ;; SDL_image needs to dlopen libjpeg in the test suite.
@ -426,15 +426,15 @@ directory.")
;; the build environment. ;; the build environment.
(substitute* "test/Makefile.in" (substitute* "test/Makefile.in"
(("HAVE_MIXER = .*$") (("HAVE_MIXER = .*$")
"HAVE_MIXER = 0\n"))) "HAVE_MIXER = 0\n"))
(alist-cons-before #t))
'check 'start-xorg-server (add-before 'check 'start-xorg-server
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; The test suite requires a running X server. ;; The test suite requires a running X server.
(system (format #f "~a/bin/Xvfb :1 &" (system (format #f "~a/bin/Xvfb :1 &"
(assoc-ref inputs "xorg-server"))) (assoc-ref inputs "xorg-server")))
(setenv "DISPLAY" ":1")) (setenv "DISPLAY" ":1")
%standard-phases)))) #t)))))
(synopsis "Guile interface for SDL (Simple DirectMedia Layer)") (synopsis "Guile interface for SDL (Simple DirectMedia Layer)")
(description "Guile-SDL is a set of bindings to the Simple DirectMedia (description "Guile-SDL is a set of bindings to the Simple DirectMedia
Layer (SDL). With them, Guile programmers can have easy access to graphics, Layer (SDL). With them, Guile programmers can have easy access to graphics,

9
gnu/packages/serveez.scm
View File

@ -40,13 +40,14 @@
(inputs `(("guile" ,guile-2.0))) (inputs `(("guile" ,guile-2.0)))
(arguments (arguments
`(#:configure-flags '("--enable-libserveez-install") `(#:configure-flags '("--enable-libserveez-install")
#:phases (alist-cons-before #:phases
'patch-source-shebangs 'patch-test-source (modify-phases %standard-phases
(add-before 'patch-source-shebangs 'patch-test-source
(lambda _ (lambda _
(substitute* (substitute*
(find-files "test" "^t[0-9]{3}$") (find-files "test" "^t[0-9]{3}$")
(("/bin/sh") (which "sh")))) (("/bin/sh") (which "sh")))
%standard-phases))) #t)))))
(home-page "https://www.gnu.org/software/serveez/") (home-page "https://www.gnu.org/software/serveez/")
(synopsis "Framework for implementing IP-based servers") (synopsis "Framework for implementing IP-based servers")
(description (description

9
gnu/packages/skribilo.scm
View File

@ -46,8 +46,9 @@
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/guile/site/2.0")) "/share/guile/site/2.0"))
#:phases (alist-cons-before #:phases
'configure 'pre-configure (modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Make sure the 'skribilo' command gets to see ;; Make sure the 'skribilo' command gets to see
;; Guile-Reader, even if Guile-Reader is not in the search ;; Guile-Reader, even if Guile-Reader is not in the search
@ -58,8 +59,8 @@
(string-append "exec " things (string-append "exec " things
" -L " reader "/share/guile/site/2.0" " -L " reader "/share/guile/site/2.0"
" -C " reader "/share/guile/site/2.0" " -C " reader "/share/guile/site/2.0"
" -c"))))) " -c"))))
%standard-phases) #t)))
#:parallel-build? #f)) #:parallel-build? #f))

9
gnu/packages/smalltalk.scm
View File

@ -60,14 +60,15 @@
(inputs (inputs
`(("zip" ,zip))) `(("zip" ,zip)))
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases
'configure 'fix-libc (modify-phases %standard-phases
(add-before 'configure 'fix-libc
(lambda _ (lambda _
(let ((libc (assoc-ref %build-inputs "libc"))) (let ((libc (assoc-ref %build-inputs "libc")))
(substitute* "libc.la.in" (substitute* "libc.la.in"
(("@LIBC_SO_NAME@") "libc.so") (("@LIBC_SO_NAME@") "libc.so")
(("@LIBC_SO_DIR@") (string-append libc "/lib"))))) (("@LIBC_SO_DIR@") (string-append libc "/lib"))))
%standard-phases))) #t)))))
(home-page "http://smalltalk.gnu.org/") (home-page "http://smalltalk.gnu.org/")
(synopsis "Smalltalk environment") (synopsis "Smalltalk environment")
(description (description

4
gnu/packages/suckless.scm
View File

@ -154,7 +154,7 @@ optimising the environment for the application in use and the task performed.")
(assoc-ref %build-inputs "freetype") (assoc-ref %build-inputs "freetype")
"/include/freetype2")) "/include/freetype2"))
#:phases #:phases
(alist-delete 'configure %standard-phases))) (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
`(("freetype" ,freetype) `(("freetype" ,freetype)
("libxft" ,libxft) ("libxft" ,libxft)
@ -211,7 +211,7 @@ numbers of user-defined menu items efficiently.")
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags (list "CC=gcc"
(string-append "PREFIX=" %output)) (string-append "PREFIX=" %output))
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
`(("libx11" ,libx11) `(("libx11" ,libx11)
("libxext" ,libxext) ("libxext" ,libxext)

9
gnu/packages/tcl.scm
View File

@ -114,13 +114,14 @@
(string-append "--exec-prefix=" out) (string-append "--exec-prefix=" out)
(string-append "--mandir=" out "/share/man"))) (string-append "--mandir=" out "/share/man")))
#:phases (alist-cons-before #:phases
'configure 'set-path-to-stty (modify-phases %standard-phases
(add-before 'configure 'set-path-to-stty
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
(("STTY_BIN=/bin/stty") (("STTY_BIN=/bin/stty")
(string-append "STTY_BIN=" (which "stty"))))) (string-append "STTY_BIN=" (which "stty"))))
%standard-phases) #t)))
#:test-target "test")) #:test-target "test"))
(home-page "http://expect.nist.gov/") (home-page "http://expect.nist.gov/")

8
gnu/packages/telephony.scm
View File

@ -56,12 +56,12 @@
"0kmgr5w3b1qwzxnsnw94q6rqs0hr8nbv9clf07ca2a2fyypx9kjk")))) "0kmgr5w3b1qwzxnsnw94q6rqs0hr8nbv9clf07ca2a2fyypx9kjk"))))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'pre-configure (add-before 'configure 'pre-configure
(lambda _ (lambda _
(substitute* "src/applog.cpp" (substitute* "src/applog.cpp"
(("^// TODO sc.*") "#include <sys/types.h>\n#include <sys/stat.h>\n"))) (("^// TODO sc.*") "#include <sys/types.h>\n#include <sys/stat.h>\n"))
%standard-phases))) #t)))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "(u)Common C++ framework for threaded applications") (synopsis "(u)Common C++ framework for threaded applications")
(description "GNU Common C++ is an portable, optimized class framework for (description "GNU Common C++ is an portable, optimized class framework for

18
gnu/packages/tex.scm
View File

@ -8,6 +8,7 @@
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -87,6 +88,20 @@
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://tug.org/historic/systems/texlive/2017/" (uri (string-append "ftp://tug.org/historic/systems/texlive/2017/"
"texlive-" version "-source.tar.xz")) "texlive-" version "-source.tar.xz"))
(patches
(list
;; This is required for compatibility with Poppler >= 0.58.
;; See <http://tutex.tug.org/pipermail/tex-k/2017-September/002809.html>
;; and <https://bugs.archlinux.org/task/55720> for some discussion.
(origin
(method url-fetch)
(uri (string-append "https://git.archlinux.org/svntogit/packages.git/plain"
"/trunk/texlive-poppler-0.59.patch?h=packages/texlive-bin"
"&id=ba2de374e2b21ecc4b85cc9777f2f15c4d356c61"))
(file-name "texlive-poppler-compat.patch")
(sha256
(base32
"1c4ikq4kxw48bi3i33bzpabrjvbk01fwjr2lz20gkc9kv8l0bg3n")))))
(sha256 (base32 (sha256 (base32
"1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81")))) "1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -123,6 +138,9 @@
`(#:out-of-source? #t `(#:out-of-source? #t
#:configure-flags #:configure-flags
`("--disable-native-texlive-build" `("--disable-native-texlive-build"
;; XXX: This is needed because recent Poppler requires C++11 or later.
;; Remove after switch to GCC >= 6.
"CXXFLAGS=-std=gnu++11"
"--with-system-cairo" "--with-system-cairo"
"--with-system-freetype2" "--with-system-freetype2"
"--with-system-gd" "--with-system-gd"

15
gnu/packages/textutils.scm
View File

@ -97,15 +97,15 @@ to DOS format and vice versa.")
(native-inputs `(("python" ,python-2))) (native-inputs `(("python" ,python-2)))
(arguments (arguments
'(#:phases '(#:phases
(alist-cons-before (modify-phases %standard-phases
'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
(substitute* "tests/setup.py" (substitute* "tests/setup.py"
(("([[:space:]]*)include_dirs=.*" all space) (("([[:space:]]*)include_dirs=.*" all space)
(string-append all space "library_dirs=['../src/.libs'],\n"))) (string-append all space "library_dirs=['../src/.libs'],\n")))
;; The test extension 'Recode.so' lacks RUNPATH for 'librecode.so'. ;; The test extension 'Recode.so' lacks RUNPATH for 'librecode.so'.
(setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/src/.libs"))) (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/src/.libs"))
%standard-phases))) #t)))))
(home-page "https://github.com/pinard/Recode") (home-page "https://github.com/pinard/Recode")
(synopsis "Text encoding converter") (synopsis "Text encoding converter")
(description "The Recode library converts files between character sets and (description "The Recode library converts files between character sets and
@ -208,10 +208,9 @@ encoding, supporting Unicode version 9.0.0.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (zero? (system* "autoreconf" "-vif"))) (lambda _ (zero? (system* "autoreconf" "-vif")))))))
%standard-phases)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)

6
gnu/packages/time.scm
View File

@ -41,7 +41,8 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
(alist-replace 'configure (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; This old `configure' script doesn't support ;; This old `configure' script doesn't support
;; variables passed as arguments. ;; variables passed as arguments.
@ -49,8 +50,7 @@
(setenv "CONFIG_SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash"))
(zero? (zero?
(system* "./configure" (system* "./configure"
(string-append "--prefix=" out))))) (string-append "--prefix=" out)))))))))
%standard-phases)))
(home-page "https://www.gnu.org/software/time/") (home-page "https://www.gnu.org/software/time/")
(synopsis "Run a command, then display its resource usage") (synopsis "Run a command, then display its resource usage")
(description (description

8
gnu/packages/tor.scm
View File

@ -138,13 +138,13 @@ rejects UDP traffic from the application you're using.")
#:configure-flags (list (string-append "--sysconfdir=" #:configure-flags (list (string-append "--sysconfdir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/etc/privoxy")) "/etc/privoxy"))
#:phases (alist-cons-after #:phases
'unpack 'autoconf (modify-phases %standard-phases
(add-after 'unpack 'autoconf
(lambda _ (lambda _
;; Unfortunately, this is not a tarball produced by ;; Unfortunately, this is not a tarball produced by
;; "make dist". ;; "make dist".
(zero? (system* "autoreconf" "-vfi"))) (zero? (system* "autoreconf" "-vfi")))))
%standard-phases)
#:tests? #f)) #:tests? #f))
(inputs (inputs
`(("w3m" ,w3m) `(("w3m" ,w3m)

8
gnu/packages/uucp.scm
View File

@ -35,8 +35,9 @@
"0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306")))) "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-replace '(#:phases
'configure (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; The old 'configure' script doesn't support the arguments ;; The old 'configure' script doesn't support the arguments
;; that we pass by default. ;; that we pass by default.
@ -45,8 +46,7 @@
(zero? (system* "./configure" (zero? (system* "./configure"
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "--infodir=" out (string-append "--infodir=" out
"/share/info"))))) "/share/info")))))))))
%standard-phases)))
(home-page "https://www.gnu.org/software/uucp/uucp.html") (home-page "https://www.gnu.org/software/uucp/uucp.html")
(synopsis "UUCP protocol implementation") (synopsis "UUCP protocol implementation")
(description (description

21
gnu/packages/video.scm
View File

@ -530,15 +530,19 @@ libebml is a C++ library to read and write EBML files.")
(define-public libva (define-public libva
(package (package
(name "libva") (name "libva")
(version "1.8.2") (version "1.8.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (list
"https://www.freedesktop.org/software/vaapi/releases/libva/libva-" ;; Newer releases are only available on GitHub.
version".tar.bz2")) (string-append "https://github.com/01org/libva/releases/download/"
version "/libva-" version ".tar.bz2")
;; Keep the old URL around for compatibility.
(string-append "https://www.freedesktop.org/software/vaapi/releases/"
"libva/libva-" version "/libva-" version ".tar.bz2")))
(sha256 (sha256
(base32 "1pnfl3q7dzxs26l3jk9xi97gr0qwnaz6dhvf9ifp2yplr3fy7lwy")))) (base32 "16xbk0awl7wp0vy0nyjvxk11spbw25mp8kwd9bmhd6x9xffi5vjn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -1395,11 +1399,10 @@ encapsulated.")
("libtool" ,libtool))) ("libtool" ,libtool)))
(arguments (arguments
'(#:phases '(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vif"))) (zero? (system* "autoreconf" "-vif")))))))))
%standard-phases)))))
(define-public libdvdcss (define-public libdvdcss
(package (package

8
gnu/packages/web-browsers.scm
View File

@ -165,11 +165,11 @@ features including, tables, builtin image display, bookmarks, SSL and more.")
"--enable-nls" "--enable-nls"
"--enable-ipv6")) "--enable-ipv6"))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases (alist-replace #:phases
'install (modify-phases %standard-phases
(replace 'install
(lambda* (#:key (make-flags '()) #:allow-other-keys) (lambda* (#:key (make-flags '()) #:allow-other-keys)
(zero? (apply system* "make" "install-full" make-flags))) (zero? (apply system* "make" "install-full" make-flags)))))))
%standard-phases)))
(synopsis "Text Web Browser") (synopsis "Text Web Browser")
(description (description
"Lynx is a fully-featured World Wide Web (WWW) client for users running "Lynx is a fully-featured World Wide Web (WWW) client for users running

7
gnu/packages/web.scm
View File

@ -775,14 +775,13 @@ used to validate and fix HTML data.")
;; For the log file, etc. ;; For the log file, etc.
"--localstatedir=/var") "--localstatedir=/var")
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'build 'pre-build (add-before 'build 'pre-build
(lambda* (#:key inputs #:allow-other-keys #:rest args) (lambda* (#:key inputs #:allow-other-keys #:rest args)
;; Uncommenting the next two lines may assist in debugging ;; Uncommenting the next two lines may assist in debugging
;; (substitute* "docs/man5/Makefile" (("a2x") "a2x -v")) ;; (substitute* "docs/man5/Makefile" (("a2x") "a2x -v"))
;; (setenv "XML_DEBUG_CATALOG" "1") ;; (setenv "XML_DEBUG_CATALOG" "1")
#t) #t)))))
%standard-phases)))
;; All of the below are used to generate the documentation ;; All of the below are used to generate the documentation
;; (Should they be propagated inputs of asciidoc ??) ;; (Should they be propagated inputs of asciidoc ??)
(native-inputs `(("asciidoc" ,asciidoc))) (native-inputs `(("asciidoc" ,asciidoc)))

12
gnu/packages/wicd.scm
View File

@ -71,8 +71,8 @@
;; we can't easily make setup.py use setuptools. ;; we can't easily make setup.py use setuptools.
#:use-setuptools? #f #:use-setuptools? #f
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'build 'configure (add-before 'build 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(python (assoc-ref inputs "python"))) (python (assoc-ref inputs "python")))
@ -167,9 +167,8 @@
(format #t (format #t
"running ~s with command ~s and parameters ~s~%" "running ~s with command ~s and parameters ~s~%"
"python setup.py" "configure" params) "python setup.py" "configure" params)
(zero? (apply system* "python" "setup.py" "configure" params))))) (zero? (apply system* "python" "setup.py" "configure" params))))))
(alist-cons-after (add-after 'install 'post-install
'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
;; wicd's installer tries to put dhclient.conf.template.default ;; wicd's installer tries to put dhclient.conf.template.default
@ -186,8 +185,7 @@
(name "/share/icons/hicolor/index.theme")) (name "/share/icons/hicolor/index.theme"))
(install-file (string-append hicolor name) (install-file (string-append hicolor name)
(string-append out "/share/icons/hicolor"))) (string-append out "/share/icons/hicolor")))
#t)) #t))))))
%standard-phases))))
(synopsis "Network connection manager") (synopsis "Network connection manager")
(description "Wicd is a network manager that aims to simplify wired and (description "Wicd is a network manager that aims to simplify wired and
wireless networking.") wireless networking.")

2
gnu/packages/wm.scm
View File

@ -115,7 +115,7 @@ nested include statements).")
("xcb-util-keysyms" ,xcb-util-keysyms) ("xcb-util-keysyms" ,xcb-util-keysyms)
("xcb-util-wm" ,xcb-util-wm))) ("xcb-util-wm" ,xcb-util-wm)))
(arguments (arguments
'(#:phases (alist-delete 'configure %standard-phases) '(#:phases (modify-phases %standard-phases (delete 'configure))
#:tests? #f ; no check target #:tests? #f ; no check target
#:make-flags (list "CC=gcc" #:make-flags (list "CC=gcc"
(string-append "PREFIX=" %output)))) (string-append "PREFIX=" %output))))

35
gnu/packages/xdisorg.scm
View File

@ -11,7 +11,7 @@
;;; Copyright © 2015 Florian Paul Schmidt <mista.tapas@gmx.net> ;;; Copyright © 2015 Florian Paul Schmidt <mista.tapas@gmx.net>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
@ -70,7 +70,8 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages bison)) #:use-module (gnu packages bison)
#:use-module (ice-9 match))
;; packages outside the x.org system proper ;; packages outside the x.org system proper
@ -289,7 +290,7 @@ rasterisation.")
(define-public libdrm (define-public libdrm
(package (package
(name "libdrm") (name "libdrm")
(version "2.4.81") (version "2.4.83")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -299,15 +300,30 @@ rasterisation.")
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1bhimr6za2ddisrvrv1qqd7c2a59s7jc954sjycq2w68b8cmrh4c")) "1minzvsyz5hgm6ixpj8ysa6jsv7vm8qc8nx390jxdsk0v9ljd983"))
(patches (search-patches "libdrm-symbol-check.patch")))) (patches (search-patches "libdrm-symbol-check.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:configure-flags
'(,@(match (%current-system)
("armhf-linux"
'("--enable-exynos-experimental-api"
"--enable-omap-experimental-api"
;; XXX: This fails a symbol check on a build machine:
;; <https://hydra.gnu.org/build/2270314/nixlog/4/raw>
;; TODO: Update the list of symbols.
;;"--enable-etnaviv-experimental-api"
"--enable-tegra-experimental-api"
"--enable-freedreno-kgsl"))
("aarch64-linux"
'("--enable-tegra-experimental-api"
"--enable-freedreno-kgsl"))
(_ '())))))
(inputs (inputs
`(("libpciaccess" ,libpciaccess) `(("libpciaccess" ,libpciaccess)))
("libpthread-stubs" ,libpthread-stubs)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(home-page "http://dri.freedesktop.org/wiki/") (home-page "https://dri.freedesktop.org/wiki/")
(synopsis "Direct rendering userspace library") (synopsis "Direct rendering userspace library")
(description "The Direct Rendering Infrastructure, also known as the DRI, (description "The Direct Rendering Infrastructure, also known as the DRI,
is a framework for allowing direct access to graphics hardware under the is a framework for allowing direct access to graphics hardware under the
@ -713,7 +729,7 @@ Guile will work for XBindKeys.")
("xcb-util-keysyms" ,xcb-util-keysyms) ("xcb-util-keysyms" ,xcb-util-keysyms)
("xcb-util-wm" ,xcb-util-wm))) ("xcb-util-wm" ,xcb-util-wm)))
(arguments (arguments
'(#:phases (alist-delete 'configure %standard-phases) '(#:phases (modify-phases %standard-phases (delete 'configure))
#:tests? #f ; no check target #:tests? #f ; no check target
#:make-flags (list "CC=gcc" #:make-flags (list "CC=gcc"
(string-append "PREFIX=" %output)))) (string-append "PREFIX=" %output))))
@ -820,7 +836,8 @@ within a single process.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:phases (alist-delete 'configure %standard-phases) ; no configure script ;; no configure script
#:phases (modify-phases %standard-phases (delete 'configure))
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"MANDIR=/share/man/man1" "MANDIR=/share/man/man1"
"CC=gcc"))) "CC=gcc")))

8
gnu/packages/xfce.scm
View File

@ -114,8 +114,8 @@ Xfce Desktop Environment.")
(arguments (arguments
'(#:phases '(#:phases
;; Run check after install phase to test dbus activation. ;; Run check after install phase to test dbus activation.
(alist-cons-after (modify-phases %standard-phases
'install 'check (add-after 'install 'check
(lambda _ (lambda _
(setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME
;; Run test-suite under a dbus session. ;; Run test-suite under a dbus session.
@ -123,8 +123,8 @@ Xfce Desktop Environment.")
(string-append %output "/share")) (string-append %output "/share"))
;; For the missing '/etc/machine-id'. ;; For the missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0"); (setenv "DBUS_FATAL_WARNINGS" "0");
(zero? (system* "dbus-launch" "make" "check"))) (zero? (system* "dbus-launch" "make" "check"))))
(alist-delete 'check %standard-phases)))) (delete 'check))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("intltool" ,intltool))) ("intltool" ,intltool)))

12
gnu/packages/xfig.scm
View File

@ -159,8 +159,8 @@ selected in various ways. For text, 35 fonts are available.")
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((imake (assoc-ref inputs "imake")) (let ((imake (assoc-ref inputs "imake"))
(out (assoc-ref outputs "out"))) (out (assoc-ref outputs "out")))
@ -191,12 +191,10 @@ selected in various ways. For text, 35 fonts are available.")
(("(MANPATH = )[[:graph:]]*" _ front) (("(MANPATH = )[[:graph:]]*" _ front)
(string-append front out "/share/man")) (string-append front out "/share/man"))
(("(CONFDIR = )([[:graph:]]*)" _ front default) (("(CONFDIR = )([[:graph:]]*)" _ front default)
(string-append front out default))))) (string-append front out default))))))
(alist-cons-after (add-after 'install 'install/doc
'install 'install/doc
(lambda _ (lambda _
(zero? (system* "make" "install.man"))) (zero? (system* "make" "install.man")))))))
%standard-phases))))
(home-page "http://www.xfig.org/") (home-page "http://www.xfig.org/")
(synopsis "Create portable LaTeX figures") (synopsis "Create portable LaTeX figures")
(description (description

7
gnu/packages/xorg.scm
View File

@ -119,8 +119,8 @@
("xproto" ,xproto))) ("xproto" ,xproto)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'install 'install-data (add-after 'install 'install-data
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((cf-files (assoc-ref inputs "xorg-cf-files")) (let ((cf-files (assoc-ref inputs "xorg-cf-files"))
(out (assoc-ref outputs "out")) (out (assoc-ref outputs "out"))
@ -137,8 +137,7 @@
(and (zero? (system* "./configure" (and (zero? (system* "./configure"
(string-append "SHELL=" (which "bash")) (string-append "SHELL=" (which "bash"))
(string-append "--prefix=" out))) (string-append "--prefix=" out)))
(zero? (system* "make" "install")))))) (zero? (system* "make" "install"))))))))))
%standard-phases)))
(home-page "http://www.x.org") (home-page "http://www.x.org")
(synopsis "Source code configuration and build system") (synopsis "Source code configuration and build system")
(description (description