* distro.scm: Rename to...
* gnu/packages.scm: ... this. Update all users accordingly.
* Makefile.am (MODULES): Adjust accordingly.
* po/POTFILES.in: Likewise.
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 \
;;; 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)
;;; Commentary:
;;;
;;; General utilities for the software distribution---i.e., the modules under
-;;; (distro ...).
+;;; (gnu packages ...).
;;;
;;; Code:
(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
;;; 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)
(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)
(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)
;;; 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)
(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)
;;; 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)
(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))
;;; 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)
#: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)
;;; 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)
#: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))
(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))
#: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
;;; 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)
(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)
;;; 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)
#: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
;;; 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)
;;; 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)
;;; 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)
;;; 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)
;;; 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)
(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)
#: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)
(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)
;;; 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)
#: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)
;;; 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)
(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)
;;; 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)
;;; 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)
(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)
(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)
(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)
;;; 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)
;;; 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)
(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)
#: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
#: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
#: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))
(use-modules (guix store)
(guix packages)
((guix utils) #:select (%current-system))
- (distro)
+ (gnu packages)
(gnu packages base)
(gnu packages guile)
(srfi srfi-1)
# 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
#: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)
#: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)