mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-23 21:17:11 -05:00
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.
This commit is contained in:
parent
1ffa7090b9
commit
59a43334a9
46 changed files with 51 additions and 50 deletions
|
@ -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 \
|
||||
|
|
|
@ -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 @@ (define-module (distro)
|
|||
;;; Commentary:
|
||||
;;;
|
||||
;;; General utilities for the software distribution---i.e., the modules under
|
||||
;;; (distro ...).
|
||||
;;; (gnu packages ...).
|
||||
;;;
|
||||
;;; Code:
|
||||
|
||||
|
@ -66,13 +66,14 @@ (define (search-bootstrap-binary file-name system)
|
|||
|
||||
(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
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -21,7 +21,7 @@ (define-module (gnu packages emacs)
|
|||
#: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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -21,7 +21,7 @@ (define-module (gnu packages flex)
|
|||
#: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))
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -23,7 +23,7 @@ (define-module (gnu packages global)
|
|||
#: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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -21,7 +21,7 @@ (define-module (gnu packages idutils)
|
|||
#: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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -21,7 +21,7 @@ (define-module (gnu packages lsh)
|
|||
#: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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -22,7 +22,7 @@ (define-module (gnu packages make-bootstrap)
|
|||
#: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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -21,7 +21,7 @@ (define-module (gnu packages system)
|
|||
#: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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -23,7 +23,7 @@ (define-module (test-derivations)
|
|||
#: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)
|
||||
|
|
|
@ -24,7 +24,7 @@ (define-module (test-packages)
|
|||
#: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…
Reference in a new issue