Browse Source

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

* distro/base.scm, distro/ld-wrapper.scm: Move to `distro/packages'.
  Adjust LD-WRAPPER-BOOT3 input file name accordingly.
* Makefile.am (MODULES): Adjust accordingly.
* distro.scm (%distro-module-directory): Change to "/distro/packages".
* guix/build-system/gnu.scm (standard-inputs): Change module name
  to (distro packages base).
* tests/packages.scm (test-packages): Likewise.
gn-latest-20200428
Ludovic Courtès 9 years ago
parent
commit
1f455fdca6
  1. 4
      Makefile.am
  2. 2
      distro.scm
  3. 5
      distro/packages/base.scm
  4. 4
      distro/packages/ld-wrapper.scm
  5. 4
      guix/build-system/gnu.scm
  6. 2
      tests/packages.scm

4
Makefile.am

@ -35,8 +35,8 @@ MODULES = \
guix/packages.scm \
guix.scm \
distro.scm \
distro/base.scm \
distro/ld-wrapper.scm
distro/packages/base.scm \
distro/packages/ld-wrapper.scm
GOBJECTS = $(MODULES:%.scm=%.go)

2
distro.scm

@ -48,7 +48,7 @@
(define %distro-module-directory
;; Absolute path of the (distro ...) module root.
(string-append (dirname (search-path %load-path "distro.scm"))
"/distro"))
"/distro/packages"))
(define (package-files)
"Return the list of files that implement distro modules."

5
distro/base.scm → distro/packages/base.scm

@ -16,7 +16,7 @@
;;; You should have received a copy of the GNU General Public License
;;; along with Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (distro base)
(define-module (distro packages base)
#:use-module (distro)
#:use-module (guix packages)
#:use-module (guix ftp)
@ -1676,7 +1676,8 @@ exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/lib/~a \"$@\"~%"
(build-system trivial-build-system)
(inputs `(("binutils" ,binutils-final)
("guile" ,(nixpkgs-derivation* "guile"))
("wrapper" ,(search-path %load-path "distro/ld-wrapper.scm"))))
("wrapper" ,(search-path %load-path
"distro/packages/ld-wrapper.scm"))))
(arguments
`(#:modules ((guix build utils))
#:builder (begin

4
distro/ld-wrapper.scm → distro/packages/ld-wrapper.scm

@ -7,7 +7,7 @@
# Use `load-compiled' because `load' (and `-l') doesn't otherwise load our
# .go file (see <http://bugs.gnu.org/12519>).
main="(@ (distro ld-wrapper) ld-wrapper)"
main="(@ (distro packages ld-wrapper) ld-wrapper)"
exec @GUILE@ -c "(load-compiled \"$0.go\") (apply $main (cdr (command-line)))" "$@"
!#
;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*-
@ -28,7 +28,7 @@ exec @GUILE@ -c "(load-compiled \"$0.go\") (apply $main (cdr (command-line)))" "
;;; You should have received a copy of the GNU General Public License
;;; along with Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (distro ld-wrapper)
(define-module (distro packages ld-wrapper)
#:use-module (srfi srfi-1)
#:export (ld-wrapper))

4
guix/build-system/gnu.scm

@ -87,8 +87,8 @@ System: GCC, GNU Make, Bash, Coreutils, etc."
(z
(error "invalid standard input" z)))
;; Resolve (distro base) lazily to hide circular dependency.
(let* ((distro (resolve-module '(distro base)))
;; Resolve (distro packages base) lazily to hide circular dependency.
(let* ((distro (resolve-module '(distro packages base)))
(inputs (module-ref distro '%final-inputs)))
(append inputs
(append-map (match-lambda

2
tests/packages.scm

@ -25,7 +25,7 @@
#:use-module (guix build-system trivial)
#:use-module (guix build-system gnu)
#:use-module (distro)
#:use-module (distro base)
#:use-module (distro packages base)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-64)
#:use-module (ice-9 match))

Loading…
Cancel
Save