M .gitignore => .gitignore +2 -2
@@ 44,9 44,9 @@ config.cache
/doc/guix.pdf
/doc/stamp-vti
/doc/version.texi
-/distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz
/guix-download
-/distro/packages/bootstrap/i686-linux/guile-bootstrap-2.0.6.tar.xz
+/gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
+/gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
/guix-package
/guix/config.scm
/guix-import
M Makefile.am => Makefile.am +115 -115
@@ 45,138 45,138 @@ MODULES = \
guix/snix.scm \
guix.scm \
distro.scm \
- distro/packages/acl.scm \
- distro/packages/algebra.scm \
- distro/packages/aspell.scm \
- distro/packages/attr.scm \
- distro/packages/autotools.scm \
- distro/packages/base.scm \
- distro/packages/bash.scm \
- distro/packages/bdb.scm \
- distro/packages/bdw-gc.scm \
- distro/packages/bison.scm \
- distro/packages/bootstrap.scm \
- distro/packages/check.scm \
- distro/packages/compression.scm \
- distro/packages/cpio.scm \
- distro/packages/cyrus-sasl.scm \
- distro/packages/dejagnu.scm \
- distro/packages/ddrescue.scm \
- distro/packages/ed.scm \
- distro/packages/emacs.scm \
- distro/packages/file.scm \
- distro/packages/flex.scm \
- distro/packages/gawk.scm \
- distro/packages/gdb.scm \
- distro/packages/gdbm.scm \
- distro/packages/gettext.scm \
- distro/packages/global.scm \
- distro/packages/gnupg.scm \
- distro/packages/gnutls.scm \
- distro/packages/gperf.scm \
- distro/packages/gsasl.scm \
- distro/packages/guile.scm \
- distro/packages/help2man.scm \
- distro/packages/icu4c.scm \
- distro/packages/idutils.scm \
- distro/packages/indent.scm \
- distro/packages/ld-wrapper.scm \
- distro/packages/less.scm \
- distro/packages/libffi.scm \
- distro/packages/libidn.scm \
- distro/packages/libjpeg.scm \
- distro/packages/libsigsegv.scm \
- distro/packages/libtiff.scm \
- distro/packages/libunistring.scm \
- distro/packages/libusb.scm \
- distro/packages/linux.scm \
- distro/packages/lout.scm \
- distro/packages/lsh.scm \
- distro/packages/m4.scm \
- distro/packages/mailutils.scm \
- distro/packages/make-bootstrap.scm \
- distro/packages/mit-krb5.scm \
- distro/packages/multiprecision.scm \
- distro/packages/mysql.scm \
- distro/packages/nano.scm \
- distro/packages/ncurses.scm \
- distro/packages/nettle.scm \
- distro/packages/openssl.scm \
- distro/packages/perl.scm \
- distro/packages/pkg-config.scm \
- distro/packages/pth.scm \
- distro/packages/python.scm \
- distro/packages/readline.scm \
- distro/packages/recutils.scm \
- distro/packages/rsync.scm \
- distro/packages/scheme.scm \
- distro/packages/shishi.scm \
- distro/packages/system.scm \
- distro/packages/tcl.scm \
- distro/packages/texinfo.scm \
- distro/packages/time.scm \
- distro/packages/wget.scm \
- distro/packages/which.scm \
- distro/packages/xml.scm \
- distro/packages/zile.scm
+ gnu/packages/acl.scm \
+ gnu/packages/algebra.scm \
+ gnu/packages/aspell.scm \
+ gnu/packages/attr.scm \
+ gnu/packages/autotools.scm \
+ gnu/packages/base.scm \
+ gnu/packages/bash.scm \
+ gnu/packages/bdb.scm \
+ gnu/packages/bdw-gc.scm \
+ gnu/packages/bison.scm \
+ gnu/packages/bootstrap.scm \
+ gnu/packages/check.scm \
+ gnu/packages/compression.scm \
+ gnu/packages/cpio.scm \
+ gnu/packages/cyrus-sasl.scm \
+ gnu/packages/dejagnu.scm \
+ gnu/packages/ddrescue.scm \
+ gnu/packages/ed.scm \
+ gnu/packages/emacs.scm \
+ gnu/packages/file.scm \
+ gnu/packages/flex.scm \
+ gnu/packages/gawk.scm \
+ gnu/packages/gdb.scm \
+ gnu/packages/gdbm.scm \
+ gnu/packages/gettext.scm \
+ gnu/packages/global.scm \
+ gnu/packages/gnupg.scm \
+ gnu/packages/gnutls.scm \
+ gnu/packages/gperf.scm \
+ gnu/packages/gsasl.scm \
+ gnu/packages/guile.scm \
+ gnu/packages/help2man.scm \
+ gnu/packages/icu4c.scm \
+ gnu/packages/idutils.scm \
+ gnu/packages/indent.scm \
+ gnu/packages/ld-wrapper.scm \
+ gnu/packages/less.scm \
+ gnu/packages/libffi.scm \
+ gnu/packages/libidn.scm \
+ gnu/packages/libjpeg.scm \
+ gnu/packages/libsigsegv.scm \
+ gnu/packages/libtiff.scm \
+ gnu/packages/libunistring.scm \
+ gnu/packages/libusb.scm \
+ gnu/packages/linux.scm \
+ gnu/packages/lout.scm \
+ gnu/packages/lsh.scm \
+ gnu/packages/m4.scm \
+ gnu/packages/mailutils.scm \
+ gnu/packages/make-bootstrap.scm \
+ gnu/packages/mit-krb5.scm \
+ gnu/packages/multiprecision.scm \
+ gnu/packages/mysql.scm \
+ gnu/packages/nano.scm \
+ gnu/packages/ncurses.scm \
+ gnu/packages/nettle.scm \
+ gnu/packages/openssl.scm \
+ gnu/packages/perl.scm \
+ gnu/packages/pkg-config.scm \
+ gnu/packages/pth.scm \
+ gnu/packages/python.scm \
+ gnu/packages/readline.scm \
+ gnu/packages/recutils.scm \
+ gnu/packages/rsync.scm \
+ gnu/packages/scheme.scm \
+ gnu/packages/shishi.scm \
+ gnu/packages/system.scm \
+ gnu/packages/tcl.scm \
+ gnu/packages/texinfo.scm \
+ gnu/packages/time.scm \
+ gnu/packages/wget.scm \
+ gnu/packages/which.scm \
+ gnu/packages/xml.scm \
+ gnu/packages/zile.scm
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go
nobase_dist_guilemodule_DATA = $(MODULES)
-patchdir = $(guilemoduledir)/distro/packages/patches
+patchdir = $(guilemoduledir)/gnu/packages/patches
dist_patch_DATA = \
- distro/packages/patches/bigloo-gc-shebangs.patch \
- distro/packages/patches/binutils-ld-new-dtags.patch \
- distro/packages/patches/cpio-gets-undeclared.patch \
- distro/packages/patches/diffutils-gets-undeclared.patch \
- distro/packages/patches/emacs-configure-sh.patch \
- distro/packages/patches/flex-bison-tests.patch \
- distro/packages/patches/gawk-shell.patch \
- distro/packages/patches/gettext-gets-undeclared.patch \
- distro/packages/patches/glibc-bootstrap-system.patch \
- distro/packages/patches/glibc-no-ld-so-cache.patch \
- distro/packages/patches/guile-1.8-cpp-4.5.patch \
- distro/packages/patches/guile-default-utf8.patch \
- distro/packages/patches/guile-relocatable.patch \
- distro/packages/patches/libtool-skip-tests.patch \
- distro/packages/patches/lsh-guile-compat.patch \
- distro/packages/patches/lsh-no-root-login.patch \
- distro/packages/patches/lsh-pam-service-name.patch \
- distro/packages/patches/m4-gets-undeclared.patch \
- distro/packages/patches/m4-readlink-EINVAL.patch \
- distro/packages/patches/m4-s_isdir.patch \
- distro/packages/patches/make-impure-dirs.patch \
- distro/packages/patches/findutils-absolute-paths.patch \
- distro/packages/patches/perl-no-sys-dirs.patch \
- distro/packages/patches/procps-make-3.82.patch \
- distro/packages/patches/readline-link-ncurses.patch \
- distro/packages/patches/shishi-gets-undeclared.patch \
- distro/packages/patches/tar-gets-undeclared.patch
+ gnu/packages/patches/bigloo-gc-shebangs.patch \
+ gnu/packages/patches/binutils-ld-new-dtags.patch \
+ gnu/packages/patches/cpio-gets-undeclared.patch \
+ gnu/packages/patches/diffutils-gets-undeclared.patch \
+ gnu/packages/patches/emacs-configure-sh.patch \
+ gnu/packages/patches/flex-bison-tests.patch \
+ gnu/packages/patches/gawk-shell.patch \
+ gnu/packages/patches/gettext-gets-undeclared.patch \
+ gnu/packages/patches/glibc-bootstrap-system.patch \
+ gnu/packages/patches/glibc-no-ld-so-cache.patch \
+ gnu/packages/patches/guile-1.8-cpp-4.5.patch \
+ gnu/packages/patches/guile-default-utf8.patch \
+ gnu/packages/patches/guile-relocatable.patch \
+ gnu/packages/patches/libtool-skip-tests.patch \
+ gnu/packages/patches/lsh-guile-compat.patch \
+ gnu/packages/patches/lsh-no-root-login.patch \
+ gnu/packages/patches/lsh-pam-service-name.patch \
+ gnu/packages/patches/m4-gets-undeclared.patch \
+ gnu/packages/patches/m4-readlink-EINVAL.patch \
+ gnu/packages/patches/m4-s_isdir.patch \
+ gnu/packages/patches/make-impure-dirs.patch \
+ gnu/packages/patches/findutils-absolute-paths.patch \
+ gnu/packages/patches/perl-no-sys-dirs.patch \
+ gnu/packages/patches/procps-make-3.82.patch \
+ gnu/packages/patches/readline-link-ncurses.patch \
+ gnu/packages/patches/shishi-gets-undeclared.patch \
+ gnu/packages/patches/tar-gets-undeclared.patch
-bootstrapdir = $(guilemoduledir)/distro/packages/bootstrap
+bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
dist_bootstrap_x86_64_linux_DATA = \
- distro/packages/bootstrap/x86_64-linux/bash \
- distro/packages/bootstrap/x86_64-linux/mkdir \
- distro/packages/bootstrap/x86_64-linux/tar \
- distro/packages/bootstrap/x86_64-linux/xz
+ gnu/packages/bootstrap/x86_64-linux/bash \
+ gnu/packages/bootstrap/x86_64-linux/mkdir \
+ gnu/packages/bootstrap/x86_64-linux/tar \
+ gnu/packages/bootstrap/x86_64-linux/xz
dist_bootstrap_i686_linux_DATA = \
- distro/packages/bootstrap/i686-linux/bash \
- distro/packages/bootstrap/i686-linux/mkdir \
- distro/packages/bootstrap/i686-linux/tar \
- distro/packages/bootstrap/i686-linux/xz
+ gnu/packages/bootstrap/i686-linux/bash \
+ gnu/packages/bootstrap/i686-linux/mkdir \
+ gnu/packages/bootstrap/i686-linux/tar \
+ gnu/packages/bootstrap/i686-linux/xz
# Big bootstrap binaries are not included in the tarball. Instead, they
# are downloaded.
nodist_bootstrap_x86_64_linux_DATA = \
- distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
+ gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
nodist_bootstrap_i686_linux_DATA = \
- distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
+ gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
# Those files must remain executable, so they remain executable once
# imported into the store.
@@ 193,10 193,10 @@ DOWNLOAD_FILE = \
$(GUILE) --no-auto-compile -L "$(top_builddir)" -L "$(top_srcdir)" \
"$(top_srcdir)/build-aux/download.scm"
-distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz:
+gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz:
$(MKDIR_P) `dirname "$@"`
$(DOWNLOAD_FILE) "$@" "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c"
-distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz:
+gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz:
$(MKDIR_P) `dirname "$@"`
$(DOWNLOAD_FILE) "$@" "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c"
M distro.scm => distro.scm +5 -5
@@ 1,5 1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ 47,12 47,12 @@
(define %patch-path
(make-parameter
- (map (cut string-append <> "/distro/packages/patches")
+ (map (cut string-append <> "/gnu/packages/patches")
%load-path)))
(define %bootstrap-binaries-path
(make-parameter
- (map (cut string-append <> "/distro/packages/bootstrap")
+ (map (cut string-append <> "/gnu/packages/bootstrap")
%load-path)))
(define (search-patch file-name)
@@ 65,9 65,9 @@
(string-append system "/" file-name)))
(define %distro-module-directory
- ;; Absolute path of the (distro ...) module root.
+ ;; Absolute path of the (gnu packages ...) module root.
(string-append (dirname (search-path %load-path "distro.scm"))
- "/distro/packages"))
+ "/gnu/packages"))
(define (package-files)
"Return the list of files that implement distro modules."
R distro/packages/acl.scm => gnu/packages/acl.scm +4 -4
@@ 16,11 16,11 @@
;;; 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 packages acl)
+(define-module (gnu packages acl)
#:use-module (guix licenses)
- #:use-module (distro packages attr)
- #:use-module (distro packages perl)
- #:use-module ((distro packages gettext)
+ #:use-module (gnu packages attr)
+ #:use-module (gnu packages perl)
+ #:use-module ((gnu packages gettext)
#:renamer (symbol-prefix-proc 'guix:))
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/algebra.scm => gnu/packages/algebra.scm +5 -5
@@ 17,12 17,12 @@
;;; 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 packages algebra)
+(define-module (gnu packages algebra)
#:use-module (distro)
- #:use-module (distro packages multiprecision)
- #:use-module (distro packages perl)
- #:use-module (distro packages readline)
- #:use-module (distro packages flex)
+ #:use-module (gnu packages multiprecision)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages readline)
+ #:use-module (gnu packages flex)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/aspell.scm => gnu/packages/aspell.scm +2 -2
@@ 16,12 16,12 @@
;;; 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 packages aspell)
+(define-module (gnu packages aspell)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix licenses)
- #:use-module (distro packages perl))
+ #:use-module (gnu packages perl))
(define-public aspell
(package
R distro/packages/attr.scm => gnu/packages/attr.scm +3 -3
@@ 17,10 17,10 @@
;;; 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 packages attr)
+(define-module (gnu packages attr)
#:use-module (guix licenses)
- #:use-module (distro packages perl)
- #:use-module ((distro packages gettext)
+ #:use-module (gnu packages perl)
+ #:use-module ((gnu packages gettext)
#:renamer (symbol-prefix-proc 'guix:))
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/autotools.scm => gnu/packages/autotools.scm +3 -3
@@ 17,11 17,11 @@
;;; 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 packages autotools)
+(define-module (gnu packages autotools)
#:use-module (guix licenses)
#:use-module (distro)
- #:use-module (distro packages perl)
- #:use-module (distro packages m4)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages m4)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))
R distro/packages/base.scm => gnu/packages/base.scm +11 -11
@@ 17,18 17,18 @@
;;; 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 packages base)
+(define-module (gnu packages base)
#:use-module (guix licenses)
#:use-module (distro)
- #:use-module (distro packages acl)
- #:use-module (distro packages bash)
- #:use-module (distro packages bootstrap)
- #:use-module (distro packages compression)
- #:use-module (distro packages gawk)
- #:use-module (distro packages guile)
- #:use-module (distro packages multiprecision)
- #:use-module (distro packages perl)
- #:use-module (distro packages linux)
+ #:use-module (gnu packages acl)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages bootstrap)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages gawk)
+ #:use-module (gnu packages guile)
+ #:use-module (gnu packages multiprecision)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages linux)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
@@ 978,7 978,7 @@ exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
("guile" ,%bootstrap-guile)
("bash" ,@(assoc-ref %boot2-inputs "bash"))
("wrapper" ,(search-path %load-path
- "distro/packages/ld-wrapper.scm"))))
+ "gnu/packages/ld-wrapper.scm"))))
(arguments
`(#:guile ,%bootstrap-guile
#:modules ((guix build utils))
R distro/packages/bash.scm => gnu/packages/bash.scm +3 -3
@@ 16,10 16,10 @@
;;; 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 packages bash)
+(define-module (gnu packages bash)
#:use-module (guix licenses)
- #:use-module (distro packages ncurses)
- #:use-module (distro packages readline)
+ #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages readline)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
R distro/packages/bdb.scm => gnu/packages/bdb.scm +1 -1
@@ 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 packages bdb)
+(define-module (gnu packages bdb)
#:use-module (distro)
#:use-module (guix licenses)
#:use-module (guix packages)
R distro/packages/bdw-gc.scm => gnu/packages/bdw-gc.scm +1 -1
@@ 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 packages bdw-gc)
+(define-module (gnu packages bdw-gc)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/bison.scm => gnu/packages/bison.scm +3 -3
@@ 16,13 16,13 @@
;;; 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 packages bison)
+(define-module (gnu packages bison)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module (distro packages m4)
- #:use-module (distro packages perl))
+ #:use-module (gnu packages m4)
+ #:use-module (gnu packages perl))
(define-public bison
(package
R distro/packages/bootstrap.scm => gnu/packages/bootstrap.scm +1 -1
@@ 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 packages bootstrap)
+(define-module (gnu packages bootstrap)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (guix packages)
R distro/packages/bootstrap/i686-linux/bash => gnu/packages/bootstrap/i686-linux/bash +0 -0
R distro/packages/bootstrap/i686-linux/mkdir => gnu/packages/bootstrap/i686-linux/mkdir +0 -0
R distro/packages/bootstrap/i686-linux/tar => gnu/packages/bootstrap/i686-linux/tar +0 -0
R distro/packages/bootstrap/i686-linux/xz => gnu/packages/bootstrap/i686-linux/xz +0 -0
R distro/packages/bootstrap/x86_64-linux/bash => gnu/packages/bootstrap/x86_64-linux/bash +0 -0
R distro/packages/bootstrap/x86_64-linux/mkdir => gnu/packages/bootstrap/x86_64-linux/mkdir +0 -0
R distro/packages/bootstrap/x86_64-linux/tar => gnu/packages/bootstrap/x86_64-linux/tar +0 -0
R distro/packages/bootstrap/x86_64-linux/xz => gnu/packages/bootstrap/x86_64-linux/xz +0 -0
R distro/packages/check.scm => gnu/packages/check.scm +1 -1
@@ 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 packages check)
+(define-module (gnu packages check)
#:use-module (distro)
#:use-module (guix licenses)
#:use-module (guix packages)
R distro/packages/compression.scm => gnu/packages/compression.scm +1 -1
@@ 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 packages compression)
+(define-module (gnu packages compression)
#:use-module ((guix licenses)
#:renamer (symbol-prefix-proc 'license:))
#:use-module (guix packages)
R distro/packages/cpio.scm => gnu/packages/cpio.scm +1 -1
@@ 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 packages cpio)
+(define-module (gnu packages cpio)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (guix packages)
R distro/packages/cyrus-sasl.scm => gnu/packages/cyrus-sasl.scm +4 -4
@@ 17,11 17,11 @@
;;; 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 packages cyrus-sasl)
+(define-module (gnu packages cyrus-sasl)
#:use-module (distro)
- #:use-module (distro packages gdbm)
- #:use-module (distro packages mit-krb5)
- #:use-module (distro packages openssl)
+ #:use-module (gnu packages gdbm)
+ #:use-module (gnu packages mit-krb5)
+ #:use-module (gnu packages openssl)
#:use-module ((guix licenses)
#:renamer (symbol-prefix-proc 'license:))
#:use-module (guix packages)
R distro/packages/ddrescue.scm => gnu/packages/ddrescue.scm +1 -1
@@ 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 packages ddrescue)
+(define-module (gnu packages ddrescue)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/dejagnu.scm => gnu/packages/dejagnu.scm +2 -2
@@ 16,12 16,12 @@
;;; 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 packages dejagnu)
+(define-module (gnu packages dejagnu)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix licenses)
- #:use-module (distro packages tcl))
+ #:use-module (gnu packages tcl))
(define-public dejagnu
(package
R distro/packages/ed.scm => gnu/packages/ed.scm +1 -1
@@ 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 packages ed)
+(define-module (gnu packages ed)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/emacs.scm => gnu/packages/emacs.scm +5 -5
@@ 16,16 16,16 @@
;;; 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 packages emacs)
+(define-module (gnu packages emacs)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (distro)
- #:use-module (distro packages ncurses)
- #:use-module (distro packages texinfo)
- #:use-module (distro packages gnutls)
- #:use-module (distro packages pkg-config))
+ #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages texinfo)
+ #:use-module (gnu packages gnutls)
+ #:use-module (gnu packages pkg-config))
(define-public emacs
(package
R distro/packages/file.scm => gnu/packages/file.scm +1 -1
@@ 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 packages file)
+(define-module (gnu packages file)
#:use-module (distro)
#:use-module (guix licenses)
#:use-module (guix packages)
R distro/packages/flex.scm => gnu/packages/flex.scm +4 -4
@@ 16,15 16,15 @@
;;; 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 packages flex)
+(define-module (gnu packages flex)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (distro)
- #:use-module (distro packages m4)
- #:use-module (distro packages bison)
- #:use-module (distro packages indent))
+ #:use-module (gnu packages m4)
+ #:use-module (gnu packages bison)
+ #:use-module (gnu packages indent))
(define-public flex
(package
R distro/packages/gawk.scm => gnu/packages/gawk.scm +2 -2
@@ 16,9 16,9 @@
;;; 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 packages gawk)
+(define-module (gnu packages gawk)
#:use-module (guix licenses)
- #:use-module (distro packages libsigsegv)
+ #:use-module (gnu packages libsigsegv)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
R distro/packages/gdb.scm => gnu/packages/gdb.scm +8 -8
@@ 16,14 16,14 @@
;;; 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 packages gdb)
- #:use-module (distro packages ncurses)
- #:use-module (distro packages readline)
- #:use-module (distro packages dejagnu)
- #:use-module (distro packages texinfo)
- #:use-module (distro packages multiprecision)
- #:use-module (distro packages xml)
- #:use-module (distro packages python)
+(define-module (gnu packages gdb)
+ #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages readline)
+ #:use-module (gnu packages dejagnu)
+ #:use-module (gnu packages texinfo)
+ #:use-module (gnu packages multiprecision)
+ #:use-module (gnu packages xml)
+ #:use-module (gnu packages python)
#:use-module ((guix licenses) #:select (gpl3+))
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/gdbm.scm => gnu/packages/gdbm.scm +1 -1
@@ 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 packages gdbm)
+(define-module (gnu packages gdbm)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/gettext.scm => gnu/packages/gettext.scm +1 -1
@@ 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 packages gettext)
+(define-module (gnu packages gettext)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (guix packages)
R distro/packages/global.scm => gnu/packages/global.scm +3 -3
@@ 16,13 16,13 @@
;;; 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 packages global)
+(define-module (gnu packages global)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix licenses)
- #:use-module (distro packages ncurses)
- #:use-module (distro packages autotools)
+ #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages autotools)
#:use-module (distro))
(define-public global ; a global variable
R distro/packages/gnupg.scm => gnu/packages/gnupg.scm +4 -4
@@ 16,11 16,11 @@
;;; 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 packages gnupg)
+(define-module (gnu packages gnupg)
#:use-module (guix licenses)
- #:use-module (distro packages pth)
- #:use-module (distro packages readline)
- #:use-module ((distro packages compression)
+ #:use-module (gnu packages pth)
+ #:use-module (gnu packages readline)
+ #:use-module ((gnu packages compression)
#:renamer (symbol-prefix-proc 'guix:))
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/gnutls.scm => gnu/packages/gnutls.scm +7 -7
@@ 16,18 16,18 @@
;;; 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 packages gnutls)
+(define-module (gnu packages gnutls)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module (distro packages base)
- #:use-module ((distro packages compression)
+ #:use-module (gnu packages base)
+ #:use-module ((gnu packages compression)
#:renamer (symbol-prefix-proc 'guix:))
- #:use-module (distro packages nettle)
- #:use-module (distro packages guile)
- #:use-module (distro packages perl)
- #:use-module (distro packages which))
+ #:use-module (gnu packages nettle)
+ #:use-module (gnu packages guile)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages which))
(define-public libtasn1
(package
R distro/packages/gperf.scm => gnu/packages/gperf.scm +1 -1
@@ 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 packages gperf)
+(define-module (gnu packages gperf)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/gsasl.scm => gnu/packages/gsasl.scm +6 -6
@@ 16,14 16,14 @@
;;; 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 packages gsasl)
+(define-module (gnu packages gsasl)
#:use-module (distro)
- #:use-module ((distro packages compression)
+ #:use-module ((gnu packages compression)
#:renamer (symbol-prefix-proc 'guix:))
- #:use-module (distro packages gnutls)
- #:use-module (distro packages libidn)
- #:use-module (distro packages nettle)
- #:use-module (distro packages shishi)
+ #:use-module (gnu packages gnutls)
+ #:use-module (gnu packages libidn)
+ #:use-module (gnu packages nettle)
+ #:use-module (gnu packages shishi)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/guile.scm => gnu/packages/guile.scm +11 -11
@@ 16,19 16,19 @@
;;; 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 packages guile)
+(define-module (gnu packages guile)
#:use-module (guix licenses)
#:use-module (distro)
- #:use-module (distro packages bdw-gc)
- #:use-module (distro packages gawk)
- #:use-module (distro packages gperf)
- #:use-module (distro packages libffi)
- #:use-module (distro packages autotools)
- #:use-module (distro packages libunistring)
- #:use-module (distro packages m4)
- #:use-module (distro packages multiprecision)
- #:use-module (distro packages pkg-config)
- #:use-module (distro packages readline)
+ #:use-module (gnu packages bdw-gc)
+ #:use-module (gnu packages gawk)
+ #:use-module (gnu packages gperf)
+ #:use-module (gnu packages libffi)
+ #:use-module (gnu packages autotools)
+ #:use-module (gnu packages libunistring)
+ #:use-module (gnu packages m4)
+ #:use-module (gnu packages multiprecision)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages readline)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))
R distro/packages/help2man.scm => gnu/packages/help2man.scm +2 -2
@@ 16,12 16,12 @@
;;; 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 packages help2man)
+(define-module (gnu packages help2man)
#:use-module (guix licenses)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module (guix build-system gnu)
- #:use-module (distro packages perl))
+ #:use-module (gnu packages perl))
(define-public help2man
(package
R distro/packages/icu4c.scm => gnu/packages/icu4c.scm +2 -2
@@ 16,9 16,9 @@
;;; 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 packages icu4c)
+(define-module (gnu packages icu4c)
#:use-module (distro)
- #:use-module (distro packages perl)
+ #:use-module (gnu packages perl)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/idutils.scm => gnu/packages/idutils.scm +1 -1
@@ 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 packages idutils)
+(define-module (gnu packages idutils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
R distro/packages/indent.scm => gnu/packages/indent.scm +1 -1
@@ 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 packages indent)
+(define-module (gnu packages indent)
#:use-module (distro)
#:use-module (guix licenses)
#:use-module (guix packages)
R distro/packages/ld-wrapper.scm => gnu/packages/ld-wrapper.scm +0 -0
R distro/packages/less.scm => gnu/packages/less.scm +2 -2
@@ 16,9 16,9 @@
;;; 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 packages less)
+(define-module (gnu packages less)
#:use-module (guix licenses)
- #:use-module (distro packages ncurses)
+ #:use-module (gnu packages ncurses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))
R distro/packages/libffi.scm => gnu/packages/libffi.scm +1 -1
@@ 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 packages libffi)
+(define-module (gnu packages libffi)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/libidn.scm => gnu/packages/libidn.scm +1 -1
@@ 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 packages libidn)
+(define-module (gnu packages libidn)
#:use-module (distro)
#:use-module (guix licenses)
#:use-module (guix packages)
R distro/packages/libjpeg.scm => gnu/packages/libjpeg.scm +1 -1
@@ 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 packages libjpeg)
+(define-module (gnu packages libjpeg)
#:use-module (distro)
#:use-module (guix licenses)
#:use-module (guix packages)
R distro/packages/libsigsegv.scm => gnu/packages/libsigsegv.scm +1 -1
@@ 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 packages libsigsegv)
+(define-module (gnu packages libsigsegv)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/libtiff.scm => gnu/packages/libtiff.scm +3 -3
@@ 16,10 16,10 @@
;;; 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 packages libtiff)
+(define-module (gnu packages libtiff)
#:use-module (distro)
- #:use-module (distro packages file)
- #:use-module (distro packages libjpeg)
+ #:use-module (gnu packages file)
+ #:use-module (gnu packages libjpeg)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/libunistring.scm => gnu/packages/libunistring.scm +1 -1
@@ 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 packages libunistring)
+(define-module (gnu packages libunistring)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/libusb.scm => gnu/packages/libusb.scm +1 -1
@@ 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 packages libusb)
+(define-module (gnu packages libusb)
#:use-module (distro)
#:use-module (guix licenses)
#:use-module (guix packages)
R distro/packages/linux.scm => gnu/packages/linux.scm +7 -7
@@ 17,16 17,16 @@
;;; 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 packages linux)
+(define-module (gnu packages linux)
#:use-module (guix licenses)
#:use-module (distro)
- #:use-module ((distro packages compression)
+ #:use-module ((gnu packages compression)
#:renamer (symbol-prefix-proc 'guix:))
- #:use-module (distro packages flex)
- #:use-module (distro packages libusb)
- #:use-module (distro packages ncurses)
- #:use-module (distro packages perl)
- #:use-module (distro packages pkg-config)
+ #:use-module (gnu packages flex)
+ #:use-module (gnu packages libusb)
+ #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))
R distro/packages/lout.scm => gnu/packages/lout.scm +1 -1
@@ 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 packages lout)
+(define-module (gnu packages lout)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/lsh.scm => gnu/packages/lsh.scm +8 -8
@@ 16,20 16,20 @@
;;; 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 packages lsh)
+(define-module (gnu packages lsh)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (distro)
- #:use-module (distro packages m4)
- #:use-module (distro packages linux)
- #:use-module ((distro packages compression)
+ #:use-module (gnu packages m4)
+ #:use-module (gnu packages linux)
+ #:use-module ((gnu packages compression)
#:renamer (symbol-prefix-proc 'guix:))
- #:use-module (distro packages multiprecision)
- #:use-module (distro packages readline)
- #:use-module (distro packages gperf)
- #:use-module (distro packages base))
+ #:use-module (gnu packages multiprecision)
+ #:use-module (gnu packages readline)
+ #:use-module (gnu packages gperf)
+ #:use-module (gnu packages base))
(define-public liboop
(package
R distro/packages/m4.scm => gnu/packages/m4.scm +1 -1
@@ 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 packages m4)
+(define-module (gnu packages m4)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (guix packages)
R distro/packages/mailutils.scm => gnu/packages/mailutils.scm +12 -12
@@ 16,19 16,19 @@
;;; 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 packages mailutils)
+(define-module (gnu packages mailutils)
#:use-module (distro)
- #:use-module (distro packages linux)
- #:use-module (distro packages gnutls)
- #:use-module (distro packages gdbm)
- #:use-module (distro packages guile)
- #:use-module (distro packages ncurses)
- #:use-module (distro packages readline)
- #:use-module (distro packages dejagnu)
- #:use-module (distro packages m4)
- #:use-module (distro packages texinfo)
- #:use-module (distro packages mysql)
- #:use-module (distro packages autotools)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages gnutls)
+ #:use-module (gnu packages gdbm)
+ #:use-module (gnu packages guile)
+ #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages readline)
+ #:use-module (gnu packages dejagnu)
+ #:use-module (gnu packages m4)
+ #:use-module (gnu packages texinfo)
+ #:use-module (gnu packages mysql)
+ #:use-module (gnu packages autotools)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/make-bootstrap.scm => gnu/packages/make-bootstrap.scm +9 -9
@@ 16,20 16,20 @@
;;; 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 packages make-bootstrap)
+(define-module (gnu packages make-bootstrap)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix licenses)
#:use-module (guix build-system trivial)
#:use-module (guix build-system gnu)
#:use-module ((distro) #:select (search-patch))
- #:use-module (distro packages base)
- #:use-module (distro packages bash)
- #:use-module (distro packages compression)
- #:use-module (distro packages gawk)
- #:use-module (distro packages guile)
- #:use-module (distro packages linux)
- #:use-module (distro packages multiprecision)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages gawk)
+ #:use-module (gnu packages guile)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages multiprecision)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:export (%bootstrap-binaries-tarball
@@ 42,7 42,7 @@
;;; Commentary:
;;;
;;; This modules provides tools to build tarballs of the "bootstrap binaries"
-;;; used in (distro packages bootstrap). These statically-linked binaries are
+;;; used in (gnu packages bootstrap). These statically-linked binaries are
;;; taken for granted and used as the root of the whole bootstrap procedure.
;;;
;;; Code:
R distro/packages/mit-krb5.scm => gnu/packages/mit-krb5.scm +3 -3
@@ 16,10 16,10 @@
;;; 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 packages mit-krb5)
+(define-module (gnu packages mit-krb5)
#:use-module (distro)
- #:use-module (distro packages bison)
- #:use-module (distro packages perl)
+ #:use-module (gnu packages bison)
+ #:use-module (gnu packages perl)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/multiprecision.scm => gnu/packages/multiprecision.scm +2 -2
@@ 16,10 16,10 @@
;;; 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 packages multiprecision)
+(define-module (gnu packages multiprecision)
#:use-module (guix licenses)
#:use-module (distro)
- #:use-module (distro packages m4)
+ #:use-module (gnu packages m4)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
R distro/packages/mysql.scm => gnu/packages/mysql.scm +6 -6
@@ 16,13 16,13 @@
;;; 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 packages mysql)
+(define-module (gnu packages mysql)
#:use-module (distro)
- #:use-module (distro packages perl)
- #:use-module (distro packages linux)
- #:use-module (distro packages openssl)
- #:use-module (distro packages compression)
- #:use-module (distro packages ncurses)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages openssl)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages ncurses)
#:use-module ((guix licenses) #:select (gpl2))
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/nano.scm => gnu/packages/nano.scm +3 -3
@@ 16,11 16,11 @@
;;; 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 packages nano)
+(define-module (gnu packages nano)
#:use-module (guix licenses)
- #:use-module ((distro packages gettext)
+ #:use-module ((gnu packages gettext)
#:renamer (symbol-prefix-proc 'guix:))
- #:use-module (distro packages ncurses)
+ #:use-module (gnu packages ncurses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))
R distro/packages/ncurses.scm => gnu/packages/ncurses.scm +1 -1
@@ 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 packages ncurses)
+(define-module (gnu packages ncurses)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/nettle.scm => gnu/packages/nettle.scm +3 -3
@@ 16,13 16,13 @@
;;; 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 packages nettle)
+(define-module (gnu packages nettle)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module (distro packages multiprecision)
- #:use-module (distro packages m4))
+ #:use-module (gnu packages multiprecision)
+ #:use-module (gnu packages m4))
(define-public nettle
(package
R distro/packages/openssl.scm => gnu/packages/openssl.scm +2 -2
@@ 16,9 16,9 @@
;;; 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 packages openssl)
+(define-module (gnu packages openssl)
#:use-module (distro)
- #:use-module (distro packages perl)
+ #:use-module (gnu packages perl)
#:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/patches/bigloo-gc-shebangs.patch => gnu/packages/patches/bigloo-gc-shebangs.patch +0 -0
R distro/packages/patches/binutils-ld-new-dtags.patch => gnu/packages/patches/binutils-ld-new-dtags.patch +0 -0
R distro/packages/patches/cpio-gets-undeclared.patch => gnu/packages/patches/cpio-gets-undeclared.patch +0 -0
R distro/packages/patches/diffutils-gets-undeclared.patch => gnu/packages/patches/diffutils-gets-undeclared.patch +0 -0
R distro/packages/patches/emacs-configure-sh.patch => gnu/packages/patches/emacs-configure-sh.patch +0 -0
R distro/packages/patches/findutils-absolute-paths.patch => gnu/packages/patches/findutils-absolute-paths.patch +0 -0
R distro/packages/patches/flex-bison-tests.patch => gnu/packages/patches/flex-bison-tests.patch +0 -0
R distro/packages/patches/gawk-shell.patch => gnu/packages/patches/gawk-shell.patch +0 -0
R distro/packages/patches/gettext-gets-undeclared.patch => gnu/packages/patches/gettext-gets-undeclared.patch +0 -0
R distro/packages/patches/glibc-bootstrap-system.patch => gnu/packages/patches/glibc-bootstrap-system.patch +0 -0
R distro/packages/patches/glibc-no-ld-so-cache.patch => gnu/packages/patches/glibc-no-ld-so-cache.patch +0 -0
R distro/packages/patches/guile-1.8-cpp-4.5.patch => gnu/packages/patches/guile-1.8-cpp-4.5.patch +0 -0
R distro/packages/patches/guile-default-utf8.patch => gnu/packages/patches/guile-default-utf8.patch +0 -0
R distro/packages/patches/guile-relocatable.patch => gnu/packages/patches/guile-relocatable.patch +0 -0
R distro/packages/patches/libtool-skip-tests.patch => gnu/packages/patches/libtool-skip-tests.patch +0 -0
R distro/packages/patches/lsh-guile-compat.patch => gnu/packages/patches/lsh-guile-compat.patch +0 -0
R distro/packages/patches/lsh-no-root-login.patch => gnu/packages/patches/lsh-no-root-login.patch +0 -0
R distro/packages/patches/lsh-pam-service-name.patch => gnu/packages/patches/lsh-pam-service-name.patch +0 -0
R distro/packages/patches/m4-gets-undeclared.patch => gnu/packages/patches/m4-gets-undeclared.patch +0 -0
R distro/packages/patches/m4-readlink-EINVAL.patch => gnu/packages/patches/m4-readlink-EINVAL.patch +0 -0
R distro/packages/patches/m4-s_isdir.patch => gnu/packages/patches/m4-s_isdir.patch +0 -0
R distro/packages/patches/make-impure-dirs.patch => gnu/packages/patches/make-impure-dirs.patch +0 -0
R distro/packages/patches/perl-no-sys-dirs.patch => gnu/packages/patches/perl-no-sys-dirs.patch +0 -0
R distro/packages/patches/procps-make-3.82.patch => gnu/packages/patches/procps-make-3.82.patch +0 -0
R distro/packages/patches/readline-link-ncurses.patch => gnu/packages/patches/readline-link-ncurses.patch +0 -0
R distro/packages/patches/shishi-gets-undeclared.patch => gnu/packages/patches/shishi-gets-undeclared.patch +0 -0
R distro/packages/patches/tar-gets-undeclared.patch => gnu/packages/patches/tar-gets-undeclared.patch +0 -0
R distro/packages/perl.scm => gnu/packages/perl.scm +1 -1
@@ 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 packages perl)
+(define-module (gnu packages perl)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (guix packages)
R distro/packages/pkg-config.scm => gnu/packages/pkg-config.scm +1 -1
@@ 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 packages pkg-config)
+(define-module (gnu packages pkg-config)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/pth.scm => gnu/packages/pth.scm +1 -1
@@ 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 packages pth)
+(define-module (gnu packages pth)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/python.scm => gnu/packages/python.scm +4 -4
@@ 17,11 17,11 @@
;;; 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 packages python)
+(define-module (gnu packages python)
#:use-module ((guix licenses) #:select (psfl))
- #:use-module (distro packages compression)
- #:use-module (distro packages openssl)
- #:use-module (distro packages base)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages openssl)
+ #:use-module (gnu packages base)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))
R distro/packages/readline.scm => gnu/packages/readline.scm +2 -2
@@ 16,10 16,10 @@
;;; 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 packages readline)
+(define-module (gnu packages readline)
#:use-module (guix licenses)
#:use-module (distro)
- #:use-module (distro packages ncurses)
+ #:use-module (gnu packages ncurses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
R distro/packages/recutils.scm => gnu/packages/recutils.scm +4 -4
@@ 16,16 16,16 @@
;;; 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 packages recutils)
+(define-module (gnu packages recutils)
#:use-module (guix licenses)
#:use-module (distro)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
- #:use-module (distro packages emacs)
- #:use-module (distro packages check)
- #:use-module (distro packages algebra))
+ #:use-module (gnu packages emacs)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages algebra))
(define-public recutils
(package
R distro/packages/rsync.scm => gnu/packages/rsync.scm +3 -3
@@ 16,10 16,10 @@
;;; 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 packages rsync)
+(define-module (gnu packages rsync)
#:use-module (distro)
- #:use-module (distro packages perl)
- #:use-module (distro packages acl)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages acl)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/scheme.scm => gnu/packages/scheme.scm +5 -5
@@ 16,16 16,16 @@
;;; 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 packages scheme)
+(define-module (gnu packages scheme)
#:use-module (distro)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module (distro packages m4)
- #:use-module (distro packages multiprecision)
- #:use-module (distro packages emacs)
- #:use-module (distro packages texinfo)
+ #:use-module (gnu packages m4)
+ #:use-module (gnu packages multiprecision)
+ #:use-module (gnu packages emacs)
+ #:use-module (gnu packages texinfo)
#:use-module (ice-9 match))
(define-public mit-scheme
R distro/packages/shishi.scm => gnu/packages/shishi.scm +4 -4
@@ 17,12 17,12 @@
;;; 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 packages shishi)
+(define-module (gnu packages shishi)
#:use-module (guix licenses)
#:use-module (distro)
- #:use-module (distro packages gnutls)
- #:use-module (distro packages gnupg)
- #:use-module ((distro packages compression)
+ #:use-module (gnu packages gnutls)
+ #:use-module (gnu packages gnupg)
+ #:use-module ((gnu packages compression)
#:renamer (symbol-prefix-proc 'guix:))
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/system.scm => gnu/packages/system.scm +2 -2
@@ 16,13 16,13 @@
;;; 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 packages system)
+(define-module (gnu packages system)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (distro)
- #:use-module (distro packages ncurses))
+ #:use-module (gnu packages ncurses))
(define-public pies
(package
R distro/packages/tcl.scm => gnu/packages/tcl.scm +1 -1
@@ 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 packages tcl)
+(define-module (gnu packages tcl)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
R distro/packages/texinfo.scm => gnu/packages/texinfo.scm +3 -3
@@ 16,13 16,13 @@
;;; 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 packages texinfo)
+(define-module (gnu packages texinfo)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module (distro packages compression)
- #:use-module (distro packages ncurses))
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages ncurses))
(define-public texinfo
(package
R distro/packages/time.scm => gnu/packages/time.scm +1 -1
@@ 17,7 17,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 packages time)
+(define-module (gnu packages time)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/wget.scm => gnu/packages/wget.scm +4 -4
@@ 16,12 16,12 @@
;;; 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 packages wget)
+(define-module (gnu packages wget)
#:use-module (guix licenses)
- #:use-module ((distro packages gettext)
+ #:use-module ((gnu packages gettext)
#:renamer (symbol-prefix-proc 'guix:))
- #:use-module (distro packages gnutls)
- #:use-module (distro packages perl)
+ #:use-module (gnu packages gnutls)
+ #:use-module (gnu packages perl)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))
R distro/packages/which.scm => gnu/packages/which.scm +1 -1
@@ 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 packages which)
+(define-module (gnu packages which)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
R distro/packages/xml.scm => gnu/packages/xml.scm +1 -1
@@ 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 packages xml)
+(define-module (gnu packages xml)
#:use-module ((guix licenses)
#:renamer (symbol-prefix-proc 'license:))
#:use-module (guix packages)
R distro/packages/zile.scm => gnu/packages/zile.scm +5 -5
@@ 16,15 16,15 @@
;;; 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 packages zile)
+(define-module (gnu packages zile)
#:use-module (guix licenses)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module (guix build-system gnu)
- #:use-module (distro packages bdw-gc)
- #:use-module (distro packages perl)
- #:use-module (distro packages help2man)
- #:use-module (distro packages ncurses))
+ #:use-module (gnu packages bdw-gc)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages help2man)
+ #:use-module (gnu packages ncurses))
(define-public zile
(package
M guix-package.in => guix-package.in +2 -2
@@ 48,8 48,8 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-37)
#:use-module (distro)
- #:use-module ((distro packages base) #:select (guile-final))
- #:use-module ((distro packages bootstrap) #:select (%bootstrap-guile))
+ #:use-module ((gnu packages base) #:select (guile-final))
+ #:use-module ((gnu packages bootstrap) #:select (%bootstrap-guile))
#:export (guix-package))
(define %store
M guix/build-system/gnu.scm => guix/build-system/gnu.scm +3 -3
@@ 159,8 159,8 @@ System: GCC, GNU Make, Bash, Coreutils, etc."
(z
(error "invalid standard input" z)))
- ;; Resolve (distro packages base) lazily to hide circular dependency.
- (let* ((distro (resolve-module '(distro packages base)))
+ ;; Resolve (gnu packages base) lazily to hide circular dependency.
+ (let* ((distro (resolve-module '(gnu packages base)))
(inputs (module-ref distro '%final-inputs)))
(append inputs
(append-map (match-lambda
@@ 233,7 233,7 @@ which could lead to gratuitous input divergence."
((and (? string?) (? derivation-path?))
guile)
(#f ; the default
- (let* ((distro (resolve-interface '(distro packages base)))
+ (let* ((distro (resolve-interface '(gnu packages base)))
(guile (module-ref distro 'guile-final)))
(package-derivation store guile system)))))
M guix/build-system/trivial.scm => guix/build-system/trivial.scm +1 -1
@@ 36,7 36,7 @@ ignored."
((and (? string?) (? derivation-path?))
guile)
(#f ; the default
- (let* ((distro (resolve-interface '(distro packages base)))
+ (let* ((distro (resolve-interface '(gnu packages base)))
(guile (module-ref distro 'guile-final)))
(package-derivation store guile system)))))
M guix/download.scm => guix/download.scm +1 -1
@@ 118,7 118,7 @@ must be a list of symbol/URL-list pairs."
((and (? string?) (? derivation-path?))
guile)
(#f ; the default
- (let* ((distro (resolve-interface '(distro packages base)))
+ (let* ((distro (resolve-interface '(gnu packages base)))
(guile (module-ref distro 'guile-final)))
(package-derivation store guile system)))))
M hydra.scm => hydra.scm +2 -2
@@ 25,8 25,8 @@
(guix packages)
((guix utils) #:select (%current-system))
(distro)
- (distro packages base)
- (distro packages guile)
+ (gnu packages base)
+ (gnu packages guile)
(srfi srfi-1)
(srfi srfi-26)
(ice-9 match))
M po/POTFILES.in => po/POTFILES.in +4 -4
@@ 1,9 1,9 @@
# List of source files which contain translatable strings.
distro.scm
-distro/packages/base.scm
-distro/packages/guile.scm
-distro/packages/lout.scm
-distro/packages/recutils.scm
+gnu/packages/base.scm
+gnu/packages/guile.scm
+gnu/packages/lout.scm
+gnu/packages/recutils.scm
guix/ui.scm
guix-build.in
guix-download.in
M tests/builders.scm => tests/builders.scm +2 -2
@@ 26,7 26,7 @@
#:use-module (guix base32)
#:use-module (guix derivations)
#:use-module ((guix packages) #:select (package-derivation))
- #:use-module (distro packages bootstrap)
+ #:use-module (gnu packages bootstrap)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-64))
@@ 48,7 48,7 @@
(map (match-lambda
((name package)
(list name (package-derivation %store package))))
- (@@ (distro packages base) %boot0-inputs))))
+ (@@ (gnu packages base) %boot0-inputs))))
(define network-reachable?
(false-if-exception (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)))
M tests/derivations.scm => tests/derivations.scm +1 -1
@@ 24,7 24,7 @@
#:use-module (guix base32)
#:use-module ((guix packages) #:select (package-derivation))
#:use-module ((distro) #:select (search-bootstrap-binary))
- #:use-module (distro packages bootstrap)
+ #:use-module (gnu packages bootstrap)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-26)
M tests/guix-build.sh => tests/guix-build.sh +4 -4
@@ 27,11 27,11 @@ if guix-build -e +;
then false; else true; fi
# Should fail because this is a source-less package.
-if guix-build -e '(@ (distro packages bootstrap) %bootstrap-glibc)' -S
+if guix-build -e '(@ (gnu packages bootstrap) %bootstrap-glibc)' -S
then false; else true; fi
# Should pass.
-guix-build -e '(@@ (distro packages base) %bootstrap-guile)' | \
+guix-build -e '(@@ (gnu packages base) %bootstrap-guile)' | \
grep -e '-guile-'
guix-build hello -d | \
grep -e '-hello-[0-9\.]\+\.drv$'
@@ 42,11 42,11 @@ if guix-build hello-0.0.1 -n; then false; else true; fi
# Keep a symlink to the result, registered as a root.
result="t-result-$$"
guix-build -r "$result" \
- -e '(@@ (distro packages base) %bootstrap-guile)'
+ -e '(@@ (gnu packages base) %bootstrap-guile)'
test -x "$result/bin/guile"
# Should fail, because $result already exists.
-if guix-build -r "$result" -e '(@@ (distro packages base) %bootstrap-guile)'
+if guix-build -r "$result" -e '(@@ (gnu packages base) %bootstrap-guile)'
then false; else true; fi
rm -f "$result"
M tests/guix-daemon.sh => tests/guix-daemon.sh +1 -1
@@ 25,5 25,5 @@ set -e
guix-daemon --version
guix-build --version
-guix-build -e '(@ (distro packages bootstrap) %bootstrap-guile)'
+guix-build -e '(@ (gnu packages bootstrap) %bootstrap-guile)'
guix-build coreutils -n
M tests/guix-package.sh => tests/guix-package.sh +2 -2
@@ 32,7 32,7 @@ rm -f "$profile"
trap 'rm "$profile" "$profile-"[0-9]* ; rm -rf t-home-'"$$" EXIT
-boot_guile="`guix-build -e '(@ (distro packages bootstrap) %bootstrap-guile)'`"
+boot_guile="`guix-build -e '(@ (gnu packages bootstrap) %bootstrap-guile)'`"
guix-package --bootstrap -p "$profile" -i "$boot_guile"
test -L "$profile" && test -L "$profile-1-link"
@@ 47,7 47,7 @@ test -f "$profile/bin/guile"
# Check whether we have network access.
if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null
then
- boot_make="`guix-build -e '(@@ (distro packages base) gnu-make-boot0)'`"
+ boot_make="`guix-build -e '(@@ (gnu packages base) gnu-make-boot0)'`"
guix-package --bootstrap -p "$profile" -i "$boot_make"
test -L "$profile-2-link"
test -f "$profile/bin/make" && test -f "$profile/bin/guile"
M tests/packages.scm => tests/packages.scm +3 -3
@@ 25,8 25,8 @@
#:use-module (guix build-system trivial)
#:use-module (guix build-system gnu)
#:use-module (distro)
- #:use-module (distro packages base)
- #:use-module (distro packages bootstrap)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages bootstrap)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-64)
#:use-module (rnrs io ports)
@@ 130,7 130,7 @@
(test-assert "GNU Make, bootstrap"
;; GNU Make is the first program built during bootstrap; we choose it
;; here so that the test doesn't last for too long.
- (let ((gnu-make (@@ (distro packages base) gnu-make-boot0)))
+ (let ((gnu-make (@@ (gnu packages base) gnu-make-boot0)))
(and (package? gnu-make)
(or (location? (package-location gnu-make))
(not (package-location gnu-make)))
M tests/store.scm => tests/store.scm +1 -1
@@ 21,7 21,7 @@
#:use-module (guix store)
#:use-module (guix utils)
#:use-module (guix base32)
- #:use-module (distro packages bootstrap)
+ #:use-module (gnu packages bootstrap)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
M tests/union.scm => tests/union.scm +1 -1
@@ 25,7 25,7 @@
#:use-module (guix build union)
#:use-module ((guix build utils)
#:select (with-directory-excursion directory-exists?))
- #:use-module (distro packages bootstrap)
+ #:use-module (gnu packages bootstrap)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-64)
#:use-module (ice-9 match))