gnu: Move 'which' to (gnu packages base).

* gnu/packages/which.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove it.
* gnu/packages/base.scm (which): New variable.
* gnu/packages/aspell.scm, gnu/packages/audio.scm,
  gnu/packages/autogen.scm, gnu/packages/cdrom.scm,
  gnu/packages/compression.scm, gnu/packages/datamash.scm,
  gnu/packages/games.scm, gnu/packages/glib.scm,
  gnu/packages/gnu-pw-mgr.scm, gnu/packages/gnutls.scm,
  gnu/packages/gps.scm, gnu/packages/guile.scm,
  gnu/packages/java.scm, gnu/packages/libevent.scm,
  gnu/packages/linux.scm, gnu/packages/lisp.scm,
  gnu/packages/node.scm, gnu/packages/ntp.scm,
  gnu/packages/orpheus.scm, gnu/packages/pciutils.scm,
  gnu/packages/python.scm, gnu/packages/qt.scm,
  gnu/packages/rsync.scm, gnu/packages/sawfish.scm,
  gnu/packages/scheme.scm, gnu/packages/ssh.scm,
  gnu/packages/statistics.scm, gnu/packages/texlive.scm,
  gnu/packages/wdiff.scm: Adjust accordingly.

33 files changed, 53 insertions, 83 deletions

diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm
index 122daa7136..bd6a54c7d4 100644
--- a/gnu/packages/aspell.scm
+++ b/gnu/packages/aspell.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,7 +22,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix licenses)
   #:use-module (gnu packages perl)
-  #:use-module (gnu packages which))
+  #:use-module (gnu packages base))
 
 (define-public aspell
   (package
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 91d78b81a5..64bde2ea20 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -48,7 +48,6 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages rdf)
   #:use-module (gnu packages readline)
-  #:use-module (gnu packages which)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
   #:use-module (srfi srfi-1))
diff --git a/gnu/packages/autogen.scm b/gnu/packages/autogen.scm
index d9726cafe9..c27ea15e70 100644
--- a/gnu/packages/autogen.scm
+++ b/gnu/packages/autogen.scm
@@ -23,7 +23,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages perl)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages guile))
 
 (define-public autogen
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 13b1a1060f..102a9659c2 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -584,6 +584,26 @@ test environments.")
     (home-page (package-home-page glibc))
     (license (package-license glibc))))
 
+(define-public which
+  (package
+    (name "which")
+    (version "2.20")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/which/which-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1y2p50zadb36izzh2zw4dm5hvdiydqf3qa88l8kav20dcmfbc5yl"))))
+    (build-system gnu-build-system)
+    (home-page "https://gnu.org/software/which/")
+    (synopsis "Find full path of shell commands")
+    (description
+     "The which program finds the location of executables in PATH, with a
+variety of options.  It is an alternative to the shell \"type\" built-in
+command.")
+    (license gpl3+))) ; some files are under GPLv2+
+
 (define-public tzdata
   (package
     (name "tzdata")
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 6187f871af..ac5f64f48f 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -32,7 +32,7 @@
   #:use-module (gnu packages elf)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages readline)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
   #:use-module (gnu packages wget)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 98994ae1e6..721fb9e9b1 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -24,7 +24,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module (gnu packages which))
+  #:use-module (gnu packages base))
 
 (define-public zlib
   (package
diff --git a/gnu/packages/datamash.scm b/gnu/packages/datamash.scm
index ccf3729b0b..3db3e6ebf0 100644
--- a/gnu/packages/datamash.scm
+++ b/gnu/packages/datamash.scm
@@ -22,7 +22,7 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages perl)
-  #:use-module (gnu packages which))
+  #:use-module (gnu packages base))
 
 (define-public datamash
   (package
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5843ca660d..9c02d88eab 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
 ;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net>
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
@@ -63,7 +63,6 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages video)
-  #:use-module (gnu packages which)
   #:use-module (gnu packages xml)
   #:use-module (guix build-system trivial)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index a2c01e6440..a2f3cbca9d 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -39,7 +39,6 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages file)
-  #:use-module (gnu packages which)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages m4)
 
diff --git a/gnu/packages/gnu-pw-mgr.scm b/gnu/packages/gnu-pw-mgr.scm
index 46d494bbb2..e0f223d7d6 100644
--- a/gnu/packages/gnu-pw-mgr.scm
+++ b/gnu/packages/gnu-pw-mgr.scm
@@ -23,7 +23,7 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
-  #:use-module (gnu packages which))
+  #:use-module (gnu packages base))
 
 (define-public gnu-pw-mgr
   (package
diff --git a/gnu/packages/gnutls.scm b/gnu/packages/gnutls.scm
index 4438e74c08..0ae660bf5d 100644
--- a/gnu/packages/gnutls.scm
+++ b/gnu/packages/gnutls.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
@@ -33,7 +33,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages which))
+  #:use-module (gnu packages base))
 
 (define-public libtasn1
   (package
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 231b1d1b04..bede89e373 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,7 +22,7 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages docbook)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 3c94567dd3..ea18bdfdac 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -33,7 +33,7 @@
   #:use-module (gnu packages readline)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages ed)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0d332933a0..29f628ca38 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -39,7 +39,6 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages linux) ;alsa
   #:use-module (gnu packages wget)
-  #:use-module (gnu packages which)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages mit-krb5)
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index e23de3a25a..88b13ecbc9 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -23,7 +23,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages python)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages pkg-config))
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 96121b63ea..621ce69c2d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -49,7 +49,7 @@
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages check)
   #:use-module (gnu packages maths)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages rrdtool)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages gtk)
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index c592fbd83f..76c826cc6e 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -28,7 +28,7 @@
   #:use-module (guix download)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages libffi)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index e8b834c3c9..b2a5d033d2 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -25,7 +25,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (guix packages)
   #:use-module (guix derivations)
   #:use-module (guix download)
diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm
index 0525882b4f..0fb7fe6c7d 100644
--- a/gnu/packages/ntp.scm
+++ b/gnu/packages/ntp.scm
@@ -20,7 +20,7 @@
 
 (define-module (gnu packages ntp)
   #:use-module (gnu packages)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages openssl)
diff --git a/gnu/packages/orpheus.scm b/gnu/packages/orpheus.scm
index 2bc6a6af14..7d4b1cac63 100644
--- a/gnu/packages/orpheus.scm
+++ b/gnu/packages/orpheus.scm
@@ -24,7 +24,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages mp3)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml))
 
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm
index bf395e33e8..7135af44e5 100644
--- a/gnu/packages/pciutils.scm
+++ b/gnu/packages/pciutils.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,7 +23,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages which))
+  #:use-module (gnu packages base))
 
 (define-public pciutils
   (package
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 772a214eb3..58132b334a 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -54,7 +54,7 @@
   #:use-module (gnu packages texlive)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages web)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages zip)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 725ac8a2fa..31afc8d544 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -159,7 +159,7 @@ webrtc/tools/e2e_quality/audio/perf")))))
        ("pkg-config" ,pkg-config)
        ("python" ,python-2)
        ("ruby" ,ruby)
-       ("which" ,(@ (gnu packages which) which))))
+       ("which" ,(@ (gnu packages base) which))))
     (arguments
      `(#:phases
          (alist-replace
diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm
index 35bd13fa0b..5e98d84835 100644
--- a/gnu/packages/rsync.scm
+++ b/gnu/packages/rsync.scm
@@ -20,7 +20,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages acl)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm
index 4ca2ea5f17..f50632885f 100644
--- a/gnu/packages/sawfish.scm
+++ b/gnu/packages/sawfish.scm
@@ -30,7 +30,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages xorg))
 
 (define-public librep
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 4d759fa11a..e0eccf51ff 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -30,7 +30,7 @@
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages elf)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages libphidget)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 3d058b14db..f475eeab09 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -32,7 +32,7 @@
   #:use-module (gnu packages ncurses)
   #:autoload   (gnu packages protobuf) (protobuf)
   #:autoload   (gnu packages boost) (boost)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index ad7bc589fe..5fae6d7a3c 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -36,7 +36,7 @@
   #:use-module (gnu packages readline)
   #:use-module (gnu packages texlive)
   #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages xorg))
 
 (define-public r
diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm
index e3321401c3..f757350135 100644
--- a/gnu/packages/texlive.scm
+++ b/gnu/packages/texlive.scm
@@ -37,7 +37,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages tcsh)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages zip)
diff --git a/gnu/packages/wdiff.scm b/gnu/packages/wdiff.scm
index 06a44a9f40..1dcdb8ba36 100644
--- a/gnu/packages/wdiff.scm
+++ b/gnu/packages/wdiff.scm
@@ -23,7 +23,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages screen)
-  #:use-module (gnu packages which))
+  #:use-module (gnu packages base))
 
 (define-public wdiff
   (package
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 5f917511f9..8754ecee8b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -35,11 +35,11 @@
   #:use-module (gnu packages asciidoc)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages autotools)
-  #:use-module ((gnu packages compression) #:select (zlib))
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages openssl)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages icu4c)
-  #:use-module (gnu packages which)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages curl)
diff --git a/gnu/packages/which.scm b/gnu/packages/which.scm
deleted file mode 100644
index df2f8e9976..0000000000
--- a/gnu/packages/which.scm
+++ /dev/null
@@ -1,44 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
-;;;
-;;; 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 which)
-  #:use-module (guix licenses)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu))
-
-(define-public which
-  (package
-    (name "which")
-    (version "2.20")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/which/which-"
-                          version ".tar.gz"))
-      (sha256
-       (base32
-        "1y2p50zadb36izzh2zw4dm5hvdiydqf3qa88l8kav20dcmfbc5yl"))))
-    (build-system gnu-build-system)
-    (home-page "https://gnu.org/software/which/")
-    (synopsis "Find full path of shell commands")
-    (description
-     "The which program finds the location of executables in PATH, with a
-variety of options.  It is an alternative to the shell \"type\" built-in
-command.")
-    (license gpl3+))) ; some files are under GPLv2+
diff --git a/gnu/system.scm b/gnu/system.scm
index 5a3842fbb8..a51b176640 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -27,12 +27,10 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages guile)
-  #:use-module (gnu packages which)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pciutils)
   #:use-module (gnu packages package-management)
-  #:use-module (gnu packages which)
   #:use-module (gnu packages less)
   #:use-module (gnu packages zile)
   #:use-module (gnu packages nano)