[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/13: gnu: eudev: Add dependency on blkid.
From: |
??? |
Subject: |
04/13: gnu: eudev: Add dependency on blkid. |
Date: |
Wed, 16 Mar 2016 03:57:51 +0000 |
iyzsong pushed a commit to branch gtk-update
in repository guix.
commit c98cb65ac587ae3c1a65f1b5097dbd67a08d7d77
Author: Ludovic Courtès <address@hidden>
Date: Wed Mar 9 15:26:09 2016 +0100
gnu: eudev: Add dependency on blkid.
* gnu/packages/linux.scm (eudev)[inputs]: Add UTIL-LINUX.
(eudev-with-blkid): Remove.
* gnu/services/base.scm (udev-service): Use EUDEV instead of
EUDEV-WITH-BLKID.
* gnu/system.scm (%base-packages): Likewise.
---
gnu/packages/linux.scm | 19 +++++--------------
gnu/services/base.scm | 4 ++--
gnu/system.scm | 2 +-
3 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a2412d0..ba0453e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1581,7 +1581,6 @@ from the module-init-tools project.")
(define-public eudev
;; The post-systemd fork, maintained by Gentoo.
- ;; TODO: Merge with 'eudev-with-blkid' below at an opportune time.
(package
(name "eudev")
(version "3.1.5")
@@ -1600,7 +1599,11 @@ from the module-init-tools project.")
("perl" ,perl)
("gperf" ,gperf)))
(inputs
- `(("kmod" ,kmod)))
+ ;; 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
+ ("kmod" ,kmod)))
(home-page "https://wiki.gentoo.org/wiki/Project:Eudev")
(synopsis "Userspace device management")
(description "Udev is a daemon which dynamically creates and removes
@@ -1608,18 +1611,6 @@ device nodes from /dev/, handles hotplug events and
loads drivers at boot
time.")
(license license:gpl2+)))
-(define-public eudev-with-blkid
- ;; TODO: Merge with 'eudev' above at an opportune time.
- (package
- (inherit eudev)
- (name "eudev-with-blkid")
- (inputs
- ;; 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
- ,@(package-inputs eudev)))))
-
(define-public lvm2
(package
(name "lvm2")
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 9b3dc73..545fe60 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -29,7 +29,7 @@
#:use-module (gnu system file-systems) ; 'file-system', etc.
#:use-module (gnu packages admin)
#:use-module ((gnu packages linux)
- #:select (eudev-with-blkid kbd e2fsprogs lvm2 fuse alsa-utils
crda gpm))
+ #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils crda gpm))
#:use-module ((gnu packages base)
#:select (canonical-package glibc))
#:use-module (gnu packages package-management)
@@ -1170,7 +1170,7 @@ item of @var{packages}."
(udev udev)
(rules (append initial-rules rules)))))))))
-(define* (udev-service #:key (udev eudev-with-blkid) (rules '()))
+(define* (udev-service #:key (udev eudev) (rules '()))
"Run @var{udev}, which populates the @file{/dev} directory dynamically. Get
extra rules from the packages listed in @var{rules}."
(service udev-service-type
diff --git a/gnu/system.scm b/gnu/system.scm
index 5be24ba..9b16011 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -374,7 +374,7 @@ explicitly appear in OS."
;; Get 'insmod' & co. from kmod, not module-init-tools, since udev
;; already depends on it anyway.
- kmod eudev-with-blkid
+ kmod eudev
e2fsprogs kbd
- branch gtk-update created (now 8fbc1a9), ???, 2016/03/15
- 09/13: gnu: pixman: Update to 0.34.0., ???, 2016/03/15
- 06/13: gnu: gtk+: Enable SVG support., ???, 2016/03/15
- 13/13: gnu: harfbuzz: Update to 1.2.3., ???, 2016/03/15
- 02/13: gnu: openssl: Update to 1.0.2g., ???, 2016/03/15
- 01/13: gnu: perl: Incorporate patch for CVE-2016-2381., ???, 2016/03/15
- 07/13: gnu: gtk+: Update to 3.18.9., ???, 2016/03/15
- 08/13: gnu: gtk+-2: Update to 2.24.30., ???, 2016/03/15
- 04/13: gnu: eudev: Add dependency on blkid.,
??? <=
- 10/13: gnu: cairo: Update to 1.14.6., ???, 2016/03/15
- 11/13: gnu: poppler: Update to 0.41.0., ???, 2016/03/15
- 12/13: gnu: glib: Update to 2.46.2., ???, 2016/03/15
- 03/13: gnu: graphite2: Update to 1.3.6., ???, 2016/03/15
- 05/13: gnu: dbus: Incorporate "dbus-helper-search-path.patch"., ???, 2016/03/15