amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: util-linux: Move libraries to separate output.

Browse source 
Fixes <https://bugs.gnu.org/37732>.
Reported by Diego Nicola Barbato <dnbarbato@posteo.de>.

* 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.
This commit is contained in:
Marius Bakke 2020-01-15 00:24:28 +01:00
parent 3cfe76bec0
commit bb93042c8b
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
35 changed files with 91 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gnu/packages/admin.scm
View file

@ -1717,7 +1717,7 @@ characters can be replaced as well, as can UTF-8 characters.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("ntfs-3g" ,ntfs-3g) `(("ntfs-3g" ,ntfs-3g)
("util-linux" ,util-linux) ("util-linux" ,util-linux "lib")
("openssl" ,openssl) ("openssl" ,openssl)
;; FIXME: add reiserfs. ;; FIXME: add reiserfs.
("zlib" ,zlib) ("zlib" ,zlib)
@ -3561,6 +3561,7 @@ tcpdump and snoop.")
("lvm2" ,lvm2) ("lvm2" ,lvm2)
("openssl" ,openssl) ("openssl" ,openssl)
("pcre" ,pcre) ("pcre" ,pcre)
("libmount" ,util-linux "lib")
("util-linux" ,util-linux))) ("util-linux" ,util-linux)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags

2
gnu/packages/android.scm
View file

@ -835,7 +835,7 @@ script that you can put anywhere in your path.")
(install-file "abootimg" bin) (install-file "abootimg" bin)
#t)))))) #t))))))
(inputs (inputs
`(("libblkid" ,util-linux))) `(("libblkid" ,util-linux "lib")))
(home-page "https://ac100.grandou.net/abootimg") (home-page "https://ac100.grandou.net/abootimg")
(synopsis "Tool for manipulating Android Boot Images") (synopsis "Tool for manipulating Android Boot Images")
(description "This package provides a tool for manipulating old Android (description "This package provides a tool for manipulating old Android

2
gnu/packages/audio.scm
View file

@ -1584,7 +1584,7 @@ especially for creating reverb effects. It supports impulse responses with 1,
;; uuid.h is included in the JACK type headers ;; uuid.h is included in the JACK type headers
;; db.h is included in the libjack metadata headers ;; db.h is included in the libjack metadata headers
(propagated-inputs (propagated-inputs
`(("libuuid" ,util-linux) `(("libuuid" ,util-linux "lib")
("bdb" ,bdb))) ("bdb" ,bdb)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

4
gnu/packages/bootloaders.scm
View file

@ -306,7 +306,7 @@ menu to select one of the installed operating systems.")
("perl" ,perl) ("perl" ,perl)
("python-2" ,python-2))) ("python-2" ,python-2)))
(inputs (inputs
`(("libuuid" ,util-linux) `(("libuuid" ,util-linux "lib")
("mtools" ,mtools))) ("mtools" ,mtools)))
(arguments (arguments
`(#:parallel-build? #f `(#:parallel-build? #f
@ -887,7 +887,7 @@ to Novena upstream, does not load u-boot.img from the first partition.")
("libyaml" ,libyaml) ("libyaml" ,libyaml)
("openssl" ,openssl) ("openssl" ,openssl)
("openssl:static" ,openssl "static") ("openssl:static" ,openssl "static")
("util-linux" ,util-linux))) ("util-linux" ,util-linux "lib")))
(home-page (home-page
"https://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot") "https://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot")
(synopsis "ChromiumOS verified boot utilities") (synopsis "ChromiumOS verified boot utilities")

2
gnu/packages/chez.scm
View file

@ -77,7 +77,7 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("ncurses" ,ncurses) `(("ncurses" ,ncurses)
("libuuid" ,util-linux) ("libuuid" ,util-linux "lib")
("libx11" ,libx11) ("libx11" ,libx11)
("xorg-rgb" ,xorg-rgb) ("xorg-rgb" ,xorg-rgb)
("nanopass" ,nanopass) ("nanopass" ,nanopass)

4
gnu/packages/cryptsetup.scm
View file

@ -62,7 +62,7 @@
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("lvm2" ,lvm2) ; device-mapper ("lvm2" ,lvm2) ; device-mapper
("popt" ,popt) ("popt" ,popt)
("util-linux" ,util-linux))) ; libuuid ("util-linux" ,util-linux "lib"))) ;libuuid
(synopsis "Hard disk encryption tool") (synopsis "Hard disk encryption tool")
(description (description
"LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk "LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk
@ -142,6 +142,6 @@ files). This assumes LIBRARY uses Libtool."
("libgcrypt" ,libgcrypt-static) ("libgcrypt" ,libgcrypt-static)
("lvm2" ,lvm2-static) ("lvm2" ,lvm2-static)
("util-linux" ,util-linux "static") ("util-linux" ,util-linux "static")
("util-linux" ,util-linux) ("util-linux" ,util-linux "lib")
("popt" ,popt)))) ("popt" ,popt))))
(synopsis "Hard disk encryption tool (statically linked)"))) (synopsis "Hard disk encryption tool (statically linked)")))

4
gnu/packages/databases.scm
View file

@ -165,7 +165,7 @@
("avahi" ,avahi) ("avahi" ,avahi)
("cyrus-sasl" ,cyrus-sasl) ("cyrus-sasl" ,cyrus-sasl)
("openssl" ,openssl) ("openssl" ,openssl)
("util-linux" ,util-linux))) ("util-linux" ,util-linux "lib")))
;; http://www.4store.org has been down for a while now. ;; http://www.4store.org has been down for a while now.
(home-page "https://github.com/4store/4store") (home-page "https://github.com/4store/4store")
(synopsis "Clustered RDF storage and query engine") (synopsis "Clustered RDF storage and query engine")
@ -974,7 +974,7 @@ as a drop-in replacement of MySQL.")
(invoke "make" "-C" "contrib" "install")))))) (invoke "make" "-C" "contrib" "install"))))))
(inputs (inputs
`(("readline" ,readline) `(("readline" ,readline)
("libuuid" ,util-linux) ("libuuid" ,util-linux "lib")
("openssl" ,openssl) ("openssl" ,openssl)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://www.postgresql.org/") (home-page "https://www.postgresql.org/")

18
gnu/packages/disk.scm
View file

@ -100,13 +100,15 @@
(inputs (inputs
`(("lvm2" ,lvm2) `(("lvm2" ,lvm2)
("readline" ,readline) ("readline" ,readline)
("util-linux" ,util-linux))) ("util-linux" ,util-linux "lib")))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
;; For the tests. ;; For the tests.
("e2fsprogs" ,e2fsprogs) ("e2fsprogs" ,e2fsprogs)
("perl" ,perl) ("perl" ,perl)
("python" ,python-2))) ("python" ,python-2)
("util-linux" ,util-linux)))
(home-page "https://www.gnu.org/software/parted/") (home-page "https://www.gnu.org/software/parted/")
(synopsis "Disk partition editor") (synopsis "Disk partition editor")
(description (description
@ -130,7 +132,7 @@ tables. It includes a library and command-line utility.")
(inputs (inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
("guile" ,guile-1.8) ("guile" ,guile-1.8)
("util-linux" ,util-linux) ("util-linux" ,util-linux "lib")
("parted" ,parted))) ("parted" ,parted)))
;; The build neglects to look for its own headers in its own tree. A next ;; 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. ;; 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) `(("gettext" ,gettext-minimal)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("popt" ,popt) ("popt" ,popt)
("util-linux" ,util-linux))) ; libuuid ("util-linux" ,util-linux "lib"))) ;libuuid
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:phases #:phases
@ -359,7 +361,7 @@ and can dramatically shorten the lifespan of the drive if left unchecked.")
;; as '/dev/disk/by-id' ;; as '/dev/disk/by-id'
`(#:tests? #f)) `(#:tests? #f))
(inputs (inputs
`(("util-linux" ,util-linux) `(("util-linux" ,util-linux "lib")
("parted" ,parted) ("parted" ,parted)
("glib" ,glib) ("glib" ,glib)
("gtkmm" ,gtkmm) ("gtkmm" ,gtkmm)
@ -587,7 +589,7 @@ automatically finding out which program to use for what file type.")
(inputs (inputs
`(("cryptsetup" ,cryptsetup) `(("cryptsetup" ,cryptsetup)
("nss" ,nss) ("nss" ,nss)
("libblkid" ,util-linux) ("libblkid" ,util-linux "lib")
("lvm2" ,lvm2) ; for "-ldevmapper" ("lvm2" ,lvm2) ; for "-ldevmapper"
("glib" ,glib) ("glib" ,glib)
("gpgme" ,gpgme))) ("gpgme" ,gpgme)))
@ -640,7 +642,7 @@ passphrases.")
("json-c" ,json-c) ("json-c" ,json-c)
("keyutils" ,keyutils) ("keyutils" ,keyutils)
("kmod" ,kmod) ("kmod" ,kmod)
("util-linux" ,util-linux))) ("util-linux" ,util-linux "lib")))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "--disable-asciidoctor" ; use docbook-xsl instead (list "--disable-asciidoctor" ; use docbook-xsl instead
@ -809,7 +811,7 @@ LVM D-Bus API).")
("libelf" ,libelf) ("libelf" ,libelf)
("elfutils" ,elfutils) ("elfutils" ,elfutils)
("json-glib" ,json-glib) ("json-glib" ,json-glib)
("libblkid" ,util-linux))) ("libblkid" ,util-linux "lib")))
(home-page "https://rmlint.rtfd.org") (home-page "https://rmlint.rtfd.org")
(synopsis "Remove duplicates and other lint from the file system") (synopsis "Remove duplicates and other lint from the file system")
(description "@command{rmlint} finds space waste and other broken things (description "@command{rmlint} finds space waste and other broken things

1
gnu/packages/efi.scm
View file

@ -113,6 +113,7 @@ environment presented by Intel's EFI.")
("util-linux" ,util-linux))) ; getopt ("util-linux" ,util-linux))) ; getopt
(inputs (inputs
`(("gnu-efi" ,gnu-efi) `(("gnu-efi" ,gnu-efi)
("libuuid" ,util-linux "lib")
("openssl" ,openssl))) ("openssl" ,openssl)))
(synopsis "EFI signing tools") (synopsis "EFI signing tools")
(description "This package provides tools for signing EFI binaries.") (description "This package provides tools for signing EFI binaries.")

2
gnu/packages/engineering.scm
View file

@ -2149,7 +2149,7 @@ engineers for reverse engineers.")
(native-inputs (native-inputs
`(("googletest-source" ,(package-source googletest)))) `(("googletest-source" ,(package-source googletest))))
(inputs (inputs
`(("libuuid" ,util-linux))) `(("libuuid" ,util-linux "lib")))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases

2
gnu/packages/enlightenment.scm
View file

@ -134,7 +134,7 @@
("lz4" ,lz4) ("lz4" ,lz4)
("openssl" ,openssl) ("openssl" ,openssl)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("util-linux" ,util-linux) ("util-linux" ,util-linux "lib")
("wayland" ,wayland) ("wayland" ,wayland)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments

6
gnu/packages/file-systems.scm
View file

@ -127,7 +127,7 @@ single file can be mounted.")
"jfsutils-include-systypes.patch")))) "jfsutils-include-systypes.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("util-linux" ,util-linux))) `(("util-linux" ,util-linux "lib")))
(home-page "http://jfs.sourceforge.net/home.html") (home-page "http://jfs.sourceforge.net/home.html")
(synopsis "Utilities for managing JFS file systems") (synopsis "Utilities for managing JFS file systems")
(description (description
@ -271,7 +271,7 @@ non-determinism in the build process.")
("fuse", fuse) ("fuse", fuse)
("openssl" ,openssl) ("openssl" ,openssl)
("liburcu" ,liburcu) ("liburcu" ,liburcu)
("libuuid" ,util-linux) ("libuuid" ,util-linux "lib")
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("readline" ,readline) ("readline" ,readline)
("zlib" ,zlib) ("zlib" ,zlib)
@ -503,7 +503,7 @@ APFS.")
("openssl" ,openssl) ("openssl" ,openssl)
("python" ,python) ("python" ,python)
("python-cffi" ,python-cffi) ("python-cffi" ,python-cffi)
("util-linux" ,util-linux) ("util-linux" ,util-linux "lib")
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://zfsonlinux.org/") (home-page "https://zfsonlinux.org/")
(synopsis "Native ZFS on Linux") (synopsis "Native ZFS on Linux")

2
gnu/packages/firmware.scm
View file

@ -253,7 +253,7 @@ coreboot.")
("gcc" ,gcc-5) ("gcc" ,gcc-5)
("nasm" ,nasm) ("nasm" ,nasm)
("python-2" ,python-2) ("python-2" ,python-2)
("util-linux" ,util-linux))) ("util-linux" ,util-linux "lib")))
(arguments (arguments
`(#:tests? #f ; No check target. `(#:tests? #f ; No check target.
#:phases #:phases

2
gnu/packages/fontutils.scm
View file

@ -308,7 +308,7 @@ fonts to/from the WOFF2 format.")
;; In Requires or Requires.private of fontconfig.pc. ;; In Requires or Requires.private of fontconfig.pc.
(propagated-inputs `(("expat" ,expat) (propagated-inputs `(("expat" ,expat)
("freetype" ,freetype) ("freetype" ,freetype)
("libuuid" ,util-linux))) ("libuuid" ,util-linux "lib")))
(inputs `(("gs-fonts" ,gs-fonts))) (inputs `(("gs-fonts" ,gs-fonts)))
(native-inputs (native-inputs
`(("gperf" ,gperf) `(("gperf" ,gperf)

2
gnu/packages/freedesktop.scm
View file

@ -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)$")) (find-files ".." "^(kbd-model-map|language-fallback-map)$"))
#t))))))) #t)))))))
(native-inputs (package-native-inputs elogind)) (native-inputs (package-native-inputs elogind))
(inputs `(("libmount" ,util-linux) (inputs `(("libmount" ,util-linux "lib")
("xkeyboard-config" ,xkeyboard-config) ("xkeyboard-config" ,xkeyboard-config)
("kbd" ,kbd) ("kbd" ,kbd)
,@(package-inputs elogind))) ,@(package-inputs elogind)))

4
gnu/packages/glib.scm
View file

@ -188,7 +188,7 @@ shared NFS home directories.")
`(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc
("libffi" ,libffi) ; in the Requires.private field of gobject-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 ;; 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) ("libselinux" ,libselinux)
("zlib" ,zlib))) ("zlib" ,zlib)))
(inputs (inputs
@ -931,7 +931,7 @@ programming language. It also contains the utility
(propagated-inputs (propagated-inputs
`(("gcab" ,gcab) ; for .pc file `(("gcab" ,gcab) ; for .pc file
("gdk-pixbuf" ,gdk-pixbuf) ; 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 (inputs
`(("glib" ,glib) `(("glib" ,glib)
("gperf" ,gperf) ("gperf" ,gperf)

4
gnu/packages/gnome.scm
View file

@ -3832,7 +3832,7 @@ more fun.")
("vte" ,vte) ("vte" ,vte)
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("util-linux" ,util-linux) ("util-linux" ,util-linux "lib")
("vala" ,vala))) ("vala" ,vala)))
(home-page "https://wiki.gnome.org/Apps/Terminal") (home-page "https://wiki.gnome.org/Apps/Terminal")
(synopsis "Terminal emulator") (synopsis "Terminal emulator")
@ -7291,7 +7291,7 @@ easy, safe, and automatic.")
("openjpeg" ,openjpeg-1) ("openjpeg" ,openjpeg-1)
("libseccomp" ,libseccomp) ("libseccomp" ,libseccomp)
("libsoup" ,libsoup) ("libsoup" ,libsoup)
("libuuid" ,util-linux) ("libuuid" ,util-linux "lib")
("network-manager" ,network-manager))) ("network-manager" ,network-manager)))
(synopsis "Metadata database, indexer and search tool") (synopsis "Metadata database, indexer and search tool")
(home-page "https://wiki.gnome.org/Projects/Tracker") (home-page "https://wiki.gnome.org/Projects/Tracker")

2
gnu/packages/jupyter.scm
View file

@ -171,7 +171,7 @@ Messaging Protocol}.")
("cppzmq" ,cppzmq) ("cppzmq" ,cppzmq)
("zeromq" ,zeromq) ("zeromq" ,zeromq)
("openssl" ,openssl) ("openssl" ,openssl)
("util-linux" ,util-linux))) ;libuuid ("util-linux" ,util-linux "lib"))) ;libuuid
(home-page "https://quantstack.net/xeus") (home-page "https://quantstack.net/xeus")
(synopsis "C++ implementation of the Jupyter Kernel protocol") (synopsis "C++ implementation of the Jupyter Kernel protocol")
(description (description

2
gnu/packages/kde.scm
View file

@ -472,7 +472,7 @@ cards.")
("kwidgetsaddons" ,kwidgetsaddons) ("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("qca" ,qca) ("qca" ,qca)
("util-linux" ,util-linux))) ("util-linux" ,util-linux "lib")))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "Library for managing partitions") (synopsis "Library for managing partitions")
(description "Library for managing partitions.") (description "Library for managing partitions.")

2
gnu/packages/kodi.scm
View file

@ -121,7 +121,7 @@
(string-append out "/lib")) (string-append out "/lib"))
#t)))))) #t))))))
(inputs (inputs
`(("util-linux" ,util-linux))) `(("libuuid" ,util-linux "lib")))
(synopsis "Lightweight universal identifier library") (synopsis "Lightweight universal identifier library")
(description "CrossGuid is a minimal GUID/UUID (description "CrossGuid is a minimal GUID/UUID
generator library for C++.") generator library for C++.")

2
gnu/packages/lighting.scm
View file

@ -57,7 +57,7 @@
`(("libftdi" ,libftdi) `(("libftdi" ,libftdi)
("libmicrohttpd" ,libmicrohttpd) ("libmicrohttpd" ,libmicrohttpd)
("libusb" ,libusb) ("libusb" ,libusb)
("libuuid" ,util-linux) ("libuuid" ,util-linux "lib")
("zlib" ,zlib))) ("zlib" ,zlib)))
(propagated-inputs (propagated-inputs
;; Ola 0.10.5 only supports protobuf 2.x, and building it with 3.x breaks. ;; Ola 0.10.5 only supports protobuf 2.x, and building it with 3.x breaks.

55
gnu/packages/linux.scm
View file

@ -1118,19 +1118,33 @@ providing the system administrator with some help in common tasks.")
(("build_kill=yes") "build_kill=no")) (("build_kill=yes") "build_kill=no"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out" ;6.4 MiB executables and documentation
"static")) ;>2 MiB of static .a libraries "lib" ;8.8 MiB shared libraries, headers and locales
"static")) ;2.9 MiB static .a libraries
(arguments (arguments
`(#:configure-flags (list "--disable-use-tty-group" `(#:configure-flags (list "--disable-use-tty-group"
"--enable-fs-paths-default=/run/current-system/profile/sbin" "--enable-fs-paths-default=/run/current-system/profile/sbin"
;; Don't try to chown root:root mount and umount ;; Don't try to chown root:root mount and umount
"--disable-makeinstall-chown" "--disable-makeinstall-chown"
"--localstatedir=/var"
(string-append "--localedir="
(assoc-ref %outputs "lib")
"/share/locale")
;; Install completions where our ;; Install completions where our
;; bash-completion package expects them. ;; bash-completion package expects them.
(string-append "--with-bashcompletiondir=" (string-append "--with-bashcompletiondir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/etc/bash_completion.d")) "/etc/bash_completion.d"))
#:phases (modify-phases %standard-phases #: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 (add-before 'build 'set-umount-file-name
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Tell 'eject' the right file name of 'umount'. ;; Tell 'eject' the right file name of 'umount'.
@ -1150,10 +1164,12 @@ providing the system administrator with some help in common tasks.")
#t))) #t)))
(add-after 'install 'move-static-libraries (add-after 'install 'move-static-libraries
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((lib (assoc-ref outputs "lib"))
(static (assoc-ref outputs "static"))) (static (assoc-ref outputs "static")))
;; Move static libraries to the "static" output.
(mkdir-p (string-append static "/lib")) (mkdir-p (string-append static "/lib"))
(with-directory-excursion out (with-directory-excursion lib
(for-each (lambda (file) (for-each (lambda (file)
(rename-file file (rename-file file
(string-append static "/" (string-append static "/"
@ -1166,7 +1182,16 @@ providing the system administrator with some help in common tasks.")
(substitute* (find-files "lib" "\\.la$") (substitute* (find-files "lib" "\\.la$")
(("old_library=.*") "old_library=''\n"))) (("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) (inputs `(("zlib" ,zlib)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
@ -1333,7 +1358,7 @@ slabtop, and skill.")
(base32 (base32
"00nwl1ppjalxbnx40dsm895r3q793p8nni6n81saj7faj2szdyk5")))) "00nwl1ppjalxbnx40dsm895r3q793p8nni6n81saj7faj2szdyk5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("util-linux" ,util-linux))) (inputs `(("util-linux" ,util-linux "lib")))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ;for the libext2fs Info manual ("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 ;; When linked against libblkid, eudev can populate /dev/disk/by-label
;; and similar; it also installs the '60-persistent-storage.rules' file, ;; and similar; it also installs the '60-persistent-storage.rules' file,
;; which contains the rules to do that. ;; which contains the rules to do that.
`(("util-linux" ,util-linux) ;for blkid `(("util-linux" ,util-linux "lib") ;for blkid
("kmod" ,kmod))) ("kmod" ,kmod)))
(home-page "https://wiki.gentoo.org/wiki/Project:Eudev") (home-page "https://wiki.gentoo.org/wiki/Project:Eudev")
(synopsis "Userspace device management") (synopsis "Userspace device management")
@ -4048,11 +4073,9 @@ and copy/paste text in the console and in xterm.")
#:test-target "test" #:test-target "test"
#:parallel-tests? #f)) ; tests fail when run in parallel #:parallel-tests? #f)) ; tests fail when run in parallel
(inputs `(("e2fsprogs" ,e2fsprogs) (inputs `(("e2fsprogs" ,e2fsprogs)
("libblkid" ,util-linux)
("libblkid:static" ,util-linux "static")
("libuuid" ,util-linux)
("libuuid:static" ,util-linux "static")
("lzo" ,lzo) ("lzo" ,lzo)
("util-linux:lib" ,util-linux "lib") ;for libblkid and libuuid
("util-linux:static" ,util-linux "static") ;ditto
("zlib" ,zlib) ("zlib" ,zlib)
("zlib:static" ,zlib "static") ("zlib:static" ,zlib "static")
("zstd" ,zstd "lib") ("zstd" ,zstd "lib")
@ -4182,7 +4205,7 @@ obviously it can be shared with files outside our set).")
("libtool" ,libtool) ("libtool" ,libtool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("libuuid" ,util-linux) `(("libuuid" ,util-linux "lib")
("libselinux" ,libselinux))) ("libselinux" ,libselinux)))
(home-page "https://f2fs.wiki.kernel.org/") (home-page "https://f2fs.wiki.kernel.org/")
(synopsis "Userland tools for f2fs") (synopsis "Userland tools for f2fs")
@ -4208,7 +4231,7 @@ disks and SD cards. This package provides the userland utilities.")
(base32 (base32
"0z9c0y3qq75iyqknl5k0v7v46l8c3pcifpqb0yqalrs24blkm7dk")))) "0z9c0y3qq75iyqknl5k0v7v46l8c3pcifpqb0yqalrs24blkm7dk"))))
(inputs (inputs
`(("libuuid" ,util-linux))))) `(("libuuid" ,util-linux "lib")))))
(define-public freefall (define-public freefall
(package (package
@ -4877,7 +4900,7 @@ are exceeded.")
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("acl" ,acl) ; extended attributes (xattr) `(("acl" ,acl) ; extended attributes (xattr)
("libuuid" ,util-linux) ("libuuid" ,util-linux "lib")
("lzo" ,lzo) ("lzo" ,lzo)
("openssl" ,openssl) ; optional crypto support ("openssl" ,openssl) ; optional crypto support
("zlib" ,zlib) ("zlib" ,zlib)
@ -5655,7 +5678,7 @@ libraries, which are often integrated directly into libfabric.")
"psm-disable-memory-stats.patch")))) "psm-disable-memory-stats.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "debug")) (outputs '("out" "debug"))
(inputs `(("libuuid" ,util-linux))) (inputs `(("libuuid" ,util-linux "lib")))
(arguments (arguments
'(#:make-flags `("PSM_USE_SYS_UUID=1" "CC=gcc" "WERROR=" '(#:make-flags `("PSM_USE_SYS_UUID=1" "CC=gcc" "WERROR="
,(string-append "INSTALL_PREFIX=" %output) ,(string-append "INSTALL_PREFIX=" %output)
@ -6032,7 +6055,7 @@ IP addresses and routes, and configure IPsec.")
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal))) `(("gettext" ,gettext-minimal)))
(inputs (inputs
`(("libuuid" ,util-linux) `(("libuuid" ,util-linux "lib")
("python" ,python-wrapper))) ("python" ,python-wrapper)))
(home-page "https://xfs.wiki.kernel.org/") (home-page "https://xfs.wiki.kernel.org/")
(synopsis "XFS file system tools") (synopsis "XFS file system tools")

2
gnu/packages/music.scm
View file

@ -2252,7 +2252,7 @@ improves on support for JACK features, such as JACK MIDI.")
"1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn")))) "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libuuid" ,util-linux) `(("libuuid" ,util-linux "lib")
("libsndfile" ,libsndfile))) ("libsndfile" ,libsndfile)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

2
gnu/packages/nfs.scm
View file

@ -113,7 +113,7 @@
("rpcsvc-proto" ,rpcsvc-proto) ;for 'rpcgen' ("rpcsvc-proto" ,rpcsvc-proto) ;for 'rpcgen'
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("lvm2" ,lvm2) ("lvm2" ,lvm2)
("util-linux" ,util-linux) ("util-linux" ,util-linux "lib")
("mit-krb5" ,mit-krb5) ("mit-krb5" ,mit-krb5)
("libtirpc" ,libtirpc))) ("libtirpc" ,libtirpc)))
(native-inputs (native-inputs

2
gnu/packages/opencog.scm
View file

@ -235,7 +235,7 @@ tasks.")
("cogutil" ,cogutil) ("cogutil" ,cogutil)
("gmp" ,gmp) ("gmp" ,gmp)
("guile" ,guile-2.2) ("guile" ,guile-2.2)
("libuuid" ,util-linux) ("libuuid" ,util-linux "lib")
("link-grammar" ,link-grammar))) ("link-grammar" ,link-grammar)))
(native-inputs (native-inputs
`(("cxxtest" ,cxxtest) `(("cxxtest" ,cxxtest)

2
gnu/packages/package-management.scm
View file

@ -939,7 +939,7 @@ Microsoft cabinet (.@dfn{CAB}) files.")
("glib" ,glib) ("glib" ,glib)
("libgsf" ,libgsf) ("libgsf" ,libgsf)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("uuid" ,util-linux))) ("uuid" ,util-linux "lib")))
(home-page "https://wiki.gnome.org/msitools") (home-page "https://wiki.gnome.org/msitools")
(synopsis "Windows Installer file manipulation tool") (synopsis "Windows Installer file manipulation tool")
(description (description

2
gnu/packages/password-utils.scm
View file

@ -209,7 +209,7 @@ algorithms AES or Twofish.")
("zip" ,zip))) ("zip" ,zip)))
(inputs `(("curl" ,curl) (inputs `(("curl" ,curl)
("file" ,file) ("file" ,file)
("libuuid" ,util-linux) ("libuuid" ,util-linux "lib")
("libxt" ,libxt) ("libxt" ,libxt)
("libxtst" ,libxtst) ("libxtst" ,libxtst)
("openssl" ,openssl) ("openssl" ,openssl)

2
gnu/packages/rdf.scm
View file

@ -217,7 +217,7 @@ taxonomic inference capability.")
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("mpfr" ,mpfr) ("mpfr" ,mpfr)
("pcre" ,pcre) ("pcre" ,pcre)
("util-linux" ,util-linux))) ("util-linux" ,util-linux "lib")))
(propagated-inputs (propagated-inputs
`(("raptor2" ,raptor2))) ; stipulated by rasqal.pc `(("raptor2" ,raptor2))) ; stipulated by rasqal.pc
(arguments (arguments

2
gnu/packages/search.scm
View file

@ -59,7 +59,7 @@
(base32 "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp")))) (base32 "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("zlib" ,zlib) (inputs `(("zlib" ,zlib)
("util-linux" ,util-linux))) ("util-linux" ,util-linux "lib")))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases

2
gnu/packages/sssd.scm
View file

@ -164,7 +164,7 @@ fundamental object types for C.")
("libxml2" ,libxml2) ; for xmllint ("libxml2" ,libxml2) ; for xmllint
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("pkg-config" ,pkg-config) ("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/") (home-page "https://pagure.io/SSSD/sssd/")
(synopsis "System security services daemon") (synopsis "System security services daemon")
(description "SSSD is a system daemon. Its primary function is to provide (description "SSSD is a system daemon. Its primary function is to provide

1
gnu/packages/storage.scm
View file

@ -231,6 +231,7 @@
("snappy" ,snappy) ("snappy" ,snappy)
("udev" ,eudev) ("udev" ,eudev)
("util-linux" ,util-linux) ("util-linux" ,util-linux)
("util-linux:lib" ,util-linux "lib")
("xfsprogs" ,xfsprogs) ("xfsprogs" ,xfsprogs)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://ceph.com/") (home-page "https://ceph.com/")

2
gnu/packages/task-management.scm
View file

@ -40,7 +40,7 @@
(inputs (inputs
`(("gnutls" ,gnutls) `(("gnutls" ,gnutls)
("lua" ,lua) ("lua" ,lua)
("util-linux" ,util-linux))) ("util-linux" ,util-linux "lib")))
(arguments (arguments
`(#:tests? #f ; No tests implemented. `(#:tests? #f ; No tests implemented.
#:phases #:phases

2
gnu/packages/telephony.scm
View file

@ -624,7 +624,7 @@ calls and messages")
("libsrtp" ,libsrtp) ("libsrtp" ,libsrtp)
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("resample", resample) ("resample", resample)
("util-linux" ,util-linux))) ("util-linux" ,util-linux "lib")))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)

4
gnu/packages/virtualization.scm
View file

@ -480,7 +480,7 @@ manage system or application containers.")
("libpcap" ,libpcap) ("libpcap" ,libpcap)
("libnl" ,libnl) ("libnl" ,libnl)
("libtirpc" ,libtirpc) ;for <rpc/rpc.h> ("libtirpc" ,libtirpc) ;for <rpc/rpc.h>
("libuuid" ,util-linux) ("libuuid" ,util-linux "lib")
("lvm2" ,lvm2) ;for libdevmapper ("lvm2" ,lvm2) ;for libdevmapper
("curl" ,curl) ("curl" ,curl)
("openssl" ,openssl) ("openssl" ,openssl)
@ -1336,7 +1336,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc"))
("pixman" ,pixman) ("pixman" ,pixman)
("qemu" ,qemu-minimal) ("qemu" ,qemu-minimal)
("seabios" ,seabios) ("seabios" ,seabios)
("util-linux" ,util-linux) ; uuid ("util-linux" ,util-linux "lib") ; uuid
; TODO: ocaml-findlib, ocaml-nox. ; TODO: ocaml-findlib, ocaml-nox.
("xz" ,xz) ; for liblzma ("xz" ,xz) ; for liblzma
("zlib" ,zlib))) ("zlib" ,zlib)))

2
gnu/packages/xorg.scm
View file

@ -1233,7 +1233,7 @@ hit when running single-threaded.")
`(("libice" ,libice))) ; SMlib.h includes ICElib.h `(("libice" ,libice))) ; SMlib.h includes ICElib.h
(inputs (inputs
`(("xtrans" ,xtrans) `(("xtrans" ,xtrans)
("util-linux" ,util-linux))) ("libuuid" ,util-linux "lib")))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")