[PATCH 1/2] gnu: Move package util-linux into its own module.

[John Darrington]

* gnu-system.am:  Add file util-linux.scm
* gnu/packages/linux.scm (util-linux): Remove variable.
* gnu/packages/util-linux.scm : New file.
---
 gnu-system.am               |    1 +
 gnu/packages/linux.scm      |   41 +-------------------------
 gnu/packages/util-linux.scm |   67 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 40 deletions(-)
 create mode 100644 gnu/packages/util-linux.scm

diff --git a/gnu-system.am b/gnu-system.am
index 0423d14..b681d66 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -233,6 +233,7 @@ GNU_SYSTEM_MODULES =                                \
   gnu/packages/uucp.scm                                \
   gnu/packages/unrtf.scm                       \
   gnu/packages/upnp.scm                                \
+  gnu/packages/util-linux.scm                  \
   gnu/packages/valgrind.scm                    \
   gnu/packages/version-control.scm             \
   gnu/packages/video.scm                       \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 09d123a..1bf7608 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -39,6 +39,7 @@
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages util-linux)
   #:use-module (gnu packages attr)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages autotools)
@@ -363,46 +364,6 @@ use the proc filesystem. We're not about changing the 
world, but
 providing the system administrator with some help in common tasks.")
     (license gpl2+)))
 
-(define-public util-linux
-  (package
-    (name "util-linux")
-    (version "2.21")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://kernel.org/linux/utils/"
-                                  name "/v" version "/"
-                                  name "-" version ".2" ".tar.xz"))
-              (sha256
-               (base32
-                "1rpgghf7n0zx0cdy8hibr41wvkm2qp1yvd8ab1rxr193l1jmgcir"))
-              (patches (list (search-patch "util-linux-perl.patch")))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:configure-flags '("--disable-use-tty-group"
-                           "--enable-ddate")
-       #:phases (alist-cons-after
-                 'install 'patch-chkdupexe
-                 (lambda* (#:key outputs #:allow-other-keys)
-                   (let ((out (assoc-ref outputs "out")))
-                     (substitute* (string-append out "/bin/chkdupexe")
-                       ;; Allow 'patch-shebang' to do its work.
-                       (("@PERL@") "/bin/perl"))))
-                 %standard-phases)))
-    (inputs `(("zlib" ,guix:zlib)
-              ("ncurses" ,ncurses)))
-    (native-inputs
-     `(("perl" ,perl)))
-    (home-page "https://www.kernel.org/pub/linux/utils/util-linux/";)
-    (synopsis "Collection of utilities for the Linux kernel")
-    (description
-     "util-linux is a random collection of utilities for the Linux kernel.")
-
-    ;; Note that util-linux doesn't use the same license for all the
-    ;; code.  GPLv2+ is the default license for a code without an
-    ;; explicitly defined license.
-    (license (list gpl3+ gpl2+ gpl2 lgpl2.0+
-                   bsd-4 public-domain))))
-
 (define-public procps
   (package
     (name "procps")
diff --git a/gnu/packages/util-linux.scm b/gnu/packages/util-linux.scm
new file mode 100644
index 0000000..f853170
--- /dev/null
+++ b/gnu/packages/util-linux.scm
@@ -0,0 +1,67 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <address@hidden>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix 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 Guix 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 GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages util-linux)
+  #:use-module ((guix licenses)
+                #:hide (zlib))
+  #:use-module (gnu packages)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages perl)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public util-linux
+  (package
+    (name "util-linux")
+    (version "2.21")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kernel.org/linux/utils/"
+                                  name "/v" version "/"
+                                  name "-" version ".2" ".tar.xz"))
+              (sha256
+               (base32
+                "1rpgghf7n0zx0cdy8hibr41wvkm2qp1yvd8ab1rxr193l1jmgcir"))
+              (patches (list (search-patch "util-linux-perl.patch")))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--disable-use-tty-group"
+                           "--enable-ddate")
+       #:phases (alist-cons-after
+                 'install 'patch-chkdupexe
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let ((out (assoc-ref outputs "out")))
+                     (substitute* (string-append out "/bin/chkdupexe")
+                       ;; Allow 'patch-shebang' to do its work.
+                       (("@PERL@") "/bin/perl"))))
+                 %standard-phases)))
+    (inputs `(("zlib" ,zlib)
+              ("ncurses" ,ncurses)))
+    (native-inputs `(("perl" ,perl)))
+    (home-page "https://www.kernel.org/pub/linux/utils/util-linux/";)
+    (synopsis "Collection of utilities for the Linux kernel")
+    (description
+     "util-linux is a random collection of utilities for the Linux kernel.")
+
+    ;; Note that util-linux doesn't use the same license for all the
+    ;; code.  GPLv2+ is the default license for a code without an
+    ;; explicitly defined license.
+    (license (list gpl3+ gpl2+ gpl2 lgpl2.0+
+                   bsd-4 public-domain))))
-- 
1.7.10.4