02/02: gnu: eudev: Remove bugfix variant.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit d594963856690f1aacf228c8a83e406d33bc44ce
Author: Marius Bakke <address@hidden>
AuthorDate: Sat Mar 14 13:19:06 2020 +0100

    gnu: eudev: Remove bugfix variant.
    
    * gnu/packages/linux.scm (eudev/btrfs-fix): Remove variable.
    (eudev)[arguments]: Add phase patch-bindir-in-btrfs-rules.
    * gnu/services/base.scm (<udev-configuration>, udev-service): Refer to EUDEV
    instead of EUDEV/BTRFS-FIX.
---
 gnu/packages/linux.scm | 30 ++++++++++--------------------
 gnu/services/base.scm  |  4 ++--
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 04788d2..b060064 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2871,6 +2871,16 @@ to the in-kernel OOM killer.")
                                (or native-inputs inputs) "xsltproc")
                                "/bin/xsltproc")))
             #t))
+         (add-before 'configure 'patch-bindir-in-btrfs-rules
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; The "@bindir@" substitution incorrectly expands to a literal
+             ;; "${exec_prefix}" (see <https://bugs.gnu.org/39926>).  Work
+             ;; around it.
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* "rules/64-btrfs.rules.in"
+                 (("@bindir@")
+                  (string-append out "/bin")))
+               #t)))
          (add-after 'install 'move-static-library
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -2927,26 +2937,6 @@ device nodes from /dev/, handles hotplug events and 
loads drivers at boot
 time.")
     (license license:gpl2+)))
 
-;; TODO: Merge with eudev on the next rebuild cycle.
-(define-public eudev/btrfs-fix
-  (package/inherit
-   eudev
-   (version (string-append (package-version eudev) "-1"))
-   (arguments
-    (substitute-keyword-arguments (package-arguments eudev)
-      ((#:phases phases '%standard-phases)
-       `(modify-phases ,phases
-          (add-before 'configure 'patch-bindir-in-btrfs-rules
-            (lambda* (#:key outputs #:allow-other-keys)
-              ;; The "@bindir@" substitution incorrectly expands to a literal
-              ;; "${exec_prefix}" (see <https://bugs.gnu.org/39926>).  Work
-              ;; around it.
-              (let ((out (assoc-ref outputs "out")))
-                (substitute* "rules/64-btrfs.rules.in"
-                  (("@bindir@")
-                   (string-append out "/bin")))
-                #t)))))))))
-
 (define-public eudev-with-hwdb
   (deprecated-package "eudev-with-hwdb" eudev))
 
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index ceb6374..b39d0f6 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1918,7 +1918,7 @@ archive}).  If that is not the case, the service will 
fail to start."
   udev-configuration make-udev-configuration
   udev-configuration?
   (udev   udev-configuration-udev                 ;<package>
-          (default eudev/btrfs-fix))
+          (default eudev))
   (rules  udev-configuration-rules                ;list of <package>
           (default '())))
 
@@ -2116,7 +2116,7 @@ the udev rules in use.")
 directory dynamically.  Get extra rules from the packages listed in the
 @code{rules} field of its value, @code{udev-configuration} object.")))
 
-(define* (udev-service #:key (udev eudev/btrfs-fix) (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