~ruther/guix-local: gnu: Move 'which' to (gnu packages base).

34 files changed, 53 insertions(+), 84 deletions(-)

M gnu-system.am
M gnu/packages/aspell.scm
M gnu/packages/audio.scm
M gnu/packages/autogen.scm
M gnu/packages/base.scm
M gnu/packages/cdrom.scm
M gnu/packages/compression.scm
M gnu/packages/datamash.scm
M gnu/packages/games.scm
M gnu/packages/glib.scm
M gnu/packages/gnu-pw-mgr.scm
M gnu/packages/gnutls.scm
M gnu/packages/gps.scm
M gnu/packages/guile.scm
M gnu/packages/java.scm
M gnu/packages/libevent.scm
M gnu/packages/linux.scm
M gnu/packages/lisp.scm
M gnu/packages/node.scm
M gnu/packages/ntp.scm
M gnu/packages/orpheus.scm
M gnu/packages/pciutils.scm
M gnu/packages/python.scm
M gnu/packages/qt.scm
M gnu/packages/rsync.scm
M gnu/packages/sawfish.scm
M gnu/packages/scheme.scm
M gnu/packages/ssh.scm
M gnu/packages/statistics.scm
M gnu/packages/texlive.scm
M gnu/packages/wdiff.scm
M gnu/packages/web.scm
D gnu/packages/which.scm
M gnu/system.scm

M gnu-system.am => gnu-system.am +0 -1

@@ 292,7 292,6 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/web.scm				\
   gnu/packages/weechat.scm			\
   gnu/packages/wget.scm				\
-  gnu/packages/which.scm			\
   gnu/packages/wicd.scm				\
   gnu/packages/wine.scm				\
   gnu/packages/wordnet.scm			\

M gnu/packages/aspell.scm => gnu/packages/aspell.scm +2 -2

@@ 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

M gnu/packages/audio.scm => gnu/packages/audio.scm +0 -1

@@ 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))

M gnu/packages/autogen.scm => gnu/packages/autogen.scm +1 -1

@@ 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

M gnu/packages/base.scm => gnu/packages/base.scm +20 -0

@@ 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")

M gnu/packages/cdrom.scm => gnu/packages/cdrom.scm +2 -2

@@ 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)

M gnu/packages/compression.scm => gnu/packages/compression.scm +1 -1

@@ 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

M gnu/packages/datamash.scm => gnu/packages/datamash.scm +1 -1

@@ 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

M gnu/packages/games.scm => gnu/packages/games.scm +1 -2

@@ 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)

M gnu/packages/glib.scm => gnu/packages/glib.scm +0 -1

@@ 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)

M gnu/packages/gnu-pw-mgr.scm => gnu/packages/gnu-pw-mgr.scm +1 -1

@@ 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

M gnu/packages/gnutls.scm => gnu/packages/gnutls.scm +2 -2

@@ 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

M gnu/packages/gps.scm => gnu/packages/gps.scm +2 -2

@@ 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)

M gnu/packages/guile.scm => gnu/packages/guile.scm +1 -1

@@ 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)

M gnu/packages/java.scm => gnu/packages/java.scm +0 -1

@@ 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)

M gnu/packages/libevent.scm => gnu/packages/libevent.scm +1 -1

@@ 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))

M gnu/packages/linux.scm => gnu/packages/linux.scm +1 -1

@@ 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)

M gnu/packages/lisp.scm => gnu/packages/lisp.scm +1 -1

@@ 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)

M gnu/packages/node.scm => gnu/packages/node.scm +1 -1

@@ 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)

M gnu/packages/ntp.scm => gnu/packages/ntp.scm +1 -1

@@ 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)

M gnu/packages/orpheus.scm => gnu/packages/orpheus.scm +1 -1

@@ 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))

M gnu/packages/pciutils.scm => gnu/packages/pciutils.scm +2 -2

@@ 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

M gnu/packages/python.scm => gnu/packages/python.scm +1 -1

@@ 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)

M gnu/packages/qt.scm => gnu/packages/qt.scm +1 -1

@@ 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

M gnu/packages/rsync.scm => gnu/packages/rsync.scm +1 -1

@@ 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)

M gnu/packages/sawfish.scm => gnu/packages/sawfish.scm +1 -1

@@ 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

M gnu/packages/scheme.scm => gnu/packages/scheme.scm +1 -1

@@ 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)

M gnu/packages/ssh.scm => gnu/packages/ssh.scm +1 -1

@@ 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)

M gnu/packages/statistics.scm => gnu/packages/statistics.scm +1 -1

@@ 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

M gnu/packages/texlive.scm => gnu/packages/texlive.scm +1 -1

@@ 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)

M gnu/packages/wdiff.scm => gnu/packages/wdiff.scm +1 -1

@@ 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

M gnu/packages/web.scm => gnu/packages/web.scm +2 -2

@@ 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)

D gnu/packages/which.scm => gnu/packages/which.scm +0 -44

@@ 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+

M gnu/system.scm => gnu/system.scm +0 -2

@@ 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)