ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'staging'

Browse source
This commit is contained in:
Marius Bakke 2017-10-10 21:44:32 +02:00
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-loongson-workaround.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/cairo-CVE-2016-9082.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/gcr-disable-failing-tests.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-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/gemma-intel-compat.patch \
%D%/packages/patches/geoclue-config.patch \

232
gnu/packages/admin.scm
View file

@ -361,32 +361,31 @@ (define-public mingetty
"05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"))))
(build-system gnu-build-system)
(arguments
`(#:phases (alist-replace 'configure
(lambda* (#:key inputs outputs
#:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man8 (string-append
out "/share/man/man8"))
(sbin (string-append out "/sbin"))
(shadow (assoc-ref inputs "shadow"))
(login (string-append shadow
"/bin/login")))
(substitute* "Makefile"
(("^SBINDIR.*")
(string-append "SBINDIR = " out
"/sbin\n"))
(("^MANDIR.*")
(string-append "MANDIR = " out
"/share/man/man8\n")))
`(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man8 (string-append out "/share/man/man8"))
(sbin (string-append out "/sbin"))
(shadow (assoc-ref inputs "shadow"))
(login (string-append shadow "/bin/login")))
(substitute* "Makefile"
(("^SBINDIR.*")
(string-append "SBINDIR = " out
"/sbin\n"))
(("^MANDIR.*")
(string-append "MANDIR = " out
"/share/man/man8\n")))
;; Pick the right 'login' by default.
(substitute* "mingetty.c"
(("\"/bin/login\"")
(string-append "\"" login "\"")))
;; Pick the right 'login' by default.
(substitute* "mingetty.c"
(("\"/bin/login\"")
(string-append "\"" login "\"")))
(mkdir-p sbin)
(mkdir-p man8)))
%standard-phases)
(mkdir-p sbin)
(mkdir-p man8))
#t)))
#:tests? #f)) ; no tests
(inputs `(("shadow" ,shadow)))
@ -725,25 +724,25 @@ (define-public clusterssh
("perl-x11-protocol" ,perl-x11-protocol)))
(arguments
`(#:phases
(alist-cons-after
'install 'set-load-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Put the perl-tk and perl-x11-protocol modules in the perl inc
;; path for PROG
(let* ((out (assoc-ref outputs "out"))
(prog (string-append out "/bin/cssh"))
(perl-ver ,(package-version perl))
(x11-inc (string-append
(assoc-ref inputs "perl-x11-protocol")
"/lib/perl5/site_perl/" perl-ver))
(tk-inc (string-append
(assoc-ref inputs "perl-tk")
"/lib/perl5/site_perl/" perl-ver
"/x86_64-linux")))
(wrap-program
prog
`("PERL5LIB" ":" prefix (,x11-inc ,tk-inc)))))
%standard-phases)))
(modify-phases %standard-phases
(add-after 'install 'set-load-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Put the perl-tk and perl-x11-protocol modules in the perl inc
;; path for PROG
(let* ((out (assoc-ref outputs "out"))
(prog (string-append out "/bin/cssh"))
(perl-ver ,(package-version perl))
(x11-inc (string-append
(assoc-ref inputs "perl-x11-protocol")
"/lib/perl5/site_perl/" perl-ver))
(tk-inc (string-append
(assoc-ref inputs "perl-tk")
"/lib/perl5/site_perl/" perl-ver
"/x86_64-linux")))
(wrap-program
prog
`("PERL5LIB" ":" prefix (,x11-inc ,tk-inc))))
#t)))))
;; The clusterssh.sourceforge.net address requires login to view
(home-page "https://sourceforge.net/projects/clusterssh/")
(synopsis "Secure concurrent multi-server terminal control")
@ -908,13 +907,14 @@ (define-public wpa-supplicant-minimal
"0l0l5gz3d5j9bqjsbjlfcv4w4jwndllp9fmyai4x9kg6qhs6v4xl"))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-replace
'configure
(lambda* (#:key outputs #:allow-other-keys)
(chdir "wpa_supplicant")
(copy-file "defconfig" ".config")
(let ((port (open-file ".config" "al")))
(display "
'(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(chdir "wpa_supplicant")
(copy-file "defconfig" ".config")
(let ((port (open-file ".config" "al")))
(display "
CONFIG_DEBUG_SYSLOG=y
# Choose GnuTLS (the default is OpenSSL.)
@ -924,26 +924,23 @@ (define-public wpa-supplicant-minimal
CFLAGS += $(shell pkg-config libnl-3.0 --cflags)
CONFIG_LIBNL32=y
CONFIG_READLINE=y\n" port)
(close-port port)))
(close-port port))))
(add-after 'install 'install-man-pages
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man"))
(man5 (string-append man "/man5"))
(man8 (string-append man "/man8")))
(define (copy-man-page target)
(lambda (file)
(install-file file target)))
(alist-cons-after
'install 'install-man-pages
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man"))
(man5 (string-append man "/man5"))
(man8 (string-append man "/man8")))
(define (copy-man-page target)
(lambda (file)
(install-file file target)))
(mkdir-p man5) (mkdir man8)
(for-each (copy-man-page man5)
(find-files "doc/docbook" "\\.5"))
(for-each (copy-man-page man8)
(find-files "doc/docbook" "\\.8"))
#t))
%standard-phases))
(mkdir-p man5) (mkdir man8)
(for-each (copy-man-page man5)
(find-files "doc/docbook" "\\.5"))
(for-each (copy-man-page man8)
(find-files "doc/docbook" "\\.8"))
#t))))
#:make-flags (list "CC=gcc"
(string-append "BINDIR=" (assoc-ref %outputs "out")
@ -980,25 +977,24 @@ (define-public wpa-supplicant
(arguments
(substitute-keyword-arguments (package-arguments wpa-supplicant-minimal)
((#:phases phases)
`(alist-cons-after
'configure 'configure-for-dbus
(lambda _
(let ((port (open-file ".config" "al")))
(display "
`(modify-phases ,phases
(add-after 'configure 'configure-for-dbus
(lambda _
(let ((port (open-file ".config" "al")))
(display "
CONFIG_CTRL_IFACE_DBUS=y
CONFIG_CTRL_IFACE_DBUS_NEW=y
CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port)
(close-port port))
#t)
(alist-cons-after
'install-man-pages 'install-dbus-conf
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(dir (string-append out "/etc/dbus-1/system.d")))
(mkdir-p dir)
(copy-file "dbus/dbus-wpa_supplicant.conf"
(string-append dir "/wpa_supplicant.conf"))))
,phases)))))))
(close-port port))
#t))
(add-after 'install-man-pages 'install-dbus-conf
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(dir (string-append out "/etc/dbus-1/system.d")))
(mkdir-p dir)
(copy-file "dbus/dbus-wpa_supplicant.conf"
(string-append dir "/wpa_supplicant.conf")))
#t))))))))
(define-public wakelan
(package
@ -1014,22 +1010,22 @@ (define-public wakelan
"0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x"))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-replace
'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/bin"))
(mkdir-p (string-append out "/share/man/man1"))
'(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/bin"))
(mkdir-p (string-append out "/share/man/man1"))
;; It's an old configure script that doesn't understand
;; the extra options we pass.
(setenv "CONFIG_SHELL" (which "bash"))
(zero?
(system* "./configure"
(string-append "--prefix=" out)
(string-append "--mandir=" out
"/share/man")))))
%standard-phases)
;; It's an old configure script that doesn't understand
;; the extra options we pass.
(setenv "CONFIG_SHELL" (which "bash"))
(zero?
(system* "./configure"
(string-append "--prefix=" out)
(string-append "--mandir=" out
"/share/man")))))))
#:tests? #f))
(home-page "http://kernel.org") ; really, no home page
(synopsis "Send a wake-on-LAN packet")
@ -1088,7 +1084,7 @@ (define-public acpica
"HOST=_LINUX"
"OPT_CFLAGS=-Wall -fno-strict-aliasing")
#:tests? #f ; no 'check' target.
#:phases (alist-delete 'configure %standard-phases)))
#:phases (modify-phases %standard-phases (delete 'configure))))
(home-page "http://acpica.org/")
(synopsis "Tools for the development and debug of ACPI tables")
(description
@ -1198,7 +1194,7 @@ (define-public tree
(base32 "04kviw799qxly08zb8n5mgxfd96gyis6x69q2qiw86jnh87c4mv9"))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-delete 'configure %standard-phases)
'(#:phases (modify-phases %standard-phases (delete 'configure))
#:tests? #f ; no check target
#:make-flags (let ((out (assoc-ref %outputs "out")))
(list (string-append "prefix=" out)))))
@ -1227,23 +1223,23 @@ (define-public direvent
"#!$SHELL")))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-before
'build 'patch-/bin/sh
(lambda* (#:key inputs #:allow-other-keys)
;; Use the right shell when executing the watcher and
;; user-provided shell commands.
(let ((bash (assoc-ref inputs "bash")))
(substitute* '("src/direvent.c" "src/progman.c")
(("\"/bin/sh\"")
(string-append "\"" bash "/bin/sh\"")))
'(#:phases
(modify-phases %standard-phases
(add-before 'build 'patch-/bin/sh
(lambda* (#:key inputs #:allow-other-keys)
;; Use the right shell when executing the watcher and
;; user-provided shell commands.
(let ((bash (assoc-ref inputs "bash")))
(substitute* '("src/direvent.c" "src/progman.c")
(("\"/bin/sh\"")
(string-append "\"" bash "/bin/sh\"")))
;; Adjust the 'shell.at' test accordingly.
(substitute* "tests/testsuite"
(("SHELL=/bin/sh")
(string-append "SHELL=" bash "/bin/sh")))
;; Adjust the 'shell.at' test accordingly.
(substitute* "tests/testsuite"
(("SHELL=/bin/sh")
(string-append "SHELL=" bash "/bin/sh")))
#t))
%standard-phases)))
#t))))))
(home-page "https://www.gnu.org/software/direvent/")
(synopsis "Daemon to monitor directories for events such as file removal")
(description
@ -1700,7 +1696,7 @@ (define-public dstat
(list (string-append "DESTDIR=" out)
"prefix=/"))
;; no configure script
#:phases (alist-delete 'configure %standard-phases)))
#:phases (modify-phases %standard-phases (delete 'configure))))
(inputs `(("python-2" ,python-2)))
(synopsis "Versatile resource statistics tool")
(description "Dstat is a versatile replacement for @command{vmstat},

31
gnu/packages/algebra.scm
View file

@ -334,22 +334,21 @@ (define-public arb
("mpfr" ,mpfr)))
(arguments
`(#:phases
(alist-replace
'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(flint (assoc-ref inputs "flint"))
(gmp (assoc-ref inputs "gmp"))
(mpfr (assoc-ref inputs "mpfr")))
;; do not pass "--enable-fast-install", which makes the
;; homebrew configure process fail
(zero? (system*
"./configure"
(string-append "--prefix=" out)
(string-append "--with-flint=" flint)
(string-append "--with-gmp=" gmp)
(string-append "--with-mpfr=" mpfr)))))
%standard-phases)))
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(flint (assoc-ref inputs "flint"))
(gmp (assoc-ref inputs "gmp"))
(mpfr (assoc-ref inputs "mpfr")))
;; do not pass "--enable-fast-install", which makes the
;; homebrew configure process fail
(zero? (system*
"./configure"
(string-append "--prefix=" out)
(string-append "--with-flint=" flint)
(string-append "--with-gmp=" gmp)
(string-append "--with-mpfr=" mpfr)))))))))
(synopsis "Arbitrary precision floating-point ball arithmetic")
(description
"Arb is a C library for arbitrary-precision floating-point ball

25
gnu/packages/apr.scm
View file

@ -80,19 +80,18 @@ (define-public apr-util
`(("expat" ,expat)))
(arguments
'(#:phases
(alist-replace
'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(apr (assoc-ref inputs "apr"))
(expat (assoc-ref inputs "expat")))
(setenv "CONFIG_SHELL" (which "bash"))
(zero?
(system* "./configure"
(string-append "--prefix=" out)
(string-append "--with-apr=" apr)
(string-append "--with-expat=" expat)))))
%standard-phases)
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(apr (assoc-ref inputs "apr"))
(expat (assoc-ref inputs "expat")))
(setenv "CONFIG_SHELL" (which "bash"))
(zero?
(system* "./configure"
(string-append "--prefix=" out)
(string-append "--with-apr=" apr)
(string-append "--with-expat=" expat)))))))
;; There are race conditions during 'make check'. Typically, the
;; 'testall' executable is not built yet by the time 'make check' tries

191
gnu/packages/audio.scm
View file

@ -620,23 +620,21 @@ (define-public clalsadrv
`(#:tests? #f ; no "check" target
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(alist-cons-after
'unpack 'patch-makefile-and-enter-directory
(lambda _
(substitute* "libs/Makefile"
(("/sbin/ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs")
#t)
(alist-cons-after
'install
'install-symlink
(lambda _
(symlink "libclalsadrv.so"
(string-append (assoc-ref %outputs "out")
"/lib/libclalsadrv.so.2")))
(modify-phases %standard-phases
(add-after 'unpack 'patch-makefile-and-enter-directory
(lambda _
(substitute* "libs/Makefile"
(("/sbin/ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs")
#t))
(add-after 'install 'install-symlink
(lambda _
(symlink "libclalsadrv.so"
(string-append (assoc-ref %outputs "out")
"/lib/libclalsadrv.so.2"))))
;; no configure script
(alist-delete 'configure %standard-phases)))))
(delete 'configure))))
(inputs
`(("alsa-lib" ,alsa-lib)
("fftw" ,fftw)))
@ -975,11 +973,9 @@ (define-public fluidsynth
(build-system gnu-build-system)
(arguments
`(#:phases
(alist-cons-after
'unpack
'remove-broken-symlinks
(lambda _ (delete-file-recursively "m4") #t)
%standard-phases)))
(modify-phases %standard-phases
(add-after 'unpack 'remove-broken-symlinks
(lambda _ (delete-file-recursively "m4") #t)))))
(inputs
`(("libsndfile" ,libsndfile)
("alsa-lib" ,alsa-lib)
@ -1018,12 +1014,11 @@ (define-public faad2
("unzip" ,unzip)))
(arguments
'(#:phases
(alist-cons-after
'unpack 'bootstrap
(lambda _
(substitute* "bootstrap" (("\r\n") "\n"))
(zero? (system* "sh" "bootstrap")))
%standard-phases)))
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(substitute* "bootstrap" (("\r\n") "\n"))
(zero? (system* "sh" "bootstrap")))))))
(home-page "http://www.audiocoding.com/faad2.html")
(synopsis "MPEG-4 and MPEG-2 AAC decoder")
(description
@ -1677,7 +1672,7 @@ (define-public lv2-mda-piano
"TYPE=mdaPiano"
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #f ; no check target
#:phases (alist-delete 'configure %standard-phases)))
#:phases (modify-phases %standard-phases (delete 'configure))))
(inputs
`(("lv2" ,lv2)
("lvtk" ,lvtk)))
@ -1700,7 +1695,7 @@ (define-public lv2-mda-epiano
"TYPE=mdaEPiano"
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#: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")
(synopsis "LV2 port of the mda EPiano plugin")
(description "An LV2 port of the mda EPiano VSTi.")))
@ -2093,19 +2088,19 @@ (define-public timidity++
(string-append "--with-default-path="
(assoc-ref %outputs "out") "/etc/timidity"))
#:phases
(alist-cons-after
'install 'install-config
(lambda _
(let ((out (string-append (assoc-ref %outputs "out")
"/etc/timidity")))
(mkdir-p out)
(call-with-output-file
(string-append out "/timidity.cfg")
(lambda (port)
(format port (string-append "source "
(assoc-ref %build-inputs "freepats")
"/share/freepats/freepats.cfg"))))))
%standard-phases)))
(modify-phases %standard-phases
(add-after 'install 'install-config
(lambda _
(let ((out (string-append (assoc-ref %outputs "out")
"/etc/timidity")))
(mkdir-p out)
(call-with-output-file
(string-append out "/timidity.cfg")
(lambda (port)
(format port (string-append "source "
(assoc-ref %build-inputs "freepats")
"/share/freepats/freepats.cfg")))))
#t)))))
(inputs
`(("alsa-lib" ,alsa-lib)
("ao" ,ao)
@ -2144,16 +2139,15 @@ (define-public vamp
(arguments
`(#:tests? #f ; no check target
#:phases
(alist-cons-after
'install 'remove-libvamp-hostsdk.la
(lambda* (#:key outputs #:allow-other-keys)
;; https://bugs.launchpad.net/ubuntu/+source/vamp-plugin-sdk/+bug/1253656
(for-each delete-file
(let ((out (assoc-ref outputs "out")))
(list (string-append out "/lib/libvamp-sdk.la")
(string-append out "/lib/libvamp-hostsdk.la"))))
#t)
%standard-phases)))
(modify-phases %standard-phases
(add-after 'install 'remove-libvamp-hostsdk.la
(lambda* (#:key outputs #:allow-other-keys)
;; https://bugs.launchpad.net/ubuntu/+source/vamp-plugin-sdk/+bug/1253656
(for-each delete-file
(let ((out (assoc-ref outputs "out")))
(list (string-append out "/lib/libvamp-sdk.la")
(string-append out "/lib/libvamp-hostsdk.la"))))
#t)))))
(inputs
`(("libsndfile" ,libsndfile)))
(native-inputs
@ -2315,11 +2309,10 @@ (define-public soundtouch
("file" ,file)))
(arguments
'(#:phases
(alist-cons-after
'unpack 'bootstrap
(lambda _
(zero? (system* "sh" "bootstrap")))
%standard-phases)))
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "sh" "bootstrap")))))))
(home-page "http://www.surina.net/soundtouch/")
(synopsis
"Audio processing library for changing tempo, pitch and playback rate")
@ -2453,11 +2446,10 @@ (define-public portaudio
'(#:phases
;; Autoreconf is necessary because the audacity-compat patch modifies
;; .in files.
(alist-cons-after
'unpack 'autoreconf
(lambda _
(zero? (system* "autoreconf" "-vif")))
%standard-phases)
(modify-phases %standard-phases
(add-after 'unpack 'autoreconf
(lambda _
(zero? (system* "autoreconf" "-vif")))))
#:tests? #f)) ;no 'check' target
(home-page "http://www.portaudio.com/")
(synopsis "Audio I/O library")
@ -2521,14 +2513,13 @@ (define-public rsound
("pulseaudio" ,pulseaudio)))
(arguments
'(#:phases
(alist-replace
'configure
(lambda* (#:key outputs #:allow-other-keys)
(setenv "CC" "gcc")
(zero?
(system* "./configure"
(string-append "--prefix=" (assoc-ref outputs "out")))))
%standard-phases)
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(setenv "CC" "gcc")
(zero?
(system* "./configure"
(string-append "--prefix=" (assoc-ref outputs "out")))))))
;; No 'check' target.
#:tests? #f))
(home-page "http://themaister.net/rsound.html")
@ -2595,22 +2586,20 @@ (define-public zita-convolver
`(#:tests? #f ; no "check" target
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(alist-cons-after
'unpack 'patch-makefile-and-enter-directory
(lambda _
(substitute* "libs/Makefile"
(("ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs") #t)
(alist-cons-after
'install
'install-symlink
(lambda _
(symlink "libzita-convolver.so"
(string-append (assoc-ref %outputs "out")
"/lib/libzita-convolver.so.3")))
(modify-phases %standard-phases
(add-after 'unpack 'patch-makefile-and-enter-directory
(lambda _
(substitute* "libs/Makefile"
(("ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs") #t))
(add-after 'install 'install-symlink
(lambda _
(symlink "libzita-convolver.so"
(string-append (assoc-ref %outputs "out")
"/lib/libzita-convolver.so.3"))))
;; no configure script
(alist-delete 'configure %standard-phases)))))
(delete 'configure))))
(inputs `(("fftwf" ,fftwf)))
(home-page "http://kokkinizita.linuxaudio.org")
(synopsis "Fast, partitioned convolution engine library")
@ -2685,23 +2674,21 @@ (define-public zita-alsa-pcmi
`(#:tests? #f ; no "check" target
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(alist-cons-after
'unpack 'patch-makefile-and-enter-directory
(lambda _
(substitute* "libs/Makefile"
(("ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs")
#t)
(alist-cons-after
'install
'install-symlink
(lambda _
(symlink "libzita-alsa-pcmi.so"
(string-append (assoc-ref %outputs "out")
"/lib/libzita-alsa-pcmi.so.0")))
;; no configure script
(alist-delete 'configure %standard-phases)))))
(modify-phases %standard-phases
(add-after 'unpack 'patch-makefile-and-enter-directory
(lambda _
(substitute* "libs/Makefile"
(("ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs")
#t))
(add-after 'install 'install-symlink
(lambda _
(symlink "libzita-alsa-pcmi.so"
(string-append (assoc-ref %outputs "out")
"/lib/libzita-alsa-pcmi.so.0"))))
;; no configure script
(delete 'configure))))
(inputs
`(("alsa-lib" ,alsa-lib)
("fftw" ,fftw)))

34
gnu/packages/backup.scm
View file

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

252
gnu/packages/bioinformatics.scm
View file

@ -369,32 +369,33 @@ (define-public bedops
'(#:tests? #f
#:make-flags (list (string-append "BINDIR=" %output "/bin"))
#:phases
(alist-cons-after
'unpack 'unpack-tarballs
(lambda _
;; FIXME: Bedops includes tarballs of minimally patched upstream
;; libraries jansson, zlib, and bzip2. We cannot just use stock
;; libraries because at least one of the libraries (zlib) is
;; patched to add a C++ function definition (deflateInit2cpp).
;; Until the Bedops developers offer a way to link against system
;; libraries we have to build the in-tree copies of these three
;; libraries.
(modify-phases %standard-phases
(add-after 'unpack 'unpack-tarballs
(lambda _
;; FIXME: Bedops includes tarballs of minimally patched upstream
;; libraries jansson, zlib, and bzip2. We cannot just use stock
;; libraries because at least one of the libraries (zlib) is
;; patched to add a C++ function definition (deflateInit2cpp).
;; Until the Bedops developers offer a way to link against system
;; libraries we have to build the in-tree copies of these three
;; libraries.
;; See upstream discussion:
;; https://github.com/bedops/bedops/issues/124
;; See upstream discussion:
;; https://github.com/bedops/bedops/issues/124
;; Unpack the tarballs to benefit from shebang patching.
(with-directory-excursion "third-party"
(and (zero? (system* "tar" "xvf" "jansson-2.6.tar.bz2"))
(zero? (system* "tar" "xvf" "zlib-1.2.7.tar.bz2"))
(zero? (system* "tar" "xvf" "bzip2-1.0.6.tar.bz2"))))
;; Disable unpacking of tarballs in Makefile.
(substitute* "system.mk/Makefile.linux"
(("^\tbzcat .*") "\t@echo \"not unpacking\"\n")
(("\\./configure") "CONFIG_SHELL=bash ./configure"))
(substitute* "third-party/zlib-1.2.7/Makefile.in"
(("^SHELL=.*$") "SHELL=bash\n")))
(alist-delete 'configure %standard-phases))))
;; Unpack the tarballs to benefit from shebang patching.
(with-directory-excursion "third-party"
(and (zero? (system* "tar" "xvf" "jansson-2.6.tar.bz2"))
(zero? (system* "tar" "xvf" "zlib-1.2.7.tar.bz2"))
(zero? (system* "tar" "xvf" "bzip2-1.0.6.tar.bz2"))))
;; Disable unpacking of tarballs in Makefile.
(substitute* "system.mk/Makefile.linux"
(("^\tbzcat .*") "\t@echo \"not unpacking\"\n")
(("\\./configure") "CONFIG_SHELL=bash ./configure"))
(substitute* "third-party/zlib-1.2.7/Makefile.in"
(("^SHELL=.*$") "SHELL=bash\n"))
#t))
(delete 'configure))))
(home-page "https://github.com/bedops/bedops")
(synopsis "Tools for high-performance genomic feature operations")
(description
@ -1325,20 +1326,21 @@ (define-public bwa
(arguments
'(#:tests? #f ;no "check" target
#:phases
(alist-replace
'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append
(assoc-ref outputs "out") "/bin"))
(doc (string-append
(assoc-ref outputs "out") "/share/doc/bwa"))
(man (string-append
(assoc-ref outputs "out") "/share/man/man1")))
(install-file "bwa" bin)
(install-file "README.md" doc)
(install-file "bwa.1" man)))
;; no "configure" script
(alist-delete 'configure %standard-phases))))
(modify-phases %standard-phases
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append
(assoc-ref outputs "out") "/bin"))
(doc (string-append
(assoc-ref outputs "out") "/share/doc/bwa"))
(man (string-append
(assoc-ref outputs "out") "/share/man/man1")))
(install-file "bwa" bin)
(install-file "README.md" doc)
(install-file "bwa.1" man))
#t))
;; no "configure" script
(delete 'configure))))
(inputs `(("zlib" ,zlib)))
;; Non-portable SSE instructions are used so building fails on platforms
;; other than x86_64.
@ -1815,10 +1817,9 @@ (define-public crossmap
(arguments
`(#:python ,python-2
#:phases
(alist-cons-after
'unpack 'set-env
(lambda _ (setenv "CROSSMAP_USE_SYSTEM_PYSAM" "1"))
%standard-phases)))
(modify-phases %standard-phases
(add-after 'unpack 'set-env
(lambda _ (setenv "CROSSMAP_USE_SYSTEM_PYSAM" "1") #t)))))
(inputs
`(("python-numpy" ,python2-numpy)
("python-pysam" ,python2-pysam)
@ -2365,19 +2366,18 @@ (define-public express
(arguments
`(#:tests? #f ;no "check" target
#:phases
(alist-cons-after
'unpack 'use-shared-boost-libs-and-set-bamtools-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("set\\(Boost_USE_STATIC_LIBS ON\\)")
"set(Boost_USE_STATIC_LIBS OFF)")
(("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/bamtools/include")
(string-append (assoc-ref inputs "bamtools") "/include/bamtools")))
(substitute* "src/CMakeLists.txt"
(("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/\\.\\./bamtools/lib")
(string-append (assoc-ref inputs "bamtools") "/lib/bamtools")))
#t)
%standard-phases)))
(modify-phases %standard-phases
(add-after 'unpack 'use-shared-boost-libs-and-set-bamtools-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("set\\(Boost_USE_STATIC_LIBS ON\\)")
"set(Boost_USE_STATIC_LIBS OFF)")
(("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/bamtools/include")
(string-append (assoc-ref inputs "bamtools") "/include/bamtools")))
(substitute* "src/CMakeLists.txt"
(("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/\\.\\./bamtools/lib")
(string-append (assoc-ref inputs "bamtools") "/lib/bamtools")))
#t)))))
(inputs
`(("boost" ,boost)
("bamtools" ,bamtools)
@ -2544,15 +2544,15 @@ (define-public flexbar
(assoc-ref %outputs "out")
"/bin/"))
#:phases
(alist-replace
'check
(lambda* (#:key outputs #:allow-other-keys)
(setenv "PATH" (string-append
(assoc-ref outputs "out") "/bin:"
(getenv "PATH")))
(chdir "../flexbar_v2.5_src/test")
(zero? (system* "bash" "flexbar_validate.sh")))
(alist-delete 'install %standard-phases))))
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key outputs #:allow-other-keys)
(setenv "PATH" (string-append
(assoc-ref outputs "out") "/bin:"
(getenv "PATH")))
(chdir "../flexbar_v2.5_src/test")
(zero? (system* "bash" "flexbar_validate.sh"))))
(delete 'install))))
(inputs
`(("tbb" ,tbb)
("zlib" ,zlib)))
@ -2788,21 +2788,21 @@ (define-public grit
(arguments
`(#:python ,python-2
#:phases
(alist-cons-after
'unpack 'generate-from-cython-sources
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Delete these C files to force fresh generation from pyx sources.
(delete-file "grit/sparsify_support_fns.c")
(delete-file "grit/call_peaks_support_fns.c")
(substitute* "setup.py"
(("Cython.Setup") "Cython.Build")
;; Add numpy include path to fix compilation
(("pyx\", \\]")
(string-append "pyx\", ], include_dirs = ['"
(assoc-ref inputs "python-numpy")
"/lib/python2.7/site-packages/numpy/core/include/"
"']"))) #t)
%standard-phases)))
(modify-phases %standard-phases
(add-after 'unpack 'generate-from-cython-sources
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Delete these C files to force fresh generation from pyx sources.
(delete-file "grit/sparsify_support_fns.c")
(delete-file "grit/call_peaks_support_fns.c")
(substitute* "setup.py"
(("Cython.Setup") "Cython.Build")
;; Add numpy include path to fix compilation
(("pyx\", \\]")
(string-append "pyx\", ], include_dirs = ['"
(assoc-ref inputs "python-numpy")
"/lib/python2.7/site-packages/numpy/core/include/"
"']")))
#t)))))
(inputs
`(("python-scipy" ,python2-scipy)
("python-numpy" ,python2-numpy)
@ -2845,28 +2845,29 @@ (define-public hisat
'()
'("POPCNT_CAPABILITY=0")))
#:phases
(alist-cons-after
'unpack 'patch-sources
(lambda _
;; XXX Cannot use snippet because zip files are not supported
(substitute* "Makefile"
(("^CC = .*$") "CC = gcc")
(("^CPP = .*$") "CPP = g++")
;; replace BUILD_HOST and BUILD_TIME for deterministic build
(("-DBUILD_HOST=.*") "-DBUILD_HOST=\"\\\"guix\\\"\"")
(("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\""))
(substitute* '("hisat-build" "hisat-inspect")
(("/usr/bin/env") (which "env"))))
(alist-replace
'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
(for-each (lambda (file)
(install-file file bin))
(find-files
"."
"hisat(-(build|align|inspect)(-(s|l)(-debug)*)*)*$"))))
(alist-delete 'configure %standard-phases)))))
(modify-phases %standard-phases
(add-after 'unpack 'patch-sources
(lambda _
;; XXX Cannot use snippet because zip files are not supported
(substitute* "Makefile"
(("^CC = .*$") "CC = gcc")
(("^CPP = .*$") "CPP = g++")
;; replace BUILD_HOST and BUILD_TIME for deterministic build
(("-DBUILD_HOST=.*") "-DBUILD_HOST=\"\\\"guix\\\"\"")
(("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\""))
(substitute* '("hisat-build" "hisat-inspect")
(("/usr/bin/env") (which "env")))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
(for-each (lambda (file)
(install-file file bin))
(find-files
"."
"hisat(-(build|align|inspect)(-(s|l)(-debug)*)*)*$")))
#t))
(delete 'configure))))
(native-inputs
`(("unzip" ,unzip)))
(inputs
@ -4680,23 +4681,21 @@ (define-public ngs-sdk
`(#:parallel-build? #f ; not supported
#:tests? #f ; no "check" target
#:phases
(alist-replace
'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; Allow 'konfigure.perl' to find 'package.prl'.
(setenv "PERL5LIB"
(string-append ".:" (getenv "PERL5LIB")))
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; Allow 'konfigure.perl' to find 'package.prl'.
(setenv "PERL5LIB"
(string-append ".:" (getenv "PERL5LIB")))
;; The 'configure' script doesn't recognize things like
;; '--enable-fast-install'.
(zero? (system* "./configure"
(string-append "--build-prefix=" (getcwd) "/build")
(string-append "--prefix=" out)))))
(alist-cons-after
'unpack 'enter-dir
(lambda _ (chdir "ngs-sdk") #t)
%standard-phases))))
;; The 'configure' script doesn't recognize things like
;; '--enable-fast-install'.
(zero? (system* "./configure"
(string-append "--build-prefix=" (getcwd) "/build")
(string-append "--prefix=" out))))))
(add-after 'unpack 'enter-dir
(lambda _ (chdir "ngs-sdk") #t)))))
(native-inputs `(("perl" ,perl)))
;; According to the test
;; unless ($MARCH =~ /x86_64/i || $MARCH =~ /i?86/i)
@ -5460,17 +5459,16 @@ (define-public subread
"-f" "Makefile.Linux"
"CC=gcc ${CCFLAGS}")
#:phases
(alist-cons-after
'unpack 'enter-dir
(lambda _ (chdir "src") #t)
(alist-replace
'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
(mkdir-p bin)
(copy-recursively "../bin" bin)))
(modify-phases %standard-phases
(add-after 'unpack 'enter-dir
(lambda _ (chdir "src") #t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
(mkdir-p bin)
(copy-recursively "../bin" bin))))
;; no "configure" script
(alist-delete 'configure %standard-phases)))))
(delete 'configure))))
(inputs `(("zlib" ,zlib)))
(home-page "http://bioinf.wehi.edu.au/subread-package/")
(synopsis "Tool kit for processing next-gen sequencing data")

33
gnu/packages/bittorrent.scm
View file

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

2
gnu/packages/cdrom.scm
View file

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

9
gnu/packages/check.scm
View file

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

18
gnu/packages/compression.scm
View file

@ -470,7 +470,7 @@ (define-public lzip
(description
"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
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.")
(license license:gpl3+)))
@ -521,14 +521,14 @@ (define-public sharutils
`(("which" ,which)))
(arguments
`(#:phases
(alist-cons-after
'patch-source-shebangs 'unpatch-source-shebang
;; revert the patch-shebang phase on a script which is
;; in fact test data
(lambda _
(substitute* "tests/shar-1.ok"
(((which "sh")) "/bin/sh")))
%standard-phases)))
(modify-phases %standard-phases
(add-after 'patch-source-shebangs 'unpatch-source-shebang
;; revert the patch-shebang phase on a script which is
;; in fact test data
(lambda _
(substitute* "tests/shar-1.ok"
(((which "sh")) "/bin/sh"))
#t)))))
(home-page "https://www.gnu.org/software/sharutils/")
(synopsis "Archives in shell scripts, uuencode/uudecode")
(description

31
gnu/packages/conky.scm
View file

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

40
gnu/packages/cups.scm
View file

@ -57,7 +57,7 @@ (define ghostscript/cups
(define-public cups-filters
(package
(name "cups-filters")
(version "1.14.1")
(version "1.17.7")
(source(origin
(method url-fetch)
(uri
@ -65,7 +65,7 @@ (define-public cups-filters
"cups-filters-" version ".tar.xz"))
(sha256
(base32
"0175jhqpsyn7bkh7w43ydhyws5zsdak05hr1fsadvzslvwqkffgi"))
"1mg397kgfx0rs9j852f8ppmvaz2al5l75ildbgiqg6j3gwq5jssw"))
(modules '((guix build utils)))
(snippet
;; install backends, banners and filters to cups-filters output
@ -93,6 +93,13 @@ (define-public cups-filters
#:configure-flags
`("--disable-driverless" ; TODO: enable this
"--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="
(assoc-ref %build-inputs "font-dejavu")
"/share/fonts/truetype/DejaVuSans.ttf")
@ -103,7 +110,34 @@ (define-public cups-filters
(assoc-ref %build-inputs "bash")
"/bin/bash")
,(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
`(("glib" ,glib "bin") ; for gdbus-codegen
("pkg-config" ,pkg-config)))

6
gnu/packages/curl.scm
View file

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

106
gnu/packages/databases.scm
View file

@ -157,14 +157,14 @@ (define-public gdbm
(define-public bdb
(package
(name "bdb")
(version "6.2.23")
(version "6.2.32")
(source (origin
(method url-fetch)
(uri (string-append "http://download.oracle.com/berkeley-db/db-"
version ".tar.gz"))
(sha256
(base32
"1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"))))
"1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9"))))
(build-system gnu-build-system)
(outputs '("out" ; programs, libraries, headers
"doc")) ; 94 MiB of HTML docs
@ -172,34 +172,33 @@ (define-public bdb
'(#:tests? #f ; no check target available
#:disallowed-references ("doc")
#:phases
(alist-replace
'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
;; '--docdir' is not honored, so we need to patch.
(substitute* "dist/Makefile.in"
(("docdir[[:blank:]]*=.*")
(string-append "docdir = " doc "/share/doc/bdb")))
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
;; '--docdir' is not honored, so we need to patch.
(substitute* "dist/Makefile.in"
(("docdir[[:blank:]]*=.*")
(string-append "docdir = " doc "/share/doc/bdb")))
(zero?
(system* "./dist/configure"
(string-append "--prefix=" out)
(string-append "CONFIG_SHELL=" (which "bash"))
(string-append "SHELL=" (which "bash"))
(zero?
(system* "./dist/configure"
(string-append "--prefix=" out)
(string-append "CONFIG_SHELL=" (which "bash"))
(string-append "SHELL=" (which "bash"))
;; Remove 7 MiB of .a files.
"--disable-static"
;; Remove 7 MiB of .a files.
"--disable-static"
;; The compatibility mode is needed by some packages,
;; notably iproute2.
"--enable-compat185"
;; The compatibility mode is needed by some packages,
;; notably iproute2.
"--enable-compat185"
;; The following flag is needed so that the inclusion
;; of db_cxx.h into C++ files works; it leads to
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
"--enable-cxx"))))
%standard-phases)))
;; The following flag is needed so that the inclusion
;; of db_cxx.h into C++ files works; it leads to
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
"--enable-cxx"))))))))
(synopsis "Berkeley database")
(description
"Berkeley DB is an embeddable database allowing developers the choice of
@ -227,39 +226,38 @@ (define-public bdb-5.3
`(#:tests? #f ; no check target available
#:disallowed-references ("doc")
#:phases
(alist-replace
'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
;; '--docdir' is not honored, so we need to patch.
(substitute* "dist/Makefile.in"
(("docdir[[:blank:]]*=.*")
(string-append "docdir = " doc "/share/doc/bdb")))
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
;; '--docdir' is not honored, so we need to patch.
(substitute* "dist/Makefile.in"
(("docdir[[:blank:]]*=.*")
(string-append "docdir = " doc "/share/doc/bdb")))
(zero?
(system* "./dist/configure"
(string-append "--prefix=" out)
(string-append "CONFIG_SHELL=" (which "bash"))
(string-append "SHELL=" (which "bash"))
(zero?
(system* "./dist/configure"
(string-append "--prefix=" out)
(string-append "CONFIG_SHELL=" (which "bash"))
(string-append "SHELL=" (which "bash"))
;; Bdb doesn't recognize aarch64 as an architecture.
,@(if (string=? "aarch64-linux" (%current-system))
'("--build=aarch64-unknown-linux-gnu")
'())
;; Bdb doesn't recognize aarch64 as an architecture.
,@(if (string=? "aarch64-linux" (%current-system))
'("--build=aarch64-unknown-linux-gnu")
'())
;; Remove 7 MiB of .a files.
"--disable-static"
;; Remove 7 MiB of .a files.
"--disable-static"
;; The compatibility mode is needed by some packages,
;; notably iproute2.
"--enable-compat185"
;; The compatibility mode is needed by some packages,
;; notably iproute2.
"--enable-compat185"
;; The following flag is needed so that the inclusion
;; of db_cxx.h into C++ files works; it leads to
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
"--enable-cxx"))))
%standard-phases)))))
;; The following flag is needed so that the inclusion
;; of db_cxx.h into C++ files works; it leads to
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
"--enable-cxx"))))))))))
(define-public es-dump-restore
(package

70
gnu/packages/debug.scm
View file

@ -58,23 +58,24 @@ (define-public delta
`(("perl" ,perl)))
(arguments
`(#:phases
(alist-replace
'install
(lambda* (#:key outputs #:allow-other-keys)
;; Makefile contains no install target
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(doc (string-append out "/share/doc/delta-" ,version)))
(begin
(mkdir-p bin)
(mkdir-p doc)
(for-each (lambda (h)
(install-file h doc))
`("License.txt" ,@(find-files "www" ".*\\.html")))
(for-each (lambda (b)
(install-file b bin))
`("delta" "multidelta" "topformflat")))))
(alist-delete 'configure %standard-phases))))
(modify-phases %standard-phases
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
;; Makefile contains no install target
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(doc (string-append out "/share/doc/delta-" ,version)))
(begin
(mkdir-p bin)
(mkdir-p doc)
(for-each (lambda (h)
(install-file h doc))
`("License.txt" ,@(find-files "www" ".*\\.html")))
(for-each (lambda (b)
(install-file b bin))
`("delta" "multidelta" "topformflat"))))
#t))
(delete 'configure))))
(home-page "http://delta.tigris.org/")
(synopsis "Heuristical file minimizer")
(description
@ -114,23 +115,24 @@ (define-public c-reduce
("sys-cpu" ,perl-sys-cpu)
("term-readkey" ,perl-term-readkey)))
(arguments
`(#:phases (alist-cons-after
'install 'set-load-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Tell creduce where to find the perl modules it needs.
(let* ((out (assoc-ref outputs "out"))
(prog (string-append out "/bin/creduce")))
(wrap-program
prog
`("PERL5LIB" ":" prefix
,(map (lambda (p)
(string-append (assoc-ref inputs p)
"/lib/perl5/site_perl/"
,(package-version perl)))
'("term-readkey" "exporter-lite"
"file-which" "getopt-tabular"
"regex-common" "sys-cpu"))))))
%standard-phases)))
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'set-load-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Tell creduce where to find the perl modules it needs.
(let* ((out (assoc-ref outputs "out"))
(prog (string-append out "/bin/creduce")))
(wrap-program
prog
`("PERL5LIB" ":" prefix
,(map (lambda (p)
(string-append (assoc-ref inputs p)
"/lib/perl5/site_perl/"
,(package-version perl)))
'("term-readkey" "exporter-lite"
"file-which" "getopt-tabular"
"regex-common" "sys-cpu")))))
#t)))))
(home-page "http://embed.cs.utah.edu/creduce")
(synopsis "Reducer for interesting code")
(description

23
gnu/packages/display-managers.scm
View file

@ -337,17 +337,18 @@ (define-public slim
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
'(#:phases (alist-cons-before
'configure 'set-new-etc-location
(lambda _
(substitute* "CMakeLists.txt"
(("/etc")
(string-append (assoc-ref %outputs "out") "/etc"))
(("install.*systemd.*")
;; The build system's logic here is: if "Linux", then
;; "systemd". Strip that.
"")))
%standard-phases)
'(#:phases
(modify-phases %standard-phases
(add-before 'configure 'set-new-etc-location
(lambda _
(substitute* "CMakeLists.txt"
(("/etc")
(string-append (assoc-ref %outputs "out") "/etc"))
(("install.*systemd.*")
;; The build system's logic here is: if "Linux", then
;; "systemd". Strip that.
""))
#t)))
#:configure-flags '("-DUSE_PAM=yes"
"-DUSE_CONSOLEKIT=no")
#:tests? #f))

2
gnu/packages/dns.scm
View file

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

74
gnu/packages/emacs.scm
View file

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

43
gnu/packages/engineering.scm
View file

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

48
gnu/packages/firmware.scm
View file

@ -52,31 +52,31 @@ (define-public ath9k-htc-firmware
(patches (search-patches "ath9k-htc-firmware-objcopy.patch"))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-before
'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
(chdir "target_firmware")
'(#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
(chdir "target_firmware")
;; 'configure' is a simple script that runs 'cmake' with
;; the right flags.
(substitute* "configure"
(("^TOOLCHAIN=.*$")
(string-append "TOOLCHAIN="
(assoc-ref inputs "cross-gcc")
"\n"))))
(alist-replace
'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(fw-dir (string-append out "/lib/firmware")))
(mkdir-p fw-dir)
(for-each (lambda (file)
(copy-file file
(string-append fw-dir "/"
(basename file))))
(find-files "." "\\.fw$"))
#t))
%standard-phases))
;; 'configure' is a simple script that runs 'cmake' with
;; the right flags.
(substitute* "configure"
(("^TOOLCHAIN=.*$")
(string-append "TOOLCHAIN="
(assoc-ref inputs "cross-gcc")
"\n")))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(fw-dir (string-append out "/lib/firmware")))
(mkdir-p fw-dir)
(for-each (lambda (file)
(copy-file file
(string-append fw-dir "/"
(basename file))))
(find-files "." "\\.fw$"))
#t))))
#:tests? #f))
;; The firmware is cross-compiled using a "bare bones" compiler (no libc.)

21
gnu/packages/flashing-tools.scm
View file

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

42
gnu/packages/fltk.scm
View file

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

27
gnu/packages/fontutils.scm
View file

@ -325,33 +325,24 @@ (define-public t1lib
(define-public teckit
(package
(name "teckit")
(version "2.5.4")
(version "2.5.7")
(source (origin
;; Downloaded tarballs vary with each download, so we use an
;; svn snapshot. The 2.5.4 release seems to be made in r128,
;; but r132 updates additional files to contain the correct
;; version number (r129 to r131 do not concern TRUNK).
(method svn-fetch)
(uri (svn-reference
(url "https://scripts.sil.org/svn-public/teckit/TRUNK")
(revision 132)))
(file-name (string-append name "-" version))
(method url-fetch)
(uri (string-append
"https://github.com/silnrsi/teckit/releases/download/v"
version "/teckit-" version ".tar.gz"))
(sha256
(base32
"1xqkqgw30pb24snh46srmjs2j4zhz2dfi5pf7znia0k34mrpwivz"))))
"1pbp97vcpj6x4yixx6ww0vsi1rrr99fksxdjafs6gdargzd24cj4"))))
(build-system gnu-build-system)
(inputs `(("zlib" ,zlib)))
(inputs
`(("zlib" ,zlib)
("expat" ,expat)))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("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")
(description
"TECkit is a low-level toolkit intended to be used by other applications

51
gnu/packages/freedesktop.scm
View file

@ -357,26 +357,25 @@ (define-public python-pyxdg
(build-system python-build-system)
(arguments
'(#:phases
(alist-replace
'check
(lambda* (#:key inputs #:allow-other-keys)
(setenv "XDG_DATA_DIRS"
(string-append (assoc-ref inputs "shared-mime-info")
"/share/"))
(substitute* "test/test-icon.py"
(("/usr/share/icons/hicolor/index.theme")
(string-append (assoc-ref inputs "hicolor-icon-theme")
"/share/icons/hicolor/index.theme"))
;; FIXME: This test fails because the theme contains the unknown
;; key "Scale".
(("theme.validate\\(\\)") "#"))
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs #:allow-other-keys)
(setenv "XDG_DATA_DIRS"
(string-append (assoc-ref inputs "shared-mime-info")
"/share/"))
(substitute* "test/test-icon.py"
(("/usr/share/icons/hicolor/index.theme")
(string-append (assoc-ref inputs "hicolor-icon-theme")
"/share/icons/hicolor/index.theme"))
;; FIXME: This test fails because the theme contains the unknown
;; key "Scale".
(("theme.validate\\(\\)") "#"))
;; One test fails with:
;; AssertionError: 'x-apple-ios-png' != 'png'
(substitute* "test/test-mime.py"
(("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#"))
(zero? (system* "nosetests" "-v")))
%standard-phases)))
;; One test fails with:
;; AssertionError: 'x-apple-ios-png' != 'png'
(substitute* "test/test-mime.py"
(("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#"))
(zero? (system* "nosetests" "-v")))))))
(native-inputs
`(("shared-mime-info" ,shared-mime-info) ;for tests
("hicolor-icon-theme" ,hicolor-icon-theme) ;for tests
@ -403,7 +402,19 @@ (define-public wayland
(base32
"0lgywr1m0d79vr4s8aimj8a307nss29hhy68gjpqj7m667055c39"))))
(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
`(("doxygen" ,doxygen)
("graphviz" ,graphviz)

46
gnu/packages/gd.scm
View file

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

5
gnu/packages/gkrellm.scm
View file

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

25
gnu/packages/gl.scm
View file

@ -217,17 +217,19 @@ (define libva-without-mesa
(define-public mesa
(package
(name "mesa")
(version "17.1.4")
(version "17.2.1")
(source
(origin
(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")
(string-append "ftp://ftp.freedesktop.org/pub/mesa/"
version "/mesa-" version ".tar.xz")))
(sha256
(base32
"1bcwxin7nmbnv92xav381b6qxscsx1zzc71ryfvj03cglbkb1wq6"))
"07msr6xismw2jq87irwhz7vygvzj6hi38d71paij9zvwh8bmsf3p"))
(patches
(search-patches "mesa-wayland-egl-symbols-check-mips.patch"
"mesa-skip-disk-cache-test.patch"))))
@ -253,13 +255,14 @@ (define-public mesa
("libxvmc" ,libxvmc)
,@(match (%current-system)
((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)
("presentproto" ,presentproto)
("s2tc" ,s2tc)
("wayland" ,wayland)))
("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)))
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python-2)
@ -267,13 +270,17 @@ (define-public mesa
(arguments
`(#:configure-flags
'(,@(match (%current-system)
((or "armhf-linux" "aarch64-linux")
'("--with-gallium-drivers=freedreno,nouveau,r300,r600,svga,swrast,vc4,virgl"))
("armhf-linux"
;; 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")))
;; Enable various optional features. TODO: opencl requires libclc,
;; 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-opencl"
;; "--enable-omx"
@ -422,7 +429,7 @@ (define-public glew
(("/lib64") "/lib")))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-delete 'configure %standard-phases)
'(#:phases (modify-phases %standard-phases (delete 'configure))
#:make-flags (list (string-append "GLEW_PREFIX="
(assoc-ref %outputs "out"))
(string-append "GLEW_DEST="

39
gnu/packages/glib.scm
View file

@ -67,7 +67,7 @@ (define-module (gnu packages glib)
(define dbus
(package
(name "dbus")
(version "1.10.18")
(version "1.10.22")
(source (origin
(method url-fetch)
(uri (string-append
@ -75,7 +75,7 @@ (define dbus
version ".tar.gz"))
(sha256
(base32
"0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0"))
"15vv9gz5i4f5l7h0d045qz5iyvl89hjk2k83lb4vbizd7qg41cg2"))
(patches (search-patches "dbus-helper-search-path.patch"))))
(build-system gnu-build-system)
(arguments
@ -137,7 +137,7 @@ (define dbus
(define glib
(package
(name "glib")
(version "2.52.2")
(version "2.52.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
@ -145,7 +145,7 @@ (define glib
name "-" version ".tar.xz"))
(sha256
(base32
"1l65kab6jr9zlllgbjcbvrbgah3sdd577fpw4pdb2j195ag5s3ph"))
"0a71wkkhkvad84gm30w13micxxgqqw3sxhybj7nd9z60lwspdvi5"))
(patches (search-patches "glib-tests-timer.patch"))))
(build-system gnu-build-system)
(outputs '("out" ; everything
@ -504,22 +504,23 @@ (define glibmm
"1926b3adx903hzvdp8glblsgjyadzqnwgkj8hg605d4wv98m1n0z"))))
(build-system gnu-build-system)
(arguments
`(#:phases (alist-cons-before
'build 'pre-build
(lambda _
;; This test uses /etc/fstab as an example file to read
;; from; choose a better example.
(substitute* "tests/giomm_simple/main.cc"
(("/etc/fstab")
(string-append (getcwd)
"/tests/giomm_simple/main.cc")))
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'pre-build
(lambda _
;; This test uses /etc/fstab as an example file to read
;; from; choose a better example.
(substitute* "tests/giomm_simple/main.cc"
(("/etc/fstab")
(string-append (getcwd)
"/tests/giomm_simple/main.cc")))
;; This test does a DNS lookup, and then expects to be able
;; to open a TLS session; just skip it.
(substitute* "tests/giomm_tls_client/main.cc"
(("Gio::init.*$")
"return 77;\n")))
%standard-phases)))
;; This test does a DNS lookup, and then expects to be able
;; to open a TLS session; just skip it.
(substitute* "tests/giomm_tls_client/main.cc"
(("Gio::init.*$")
"return 77;\n"))
#t)))))
(native-inputs `(("pkg-config" ,pkg-config)
("glib" ,glib "bin")))
(propagated-inputs

147
gnu/packages/gnome.scm
View file

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

17
gnu/packages/gprolog.scm
View file

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

19
gnu/packages/gps.scm
View file

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

13
gnu/packages/graphics.scm
View file

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

70
gnu/packages/graphviz.scm
View file

@ -44,51 +44,41 @@ (define-module (gnu packages graphviz)
(define-public graphviz
(package
(name "graphviz")
(version "2.38.0")
(version "2.40.1")
(source (origin
(method url-fetch)
(uri (string-append
"http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-"
version ".tar.gz"))
(sha256
(base32
"17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1"))))
(method url-fetch)
(uri (string-append
"http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-"
version ".tar.gz"))
(sha256
(base32
"08d4ygkxz2f553bxj6087da56a23kx1khv0j8ycxa102vvx1hlna"))))
(build-system gnu-build-system)
(arguments
;; FIXME: rtest/rtest.sh is a ksh script (!). Add ksh as an input.
'(#:tests? #f
#:phases (alist-cons-before
'build 'pre-build
(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)
(let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
(mkdir-p (string-append doc "/share/graphviz"))
(rename-file (string-append out "/share/graphviz/doc")
(string-append doc "/share/graphviz/doc"))
#t))
(alist-cons-after
'move-docs 'move-guile-bindings
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))
(extdir (string-append lib
"/guile/2.0/extensions")))
(mkdir-p extdir)
(rename-file (string-append
lib "/graphviz/guile/libgv_guile.so")
(string-append extdir
"/libgv_guile.so"))))
%standard-phases)))))
#:phases
(modify-phases %standard-phases
(add-after 'install 'move-docs
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
(mkdir-p (string-append doc "/share/graphviz"))
(rename-file (string-append out "/share/graphviz/doc")
(string-append doc "/share/graphviz/doc"))
#t)))
(add-after 'move-docs 'move-guile-bindings
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))
(extdir (string-append lib
"/guile/2.0/extensions")))
(mkdir-p extdir)
(rename-file (string-append
lib "/graphviz/guile/libgv_guile.so")
(string-append extdir
"/libgv_guile.so"))
#t))))))
(inputs
`(("libXrender" ,libxrender)
("libX11" ,libx11)

123
gnu/packages/gtk.scm
View file

@ -105,14 +105,14 @@ (define-public atk
(define-public cairo
(package
(name "cairo")
(version "1.14.8")
(version "1.14.10")
(source (origin
(method url-fetch)
(uri (string-append "https://cairographics.org/releases/cairo-"
version ".tar.xz"))
(sha256
(base32
"082ypjlh03ss5616amgjp9ap3xwwccyh2knyyrj1a4d4x65dkwni"))
"02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy"))
(patches (search-patches "cairo-CVE-2016-9082.patch"))))
(build-system gnu-build-system)
(propagated-inputs
@ -171,7 +171,7 @@ (define-public cairo-xcb
(define-public harfbuzz
(package
(name "harfbuzz")
(version "1.4.6")
(version "1.5.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.freedesktop.org/software/"
@ -179,7 +179,7 @@ (define-public harfbuzz
version ".tar.bz2"))
(sha256
(base32
"14yj514yfy373np3gxk930a443j1zgnwg6mm0kdzzjr0rn0qp9r1"))))
"0lbwzif7ndvx1iqzp7wxv6j3ilal6di2vj33cy3bha97mpyqv0sn"))))
(build-system gnu-build-system)
(outputs '("out"
"bin")) ; 160K, only hb-view depend on cairo
@ -209,7 +209,7 @@ (define-public harfbuzz
(define-public pango
(package
(name "pango")
(version "1.40.6")
(version "1.40.12")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/"
@ -217,7 +217,7 @@ (define-public pango
name "-" version ".tar.xz"))
(sha256
(base32
"0wz5b5knpw4gfvz3ny8l6h2ca3bpqqyh55mffkyzgsd1hdrjn5fa"))))
"1z0w2vrx3qh3aryfkbfijkcxxr3yjbxc2l4b0yy8rcp2wjlakwbm"))))
(build-system gnu-build-system)
(propagated-inputs
`(("cairo" ,cairo)
@ -279,16 +279,17 @@ (define-public ganv
"0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l"))))
(build-system waf-build-system)
(arguments
`(#:phases (alist-cons-before
'configure 'set-flags
(lambda* (#:key outputs #:allow-other-keys)
;; Compile with C++11, required by gtkmm.
(setenv "CXXFLAGS" "-std=c++11")
;; Allow 'bin/ganv_bench' to find libganv-1.so.
(setenv "LDFLAGS"
(string-append "-Wl,-rpath="
(assoc-ref outputs "out") "/lib")))
%standard-phases)
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'set-flags
(lambda* (#:key outputs #:allow-other-keys)
;; Compile with C++11, required by gtkmm.
(setenv "CXXFLAGS" "-std=c++11")
;; Allow 'bin/ganv_bench' to find libganv-1.so.
(setenv "LDFLAGS"
(string-append "-Wl,-rpath="
(assoc-ref outputs "out") "/lib"))
#t)))
#:tests? #f)) ; no check target
(inputs
`(("gtk" ,gtk+-2)
@ -349,24 +350,24 @@ (define-public gtksourceview-2
`(#:phases
;; Unfortunately, some of the tests in "make check" are highly dependent
;; on the environment therefore, some black magic is required.
(alist-cons-before
'check 'start-xserver
(lambda* (#:key inputs #:allow-other-keys)
(let ((xorg-server (assoc-ref inputs "xorg-server"))
(mime (assoc-ref inputs "shared-mime-info")))
(modify-phases %standard-phases
(add-before 'check 'start-xserver
(lambda* (#:key inputs #:allow-other-keys)
(let ((xorg-server (assoc-ref inputs "xorg-server"))
(mime (assoc-ref inputs "shared-mime-info")))
;; There must be a running X server and make check doesn't start one.
;; Therefore we must do it.
(system (format #f "~a/bin/Xvfb :1 &" xorg-server))
(setenv "DISPLAY" ":1")
;; There must be a running X server and make check doesn't start one.
;; Therefore we must do it.
(system (format #f "~a/bin/Xvfb :1 &" xorg-server))
(setenv "DISPLAY" ":1")
;; The .lang files must be found in $XDG_DATA_HOME/gtksourceview-2.0
(system "ln -s gtksourceview gtksourceview-2.0")
(setenv "XDG_DATA_HOME" (getcwd))
;; The .lang files must be found in $XDG_DATA_HOME/gtksourceview-2.0
(system "ln -s gtksourceview gtksourceview-2.0")
(setenv "XDG_DATA_HOME" (getcwd))
;; Finally, the mimetypes must be available.
(setenv "XDG_DATA_DIRS" (string-append mime "/share/")) ))
%standard-phases)))
;; Finally, the mimetypes must be available.
(setenv "XDG_DATA_DIRS" (string-append mime "/share/")))
#t)))))
(synopsis "Widget that extends the standard GTK+ 2.x 'GtkTextView' widget")
(description
"GtkSourceView is a portable C library that extends the standard GTK+
@ -427,8 +428,7 @@ (define-public gtksourceview
(define-public gdk-pixbuf
(package
(name "gdk-pixbuf")
(replacement gdk-pixbuf-2.36.10)
(version "2.36.6")
(version "2.36.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -436,8 +436,7 @@ (define-public gdk-pixbuf
name "-" version ".tar.xz"))
(sha256
(base32
"034279k49ydawnagqd7b1rz741n20k4y3grybzwp26zd146bjpj5"))
(patches (search-patches "gdk-pixbuf-list-dir.patch"))))
"1klsjkdbashd8yb8xjsc9ff3bz32n2id5s79nrrmqiw9df4zmxpq"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--with-x11")
@ -484,7 +483,6 @@ (define-public gdk-pixbuf
(define-public gdk-pixbuf+svg
(package (inherit gdk-pixbuf)
(name "gdk-pixbuf+svg")
(replacement gdk-pixbuf+svg-2.36.10)
(inputs
`(("librsvg" ,librsvg)
,@(package-inputs gdk-pixbuf)))
@ -508,26 +506,6 @@ (define-public gdk-pixbuf+svg
(synopsis
"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
(package
(name "at-spi2-core")
@ -676,7 +654,7 @@ (define-public gtk+
(name "gtk+")
;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in
;; mate.scm will also need to be updated.
(version "3.22.15")
(version "3.22.21")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -684,7 +662,7 @@ (define-public gtk+
name "-" version ".tar.xz"))
(sha256
(base32
"1nqgb71vx222g9fd2p017948hqybnyi69xs3n2d64clim7115868"))
"11vb1shgr4rlayfk0b858gz986jsn2mpjlxvr89b2kgvbjlc3lqv"))
(patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
(outputs '("out" "bin" "doc"))
@ -898,18 +876,19 @@ (define-public guile-present
"godir = $(moddir)\n")))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-after
'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(guile (assoc-ref inputs "guile")))
(substitute* (find-files bin ".*")
(("guile")
(string-append guile "/bin/guile -L "
out "/share/guile/site/2.0 -C "
out "/share/guile/site/2.0 ")))))
%standard-phases)))
'(#:phases
(modify-phases %standard-phases
(add-after 'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(guile (assoc-ref inputs "guile")))
(substitute* (find-files bin ".*")
(("guile")
(string-append guile "/bin/guile -L "
out "/share/guile/site/2.0 -C "
out "/share/guile/site/2.0 "))))
#t)))))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.2)))
(propagated-inputs
@ -1183,7 +1162,7 @@ (define-public python2-pycairo
`(#:python ,python-2
,@(substitute-keyword-arguments (package-arguments python-pycairo)
((#:phases phases)
`(alist-delete 'patch-waf ,phases))
`(modify-phases ,phases (delete 'patch-waf)))
((#:native-inputs native-inputs)
`(alist-delete "python-waf" ,native-inputs)))))
;; Dual-licensed under LGPL 2.1 or Mozilla Public License 1.1
@ -1277,7 +1256,7 @@ (define-public girara
#:test-target "test"
#:tests? #f ; Tests fail with "Gtk cannot open display:"
#:phases
(alist-delete 'configure %standard-phases)))
(modify-phases %standard-phases (delete 'configure))))
(build-system gnu-build-system)
(home-page "https://pwmt.org/projects/girara/")
(synopsis "Library for minimalistic gtk+3 user interfaces")

81
gnu/packages/guile-wm.scm
View file

@ -83,50 +83,51 @@ (define-public guile-wm
#:configure-flags (list (string-append "--datadir="
(assoc-ref %outputs "out")
"/share/guile/site/2.0"))
#:phases (alist-cons-before
'configure 'set-go-directory
(lambda* (#:key outputs #:allow-other-keys)
;; Install .go files to $out/share/guile/site/2.0.
(let ((out (assoc-ref outputs "out")))
(substitute* "module/Makefile.in"
(("^wmdir = .*$")
(string-append "wmdir = " out
"/share/guile/site/2.0\n")))))
(alist-cons-after
'install 'set-load-path
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Put Guile-XCB's and Guile-WM's modules in the
;; search path of PROG.
(let* ((out (assoc-ref outputs "out"))
(prog (string-append out "/bin/guile-wm"))
(mods (string-append
out "/share/guile/site/2.0"))
(xcb (string-append
(assoc-ref inputs "guile-xcb")
"/share/guile/site/2.0")))
(wrap-program
prog
`("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,mods ,xcb)))))
(alist-cons-after
'install 'install-xsession
(lambda* (#:key outputs #:allow-other-keys)
;; add a .desktop file to xsessions
(let ((xsessions (string-append
%output "/share/xsessions")))
(mkdir-p xsessions)
(call-with-output-file (string-append
xsessions "/guile-wm.desktop")
(lambda (port)
(format port
"[Desktop Entry]~@
#:phases
(modify-phases %standard-phases
(add-before 'configure 'set-go-directory
(lambda* (#:key outputs #:allow-other-keys)
;; Install .go files to $out/share/guile/site/2.0.
(let ((out (assoc-ref outputs "out")))
(substitute* "module/Makefile.in"
(("^wmdir = .*$")
(string-append "wmdir = " out
"/share/guile/site/2.0\n"))))
#t))
(add-after 'install 'set-load-path
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Put Guile-XCB's and Guile-WM's modules in the
;; search path of PROG.
(let* ((out (assoc-ref outputs "out"))
(prog (string-append out "/bin/guile-wm"))
(mods (string-append
out "/share/guile/site/2.0"))
(xcb (string-append
(assoc-ref inputs "guile-xcb")
"/share/guile/site/2.0")))
(wrap-program
prog
`("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,mods ,xcb))))
#t))
(add-after 'install 'install-xsession
(lambda* (#:key outputs #:allow-other-keys)
;; add a .desktop file to xsessions
(let ((xsessions (string-append
%output "/share/xsessions")))
(mkdir-p xsessions)
(call-with-output-file (string-append
xsessions "/guile-wm.desktop")
(lambda (port)
(format port
"[Desktop Entry]~@
Name=~a~@
Comment=~a~@
Exec=~a/bin/guile-wm~@
Type=Application~%"
,name ,synopsis %output)))))
%standard-phases)))))
,name ,synopsis %output))))
#t)))))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.0)
("guile-xcb" ,guile-xcb)))

34
gnu/packages/guile.scm
View file

@ -95,24 +95,24 @@ (define-public guile-1.8
(arguments '(#:configure-flags '("--disable-error-on-warning")
;; Insert a phase before `configure' to patch things up.
#:phases (alist-cons-before
'configure
'patch-stuff
(lambda* (#:key outputs #:allow-other-keys)
;; Add a call to `lt_dladdsearchdir' so that
;; `libguile-readline.so' & co. are in the
;; loader's search path.
(substitute* "libguile/dynl.c"
(("lt_dlinit.*$" match)
(format #f
" ~a~% lt_dladdsearchdir(\"~a/lib\");~%"
match
(assoc-ref outputs "out"))))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-stuff
(lambda* (#:key outputs #:allow-other-keys)
;; Add a call to `lt_dladdsearchdir' so that
;; `libguile-readline.so' & co. are in the
;; loader's search path.
(substitute* "libguile/dynl.c"
(("lt_dlinit.*$" match)
(format #f
" ~a~% lt_dladdsearchdir(\"~a/lib\");~%"
match
(assoc-ref outputs "out"))))
;; The usual /bin/sh...
(substitute* "ice-9/popen.scm"
(("/bin/sh") (which "sh"))))
%standard-phases)))
;; The usual /bin/sh...
(substitute* "ice-9/popen.scm"
(("/bin/sh") (which "sh")))
#t)))))
(inputs `(("gawk" ,gawk)
("readline" ,readline)))

61
gnu/packages/hugs.scm
View file

@ -39,36 +39,37 @@ (define-public hugs
"1mdy4aq4campgmnpc2qwq7bsbfhaxfsqdghbyyz2wms4lnfcmyma"))))
(build-system gnu-build-system)
(arguments
`(#:phases (alist-cons-before
'configure 'fix-sh-n-cp
(lambda _
(substitute*
'("configure"
"libraries/configure"
"packages/time/configure"
"packages/base/configure"
"packages/X11/configure"
"packages/HGL/configure"
"packages/OpenAL/configure"
"packages/OpenGL/configure"
"packages/network/configure"
"packages/unix/configure"
"packages/Cabal/tests/HSQL/configure"
"packages/ALUT/configure"
"packages/GLUT/configure"
"packages/base/cbits/execvpe.c"
"packages/base/System/Process/Internals.hs"
"packages/Cabal/Distribution/attic"
"packages/Cabal/Distribution/Simple/Register.hs"
"packages/Cabal/Distribution/Simple/Hugs.hs"
"tools/hugs-hc"
"src/machdep.c"
"libraries/Makefile.in")
(("/bin/sh") (which "sh")))
(substitute* '("demos/Makefile.in"
"libraries/Makefile.in")
(("/bin/cp") (which "cp"))))
%standard-phases)
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-sh-n-cp
(lambda _
(substitute*
'("configure"
"libraries/configure"
"packages/time/configure"
"packages/base/configure"
"packages/X11/configure"
"packages/HGL/configure"
"packages/OpenAL/configure"
"packages/OpenGL/configure"
"packages/network/configure"
"packages/unix/configure"
"packages/Cabal/tests/HSQL/configure"
"packages/ALUT/configure"
"packages/GLUT/configure"
"packages/base/cbits/execvpe.c"
"packages/base/System/Process/Internals.hs"
"packages/Cabal/Distribution/attic"
"packages/Cabal/Distribution/Simple/Register.hs"
"packages/Cabal/Distribution/Simple/Hugs.hs"
"tools/hugs-hc"
"src/machdep.c"
"libraries/Makefile.in")
(("/bin/sh") (which "sh")))
(substitute* '("demos/Makefile.in"
"libraries/Makefile.in")
(("/bin/cp") (which "cp")))
#t)))
#:tests? #f)) ; no test target
;; FIXME: Fails to build with GCC 5.
(native-inputs `(("gcc" ,gcc-4.9)))

60
gnu/packages/hurd.scm
View file

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

13
gnu/packages/image-viewers.scm
View file

@ -65,10 +65,10 @@ (define-public feh
"0azgpr4al2pi4858z4xh4lfz84cvzxw3n426fn7rz6cdj34q212j"))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-delete 'configure %standard-phases)
#:tests? #f ;FIXME: Requires 'perl-test-command'.
#:make-flags
(list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")))))
'(#:phases (modify-phases %standard-phases (delete 'configure))
#:tests? #f ;FIXME: Requires 'perl-test-command'.
#:make-flags
(list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")))))
(inputs `(("imlib2" ,imlib2)
("curl" ,curl)
("libpng" ,libpng)
@ -178,9 +178,8 @@ (define-public sxiv
'(#:tests? #f ; no check target
#:make-flags (list (string-append "PREFIX=" %output)
"CC=gcc")
#:phases (alist-delete
'configure ; no configure phase
%standard-phases)))
;; no configure phase
#:phases (modify-phases %standard-phases (delete 'configure))))
(inputs
`(("libx11" ,libx11)
("imlib2" ,imlib2)

11
gnu/packages/inkscape.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2014, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -50,6 +51,16 @@ (define-public inkscape
(uri (string-append "https://media.inkscape.org/dl/"
"resources/file/"
"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
(base32
"01chr3vh728dkg7l7lilwgmh5nrp784khdhjgpqjbq9dh2zhax15"))))

18
gnu/packages/libcanberra.scm
View file

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

9
gnu/packages/libevent.scm
View file

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

283
gnu/packages/linux.scm
View file

@ -511,7 +511,7 @@ (define-public psmisc
(define-public util-linux
(package
(name "util-linux")
(version "2.30")
(version "2.30.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/utils/"
@ -519,7 +519,7 @@ (define-public util-linux
name "-" version ".tar.xz"))
(sha256
(base32
"13d0ax8bcapga8phj2nclx86w57ddqxbr98ajibpzjq6d7zs8262"))
"0hdq2fz405a89fyha4bgwg0rx8b65inxq17w8fg8qhmcj4x3dr0v"))
(patches (search-patches "util-linux-tests.patch"))
(modules '((guix build utils)))
(snippet
@ -1434,22 +1434,22 @@ (define-public bridge-utils
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)))
(arguments
'(#:phases (alist-cons-after
'unpack 'bootstrap
(lambda _
;; Fix "field ‘ip6’ has incomplete type" errors.
(substitute* "libbridge/libbridge.h"
(("#include <linux/if_bridge.h>")
"#include <linux/in6.h>\n#include <linux/if_bridge.h>"))
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
;; Fix "field ‘ip6’ has incomplete type" errors.
(substitute* "libbridge/libbridge.h"
(("#include <linux/if_bridge.h>")
"#include <linux/in6.h>\n#include <linux/if_bridge.h>"))
;; Ensure that the entire build fails if one of the
;; sub-Makefiles fails.
(substitute* "Makefile.in"
(("\\$\\(MAKE\\) \\$\\(MFLAGS\\) -C \\$\\$x ;")
"$(MAKE) $(MFLAGS) -C $$x || exit 1;"))
;; Ensure that the entire build fails if one of the
;; sub-Makefiles fails.
(substitute* "Makefile.in"
(("\\$\\(MAKE\\) \\$\\(MFLAGS\\) -C \\$\\$x ;")
"$(MAKE) $(MFLAGS) -C $$x || exit 1;"))
(zero? (system* "autoreconf" "-vf")))
%standard-phases)
(zero? (system* "autoreconf" "-vf")))))
#:tests? #f)) ; no 'check' target
(home-page
@ -1554,7 +1554,7 @@ (define-public iw
(arguments
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc")
#:phases (alist-delete 'configure %standard-phases)))
#:phases (modify-phases %standard-phases (delete 'configure))))
(home-page "https://wireless.wiki.kernel.org/")
(synopsis "Tool for configuring wireless devices")
(description
@ -1687,27 +1687,28 @@ (define-public fuse
(string-append "UDEV_RULES_PATH="
(assoc-ref %outputs "out")
"/lib/udev/rules.d"))
#:phases (alist-cons-before
'build 'set-file-names
(lambda* (#:key inputs #:allow-other-keys)
;; libfuse calls out to mount(8) and umount(8). Make sure
;; it refers to the right ones.
(substitute* '("lib/mount_util.c" "util/mount_util.c")
(("/bin/(u?)mount" _ maybe-u)
(string-append (assoc-ref inputs "util-linux")
"/bin/" maybe-u "mount")))
(substitute* '("util/mount.fuse.c")
(("/bin/sh")
(which "sh")))
#:phases
(modify-phases %standard-phases
(add-before 'build 'set-file-names
(lambda* (#:key inputs #:allow-other-keys)
;; libfuse calls out to mount(8) and umount(8). Make sure
;; it refers to the right ones.
(substitute* '("lib/mount_util.c" "util/mount_util.c")
(("/bin/(u?)mount" _ maybe-u)
(string-append (assoc-ref inputs "util-linux")
"/bin/" maybe-u "mount")))
(substitute* '("util/mount.fuse.c")
(("/bin/sh")
(which "sh")))
;; This hack leads libfuse to search for 'fusermount' in
;; $PATH, where it may find a setuid-root binary, instead of
;; trying solely $out/sbin/fusermount and failing because
;; it's not setuid.
(substitute* "lib/Makefile"
(("-DFUSERMOUNT_DIR=[[:graph:]]+")
"-DFUSERMOUNT_DIR=\\\"/var/empty\\\"")))
%standard-phases)))
;; This hack leads libfuse to search for 'fusermount' in
;; $PATH, where it may find a setuid-root binary, instead of
;; trying solely $out/sbin/fusermount and failing because
;; it's not setuid.
(substitute* "lib/Makefile"
(("-DFUSERMOUNT_DIR=[[:graph:]]+")
"-DFUSERMOUNT_DIR=\\\"/var/empty\\\""))
#t)))))
(home-page "https://github.com/libfuse/libfuse")
(synopsis "Support file systems implemented in user space")
(description
@ -1785,20 +1786,20 @@ (define-public unionfs-fuse/static
(arguments
'(#:tests? #f
#:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-static")
#:phases (alist-cons-after
'install 'post-install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(exe (string-append out "/bin/unionfs")))
;; By default, 'unionfs' keeps references to
;; $glibc/share/locale and similar stuff. Remove them.
(remove-store-references exe)
#:phases
(modify-phases %standard-phases
(add-after 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(exe (string-append out "/bin/unionfs")))
;; By default, 'unionfs' keeps references to
;; $glibc/share/locale and similar stuff. Remove them.
(remove-store-references exe)
;; 'unionfsctl' has references to glibc as well. Since
;; we don't need it, remove it.
(delete-file (string-append out "/bin/unionfsctl"))
#t))
%standard-phases)))
;; 'unionfsctl' has references to glibc as well. Since
;; we don't need it, remove it.
(delete-file (string-append out "/bin/unionfsctl"))
#t))))))
(inputs `(("fuse" ,fuse-static)))))
(define-public sshfs-fuse
@ -2378,43 +2379,42 @@ (define-public lm-sensors
(string-append "MANDIR=" %output "/share/man")
(string-append "LIBDIR=" (assoc-ref %outputs "lib") "/lib"))
#:phases
(alist-delete
'configure
(alist-cons-before
'build 'patch-exec-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "prog/detect/sensors-detect"
(("`uname")
(string-append "`" (assoc-ref inputs "coreutils")
"/bin/uname"))
(("(`|\")modprobe" all open-quote)
(string-append open-quote
(assoc-ref inputs "kmod")
"/bin/modprobe")))
(substitute* '("prog/pwm/pwmconfig"
"prog/pwm/fancontrol")
(("gnuplot")
(string-append (assoc-ref inputs "gnuplot")
"/bin/gnuplot"))
(("cat ")
(string-append (assoc-ref inputs "coreutils")
"/bin/cat "))
(("egrep ")
(string-append (assoc-ref inputs "grep")
"/bin/egrep "))
(("sed -e")
(string-append (assoc-ref inputs "sed")
"/bin/sed -e"))
(("cut -d")
(string-append (assoc-ref inputs "coreutils")
"/bin/cut -d"))
(("sleep ")
(string-append (assoc-ref inputs "coreutils")
"/bin/sleep "))
(("readlink -f")
(string-append (assoc-ref inputs "coreutils")
"/bin/readlink -f"))))
%standard-phases))))
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'patch-exec-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "prog/detect/sensors-detect"
(("`uname")
(string-append "`" (assoc-ref inputs "coreutils")
"/bin/uname"))
(("(`|\")modprobe" all open-quote)
(string-append open-quote
(assoc-ref inputs "kmod")
"/bin/modprobe")))
(substitute* '("prog/pwm/pwmconfig"
"prog/pwm/fancontrol")
(("gnuplot")
(string-append (assoc-ref inputs "gnuplot")
"/bin/gnuplot"))
(("cat ")
(string-append (assoc-ref inputs "coreutils")
"/bin/cat "))
(("egrep ")
(string-append (assoc-ref inputs "grep")
"/bin/egrep "))
(("sed -e")
(string-append (assoc-ref inputs "sed")
"/bin/sed -e"))
(("cut -d")
(string-append (assoc-ref inputs "coreutils")
"/bin/cut -d"))
(("sleep ")
(string-append (assoc-ref inputs "coreutils")
"/bin/sleep "))
(("readlink -f")
(string-append (assoc-ref inputs "coreutils")
"/bin/readlink -f")))
#t)))))
(home-page "http://jdelvare.nerim.net/devel.html#lmsensors")
(synopsis "Utilities to read temperature/voltage/fan sensors")
(description
@ -2441,7 +2441,7 @@ (define-public i2c-tools
#:make-flags (list (string-append "prefix=" %output)
"CC=gcc")
;; no configure script
#:phases (alist-delete 'configure %standard-phases)))
#:phases (modify-phases %standard-phases (delete 'configure))))
(inputs
`(("perl" ,perl)))
(home-page "http://jdelvare.nerim.net/devel.html#i2ctools")
@ -2470,18 +2470,19 @@ (define-public xsensors
("gtk" ,gtk+-2)))
(native-inputs `(("pkg-config" ,pkg-config)))
(arguments
`(#:phases (alist-cons-before
'configure 'enable-deprecated
(lambda _
(substitute* "src/Makefile.in"
(("-DGDK_DISABLE_DEPRECATED") "")
(("-DGTK_DISABLE_DEPRECATED") "")))
(alist-cons-before
'configure 'remove-Werror
(lambda _
(substitute* '("configure" "src/Makefile.in")
(("-Werror") "")))
%standard-phases))))
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'enable-deprecated
(lambda _
(substitute* "src/Makefile.in"
(("-DGDK_DISABLE_DEPRECATED") "")
(("-DGTK_DISABLE_DEPRECATED") ""))
#t))
(add-before 'configure 'remove-Werror
(lambda _
(substitute* '("configure" "src/Makefile.in")
(("-Werror") ""))
#t)))))
(home-page "http://www.linuxhardware.org/xsensors/")
(synopsis "Hardware health information viewer")
(description
@ -2497,12 +2498,13 @@ (define-public perf
(source (package-source linux-libre))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-replace
'configure
(lambda* (#:key inputs #:allow-other-keys)
(setenv "SHELL_PATH" (which "bash"))
(chdir "tools/perf"))
%standard-phases)
'(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs #:allow-other-keys)
(setenv "SHELL_PATH" (which "bash"))
(chdir "tools/perf")
#t)))
#:make-flags (list (string-append "DESTDIR="
(assoc-ref %outputs "out"))
"WERROR=0"
@ -2841,22 +2843,23 @@ (define-public mdadm
(string-append "BINDIR=" out "/sbin")
(string-append "MANDIR=" out "/share/man")
(string-append "UDEVDIR=" out "/lib/udev")))
#:phases (alist-cons-before
'build 'patch-program-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((coreutils (assoc-ref inputs "coreutils")))
(substitute* "udev-md-raid-arrays.rules"
(("/usr/bin/(readlink|basename)" all program)
(string-append coreutils "/bin/" program)))))
(alist-cons-before
'build 'remove-W-error
(lambda _
;; We cannot build with -Werror on i686 due to a
;; 'sign-compare' warning in util.c.
(substitute* "Makefile"
(("-Werror") ""))
#t)
(alist-delete 'configure %standard-phases)))
#:phases
(modify-phases %standard-phases
(add-before 'build 'patch-program-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((coreutils (assoc-ref inputs "coreutils")))
(substitute* "udev-md-raid-arrays.rules"
(("/usr/bin/(readlink|basename)" all program)
(string-append coreutils "/bin/" program))))
#t))
(add-before 'build 'remove-W-error
(lambda _
;; We cannot build with -Werror on i686 due to a
;; 'sign-compare' warning in util.c.
(substitute* "Makefile"
(("-Werror") ""))
#t))
(delete 'configure))
;;tests must be done as root
#:tests? #f))
(home-page "http://neil.brown.name/blog/mdadm")
@ -2991,7 +2994,7 @@ (define-public libaio
(list "CC=gcc" (string-append "prefix=" %output))
#:test-target "partcheck" ; need root for a full 'check'
#: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")
(synopsis "Linux-native asynchronous I/O access library")
(description
@ -3026,8 +3029,7 @@ (define-public sbc
(define-public bluez
(package
(name "bluez")
(version "5.45")
(replacement bluez/fixed)
(version "5.47")
(source (origin
(method url-fetch)
(uri (string-append
@ -3035,7 +3037,7 @@ (define-public bluez
version ".tar.xz"))
(sha256
(base32
"1sb4aflgyrl7apricjipa8wx95qm69yja0lmn2f19g560c3v1b2c"))))
"1j22hfjz0fp4pgclgz9mfcwjbr4wqgah3gd2qhfg4r6msmybyxfg"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -3089,20 +3091,6 @@ (define-public bluez
is flexible, efficient and uses a modular implementation.")
(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
(package
(name "fuse-exfat")
@ -3662,13 +3650,14 @@ (define-public module-init-tools
;; FIXME: The upstream tarball lacks man pages, and building them would
;; require DocBook & co. We used to use Gentoo's pre-built man pages,
;; but they vanished. In the meantime, fake it.
'(#:phases (alist-cons-before
'configure 'fake-docbook
(lambda _
(substitute* "Makefile.in"
(("^DOCBOOKTOMAN.*$")
"DOCBOOKTOMAN = true\n")))
%standard-phases)))
'(#:phases
(modify-phases %standard-phases
(add-before 'configure 'fake-docbook
(lambda _
(substitute* "Makefile.in"
(("^DOCBOOKTOMAN.*$")
"DOCBOOKTOMAN = true\n"))
#t)))))
(home-page "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/")
(synopsis "Tools for loading and managing Linux kernel modules")
(description

61
gnu/packages/lisp.scm
View file

@ -455,36 +455,33 @@ (define-public ccl
(guix build utils)
(guix build gnu-build-system))
#:phases
(alist-replace
'unpack
(lambda* (#:key inputs #:allow-other-keys)
(and (zero? (system* "tar" "xzvf" (assoc-ref inputs "ccl")))
(begin (chdir "ccl") #t)))
(alist-delete
'configure
(alist-cons-before
'build 'pre-build
;; Enter the source directory for the current platform's lisp
;; kernel, and run 'make clean' to remove the precompiled one.
(lambda _
(chdir (string-append
"lisp-kernel/"
,(match (or (%current-target-system) (%current-system))
("i686-linux" "linuxx8632")
("x86_64-linux" "linuxx8664")
("armhf-linux" "linuxarm")
;; Prevent errors when querying this package
;; on unsupported platforms, e.g. when running
;; "guix package --search="
(_ "UNSUPPORTED"))))
(substitute* '("Makefile")
(("/bin/rm") "rm"))
(setenv "CC" "gcc")
(zero? (system* "make" "clean")))
;; 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.
(alist-replace
'install
(modify-phases %standard-phases
(replace 'unpack
(lambda* (#:key inputs #:allow-other-keys)
(and (zero? (system* "tar" "xzvf" (assoc-ref inputs "ccl")))
(begin (chdir "ccl") #t))))
(delete 'configure)
(add-before 'build 'pre-build
;; Enter the source directory for the current platform's lisp
;; kernel, and run 'make clean' to remove the precompiled one.
(lambda _
(chdir (string-append
"lisp-kernel/"
,(match (or (%current-target-system) (%current-system))
("i686-linux" "linuxx8632")
("x86_64-linux" "linuxx8664")
("armhf-linux" "linuxarm")
;; Prevent errors when querying this package
;; on unsupported platforms, e.g. when running
;; "guix package --search="
(_ "UNSUPPORTED"))))
(substitute* '("Makefile")
(("/bin/rm") "rm"))
(setenv "CC" "gcc")
(zero? (system* "make" "clean"))))
;; 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.
(replace 'install
(lambda* (#:key outputs inputs #:allow-other-keys)
;; The lisp kernel built by running 'make' in lisp-kernel/$system
;; is put back into the original directory, so go back. The heap
@ -523,8 +520,8 @@ (define-public ccl
"CCL_DEFAULT_DIRECTORY=" libdir "\n"
"export CCL_DEFAULT_DIRECTORY\n"
"exec " libdir kernel "\n"))))
(chmod wrapper #o755)))
%standard-phases))))))
(chmod wrapper #o755))
#t)))))
(supported-systems '("i686-linux" "x86_64-linux" "armhf-linux"))
(home-page "http://ccl.clozure.com/")
(synopsis "Common Lisp implementation")

2
gnu/packages/lua.scm
View file

@ -124,7 +124,7 @@ (define-public luajit
(build-system gnu-build-system)
(arguments
'(#: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")))))
(home-page "http://www.luajit.org/")
(synopsis "Just in time compiler for Lua programming language version 5.1")

88
gnu/packages/machine-learning.scm
View file

@ -376,54 +376,50 @@ (define (delete-ifdefs file)
(arguments
'(#:tests? #f ;no check target
#:phases
(alist-cons-after
'unpack 'delete-broken-symlinks
(lambda _
(for-each delete-file '("applications/arts/data"
"applications/asp/data"
"applications/easysvm/data"
"applications/msplicer/data"
"applications/ocr/data"
"examples/documented/data"
"examples/documented/matlab_static"
"examples/documented/octave_static"
"examples/undocumented/data"
"examples/undocumented/matlab_static"
"examples/undocumented/octave_static"
"tests/integration/data"
"tests/integration/matlab_static"
"tests/integration/octave_static"
"tests/integration/python_modular/tests"))
#t)
(alist-cons-after
'unpack 'change-R-target-path
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("src/interfaces/r_modular/CMakeLists.txt"
"src/interfaces/r_static/CMakeLists.txt"
"examples/undocumented/r_modular/CMakeLists.txt")
(("\\$\\{R_COMPONENT_LIB_PATH\\}")
(string-append (assoc-ref outputs "out")
"/lib/R/library/")))
#t)
(alist-cons-after
'unpack 'fix-octave-modules
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("src/interfaces/octave_modular/CMakeLists.txt"
"src/interfaces/octave_static/CMakeLists.txt")
(("^include_directories\\(\\$\\{OCTAVE_INCLUDE_DIRS\\}")
"include_directories(${OCTAVE_INCLUDE_DIRS} ${OCTAVE_INCLUDE_DIRS}/octave"))
(modify-phases %standard-phases
(add-after 'unpack 'delete-broken-symlinks
(lambda _
(for-each delete-file '("applications/arts/data"
"applications/asp/data"
"applications/easysvm/data"
"applications/msplicer/data"
"applications/ocr/data"
"examples/documented/data"
"examples/documented/matlab_static"
"examples/documented/octave_static"
"examples/undocumented/data"
"examples/undocumented/matlab_static"
"examples/undocumented/octave_static"
"tests/integration/data"
"tests/integration/matlab_static"
"tests/integration/octave_static"
"tests/integration/python_modular/tests"))
#t))
(add-after 'unpack 'change-R-target-path
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("src/interfaces/r_modular/CMakeLists.txt"
"src/interfaces/r_static/CMakeLists.txt"
"examples/undocumented/r_modular/CMakeLists.txt")
(("\\$\\{R_COMPONENT_LIB_PATH\\}")
(string-append (assoc-ref outputs "out")
"/lib/R/library/")))
#t))
(add-after 'unpack 'fix-octave-modules
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("src/interfaces/octave_modular/CMakeLists.txt"
"src/interfaces/octave_static/CMakeLists.txt")
(("^include_directories\\(\\$\\{OCTAVE_INCLUDE_DIRS\\}")
"include_directories(${OCTAVE_INCLUDE_DIRS} ${OCTAVE_INCLUDE_DIRS}/octave"))
;; change target directory
(substitute* "src/interfaces/octave_modular/CMakeLists.txt"
(("\\$\\{OCTAVE_OCT_LOCAL_API_FILE_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/octave/packages")))
#t)
(alist-cons-before
'build 'set-HOME
;; change target directory
(substitute* "src/interfaces/octave_modular/CMakeLists.txt"
(("\\$\\{OCTAVE_OCT_LOCAL_API_FILE_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/octave/packages")))
#t))
(add-before 'build 'set-HOME
;; $HOME needs to be set at some point during the build phase
(lambda _ (setenv "HOME" "/tmp") #t)
%standard-phases))))
(lambda _ (setenv "HOME" "/tmp") #t)))
#:configure-flags
(list "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
"-DUSE_SVMLIGHT=OFF" ;disable proprietary SVMLIGHT

90
gnu/packages/mail.scm
View file

@ -1034,51 +1034,51 @@ (define-public exim
("perl" ,perl)))
(arguments
'(#:phases
(alist-replace
'configure
;; We'd use #:make-flags but the top-level Makefile calls others
;; recursively, so just set all variables this way.
(lambda* (#:key outputs inputs #:allow-other-keys)
(substitute* '("Makefile" "OS/Makefile-Default")
(("(RM_COMMAND=).*" all var)
(string-append var "rm\n")))
(copy-file "src/EDITME" "Local/Makefile")
(copy-file "exim_monitor/EDITME" "Local/eximon.conf")
(let ((out (assoc-ref outputs "out"))
(gzip (assoc-ref inputs "gzip"))
(bzip2 (assoc-ref inputs "bzip2"))
(xz (assoc-ref inputs "xz")))
(substitute* '("Local/Makefile")
(("(BIN_DIRECTORY=).*" all var)
(string-append var out "/bin\n"))
(("(CONFIGURE_FILE=).*" all var)
(string-append var out "/etc/exim.conf\n"))
(("(EXIM_USER=).*" all var)
(string-append var "nobody\n"))
(("(FIXED_NEVER_USERS=).*" all var)
(string-append var "\n")) ;XXX no root in build environment
(("(COMPRESS_COMMAND=).*" all var)
(string-append var gzip "/bin/gzip\n"))
(("(ZCAT_COMMAND=).*" all var)
(string-append var gzip "/bin/zcat\n")))
;; This file has hardcoded names for tools despite the zcat
;; configuration above.
(substitute* '("src/exigrep.src")
(("'zcat'") (string-append "'" gzip "/bin/zcat'"))
(("'bzcat'") (string-append "'" bzip2 "/bin/bzcat'"))
(("'xzcat'") (string-append "'" xz "/bin/xzcat'"))
(("'lzma'") (string-append "'" xz "/bin/lzma'")))))
(alist-cons-before
'build 'fix-sh-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* '("scripts/lookups-Makefile" "scripts/reversion")
(("SHELL=/bin/sh") "SHELL=sh"))
(substitute* '("scripts/Configure-config.h")
(("\\| /bin/sh") "| sh"))
(let ((bash (assoc-ref inputs "bash")))
(substitute* '("scripts/Configure-eximon")
(("#!/bin/sh") (string-append "#!" bash "/bin/sh")))))
%standard-phases))
(modify-phases %standard-phases
(replace 'configure
;; We'd use #:make-flags but the top-level Makefile calls others
;; recursively, so just set all variables this way.
(lambda* (#:key outputs inputs #:allow-other-keys)
(substitute* '("Makefile" "OS/Makefile-Default")
(("(RM_COMMAND=).*" all var)
(string-append var "rm\n")))
(copy-file "src/EDITME" "Local/Makefile")
(copy-file "exim_monitor/EDITME" "Local/eximon.conf")
(let ((out (assoc-ref outputs "out"))
(gzip (assoc-ref inputs "gzip"))
(bzip2 (assoc-ref inputs "bzip2"))
(xz (assoc-ref inputs "xz")))
(substitute* '("Local/Makefile")
(("(BIN_DIRECTORY=).*" all var)
(string-append var out "/bin\n"))
(("(CONFIGURE_FILE=).*" all var)
(string-append var out "/etc/exim.conf\n"))
(("(EXIM_USER=).*" all var)
(string-append var "nobody\n"))
(("(FIXED_NEVER_USERS=).*" all var)
(string-append var "\n")) ;XXX no root in build environment
(("(COMPRESS_COMMAND=).*" all var)
(string-append var gzip "/bin/gzip\n"))
(("(ZCAT_COMMAND=).*" all var)
(string-append var gzip "/bin/zcat\n")))
;; This file has hardcoded names for tools despite the zcat
;; configuration above.
(substitute* '("src/exigrep.src")
(("'zcat'") (string-append "'" gzip "/bin/zcat'"))
(("'bzcat'") (string-append "'" bzip2 "/bin/bzcat'"))
(("'xzcat'") (string-append "'" xz "/bin/xzcat'"))
(("'lzma'") (string-append "'" xz "/bin/lzma'"))))
#t))
(add-before 'build 'fix-sh-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* '("scripts/lookups-Makefile" "scripts/reversion")
(("SHELL=/bin/sh") "SHELL=sh"))
(substitute* '("scripts/Configure-config.h")
(("\\| /bin/sh") "| sh"))
(let ((bash (assoc-ref inputs "bash")))
(substitute* '("scripts/Configure-eximon")
(("#!/bin/sh") (string-append "#!" bash "/bin/sh"))))
#t)))
#:make-flags '("INSTALL_ARG=-no_chown")
;; No 'check' target.
#:tests? #f))

4
gnu/packages/man.scm
View file

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

100
gnu/packages/maths.scm
View file

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

27
gnu/packages/messaging.scm
View file

@ -143,20 +143,19 @@ (define-public bitlbee
("python" ,python-2)
("perl" ,perl)))
(arguments
`(#:phases (alist-cons-after
'install 'install-etc
(lambda* (#:key (make-flags '()) #:allow-other-keys)
(zero? (apply system* "make" "install-etc" make-flags)))
(alist-replace
'configure
;; bitlbee's configure script does not tolerate many of the
;; variable settings that Guix would pass to it.
(lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "./configure"
(string-append "--prefix="
(assoc-ref outputs "out"))
"--otr=1")))
%standard-phases))))
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-etc
(lambda* (#:key (make-flags '()) #:allow-other-keys)
(zero? (apply system* "make" "install-etc" make-flags))))
(replace 'configure
;; bitlbee's configure script does not tolerate many of the
;; variable settings that Guix would pass to it.
(lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "./configure"
(string-append "--prefix="
(assoc-ref outputs "out"))
"--otr=1")))))))
(synopsis "IRC to instant messaging gateway")
(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

87
gnu/packages/mp3.scm
View file

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

102
gnu/packages/music.scm
View file

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

79
gnu/packages/noweb.scm
View file

@ -35,47 +35,46 @@ (define-public noweb
"10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9"))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-before
'install 'pre-install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/share/texmf/tex/latex"))
#t))
(alist-cons-after
'install 'post-install
(lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(cu (assoc-ref inputs "coreutils"))
(du (assoc-ref inputs "diffutils")))
(with-directory-excursion out
(for-each (lambda (prog)
(substitute* prog
(("nawk") (which "awk"))))
(append (map (lambda (x)
(string-append "bin/" x))
'("noweb" "nountangle"
"noroots" "noroff"
"noindex"))
(map (lambda (x)
(string-append "lib/" x))
'("btdefn" "emptydefn" "noidx"
"pipedocs" "toascii" "tohtml"
"toroff" "totex" "unmarkup"))))
(substitute* "bin/cpif"
(("^PATH=.*$")
(string-append "PATH=" cu "/bin:" du "/bin\n"))))
#t))
(alist-replace
'configure
(lambda _
;; Jump in the source.
(chdir "src")
'(#:phases
(modify-phases %standard-phases
(add-before 'install 'pre-install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/share/texmf/tex/latex"))
#t)))
(add-after 'install 'post-install
(lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(cu (assoc-ref inputs "coreutils"))
(du (assoc-ref inputs "diffutils")))
(with-directory-excursion out
(for-each (lambda (prog)
(substitute* prog
(("nawk") (which "awk"))))
(append (map (lambda (x)
(string-append "bin/" x))
'("noweb" "nountangle"
"noroots" "noroff"
"noindex"))
(map (lambda (x)
(string-append "lib/" x))
'("btdefn" "emptydefn" "noidx"
"pipedocs" "toascii" "tohtml"
"toroff" "totex" "unmarkup"))))
(substitute* "bin/cpif"
(("^PATH=.*$")
(string-append "PATH=" cu "/bin:" du "/bin\n"))))
#t)))
(replace 'configure
(lambda _
;; Jump in the source.
(chdir "src")
;; The makefile reads "source: FAQ", but FAQ isn't
;; available.
(substitute* "Makefile"
(("FAQ") "")))
%standard-phases)))
;; The makefile reads "source: FAQ", but FAQ isn't
;; available.
(substitute* "Makefile"
(("FAQ") ""))
#t)))
#:make-flags (let ((out (assoc-ref %outputs "out")))
(list (string-append "BIN=" out "/bin")
(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");

6
gnu/packages/patches/mesa-skip-disk-cache-test.patch
View file

@ -8,12 +8,12 @@ for now.
@@ -170,11 +170,6 @@
unsetenv("MESA_GLSL_CACHE_DIR");
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");
-
- disk_cache_destroy(cache);
-
/* Test with XDG_CACHE_HOME set */
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);

120
gnu/packages/patchutils.scm
View file

@ -53,30 +53,31 @@ (define-public patchutils
(inputs `(("perl" ,perl)))
(arguments
'(#:parallel-tests? #f
#:phases (alist-cons-before
'check 'patch-test-scripts
(lambda _
(let ((echo (which "echo")))
(substitute*
(find-files "tests" "^run-test$")
(("/bin/echo") echo))))
(alist-cons-after
'install 'wrap-program
;; Point installed scripts to the utilities they need.
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(diffutils (assoc-ref inputs "diffutils"))
(sed (assoc-ref inputs "sed"))
(gawk (assoc-ref inputs "gawk")))
(for-each
(lambda (prog)
(wrap-program (string-append out "/bin/" prog)
`("PATH" ":" prefix
,(map (lambda (dir)
(string-append dir "/bin"))
(list diffutils sed gawk)))))
'("dehtmldiff" "editdiff" "espdiff"))))
%standard-phases))))
#:phases
(modify-phases %standard-phases
(add-before 'check 'patch-test-scripts
(lambda _
(let ((echo (which "echo")))
(substitute*
(find-files "tests" "^run-test$")
(("/bin/echo") echo)))
#t))
(add-after 'install 'wrap-program
;; Point installed scripts to the utilities they need.
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(diffutils (assoc-ref inputs "diffutils"))
(sed (assoc-ref inputs "sed"))
(gawk (assoc-ref inputs "gawk")))
(for-each
(lambda (prog)
(wrap-program (string-append out "/bin/" prog)
`("PATH" ":" prefix
,(map (lambda (dir)
(string-append dir "/bin"))
(list diffutils sed gawk)))))
'("dehtmldiff" "editdiff" "espdiff")))
#t)))))
(home-page "http://cyberelk.net/tim/software/patchutils")
(synopsis "Collection of tools for manipulating patch files")
(description
@ -105,39 +106,39 @@ (define-public quilt
("ed" ,ed)))
(arguments
'(#:parallel-tests? #f
#:phases
(alist-cons-before
'check 'patch-tests
(lambda _
(substitute*
'("test/run"
"test/edit.test")
(("/bin/sh") (which "sh")))
;; TODO: Run the mail tests once the mail feature can be supported.
(delete-file "test/mail.test"))
(alist-cons-after
'install 'wrap-program
;; 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
;; make sure the quilt script can find those utilities when run.
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(coreutils (assoc-ref inputs "coreutils"))
(diffutils (assoc-ref inputs "diffutils"))
(findutils (assoc-ref inputs "findutils"))
(less (assoc-ref inputs "less"))
(file (assoc-ref inputs "file"))
(ed (assoc-ref inputs "ed"))
(sed (assoc-ref inputs "sed"))
(bash (assoc-ref inputs "bash"))
(grep (assoc-ref inputs "grep")))
(wrap-program (string-append out "/bin/quilt")
`("PATH" ":" prefix
,(map (lambda (dir)
(string-append dir "/bin"))
(list coreutils diffutils findutils
less file ed sed bash grep))))))
%standard-phases))))
#:phases
(modify-phases %standard-phases
(add-before 'check 'patch-tests
(lambda _
(substitute*
'("test/run"
"test/edit.test")
(("/bin/sh") (which "sh")))
;; TODO: Run the mail tests once the mail feature can be supported.
(delete-file "test/mail.test")
#t))
(add-after 'install 'wrap-program
;; 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
;; make sure the quilt script can find those utilities when run.
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(coreutils (assoc-ref inputs "coreutils"))
(diffutils (assoc-ref inputs "diffutils"))
(findutils (assoc-ref inputs "findutils"))
(less (assoc-ref inputs "less"))
(file (assoc-ref inputs "file"))
(ed (assoc-ref inputs "ed"))
(sed (assoc-ref inputs "sed"))
(bash (assoc-ref inputs "bash"))
(grep (assoc-ref inputs "grep")))
(wrap-program (string-append out "/bin/quilt")
`("PATH" ":" prefix
,(map (lambda (dir)
(string-append dir "/bin"))
(list coreutils diffutils findutils
less file ed sed bash grep)))))
#t)))))
(home-page "https://savannah.nongnu.org/projects/quilt/")
(synopsis "Script for managing patches to software")
(description
@ -164,8 +165,9 @@ (define-public colordiff
#:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))
"INSTALL_DIR=/bin" "MAN_DIR=/share/man/man1")
#:phases
(alist-delete 'configure
(alist-delete 'build %standard-phases))))
(modify-phases %standard-phases
(delete 'configure)
(delete 'build))))
(inputs
`(("perl" ,perl)
("xmlto" ,xmlto)))

65
gnu/packages/pdf.scm
View file

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

29
gnu/packages/perl.scm
View file

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

15
gnu/packages/photo.scm
View file

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

2
gnu/packages/php.scm
View file

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

17
gnu/packages/popt.scm
View file

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

65
gnu/packages/pretty-print.scm
View file

@ -205,22 +205,23 @@ (define-public source-highlight
(list (string-append "--with-boost="
(assoc-ref %build-inputs "boost")))
#:parallel-tests? #f ;There appear to be race conditions
#:phases (alist-cons-before
'check 'patch-test-files
(lambda _
;; Unpatch shebangs in test input so that source-highlight
;; is still able to infer input language
(substitute* '("tests/test.sh"
"tests/test2.sh"
"tests/test.tcl")
(((string-append "#! *" (which "sh"))) "#!/bin/sh"))
;; Initial patching unrecoverably removes whitespace, so
;; remove it also in the comparison output.
(substitute* '("tests/test.sh.html"
"tests/test2.sh.html"
"tests/test.tcl.html")
(("#! */bin/sh") "#!/bin/sh")))
%standard-phases)))
#:phases
(modify-phases %standard-phases
(add-before 'check 'patch-test-files
(lambda _
;; Unpatch shebangs in test input so that source-highlight
;; is still able to infer input language
(substitute* '("tests/test.sh"
"tests/test2.sh"
"tests/test.tcl")
(((string-append "#! *" (which "sh"))) "#!/bin/sh"))
;; Initial patching unrecoverably removes whitespace, so
;; remove it also in the comparison output.
(substitute* '("tests/test.sh.html"
"tests/test2.sh.html"
"tests/test.tcl.html")
(("#! */bin/sh") "#!/bin/sh"))
#t)))))
(home-page "https://www.gnu.org/software/src-highlite/")
(synopsis "Produce a document with syntax highlighting from a source file")
(description
@ -292,22 +293,22 @@ (define-public astyle
#:make-flags (list (string-append "prefix=" %output)
"INSTALL=install"
"all")
#:phases (alist-replace
'configure
(lambda _ (chdir "build/gcc"))
(alist-cons-after
'install 'install-libs
(lambda* (#:key outputs #:allow-other-keys)
;; Libraries are not installed by default
(let* ((output (assoc-ref outputs "out"))
(libdir (string-append output "/lib")))
(begin
(mkdir-p libdir)
(for-each (lambda (l)
(copy-file
l (string-append libdir "/" (basename l))))
(find-files "bin" "lib*")))))
%standard-phases))))
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda _ (chdir "build/gcc") #t))
(add-after 'install 'install-libs
(lambda* (#:key outputs #:allow-other-keys)
;; Libraries are not installed by default
(let* ((output (assoc-ref outputs "out"))
(libdir (string-append output "/lib")))
(begin
(mkdir-p libdir)
(for-each (lambda (l)
(copy-file
l (string-append libdir "/" (basename l))))
(find-files "bin" "lib*"))))
#t)))))
(home-page "http://astyle.sourceforge.net/")
(synopsis "Source code indenter, formatter, and beautifier")
(description

4
gnu/packages/pulseaudio.scm
View file

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

33
gnu/packages/pumpio.scm
View file

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

45
gnu/packages/python.scm
View file

@ -485,11 +485,10 @@ (define-public python-passlib
`(("python-py-bcrypt" ,python-py-bcrypt)))
(arguments
`(#:phases
(alist-cons-before
'check 'set-PYTHON_EGG_CACHE
;; some tests require access to "$HOME/.cython"
(lambda* _ (setenv "PYTHON_EGG_CACHE" "/tmp"))
%standard-phases)))
(modify-phases %standard-phases
(add-before 'check 'set-PYTHON_EGG_CACHE
;; some tests require access to "$HOME/.cython"
(lambda* _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t)))))
(home-page "https://bitbucket.org/ecollins/passlib")
(synopsis
"Comprehensive password hashing framework")
@ -1079,12 +1078,10 @@ (define-public python-pycrypto
("gmp" ,gmp)))
(arguments
`(#:phases
(alist-cons-before
'build 'set-build-env
;; pycrypto runs an autoconf configure script behind the scenes
(lambda _
(setenv "CONFIG_SHELL" (which "bash")))
%standard-phases)))
(modify-phases %standard-phases
(add-before 'build 'set-build-env
;; pycrypto runs an autoconf configure script behind the scenes
(lambda _ (setenv "CONFIG_SHELL" (which "bash")) #t)))))
(home-page "http://www.pycrypto.org/")
(synopsis "Cryptographic modules for Python")
(description
@ -1496,11 +1493,11 @@ (define-public python2-empy
(build-system python-build-system)
(arguments
`(#:python ,python-2
#:phases (alist-replace
'check
(lambda _
(zero? (system* "./test.sh")))
%standard-phases)))
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(zero? (system* "./test.sh")))))))
(home-page "http://www.alcyone.com/software/empy/")
(synopsis "Templating system for Python")
(description
@ -4721,10 +4718,10 @@ (define-public python-sqlalchemy
("python-pytest" ,python-pytest)
("python-mock" ,python-mock))) ;for tests
(arguments
`(#:phases (alist-replace
'check
(lambda _ (zero? (system* "py.test")))
%standard-phases)))
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _ (zero? (system* "py.test")))))))
(home-page "http://www.sqlalchemy.org")
(synopsis "Database abstraction library")
(description
@ -8635,10 +8632,10 @@ (define-public python-docopt
(native-inputs
`(("python-pytest" ,python-pytest)))
(arguments
`(#:phases (alist-replace
'check
(lambda _ (zero? (system* "py.test")))
%standard-phases)))
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _ (zero? (system* "py.test")))))))
(home-page "http://docopt.org")
(synopsis "Command-line interface description language for Python")
(description "This library allows the user to define a command-line

40
gnu/packages/rdf.scm
View file

@ -127,26 +127,26 @@ (define-public lrdf
"18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s"))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-after
'remove-out-of-tree-references 'autoreconf
(lambda _
(zero? (system* "autoreconf" "-vfi")))
(alist-cons-after
'unpack 'remove-out-of-tree-references
(lambda _
;; remove symlinks to files in /usr/
(delete-file-recursively "m4")
(for-each delete-file '("config.guess"
"config.sub"
"depcomp"
"install-sh"
"ltmain.sh"
"missing"))
;; remove_test depends on an out-of-tree RDF file
(substitute* "examples/Makefile.am"
(("instances_test remove_test") "instances_test")
(("\\$\\(TESTS\\) remove_test") "$(TESTS)")))
%standard-phases))))
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-out-of-tree-references
(lambda _
;; remove symlinks to files in /usr/
(delete-file-recursively "m4")
(for-each delete-file '("config.guess"
"config.sub"
"depcomp"
"install-sh"
"ltmain.sh"
"missing"))
;; remove_test depends on an out-of-tree RDF file
(substitute* "examples/Makefile.am"
(("instances_test remove_test") "instances_test")
(("\\$\\(TESTS\\) remove_test") "$(TESTS)"))
#t))
(add-after 'remove-out-of-tree-references 'autoreconf
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(inputs
`(("raptor" ,raptor2)
("cyrus-sasl" ,cyrus-sasl)

20
gnu/packages/regex.scm
View file

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

19
gnu/packages/rrdtool.scm
View file

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

84
gnu/packages/ruby.scm
View file

@ -49,8 +49,7 @@ (define-module (gnu packages ruby)
(define-public ruby
(package
(name "ruby")
(replacement ruby-2.4.2)
(version "2.4.0")
(version "2.4.2")
(source
(origin
(method url-fetch)
@ -59,7 +58,7 @@ (define-public ruby
"/ruby-" version ".tar.xz"))
(sha256
(base32
"141nnsdk2q83c23p5kl404id8gy1ap261gin48rbjj5sbksgx1rs"))
"0dgp4ypk3smrsbh2c249n5pl6nqhpd2igq9484dbsh81sf08k2kl"))
(modules '((guix build utils)))
(snippet `(begin
;; Remove bundled libffi
@ -103,26 +102,6 @@ (define-public ruby
(home-page "https://ruby-lang.org")
(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
(package
(inherit ruby)
@ -171,16 +150,16 @@ (define-public ruby-2.1
`(#:test-target "test"
#:parallel-tests? #f
#:phases
(alist-cons-before
'configure 'replace-bin-sh
(lambda _
(substitute* '("Makefile.in"
"ext/pty/pty.c"
"io.c"
"lib/mkmf.rb"
"process.c")
(("/bin/sh") (which "sh"))))
%standard-phases)))
(modify-phases %standard-phases
(add-before 'configure 'replace-bin-sh
(lambda _
(substitute* '("Makefile.in"
"ext/pty/pty.c"
"io.c"
"lib/mkmf.rb"
"process.c")
(("/bin/sh") (which "sh")))
#t)))))
(native-search-paths
(list (search-path-specification
(variable "GEM_PATH")
@ -205,16 +184,21 @@ (define-public ruby-1.8
`(#:test-target "test"
#:parallel-tests? #f
#:phases
(alist-cons-before
'configure 'replace-bin-sh
(lambda _
(substitute* '("Makefile.in"
"ext/pty/pty.c"
"io.c"
"lib/mkmf.rb"
"process.c")
(("/bin/sh") (which "sh"))))
%standard-phases)))))
(modify-phases %standard-phases
(add-before 'configure 'replace-bin-sh
(lambda _
(substitute* '("Makefile.in"
"ext/pty/pty.c"
"io.c"
"lib/mkmf.rb"
"process.c")
(("/bin/sh") (which "sh")))
#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
(package
@ -3800,10 +3784,9 @@ (define-public ruby-ansi
(add-before 'validate-runpath 'replace-broken-symlink
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(file (string-append out "/lib/ruby/gems/"
,(package-version ruby)
"/gems/ansi-" ,version
"/lib/ansi.yml")))
(file (string-append out
,(gem-directory (package-version ruby))
"/ansi-" ,version "/lib/ansi.yml")))
;; XXX: This symlink is broken since ruby 2.4.
;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html
(delete-file file)
@ -4001,10 +3984,9 @@ (define-public ruby-ae
(add-before 'validate-runpath 'replace-broken-symlink
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(file (string-append out "/lib/ruby/gems/"
,(package-version ruby)
"/gems/ae-" ,version
"/lib/ae.yml")))
(file (string-append out
,(gem-directory (package-version ruby))
"/ae-" ,version "/lib/ae.yml")))
;; XXX: This symlink is broken since ruby 2.4.
;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html
(delete-file file)

50
gnu/packages/sawfish.scm
View file

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

134
gnu/packages/scheme.scm
View file

@ -417,73 +417,73 @@ (define-public racket
(build-system gnu-build-system)
(arguments
'(#:phases
(alist-cons-before
'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
;; Patch dynamically loaded libraries with their absolute paths.
(let* ((library-path (search-path-as-string->list
(getenv "LIBRARY_PATH")))
(find-so (lambda (soname)
(search-path
library-path
(format #f "~a.so" soname))))
(patch-ffi-libs (lambda (file libs)
(for-each
(lambda (lib)
(substitute* file
(((format #f "\"~a\"" lib))
(format #f "\"~a\"" (find-so lib)))))
libs))))
(substitute* "collects/db/private/sqlite3/ffi.rkt"
(("ffi-lib sqlite-so")
(format #f "ffi-lib \"~a\"" (find-so "libsqlite3"))))
(substitute* "collects/openssl/libssl.rkt"
(("ffi-lib libssl-so")
(format #f "ffi-lib \"~a\"" (find-so "libssl"))))
(substitute* "collects/openssl/libcrypto.rkt"
(("ffi-lib libcrypto-so")
(format #f "ffi-lib \"~a\"" (find-so "libcrypto"))))
(substitute* "share/pkgs/math-lib/math/private/bigfloat/gmp.rkt"
(("ffi-lib libgmp-so")
(format #f "ffi-lib \"~a\"" (find-so "libgmp"))))
(substitute* "share/pkgs/math-lib/math/private/bigfloat/mpfr.rkt"
(("ffi-lib libmpfr-so")
(format #f "ffi-lib \"~a\"" (find-so "libmpfr"))))
(for-each
(lambda (x) (apply patch-ffi-libs x))
'(("share/pkgs/draw-lib/racket/draw/unsafe/cairo-lib.rkt"
("libfontconfig" "libcairo"))
("share/pkgs/draw-lib/racket/draw/unsafe/glib.rkt"
("libglib-2.0" "libgmodule-2.0" "libgobject-2.0"))
("share/pkgs/draw-lib/racket/draw/unsafe/jpeg.rkt"
("libjpeg"))
("share/pkgs/draw-lib/racket/draw/unsafe/pango.rkt"
("libpango-1.0" "libpangocairo-1.0"))
("share/pkgs/draw-lib/racket/draw/unsafe/png.rkt"
("libpng"))
("share/pkgs/db-lib/db/private/odbc/ffi.rkt"
("libodbc"))
("share/pkgs/gui-lib/mred/private/wx/gtk/x11.rkt"
("libX11"))
("share/pkgs/gui-lib/mred/private/wx/gtk/gsettings.rkt"
("libgio-2.0"))
("share/pkgs/gui-lib/mred/private/wx/gtk/gtk3.rkt"
("libgdk-3" "libgtk-3"))
("share/pkgs/gui-lib/mred/private/wx/gtk/unique.rkt"
("libunique-1.0"))
("share/pkgs/gui-lib/mred/private/wx/gtk/utils.rkt"
("libgdk-x11-2.0" "libgdk_pixbuf-2.0" "libgtk-x11-2.0"))
("share/pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt"
("libGL"))
("share/pkgs/sgl/gl.rkt"
("libGL" "libGLU")))))
(chdir "src"))
(alist-cons-after
'unpack 'patch-/bin/sh
(lambda _
(substitute* "collects/racket/system.rkt"
(("/bin/sh") (which "sh"))))
%standard-phases))
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
;; Patch dynamically loaded libraries with their absolute paths.
(let* ((library-path (search-path-as-string->list
(getenv "LIBRARY_PATH")))
(find-so (lambda (soname)
(search-path
library-path
(format #f "~a.so" soname))))
(patch-ffi-libs (lambda (file libs)
(for-each
(lambda (lib)
(substitute* file
(((format #f "\"~a\"" lib))
(format #f "\"~a\"" (find-so lib)))))
libs))))
(substitute* "collects/db/private/sqlite3/ffi.rkt"
(("ffi-lib sqlite-so")
(format #f "ffi-lib \"~a\"" (find-so "libsqlite3"))))
(substitute* "collects/openssl/libssl.rkt"
(("ffi-lib libssl-so")
(format #f "ffi-lib \"~a\"" (find-so "libssl"))))
(substitute* "collects/openssl/libcrypto.rkt"
(("ffi-lib libcrypto-so")
(format #f "ffi-lib \"~a\"" (find-so "libcrypto"))))
(substitute* "share/pkgs/math-lib/math/private/bigfloat/gmp.rkt"
(("ffi-lib libgmp-so")
(format #f "ffi-lib \"~a\"" (find-so "libgmp"))))
(substitute* "share/pkgs/math-lib/math/private/bigfloat/mpfr.rkt"
(("ffi-lib libmpfr-so")
(format #f "ffi-lib \"~a\"" (find-so "libmpfr"))))
(for-each
(lambda (x) (apply patch-ffi-libs x))
'(("share/pkgs/draw-lib/racket/draw/unsafe/cairo-lib.rkt"
("libfontconfig" "libcairo"))
("share/pkgs/draw-lib/racket/draw/unsafe/glib.rkt"
("libglib-2.0" "libgmodule-2.0" "libgobject-2.0"))
("share/pkgs/draw-lib/racket/draw/unsafe/jpeg.rkt"
("libjpeg"))
("share/pkgs/draw-lib/racket/draw/unsafe/pango.rkt"
("libpango-1.0" "libpangocairo-1.0"))
("share/pkgs/draw-lib/racket/draw/unsafe/png.rkt"
("libpng"))
("share/pkgs/db-lib/db/private/odbc/ffi.rkt"
("libodbc"))
("share/pkgs/gui-lib/mred/private/wx/gtk/x11.rkt"
("libX11"))
("share/pkgs/gui-lib/mred/private/wx/gtk/gsettings.rkt"
("libgio-2.0"))
("share/pkgs/gui-lib/mred/private/wx/gtk/gtk3.rkt"
("libgdk-3" "libgtk-3"))
("share/pkgs/gui-lib/mred/private/wx/gtk/unique.rkt"
("libunique-1.0"))
("share/pkgs/gui-lib/mred/private/wx/gtk/utils.rkt"
("libgdk-x11-2.0" "libgdk_pixbuf-2.0" "libgtk-x11-2.0"))
("share/pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt"
("libGL"))
("share/pkgs/sgl/gl.rkt"
("libGL" "libGLU")))))
(chdir "src")
#t))
(add-after 'unpack 'patch-/bin/sh
(lambda _
(substitute* "collects/racket/system.rkt"
(("/bin/sh") (which "sh")))
#t)))
#:tests? #f ; XXX: how to run them?
))
(inputs

46
gnu/packages/sdl.scm
View file

@ -411,30 +411,30 @@ (define-public guile-sdl
(assoc-ref %build-inputs "sdl-union")))
#:parallel-build? #f ; parallel build fails
#:phases
(alist-cons-before
'configure 'fix-env-and-patch
(lambda* (#:key inputs #:allow-other-keys)
(setenv "GUILE_AUTO_COMPILE" "0")
;; SDL_image needs to dlopen libjpeg in the test suite.
(setenv "LD_LIBRARY_PATH"
(string-append (assoc-ref inputs "libjpeg") "/lib"))
;; Change the site directory /site/2.0 like Guile expects.
(substitute* "build-aux/guile-baux/re-prefixed-site-dirs"
(("\"/site\"") "\"/site/2.0\""))
(modify-phases %standard-phases
(add-before 'configure 'fix-env-and-patch
(lambda* (#:key inputs #:allow-other-keys)
(setenv "GUILE_AUTO_COMPILE" "0")
;; SDL_image needs to dlopen libjpeg in the test suite.
(setenv "LD_LIBRARY_PATH"
(string-append (assoc-ref inputs "libjpeg") "/lib"))
;; Change the site directory /site/2.0 like Guile expects.
(substitute* "build-aux/guile-baux/re-prefixed-site-dirs"
(("\"/site\"") "\"/site/2.0\""))
;; Skip tests that rely on sound support, which is unavailable in
;; the build environment.
(substitute* "test/Makefile.in"
(("HAVE_MIXER = .*$")
"HAVE_MIXER = 0\n")))
(alist-cons-before
'check 'start-xorg-server
(lambda* (#:key inputs #:allow-other-keys)
;; The test suite requires a running X server.
(system (format #f "~a/bin/Xvfb :1 &"
(assoc-ref inputs "xorg-server")))
(setenv "DISPLAY" ":1"))
%standard-phases))))
;; Skip tests that rely on sound support, which is unavailable in
;; the build environment.
(substitute* "test/Makefile.in"
(("HAVE_MIXER = .*$")
"HAVE_MIXER = 0\n"))
#t))
(add-before 'check 'start-xorg-server
(lambda* (#:key inputs #:allow-other-keys)
;; The test suite requires a running X server.
(system (format #f "~a/bin/Xvfb :1 &"
(assoc-ref inputs "xorg-server")))
(setenv "DISPLAY" ":1")
#t)))))
(synopsis "Guile interface for SDL (Simple DirectMedia Layer)")
(description "Guile-SDL is a set of bindings to the Simple DirectMedia
Layer (SDL). With them, Guile programmers can have easy access to graphics,

15
gnu/packages/serveez.scm
View file

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

29
gnu/packages/skribilo.scm
View file

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

17
gnu/packages/smalltalk.scm
View file

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

4
gnu/packages/suckless.scm
View file

@ -154,7 +154,7 @@ (define-public dmenu
(assoc-ref %build-inputs "freetype")
"/include/freetype2"))
#:phases
(alist-delete 'configure %standard-phases)))
(modify-phases %standard-phases (delete 'configure))))
(inputs
`(("freetype" ,freetype)
("libxft" ,libxft)
@ -211,7 +211,7 @@ (define-public slock
'(#:tests? #f ; no tests
#:make-flags (list "CC=gcc"
(string-append "PREFIX=" %output))
#:phases (alist-delete 'configure %standard-phases)))
#:phases (modify-phases %standard-phases (delete 'configure))))
(inputs
`(("libx11" ,libx11)
("libxext" ,libxext)

15
gnu/packages/tcl.scm
View file

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

12
gnu/packages/telephony.scm
View file

@ -56,12 +56,12 @@ (define-public commoncpp
"0kmgr5w3b1qwzxnsnw94q6rqs0hr8nbv9clf07ca2a2fyypx9kjk"))))
(arguments
`(#:phases
(alist-cons-before
'configure 'pre-configure
(lambda _
(substitute* "src/applog.cpp"
(("^// TODO sc.*") "#include <sys/types.h>\n#include <sys/stat.h>\n")))
%standard-phases)))
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda _
(substitute* "src/applog.cpp"
(("^// TODO sc.*") "#include <sys/types.h>\n#include <sys/stat.h>\n"))
#t)))))
(build-system gnu-build-system)
(synopsis "(u)Common C++ framework for threaded applications")
(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, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -87,6 +88,20 @@ (define-public texlive-bin
(method url-fetch)
(uri (string-append "ftp://tug.org/historic/systems/texlive/2017/"
"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
"1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81"))))
(build-system gnu-build-system)
@ -123,6 +138,9 @@ (define-public texlive-bin
`(#:out-of-source? #t
#:configure-flags
`("--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-freetype2"
"--with-system-gd"

25
gnu/packages/textutils.scm
View file

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

20
gnu/packages/time.scm
View file

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

14
gnu/packages/tor.scm
View file

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

24
gnu/packages/uucp.scm
View file

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

23
gnu/packages/video.scm
View file

@ -530,15 +530,19 @@ (define-public libmatroska
(define-public libva
(package
(name "libva")
(version "1.8.2")
(version "1.8.3")
(source
(origin
(method url-fetch)
(uri (string-append
"https://www.freedesktop.org/software/vaapi/releases/libva/libva-"
version".tar.bz2"))
(uri (list
;; Newer releases are only available on GitHub.
(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
(base32 "1pnfl3q7dzxs26l3jk9xi97gr0qwnaz6dhvf9ifp2yplr3fy7lwy"))))
(base32 "16xbk0awl7wp0vy0nyjvxk11spbw25mp8kwd9bmhd6x9xffi5vjn"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -1395,11 +1399,10 @@ (define-public libdvdnav-4
("libtool" ,libtool)))
(arguments
'(#:phases
(alist-cons-after
'unpack 'autoreconf
(lambda _
(zero? (system* "autoreconf" "-vif")))
%standard-phases)))))
(modify-phases %standard-phases
(add-after 'unpack 'autoreconf
(lambda _
(zero? (system* "autoreconf" "-vif")))))))))
(define-public libdvdcss
(package

10
gnu/packages/web-browsers.scm
View file

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

15
gnu/packages/web.scm
View file

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

214
gnu/packages/wicd.scm
View file

@ -71,123 +71,121 @@ (define-public wicd
;; we can't easily make setup.py use setuptools.
#:use-setuptools? #f
#:phases
(alist-cons-before
'build 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(python (assoc-ref inputs "python")))
(define (which* cmd)
(cond ((string=? cmd "ping")
"/run/setuid-programs/ping")
((which cmd)
=> identity)
(else
(format (current-error-port)
"WARNING: Unable to find absolute path for ~s~%"
cmd)
#f)))
(substitute* "setup.py"
;; The handling of unrecognized distros in setup.py is
;; broken. Work around the problem.
(("\\('init=', " all)
(string-append "#" all))
;; Inhibit attempts to install in /var or /etc.
(("\\(wpath\\.(log|etc|networks|.*scripts), " all)
(string-append "#" all)))
(modify-phases %standard-phases
(add-before 'build 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(python (assoc-ref inputs "python")))
(define (which* cmd)
(cond ((string=? cmd "ping")
"/run/setuid-programs/ping")
((which cmd)
=> identity)
(else
(format (current-error-port)
"WARNING: Unable to find absolute path for ~s~%"
cmd)
#f)))
(substitute* "setup.py"
;; The handling of unrecognized distros in setup.py is
;; broken. Work around the problem.
(("\\('init=', " all)
(string-append "#" all))
;; Inhibit attempts to install in /var or /etc.
(("\\(wpath\\.(log|etc|networks|.*scripts), " all)
(string-append "#" all)))
;; Patch references to subprograms with absolute pathnames.
(substitute* "wicd/wnettools.py"
(("(misc\\.Run\\(\\[?[\"'])([^\"' ]*)" all pre cmd)
(string-append pre (which* cmd)))
(("(self\\._find_program_path|misc\\.find_path)\\([\"']([^\"']*)[\"']\\)"
all dummy cmd)
(let ((pathname (which* cmd)))
(if pathname
(string-append "'" pathname "'")
"None")))
(("([\"'])(ifconfig|route|wpa_cli|wpa_supplicant|iwconfig|iwpriv|iwlist|ping)"
all open-quote cmd)
(string-append open-quote (which* cmd))))
;; Patch references to subprograms with absolute pathnames.
(substitute* "wicd/wnettools.py"
(("(misc\\.Run\\(\\[?[\"'])([^\"' ]*)" all pre cmd)
(string-append pre (which* cmd)))
(("(self\\._find_program_path|misc\\.find_path)\\([\"']([^\"']*)[\"']\\)"
all dummy cmd)
(let ((pathname (which* cmd)))
(if pathname
(string-append "'" pathname "'")
"None")))
(("([\"'])(ifconfig|route|wpa_cli|wpa_supplicant|iwconfig|iwpriv|iwlist|ping)"
all open-quote cmd)
(string-append open-quote (which* cmd))))
;; setup.py cannot cope without LANG
(setenv "LANG" "C")
;; setup.py cannot cope without LANG
(setenv "LANG" "C")
(let ((params
(list
(string-append "--python=" python "/bin/python")
"--no-install-init"
"--no-install-docs"
"--no-install-acpi"
"--no-install-pmutils"
"--no-install-kde"
"--no-install-gnome-shell-extensions"
(let ((params
(list
(string-append "--python=" python "/bin/python")
"--no-install-init"
"--no-install-docs"
"--no-install-acpi"
"--no-install-pmutils"
"--no-install-kde"
"--no-install-gnome-shell-extensions"
"--distro=guixsd"
"--wicdgroup=netdev"
"--loggroup=root"
"--logperms=0640"
"--distro=guixsd"
"--wicdgroup=netdev"
"--loggroup=root"
"--logperms=0640"
;; XXX setup.py configure asks us to pass --init=,
;; but if we do it says "no such option 'init'".
;; (string-append "--init=" out "/etc/init.d")
;; XXX setup.py configure asks us to pass --init=,
;; but if we do it says "no such option 'init'".
;; (string-append "--init=" out "/etc/init.d")
(string-append "--initfile=" out "/etc/init.d/wicd")
(string-append "--lib=" out "/lib/wicd")
(string-append "--share=" out "/share/wicd")
(string-append "--initfile=" out "/etc/init.d/wicd")
(string-append "--lib=" out "/lib/wicd")
(string-append "--share=" out "/share/wicd")
"--etc=/etc/wicd"
"--scripts=/etc/wicd/scripts"
"--pmutils=/etc/pm-utils/sleep.d"
"--etc=/etc/wicd"
"--scripts=/etc/wicd/scripts"
"--pmutils=/etc/pm-utils/sleep.d"
(string-append "--encryption="
out "/etc/encryption/templates")
(string-append "--bin=" out "/bin")
(string-append "--sbin=" out "/sbin")
(string-append "--daemon=" out "/share/wicd/daemon")
(string-append "--backends=" out "/share/wicd/backends")
(string-append "--curses=" out "/share/wicd/curses")
(string-append "--gtk=" out "/share/wicd/gtk")
(string-append "--cli=" out "/share/wicd/cli")
(string-append "--gnome-shell-extensions="
out "/share/gnome-shell-extensions")
(string-append "--icons=" out "/share/icons/hicolor")
(string-append "--pixmaps=" out "/share/pixmaps")
(string-append "--images=" out "/share/icons")
(string-append "--dbus=" out "/etc/dbus-1/system.d")
(string-append "--dbus-service="
out "/share/dbus-1/system-services")
(string-append "--systemd=" out "/lib/systemd/system")
(string-append "--logrotate=" out "/etc/logrotate.d")
(string-append "--desktop=" out "/share/applications")
(string-append "--translations=" out "/share/locale")
(string-append "--autostart=" out "/etc/xdg/autostart")
(string-append "--docdir=" out "/share/doc/wicd")
(string-append "--mandir=" out "/share/man")
(string-append "--kdedir=" out "/share/autostart"))))
(format #t
"running ~s with command ~s and parameters ~s~%"
"python setup.py" "configure" params)
(zero? (apply system* "python" "setup.py" "configure" params)))))
(alist-cons-after
'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; wicd's installer tries to put dhclient.conf.template.default
;; in /etc/wicd/other, which is not available in the build
;; environment, so here we install it manually in the output
;; directory.
(let ((dest-dir (string-append out "/etc/wicd"))
(name "dhclient.conf.template.default"))
(install-file (string-append "other/" name) dest-dir))
(string-append "--encryption="
out "/etc/encryption/templates")
(string-append "--bin=" out "/bin")
(string-append "--sbin=" out "/sbin")
(string-append "--daemon=" out "/share/wicd/daemon")
(string-append "--backends=" out "/share/wicd/backends")
(string-append "--curses=" out "/share/wicd/curses")
(string-append "--gtk=" out "/share/wicd/gtk")
(string-append "--cli=" out "/share/wicd/cli")
(string-append "--gnome-shell-extensions="
out "/share/gnome-shell-extensions")
(string-append "--icons=" out "/share/icons/hicolor")
(string-append "--pixmaps=" out "/share/pixmaps")
(string-append "--images=" out "/share/icons")
(string-append "--dbus=" out "/etc/dbus-1/system.d")
(string-append "--dbus-service="
out "/share/dbus-1/system-services")
(string-append "--systemd=" out "/lib/systemd/system")
(string-append "--logrotate=" out "/etc/logrotate.d")
(string-append "--desktop=" out "/share/applications")
(string-append "--translations=" out "/share/locale")
(string-append "--autostart=" out "/etc/xdg/autostart")
(string-append "--docdir=" out "/share/doc/wicd")
(string-append "--mandir=" out "/share/man")
(string-append "--kdedir=" out "/share/autostart"))))
(format #t
"running ~s with command ~s and parameters ~s~%"
"python setup.py" "configure" params)
(zero? (apply system* "python" "setup.py" "configure" params))))))
(add-after 'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; wicd's installer tries to put dhclient.conf.template.default
;; in /etc/wicd/other, which is not available in the build
;; environment, so here we install it manually in the output
;; directory.
(let ((dest-dir (string-append out "/etc/wicd"))
(name "dhclient.conf.template.default"))
(install-file (string-append "other/" name) dest-dir))
;; Copy index.theme from hicolor-icon-theme. This is needed to
;; allow wicd-gtk to find its icons.
(let ((hicolor (assoc-ref inputs "hicolor-icon-theme"))
(name "/share/icons/hicolor/index.theme"))
(install-file (string-append hicolor name)
(string-append out "/share/icons/hicolor")))
#t))
%standard-phases))))
;; Copy index.theme from hicolor-icon-theme. This is needed to
;; allow wicd-gtk to find its icons.
(let ((hicolor (assoc-ref inputs "hicolor-icon-theme"))
(name "/share/icons/hicolor/index.theme"))
(install-file (string-append hicolor name)
(string-append out "/share/icons/hicolor")))
#t))))))
(synopsis "Network connection manager")
(description "Wicd is a network manager that aims to simplify wired and
wireless networking.")

2
gnu/packages/wm.scm
View file

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

37
gnu/packages/xdisorg.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2015 Florian Paul Schmidt <mista.tapas@gmx.net>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; 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 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
@ -70,7 +70,8 @@ (define-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
#:use-module (gnu packages gtk)
#: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
@ -289,7 +290,7 @@ (define-public pixman
(define-public libdrm
(package
(name "libdrm")
(version "2.4.81")
(version "2.4.83")
(source
(origin
(method url-fetch)
@ -299,15 +300,30 @@ (define-public libdrm
".tar.bz2"))
(sha256
(base32
"1bhimr6za2ddisrvrv1qqd7c2a59s7jc954sjycq2w68b8cmrh4c"))
"1minzvsyz5hgm6ixpj8ysa6jsv7vm8qc8nx390jxdsk0v9ljd983"))
(patches (search-patches "libdrm-symbol-check.patch"))))
(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
`(("libpciaccess" ,libpciaccess)
("libpthread-stubs" ,libpthread-stubs)))
`(("libpciaccess" ,libpciaccess)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://dri.freedesktop.org/wiki/")
`(("pkg-config" ,pkg-config)))
(home-page "https://dri.freedesktop.org/wiki/")
(synopsis "Direct rendering userspace library")
(description "The Direct Rendering Infrastructure, also known as the DRI,
is a framework for allowing direct access to graphics hardware under the
@ -713,7 +729,7 @@ (define-public sxhkd
("xcb-util-keysyms" ,xcb-util-keysyms)
("xcb-util-wm" ,xcb-util-wm)))
(arguments
'(#:phases (alist-delete 'configure %standard-phases)
'(#:phases (modify-phases %standard-phases (delete 'configure))
#:tests? #f ; no check target
#:make-flags (list "CC=gcc"
(string-append "PREFIX=" %output))))
@ -820,7 +836,8 @@ (define-public xcape
(build-system gnu-build-system)
(arguments
`(#: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"))
"MANDIR=/share/man/man1"
"CC=gcc")))

22
gnu/packages/xfce.scm
View file

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

74
gnu/packages/xfig.scm
View file

@ -159,44 +159,42 @@ (define-public transfig
(arguments
`(#:tests? #f
#:phases
(alist-replace
'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((imake (assoc-ref inputs "imake"))
(out (assoc-ref outputs "out")))
(substitute* '("fig2dev/Imakefile"
"transfig/Imakefile")
(("XCOMM (BINDIR = )[[:graph:]]*" _ front)
(string-append front out "/bin"))
(("XCOMM USEINLINE") "USEINLINE")
;; The variable name is deceptive. The directory is used as an
;; installation path for bitmaps.
(("(XFIGLIBDIR =[[:blank:]]*)[[:graph:]]*" _ front)
(string-append front out "/lib"))
(("(XPMLIBDIR = )[[:graph:]]*" _ front)
(string-append front (assoc-ref inputs "libxpm") "/lib"))
(("(XPMINC = -I)[[:graph:]]*" _ front)
(string-append front (assoc-ref inputs "libxpm") "/include/X11"))
(("/usr/local/lib/fig2dev") (string-append out "/lib")))
;; The -a argument is required in order to pick up the correct paths
;; to several X header files.
(zero? (system* "xmkmf" "-a"))
(substitute* '("Makefile"
"fig2dev/Makefile"
"transfig/Makefile")
;; These imake variables somehow remain undefined
(("DefaultGcc2[[:graph:]]*Opt") "-O2")
;; Reset a few variable defaults that are set in imake templates
((imake) out)
(("(MANPATH = )[[:graph:]]*" _ front)
(string-append front out "/share/man"))
(("(CONFDIR = )([[:graph:]]*)" _ front default)
(string-append front out default)))))
(alist-cons-after
'install 'install/doc
(lambda _
(zero? (system* "make" "install.man")))
%standard-phases))))
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((imake (assoc-ref inputs "imake"))
(out (assoc-ref outputs "out")))
(substitute* '("fig2dev/Imakefile"
"transfig/Imakefile")
(("XCOMM (BINDIR = )[[:graph:]]*" _ front)
(string-append front out "/bin"))
(("XCOMM USEINLINE") "USEINLINE")
;; The variable name is deceptive. The directory is used as an
;; installation path for bitmaps.
(("(XFIGLIBDIR =[[:blank:]]*)[[:graph:]]*" _ front)
(string-append front out "/lib"))
(("(XPMLIBDIR = )[[:graph:]]*" _ front)
(string-append front (assoc-ref inputs "libxpm") "/lib"))
(("(XPMINC = -I)[[:graph:]]*" _ front)
(string-append front (assoc-ref inputs "libxpm") "/include/X11"))
(("/usr/local/lib/fig2dev") (string-append out "/lib")))
;; The -a argument is required in order to pick up the correct paths
;; to several X header files.
(zero? (system* "xmkmf" "-a"))
(substitute* '("Makefile"
"fig2dev/Makefile"
"transfig/Makefile")
;; These imake variables somehow remain undefined
(("DefaultGcc2[[:graph:]]*Opt") "-O2")
;; Reset a few variable defaults that are set in imake templates
((imake) out)
(("(MANPATH = )[[:graph:]]*" _ front)
(string-append front out "/share/man"))
(("(CONFDIR = )([[:graph:]]*)" _ front default)
(string-append front out default))))))
(add-after 'install 'install/doc
(lambda _
(zero? (system* "make" "install.man")))))))
(home-page "http://www.xfig.org/")
(synopsis "Create portable LaTeX figures")
(description

39
gnu/packages/xorg.scm
View file

@ -119,26 +119,25 @@ (define-public imake
("xproto" ,xproto)))
(arguments
`(#:phases
(alist-cons-after
'install 'install-data
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((cf-files (assoc-ref inputs "xorg-cf-files"))
(out (assoc-ref outputs "out"))
(unpack (assoc-ref %standard-phases 'unpack))
(patch-source-shebangs
(assoc-ref %standard-phases 'patch-source-shebangs)))
(mkdir "xorg-cf-files")
(with-directory-excursion "xorg-cf-files"
(apply unpack (list #:source cf-files))
(apply patch-source-shebangs (list #:source cf-files))
(substitute* '("mingw.cf" "Imake.tmpl" "nto.cf" "os2.cf"
"linux.cf" "Amoeba.cf" "cygwin.cf")
(("/bin/sh") (which "bash")))
(and (zero? (system* "./configure"
(string-append "SHELL=" (which "bash"))
(string-append "--prefix=" out)))
(zero? (system* "make" "install"))))))
%standard-phases)))
(modify-phases %standard-phases
(add-after 'install 'install-data
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((cf-files (assoc-ref inputs "xorg-cf-files"))
(out (assoc-ref outputs "out"))
(unpack (assoc-ref %standard-phases 'unpack))
(patch-source-shebangs
(assoc-ref %standard-phases 'patch-source-shebangs)))
(mkdir "xorg-cf-files")
(with-directory-excursion "xorg-cf-files"
(apply unpack (list #:source cf-files))
(apply patch-source-shebangs (list #:source cf-files))
(substitute* '("mingw.cf" "Imake.tmpl" "nto.cf" "os2.cf"
"linux.cf" "Amoeba.cf" "cygwin.cf")
(("/bin/sh") (which "bash")))
(and (zero? (system* "./configure"
(string-append "SHELL=" (which "bash"))
(string-append "--prefix=" out)))
(zero? (system* "make" "install"))))))))))
(home-page "http://www.x.org")
(synopsis "Source code configuration and build system")
(description