Browse Source

distro: Rename (distro) to (gnu packages).

* distro.scm: Rename to...
* gnu/packages.scm: ... this.  Update all users accordingly.
* Makefile.am (MODULES): Adjust accordingly.
* po/POTFILES.in: Likewise.
gn-latest-20200428
Ludovic Courtès 9 years ago
parent
commit
59a43334a9
  1. 2
      Makefile.am
  2. 11
      gnu/packages.scm
  3. 2
      gnu/packages/algebra.scm
  4. 2
      gnu/packages/autotools.scm
  5. 2
      gnu/packages/base.scm
  6. 2
      gnu/packages/bdb.scm
  7. 2
      gnu/packages/bootstrap.scm
  8. 2
      gnu/packages/check.scm
  9. 2
      gnu/packages/cpio.scm
  10. 2
      gnu/packages/cyrus-sasl.scm
  11. 2
      gnu/packages/emacs.scm
  12. 2
      gnu/packages/file.scm
  13. 2
      gnu/packages/flex.scm
  14. 2
      gnu/packages/gettext.scm
  15. 2
      gnu/packages/global.scm
  16. 2
      gnu/packages/gsasl.scm
  17. 2
      gnu/packages/guile.scm
  18. 2
      gnu/packages/icu4c.scm
  19. 2
      gnu/packages/idutils.scm
  20. 2
      gnu/packages/indent.scm
  21. 2
      gnu/packages/libidn.scm
  22. 2
      gnu/packages/libjpeg.scm
  23. 2
      gnu/packages/libtiff.scm
  24. 2
      gnu/packages/libusb.scm
  25. 2
      gnu/packages/linux.scm
  26. 2
      gnu/packages/lsh.scm
  27. 2
      gnu/packages/m4.scm
  28. 2
      gnu/packages/mailutils.scm
  29. 2
      gnu/packages/make-bootstrap.scm
  30. 2
      gnu/packages/mit-krb5.scm
  31. 2
      gnu/packages/multiprecision.scm
  32. 2
      gnu/packages/mysql.scm
  33. 2
      gnu/packages/openssl.scm
  34. 2
      gnu/packages/perl.scm
  35. 2
      gnu/packages/readline.scm
  36. 2
      gnu/packages/recutils.scm
  37. 2
      gnu/packages/rsync.scm
  38. 2
      gnu/packages/scheme.scm
  39. 2
      gnu/packages/shishi.scm
  40. 2
      gnu/packages/system.scm
  41. 2
      guix-build.in
  42. 2
      guix-package.in
  43. 2
      hydra.scm
  44. 2
      po/POTFILES.in
  45. 2
      tests/derivations.scm
  46. 2
      tests/packages.scm

2
Makefile.am

@ -44,7 +44,7 @@ MODULES = \
guix/packages.scm \
guix/snix.scm \
guix.scm \
distro.scm \
gnu/packages.scm \
gnu/packages/acl.scm \
gnu/packages/algebra.scm \
gnu/packages/aspell.scm \

11
distro.scm → gnu/packages.scm

@ -16,7 +16,7 @@
;;; 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 (distro)
(define-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (ice-9 ftw)
@ -33,7 +33,7 @@
;;; Commentary:
;;;
;;; General utilities for the software distribution---i.e., the modules under
;;; (distro ...).
;;; (gnu packages ...).
;;;
;;; Code:
@ -66,13 +66,14 @@
(define %distro-module-directory
;; Absolute path of the (gnu packages ...) module root.
(string-append (dirname (search-path %load-path "distro.scm"))
"/gnu/packages"))
(string-append (dirname (search-path %load-path "gnu/packages.scm"))
"/packages"))
(define (package-files)
"Return the list of files that implement distro modules."
(define prefix-len
(string-length (dirname (search-path %load-path "distro.scm"))))
(string-length
(dirname (dirname (search-path %load-path "gnu/packages.scm")))))
(file-system-fold (const #t) ; enter?
(lambda (path stat result) ; leaf

2
gnu/packages/algebra.scm

@ -18,7 +18,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages algebra)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages perl)
#:use-module (gnu packages readline)

2
gnu/packages/autotools.scm

@ -19,7 +19,7 @@
(define-module (gnu packages autotools)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages perl)
#:use-module (gnu packages m4)
#:use-module (guix packages)

2
gnu/packages/base.scm

@ -19,7 +19,7 @@
(define-module (gnu packages base)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages acl)
#:use-module (gnu packages bash)
#:use-module (gnu packages bootstrap)

2
gnu/packages/bdb.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages bdb)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)

2
gnu/packages/bootstrap.scm

@ -18,7 +18,7 @@
(define-module (gnu packages bootstrap)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system)

2
gnu/packages/check.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages check)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)

2
gnu/packages/cpio.scm

@ -18,7 +18,7 @@
(define-module (gnu packages cpio)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))

2
gnu/packages/cyrus-sasl.scm

@ -18,7 +18,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages cyrus-sasl)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages gdbm)
#:use-module (gnu packages mit-krb5)
#:use-module (gnu packages openssl)

2
gnu/packages/emacs.scm

@ -21,7 +21,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages gnutls)

2
gnu/packages/file.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages file)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)

2
gnu/packages/flex.scm

@ -21,7 +21,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages m4)
#:use-module (gnu packages bison)
#:use-module (gnu packages indent))

2
gnu/packages/gettext.scm

@ -18,7 +18,7 @@
(define-module (gnu packages gettext)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))

2
gnu/packages/global.scm

@ -23,7 +23,7 @@
#:use-module (guix licenses)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages autotools)
#:use-module (distro))
#:use-module (gnu packages))
(define-public global ; a global variable
(package

2
gnu/packages/gsasl.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages gsasl)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module ((gnu packages compression)
#:renamer (symbol-prefix-proc 'guix:))
#:use-module (gnu packages gnutls)

2
gnu/packages/guile.scm

@ -18,7 +18,7 @@
(define-module (gnu packages guile)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gperf)

2
gnu/packages/icu4c.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages icu4c)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages perl)
#:use-module (guix licenses)
#:use-module (guix packages)

2
gnu/packages/idutils.scm

@ -21,7 +21,7 @@
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix licenses)
#:use-module (distro))
#:use-module (gnu packages))
(define-public idutils
(package

2
gnu/packages/indent.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages indent)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)

2
gnu/packages/libidn.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages libidn)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)

2
gnu/packages/libjpeg.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages libjpeg)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)

2
gnu/packages/libtiff.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages libtiff)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages file)
#:use-module (gnu packages libjpeg)
#:use-module (guix licenses)

2
gnu/packages/libusb.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages libusb)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)

2
gnu/packages/linux.scm

@ -19,7 +19,7 @@
(define-module (gnu packages linux)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module ((gnu packages compression)
#:renamer (symbol-prefix-proc 'guix:))
#:use-module (gnu packages flex)

2
gnu/packages/lsh.scm

@ -21,7 +21,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages m4)
#:use-module (gnu packages linux)
#:use-module ((gnu packages compression)

2
gnu/packages/m4.scm

@ -18,7 +18,7 @@
(define-module (gnu packages m4)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)

2
gnu/packages/mailutils.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages mailutils)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages linux)
#:use-module (gnu packages gnutls)
#:use-module (gnu packages gdbm)

2
gnu/packages/make-bootstrap.scm

@ -22,7 +22,7 @@
#:use-module (guix licenses)
#:use-module (guix build-system trivial)
#:use-module (guix build-system gnu)
#:use-module ((distro) #:select (search-patch))
#:use-module ((gnu packages) #:select (search-patch))
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)

2
gnu/packages/mit-krb5.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages mit-krb5)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages bison)
#:use-module (gnu packages perl)
#:use-module (guix licenses)

2
gnu/packages/multiprecision.scm

@ -18,7 +18,7 @@
(define-module (gnu packages multiprecision)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages m4)
#:use-module (guix packages)
#:use-module (guix download)

2
gnu/packages/mysql.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages mysql)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages perl)
#:use-module (gnu packages linux)
#:use-module (gnu packages openssl)

2
gnu/packages/openssl.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages openssl)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages perl)
#:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
#:use-module (guix packages)

2
gnu/packages/perl.scm

@ -18,7 +18,7 @@
(define-module (gnu packages perl)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)

2
gnu/packages/readline.scm

@ -18,7 +18,7 @@
(define-module (gnu packages readline)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages ncurses)
#:use-module (guix packages)
#:use-module (guix download)

2
gnu/packages/recutils.scm

@ -18,7 +18,7 @@
(define-module (gnu packages recutils)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)

2
gnu/packages/rsync.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages rsync)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages perl)
#:use-module (gnu packages acl)
#:use-module (guix licenses)

2
gnu/packages/scheme.scm

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages scheme)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)

2
gnu/packages/shishi.scm

@ -19,7 +19,7 @@
(define-module (gnu packages shishi)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages gnutls)
#:use-module (gnu packages gnupg)
#:use-module ((gnu packages compression)

2
gnu/packages/system.scm

@ -21,7 +21,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages ncurses))
(define-public pies

2
guix-build.in

@ -41,7 +41,7 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-37)
#:autoload (distro) (find-packages-by-name)
#:autoload (gnu packages) (find-packages-by-name)
#:export (guix-build))
(define %store

2
guix-package.in

@ -47,7 +47,7 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-37)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module ((gnu packages base) #:select (guile-final))
#:use-module ((gnu packages bootstrap) #:select (%bootstrap-guile))
#:export (guix-package))

2
hydra.scm

@ -24,7 +24,7 @@
(use-modules (guix store)
(guix packages)
((guix utils) #:select (%current-system))
(distro)
(gnu packages)
(gnu packages base)
(gnu packages guile)
(srfi srfi-1)

2
po/POTFILES.in

@ -1,5 +1,5 @@
# List of source files which contain translatable strings.
distro.scm
gnu/packages.scm
gnu/packages/base.scm
gnu/packages/guile.scm
gnu/packages/lout.scm

2
tests/derivations.scm

@ -23,7 +23,7 @@
#:use-module (guix utils)
#:use-module (guix base32)
#:use-module ((guix packages) #:select (package-derivation))
#:use-module ((distro) #:select (search-bootstrap-binary))
#:use-module ((gnu packages) #:select (search-bootstrap-binary))
#:use-module (gnu packages bootstrap)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)

2
tests/packages.scm

@ -24,7 +24,7 @@
#:use-module (guix packages)
#:use-module (guix build-system trivial)
#:use-module (guix build-system gnu)
#:use-module (distro)
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages bootstrap)
#:use-module (srfi srfi-26)

Loading…
Cancel
Save