me
/
guix
Archived
1
0
Fork 0
Code

gnu: util-linux: Rename udev variant. 

Some packages propagate util-linux, so make sure that that manifests and
similar choose the same version to avoid conflicts.

* gnu/packages/linux.scm (util-linux)[properties]: Remove.
(util-linux+udev)[name]: Set to "util-linux-with-udev".
[properties]: Remove.
master
Marius Bakke 2020-01-09 00:13:50 +01:00
parent 907eeac2e7
commit 60a366ec7a
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/linux.scm
View File

@ -1182,9 +1182,6 @@ providing the system administrator with some help in common tasks.")
utilities. It provides dmesg and includes tools for working with file systems, utilities. It provides dmesg and includes tools for working with file systems,
block devices, UUIDs, TTYs, and many other tools.") block devices, UUIDs, TTYs, and many other tools.")
;; Hide the package so that end users get the udev-enabled variant below.
(properties '((hidden? . #t)))
;; Note that util-linux doesn't use the same license for all the ;; Note that util-linux doesn't use the same license for all the
;; code. GPLv2+ is the default license for a code without an ;; code. GPLv2+ is the default license for a code without an
;; explicitly defined license. ;; explicitly defined license.
@ -1197,10 +1194,10 @@ block devices, UUIDs, TTYs, and many other tools.")
(define-public util-linux+udev (define-public util-linux+udev
(package/inherit (package/inherit
util-linux util-linux
(name "util-linux-with-udev")
(inputs (inputs
`(("udev" ,eudev) `(("udev" ,eudev)
,@(package-inputs util-linux))) ,@(package-inputs util-linux)))))
(properties (alist-delete 'hidden? (package-properties util-linux)))))
(define-public ddate (define-public ddate
(package (package