From 59a43334a98babd6c776648967e48d7c44723639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 18 Jan 2013 01:06:47 +0100 Subject: [PATCH] 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. --- Makefile.am | 2 +- distro.scm => gnu/packages.scm | 11 ++++++----- gnu/packages/algebra.scm | 2 +- gnu/packages/autotools.scm | 2 +- gnu/packages/base.scm | 2 +- gnu/packages/bdb.scm | 2 +- gnu/packages/bootstrap.scm | 2 +- gnu/packages/check.scm | 2 +- gnu/packages/cpio.scm | 2 +- gnu/packages/cyrus-sasl.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/file.scm | 2 +- gnu/packages/flex.scm | 2 +- gnu/packages/gettext.scm | 2 +- gnu/packages/global.scm | 2 +- gnu/packages/gsasl.scm | 2 +- gnu/packages/guile.scm | 2 +- gnu/packages/icu4c.scm | 2 +- gnu/packages/idutils.scm | 2 +- gnu/packages/indent.scm | 2 +- gnu/packages/libidn.scm | 2 +- gnu/packages/libjpeg.scm | 2 +- gnu/packages/libtiff.scm | 2 +- gnu/packages/libusb.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/lsh.scm | 2 +- gnu/packages/m4.scm | 2 +- gnu/packages/mailutils.scm | 2 +- gnu/packages/make-bootstrap.scm | 2 +- gnu/packages/mit-krb5.scm | 2 +- gnu/packages/multiprecision.scm | 2 +- gnu/packages/mysql.scm | 2 +- gnu/packages/openssl.scm | 2 +- gnu/packages/perl.scm | 2 +- gnu/packages/readline.scm | 2 +- gnu/packages/recutils.scm | 2 +- gnu/packages/rsync.scm | 2 +- gnu/packages/scheme.scm | 2 +- gnu/packages/shishi.scm | 2 +- gnu/packages/system.scm | 2 +- guix-build.in | 2 +- guix-package.in | 2 +- hydra.scm | 2 +- po/POTFILES.in | 2 +- tests/derivations.scm | 2 +- tests/packages.scm | 2 +- 46 files changed, 51 insertions(+), 50 deletions(-) rename distro.scm => gnu/packages.scm (95%) diff --git a/Makefile.am b/Makefile.am index b4c8c931fd8fb4603c9078d97c6f2ad4345efe16..86f965171988f64bfd7d4e2aa9edbab511aba8b6 100644 --- a/Makefile.am +++ b/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 \ diff --git a/distro.scm b/gnu/packages.scm similarity index 95% rename from distro.scm rename to gnu/packages.scm index 39735848155feaa189e093196af9368b79e67d16..792fe44efa7091ac8113f2ec33d4395aba1ca12e 100644 --- a/distro.scm +++ b/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 . -(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 diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 088e32bc0c736e0028647242d5e81640e6cd8f9a..84806f9e3ab2879af6e087b185bb3879a377682e 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -18,7 +18,7 @@ ;;; along with GNU Guix. If not, see . (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) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index b5c8b6ec8752f4fd308b4fc262cdef240bfeeeef..05fddcc2ab557cc69b96432199baa89316453ae1 100644 --- a/gnu/packages/autotools.scm +++ b/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) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index b5a58566099108d0021b429cc61c029ba8b0576d..4764039afd5150abc2cc5c9a0aeeae6d68157dbb 100644 --- a/gnu/packages/base.scm +++ b/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) diff --git a/gnu/packages/bdb.scm b/gnu/packages/bdb.scm index 1be57b302ab5f989e7116e6053c75ce2bf6e7f72..c9cdf4af6b1d76740d42b00c4dade87da0a47ae0 100644 --- a/gnu/packages/bdb.scm +++ b/gnu/packages/bdb.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages bdb) - #:use-module (distro) + #:use-module (gnu packages) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 6cad9336440669edabf00a1c80963f7017509efc..39cdea2f6239414f8261114880f7acb5ba4a9687 100644 --- a/gnu/packages/bootstrap.scm +++ b/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) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index ec2997cbe6e7d415ac52ed2a283c2d6e3451a55b..ebb04e2b533691f09664390504c449a382597291 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages check) - #:use-module (distro) + #:use-module (gnu packages) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/cpio.scm b/gnu/packages/cpio.scm index 6fddc3f768033ef55388abae36e512ecfd422fce..711d64d7afc16518d6d00aec86228373a3c085b6 100644 --- a/gnu/packages/cpio.scm +++ b/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)) diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index fe8ea4ef7c0b950c5e29cd2b3294566414a81abe..b724d4fc2f7db0f2c7b71c3414a6720b014f2e75 100644 --- a/gnu/packages/cyrus-sasl.scm +++ b/gnu/packages/cyrus-sasl.scm @@ -18,7 +18,7 @@ ;;; along with GNU Guix. If not, see . (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) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c9d0822a80b5cf015b4b83febcb5a3e815cf75dd..13a03ce3655e15f86147b090d56fec57ce3a7b20 100644 --- a/gnu/packages/emacs.scm +++ b/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) diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index 5a2cc2ad8063fa7d27d131ecb3296ac8c8fe962d..1e09fb7f18b97c61aa0357ed080b602a5493de38 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages file) - #:use-module (distro) + #:use-module (gnu packages) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 7a6d5f507dc56183a70beb70f4c154b2750b443f..5548dcf05d885d49fe600027e211fc1f474c99dd 100644 --- a/gnu/packages/flex.scm +++ b/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)) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index c45a488dcaa61f5e408a9e37f8fd00eef45c8719..e85b8f69c3d74bea1306cdcb1c92cc8be4c0343c 100644 --- a/gnu/packages/gettext.scm +++ b/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)) diff --git a/gnu/packages/global.scm b/gnu/packages/global.scm index 705efbbbedaefed17c9d061736cf25ec2d9a4bb5..592aefc66e097071531f10b606b89232f0957422 100644 --- a/gnu/packages/global.scm +++ b/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 diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index dc75b18455c9be59b58b73990b7b0c162d1ebe01..832ae0c2ff7087ce19e07468b624d125ebabff56 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (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) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 5034ae914aa10b6ea51a273d759d6fb8943bdfc1..4c87465b2520f163d6d601a1e6c12f296e9307f2 100644 --- a/gnu/packages/guile.scm +++ b/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) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index e0aa3bcd88973867706eab114eaf85d64cb1c169..35b0c35069de25fed01291394faca1d7666ef478 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (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) diff --git a/gnu/packages/idutils.scm b/gnu/packages/idutils.scm index 34b6dfcff9d43d43ee61e4a7f37e4209e044516a..775de18c5cff1dd88c2b53d7869ea79807029700 100644 --- a/gnu/packages/idutils.scm +++ b/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 diff --git a/gnu/packages/indent.scm b/gnu/packages/indent.scm index eb42e6a7b4200a0ba54717263f1b043ca7f6a121..c70a790e62928c71821c29e451df9bc18338d254 100644 --- a/gnu/packages/indent.scm +++ b/gnu/packages/indent.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages indent) - #:use-module (distro) + #:use-module (gnu packages) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index dd246ef3e19ebcee0c2203b04d53e0e6389b2143..b49a2018ca5de3767e8435651dab1281fee5c162 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libidn) - #:use-module (distro) + #:use-module (gnu packages) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/libjpeg.scm b/gnu/packages/libjpeg.scm index 22d5a6b1c153fbfaf2470efaa6ec8d9d590a8675..e646b1dfa2412d58256fba36a0fc309313a34fd8 100644 --- a/gnu/packages/libjpeg.scm +++ b/gnu/packages/libjpeg.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libjpeg) - #:use-module (distro) + #:use-module (gnu packages) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/libtiff.scm b/gnu/packages/libtiff.scm index 0e785a622bb77e6641633620b76dd98d58771129..5c5f1cc094f37545f14b33bf82f91fc4476f896f 100644 --- a/gnu/packages/libtiff.scm +++ b/gnu/packages/libtiff.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (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) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 1813f0cd041768d7776e452cf78e8fe20ac0e8b7..86ead7b22e47072d1c580f5770c524b9790fdc2e 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libusb) - #:use-module (distro) + #:use-module (gnu packages) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ded36c5eecee0228b04662d331a6e59f9774eb7f..de6d53a0d93d225d273c8f379e6409da8ac2e974 100644 --- a/gnu/packages/linux.scm +++ b/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) diff --git a/gnu/packages/lsh.scm b/gnu/packages/lsh.scm index b42eb246393c6ff7042df2b61b97d2e66e104de4..5b3e9a7e0bb6201855c9d06c1400d85c7d413304 100644 --- a/gnu/packages/lsh.scm +++ b/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) diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm index bac8d02c85dba6c06caf8dc7bc35ea8f1515073c..fdf55f802df25411adee98a3fe8a7fc1c3082308 100644 --- a/gnu/packages/m4.scm +++ b/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) diff --git a/gnu/packages/mailutils.scm b/gnu/packages/mailutils.scm index f6d46aaf348c0da3c239a9e9372b98554f0917f1..d9f26323e8275c53948b6a25d4ddd53602a6254f 100644 --- a/gnu/packages/mailutils.scm +++ b/gnu/packages/mailutils.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (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) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 20679d22446b855607df49e71aa01c59f40c4580..a252848a47cad7db07125fb8bb461855ce7a0036 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/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) diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm index 4b30a7ca175c21ac7cb3c4578a933173ed027988..4fbd301957606366d3161df4e73de1e24c6bb166 100644 --- a/gnu/packages/mit-krb5.scm +++ b/gnu/packages/mit-krb5.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (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) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index f05fe1994e1f10024999d49663a8bb70cc8deb0f..1d74dadef079fb72f279cb271fd411a61fe5836c 100644 --- a/gnu/packages/multiprecision.scm +++ b/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) diff --git a/gnu/packages/mysql.scm b/gnu/packages/mysql.scm index 517f65610ecb6bae39c7ababffc190d9f789a0b2..4258bf6fe509a2945e1fd5de814f1ed5e91cc23b 100644 --- a/gnu/packages/mysql.scm +++ b/gnu/packages/mysql.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (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) diff --git a/gnu/packages/openssl.scm b/gnu/packages/openssl.scm index 8c8ba4c66835553d26d7d8896c33d8ace5090766..2af24abe4af2eb53d171be006d15e3a6dcc03720 100644 --- a/gnu/packages/openssl.scm +++ b/gnu/packages/openssl.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (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) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 719aa4db5c5af0125f61f5ff8fd73d624a0f2024..a37202b7bb3124d7fced0c6c6a45a3f03fe3957e 100644 --- a/gnu/packages/perl.scm +++ b/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) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 8623e6375853ee916583c7b98771555e1b5577d7..83666b225dc0e0558c3605c96893ed6db4f844d9 100644 --- a/gnu/packages/readline.scm +++ b/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) diff --git a/gnu/packages/recutils.scm b/gnu/packages/recutils.scm index 39452b54b901763a8ba6af61375e7772f9a62a52..3104f7149998dbc2820e978c838d145a6242d78b 100644 --- a/gnu/packages/recutils.scm +++ b/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) diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm index 3fb78744341cbef88ca6592f660c4b5481779e93..16e1a53cb24296b1a8f20e62a030671542d08b94 100644 --- a/gnu/packages/rsync.scm +++ b/gnu/packages/rsync.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (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) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index a1b8f68c9de5b55376e370ee73e70825d13f905c..ee8eb83d6898bf8dacbb89de904572248469d388 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages scheme) - #:use-module (distro) + #:use-module (gnu packages) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/shishi.scm b/gnu/packages/shishi.scm index d6d152f3689a3cf4f8d5cc7ebcccd30b70bc6d6f..1590221496488d632c59cdf5ef3650a7ca43dc46 100644 --- a/gnu/packages/shishi.scm +++ b/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) diff --git a/gnu/packages/system.scm b/gnu/packages/system.scm index 5fb3dc463b392b3a5699e26296e9fb01582fe31b..1eddd6de86195405390a3958798973a935a025df 100644 --- a/gnu/packages/system.scm +++ b/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 diff --git a/guix-build.in b/guix-build.in index abfab2bbbe9d2204de1e35732b176a26d1746a11..e3894b8af2597db3e382cb15847f3d914a79b363 100644 --- a/guix-build.in +++ b/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 diff --git a/guix-package.in b/guix-package.in index 933b85dced5576c082771beeb8893ac16896afbd..58d6c49501c94def5de8a5f7e7b5bbc2375db852 100644 --- a/guix-package.in +++ b/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)) diff --git a/hydra.scm b/hydra.scm index fdca935d5f617f480cf6820f9ca0d964c2d93e89..8e3be16b08a93644d9ef81ac95e049d9ccb75a0c 100644 --- a/hydra.scm +++ b/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) diff --git a/po/POTFILES.in b/po/POTFILES.in index d8fb384ae522f139448efd81ff3cca921c8a7fff..049a1c707e47d4705b1e3927a4fad8ccb1340611 100644 --- a/po/POTFILES.in +++ b/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 diff --git a/tests/derivations.scm b/tests/derivations.scm index 21c2a6acd95efaba11c048a3b95f115f3292fc07..83c8d444d76f94a9dfd09ac38cd298ea3b3f280e 100644 --- a/tests/derivations.scm +++ b/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) diff --git a/tests/packages.scm b/tests/packages.scm index 07d2ea54c751fe950fbafc0eae2d666d079845c7..ea0df511d2da61861e893c5f5d27032568fde05c 100644 --- a/tests/packages.scm +++ b/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)