From ba0e14061aab502999c29b71412b8dd7e6b00bac Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 3 Jan 2020 16:00:44 +0100 Subject: gnu: mingetty: Fix cross-compilation. * gnu/packages/admin.scm (mingetty)[arguments]: When cross-compiling, set CC to the appropriate value in configure phase. --- gnu/packages/admin.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1725f2a563..81f9f3b70e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Guillaume Le Vaillant -;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -520,13 +520,17 @@ login, passwd, su, groupadd, and useradd.") `(#:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs outputs target #: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" + ,@(if (%current-target-system) + '((("CC=.*$") + (string-append "CC=" target "-gcc\n"))) + '()) (("^SBINDIR.*") (string-append "SBINDIR = " out "/sbin\n")) -- cgit v1.2.3 From f63495d31bf5acad00b6ee5f44a0553a67ee91fb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:09:50 +0100 Subject: gnu: guile: Apply Shepherd fix to the default Guile. * gnu/packages/guile.scm (guile-2.2/bug-fix): Remove variable. (guile-2.2)[source](patches): Add "guile-finalization-crash.patch". * gnu/packages/admin.scm (shepherd)[inputs, native-inputs]: Change from GUILE-2.2/BUG-FIX to GUILE-2.2. --- gnu/packages/admin.scm | 4 ++-- gnu/packages/guile.scm | 13 +------------ 2 files changed, 3 insertions(+), 14 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0790925416..460228db61 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -211,10 +211,10 @@ and provides a \"top-like\" mode (monitoring).") `(("pkg-config" ,pkg-config) ;; This is the Guile we use as a cross-compiler... - ("guile" ,guile-2.2/bug-fix))) + ("guile" ,guile-2.2))) (inputs ;; ... and this is the one that appears in shebangs when cross-compiling. - `(("guile" ,guile-2.2/bug-fix) ;for + `(("guile" ,guile-2.2) ;for ;; The 'shepherd' command uses Readline when used interactively. It's ;; an unusual use case though, so we don't propagate it. diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c0743269fc..7b6009770d 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -230,6 +230,7 @@ without requiring the source code to be rewritten.") "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk")) (modules '((guix build utils))) (patches (search-patches + "guile-finalization-crash.patch" "guile-2.2-skip-oom-test.patch")) ;; Remove the pre-built object files. Instead, build everything @@ -250,18 +251,6 @@ without requiring the source code to be rewritten.") (variable "GUILE_LOAD_COMPILED_PATH") (files '("lib/guile/2.2/site-ccache"))))))) -(define-public guile-2.2/bug-fix - ;; This variant contains a bug fix for a relatively rare crash that could - ;; affect shepherd as PID 1: . - (package - (inherit guile-2.2) - (version (string-append (package-version guile-2.2) "-1")) - (source (origin - (inherit (package-source guile-2.2)) - (patches - (append (search-patches "guile-finalization-crash.patch") - (origin-patches (package-source guile-2.2)))))))) - (define-public guile-2.2/fixed ;; A package of Guile 2.2 that's rarely changed. It is the one used ;; in the `base' module, and thus changing it entails a full rebuild. -- cgit v1.2.3 From bb93042c8beb881ab907fa802eefb3c4091039a2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 00:24:28 +0100 Subject: gnu: util-linux: Move libraries to separate output. Fixes . Reported by Diego Nicola Barbato . * gnu/packages/linux.scm (util-linux)[outputs]: Add "lib". [arguments]: Update #:configure-flags and the "move-static-libraries" phase accordingly. Add phases "patch-build-scripts" and "adjust-pkg-config-files". (e2fsprogs, psm, mtd-utils, f2fs-tools, f2fs-tools-1.7, eudev, xfsprogs)[inputs]: Change to the "lib" output of UTIL-LINUX. (btrfs-progs)[inputs]: Remove duplicate UTIL-LINUX inputs and change to use the "lib" output. * gnu/packages/admin.scm (pam-mount)[inputs]: Add UTIL-LINUX:LIB. (testdisk)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/android.scm (abootimg)[inputs]: Likewise. * gnu/packages/audio.scm (jack-1)[propagated-inputs]: Likewise. * gnu/packages/bootloaders.scm (syslinux, vboot-utils)[inputs]: Likewise. * gnu/packages/chez.scm (chez-scheme)[inputs]: Likewise. * gnu/packages/cryptsetup.scm (cryptsetup, cryptsetup-static)[inputs]: Likewise. * gnu/packages/databases.scm (postgresql, 4store)[inputs]: Likewise. * gnu/packages/disk.scm (ndctl, gptfdisk, fdisk, gparted, rmlint, volume-key)[inputs]: Likewise. (parted)[inputs]: Likewise. [native-inputs]: Add UTIL-LINUX. * gnu/packages/efi.scm (sbsigntools)[inputs]: Add UTIL-LINUX:LIB. * gnu/packages/engineering.scm (lib3mf)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise. * gnu/packages/file-systems.scm (glusterfs, jfsutils, zfs)[inputs]: Likewise. * gnu/packages/firmware.scm (ovmf)[inputs]: Likewise. * gnu/packages/fontutils.scm (fontconfig)[propagated-inputs]: Likewise. * gnu/packages/freedesktop.scm (localed)[inputs]: Likewise. * gnu/packages/glib.scm (glib, appstream-glib)[propagated-inputs]: Likewise. * gnu/packages/gnome.scm (tracker, gnome-terminal)[inputs]: Likewise. * gnu/packages/jupyter.scm (xeus)[inputs]: Likewise. * gnu/packages/kde.scm (kpmcore)[inputs]: Likewise. * gnu/packages/kodi.scm (crossguid)[inputs]: Likewise. * gnu/packages/lighting.scm (ola)[inputs]: Likewise. * gnu/packages/music.scm (libgig)[inputs]: Likewise. * gnu/packages/nfs.scm (nfs-utils)[inputs]: Likewise. * gnu/packages/opencog.scm (opencog)[inputs]: Likewise. * gnu/packages/package-management.scm (msitools)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/password-utils.scm (pwsafe)[inputs]: Likewise. * gnu/packages/telephony.scm (pjproject)[propagated-inputs]: Likewise. * gnu/packages/rdf.scm (rasqal)[inputs]: Likewise. * gnu/packages/search.scm (xapian)[inputs]: Likewise. * gnu/packages/sssd.scm (sssd)[native-inputs]: Likewise. * gnu/packages/storage.scm (ceph)[inputs]: Add UTIL-LINUX:LIB. * gnu/packages/task-management.scm (taskwarrior)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/virtualization.scm (libvirt, xen)[inputs]: Likewise. * gnu/packages/xorg.scm (libsm)[inputs]: Likewise. --- gnu/packages/admin.scm | 3 +- gnu/packages/android.scm | 2 +- gnu/packages/audio.scm | 2 +- gnu/packages/bootloaders.scm | 4 +-- gnu/packages/chez.scm | 2 +- gnu/packages/cryptsetup.scm | 4 +-- gnu/packages/databases.scm | 4 +-- gnu/packages/disk.scm | 18 ++++++------ gnu/packages/efi.scm | 1 + gnu/packages/engineering.scm | 2 +- gnu/packages/enlightenment.scm | 2 +- gnu/packages/file-systems.scm | 6 ++-- gnu/packages/firmware.scm | 2 +- gnu/packages/fontutils.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/glib.scm | 4 +-- gnu/packages/gnome.scm | 4 +-- gnu/packages/jupyter.scm | 2 +- gnu/packages/kde.scm | 2 +- gnu/packages/kodi.scm | 2 +- gnu/packages/lighting.scm | 2 +- gnu/packages/linux.scm | 55 ++++++++++++++++++++++++++----------- gnu/packages/music.scm | 2 +- gnu/packages/nfs.scm | 2 +- gnu/packages/opencog.scm | 2 +- gnu/packages/package-management.scm | 2 +- gnu/packages/password-utils.scm | 2 +- gnu/packages/rdf.scm | 2 +- gnu/packages/search.scm | 2 +- gnu/packages/sssd.scm | 2 +- gnu/packages/storage.scm | 1 + gnu/packages/task-management.scm | 2 +- gnu/packages/telephony.scm | 2 +- gnu/packages/virtualization.scm | 4 +-- gnu/packages/xorg.scm | 2 +- 35 files changed, 91 insertions(+), 63 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 460228db61..2b7cac7c16 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1717,7 +1717,7 @@ characters can be replaced as well, as can UTF-8 characters.") (build-system gnu-build-system) (inputs `(("ntfs-3g" ,ntfs-3g) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("openssl" ,openssl) ;; FIXME: add reiserfs. ("zlib" ,zlib) @@ -3561,6 +3561,7 @@ tcpdump and snoop.") ("lvm2" ,lvm2) ("openssl" ,openssl) ("pcre" ,pcre) + ("libmount" ,util-linux "lib") ("util-linux" ,util-linux))) (arguments `(#:configure-flags diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 30dd8925a4..62a5466ed0 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -835,7 +835,7 @@ script that you can put anywhere in your path.") (install-file "abootimg" bin) #t)))))) (inputs - `(("libblkid" ,util-linux))) + `(("libblkid" ,util-linux "lib"))) (home-page "https://ac100.grandou.net/abootimg") (synopsis "Tool for manipulating Android Boot Images") (description "This package provides a tool for manipulating old Android diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2b0e68fdc4..e14516e8e8 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1584,7 +1584,7 @@ especially for creating reverb effects. It supports impulse responses with 1, ;; uuid.h is included in the JACK type headers ;; db.h is included in the libjack metadata headers (propagated-inputs - `(("libuuid" ,util-linux) + `(("libuuid" ,util-linux "lib") ("bdb" ,bdb))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index c072ff8c8e..d3773bf6df 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -306,7 +306,7 @@ menu to select one of the installed operating systems.") ("perl" ,perl) ("python-2" ,python-2))) (inputs - `(("libuuid" ,util-linux) + `(("libuuid" ,util-linux "lib") ("mtools" ,mtools))) (arguments `(#:parallel-build? #f @@ -887,7 +887,7 @@ to Novena upstream, does not load u-boot.img from the first partition.") ("libyaml" ,libyaml) ("openssl" ,openssl) ("openssl:static" ,openssl "static") - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (home-page "https://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot") (synopsis "ChromiumOS verified boot utilities") diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 3330f91dfc..d08363a8dc 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -77,7 +77,7 @@ (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("libx11" ,libx11) ("xorg-rgb" ,xorg-rgb) ("nanopass" ,nanopass) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index 2a824d416e..d4c039ac04 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -62,7 +62,7 @@ ("libgcrypt" ,libgcrypt) ("lvm2" ,lvm2) ; device-mapper ("popt" ,popt) - ("util-linux" ,util-linux))) ; libuuid + ("util-linux" ,util-linux "lib"))) ;libuuid (synopsis "Hard disk encryption tool") (description "LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk @@ -142,6 +142,6 @@ files). This assumes LIBRARY uses Libtool." ("libgcrypt" ,libgcrypt-static) ("lvm2" ,lvm2-static) ("util-linux" ,util-linux "static") - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("popt" ,popt)))) (synopsis "Hard disk encryption tool (statically linked)"))) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5d770f46e5..7607c01391 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -165,7 +165,7 @@ ("avahi" ,avahi) ("cyrus-sasl" ,cyrus-sasl) ("openssl" ,openssl) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) ;; http://www.4store.org has been down for a while now. (home-page "https://github.com/4store/4store") (synopsis "Clustered RDF storage and query engine") @@ -974,7 +974,7 @@ as a drop-in replacement of MySQL.") (invoke "make" "-C" "contrib" "install")))))) (inputs `(("readline" ,readline) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("openssl" ,openssl) ("zlib" ,zlib))) (home-page "https://www.postgresql.org/") diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 8a17e8ddbb..d63ba3e58d 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -100,13 +100,15 @@ (inputs `(("lvm2" ,lvm2) ("readline" ,readline) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (native-inputs `(("gettext" ,gettext-minimal) + ;; For the tests. ("e2fsprogs" ,e2fsprogs) ("perl" ,perl) - ("python" ,python-2))) + ("python" ,python-2) + ("util-linux" ,util-linux))) (home-page "https://www.gnu.org/software/parted/") (synopsis "Disk partition editor") (description @@ -130,7 +132,7 @@ tables. It includes a library and command-line utility.") (inputs `(("gettext" ,gettext-minimal) ("guile" ,guile-1.8) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("parted" ,parted))) ;; The build neglects to look for its own headers in its own tree. A next ;; release should fix this, but may never come: GNU fdisk looks abandoned. @@ -171,7 +173,7 @@ tables, and it understands a variety of different formats.") `(("gettext" ,gettext-minimal) ("ncurses" ,ncurses) ("popt" ,popt) - ("util-linux" ,util-linux))) ; libuuid + ("util-linux" ,util-linux "lib"))) ;libuuid (arguments `(#:test-target "test" #:phases @@ -359,7 +361,7 @@ and can dramatically shorten the lifespan of the drive if left unchecked.") ;; as '/dev/disk/by-id' `(#:tests? #f)) (inputs - `(("util-linux" ,util-linux) + `(("util-linux" ,util-linux "lib") ("parted" ,parted) ("glib" ,glib) ("gtkmm" ,gtkmm) @@ -587,7 +589,7 @@ automatically finding out which program to use for what file type.") (inputs `(("cryptsetup" ,cryptsetup) ("nss" ,nss) - ("libblkid" ,util-linux) + ("libblkid" ,util-linux "lib") ("lvm2" ,lvm2) ; for "-ldevmapper" ("glib" ,glib) ("gpgme" ,gpgme))) @@ -640,7 +642,7 @@ passphrases.") ("json-c" ,json-c) ("keyutils" ,keyutils) ("kmod" ,kmod) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (arguments `(#:configure-flags (list "--disable-asciidoctor" ; use docbook-xsl instead @@ -809,7 +811,7 @@ LVM D-Bus API).") ("libelf" ,libelf) ("elfutils" ,elfutils) ("json-glib" ,json-glib) - ("libblkid" ,util-linux))) + ("libblkid" ,util-linux "lib"))) (home-page "https://rmlint.rtfd.org") (synopsis "Remove duplicates and other lint from the file system") (description "@command{rmlint} finds space waste and other broken things diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index b6e93dd618..2bfebfdbc2 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -113,6 +113,7 @@ environment presented by Intel's EFI.") ("util-linux" ,util-linux))) ; getopt (inputs `(("gnu-efi" ,gnu-efi) + ("libuuid" ,util-linux "lib") ("openssl" ,openssl))) (synopsis "EFI signing tools") (description "This package provides tools for signing EFI binaries.") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3f4cdbd172..bd611f01f2 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2149,7 +2149,7 @@ engineers for reverse engineers.") (native-inputs `(("googletest-source" ,(package-source googletest)))) (inputs - `(("libuuid" ,util-linux))) + `(("libuuid" ,util-linux "lib"))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index d79ca949f2..121627dd88 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -134,7 +134,7 @@ ("lz4" ,lz4) ("openssl" ,openssl) ("pulseaudio" ,pulseaudio) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("wayland" ,wayland) ("zlib" ,zlib))) (arguments diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index a3dc993055..50afe29c77 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -127,7 +127,7 @@ single file can be mounted.") "jfsutils-include-systypes.patch")))) (build-system gnu-build-system) (inputs - `(("util-linux" ,util-linux))) + `(("util-linux" ,util-linux "lib"))) (home-page "http://jfs.sourceforge.net/home.html") (synopsis "Utilities for managing JFS file systems") (description @@ -271,7 +271,7 @@ non-determinism in the build process.") ("fuse", fuse) ("openssl" ,openssl) ("liburcu" ,liburcu) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("libxml2" ,libxml2) ("readline" ,readline) ("zlib" ,zlib) @@ -503,7 +503,7 @@ APFS.") ("openssl" ,openssl) ("python" ,python) ("python-cffi" ,python-cffi) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("zlib" ,zlib))) (home-page "https://zfsonlinux.org/") (synopsis "Native ZFS on Linux") diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 0156a4e9fa..ab03bc32fd 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -253,7 +253,7 @@ coreboot.") ("gcc" ,gcc-5) ("nasm" ,nasm) ("python-2" ,python-2) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (arguments `(#:tests? #f ; No check target. #:phases diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index b5c8d27c7e..107967bb5d 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -308,7 +308,7 @@ fonts to/from the WOFF2 format.") ;; In Requires or Requires.private of fontconfig.pc. (propagated-inputs `(("expat" ,expat) ("freetype" ,freetype) - ("libuuid" ,util-linux))) + ("libuuid" ,util-linux "lib"))) (inputs `(("gs-fonts" ,gs-fonts))) (native-inputs `(("gperf" ,gperf) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ed221439b4..79363f5662 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -476,7 +476,7 @@ of a the system to know what users are logged in, and where.") (find-files ".." "^(kbd-model-map|language-fallback-map)$")) #t))))))) (native-inputs (package-native-inputs elogind)) - (inputs `(("libmount" ,util-linux) + (inputs `(("libmount" ,util-linux "lib") ("xkeyboard-config" ,xkeyboard-config) ("kbd" ,kbd) ,@(package-inputs elogind))) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 4fe38b7f25..2b8700f6da 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -188,7 +188,7 @@ shared NFS home directories.") `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.pc ;; These are in the Requires.private field of gio-2.0.pc - ("util-linux" ,util-linux) ; for libmount + ("util-linux" ,util-linux "lib") ;for libmount ("libselinux" ,libselinux) ("zlib" ,zlib))) (inputs @@ -931,7 +931,7 @@ programming language. It also contains the utility (propagated-inputs `(("gcab" ,gcab) ; for .pc file ("gdk-pixbuf" ,gdk-pixbuf) ; for .pc file - ("util-linux" ,util-linux))) ; for .pc file + ("libuuid" ,util-linux "lib"))) ; for .pc file (inputs `(("glib" ,glib) ("gperf" ,gperf) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ac566b8647..b841a72c3b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3832,7 +3832,7 @@ more fun.") ("vte" ,vte) ("gnutls" ,gnutls) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("vala" ,vala))) (home-page "https://wiki.gnome.org/Apps/Terminal") (synopsis "Terminal emulator") @@ -7291,7 +7291,7 @@ easy, safe, and automatic.") ("openjpeg" ,openjpeg-1) ("libseccomp" ,libseccomp) ("libsoup" ,libsoup) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("network-manager" ,network-manager))) (synopsis "Metadata database, indexer and search tool") (home-page "https://wiki.gnome.org/Projects/Tracker") diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index e65a8bd6c9..3f16bc27f1 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -171,7 +171,7 @@ Messaging Protocol}.") ("cppzmq" ,cppzmq) ("zeromq" ,zeromq) ("openssl" ,openssl) - ("util-linux" ,util-linux))) ;libuuid + ("util-linux" ,util-linux "lib"))) ;libuuid (home-page "https://quantstack.net/xeus") (synopsis "C++ implementation of the Jupyter Kernel protocol") (description diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index bb5c25014e..924ca752d9 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -472,7 +472,7 @@ cards.") ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase) ("qca" ,qca) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (home-page "https://community.kde.org/Frameworks") (synopsis "Library for managing partitions") (description "Library for managing partitions.") diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 23afd138a3..bc61e96d19 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -121,7 +121,7 @@ (string-append out "/lib")) #t)))))) (inputs - `(("util-linux" ,util-linux))) + `(("libuuid" ,util-linux "lib"))) (synopsis "Lightweight universal identifier library") (description "CrossGuid is a minimal GUID/UUID generator library for C++.") diff --git a/gnu/packages/lighting.scm b/gnu/packages/lighting.scm index b91f5c8834..18110420de 100644 --- a/gnu/packages/lighting.scm +++ b/gnu/packages/lighting.scm @@ -57,7 +57,7 @@ `(("libftdi" ,libftdi) ("libmicrohttpd" ,libmicrohttpd) ("libusb" ,libusb) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("zlib" ,zlib))) (propagated-inputs ;; Ola 0.10.5 only supports protobuf 2.x, and building it with 3.x breaks. diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7e2d04e53e..e91d4c2c21 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1118,19 +1118,33 @@ providing the system administrator with some help in common tasks.") (("build_kill=yes") "build_kill=no")) #t)))) (build-system gnu-build-system) - (outputs '("out" - "static")) ;>2 MiB of static .a libraries + (outputs '("out" ;6.4 MiB executables and documentation + "lib" ;8.8 MiB shared libraries, headers and locales + "static")) ;2.9 MiB static .a libraries (arguments `(#:configure-flags (list "--disable-use-tty-group" "--enable-fs-paths-default=/run/current-system/profile/sbin" ;; Don't try to chown root:root mount and umount "--disable-makeinstall-chown" + "--localstatedir=/var" + (string-append "--localedir=" + (assoc-ref %outputs "lib") + "/share/locale") ;; Install completions where our ;; bash-completion package expects them. (string-append "--with-bashcompletiondir=" (assoc-ref %outputs "out") "/etc/bash_completion.d")) #:phases (modify-phases %standard-phases + (add-before 'configure 'patch-build-scripts + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "configure" + ;; The build system assumes that we want to install + ;; libraries below $exec_prefix when $libdir does not + ;; match any of the "usual" locations. Fix that. + (("usrlib_execdir='\\$\\{exec_prefix\\}'\\$libdir") + "usrlib_execdir=$libdir")) + #t)) (add-before 'build 'set-umount-file-name (lambda* (#:key outputs #:allow-other-keys) ;; Tell 'eject' the right file name of 'umount'. @@ -1150,10 +1164,12 @@ providing the system administrator with some help in common tasks.") #t))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) + (let ((lib (assoc-ref outputs "lib")) (static (assoc-ref outputs "static"))) + + ;; Move static libraries to the "static" output. (mkdir-p (string-append static "/lib")) - (with-directory-excursion out + (with-directory-excursion lib (for-each (lambda (file) (rename-file file (string-append static "/" @@ -1166,7 +1182,16 @@ providing the system administrator with some help in common tasks.") (substitute* (find-files "lib" "\\.la$") (("old_library=.*") "old_library=''\n"))) - #t)))))) + #t))) + (add-after 'install 'adjust-pkg-config-files + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (assoc-ref outputs "lib"))) + ;; Drop the unused "prefix=" and "exec_prefix=" variables from + ;; the pkg-config files to avoid a cyclic reference on "out". + (substitute* (find-files (string-append lib "/lib/pkgconfig") + "\\.pc$") + (("^(exec_)?prefix=.*") ""))) + #t))))) (inputs `(("zlib" ,zlib) ("ncurses" ,ncurses) @@ -1333,7 +1358,7 @@ slabtop, and skill.") (base32 "00nwl1ppjalxbnx40dsm895r3q793p8nni6n81saj7faj2szdyk5")))) (build-system gnu-build-system) - (inputs `(("util-linux" ,util-linux))) + (inputs `(("util-linux" ,util-linux "lib"))) (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo) ;for the libext2fs Info manual @@ -2746,7 +2771,7 @@ from the module-init-tools project.") ;; When linked against libblkid, eudev can populate /dev/disk/by-label ;; and similar; it also installs the '60-persistent-storage.rules' file, ;; which contains the rules to do that. - `(("util-linux" ,util-linux) ;for blkid + `(("util-linux" ,util-linux "lib") ;for blkid ("kmod" ,kmod))) (home-page "https://wiki.gentoo.org/wiki/Project:Eudev") (synopsis "Userspace device management") @@ -4048,11 +4073,9 @@ and copy/paste text in the console and in xterm.") #:test-target "test" #:parallel-tests? #f)) ; tests fail when run in parallel (inputs `(("e2fsprogs" ,e2fsprogs) - ("libblkid" ,util-linux) - ("libblkid:static" ,util-linux "static") - ("libuuid" ,util-linux) - ("libuuid:static" ,util-linux "static") ("lzo" ,lzo) + ("util-linux:lib" ,util-linux "lib") ;for libblkid and libuuid + ("util-linux:static" ,util-linux "static") ;ditto ("zlib" ,zlib) ("zlib:static" ,zlib "static") ("zstd" ,zstd "lib") @@ -4182,7 +4205,7 @@ obviously it can be shared with files outside our set).") ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (inputs - `(("libuuid" ,util-linux) + `(("libuuid" ,util-linux "lib") ("libselinux" ,libselinux))) (home-page "https://f2fs.wiki.kernel.org/") (synopsis "Userland tools for f2fs") @@ -4208,7 +4231,7 @@ disks and SD cards. This package provides the userland utilities.") (base32 "0z9c0y3qq75iyqknl5k0v7v46l8c3pcifpqb0yqalrs24blkm7dk")))) (inputs - `(("libuuid" ,util-linux))))) + `(("libuuid" ,util-linux "lib"))))) (define-public freefall (package @@ -4877,7 +4900,7 @@ are exceeded.") ("pkg-config" ,pkg-config))) (inputs `(("acl" ,acl) ; extended attributes (xattr) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("lzo" ,lzo) ("openssl" ,openssl) ; optional crypto support ("zlib" ,zlib) @@ -5655,7 +5678,7 @@ libraries, which are often integrated directly into libfabric.") "psm-disable-memory-stats.patch")))) (build-system gnu-build-system) (outputs '("out" "debug")) - (inputs `(("libuuid" ,util-linux))) + (inputs `(("libuuid" ,util-linux "lib"))) (arguments '(#:make-flags `("PSM_USE_SYS_UUID=1" "CC=gcc" "WERROR=" ,(string-append "INSTALL_PREFIX=" %output) @@ -6032,7 +6055,7 @@ IP addresses and routes, and configure IPsec.") (native-inputs `(("gettext" ,gettext-minimal))) (inputs - `(("libuuid" ,util-linux) + `(("libuuid" ,util-linux "lib") ("python" ,python-wrapper))) (home-page "https://xfs.wiki.kernel.org/") (synopsis "XFS file system tools") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2583191f33..4a4d870ac5 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2252,7 +2252,7 @@ improves on support for JACK features, such as JACK MIDI.") "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn")))) (build-system gnu-build-system) (inputs - `(("libuuid" ,util-linux) + `(("libuuid" ,util-linux "lib") ("libsndfile" ,libsndfile))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index b81623fd07..7efee9360a 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -113,7 +113,7 @@ ("rpcsvc-proto" ,rpcsvc-proto) ;for 'rpcgen' ("sqlite" ,sqlite) ("lvm2" ,lvm2) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("mit-krb5" ,mit-krb5) ("libtirpc" ,libtirpc))) (native-inputs diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index c6828d6603..6484c10dce 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -235,7 +235,7 @@ tasks.") ("cogutil" ,cogutil) ("gmp" ,gmp) ("guile" ,guile-2.2) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("link-grammar" ,link-grammar))) (native-inputs `(("cxxtest" ,cxxtest) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6becdb22a9..009dfba85c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -939,7 +939,7 @@ Microsoft cabinet (.@dfn{CAB}) files.") ("glib" ,glib) ("libgsf" ,libgsf) ("libxml2" ,libxml2) - ("uuid" ,util-linux))) + ("uuid" ,util-linux "lib"))) (home-page "https://wiki.gnome.org/msitools") (synopsis "Windows Installer file manipulation tool") (description diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index db5f54e1d9..bef32e8d29 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -209,7 +209,7 @@ algorithms AES or Twofish.") ("zip" ,zip))) (inputs `(("curl" ,curl) ("file" ,file) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("libxt" ,libxt) ("libxtst" ,libxtst) ("openssl" ,openssl) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index b086d2f00f..c69e9cb892 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -217,7 +217,7 @@ taxonomic inference capability.") ("libxml2" ,libxml2) ("mpfr" ,mpfr) ("pcre" ,pcre) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (propagated-inputs `(("raptor2" ,raptor2))) ; stipulated by rasqal.pc (arguments diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 3b7bc36889..5410263d5b 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -59,7 +59,7 @@ (base32 "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm index 7bb71dce13..905f0b11ca 100644 --- a/gnu/packages/sssd.scm +++ b/gnu/packages/sssd.scm @@ -164,7 +164,7 @@ fundamental object types for C.") ("libxml2" ,libxml2) ; for xmllint ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) - ("util-linux" ,util-linux))) ; for uuid.h, reqired for KCM + ("util-linux" ,util-linux "lib"))) ;for uuid.h, reqired for KCM (home-page "https://pagure.io/SSSD/sssd/") (synopsis "System security services daemon") (description "SSSD is a system daemon. Its primary function is to provide diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index a5614777fa..e3a883a535 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -231,6 +231,7 @@ ("snappy" ,snappy) ("udev" ,eudev) ("util-linux" ,util-linux) + ("util-linux:lib" ,util-linux "lib") ("xfsprogs" ,xfsprogs) ("zlib" ,zlib))) (home-page "https://ceph.com/") diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 701e14a5e2..a0313c17c2 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -40,7 +40,7 @@ (inputs `(("gnutls" ,gnutls) ("lua" ,lua) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (arguments `(#:tests? #f ; No tests implemented. #:phases diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 1ae0724ba2..8a84cbc2cd 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -624,7 +624,7 @@ calls and messages") ("libsrtp" ,libsrtp) ("gnutls" ,gnutls) ("resample", resample) - ("util-linux" ,util-linux))) + ("util-linux" ,util-linux "lib"))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 51ba3c602a..a3db8e813d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -480,7 +480,7 @@ manage system or application containers.") ("libpcap" ,libpcap) ("libnl" ,libnl) ("libtirpc" ,libtirpc) ;for - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("lvm2" ,lvm2) ;for libdevmapper ("curl" ,curl) ("openssl" ,openssl) @@ -1336,7 +1336,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) ("pixman" ,pixman) ("qemu" ,qemu-minimal) ("seabios" ,seabios) - ("util-linux" ,util-linux) ; uuid + ("util-linux" ,util-linux "lib") ; uuid ; TODO: ocaml-findlib, ocaml-nox. ("xz" ,xz) ; for liblzma ("zlib" ,zlib))) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9127d38c3a..c7b4c8299b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1233,7 +1233,7 @@ hit when running single-threaded.") `(("libice" ,libice))) ; SMlib.h includes ICElib.h (inputs `(("xtrans" ,xtrans) - ("util-linux" ,util-linux))) + ("libuuid" ,util-linux "lib"))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") -- cgit v1.2.3 From 4bd428a7ce382f623784a3ff8186aadc3cebca91 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 17 Jan 2020 19:27:01 +0100 Subject: gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo'. * gnu/packages/abiword.scm (abiword)[inputs]: Change from LIBJPEG to LIBJPEG-TURBO. * gnu/packages/admin.scm (testdisk)[inputs]: Likewise. * gnu/packages/algebra.scm (giac)[inputs]: Likewise. * gnu/packages/animation.scm (synfig)[inputs]: Likewise. * gnu/packages/astronomy.scm (gnuastro, celestia)[inputs]: Likewise. * gnu/packages/cdrom.scm (dvdstyler)[inputs]: Likewise. * gnu/packages/cran.scm (r-jpeg, r-tiff, r-readbitmap)[inputs]: Likewise. * gnu/packages/cups.scm (cups-filters, hplip)[inputs]: Likewise. * gnu/packages/display-managers.scm (slim)[inputs]: Likewise. * gnu/packages/ebook.scm (fbreader)[inputs]: Likewise. * gnu/packages/emacs.scm (emacs)[inputs]: Likewise. * gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise. * gnu/packages/fltk.scm (fltk, ntk)[inputs]: Likewise. * gnu/packages/fontutils.scm (fontforge)[inputs]: Likewise. * gnu/packages/freedesktop.scm (weston)[inputs]: Likewise. * gnu/packages/game-development.scm (sfml, allegro, aseprite, python-pygame, eureka, ioquake3)[inputs]: Likewise. * gnu/packages/games.scm (adanaxisgpl, freedroidrpg, irrlicht, minetest, fizmo, supertuxkart, gzdoom, xmoto, xonotic)[inputs]: Likewise. * gnu/packages/gd.scm (gd, perl-gd)[inputs]: Likewise. * gnu/packages/ghostscript.scm (lcms)[inputs]: Likewise. (ghostscript)[inputs, native-inputs]: Likewise. * gnu/packages/gimp.scm (gegl, gimp)[inputs]: Likewise. * gnu/packages/gnome.scm (libgnomeui, eog, tracker-miners, gthumb)[inputs]: Likewise. * gnu/packages/gnunet.scm (libextractor)[inputs]: Likewise. * gnu/packages/gnustep.scm (windowmaker)[inputs]: Likewise. * gnu/packages/graphics.scm (blender, blender-2.79, openimageio, openscenegraph, openscenegraph-3.4, povray, fgallery)[inputs]: Likewise. * gnu/packages/graphviz.scm (graphviz)[inputs]: Likewise. * gnu/packages/gstreamer.scm (gst-plugins-good)[inputs]: Likewise. * gnu/packages/gtk.scm (gdk-pixbuf)[inputs]: Likewise. * gnu/packages/image-processing.scm (dcmtk, mia, vtk, opencv, vips, nip2, vxl, insight-toolkit)[inputs]: Likewise. * gnu/packages/image-viewers.scm (gpicview, luminance-hdr)[inputs]: Likewise. * gnu/packages/image.scm (jpegoptim, libtiff, leptonica, imlib2, freeimage, vigra, libwebp, libmng, jasper, steghide, jp2a)[inputs]: Likewise. * gnu/packages/imagemagick.scm (imagemagick, graphicsmagick)[inputs]: Likewise. * gnu/packages/java.scm (icedtea-6, icedtea-7, openjdk9, openjdk11, openjdk12)[inputs]: Likewise. * gnu/packages/kde-frameworks.scm (khtml)[inputs]: Likewise. * gnu/packages/kodi.scm (kodi)[inputs]: Likewise. * gnu/packages/machine-learning.scm (dlib, tensorflow)[inputs]: Likewise. * gnu/packages/mate.scm (atril, eom)[inputs]: Likewise. * gnu/packages/maths.scm (hdf4, hdf-java, hdf-eos2, netcdf)[inputs]: Likewise. * gnu/packages/netpbm.scm (netpbm)[inputs]: Likewise. * gnu/packages/pdf.scm (zathura-pdf-mupdf, podofo, mupdf, fbida)[inputs]: Likewise. * gnu/packages/photo.scm (libraw, libpano13, enblend-enfuse, darktable, hugin, rawtherapee)[inputs]: Likewise. * gnu/packages/prolog.scm (swi-prolog)[native-inputs]: Likewise. * gnu/packages/python-xyz.scm (python-hdf4, python-pillow)[inputs]: Likewise. * gnu/packages/qt.scm (qtbase, qtwebkit)[inputs]: Likewise. * gnu/packages/rdesktop.scm (freerdp)[inputs]: Likewise. * gnu/packages/scanner.scm (sane-backends, xsane)[inputs]: Likewise. * gnu/packages/scheme.scm (racket)[inputs]: Likewise. * gnu/packages/scribus.scm (scribus)[inputs]: Likewise. * gnu/packages/sdl.scm (sdl-image)[propagated-inputs]: Likewise. (guile-sdl)[native-inputs]: Likewise. * gnu/packages/spice.scm (spice-gtk)[inputs]: Likewise. * gnu/packages/statistics.scm (r-with-tests)[inputs]: Likewise. * gnu/packages/tcl.scm (perl-tk)[inputs]: Likewise. * gnu/packages/upnp.scm (readymedia)[inputs]: Likewise. * gnu/packages/video.scm (mplayer, mpv, v4l-utils, motion)[inputs]: Likewise. * gnu/packages/web-browsers.scm (dillo, links)[inputs]: Likewise. * gnu/packages/web.scm (netsurf)[inputs]: Likewise. * gnu/packages/webkit.scm (webkitgtk)[inputs]: Likewise. * gnu/packages/wine.scm (wine)[inputs]: Likewise. * gnu/packages/wv.scm (wv)[inputs]: Likewise. * gnu/packages/wxwidgets.scm (wxwidgets, wxwidgets-2)[inputs]: Likewise. * gnu/packages/xdisorg.scm (xscreensaver)[inputs]: Likewise. * gnu/packages/xfce.scm (tumbler)[inputs]: Likewise. * gnu/packages/xfig.scm (xfig, transfig)[inputs]: Likewise. * gnu/packages/xorg.scm (xpra)[inputs]: Likewise. --- gnu/packages/abiword.scm | 2 +- gnu/packages/admin.scm | 2 +- gnu/packages/algebra.scm | 2 +- gnu/packages/animation.scm | 2 +- gnu/packages/astronomy.scm | 4 ++-- gnu/packages/cdrom.scm | 2 +- gnu/packages/cran.scm | 6 +++--- gnu/packages/cups.scm | 4 ++-- gnu/packages/display-managers.scm | 2 +- gnu/packages/ebook.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/enlightenment.scm | 2 +- gnu/packages/fltk.scm | 4 ++-- gnu/packages/fontutils.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/game-development.scm | 12 ++++++------ gnu/packages/games.scm | 18 +++++++++--------- gnu/packages/gd.scm | 4 ++-- gnu/packages/ghostscript.scm | 6 +++--- gnu/packages/gimp.scm | 4 ++-- gnu/packages/gnome.scm | 8 ++++---- gnu/packages/gnunet.scm | 2 +- gnu/packages/gnustep.scm | 2 +- gnu/packages/graphics.scm | 14 +++++++------- gnu/packages/graphviz.scm | 2 +- gnu/packages/gstreamer.scm | 2 +- gnu/packages/gtk.scm | 2 +- gnu/packages/image-processing.scm | 16 ++++++++-------- gnu/packages/image-viewers.scm | 4 ++-- gnu/packages/image.scm | 22 +++++++++++----------- gnu/packages/imagemagick.scm | 4 ++-- gnu/packages/java.scm | 10 +++++----- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/kodi.scm | 2 +- gnu/packages/machine-learning.scm | 4 ++-- gnu/packages/mate.scm | 4 ++-- gnu/packages/maths.scm | 8 ++++---- gnu/packages/netpbm.scm | 2 +- gnu/packages/pdf.scm | 8 ++++---- gnu/packages/photo.scm | 12 ++++++------ gnu/packages/prolog.scm | 2 +- gnu/packages/python-xyz.scm | 4 ++-- gnu/packages/qt.scm | 4 ++-- gnu/packages/rdesktop.scm | 2 +- gnu/packages/scanner.scm | 4 ++-- gnu/packages/scheme.scm | 2 +- gnu/packages/scribus.scm | 2 +- gnu/packages/sdl.scm | 4 ++-- gnu/packages/spice.scm | 2 +- gnu/packages/statistics.scm | 2 +- gnu/packages/tcl.scm | 2 +- gnu/packages/upnp.scm | 2 +- gnu/packages/video.scm | 8 ++++---- gnu/packages/web-browsers.scm | 4 ++-- gnu/packages/web.scm | 2 +- gnu/packages/webkit.scm | 2 +- gnu/packages/wine.scm | 2 +- gnu/packages/wv.scm | 2 +- gnu/packages/wxwidgets.scm | 4 ++-- gnu/packages/xdisorg.scm | 2 +- gnu/packages/xfce.scm | 2 +- gnu/packages/xfig.scm | 4 ++-- gnu/packages/xorg.scm | 2 +- 63 files changed, 140 insertions(+), 140 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm index 2b65a02242..9cfd12a1e6 100644 --- a/gnu/packages/abiword.scm +++ b/gnu/packages/abiword.scm @@ -95,7 +95,7 @@ ("libchamplain" ,libchamplain) ("libglade" ,libglade) ("libgsf" ,libgsf) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("librsvg" ,librsvg) ("libxml2" ,libxml2) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2b7cac7c16..c40529f817 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1722,7 +1722,7 @@ characters can be replaced as well, as can UTF-8 characters.") ;; FIXME: add reiserfs. ("zlib" ,zlib) ("e2fsprogs" ,e2fsprogs) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("ncurses" ,ncurses))) (home-page "https://www.cgsecurity.org/wiki/TestDisk") (synopsis "Data recovery tool") diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index a31ac8dab0..d3e4dfbd86 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -405,7 +405,7 @@ precision.") ("gsl" ,gsl) ("lapack" ,lapack) ("libao" ,ao) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libsamplerate" ,libsamplerate) ("libx11" ,libx11) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 08bf4eb1de..0357ac1190 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -112,7 +112,7 @@ C++ @dfn{Standard Template Library} (STL).") `(("boost" ,boost) ("ffmpeg" ,ffmpeg) ("libdv" ,libdv) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libmng" ,libmng) ("zlib" ,zlib))) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 3bb236fde9..2ac41e17a0 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -132,7 +132,7 @@ header.") (inputs `(("cfitsio" ,cfitsio) ("gsl" ,gsl) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("wcslib" ,wcslib) ("zlib" ,zlib))) @@ -218,7 +218,7 @@ objects.") `(("glu" ,glu) ("glew" ,glew) ("libtheora" ,libtheora) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ;; maybe required? ("mesa" ,mesa) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index b6bdf33eef..64aa38d785 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -459,7 +459,7 @@ capacity is user-selectable.") ("eudev" ,eudev) ("fontconfig" ,fontconfig) ("libexif" ,libexif) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("ffmpeg" ,ffmpeg-3.4))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ff2490bc31..3368d60042 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1347,7 +1347,7 @@ applications. That is, compute distances and related measures for angular (base32 "1a8mi70x79a691r40yiw684jkg1mr9n8agkxlcksxcnrdybs9c0x")))) (build-system r-build-system) - (inputs `(("libjpeg" ,libjpeg))) + (inputs `(("libjpeg" ,libjpeg-turbo))) (home-page "http://www.rforge.net/jpeg/") (synopsis "Read and write JPEG images with R") (description "This package provides a way to read, write and display @@ -9704,7 +9704,7 @@ redundant complex conjugate when the input is real data.") (build-system r-build-system) (inputs `(("libtiff" ,libtiff) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) (home-page "http://www.rforge.net/tiff/") (synopsis "Read and write TIFF images") @@ -18295,7 +18295,7 @@ currently limited to 8 bit greyscale images and 24, 32 bit (A)RGB images.") (properties `((upstream-name . "readbitmap"))) (build-system r-build-system) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng))) (propagated-inputs `(("r-bmp" ,r-bmp) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 8fbb2ee4f6..d8c1d11944 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -158,7 +158,7 @@ ("ijs" ,ijs) ("dbus" ,dbus) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("glib" ,glib) @@ -585,7 +585,7 @@ should only be used as part of the Guix cups-pk-helper service.") (inputs `(("cups-minimal" ,cups-minimal) ("dbus" ,dbus) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libusb" ,libusb) ("python" ,python) ("python-dbus" ,python-dbus) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index bfe1a8f6dd..70caeab06d 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -244,7 +244,7 @@ GTK+, lets you select a desktop session and log in to it.") (build-system cmake-build-system) (inputs `(("linux-pam" ,linux-pam) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("freeglut" ,freeglut) ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 7f8aa42e95..683be7927a 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -290,7 +290,7 @@ designed to be used in a generic text renderer.") ("fribidi" ,fribidi) ("glib" ,glib) ("gtk+-2" ,gtk+-2) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("liblinebreak" ,liblinebreak) ("libxft" ,libxft) ("sqlite" ,sqlite) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b26c928e87..cfbcb83872 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -173,7 +173,7 @@ ("libxft" ,libxft) ("libtiff" ,libtiff) ("giflib" ,giflib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("imagemagick" ,imagemagick) ("acl" ,acl) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 121627dd88..3fc9d522f4 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -124,7 +124,7 @@ ("harfbuzz" ,harfbuzz) ("luajit" ,luajit) ("libinput" ,libinput-minimal) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libsndfile" ,libsndfile) ("libtiff" ,libtiff) diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index 40d5e7e513..204d2f8483 100644 --- a/gnu/packages/fltk.scm +++ b/gnu/packages/fltk.scm @@ -56,7 +56,7 @@ (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libx11" ,libx11) ("libxft" ,libxft) @@ -129,7 +129,7 @@ UI builder called FLUID that can be used to create applications in minutes.") (assoc-ref outputs "out") "/lib")) #t))))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("glu" ,glu) ("waf" ,python-waf))) ;; ntk.pc lists "x11" and "xft" in Requires.private, and "cairo" in diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 107967bb5d..34e17fdf67 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -594,7 +594,7 @@ definitions.") ("libSM" ,libsm) ("libX11" ,libx11) ("libXi" ,libxi) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libltdl" ,libltdl) ("libpng" ,libpng) ("libspiro" ,libspiro) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 1b61ea43dd..7a7eea2d67 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -687,7 +687,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") ("lcms" ,lcms) ("libevdev" ,libevdev) ("libinput" ,libinput-minimal) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libunwind" ,libunwind) ("libva" ,libva) ("libwebp" ,libwebp) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ee8dea23b5..54703cf846 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -527,7 +527,7 @@ clone.") ("xcb-util-image" ,xcb-util-image) ("libxrandr" ,libxrandr) ("eudev" ,eudev) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libsndfile" ,libsndfile) ("stb-image" ,stb-image) ("stb-image-write" ,stb-image-write))) @@ -746,7 +746,7 @@ etc.") ("freetype" ,freetype) ("glu" ,glu) ("gtk" ,gtk+-2) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtheora" ,libtheora) ("libvorbis" ,libvorbis) @@ -828,7 +828,7 @@ etc.") ("curl" ,curl) ("freetype" ,freetype) ("giflib" ,giflib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libwebp" ,libwebp) ("libx11" ,libx11) @@ -980,7 +980,7 @@ interface (API).") ("sdl-mixer" ,sdl-mixer) ("sdl-ttf" ,sdl-ttf) ("sdl-gfx" ,sdl-gfx) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libX11" ,libx11) ("libsmpeg" ,libsmpeg) @@ -1663,7 +1663,7 @@ scripted in a Python-like language.") ("libxft" ,libxft) ("libxinerama" ,libxinerama) ("libfontconfig" ,fontconfig) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("fltk" ,fltk) ("zlib" ,zlib))) @@ -1835,7 +1835,7 @@ of the others") (build-system gnu-build-system) (inputs `(("sdl2" ,sdl2) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("openal" ,openal) ("curl" ,curl) ("opusfile" ,opusfile) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index eb703d114a..49a2bde6eb 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -235,7 +235,7 @@ `(("expat" ,expat) ("freeglut" ,freeglut) ("glu" ,glu) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libogg" ,libogg) ("libtiff" ,libtiff) ("libvorbis" ,libvorbis) @@ -683,7 +683,7 @@ effects and music to make a completely free game.") `(("pkg-config" ,pkg-config))) (inputs `(("glu" ,glu) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libogg" ,libogg) ("libpng" ,libpng) ("libvorbis" ,libvorbis) @@ -1925,7 +1925,7 @@ are primarily in English, however some in other languages are provided.") #:make-flags '("CC=gcc" "sharedlib"))) (inputs `(("bzip2" ,bzip2) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libx11" ,libx11) ("libxxf86vm" ,libxxf86vm) @@ -2072,7 +2072,7 @@ match, cannon keep, and grave-itation pit.") ("gmp" ,gmp) ("irrlicht" ,irrlicht) ("jsoncpp" ,jsoncpp) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libogg" ,libogg) ("libvorbis" ,libvorbis) @@ -2314,7 +2314,7 @@ games using Python as well as C++.") `(("pkg-config" ,pkg-config))) (inputs `(("freetype" ,freetype) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libsndfile" ,libsndfile) ("libxml2" ,libxml2) @@ -2443,7 +2443,7 @@ This game is based on the GPL version of the famous game TuxRacer.") ("curl" ,curl) ;; The following input is needed to build the bundled and modified ;; version of irrlicht. - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("openssl" ,openssl) ("enet" ,enet))) (native-inputs @@ -5772,7 +5772,7 @@ You can save humanity and get programming skills!") ("fluidsynth" ,fluidsynth) ("gtk+3" ,gtk+) ("libgme" ,libgme) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libsndfile" ,libsndfile) ("mesa" ,mesa) ("mpg123" ,mpg123) @@ -6229,7 +6229,7 @@ quotation from a collection of quotes.") `(("xonotic-data" ,xonotic-data) ("alsa-lib" ,alsa-lib) ("curl" ,curl) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libmodplug" ,libmodplug) ("libvorbis" ,libvorbis) ("libogg" ,libogg) @@ -9634,7 +9634,7 @@ This package is part of the KDE games module.") `(("curl" ,curl) ("font-dejavu" ,font-dejavu) ("glu" ,glu) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libxdg-basedir" ,libxdg-basedir) ("libxml2" ,libxml2) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 6afccb7b0c..e336282546 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -83,7 +83,7 @@ ("zlib" ,zlib))) (propagated-inputs `(("fontconfig" ,fontconfig) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (home-page "http://www.libgd.org/") (synopsis "Library for the dynamic creation of images by programmers") (description @@ -114,7 +114,7 @@ most common applications of GD involve website development.") ("freetype" ,freetype) ("gd" ,gd) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) (arguments `(#:make-maker-flags diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 84c6985bde..3cd1e4af8d 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -60,7 +60,7 @@ (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) - (inputs `(("libjpeg" ,libjpeg) + (inputs `(("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("zlib" ,zlib))) (synopsis "Little CMS, a small-footprint colour management engine") @@ -278,14 +278,14 @@ printing, and psresize, for adjusting page sizes.") ;; these libraries. ,@(if (%current-target-system) `(("zlib/native" ,zlib) - ("libjpeg/native" ,libjpeg)) + ("libjpeg/native" ,libjpeg-turbo)) '()))) (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) ("gs-fonts" ,gs-fonts) ("jbig2dec" ,jbig2dec) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpaper" ,libpaper) ("libpng" ,libpng) ("libtiff" ,libtiff) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 42a55cff33..e95251cc79 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -117,7 +117,7 @@ provided, as well as a framework to add new color models and data types.") `(("cairo" ,cairo) ("pango" ,pango) ("libpng" ,libpng) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ; for gtester @@ -174,7 +174,7 @@ buffers.") ("glib" ,glib) ("glib-networking" ,glib-networking) ("libtiff" ,libtiff) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("atk" ,atk) ("gexiv2" ,gexiv2) ("gtk+" ,gtk+-2) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5a813f6854..0be8fcc49e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2803,7 +2803,7 @@ creating interactive structured graphics.") ("libgnome" ,libgnome) ("libgnomecanvas" ,libgnomecanvas) ("libgnome-keyring" ,libgnome-keyring))) - (inputs `(("libjpeg" ,libjpeg) + (inputs `(("libjpeg" ,libjpeg-turbo) ("popt" ,popt) ("libbonobo" ,libbonobo) ("libxml2" ,libxml2) @@ -5150,7 +5150,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") ("lcms" ,lcms) ("libexif" ,libexif) ("libpeas" ,libpeas) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("librsvg" ,librsvg) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+))) @@ -7518,7 +7518,7 @@ shared object databases, search tools and indexing.") ("libgsf" ,libgsf) ("libgxps" ,libgxps) ("libiptcdata" ,libiptcdata) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libosinfo" ,libosinfo) ("libpng" ,libpng) ("libseccomp" ,libseccomp) @@ -9444,7 +9444,7 @@ functionality.") ("clutter" ,clutter) ("clutter-gst" ,clutter-gst) ("clutter-gtk" ,clutter-gtk) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("libraw" ,libraw))) (home-page "https://wiki.gnome.org/Apps/Gthumb") diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 43605dfc86..d026c67992 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -101,7 +101,7 @@ ("gtk+" ,gtk+) ("libarchive" ,libarchive) ("libgsf" ,libgsf) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libltdl" ,libltdl) ("libmpeg2" ,libmpeg2) ("libmp4v2" ,libmp4v2) diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index dd7c67d553..ff2145a25e 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -139,7 +139,7 @@ to easily create cross-compiled binaries.") ("libx11" ,libx11) ("libxinerama" ,libxinerama) ("fontconfig" ,fontconfig) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("giflib" ,giflib) ("libpng" ,libpng) ("libtiff" ,libtiff))) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 217ccb4ece..8091afaf0a 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -153,7 +153,7 @@ ("opensubdiv" ,opensubdiv) ("ilmbase" ,ilmbase) ("openjpeg" ,openjpeg) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("ffmpeg" ,ffmpeg) @@ -241,7 +241,7 @@ application can be customized via its API for Python scripting.") ("openexr" ,openexr) ("ilmbase" ,ilmbase) ("openjpeg" ,openjpeg-1) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("ffmpeg" ,ffmpeg) @@ -495,7 +495,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") (inputs `(("boost" ,boost) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("giflib" ,giflib) ("openexr" ,openexr) @@ -558,7 +558,7 @@ visual effects work for film.") ("unzip" ,unzip))) (inputs `(("giflib" ,giflib) - ("libjpeg" ,libjpeg) ; Required for the JPEG texture plugin. + ("libjpeg" ,libjpeg-turbo) ; Required for the JPEG texture plugin. ("jasper" ,jasper) ("librsvg" ,librsvg) ("libxrandr" ,libxrandr) @@ -597,7 +597,7 @@ virtual reality, scientific visualization and modeling.") "-DCMAKE_CXX_FLAGS=-fpermissive" ,flags)))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ,@(package-inputs openscenegraph))))) @@ -662,7 +662,7 @@ virtual reality, scientific visualization and modeling.") ("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("openexr" ,openexr) @@ -1014,7 +1014,7 @@ your terminal.") `(("imagemagick" ,imagemagick) ("lcms" ,lcms) ("fbida" ,fbida) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("zip" ,zip) ("perl" ,perl) ("perl-cpanel-json-xs" ,perl-cpanel-json-xs) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 5ef0fd0344..406375b3d6 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -104,7 +104,7 @@ ("libltdl" ,libltdl) ("libXaw" ,libxaw) ("expat" ,expat) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng))) (native-inputs `(("bison" ,bison) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 1e26a3ce3e..2854945d78 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -264,7 +264,7 @@ for the GStreamer multimedia library.") ("libcaca" ,libcaca) ("libdv" ,libdv) ("libiec61883" ,libiec61883) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libshout" ,libshout) ("libsoup" ,libsoup) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b136449f7e..f0068dbe05 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -531,7 +531,7 @@ highlighting and other features typical of a source code editor.") ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("libx11" ,libx11))) (native-inputs diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index f5d67c8917..cdaf8e86e2 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -89,7 +89,7 @@ (inputs `(;; Our ICU is too recent: “error: ‘UChar’ does not name a type“. ;; ("icu4c" ,icu4c) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libxml2" ,libxml2) @@ -137,7 +137,7 @@ licences similar to the Modified BSD licence.")))) ("gts" ,gts) ("hdf5" ,hdf5) ("itpp" ,itpp) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libxml" ,libxml2) @@ -198,7 +198,7 @@ of external libraries that provide additional functionality.") ("expat" ,expat) ("freetype" ,freetype) ("hdf5" ,hdf5) - ("jpeg" ,libjpeg) + ("jpeg" ,libjpeg-turbo) ("jsoncpp" ,jsoncpp) ("libogg" ,libogg) ("libtheora" ,libtheora) @@ -393,7 +393,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") (patches (search-patches "opencv-rgbd-aarch64-test-fix.patch")) (sha256 (base32 "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2")))))) - (inputs `(("libjpeg" ,libjpeg) + (inputs `(("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("jasper" ,jasper) ;; ffmpeg 4.0 causes core dumps in tests. @@ -454,7 +454,7 @@ vision algorithms. It can be used to do things like: ("gobject-introspection" ,gobject-introspection))) (inputs `(("glib" ,glib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("librsvg" ,librsvg) ("libtiff" ,libtiff) @@ -516,7 +516,7 @@ due to its architecture which automatically parallelises the image workflows.") ("gtk+-2" ,gtk+-2) ("libxml2" ,libxml2) ("libexif" ,libexif) - ("libjpeg" ,libjpeg) ; required by vips.pc + ("libjpeg" ,libjpeg-turbo) ;required by vips.pc ("librsvg" ,librsvg) ("fftw" ,fftw) ("libgsf" ,libgsf) @@ -573,7 +573,7 @@ recalculates.") (inputs `(("libgeotiff" ,libgeotiff) ("libtiff" ,libtiff) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("zlib" ,zlib))) (home-page "https://github.com/vxl/vxl/") @@ -650,7 +650,7 @@ libraries designed for computer vision research and implementation.") ("fftw" ,fftw) ("fftwf" ,fftwf) ("hdf5" ,hdf5) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("mesa" ,mesa-opencl) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 85d3a153e7..8589130822 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -204,7 +204,7 @@ collection. Geeqie was initially based on GQview.") "0hi9v0rdx47nys0wvm9xasdrafa34r5kq6crb074a0ipwmc60iiq")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (synopsis "Simple and fast image viewer for X") @@ -382,7 +382,7 @@ It supports JPEG, PNG and GIF formats.") ("zlib" ,zlib) ("exiv2" ,exiv2) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("lcms" ,lcms) ("openexr" ,openexr) ("fftw" ,fftwf) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 4fef6fe21e..6bb0b47cb3 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -500,7 +500,7 @@ official designation is ISO/IEC 29199-2). This library is an implementation of t (sha256 (base32 "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8")))) (build-system gnu-build-system) - (inputs `(("libjpeg" ,libjpeg))) + (inputs `(("libjpeg" ,libjpeg-turbo))) (arguments '(#:tests? #f)) ; no tests (synopsis "Optimize JPEG images") @@ -565,7 +565,7 @@ extracting icontainer icon files.") ,name "-" ,version) "--disable-static"))) (inputs `(("zlib" ,zlib) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (synopsis "Library for handling TIFF files") (description "Libtiff provides support for the Tag Image File Format (TIFF), a format @@ -598,7 +598,7 @@ collection of tools for doing simple manipulations of TIFF images.") ("pkg-config" ,pkg-config))) (inputs `(("giflib" ,giflib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) @@ -872,7 +872,7 @@ compose, and analyze GIF images.") ("freetype" ,freetype) ("giflib" ,giflib) ("libid3tag" ,libid3tag) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libx11" ,libx11) @@ -983,7 +983,7 @@ supplies a generic doubly-linked list and some string functions.") `(("pkg-config" ,pkg-config) ("unzip" ,unzip))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("libjxr" ,libjxr) ("libpng" ,libpng) ("libraw" ,libraw) @@ -1020,7 +1020,7 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.") ("hdf5" ,hdf5) ("ilmbase" ,ilmbase) ; propagated by openexr, but needed explicitly ; to create a configure-flag - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("openexr" ,openexr) @@ -1124,7 +1124,7 @@ language bindings to VIGRA.") (inputs `(("freeglut" ,freeglut) ("giflib" ,giflib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff))) (native-inputs @@ -1164,7 +1164,7 @@ channels.") (propagated-inputs ;; These are all in the 'Libs.private' field of libmng.pc. `(("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) (home-page "http://www.libmng.com/") (synopsis "Library for handling MNG files") @@ -1280,7 +1280,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (base32 "05l75yd1zsxwv25ykwwwjs8961szv7iywf16nc6vc6qpby27ckv6")))) (build-system cmake-build-system) - (inputs `(("libjpeg" ,libjpeg))) + (inputs `(("libjpeg" ,libjpeg-turbo))) (synopsis "JPEG-2000 library") (description "The JasPer Project is an initiative to provide a reference implementation of the codec specified in the JPEG-2000 Part-1 standard (i.e., @@ -1368,7 +1368,7 @@ differences in file encoding, image quality, and other small variations.") (inputs `(("libmhash" ,libmhash) ("libmcrypt" ,libmcrypt) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) (arguments `(#:make-flags '("CXXFLAGS=-fpermissive") ;required for MHashPP.cc @@ -1739,7 +1739,7 @@ identical visual appearance.") (build-system gnu-build-system) (inputs `(("curl" ,curl) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("ncurses" ,ncurses))) (home-page "https://csl.name/jp2a/") (synopsis "Convert JPEG images to ASCII") diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 2b4bc5680d..f75dd795f1 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -101,7 +101,7 @@ ("libxml2" ,libxml2) ("libtiff" ,libtiff) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("pango" ,pango) ("freetype" ,freetype) ("bzip2" ,bzip2) @@ -203,7 +203,7 @@ script.") ("libxml2" ,libxml2) ("libtiff" ,libtiff) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("freetype" ,freetype) ("bzip2" ,bzip2) ("xz" ,xz) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6abd0c8360..96d14c3988 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -949,7 +949,7 @@ machine."))) ("grep" ,grep) ("jamvm" ,jamvm) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libnsl" ,libnsl) ("libpng" ,libpng) ("libtool" ,libtool) @@ -1569,7 +1569,7 @@ bootstrapping purposes.") ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("libxrender" ,libxrender) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("mit-krb5" ,mit-krb5) ("nss" ,nss) @@ -1866,7 +1866,7 @@ new Date();")) ("giflib" ,giflib) ("lcms" ,lcms) ("libelf" ,libelf) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libice" ,libice) ("libpng" ,libpng) ("libx11" ,libx11) @@ -2144,7 +2144,7 @@ new Date();")) ("freetype" ,freetype) ("giflib" ,giflib) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libx11" ,libx11) ("libxext" ,libxext) @@ -2191,7 +2191,7 @@ new Date();")) ("freetype" ,freetype) ("giflib" ,giflib) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libx11" ,libx11) ("libxext" ,libxext) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 9230bb71c0..fd1b6ec7ca 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -3768,7 +3768,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("openssl" ,openssl) ("phonon" ,phonon) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index bc61e96d19..c74d4e0532 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -419,7 +419,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") ("libcdio" ,libcdio) ("libdrm" ,libdrm) ("libgcrypt" ,libgcrypt) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libltdl" ,libltdl) ("libmad" ,libmad) ("libmicrohttpd" ,libmicrohttpd) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 719401d69a..d92a74efa8 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -778,7 +778,7 @@ than 8 bits, and at the end only some significant 8 bits are kept.") (inputs `(("giflib" ,giflib) ("lapack" ,lapack) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libx11" ,libx11) ("openblas" ,openblas) @@ -1746,7 +1746,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) ("eigen" ,eigen-for-tensorflow) ("gemmlowp" ,gemmlowp-for-tensorflow) ("lmdb" ,lmdb) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("giflib" ,giflib) ("grpc" ,grpc) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index fa95d0bf66..5c9da6d72b 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -808,7 +808,7 @@ infamous 'Wanda the Fish'.") ("libice" ,libice) ("libsm" ,libsm) ("libgxps" ,libgxps) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libxml2" ,libxml2) ("dogtail" ,python2-dogtail) ("shared-mime-info" ,shared-mime-info) @@ -1344,7 +1344,7 @@ can be used as backgrounds in the MATE Desktop environment.") ("libpeas" ,libpeas) ("libxml2" ,libxml2) ("libexif" ,libexif) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("librsvg" ,librsvg) ("lcms" ,lcms) ("mate-desktop" ,mate-desktop) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 003e8c0286..1d5a9edc5f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -725,7 +725,7 @@ computations.") ("flex" ,flex))) (inputs `(("zlib" ,zlib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtirpc" ,libtirpc))) (arguments `(#:parallel-tests? #f @@ -965,7 +965,7 @@ extremely large and complex data collections.") `(("hdf4" ,hdf4) ("hdf5" ,hdf5) ("zlib" ,zlib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("slf4j-api" ,java-slf4j-api))) (arguments `(#:configure-flags @@ -1082,7 +1082,7 @@ implemented in C.") `(("hdf4" ,hdf4-alt) ; assume most HDF-EOS2 users won't use the HDF4 netCDF API ;; XXX: These inputs are really dependencies of hdf4. ("zlib" ,zlib) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtirpc" ,libtirpc) ("gctp" ,gctp))) @@ -1242,7 +1242,7 @@ similar to MATLAB, GNU Octave or SciPy.") `(("hdf4" ,hdf4-alt) ("hdf5" ,hdf5) ("zlib" ,zlib) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (arguments `(#:configure-flags '("--enable-doxygen" "--enable-dot" "--enable-hdf4") diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index 7fe0503d6f..aac6f13379 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -102,7 +102,7 @@ (build-system gnu-build-system) (inputs `(("ghostscript" ,ghostscript) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libxml2" ,libxml2) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 32a45ed4d5..8451390647 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -433,7 +433,7 @@ using the DjVuLibre library.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("jbig2dec" ,jbig2dec) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("mujs" ,mujs) ("mupdf" ,mupdf) ("openjpeg" ,openjpeg) @@ -573,7 +573,7 @@ interaction.") `(("cppunit" ,cppunit) ("pkg-config" ,pkg-config))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -632,7 +632,7 @@ extracting content or merging files.") ("freetype" ,freetype) ("harfbuzz" ,harfbuzz) ("jbig2dec" ,jbig2dec) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libx11" ,libx11) ("libxext" ,libxext) ("mujs" ,mujs) @@ -859,7 +859,7 @@ the PDF pages.") #:tests? #f #:make-flags (list "CC=gcc" (string-append "prefix=" (assoc-ref %outputs "out"))))) - (inputs `(("libjpeg" ,libjpeg) + (inputs `(("libjpeg" ,libjpeg-turbo) ("curl" ,curl) ("libtiff" ,libtiff) ("libudev" ,eudev) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 0867433245..0dfc442883 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -82,7 +82,7 @@ (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("libjpeg" ,libjpeg))) ;for lossy DNGs and old Kodak cameras + `(("libjpeg" ,libjpeg-turbo))) ;for lossy DNGs and old Kodak cameras (propagated-inputs `(("lcms" ,lcms))) ;for color profiles (home-page "https://www.libraw.org") @@ -258,7 +258,7 @@ and a wide variety of other metadata.") "1a4m3plmfcrrplqs9zfzhc5apibn10m5sajpizm1sd3q74w5fwq3")))) (build-system cmake-build-system) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("zlib" ,zlib))) @@ -300,7 +300,7 @@ overlapping images, as well as some command line tools.") `(("boost" ,boost) ("gsl" ,gsl) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("openexr" ,openexr) @@ -394,7 +394,7 @@ photographic equipment.") ("pugixml" ,pugixml) ("gtk+" ,gtk+) ("sqlite" ,sqlite) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("cairo" ,cairo) ("lcms" ,lcms) @@ -450,7 +450,7 @@ and enhance them.") ("freeglut" ,freeglut) ("glew" ,glew) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpano13" ,libpano13) ("libpng" ,libpng) ("libtiff" ,libtiff) @@ -535,7 +535,7 @@ a complete panorama and stitch any series of overlapping pictures.") ("lensfun" ,lensfun) ("libcanberra" ,libcanberra) ("libiptcdata" ,libiptcdata) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("librsvg" ,librsvg) ("libsigc++" ,libsigc++) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index ca280f77fa..f8ea6194c6 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -137,7 +137,7 @@ manner. It also features an interactive interpreter.") ("texinfo" ,texinfo) ("libarchive" ,libarchive) ("libunwind" ,libunwind) - ("libjpeg", libjpeg) + ("libjpeg", libjpeg-turbo) ("libxft" ,libxft) ("fontconfig" ,fontconfig) ("perl" ,perl) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c00b1c7ed0..4dfe6ee612 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -441,7 +441,7 @@ Expressions are constructed from parsed strings or directly in Python.") (propagated-inputs `(("numpy" ,python-numpy))) (inputs `(("hdf4" ,hdf4) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) (arguments `(#:phases @@ -4460,7 +4460,7 @@ the OleFileIO module from PIL, the Python Image Library.") (inputs `(("freetype" ,freetype) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("libwebp" ,libwebp) ("openjpeg" ,openjpeg) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 435bdbd518..675720288a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -380,7 +380,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") ("harfbuzz" ,harfbuzz) ("icu4c" ,icu4c) ("libinput" ,libinput-minimal) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libmng" ,libmng) ("libpng" ,libpng) ("libx11" ,libx11) @@ -2396,7 +2396,7 @@ different kinds of sliders, and much more.") `(("icu" ,icu4c) ("glib" ,glib) ("gst-plugins-base" ,gst-plugins-base) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libwebp" ,libwebp) ("sqlite" ,sqlite) diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 71464237f4..2e364b2b8e 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -103,7 +103,7 @@ to remotely control a user's Windows desktop.") `(("alsa-lib" ,alsa-lib) ("cups" ,cups) ("ffmpeg" ,ffmpeg) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libx11" ,libx11) ("libxkbcommon" ,libxkbcommon) ("libxkbfile" ,libxkbfile) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 98f7fd203a..8e57cb20eb 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -123,7 +123,7 @@ package contains the library, but no drivers.") (name "sane-backends") (inputs `(("hplip" ,(@ (gnu packages cups) hplip-minimal)) - ("libjpeg" ,libjpeg) ; wanted by pixma, epsonds, others + ("libjpeg" ,libjpeg-turbo) ; wanted by pixma, epsonds, others ("libpng" ,libpng) ; support ‘scanimage --format=png’ ,@(package-inputs sane-backends-minimal))) (arguments @@ -219,7 +219,7 @@ package contains the library and drivers."))) (inputs `(("gtk+" ,gtk+-2) ("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("sane-backends" ,sane-backends) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index b0da2ac36b..44eab98fba 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -533,7 +533,7 @@ implementation techniques and as an expository tool.") ("glu" ,glu) ("gmp" ,gmp) ("gtk+" ,gtk+) ; propagates gdk-pixbuf+svg - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libx11" ,libx11) ("mesa" ,mesa) diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index e9c998c7b6..385017f2c2 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -87,7 +87,7 @@ ("lcms" ,lcms) ("libcdr" ,libcdr) ("libfreehand" ,libfreehand) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libmspub" ,libmspub) ("libpagemaker" ,libpagemaker) ("librevenge" ,librevenge) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index a01cafb34a..b133227629 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -238,7 +238,7 @@ other supporting functions for SDL.") ;; propagated input because the pkg-config file refers to SDL's pkg-config ;; file. (propagated-inputs `(("sdl" ,sdl) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) @@ -507,7 +507,7 @@ directory.") `(("pkg-config" ,pkg-config) ;; Required by test suite. ("xorg-server" ,xorg-server) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (inputs `(("guile" ,guile-2.2) ("sdl-union" ,(sdl-union)))) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index a57e0151ca..12461914bc 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -146,7 +146,7 @@ which allows users to view a desktop computing environment.") ("gobject-introspection" ,gobject-introspection) ("json-glib" ,json-glib) ("libepoxy" ,libepoxy) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libxcb" ,libxcb) ("lz4" ,lz4) ("mesa" ,mesa) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ec2994dc33..a9e17ff2e5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -343,7 +343,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\ ("openblas" ,openblas) ("gfortran" ,gfortran) ("icu4c" ,icu4c) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libxt" ,libxt) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index c88d0338cb..f17e138bdb 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -232,7 +232,7 @@ interfaces (GUIs) in the Tcl language.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libx11" ,libx11) ("libpng" ,libpng) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (arguments `(#:make-maker-flags `(,(string-append "X11=" (assoc-ref %build-inputs "libx11"))) diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 8f3c887a68..c7ad33c17b 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -144,7 +144,7 @@ and others.") ("gettext" ,gettext-minimal))) (inputs `(("libexif" ,libexif) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libid3tag" ,libid3tag) ("flac" ,flac) ("libvorbis" ,libvorbis) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 730d5a408f..370994c9d6 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1281,7 +1281,7 @@ streaming protocols.") ("libass" ,libass) ("libdvdcss" ,libdvdcss) ("libdvdnav" ,libdvdnav) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libmpeg2" ,libmpeg2) ("libmpg123" ,mpg123) ; audio codec for MP3 ("libpng" ,libpng) @@ -1379,7 +1379,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ("libcdio-paranoia" ,libcdio-paranoia) ("libdvdread" ,libdvdread) ("libdvdnav" ,libdvdnav) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libva" ,libva) ("libvdpau" ,libvdpau) ("libx11" ,libx11) @@ -2334,7 +2334,7 @@ tools, XML authoring components, and an extensible plug-in based API.") (inputs `(("alsa-lib" ,alsa-lib) ("glu" ,glu) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libx11" ,libx11) ("qtbase" ,qtbase) ("eudev" ,eudev))) @@ -3336,7 +3336,7 @@ It counts more than 100 plugins.") ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) (inputs - `(("libjpeg" ,libjpeg) + `(("libjpeg" ,libjpeg-turbo) ("ffmpeg" ,ffmpeg-3.4) ("libmicrohttpd" ,libmicrohttpd) ("sqlite" ,sqlite))) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 0c18191cc7..1a492cab30 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -78,7 +78,7 @@ (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("fltk" ,fltk) ("fontconfig" ,fontconfig) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libxcursor" ,libxcursor) ("libxft" ,libxft) @@ -126,7 +126,7 @@ older or slower computers and embedded systems.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("zlib" ,zlib) ("openssl" ,openssl) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("libevent" ,libevent) ("libpng" ,libpng) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3568cf0a7f..18ee158be5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5001,7 +5001,7 @@ w3c webidl files and a binding configuration file.") ("openssl" ,openssl) ("utf8proc" ,utf8proc) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libcss" ,libcss) ("libdom" ,libdom) ("libnsbmp" ,libnsbmp) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 5101ceb2ea..3d367aa54f 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -207,7 +207,7 @@ engine that uses Wayland for graphics output.") ("hyphen" ,hyphen) ("icu4c" ,icu4c) ("libgcrypt" ,libgcrypt) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libnotify" ,libnotify) ("libpng" ,libpng) ("libseccomp" ,libseccomp) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 258980803a..0700fdce20 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -111,7 +111,7 @@ ("libsane" ,sane-backends) ("libpcap" ,libpcap) ("libpng" ,libpng) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("libICE" ,libice) ("libX11" ,libx11) diff --git a/gnu/packages/wv.scm b/gnu/packages/wv.scm index 866cfee222..37881a4d0f 100644 --- a/gnu/packages/wv.scm +++ b/gnu/packages/wv.scm @@ -45,7 +45,7 @@ (inputs `(("glib" ,glib) ("libgsf" ,libgsf) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("zlib" ,zlib))) (native-inputs diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 48e6c31f6c..c2eedad5cb 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -67,7 +67,7 @@ ;; XXX gstreamer-0.10 builds fail ;; ("gstreamer" ,gstreamer-0.10) ("gtk" ,gtk+) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libmspack" ,libmspack) ("libsm" ,libsm) ("libtiff" ,libtiff) @@ -114,7 +114,7 @@ and many other languages.") (base32 "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk")))) (inputs `(("gtk" ,gtk+-2) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("libmspack" ,libmspack) ("sdl" ,sdl) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d5c375e046..baf03e012f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1239,7 +1239,7 @@ protocol.") ("libglade" ,libglade) ("libxml2" ,libxml2) ("libsm" ,libsm) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("linux-pam" ,linux-pam) ("pango" ,pango) ("gtk+" ,gtk+) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 7489624646..ff3d6c9ece 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -289,7 +289,7 @@ merging features essential for loading menus modified with menu editors.") ("gdk-pixbuf" ,gdk-pixbuf) ("cairo" ,cairo) ;; Needed for pdf thumbnails (poppler-glibc.pc) ("freetype" ,freetype) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libgsf" ,libgsf) ("poppler" ,poppler) ;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 09c7597761..c3d02619b4 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -47,7 +47,7 @@ `(("desktop-file-utils" ,desktop-file-utils))) (inputs `(("libxaw3d" ,libxaw3d) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libxpm" ,libxpm) ("libx11" ,libx11) @@ -90,7 +90,7 @@ selected in various ways. For text, 35 fonts are available.") ("makedepend" ,makedepend))) (inputs `(("xfig" ,xfig) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libxpm" ,libxpm) ("libx11" ,libx11) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 017a41203d..ab86b228bb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6120,7 +6120,7 @@ basic eye-candy effects.") (inputs `(("ffmpeg" ,ffmpeg) ("flac" ,flac) ("gtk+-2" ,gtk+-2) ;; no full GTK3 support yet - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libvpx" ,libvpx) ("libx264" ,libx264) -- cgit v1.2.3 From 778d6b522ae361767d3cf984a3b182bac7361b7a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 16 Feb 2020 09:06:53 +0200 Subject: gnu: Remove obsolete bootstrap workaround phases. * gnu/packages/admin.scm (igt-gpu-tools)[arguments]: Don't set NOCONFIGURE environment variable. * gnu/packages/algebra.scm (givaro, fflas-ffpack, linbox), * gnu/packages/arcan.scm (xarcan), * gnu/packages/audio.scm (rtmidi), * gnu/packages/cinnamon.scm (cinnamon-desktop), * gnu/packages/gnome.scm (dia, libxklavier, byzanz), * gnu/packages/image-viewers.scm (geeqie), * gnu/packages/libusb.scm (libplist), * gnu/packages/mail.scm (libetpan), * gnu/packages/networking.scm (aircrack-ng), * gnu/packages/terminals.scm (tilda, kmscon), * gnu/packages/xorg.scm (xf86-video-intel, xcompmgr) [arguments]: Same. --- gnu/packages/admin.scm | 9 +-------- gnu/packages/algebra.scm | 28 +--------------------------- gnu/packages/arcan.scm | 8 +------- gnu/packages/audio.scm | 7 ------- gnu/packages/cinnamon.scm | 7 ------- gnu/packages/gnome.scm | 23 +++-------------------- gnu/packages/image-viewers.scm | 1 - gnu/packages/libusb.scm | 9 +-------- gnu/packages/mail.scm | 8 +------- gnu/packages/networking.scm | 6 ------ gnu/packages/terminals.scm | 10 ---------- gnu/packages/xorg.scm | 14 +------------- 12 files changed, 9 insertions(+), 121 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index af39676d57..02fdb453b6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2802,14 +2802,7 @@ buffers.") (base32 "1gpdjs5aj6vsnzwcjvw5bb120lgffvvshi4202phr0bzw3b92ky8")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; many of the tests try to load kernel modules - #:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - ;; Don't run configure in this phase. - (setenv "NOCONFIGURE" "1") - (invoke "sh" "autogen.sh")))))) + `(#:tests? #f)) ; many of the tests try to load kernel modules (inputs `(("cairo" ,cairo) ("elfutils" ,elfutils) ; libdw diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index d3e4dfbd86..08d209ec58 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1217,15 +1217,6 @@ objects.") ("libtool" ,libtool))) (propagated-inputs `(("gmp" ,gmp))) ; gmp++.h includes gmpxx.h - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'setenv - ;; Prevent the autogen.sh script to carry out the configure - ;; script, which has not yet been patched to replace /bin/sh. - (lambda _ - (setenv "NOCONFIGURE" "yes") - #t))))) (synopsis "Algebraic computations with exact rings and fields") (description "Givaro is a C++ library implementing the basic arithmetic of various @@ -1264,15 +1255,7 @@ compound objects, such as vectors, matrices and univariate polynomials.") `(#:configure-flags (list (string-append "--with-blas-libs=" (assoc-ref %build-inputs "openblas") - "/lib/libopenblas.so")) - #:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'setenv - ;; Prevent the autogen.sh script to carry out the configure - ;; script, which has not yet been patched to replace /bin/sh. - (lambda _ - (setenv "NOCONFIGURE" "yes") - #t))))) + "/lib/libopenblas.so")))) (synopsis "C++ library for linear algebra over finite fields") (description "FFLAS-FFPACK is a C++ template library for basic linear algebra @@ -1308,15 +1291,6 @@ algebra, such as the row echelon form.") ("pkg-config" ,pkg-config))) (inputs `(("fflas-ffpack" ,fflas-ffpack))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'setenv - ;; Prevent the autogen.sh script to carry out the configure - ;; script, which has not yet been patched to replace /bin/sh. - (lambda _ - (setenv "NOCONFIGURE" "yes") - #t))))) (synopsis "C++ library for linear algebra over exact rings") (description "LinBox is a C++ template library for exact linear algebra computation diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index db472efec5..e3f8b60aea 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -216,13 +216,7 @@ engine programmable using Lua.") (assoc-ref %build-inputs "xkbcomp") "/bin") ,(string-append "--with-xkb-output=" - "/tmp")) ; FIXME: Copied from xorg - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'noconfigure - (lambda _ - (setenv "NOCONFIGURE" "true") - #t))))) + "/tmp")))) ; FIXME: Copied from xorg (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index fbb2d90979..78d29e1c68 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2444,13 +2444,6 @@ tempo and pitch of an audio recording independently of one another.") (base32 "1k962ljpnwyjw9jjiky2372khhri1wqvrj5qsalfpys31xqzw31p")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'noconfigure - (lambda _ - (setenv "NOCONFIGURE" "yes") - #t))))) (inputs `(("jack" ,jack-1) ("alsa-lib" ,alsa-lib))) diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm index a8850391aa..fadf18df81 100644 --- a/gnu/packages/cinnamon.scm +++ b/gnu/packages/cinnamon.scm @@ -51,13 +51,6 @@ (base32 "18mjy80ly9361npjhxpm3n0pkmrwviaqr2kixjb7hyxa6kzzh5xw")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'skip-premature-configure - (lambda _ - (setenv "NOCONFIGURE" "set") - #t))))) ;; TODO: package 'libgsystem'. (inputs `(("accountsservice" ,accountsservice) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cc00b69cf3..d9a5e6fe5b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -911,13 +911,6 @@ useful as a tutorial and users' guide for new or less experienced users.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'dont-configure-during-bootstrap - (lambda _ - (setenv "NOCONFIGURE" "true") - #t))))) (home-page "https://wiki.gnome.org/Apps/Dia") (synopsis "Diagram creation for GNOME") (description "Dia can be used to draw different types of diagrams, and @@ -3505,13 +3498,7 @@ and objects.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'no-configure - (lambda* _ - (setenv "NOCONFIGURE" "1") - #t))) - #:configure-flags + '(#:configure-flags (list (string-append "--with-xkb-base=" (assoc-ref %build-inputs "xkeyboard-config") "/share/X11/xkb") @@ -7924,7 +7911,7 @@ documents and diagrams, playing media, scanning, and much more.") (arguments '(#:phases (modify-phases %standard-phases - (replace 'bootstrap + (add-before 'bootstrap 'build-without-Werror (lambda _ ;; The build system cleverly detects that we're not building from ;; a release tarball and turns on -Werror for GCC. @@ -7932,11 +7919,7 @@ documents and diagrams, playing media, scanning, and much more.") ;; causes the build to fail unnecessarily, so we remove the flag. (substitute* '("configure.ac") (("-Werror") "")) - ;; The autogen.sh script in gnome-common will run ./configure - ;; by default, which is problematic because source shebangs - ;; have not yet been patched. - (setenv "NOCONFIGURE" "t") - (zero? (system* "sh" "autogen.sh"))))))) + #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 8589130822..2ac15a6cd9 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -155,7 +155,6 @@ actions.") write-dummy-changelog) (call-with-output-file "ChangeLog.html" write-dummy-changelog) - (setenv "NOCONFIGURE" "true") ;; Don't try to run 'git' for the version number. (substitute* "configure.ac" diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 5e468a4316..a0ae273b67 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -318,14 +318,7 @@ wrapper for accessing libusb-1.0.") (base32 "02vraf4j46bp746s0gz7vga2gv2dy3zd1v1bsy9x8algg9fpcb7n")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'configure-later - ;; Don't run ./configure during bootstrap. - (lambda _ - (setenv "NOCONFIGURE" "set") - #t))) - ;; Tests fail randomly when run in parallel because several of them write + `(;; Tests fail randomly when run in parallel because several of them write ;; and read to/from the same file--e.g., "4.plist" is accessed by ;; 'large.test' and 'largecmp.test'. #:parallel-tests? #f)) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1a9f9e5e5c..9d6e3dba8b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1133,13 +1133,7 @@ useful features.") ("expat" ,expat) ("zlib" ,zlib))) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (setenv "NOCONFIGURE" "true") - (invoke "sh" "autogen.sh")))) - #:configure-flags + '(#:configure-flags '("--disable-static" "--disable-db"))) (home-page "https://www.etpan.org/libetpan.html") (synopsis "Portable middleware for email access") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index dbc40028ad..4a48355163 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -934,12 +934,6 @@ live network and disk I/O bandwidth monitor.") (("/bin/sh") (which "sh"))) #t)) - (replace 'bootstrap - (lambda _ - ;; Patch shebangs in generated files before running - ;; ./configure. - (setenv "NOCONFIGURE" "please") - (invoke "bash" "./autogen.sh"))) (add-after 'build 'absolutize-tools (lambda* (#:key inputs #:allow-other-keys) (let ((ethtool (string-append (assoc-ref inputs "ethtool") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 8773f1969f..cffaea24a0 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -96,12 +96,6 @@ (base32 "154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj")))) (build-system glib-or-gtk-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (setenv "NOCONFIGURE" "true") - (invoke "sh" "autogen.sh")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -276,10 +270,6 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.") #:disallowed-references (,mesa) #:phases (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (setenv "NOCONFIGURE" "indeed") - (invoke "sh" "autogen.sh"))) ;; Use elogind instead of systemd. (add-before 'configure 'remove-systemd (lambda _ diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ab86b228bb..3fb2cf8d0f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2980,13 +2980,7 @@ X server.") (string-prefix? "x86_64-" system))) %supported-systems)) (arguments - '(#:configure-flags '("--with-default-accel=uxa") - #:phases (modify-phases %standard-phases - (add-before 'bootstrap 'pre-bootstrap - (lambda _ - ;; Inhibit autogen.sh from running configure. - (setenv "NOCONFIGURE" "1") - #t))))) + '(#:configure-flags '("--with-default-accel=uxa"))) (home-page "https://www.x.org/wiki/") (synopsis "Intel video driver for X server") (description @@ -6079,12 +6073,6 @@ Conventions Manual) and some of the @dfn{EWMH} (base32 "11i7vyk3pynw8q8aczpy56qncm84y0cmhlvyja3sj8dgy60g03q2")) (file-name (git-file-name name version)))) (build-system gnu-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (setenv "NOCONFIGURE" "t") - (invoke "sh" "autogen.sh")))))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) -- cgit v1.2.3 From edc8fd2e2d75ba7af9bf6403277ecb0dccd48dc3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Mar 2020 20:54:52 +0100 Subject: gnu: Remove guile@2.2.6. * gnu/packages/patches/guile-finalization-crash.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/guile.scm (guile-2.2)[source](patches): Remove 'guile-finalization-crash.patch'. (guile-2.2.7): Remove variable. (guile-2.2/bug-fix): Point to GUILE-2.2. * gnu/packages/admin.scm (shepherd)[native-inputs, inputs]: Use GUILE-2.2 instead of GUILE-2.2.7. --- gnu/local.mk | 1 - gnu/packages/admin.scm | 4 +- gnu/packages/guile.scm | 21 ++------ .../patches/guile-finalization-crash.patch | 61 ---------------------- 4 files changed, 5 insertions(+), 82 deletions(-) delete mode 100644 gnu/packages/patches/guile-finalization-crash.patch (limited to 'gnu/packages/admin.scm') diff --git a/gnu/local.mk b/gnu/local.mk index cc219b42df..f2e323c345 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -992,7 +992,6 @@ dist_patch_DATA = \ %D%/packages/patches/guile-3.0-crash.patch \ %D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ - %D%/packages/patches/guile-finalization-crash.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-relocatable.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index af29dc30fe..350cd541b7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -211,10 +211,10 @@ and provides a \"top-like\" mode (monitoring).") `(("pkg-config" ,pkg-config) ;; This is the Guile we use as a cross-compiler... - ("guile" ,guile-2.2.7))) + ("guile" ,guile-2.2))) (inputs ;; ... and this is the one that appears in shebangs when cross-compiling. - `(("guile" ,guile-2.2.7) ;for + `(("guile" ,guile-2.2) ;; The 'shepherd' command uses Readline when used interactively. It's ;; an unusual use case though, so we don't propagate it. diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 0ce5d71cfd..b97f149391 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -217,7 +217,7 @@ without requiring the source code to be rewritten.") (define-public guile-2.2 (package (inherit guile-2.0) (name "guile") - (version "2.2.6") + (version "2.2.7") (source (origin (method url-fetch) @@ -227,10 +227,9 @@ without requiring the source code to be rewritten.") ".tar.xz")) (sha256 (base32 - "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk")) + "013mydzhfswqci6xmyc1ajzd59pfbdak15i0b090nhr9bzm7dxyd")) (modules '((guix build utils))) (patches (search-patches - "guile-finalization-crash.patch" "guile-2.2-skip-oom-test.patch")) ;; Remove the pre-built object files. Instead, build everything @@ -251,21 +250,7 @@ without requiring the source code to be rewritten.") (variable "GUILE_LOAD_COMPILED_PATH") (files '("lib/guile/2.2/site-ccache"))))))) -(define-public guile-2.2.7 - ;; This version contains a bug fix for a relatively rare crash that could - ;; affect shepherd as PID 1: . - (package - (inherit guile-2.2) - (version "2.2.7") - (source (origin - (inherit (package-source guile-2.2)) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.xz")) - (sha256 - (base32 - "013mydzhfswqci6xmyc1ajzd59pfbdak15i0b090nhr9bzm7dxyd")))))) - -(define-deprecated guile-2.2/bug-fix guile-2.2.7) +(define-deprecated guile-2.2/bug-fix guile-2.2) (define-public guile-2.2/fixed ;; A package of Guile 2.2 that's rarely changed. It is the one used diff --git a/gnu/packages/patches/guile-finalization-crash.patch b/gnu/packages/patches/guile-finalization-crash.patch deleted file mode 100644 index 098249e49f..0000000000 --- a/gnu/packages/patches/guile-finalization-crash.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit edf5aea7ac852db2356ef36cba4a119eb0c81ea9 -Author: Ludovic Courtès -Date: Mon Dec 9 14:44:59 2019 +0100 - - Fix non-deterministic crash in 'finalization_thread_proc'. - - Fixes . - Reported by Jesse Gibbons . - - * libguile/finalizers.c (finalization_thread_proc): Do not enter the - "switch (data.byte)" condition when data.n <= 0. - -diff --git a/libguile/finalizers.c b/libguile/finalizers.c -index c5d69e8e3..94a6e6b0a 100644 ---- a/libguile/finalizers.c -+++ b/libguile/finalizers.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2012, 2013, 2014 Free Software Foundation, Inc. -+/* Copyright (C) 2012, 2013, 2014, 2019 Free Software Foundation, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License -@@ -211,21 +211,26 @@ finalization_thread_proc (void *unused) - - scm_without_guile (read_finalization_pipe_data, &data); - -- if (data.n <= 0 && data.err != EINTR) -+ if (data.n <= 0) - { -- perror ("error in finalization thread"); -- return NULL; -+ if (data.err != EINTR) -+ { -+ perror ("error in finalization thread"); -+ return NULL; -+ } - } -- -- switch (data.byte) -+ else - { -- case 0: -- scm_run_finalizers (); -- break; -- case 1: -- return NULL; -- default: -- abort (); -+ switch (data.byte) -+ { -+ case 0: -+ scm_run_finalizers (); -+ break; -+ case 1: -+ return NULL; -+ default: -+ abort (); -+ } - } - } - } -- cgit v1.2.3 From b6bee63bed4f013064c0d902e7c8b83ed7514ade Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 23 Feb 2020 00:20:30 +0100 Subject: gnu: Default to Guile 3.0. This patch changes three things: 1. package derivations are built using Guile 3.0; 2. 'gexp->derivation' defaults to Guile 3.0; 3. "guile3.0-" packages are deprecated aliases for the regular package, which now depends on Guile 3.0; "guile2.2-" packages are introduced; "guile-next" is renamed to "guile". * gnu/packages/guile.scm (guile-2.0/fixed): Remove. (guile-3.0/fixed): New variable. (package-for-guile-3.0): Remove. (package-for-guile-2.2): New variable. (define-deprecated-guile3.0-package): New macro. (guile-3.0)[name]: Change to "guile". (guile-json-3)[native-inputs, inputs]: New fields. (guile2.2-json): New variable. (guile3.0-json): Deprecate. (guile-gdbm-ffi)[native-inputs]: Switch to GUILE-3.0. (guile2.2-gdbm-ffi): New variable. (guile3.0-gdbm-ffi): Deprecate. (guile-sqlite3): Switch to GUILE-3.0. (guile2.2-sqlite3): New variable. (guile3.0-sqlite3): Deprecate. (guile-bytestructures): Switch to GUILE-3.0. (guile2.2-bytestructures): New variable. (guile3.0-bytestructures): Deprecate. (guile-git): Switch to GUILE-3.0. (guile2.2-git): New variable. (guile3.0-git): Deprecate. (guile-2.2/bug-fix): * gnu/packages/ci.scm (cuirass): Switch to GUILE-3.0. * gnu/packages/emacs-xyz.scm (emacs-guix): Switch to GUILE-3.0. * gnu/packages/gtk.scm (guile-cairo)[arguments]: New field. Switch to GUILE-3.0. (guile2.2-cairo): New variable. (guile3.0-cairo): Deprecate. (guile-rsvg): Switch to GUILE-3.0. (guile2.2-cairo): New variable. (guile3.0-cairo): Deprecate. (guile-present): Switch to GUILE-3.0. (guile2.2-present): New variable. (guile3.0-present): Deprecate. (guile-gnome)[propagated-inputs]: Use GUILE2.2-CAIRO and GUILE2.2-LIB. * gnu/packages/guile-xyz.scm (guile-fibers)[arguments]: Add #:configure-flags. Switch to GUILE-3.0. (guile2.2-fibers): New variable. (guile3.0-fibers): Deprecate. (guile-syntax-highlight): Switch to GUILE-3.0. (guile2.2-syntax-highlight): New variable. (guile3.0-syntax-highlight): Deprecate. (guile-colorized): Switch to GUILE-3.0. (guile2.2-colorized): New variable. (guile3.0-colorized): Deprecate. (guile-pfds): Switch to GUILE-3.0. (guile2.2-pfds): New variable. (guile3.0-pfds): Deprecate. (guile-simple-zmq): Switch to GUILE-3.0. (guile2.2-simple-zmq): New variable. (guile3.0-simple-zmq): Deprecate. (guile-newt): Switch to GUILE-3.0. (guile2.2-newt): New variable. (guile3.0-newt): Deprecate. (guile-parted): Switch to GUILE-3.0. (guile2.2-parted): New variable. (guile3.0-parted): Deprecate. (guile-config): Switch to GUILE-3.0. (guile2.2-config): New variable. (guile3.0-config): Deprecate. (guile-hall): Switch to GUILE-3.0. (guile2.2-hall): New variable. (guile3.0-hall): Deprecate. (guile-ics): Switch to GUILE-3.0. (guile2.2-ics): New variable. (guile3.0-ics): Deprecate. (guile-wisp)[arguments]: Add 'support-guile-3.0' phase. Switch to GUILE-3.0. (guile2.2-wisp): New variable. (guile3.0-wisp): Deprecate. (guile-lib): Switch to GUILE-3.0. (guile2.2-lib): New variable. (guile3.0-lib): Deprecate. (guile-minikanren): Switch to GUILE-3.0. (guile2.2-minikanren): New variable. (guile3.0-minikanren): Deprecate. (guile-irregex): Switch to GUILE-3.0. (guile2.2-irregex): New variable. (guile3.0-irregex): Deprecate. (haunt): Switch to GUILE-3.0, and remove GUILE-READER. (guile2.2-haunt): New variable. (guile3.0-haunt): Deprecate. (guile-commonmark): Switch to GUILE-3.0. (guile2.2-commonmark): New variable. (guile3.0-commonmark): Deprecate. (mcron): Switch to GUILE-3.0. (guile2.0-mcron): New variable. (guile3.0-mcron): Deprecate. (guile-picture-language): Switch to GUILE-3.0. (guile2.2-picture-language): New variable. (guile3.0-picture-language): Deprecate. (guile-gi): Switch to GUILE-3.0. (guile2.2-gi): New variable. (guile3.0-gi): Deprecate. (guile-hashing): Switch to GUILE-3.0. (guile2.2-hashing): New variable. (guile3.0-hashing): Deprecate. * gnu/packages/package-management.scm (guix): Switch to GUILE-3.0. (guile2.2-guix): New variable. (guile3.0-guix): Deprecate. (gwl): Replace "guile3.0-" with "guile-". (guix-jupyter)[source]: Adjust for Guile 3.0. Switch to GUILE-3.0. * gnu/packages/ssh.scm (guile-ssh): Switch to GUILE-3.0. (guile2.2-ssh): New variable. (guile3.0-ssh): Deprecate. * gnu/packages/admin.scm (shepherd): Switch to GUILE-3.0. (guile2.2-shepherd): New variable. (guile3.0-shepherd): Deprecate. * gnu/packages/mail.scm (mailutils): Switch to GUILE-3.0. (guile2.2-mailutils): New variable. (guile3.0-mailutils): Deprecate. * gnu/packages/plotutils.scm (guile-charting): Switch to GUILE-3.0. (guile2.2-charting): New variable. (guile3.0-charting): Deprecate. * gnu/packages/version-control.scm (libgit2): Switch to GUILE-3.0. * gnu/packages/vpn.scm (vpnc-scripts): Switch to GUILE-3.0. * gnu/packages/web.scm (guix-data-service): Switch to GUILE-3.0. (hpcguix-web): Switch to GUILE-3.0. * guix/self.scm (specification->package): Refer to the "guile-" variants instead of "guile3.0-". * guix/gexp.scm (default-guile): Change to GUILE-3.0. * build-aux/build-self.scm (build): #:guile-version defaults to "3.0". * gnu/packages/commencement.scm (guile-final): Base on GUILE-3.0/FIXED. --- build-aux/build-self.scm | 4 +- gnu/packages/admin.scm | 15 +- gnu/packages/ci.scm | 2 +- gnu/packages/commencement.scm | 2 +- gnu/packages/emacs-xyz.scm | 4 +- gnu/packages/gnupg.scm | 16 +-- gnu/packages/gtk.scm | 59 ++++---- gnu/packages/guile-xyz.scm | 269 ++++++++++++++++++++++-------------- gnu/packages/guile.scm | 96 +++++++++---- gnu/packages/mail.scm | 11 +- gnu/packages/package-management.scm | 63 +++++---- gnu/packages/plotutils.scm | 13 +- gnu/packages/ssh.scm | 15 +- gnu/packages/version-control.scm | 2 +- gnu/packages/vpn.scm | 4 +- gnu/packages/web.scm | 2 +- guix/gexp.scm | 4 +- guix/self.scm | 10 +- 18 files changed, 358 insertions(+), 233 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index f2e785b7f1..b30adfeb9f 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -383,11 +383,11 @@ interface (FFI) of Guile.") #:key verbose? (version (date-version-string)) system (pull-version 0) - ;; For the standalone Guix, default to Guile 2.2. For old + ;; For the standalone Guix, default to Guile 3.0. For old ;; versions of 'guix pull' (pre-0.15.0), we have to use the ;; same Guile as the current one. (guile-version (if (> pull-version 0) - "2.2" + "3.0" (effective-version))) #:allow-other-keys diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 63ee6dd53f..90252fc413 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -211,10 +211,10 @@ and provides a \"top-like\" mode (monitoring).") `(("pkg-config" ,pkg-config) ;; This is the Guile we use as a cross-compiler... - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (inputs ;; ... and this is the one that appears in shebangs when cross-compiling. - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ;; The 'shepherd' command uses Readline when used interactively. It's ;; an unusual use case though, so we don't propagate it. @@ -228,15 +228,18 @@ interface and is based on GNU Guile.") (license license:gpl3+) (home-page "https://www.gnu.org/software/shepherd/"))) -(define-public guile3.0-shepherd +(define-public guile2.2-shepherd (package (inherit shepherd) - (name "guile3.0-shepherd") + (name "guile2.2-shepherd") (native-inputs `(("pkg-config" ,pkg-config) - ("guile" ,guile-next))) + ("guile" ,guile-2.2))) (inputs - `(("guile" ,guile-next))))) + `(("guile" ,guile-2.2))))) + +(define-public guile3.0-shepherd + (deprecated-package "guile3.0-shepherd" shepherd)) (define-public cloud-utils (package diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 24de11b713..a5474e0a96 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -120,7 +120,7 @@ `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) #t)))))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-3) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index cebb4b5a68..65797af244 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3589,7 +3589,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; This package must be public because other modules refer to it. However, ;; mark it as hidden so that 'fold-packages' ignores it. (with-boot4 (hidden-package - (package-with-bootstrap-guile guile-2.2/fixed)))) + (package-with-bootstrap-guile guile-3.0/fixed)))) (define glibc-utf8-locales-final ;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e2b067e1dc..092bb6f2a0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Alex Kost ;;; Copyright © 2015 Federico Beffa @@ -2207,7 +2207,7 @@ type, for example: packages, buffers, files, etc.") `(("pkg-config" ,pkg-config) ("emacs" ,emacs-minimal))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("guix" ,guix))) (propagated-inputs `(("geiser" ,emacs-geiser) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 5d389d165c..9b6019007e 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2015, 2018 Andreas Enge ;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver @@ -493,7 +493,7 @@ gpgpme starting with version 1.7.") ("texinfo" ,texinfo) ("guile" ,guile-2.2))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("libgcrypt" ,libgcrypt))) (synopsis "Cryptography library for Guile using Libgcrypt") (description @@ -514,17 +514,17 @@ interface (FFI) of Guile.") `(("guile" ,guile-2.0) ,@(alist-delete "guile" (package-inputs guile-gcrypt)))))) -(define-public guile3.0-gcrypt +(define-public guile2.2-gcrypt (package (inherit guile-gcrypt) - (name "guile3.0-gcrypt") - (native-inputs - `(("guile" ,guile-next) - ,@(alist-delete "guile" (package-native-inputs guile-gcrypt)))) + (name "guile2.2-gcrypt") (inputs - `(("guile" ,guile-next) + `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-gcrypt)))))) +(define-public guile3.0-gcrypt + (deprecated-package "guile3.0-gcrypt" guile-gcrypt)) + (define-public python-gpg (package (name "python-gpg") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 76766a1b1f..10173bf124 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -875,10 +875,14 @@ application suites.") "#include \n#include \n")) #t))))) (build-system gnu-build-system) + (arguments + ;; Uses of 'scm_t_uint8' & co. are deprecated; don't stop the build + ;; because of them. + '(#:configure-flags '("--disable-Werror"))) (inputs `(("guile-lib" ,guile-lib) ("expat" ,expat) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (propagated-inputs ;; The .pc file refers to 'cairo'. `(("cairo" ,cairo))) @@ -895,22 +899,19 @@ graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment.") (license license:lgpl3+))) -(define-public guile3.0-cairo +(define-public guile2.2-cairo (package (inherit guile-cairo) - (name "guile3.0-cairo") - (arguments - (substitute-keyword-arguments (package-arguments guile-cairo) - ((#:configure-flags flags ''()) - ;; Uses of 'scm_t_uint8' & co. are deprecated; don't stop the build - ;; because of them. - `(cons "--disable-Werror" ,flags)))) + (name "guile2.2-cairo") (inputs - `(("guile" ,guile-3.0) - ("guile-lib" ,guile3.0-lib) + `(("guile" ,guile-2.2) + ("guile-lib" ,guile2.2-lib) ,@(fold alist-delete (package-inputs guile-cairo) '("guile" "guile-lib")))))) +(define-public guile3.0-cairo + (deprecated-package "guile3.0-cairo" guile-cairo)) + (define-public guile-rsvg ;; Use a recent snapshot that supports Guile 2.2 and beyond. (let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678") @@ -947,7 +948,7 @@ exceptions, macros, and a dynamic programming environment.") ("automake" ,automake) ("libtool" ,libtool) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.2) + (inputs `(("guile" ,guile-3.0) ("librsvg" ,librsvg) ("guile-lib" ,guile-lib))) ;for (unit-test) (propagated-inputs `(("guile-cairo" ,guile-cairo))) @@ -958,16 +959,19 @@ images onto Cairo surfaces.") (home-page "http://wingolog.org/projects/guile-rsvg/") (license license:lgpl2.1+)))) -(define-public guile3.0-rsvg +(define-public guile2.2-rsvg (package (inherit guile-rsvg) - (name "guile3.0-rsvg") + (name "guile2.2-rsvg") (inputs - `(("guile" ,guile-3.0) - ("guile-lib" ,guile3.0-lib) + `(("guile" ,guile-2.2) + ("guile-lib" ,guile2.2-lib) ,@(fold alist-delete (package-inputs guile-rsvg) '("guile" "guile-lib")))) - (propagated-inputs `(("guile-cairo" ,guile3.0-cairo))))) + (propagated-inputs `(("guile-cairo" ,guile2.2-cairo))))) + +(define-public guile3.0-rsvg + (deprecated-package "guile3.0-rsvg" guile-rsvg)) (define-public guile-present (package @@ -1013,7 +1017,7 @@ images onto Cairo surfaces.") out "/lib/guile/" version "/site-ccache ")))) #t))))) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (propagated-inputs ;; These are used by the (present …) modules. `(("guile-lib" ,guile-lib) @@ -1029,15 +1033,18 @@ includes a tools to generate PDF presentations out of Org mode and Texinfo documents.") (license license:lgpl3+))) -(define-public guile3.0-present +(define-public guile2.2-present (package (inherit guile-present) - (name "guile3.0-present") - (inputs `(("guile" ,guile-3.0))) + (name "guile2.2-present") + (inputs `(("guile" ,guile-2.2))) (propagated-inputs - `(("guile-lib" ,guile3.0-lib) - ("guile-cairo" ,guile3.0-cairo) - ("guile-rsvg" ,guile3.0-rsvg))))) + `(("guile-lib" ,guile2.2-lib) + ("guile-cairo" ,guile2.2-cairo) + ("guile-rsvg" ,guile2.2-rsvg))))) + +(define-public guile3.0-present + (deprecated-package "guile3.0-present" guile-present)) (define-public guile-gnome (package @@ -1072,9 +1079,9 @@ documents.") ("glib" ,glib))) (inputs `(("guile" ,guile-2.2))) (propagated-inputs - `(("guile-cairo" ,guile-cairo) + `(("guile-cairo" ,guile2.2-cairo) ("g-wrap" ,g-wrap) - ("guile-lib" ,guile-lib))) + ("guile-lib" ,guile2.2-lib))) (arguments `(#:tests? #f ;FIXME #:phases (modify-phases %standard-phases diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9f8173657e..0ee712b6f5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -523,7 +523,9 @@ Unix-style DSV format and RFC 4180 format.") #t)))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases + '(;; The code uses 'scm_t_uint64' et al., which are deprecated in 3.0. + #:configure-flags '("CFLAGS=-Wno-error=deprecated-declarations") + #:phases (modify-phases %standard-phases (add-after 'install 'mode-guile-objects (lambda* (#:key outputs #:allow-other-keys) ;; .go files are installed to "lib/guile/X.Y/cache". @@ -540,7 +542,7 @@ Unix-style DSV format and RFC 4180 format.") `(("texinfo" ,texinfo) ("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (synopsis "Lightweight concurrency facility for Guile") (description "Fibers is a Guile library that implements a a lightweight concurrency @@ -556,15 +558,14 @@ is not available for Guile 2.0.") (home-page "https://github.com/wingo/fibers") (license license:lgpl3+))) -(define-public guile3.0-fibers +(define-public guile2.0-fibers (package (inherit guile-fibers) - (name "guile3.0-fibers") - (arguments - ;; The code uses 'scm_t_uint64' et al., which are deprecated in 3.0. - `(#:configure-flags '("CFLAGS=-Wno-error=deprecated-declarations") - ,@(package-arguments guile-fibers))) - (inputs `(("guile" ,guile-3.0))))) + (name "guile2.2-fibers") + (inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-fibers + (deprecated-package "guile3.0-fibers" guile-fibers)) (define-public guile-syntax-highlight (package @@ -591,7 +592,7 @@ is not available for Guile 2.0.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (synopsis "General-purpose syntax highlighter for GNU Guile") (description "Guile-syntax-highlight is a general-purpose syntax highlighting library for GNU Guile. It can parse code written in various @@ -600,11 +601,14 @@ HTML (via SXML) or any other format for rendering.") (home-page "http://dthompson.us/projects/guile-syntax-highlight.html") (license license:lgpl3+))) -(define-public guile3.0-syntax-highlight +(define-public guile2.2-syntax-highlight (package (inherit guile-syntax-highlight) - (name "guile3.0-syntax-highlight") - (inputs `(("guile" ,guile-3.0))))) + (name "guile2.2-syntax-highlight") + (inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-syntax-highlight + (deprecated-package "guile3.0-syntax-highlight" guile-syntax-highlight)) (define-public guile-sjson (package @@ -692,18 +696,21 @@ using Guile's foreign function interface.") (base32 "10mv8c63159r3qvwwdvsgnsvdg7nc2ghak85zapwqpv4ywrqp9zc")))) (build-system guile-build-system) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (home-page "https://gitlab.com/NalaGinrut/guile-colorized") (synopsis "Colorized REPL for Guile") (description "Guile-colorized provides you with a colorized REPL for GNU Guile.") (license license:gpl3+))) -(define-public guile3.0-colorized +(define-public guile2.2-colorized (package (inherit guile-colorized) - (name "guile3.0-colorized") - (native-inputs `(("guile" ,guile-next))))) + (name "guile2.2-colorized") + (native-inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-colorized + (deprecated-package "guile3.0-colorized" guile-colorized)) (define-public guile-pfds (package @@ -723,6 +730,14 @@ using Guile's foreign function interface.") (arguments '(#:source-directory "src" #:phases (modify-phases %standard-phases + (add-after 'unpack 'work-around-guile-bug + (lambda _ + ;; See bug #39210. + (substitute* '("fingertrees.sls" + "queues/private/condition.sls" + "deques/private/condition.sls") + (("&assertion") "&violation")) + #t)) (add-after 'unpack 'move-files-around (lambda _ ;; Move files under a pfds/ directory to reflect the @@ -756,7 +771,7 @@ using Guile's foreign function interface.") (find-files "." "\\.sls$")) #t))))) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (synopsis "Purely functional data structures for Guile") (description "This package provides purely functional data structures written in R6RS @@ -777,23 +792,19 @@ Vicare Scheme and IronScheme. Right now it contains: @end itemize\n") (license license:bsd-3))) -(define-public guile3.0-pfds +(define-public guile2.2-pfds (package (inherit guile-pfds) - (name "guile3.0-pfds") - (native-inputs `(("guile" ,guile-3.0))) + (name "guile2.2-pfds") + (native-inputs `(("guile" ,guile-2.2))) (arguments (substitute-keyword-arguments (package-arguments guile-pfds) ((#:phases phases) `(modify-phases ,phases - (add-after 'unpack 'work-around-guile-bug - (lambda _ - ;; See bug #39210. - (substitute* '("fingertrees.sls" - "queues/private/condition.sls" - "deques/private/condition.sls") - (("&assertion") "&violation")) - #t)))))))) + (delete 'work-around-guile-bug))))))) + +(define-public guile3.0-pfds + (deprecated-package "guile3.0-pfds" guile-pfds)) (define-public guile-aa-tree (package @@ -847,7 +858,7 @@ convenient nested tree operations.") (assoc-ref inputs "zeromq")))) #t))))) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (inputs `(("zeromq" ,zeromq))) (home-page "https://github.com/jerry40/guile-simple-zmq") @@ -857,11 +868,14 @@ convenient nested tree operations.") messaging library.") (license license:gpl3+)))) -(define-public guile3.0-simple-zmq +(define-public guile2.2-simple-zmq (package (inherit guile-simple-zmq) - (name "guile3.0-simple-zmq") - (native-inputs `(("guile" ,guile-next))))) + (name "guile2.2-simple-zmq") + (native-inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-simple-zmq + (deprecated-package "guile3.0-simple-zmq" guile-simple-zmq)) (define-public jupyter-guile-kernel (let ((commit "a7db9245a886e104138474df46c3e88b95cff629") @@ -1068,7 +1082,7 @@ format.") '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("newt" ,newt))) (native-inputs `(("autoconf" ,autoconf) @@ -1082,13 +1096,16 @@ Scheme by using Guile’s foreign function interface.") (home-page "https://gitlab.com/mothacehe/guile-newt") (license license:gpl3+))) -(define-public guile3.0-newt +(define-public guile2.2-newt (package (inherit guile-newt) - (name "guile3.0-newt") + (name "guile2.2-newt") (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-newt)))))) +(define-public guile3.0-newt + (deprecated-package "guile3.0-newt" guile-newt)) + (define-public guile-mastodon (package (name "guile-mastodon") @@ -1149,7 +1166,7 @@ microblogging service.") '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("parted" ,parted))) (propagated-inputs `(("guile-bytestructures" ,guile-bytestructures))) @@ -1165,14 +1182,17 @@ written in pure Scheme by using Guile's foreign function interface.") (home-page "https://gitlab.com/mothacehe/guile-parted") (license license:gpl3+))) -(define-public guile3.0-parted +(define-public guile2.2-parted (package (inherit guile-parted) - (name "guile3.0-parted") + (name "guile2.2-parted") (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-parted)))) (propagated-inputs - `(("guile-bytestructures" ,guile3.0-bytestructures))))) + `(("guile-bytestructures" ,guile2.2-bytestructures))))) + +(define-public guile3.0-parted + (deprecated-package "guile3.0-parted" guile-parted)) (define-public guile-xosd (package @@ -1359,7 +1379,7 @@ PostgreSQL.") ("automake" ,automake) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (synopsis "Guile application configuration parsing library.") (description @@ -1374,13 +1394,16 @@ above command-line parameters.") "https://gitlab.com/a-sassmannshausen/guile-config") (license license:gpl3+))) -(define-public guile3.0-config +(define-public guile2.2-config (package (inherit guile-config) - (name "guile3.0-config") - (inputs `(("guile" ,guile-next) + (name "guile2.2-config") + (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-config)))))) +(define-public guile3.0-config + (deprecated-package "guile3.0-config" guile-config)) + (define-public guile-hall (package (name "guile-hall") @@ -1447,7 +1470,7 @@ above command-line parameters.") ("automake" ,automake) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (propagated-inputs `(("guile-config" ,guile-config))) (synopsis "Guile project tooling") @@ -1459,17 +1482,20 @@ provides tight coupling to Guix.") (home-page "https://gitlab.com/a-sassmannshausen/guile-hall") (license license:gpl3+))) -(define-public guile3.0-hall +(define-public guile2.2-hall (package (inherit guile-hall) - (name "guile3.0-hall") - (inputs `(("guile" ,guile-next) + (name "guile2.2-hall") + (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-hall)))) (propagated-inputs - `(("guile-config" ,guile3.0-config) + `(("guile-config" ,guile2.2-config) ,@(alist-delete "guile-config" (package-propagated-inputs guile-hall)))))) +(define-public guile3.0-hall + (deprecated-package "guile3.0-hall" guile-hall)) + (define-public guile-ics (package (name "guile-ics") @@ -1499,7 +1525,7 @@ provides tight coupling to Guix.") ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'. ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.2) ("which" ,which))) + (inputs `(("guile" ,guile-3.0) ("which" ,which))) (propagated-inputs `(("guile-lib" ,guile-lib))) (home-page "https://github.com/artyom-poptsov/guile-ics") (synopsis "Guile parser library for the iCalendar format") @@ -1510,13 +1536,16 @@ pure Scheme. The library can be used to read and write iCalendar data. The library is shipped with documentation in Info format and usage examples.") (license license:gpl3+))) -(define-public guile3.0-ics +(define-public guile2.2-ics (package (inherit guile-ics) - (name "guile3.0-ics") - (inputs `(("guile" ,guile-3.0) + (name "guile2.2-ics") + (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-ics)))) - (propagated-inputs `(("guile-lib" ,guile3.0-lib))))) + (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) + +(define-public guile3.0-ics + (deprecated-package "guile3.0-ics" guile-ics)) (define-public guile-wisp (package @@ -1543,6 +1572,12 @@ The library is shipped with documentation in Info format and usage examples.") (guix build emacs-utils)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'support-guile-3.0 + (lambda _ + (substitute* "configure" + (("_guile_versions_to_search=\"2.2") + "_guile_versions_to_search=\"3.0 2.2")) + #t)) (add-before 'configure 'patch-/usr/bin/env (lambda _ (substitute* "Makefile.in" @@ -1581,7 +1616,7 @@ The library is shipped with documentation in Info format and usage examples.") (assoc-ref emacs:%standard-phases 'make-autoloads))))) (home-page "https://www.draketo.de/english/wisp") (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (native-inputs `(("emacs" ,emacs-minimal) ("python" ,python) @@ -1592,21 +1627,14 @@ whitespace-significant language. It may be easier on the eyes for some users and in some situations.") (license license:gpl3+))) -(define-public guile3.0-wisp +(define-public guile2.2-wisp (package (inherit guile-wisp) - (name "guile3.0-wisp") - (inputs `(("guile" ,guile-3.0))) - (arguments - (substitute-keyword-arguments (package-arguments guile-wisp) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'support-guile-3.0 - (lambda _ - (substitute* "configure" - (("_guile_versions_to_search=\"2.2") - "_guile_versions_to_search=\"3.0 2.2")) - #t)))))))) + (name "guile2.2-wisp") + (inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-wisp + (deprecated-package "guile3.0-wisp" guile-wisp)) (define-public guile-sly (package @@ -1847,7 +1875,7 @@ library.") $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) #t))))) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (home-page "https://www.nongnu.org/guile-lib/") (synopsis "Collection of useful Guile Scheme modules") (description @@ -1867,11 +1895,14 @@ for Guile\".") (name "guile2.0-lib") (inputs `(("guile" ,guile-2.0))))) -(define-public guile3.0-lib +(define-public guile2.2-lib (package (inherit guile-lib) - (name "guile3.0-lib") - (inputs `(("guile" ,guile-3.0))))) + (name "guile2.2-lib") + (inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-lib + (deprecated-package "guile3.0-lib" guile-lib)) (define-public guile-minikanren (package @@ -1888,7 +1919,7 @@ for Guile\".") "0r50jlpzi940jlmxyy3ddqqwmj5r12gb4bcv0ssini9v8km13xz6")))) (build-system guile-build-system) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (home-page "https://github.com/ijp/minikanren") (synopsis "MiniKanren declarative logic system, packaged for Guile") (description @@ -1909,11 +1940,14 @@ See http://minikanren.org/ for more on miniKanren generally.") (name "guile2.0-minikanren") (native-inputs `(("guile" ,guile-2.0))))) -(define-public guile3.0-minikanren +(define-public guile2.2-minikanren (package (inherit guile-minikanren) - (name "guile3.0-minikanren") - (native-inputs `(("guile" ,guile-next))))) + (name "guile2.2-minikanren") + (native-inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-minikanren + (deprecated-package "guile3.0-minikanren" guile-minikanren)) (define-public guile-irregex (package @@ -1946,7 +1980,7 @@ See http://minikanren.org/ for more on miniKanren generally.") #t))) #:source-directory "src")) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (home-page "http://synthcode.com/scheme/irregex") (synopsis "S-expression based regular expressions") (description @@ -1961,11 +1995,14 @@ inspired by the SCSH regular expression system.") (name "guile2.0-irregex") (native-inputs `(("guile" ,guile-2.0))))) -(define-public guile3.0-irregex +(define-public guile2.2-irregex (package (inherit guile-irregex) - (name "guile3.0-irregex") - (native-inputs `(("guile" ,guile-next))))) + (name "guile2.2-irregex") + (native-inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-irregex + (deprecated-package "guile3.0-irregex" guile-irregex)) (define-public haunt (package @@ -2031,9 +2068,10 @@ inspired by the SCSH regular expression system.") `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (propagated-inputs - `(("guile-reader" ,guile-reader) + ;; XXX: Guile-Reader is currently unavailable for Guile 2.2 so strip it. + `(;;("guile-reader" ,guile-reader) ("guile-commonmark" ,guile-commonmark))) (synopsis "Functional static site generator") (description "Haunt is a static site generator written in Guile @@ -2042,14 +2080,14 @@ interface for reading articles in any format.") (home-page "http://haunt.dthompson.us") (license license:gpl3+))) -(define-public guile3.0-haunt +(define-public guile2.2-haunt (package (inherit haunt) - (name "guile3.0-haunt") - (inputs `(("guile" ,guile-3.0))) + (name "guile2.2-haunt") + (inputs `(("guile" ,guile-2.2))) (propagated-inputs - ;; XXX: Guile-Reader is currently unavailable for Guile 3.0 so strip it. - `(("guile-commonmark" ,guile3.0-commonmark))))) + `(("guile-reader" ,guile-reader) + ("guile-commonmark" ,guile2.2-commonmark))))) (define-public guile2.0-haunt (package @@ -2057,6 +2095,9 @@ interface for reading articles in any format.") (name "guile2.0-haunt") (inputs `(("guile" ,guile-2.0))))) +(define-public guile3.0-haunt + (deprecated-package "guile3.0-haunt" haunt)) + (define-public guile-redis (package (name "guile-redis") @@ -2112,7 +2153,7 @@ key-value cache and store.") #t)))) (build-system gnu-build-system) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (native-inputs `(("pkg-config" ,pkg-config))) (synopsis "CommonMark parser for Guile") @@ -2125,11 +2166,11 @@ is no support for parsing block and inline level HTML.") (home-page "https://github.com/OrangeShark/guile-commonmark") (license license:lgpl3+))) -(define-public guile3.0-commonmark +(define-public guile2.2-commonmark (package (inherit guile-commonmark) - (name "guile3.0-commonmark") - (inputs `(("guile" ,guile-3.0))))) + (name "guile2.2-commonmark") + (inputs `(("guile" ,guile-2.2))))) (define-public guile2.0-commonmark (package @@ -2137,6 +2178,9 @@ is no support for parsing block and inline level HTML.") (name "guile2.0-commonmark") (inputs `(("guile" ,guile-2.0))))) +(define-public guile3.0-commonmark + (deprecated-package "guile3.0-commonmark" guile-commonmark)) + (define-public mcron (package (name "mcron") @@ -2174,7 +2218,7 @@ is no support for parsing block and inline level HTML.") #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("tzdata" ,tzdata-for-tests))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (home-page "https://www.gnu.org/software/mcron/") (synopsis "Run jobs at scheduled times") (description @@ -2184,11 +2228,14 @@ Guile, so its configuration can be written in Scheme; the original cron format is also supported.") (license license:gpl3+))) -(define-public guile3.0-mcron +(define-public guile2.2-mcron (package (inherit mcron) - (name "guile3.0-mcron") - (inputs `(("guile" ,guile-3.0))))) + (name "guile2.2-mcron") + (inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-mcron + (deprecated-package "guile3.0-mcron" mcron)) (define-public mcron2 ;; This was mthl's mcron development branch, and it became mcron 1.1. @@ -2211,7 +2258,7 @@ format is also supported.") "1ydvw9dvssdvlvhh1dr8inyzy2x6m41qgp8hsivca1xysr4gc23a")))) (build-system gnu-build-system) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -2225,11 +2272,15 @@ format is also supported.") The picture values can directly be displayed in Geiser.") (license license:lgpl3+)))) -(define-public guile3.0-picture-language +(define-public guile2.2-picture-language (package (inherit guile-picture-language) - (name "guile3.0-picture-language") - (inputs `(("guile" ,guile-3.0))))) + (name "guile2.2-picture-language") + (inputs `(("guile" ,guile-2.2))))) + +(define-public guile3.0-picture-language + (deprecated-package "guile3.0-picture-language" + guile-picture-language)) (define-public guile-studio (package @@ -2526,7 +2577,7 @@ list of components. This module takes care of that for you.") ("gtk+" ,gtk+) ("guile-lib" ,guile-lib) ("webkitgtk" ,webkitgtk))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (home-page "https://github.com/spk121/guile-gi") (synopsis "GObject bindings for Guile") (description @@ -2535,14 +2586,17 @@ libraries, such as GTK+3. Its README comes with the disclaimer: This is pre-alpha code.") (license license:gpl3+))) -(define-public guile3.0-gi +(define-public guile2.2-gi (package (inherit guile-gi) - (name "guile3.0-gi") + (name "guile2.2-gi") (native-inputs - `(("guile" ,guile-3.0) + `(("guile" ,guile-2.2) ,@(package-native-inputs guile-gi))))) +(define-public guile3.0-gi + (deprecated-package "guile3.0-gi" guile-gi)) + (define-public guile-srfi-159 (let ((commit "1bd98abda2ae4ef8f36761a167903e55c6bda7bb") (revision "0")) @@ -3012,7 +3066,7 @@ the style of the Node Package Manager (NPM).") (rename-file "private" "hashing/private") #t))))) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (synopsis "Cryprographic hash functions implemented in Scheme") (description "The @code{(hashing @dots{})} modules implement cryptographic hash @@ -3020,13 +3074,16 @@ functions in pure R6RS Scheme: CRC, HMAC, MD5, SHA-1, and SHA-2 (SHA-256, SHA-512).") (license license:expat))) -(define-public guile3.0-hashing +(define-public guile2.2-hashing (package (inherit guile-hashing) - (name "guile3.0-hashing") + (name "guile2.2-hashing") (native-inputs `(("guile" ,guile-next))))) +(define-public guile3.0-hashing + (deprecated-package "guile3.0-hashing" guile-hashing)) + (define-public guile-webutils (let ((commit "8541904f761066dc9c27b1153e9a838be9a55299") (revision "0")) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 17fa51a3c7..b471eccfed 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -252,15 +252,6 @@ without requiring the source code to be rewritten.") (define-deprecated guile-2.2/bug-fix guile-2.2) -(define-public guile-2.2/fixed - ;; A package of Guile 2.2 that's rarely changed. It is the one used - ;; in the `base' module, and thus changing it entails a full rebuild. - (package - (inherit guile-2.2) - (properties '((hidden? . #t) ;people should install 'guile-2.2' - (timeout . 72000) ;20 hours - (max-silent-time . 36000))))) ;10 hours (needed on ARM - ; when heavily loaded) (define-public guile-2.2.4 (package/inherit guile-2.2 @@ -277,7 +268,7 @@ without requiring the source code to be rewritten.") ;; This is the latest Guile stable version. (package (inherit guile-2.2) - (name "guile-next") ;to be renamed to "guile" + (name "guile") (version "3.0.1") (source (origin (inherit (package-source guile-2.2)) @@ -300,6 +291,16 @@ without requiring the source code to be rewritten.") (define-public guile-next guile-3.0) +(define-public guile-3.0/fixed + ;; A package of Guile that's rarely changed. It is the one used in the + ;; `base' module, and thus changing it entails a full rebuild. + (package + (inherit guile-3.0) + (properties '((hidden? . #t) ;people should install 'guile-2.2' + (timeout . 72000) ;20 hours + (max-silent-time . 36000))))) ;10 hours (needed on ARM + ; when heavily loaded) + (define* (make-guile-readline guile #:optional (name "guile-readline")) (package (name name) @@ -377,9 +378,32 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its (package-input-rewriting `((,guile-2.2 . ,guile-2.0)) (guile-variant-package-name "guile2.0"))) -(define package-for-guile-3.0 - (package-input-rewriting `((,guile-2.2 . ,guile-next)) - (guile-variant-package-name "guile3.0"))) +(define package-for-guile-2.2 + (package-input-rewriting `((,guile-3.0 . ,guile-2.2)) + (guile-variant-package-name "guile2.2"))) + +(define-syntax define-deprecated-guile3.0-package + (lambda (s) + "Define a deprecated package alias for \"guile3.0-something\"." + (syntax-case s () + ((_ name) + (and (identifier? #'name) + (string-prefix? "guile3.0-" (symbol->string (syntax->datum + #'name)))) + (let ((->guile (lambda (str) + (let ((base (string-drop str + (string-length "guile3.0-")))) + (string-append "guile-" base))))) + (with-syntax ((package-name (symbol->string (syntax->datum #'name))) + (package + (datum->syntax + #'name + (string->symbol + (->guile (symbol->string (syntax->datum #'name))))))) + #'(begin + (define-deprecated name package + (deprecated-package package-name package)) + (export name)))))))) (define-public guile-for-guile-emacs (package (inherit guile-2.2) @@ -474,10 +498,16 @@ specification. These are the main features: version ".tar.gz")) (sha256 (base32 - "14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz")))))) + "14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz")))) + (native-inputs `(("pkg-config" ,pkg-config) + ("guile" ,guile-3.0))) + (inputs `(("guile" ,guile-3.0))))) + +(define-public guile2.2-json + (package-for-guile-2.2 guile-json-3)) (define-public guile3.0-json - (package-for-guile-3.0 guile-json-3)) + (deprecated-package "guile3.0-json" guile-json-3)) ;; There are two guile-gdbm packages, one using the FFI and one with ;; direct C bindings, hence the verbose name. @@ -518,7 +548,7 @@ specification. These are the main features: (assoc-ref inputs "gdbm")))) #t))))) (native-inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (inputs `(("gdbm" ,gdbm))) (home-page "https://github.com/ijp/guile-gdbm") @@ -531,8 +561,10 @@ Guile's foreign function interface.") (define-public guile2.0-gdbm-ffi (package-for-guile-2.0 guile-gdbm-ffi)) -(define-public guile3.0-gdbm-ffi - (package-for-guile-3.0 guile-gdbm-ffi)) +(define-public guile2.2-gdbm-ffi + (package-for-guile-2.2 guile-gdbm-ffi)) + +(define-deprecated-guile3.0-package guile3.0-gdbm-ffi) (define-public guile-sqlite3 (package @@ -565,7 +597,7 @@ Guile's foreign function interface.") ("guile" ,guile-2.2) ("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("sqlite" ,sqlite))) (synopsis "Access SQLite databases from Guile") (description @@ -575,8 +607,10 @@ Guile's foreign function interface.") (define-public guile2.0-sqlite3 (package-for-guile-2.0 guile-sqlite3)) -(define-public guile3.0-sqlite3 - (package-for-guile-3.0 guile-sqlite3)) +(define-public guile2.2-sqlite3 + (package-for-guile-2.2 guile-sqlite3)) + +(define-deprecated-guile3.0-package guile3.0-sqlite3) (define-public guile-bytestructures (package @@ -608,9 +642,9 @@ Guile's foreign function interface.") `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (synopsis "Structured access to bytevector contents for Guile") (description "Guile bytestructures offers a system imitating the type system @@ -624,8 +658,10 @@ type system, elevating types to first-class status.") (define-public guile2.0-bytestructures (package-for-guile-2.0 guile-bytestructures)) -(define-public guile3.0-bytestructures - (package-for-guile-3.0 guile-bytestructures)) +(define-public guile2.2-bytestructures + (package-for-guile-2.2 guile-bytestructures)) + +(define-deprecated-guile3.0-package guile3.0-bytestructures) (define-public guile-git (package @@ -643,10 +679,10 @@ type system, elevating types to first-class status.") (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("guile-bytestructures" ,guile-bytestructures))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("libgit2" ,libgit2))) (propagated-inputs `(("guile-bytestructures" ,guile-bytestructures))) @@ -656,8 +692,8 @@ type system, elevating types to first-class status.") manipulate repositories of the Git version control system.") (license license:gpl3+))) -(define-public guile3.0-git - (package-for-guile-3.0 guile-git)) +(define-public guile2.2-git + (package-for-guile-2.2 guile-git)) (define-public guile2.0-git (let ((base (package-for-guile-2.0 guile-git))) @@ -670,5 +706,7 @@ manipulate repositories of the Git version control system.") ,@(srfi-1:alist-delete "libgit2" (package-inputs base))))))) +(define-deprecated-guile3.0-package guile3.0-git) + ;;; guile.scm ends here diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a09c263697..988542b061 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -222,7 +222,7 @@ `(("dejagnu" ,dejagnu) ("m4" ,m4) ("texinfo" ,texinfo) - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("gsasl" ,gsasl) ("gnutls" ,gnutls) ("ncurses" ,ncurses) @@ -246,14 +246,17 @@ software.") ;; Libraries are under LGPLv3+, and programs under GPLv3+. (list gpl3+ lgpl3+)))) -(define-public guile3.0-mailutils +(define-public guile2.2-mailutils (package (inherit mailutils) - (name "guile3.0-mailutils") + (name "guile2.2-mailutils") (inputs - `(("guile" ,guile-3.0) + `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs mailutils)))))) +(define-public guile3.0-mailutils + (deprecated-package "guile3.0-mailutils" mailutils)) + (define-public nullmailer (package (name "nullmailer") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 19dbf2c7b8..555019a57d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -307,7 +307,7 @@ ("sqlite" ,sqlite) ("libgcrypt" ,libgcrypt) - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ;; Some of the tests use "unshare" when it is available. ("util-linux" ,util-linux) @@ -328,7 +328,7 @@ ("glibc-utf8-locales" ,glibc-utf8-locales))) (propagated-inputs - `(("gnutls" ,gnutls) + `(("gnutls" ,guile3.0-gnutls) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-3) ("guile-sqlite3" ,guile-sqlite3) @@ -360,7 +360,7 @@ the Nix package manager.") (fold alist-delete (package-native-inputs guix) '("po4a" "graphviz" "help2man"))) (inputs - `(("gnutls" ,gnutls) + `(("gnutls" ,guile3.0-gnutls) ("guile-git" ,guile-git) ("guile-json" ,guile-json-3) ("guile-gcrypt" ,guile-gcrypt) @@ -408,31 +408,34 @@ the Nix package manager.") (define-public guile2.0-guix (deprecated-package "guile2.0-guix" guix)) -(define-public guile3.0-guix +(define-public guile2.2-guix (package (inherit guix) - (name "guile3.0-guix") + (name "guile2.2-guix") (native-inputs - `(("guile" ,guile-3.0) - ("gnutls" ,guile3.0-gnutls) - ("guile-gcrypt" ,guile3.0-gcrypt) - ("guile-json" ,guile3.0-json) - ("guile-sqlite3" ,guile3.0-sqlite3) - ("guile-ssh" ,guile3.0-ssh) - ("guile-git" ,guile3.0-git) + `(("guile" ,guile-2.2) + ("gnutls" ,guile2.2-gnutls) + ("guile-gcrypt" ,guile2.2-gcrypt) + ("guile-json" ,guile2.2-json) + ("guile-sqlite3" ,guile2.2-sqlite3) + ("guile-ssh" ,guile2.2-ssh) + ("guile-git" ,guile2.2-git) ,@(fold alist-delete (package-native-inputs guix) '("guile" "gnutls" "guile-gcrypt" "guile-json" "guile-sqlite3" "guile-ssh" "guile-git")))) (inputs - `(("guile" ,guile-3.0) + `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guix)))) (propagated-inputs - `(("gnutls" ,guile3.0-gnutls) - ("guile-gcrypt" ,guile3.0-gcrypt) - ("guile-json" ,guile3.0-json) - ("guile-sqlite3" ,guile3.0-sqlite3) - ("guile-ssh" ,guile3.0-ssh) - ("guile-git" ,guile3.0-git))))) + `(("gnutls" ,gnutls) + ("guile-gcrypt" ,guile2.2-gcrypt) + ("guile-json" ,guile2.2-json) + ("guile-sqlite3" ,guile2.2-sqlite3) + ("guile-ssh" ,guile2.2-ssh) + ("guile-git" ,guile2.2-git))))) + +(define-public guile3.0-guix + (deprecated-package "guile3.0-guix" guix)) (define-public guix-minimal ;; A version of Guix which is built with the minimal set of dependencies, as @@ -837,12 +840,12 @@ written entirely in Python."))) (inputs `(("guile" ,guile-3.0))) (propagated-inputs - `(("guix" ,guile3.0-guix) - ("guile-commonmark" ,guile3.0-commonmark) - ("guile-gcrypt" ,guile3.0-gcrypt) - ("guile-pfds" ,guile3.0-pfds) - ("guile-syntax-highlight" ,guile3.0-syntax-highlight) - ("guile-wisp" ,guile3.0-wisp))) + `(("guix" ,guix) + ("guile-commonmark" ,guile-commonmark) + ("guile-gcrypt" ,guile-gcrypt) + ("guile-pfds" ,guile-pfds) + ("guile-syntax-highlight" ,guile-syntax-highlight) + ("guile-wisp" ,guile-wisp))) (home-page "https://workflows.guix.info") (synopsis "Workflow management extension for GNU Guix") (description "The @dfn{Guix Workflow Language} (GWL) provides an @@ -867,6 +870,14 @@ environments.") (sha256 (base32 "01z7jjkc7r7lj6637rcgpz40v8xqqyfp6871h94yvcnwm7zy9h1n")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure.ac" + (("^GUILE_PKG.*") + "GUILE_PKG([3.0 2.2])\n")) + #t)) (file-name (string-append "guix-jupyter-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -925,7 +936,7 @@ environments.") ("python-ipykernel" ,python-ipykernel))) (inputs `(("guix" ,guix) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (propagated-inputs `(("guile-json" ,guile-json-3) ("guile-simple-zmq" ,guile-simple-zmq) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 7a7f30e255..a7b6e22030 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -112,7 +112,7 @@ scientific data.") #t)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-3.0))) (propagated-inputs `(("guile-cairo" ,guile-cairo))) (home-page "http://wingolog.org/software/guile-charting/") (synopsis "Create charts and graphs in Guile") @@ -121,12 +121,15 @@ scientific data.") using the Cairo drawing library.") (license license:lgpl2.1+))) -(define-public guile3.0-charting +(define-public guile2.2-charting (package (inherit guile-charting) - (name "guile3.0-charting") - (inputs `(("guile" ,guile-3.0))) - (propagated-inputs `(("guile-cairo" ,guile3.0-cairo))))) + (name "guile2.2-charting") + (inputs `(("guile" ,guile-2.2))) + (propagated-inputs `(("guile-cairo" ,guile2.2-cairo))))) + +(define-public guile3.0-charting + (deprecated-package "guile3.0-charting" guile-charting)) (define-public ploticus (package diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 4d062bbb18..9ae9e6aaaa 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -301,8 +301,8 @@ Additionally, various channel-specific options can be negotiated.") ("texinfo" ,texinfo) ("pkg-config" ,pkg-config) ("which" ,which) - ("guile" ,guile-2.2))) ;needed when cross-compiling. - (inputs `(("guile" ,guile-2.2) + ("guile" ,guile-3.0))) ;needed when cross-compiling. + (inputs `(("guile" ,guile-3.0) ("libssh" ,libssh) ("libgcrypt" ,libgcrypt))) (synopsis "Guile bindings to libssh") @@ -322,16 +322,19 @@ libssh library.") (inputs `(("guile" ,guile-2.0) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -(define-public guile3.0-ssh +(define-public guile2.2-ssh (package (inherit guile-ssh) - (name "guile3.0-ssh") + (name "guile2.2-ssh") (native-inputs - `(("guile" ,guile-next) ;needed when cross-compiling. + `(("guile" ,guile-2.2) ;needed when cross-compiling. ,@(alist-delete "guile" (package-native-inputs guile-ssh)))) - (inputs `(("guile" ,guile-next) + (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) +(define-public guile3.0-ssh + (deprecated-package "guile3.0-ssh" guile-ssh)) + (define-public corkscrew (package (name "corkscrew") diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6451037fdb..27c7804029 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2013 Cyril Roelandt -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2014, 2015, 2016 Mark H Weaver diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 4899dbe3b7..d46b29ec13 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2013, 2016, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2016, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Jeff Mickey ;;; Copyright © 2016, 2017, 2019 Efraim Flashner @@ -136,7 +136,7 @@ Only \"Universal TUN/TAP device driver support\" is needed in the kernel.") (base32 "1g41yarz2bl0f73kbjqnywr485ghanbp7nmspklfb0n07yp0z6ak")))) (build-system gnu-build-system) - (inputs `(("guile" ,guile-2.2) ; for the wrapper scripts + (inputs `(("guile" ,guile-3.0) ; for the wrapper scripts ("coreutils" ,coreutils) ("grep" ,grep) ("iproute2" ,iproute) ; for ‘ip’ diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index db10cbf3e9..84da93b4cc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7162,7 +7162,7 @@ compressed JSON header blocks. (inputs `(("guix" ,guix))) (propagated-inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("guile-commonmark" ,guile-commonmark) ("guile-json" ,guile-json-3))) (home-page "https://github.com/UMCUGenetics/hpcguix-web") diff --git a/guix/gexp.scm b/guix/gexp.scm index 5912511530..f50104efbc 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1553,12 +1553,12 @@ TARGET, a GNU triplet." ;;; (define (default-guile) - ;; Lazily resolve 'guile-2.2' (not 'guile-final' because this is for + ;; Lazily resolve 'guile-3.0' (not 'guile-final' because this is for ;; programs returned by 'program-file' and we don't want to keep references ;; to several Guile packages). This module must not refer to (gnu …) ;; modules directly, to avoid circular dependencies, hence this hack. (module-ref (resolve-interface '(gnu packages guile)) - 'guile-2.2)) + 'guile-3.0)) (define* (load-path-expression modules #:optional (path %load-path) #:key (extensions '()) system target) diff --git a/guix/self.scm b/guix/self.scm index 6b633f9bc0..e3b36b9407 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -49,11 +49,11 @@ (module-ref (resolve-interface module) variable)))) (match-lambda ("guile" (ref '(gnu packages guile) 'guile-3.0)) - ("guile-json" (ref '(gnu packages guile) 'guile3.0-json)) - ("guile-ssh" (ref '(gnu packages ssh) 'guile3.0-ssh)) - ("guile-git" (ref '(gnu packages guile) 'guile3.0-git)) - ("guile-sqlite3" (ref '(gnu packages guile) 'guile3.0-sqlite3)) - ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile3.0-gcrypt)) + ("guile-json" (ref '(gnu packages guile) 'guile-json-3)) + ("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh)) + ("guile-git" (ref '(gnu packages guile) 'guile-git)) + ("guile-sqlite3" (ref '(gnu packages guile) 'guile-sqlite3)) + ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt)) ("gnutls" (ref '(gnu packages tls) 'guile3.0-gnutls)) ("zlib" (ref '(gnu packages compression) 'zlib)) ("lzlib" (ref '(gnu packages compression) 'lzlib)) -- cgit v1.2.3 From 1a9b3faaf25c40552e100f4a00bef8f0a32ba1dc Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 02:35:00 -0500 Subject: gnu: shadow: Add linux-pam dependency for the Hurd. * gnu/packages/admin.scm (shadow): Also include linux-pam dependency for the Hurd. --- gnu/packages/admin.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f5cebc0283..a296d6cacf 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -503,11 +504,7 @@ hostname.") (for-each delete-file (find-files man "^groups\\.")) #t)))))) - (inputs (if (string-contains (or (%current-target-system) - (%current-system)) - "-linux") - `(("linux-pam" ,linux-pam)) - '())) + (inputs `(("linux-pam" ,linux-pam))) (home-page "https://github.com/shadow-maint/shadow") (synopsis "Authentication-related tools such as passwd, su, and login") (description -- cgit v1.2.3 From c0a5cd1be3fce740c634596959321a76f22623a9 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 16:11:48 +0100 Subject: gnu: shepherd: Build fix for the Hurd. * gnu/packages/patches/shepherd-hurd.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (shepherd): Use it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 2 ++ gnu/packages/patches/shepherd-hurd.patch | 44 ++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 gnu/packages/patches/shepherd-hurd.patch (limited to 'gnu/packages/admin.scm') diff --git a/gnu/local.mk b/gnu/local.mk index b25d369e07..0ff248fe70 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1428,6 +1428,7 @@ dist_patch_DATA = \ %D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ + %D%/packages/patches/shepherd-hurd.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ %D%/packages/patches/slim-session.patch \ %D%/packages/patches/slim-config.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a296d6cacf..4958d67b06 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages file) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) + #:use-module (gnu packages hurd) #:use-module (gnu packages libbsd) #:use-module (gnu packages linux) #:use-module (gnu packages lua) @@ -202,6 +203,7 @@ and provides a \"top-like\" mode (monitoring).") (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) + (patches (search-patches "shepherd-hurd.patch")) (sha256 (base32 "07j3vd0y8zab2nwbrwj0ahrfif1ldm5sjssn7m3dw4s307fsrfzx")))) diff --git a/gnu/packages/patches/shepherd-hurd.patch b/gnu/packages/patches/shepherd-hurd.patch new file mode 100644 index 0000000000..5043e831f2 --- /dev/null +++ b/gnu/packages/patches/shepherd-hurd.patch @@ -0,0 +1,44 @@ +Fixes compilation on the Hurd. + +Taken from upstream: http://git.savannah.gnu.org/cgit/shepherd.git/commit/?id=232331369fe2a0495c7c777e11eecabee6257b3f + +From 232331369fe2a0495c7c777e11eecabee6257b3f Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Sat, 7 Mar 2020 22:01:23 +0100 +Subject: [PATCH] system: Support compilation on the Hurd. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* modules/shepherd/system.scm.in (prctl): Wrap 'dynamic-func' call in +'false-if-exception'. + +Co-authored-by: Ludovic Courtès +--- + modules/shepherd/system.scm.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules/shepherd/system.scm.in b/modules/shepherd/system.scm.in +index 769404a..0b2cc9d 100644 +--- a/modules/shepherd/system.scm.in ++++ b/modules/shepherd/system.scm.in +@@ -1,6 +1,7 @@ + ;; system.scm -- Low-level operating system interface. + ;; Copyright (C) 2013, 2014, 2016, 2018 Ludovic Courtès + ;; Copyright (C) 2018 Carlo Zancanaro ++;; Copyright (C) 2020 Jan (janneke) Nieuwenhuizen + ;; + ;; This file is part of the GNU Shepherd. + ;; +@@ -145,7 +146,7 @@ ctrlaltdel(8) and see kernel/reboot.c in Linux." + (define PR_SET_CHILD_SUBREAPER @PR_SET_CHILD_SUBREAPER@) + + (define prctl +- (if (dynamic-func "prctl" (dynamic-link)) ++ (if (false-if-exception (dynamic-func "prctl" (dynamic-link))) + (let ((proc (syscall->procedure long "prctl" (list int int)))) + (lambda (process operation) + "Perform an operation on the given process" +-- +2.24.0 + -- cgit v1.2.3 From 3d3ca76f1cde964aa61433cdd40dd701c39e60e7 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 11:12:15 -0500 Subject: gnu: inetutils: Support for the Hurd. * gnu/packages/linux.scm (net-tools)[supported-systems]: Remove the Hurd. * gnu/packages/patches/inetutils-hurd.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (inetutils): Use it. Disable some features on the Hurd. [native-inputs]: Include net-tools only on supported systems --- gnu/local.mk | 1 + gnu/packages/admin.scm | 17 +- gnu/packages/linux.scm | 1 + gnu/packages/patches/inetutils-hurd.patch | 583 ++++++++++++++++++++++++++++++ 4 files changed, 601 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/inetutils-hurd.patch (limited to 'gnu/packages/admin.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 0ff248fe70..9e4ce6ce92 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1052,6 +1052,7 @@ dist_patch_DATA = \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/ilmbase-openexr-pkg-config.patch \ + %D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4958d67b06..9662468b55 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -438,6 +438,7 @@ re-executing them as necessary.") (method url-fetch) (uri (string-append "mirror://gnu/inetutils/inetutils-" version ".tar.gz")) + (patches (search-patches "inetutils-hurd.patch")) (sha256 (base32 "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy")))) @@ -449,13 +450,27 @@ re-executing them as necessary.") ;; cross-compiling (by default it does not.) ,@(if (%current-target-system) '("--with-path-procnet-dev=/proc/net/dev") + '()) + ,@(if (hurd-target?) + '("--disable-rcp" + "--disable-rexec" + "--disable-rexecd" + "--disable-rlogin" + "--disable-rlogind" + "--disable-rsh" + "--disable-rshd" + "--disable-uucpd" + "--disable-whois") '())) ;; On some systems, 'libls.sh' may fail with an error such as: ;; "Failed to tell switch -a apart from -A". #:parallel-tests? #f)) (inputs `(("ncurses" ,ncurses) ("readline" ,readline))) ;for 'ftp' - (native-inputs `(("netstat" ,net-tools))) ;for tests + (native-inputs (if (member (%current-system) + (package-supported-systems net-tools)) + `(("netstat" ,net-tools)) ;for tests + '())) (home-page "https://www.gnu.org/software/inetutils/") (synopsis "Basic networking utilities") (description diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3abfc469ba..1c157205d3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2031,6 +2031,7 @@ inadequately in modern network environments, and both should be deprecated.") (string-append "mandir=/share/man"))))) (native-inputs `(("gettext" ,gettext-minimal) ("unzip" ,unzip))) + (supported-systems (delete "i586-gnu" %supported-systems)) (synopsis "Tools for controlling the network subsystem in Linux") (description "This package includes the important tools for controlling the network diff --git a/gnu/packages/patches/inetutils-hurd.patch b/gnu/packages/patches/inetutils-hurd.patch new file mode 100644 index 0000000000..bd65c4feb1 --- /dev/null +++ b/gnu/packages/patches/inetutils-hurd.patch @@ -0,0 +1,583 @@ +Support compiling on the Hurd. + +Taken from https://git.hadrons.org/cgit/debian/pkgs/inetutils.git/tree/debian/patches/0002-ifconfig-Improve-the-support-for-GNU-Hurd.patch + +From 9a90d9b9119906df23cb2db1503cb0f099942dd9 Mon Sep 17 00:00:00 2001 +From: Mats Erik Andersson +Date: Sat, 18 Jul 2015 01:12:41 +0200 +Subject: [PATCH 02/35] ifconfig: Improve the support for GNU/Hurd. + +Use system specific code instead of generic code. +This provides abilities similar to other systems. +--- + ChangeLog | 17 +++ + ifconfig/system.c | 10 +- + ifconfig/system.h | 2 + + ifconfig/system/Makefile.am | 4 +- + ifconfig/system/generic.c | 14 +- + ifconfig/system/hurd.c | 292 ++++++++++++++++++++++++++++++++++++ + ifconfig/system/hurd.h | 50 ++++++ + 7 files changed, 381 insertions(+), 8 deletions(-) + create mode 100644 ifconfig/system/hurd.c + create mode 100644 ifconfig/system/hurd.h + +diff --git a/ifconfig/system.c b/ifconfig/system.c +index 30677e41..e108dc2e 100644 +--- a/ifconfig/system.c ++++ b/ifconfig/system.c +@@ -25,10 +25,12 @@ + # include "system/solaris.c" + #elif defined __QNX__ + # include "system/qnx.c" +-# elif defined __DragonFly__ || defined __FreeBSD__ || \ +- defined __FreeBSD_kernel__ || \ +- defined __NetBSD__ || defined __OpenBSD__ +-# include "system/bsd.c" ++#elif defined __DragonFly__ || defined __FreeBSD__ || \ ++ defined __FreeBSD_kernel__ || \ ++ defined __NetBSD__ || defined __OpenBSD__ ++# include "system/bsd.c" ++#elif defined __GNU__ ++# include "system/hurd.c" + #else + # include "system/generic.c" + #endif +diff --git a/ifconfig/system.h b/ifconfig/system.h +index 8521ad95..66878d3a 100644 +--- a/ifconfig/system.h ++++ b/ifconfig/system.h +@@ -97,6 +97,8 @@ extern struct if_nameindex* (*system_if_nameindex) (void); + defined __FreeBSD_kernel__ || \ + defined __NetBSD__ || defined __OpenBSD__ + # include "system/bsd.h" ++# elif defined __GNU__ ++# include "system/hurd.h" + # else + # include "system/generic.h" + # endif +diff --git a/ifconfig/system/Makefile.am b/ifconfig/system/Makefile.am +index 954c6774..62a9f1c4 100644 +--- a/ifconfig/system/Makefile.am ++++ b/ifconfig/system/Makefile.am +@@ -26,8 +26,10 @@ noinst_HEADERS = \ + linux.h \ + solaris.h \ + qnx.h \ ++ hurd.h \ + bsd.c \ + generic.c \ + linux.c \ + solaris.c \ +- qnx.c ++ qnx.c \ ++ hurd.c +diff --git a/ifconfig/system/generic.c b/ifconfig/system/generic.c +index 9a2bda55..20a78bde 100644 +--- a/ifconfig/system/generic.c ++++ b/ifconfig/system/generic.c +@@ -22,6 +22,8 @@ + #include + + #include "../ifconfig.h" ++ ++#include + + + /* Output format stuff. */ +@@ -36,19 +38,25 @@ const char *system_help; + struct argp_child system_argp_child; + + int +-system_parse_opt (struct ifconfig **ifp, char option, char *optarg) ++system_parse_opt (struct ifconfig **ifp _GL_UNUSED_PARAMETER, ++ char option _GL_UNUSED_PARAMETER, ++ char *optarg _GL_UNUSED_PARAMETER) + { + return 0; + } + + int +-system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[]) ++system_parse_opt_rest (struct ifconfig **ifp _GL_UNUSED_PARAMETER, ++ int argc _GL_UNUSED_PARAMETER, ++ char *argv[] _GL_UNUSED_PARAMETER) + { + return 0; + } + + int +-system_configure (int sfd, struct ifreq *ifr, struct system_ifconfig *ifs) ++system_configure (int sfd _GL_UNUSED_PARAMETER, ++ struct ifreq *ifr _GL_UNUSED_PARAMETER, ++ struct system_ifconfig *ifs _GL_UNUSED_PARAMETER) + { + return 0; + } +diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c +new file mode 100644 +index 00000000..3bd19775 +--- /dev/null ++++ b/ifconfig/system/hurd.c +@@ -0,0 +1,292 @@ ++/* hurd.c -- Code for ifconfig specific to GNU/Hurd. ++ Copyright (C) 2015 Free Software Foundation, Inc. ++ ++ This file is part of GNU Inetutils. ++ ++ GNU Inetutils is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or (at ++ your option) any later version. ++ ++ GNU Inetutils is distributed in the hope that it will be useful, but ++ WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see `http://www.gnu.org/licenses/'. */ ++ ++/* Mostly written by Marcus Brinkmann. ++ Adaptions to GNU/Hurd by Mats Erik Andersson. */ ++ ++#include ++ ++#include ++#include ++#include ++#include "../ifconfig.h" ++ ++#include ++ ++ ++/* Output format stuff. */ ++ ++const char *system_default_format = "gnu"; ++ ++ ++/* Argument parsing stuff. */ ++ ++const char *system_help = "NAME [ADDR]\ ++ [broadcast BRDADDR] [netmask MASK]\ ++ [mtu N] [up|down] [FLAGS]"; ++ ++struct argp_child system_argp_child; ++ ++int ++system_parse_opt (struct ifconfig **ifp _GL_UNUSED_PARAMETER, ++ char option _GL_UNUSED_PARAMETER, ++ char *optarg _GL_UNUSED_PARAMETER) ++{ ++ return 0; ++} ++ ++int ++system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[]) ++{ ++ int i = 0, mask, rev; ++ enum { ++ EXPECT_NOTHING, ++ EXPECT_AF, ++ EXPECT_BROADCAST, ++ EXPECT_NETMASK, ++ EXPECT_METRIC, ++ EXPECT_MTU ++ } expect = EXPECT_AF; ++ ++ *ifp = parse_opt_new_ifs (argv[0]); ++ ++ while (++i < argc) ++ { ++ switch (expect) ++ { ++ case EXPECT_BROADCAST: ++ parse_opt_set_brdaddr (*ifp, argv[i]); ++ break; ++ ++ case EXPECT_NETMASK: ++ parse_opt_set_netmask (*ifp, argv[i]); ++ break; ++ ++ case EXPECT_MTU: ++ parse_opt_set_mtu (*ifp, argv[i]); ++ break; ++ ++ /* XXX: 2015-07-18, GNU/Hurd does not yet support ++ ioctl(SIOCSIFMETRIC), but we let the code ++ handle this standard ability anyway! ++ */ ++ case EXPECT_METRIC: ++ parse_opt_set_metric (*ifp, argv[i]); ++ break; ++ ++ case EXPECT_AF: ++ expect = EXPECT_NOTHING; ++ if (!strcmp (argv[i], "inet")) ++ continue; ++ else if (!strcmp (argv[i], "inet6")) ++ { ++ error (0, 0, "%s is not a supported address family", argv[i]); ++ return 0; ++ } ++ break; ++ ++ case EXPECT_NOTHING: ++ break; ++ } ++ ++ if (expect != EXPECT_NOTHING) ++ expect = EXPECT_NOTHING; ++ else if (!strcmp (argv[i], "broadcast")) ++ expect = EXPECT_BROADCAST; ++ else if (!strcmp (argv[i], "netmask")) ++ expect = EXPECT_NETMASK; ++ else if (!strcmp (argv[i], "metric")) ++ expect = EXPECT_METRIC; ++ else if (!strcmp (argv[i], "mtu")) ++ expect = EXPECT_MTU; ++ else if (!strcmp (argv[i], "up")) ++ parse_opt_set_flag (*ifp, IFF_UP | IFF_RUNNING, 0); ++ else if (!strcmp (argv[i], "down")) ++ parse_opt_set_flag (*ifp, IFF_UP, 1); ++ else if (((mask = if_nameztoflag (argv[i], &rev)) ++ & ~IU_IFF_CANTCHANGE) != 0) ++ parse_opt_set_flag (*ifp, mask, rev); ++ else ++ { ++ if (!((*ifp)->valid & IF_VALID_ADDR)) ++ parse_opt_set_address (*ifp, argv[i]); ++ else if (!((*ifp)->valid & IF_VALID_DSTADDR)) ++ parse_opt_set_dstaddr (*ifp, argv[i]); ++ } ++ } ++ ++ switch (expect) ++ { ++ case EXPECT_BROADCAST: ++ error (0, 0, "option `broadcast' requires an argument"); ++ break; ++ ++ case EXPECT_NETMASK: ++ error (0, 0, "option `netmask' requires an argument"); ++ break; ++ ++ case EXPECT_METRIC: ++ error (0, 0, "option `metric' requires an argument"); ++ break; ++ ++ case EXPECT_MTU: ++ error (0, 0, "option `mtu' requires an argument"); ++ break; ++ ++ case EXPECT_AF: ++ case EXPECT_NOTHING: ++ return 1; ++ } ++ ++ return 0; ++} ++ ++int ++system_configure (int sfd _GL_UNUSED_PARAMETER, ++ struct ifreq *ifr _GL_UNUSED_PARAMETER, ++ struct system_ifconfig *ifs _GL_UNUSED_PARAMETER) ++{ ++ return 0; ++} ++ ++struct if_nameindex* (*system_if_nameindex) (void) = if_nameindex; ++ ++static void ++print_hwaddr_ether (format_data_t form _GL_UNUSED_PARAMETER, ++ unsigned char *data) ++{ ++ *column += printf ("%02X:%02X:%02X:%02X:%02X:%02X", ++ data[0], data[1], data[2], data[3], data[4], data[5]); ++ had_output = 1; ++} ++ ++struct arphrd_symbol ++{ ++ const char *name; ++ const char *title; ++ int value; ++ void (*print_hwaddr) (format_data_t form, unsigned char *data); ++} arphrd_symbols[] = ++ { ++#ifdef ARPHRD_ETHER /* Ethernet 10/100Mbps. */ ++ { "ETHER", "Ethernet", ARPHRD_ETHER, print_hwaddr_ether}, ++#endif ++#ifdef ARPHRD_LOOPBACK /* Loopback device. */ ++ { "LOOPBACK", "Local Loopback", ARPHRD_LOOPBACK, NULL}, ++#endif ++ /* XXX: The image debian-hurd-20150424 returns the value 4 ++ instead of expected ARPHRD_LOOPBACK. This has been ++ discussed in the list debian-hurd, where I was asked ++ to resist the temptation of a work around! ++ */ ++ { NULL, NULL, 0, NULL} ++ }; ++ ++struct arphrd_symbol * ++arphrd_findvalue (int value) ++{ ++ struct arphrd_symbol *arp = arphrd_symbols; ++ while (arp->name != NULL) ++ { ++ if (arp->value == value) ++ break; ++ arp++; ++ } ++ if (arp->name) ++ return arp; ++ else ++ return NULL; ++} ++ ++void ++system_fh_hwaddr_query (format_data_t form, int argc, char *argv[]) ++{ ++#ifdef SIOCGIFHWADDR ++ struct arphrd_symbol *arp; ++ ++ if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0) ++ select_arg (form, argc, argv, 1); ++ ++ arp = arphrd_findvalue (form->ifr->ifr_hwaddr.sa_family); ++ select_arg (form, argc, argv, (arp && arp->print_hwaddr) ? 0 : 1); ++#else ++ select_arg (form, argc, argv, 1); ++#endif ++} ++ ++void ++system_fh_hwaddr (format_data_t form, int argc _GL_UNUSED_PARAMETER, ++ char *argv[] _GL_UNUSED_PARAMETER) ++{ ++#ifdef SIOCGIFHWADDR ++ if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0) ++ error (EXIT_FAILURE, errno, ++ "SIOCGIFHWADDR failed for interface `%s'", ++ form->ifr->ifr_name); ++ else ++ { ++ struct arphrd_symbol *arp; ++ ++ arp = arphrd_findvalue (form->ifr->ifr_hwaddr.sa_family); ++ if (arp && arp->print_hwaddr) ++ arp->print_hwaddr (form, ++ (unsigned char *) form->ifr->ifr_hwaddr.sa_data); ++ else ++ put_string (form, "(hwaddr unknown)"); ++ } ++#else ++ *column += printf ("(not available)"); ++ had_output = 1; ++#endif ++} ++ ++void ++system_fh_hwtype_query (format_data_t form, int argc, char *argv[]) ++{ ++#ifdef SIOCGIFHWADDR ++ if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) >= 0) ++ select_arg (form, argc, argv, 0); ++ else ++#endif ++ select_arg (form, argc, argv, 1); ++} ++ ++void ++system_fh_hwtype (format_data_t form, int argc _GL_UNUSED_PARAMETER, ++ char *argv[] _GL_UNUSED_PARAMETER) ++{ ++#ifdef SIOCGIFHWADDR ++ if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0) ++ error (EXIT_FAILURE, errno, ++ "SIOCGIFHWADDR failed for interface `%s'", ++ form->ifr->ifr_name); ++ else ++ { ++ struct arphrd_symbol *arp; ++ ++ arp = arphrd_findvalue (form->ifr->ifr_hwaddr.sa_family); ++ if (arp) ++ put_string (form, arp->title); ++ else ++ put_string (form, "(hwtype unknown)"); ++ } ++#else ++ *column += printf ("(not available)"); ++ had_output = 1; ++#endif ++} +diff --git a/ifconfig/system/hurd.h b/ifconfig/system/hurd.h +new file mode 100644 +index 00000000..bab14565 +--- /dev/null ++++ b/ifconfig/system/hurd.h +@@ -0,0 +1,50 @@ ++/* ++ Copyright (C) 2015 Free Software Foundation, Inc. ++ ++ This file is part of GNU Inetutils. ++ ++ GNU Inetutils is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or (at ++ your option) any later version. ++ ++ GNU Inetutils is distributed in the hope that it will be useful, but ++ WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see `http://www.gnu.org/licenses/'. */ ++ ++/* Written by Mats Erik Andersson. */ ++ ++#ifndef IFCONFIG_SYSTEM_HURD_H ++# define IFCONFIG_SYSTEM_HURD_H ++ ++# include "../printif.h" ++# include "../options.h" ++ ++ ++/* Option support. */ ++ ++struct system_ifconfig ++{ ++ int valid; ++}; ++ ++ ++/* Output format support. */ ++ ++# define SYSTEM_FORMAT_HANDLER \ ++ { "hurd", fh_nothing}, \ ++ { "hwaddr?", system_fh_hwaddr_query}, \ ++ { "hwaddr", system_fh_hwaddr}, \ ++ { "hwtype?", system_fh_hwtype_query}, \ ++ { "hwtype", system_fh_hwtype}, ++ ++void system_fh_hwaddr_query (format_data_t form, int argc, char *argv[]); ++void system_fh_hwaddr (format_data_t form, int argc, char *argv[]); ++void system_fh_hwtype_query (format_data_t form, int argc, char *argv[]); ++void system_fh_hwtype (format_data_t form, int argc, char *argv[]); ++ ++#endif /* !IFCONFIG_SYSTEM_HURD_H */ +-- +2.23.0.rc1.170.gbd704faa3e + +From 589dab9c7d3119da82837dabae34c8a3d16cbe49 Mon Sep 17 00:00:00 2001 +From: Mats Erik Andersson +Date: Thu, 30 Jul 2015 01:06:42 +0200 +Subject: [PATCH 07/35] ifconfig: Hardware detection in GNU/Hurd. + +A work-around needed to distinguish hardware type. +--- + ChangeLog | 10 ++++++++++ + ifconfig/system/hurd.c | 19 ++++++++++++------- + 2 files changed, 22 insertions(+), 7 deletions(-) + +diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c +index 3bd19775..b6261a00 100644 +--- a/ifconfig/system/hurd.c ++++ b/ifconfig/system/hurd.c +@@ -175,6 +175,16 @@ print_hwaddr_ether (format_data_t form _GL_UNUSED_PARAMETER, + had_output = 1; + } + ++/* GNU/Hurd and Mach are using a mixture of BSD definitions ++ * and GNU/Linux interface headers, which in this situation ++ * means that sa_family_t is an unsigned char, from BSD, while ++ * all ARPHRD_* come from GNU/Linux and are thus 16 bits wide. ++ * We must account for this. The following bitmask will ++ * adapt to any future change! ++ */ ++ ++#define _ARP_MASK ((sizeof (sa_family_t) == 1) ? 0xff : 0xffff) ++ + struct arphrd_symbol + { + const char *name; +@@ -184,16 +194,11 @@ struct arphrd_symbol + } arphrd_symbols[] = + { + #ifdef ARPHRD_ETHER /* Ethernet 10/100Mbps. */ +- { "ETHER", "Ethernet", ARPHRD_ETHER, print_hwaddr_ether}, ++ { "ETHER", "Ethernet", ARPHRD_ETHER & _ARP_MASK, print_hwaddr_ether}, + #endif + #ifdef ARPHRD_LOOPBACK /* Loopback device. */ +- { "LOOPBACK", "Local Loopback", ARPHRD_LOOPBACK, NULL}, ++ { "LOOPBACK", "Local Loopback", ARPHRD_LOOPBACK & _ARP_MASK, NULL}, + #endif +- /* XXX: The image debian-hurd-20150424 returns the value 4 +- instead of expected ARPHRD_LOOPBACK. This has been +- discussed in the list debian-hurd, where I was asked +- to resist the temptation of a work around! +- */ + { NULL, NULL, 0, NULL} + }; + +-- +2.23.0.rc1.170.gbd704faa3e + +From d379784b4461d17b2536effd1b52bae21cd28a32 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Fri, 16 Aug 2019 00:34:03 +0200 +Subject: [PATCH 35/35] telnet: Several ioctls have been disabled in the Hurd's + glibc + +But not the related option macros. inetutils uses those macros to decide +whether the ioctls are available, so it is FTBFS now. The Hurd's glibc +is being fixed, but we'll use this for now to get the builds going. +--- + telnet/sys_bsd.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c +index 662536ab..5eb35cb5 100644 +--- a/telnet/sys_bsd.c ++++ b/telnet/sys_bsd.c +@@ -63,6 +63,7 @@ + #include + #include + #include ++#include + #include + + #include "ring.h" +@@ -157,7 +158,7 @@ TerminalRead (char *buf, int n) + int + TerminalAutoFlush (void) + { +-#if defined LNOFLSH ++#if defined TIOCLGET && defined LNOFLSH + int flush; + + ioctl (0, TIOCLGET, (char *) &flush); +@@ -260,7 +261,9 @@ TerminalSaveState (void) + ioctl (0, TIOCGETP, (char *) &ottyb); + ioctl (0, TIOCGETC, (char *) &otc); + ioctl (0, TIOCGLTC, (char *) &oltc); ++#ifdef TIOCLGET + ioctl (0, TIOCLGET, (char *) &olmode); ++#endif + + ntc = otc; + nltc = oltc; +@@ -755,7 +758,9 @@ TerminalNewMode (register int f) + #endif + } + #ifndef USE_TERMIO ++#ifdef TIOCLSET + ioctl (tin, TIOCLSET, (char *) &lmode); ++#endif + ioctl (tin, TIOCSLTC, (char *) <c); + ioctl (tin, TIOCSETC, (char *) &tc); + ioctl (tin, TIOCSETN, (char *) &sb); +-- +2.23.0.rc1.170.gbd704faa3e + -- cgit v1.2.3 From 7f31bd25ad734c483d450eefccdfb26874d2326d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 16:38:31 -0500 Subject: gnu: shadow: Build fix for the Hurd. * gnu/packages/patches/shadow-hurd-pctrl.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (shadow): Use it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 1 + gnu/packages/patches/shadow-hurd-pctrl.patch | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 gnu/packages/patches/shadow-hurd-pctrl.patch (limited to 'gnu/packages/admin.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 6c9cea2c9b..fba481cfd0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1430,6 +1430,7 @@ dist_patch_DATA = \ %D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ + %D%/packages/patches/shadow-hurd-pctrl.patch \ %D%/packages/patches/shepherd-hurd.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ %D%/packages/patches/slim-session.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9662468b55..d35c455275 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -488,6 +488,7 @@ hostname.") (uri (string-append "https://github.com/shadow-maint/shadow/releases/" "download/" version "/shadow-" version ".tar.xz")) + (patches (search-patches "shadow-hurd-pctrl.patch")) (sha256 (base32 "0qmfq50sdhz6xilgxvinblll8j2iqfl7hwk45bq744y4plq4dbd3")))) diff --git a/gnu/packages/patches/shadow-hurd-pctrl.patch b/gnu/packages/patches/shadow-hurd-pctrl.patch new file mode 100644 index 0000000000..2e376e19a9 --- /dev/null +++ b/gnu/packages/patches/shadow-hurd-pctrl.patch @@ -0,0 +1,16 @@ +Avoid including sys/prctl.h on the Hurd. + +Upstream status: Not submitted. + +--- shadow-4.8.1/libmisc/idmapping.c.orig 2020-03-07 16:32:05.000000000 -0500 ++++ shadow-4.8.1/libmisc/idmapping.c 2020-03-07 16:32:27.000000000 -0500 +@@ -36,8 +36,8 @@ + #include + #include "prototypes.h" + #include "idmapping.h" +-#include + #if HAVE_SYS_CAPABILITY_H ++#include + #include + #endif + -- cgit v1.2.3 From 9ec263b415f0fccce47fa3cc35a1651017a265ea Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 7 Mar 2020 11:51:39 -0500 Subject: gnu: isc-dhcp: Support for the Hurd. * gnu/packages/admin.scm (isc-dhcp)[inputs]: Remove net-tools, iproute on the Hurd. --- gnu/packages/admin.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d35c455275..ae1ed94b1b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -910,8 +910,9 @@ connection alive.") ("file" ,file))) (inputs `(("inetutils" ,inetutils) - ("net-tools" ,net-tools) - ("iproute" ,iproute) + ,@(if (hurd-target?) '() + `(("net-tools" ,net-tools) + ("iproute" ,iproute))) ;; isc-dhcp bundles a copy of BIND, which has proved vulnerable ;; in the past. Use a BIND-VERSION of our choosing instead. -- cgit v1.2.3 From 62c3fd34e498327f1eeae6283b0c54ae56b7282b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Apr 2020 15:34:46 +0200 Subject: gnu: shepherd: Remove obsolete patch. * gnu/packages/patches/shepherd-hurd.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/admin.scm (shepherd)[source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/admin.scm | 1 - gnu/packages/patches/shepherd-hurd.patch | 44 -------------------------------- 3 files changed, 46 deletions(-) delete mode 100644 gnu/packages/patches/shepherd-hurd.patch (limited to 'gnu/packages/admin.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 535c23d98b..63a9c83c19 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1463,7 +1463,6 @@ dist_patch_DATA = \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/shadow-hurd-pctrl.patch \ - %D%/packages/patches/shepherd-hurd.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ %D%/packages/patches/slim-session.patch \ %D%/packages/patches/slim-config.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 567c7cfb94..a9240dbdb1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -206,7 +206,6 @@ and provides a \"top-like\" mode (monitoring).") (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) - (patches (search-patches "shepherd-hurd.patch")) (sha256 (base32 "02lbc8z5gd8v8wfi4yh1zww8mk03w0zcwnmk4l4p3vpjlvlb63ll")))) diff --git a/gnu/packages/patches/shepherd-hurd.patch b/gnu/packages/patches/shepherd-hurd.patch deleted file mode 100644 index 5043e831f2..0000000000 --- a/gnu/packages/patches/shepherd-hurd.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fixes compilation on the Hurd. - -Taken from upstream: http://git.savannah.gnu.org/cgit/shepherd.git/commit/?id=232331369fe2a0495c7c777e11eecabee6257b3f - -From 232331369fe2a0495c7c777e11eecabee6257b3f Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Sat, 7 Mar 2020 22:01:23 +0100 -Subject: [PATCH] system: Support compilation on the Hurd. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* modules/shepherd/system.scm.in (prctl): Wrap 'dynamic-func' call in -'false-if-exception'. - -Co-authored-by: Ludovic Courtès ---- - modules/shepherd/system.scm.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules/shepherd/system.scm.in b/modules/shepherd/system.scm.in -index 769404a..0b2cc9d 100644 ---- a/modules/shepherd/system.scm.in -+++ b/modules/shepherd/system.scm.in -@@ -1,6 +1,7 @@ - ;; system.scm -- Low-level operating system interface. - ;; Copyright (C) 2013, 2014, 2016, 2018 Ludovic Courtès - ;; Copyright (C) 2018 Carlo Zancanaro -+;; Copyright (C) 2020 Jan (janneke) Nieuwenhuizen - ;; - ;; This file is part of the GNU Shepherd. - ;; -@@ -145,7 +146,7 @@ ctrlaltdel(8) and see kernel/reboot.c in Linux." - (define PR_SET_CHILD_SUBREAPER @PR_SET_CHILD_SUBREAPER@) - - (define prctl -- (if (dynamic-func "prctl" (dynamic-link)) -+ (if (false-if-exception (dynamic-func "prctl" (dynamic-link))) - (let ((proc (syscall->procedure long "prctl" (list int int)))) - (lambda (process operation) - "Perform an operation on the given process" --- -2.24.0 - -- cgit v1.2.3