mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-06 21:20:33 +02:00
gnu: guix: Improve style and fix tests on hurd.
This is a follow-up to f1a3bf940c, and
fixes guix/guix#1221.
* gnu/packages/package-management.scm (guix):
[arguments]: Improve style, rewrite using gexps.
<#:modules>: Add (srfi srfi-1) and (ice-9 match).
<#:phases>: Rename test/pypi.scm to test/import/pypi.scm in phase
'disable-tests/hurd. In phase 'use-host-compressors, use
search-input-file. In phase 'wrap-program, use search-input-directory
to inject dependency paths.
[native-inputs, propagated-inputs]: Improve style, remove labels.
(guix-daemon)[arguments]: Improve style, use gexps.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Nicolas Graves
committed by
Ludovic Courtès
Ludovic Courtès
parent
34ac15e813
commit
1758aca454
@@ -209,51 +209,47 @@
|
||||
(file-name (string-append "guix-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(;; For reproducibility, see <https://issues.guix.gnu.org/74204>.
|
||||
#:parallel-build? #false
|
||||
#:configure-flags (list
|
||||
|
||||
;; Provide channel metadata for 'guix describe'.
|
||||
;; Don't pass '--with-channel-url' and
|
||||
;; '--with-channel-introduction' and instead use
|
||||
;; the defaults.
|
||||
,(string-append "--with-channel-commit=" commit)
|
||||
(list
|
||||
;; For reproducibility, see <https://issues.guix.gnu.org/74204>.
|
||||
#:parallel-build? #f
|
||||
#:configure-flags
|
||||
#~(list
|
||||
;; Provide channel metadata for 'guix describe'. Don't pass
|
||||
;; '--with-channel-url' and '--with-channel-introduction' and
|
||||
;; instead use the defaults.
|
||||
#$(string-append "--with-channel-commit=" commit)
|
||||
|
||||
"--localstatedir=/var"
|
||||
"--sysconfdir=/etc"
|
||||
(string-append "--with-bash-completion-dir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/etc/bash_completion.d")
|
||||
#$output "/etc/bash_completion.d")
|
||||
(string-append "--with-apparmor-profile-dir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/etc/apparmor.d")
|
||||
#$output "/etc/apparmor.d")
|
||||
|
||||
;; Set 'DOT_USER_PROGRAM' to the empty string so
|
||||
;; we don't keep a reference to Graphviz, whose
|
||||
;; closure is pretty big (too big for the Guix
|
||||
;; system installation image.)
|
||||
;; Set 'DOT_USER_PROGRAM' to the empty string so we don't keep a
|
||||
;; reference to Graphviz, whose closure is pretty big (too big for
|
||||
;; the Guix system installation image.)
|
||||
"ac_cv_path_DOT_USER_PROGRAM=dot"
|
||||
|
||||
;; When cross-compiling, 'git' is not in $PATH
|
||||
;; (because it's not a native input). Thus,
|
||||
;; always explicitly pass its file name.
|
||||
;; When cross-compiling, 'git' is not in $PATH (because it's not a
|
||||
;; native input). Thus, always explicitly pass its file name.
|
||||
(string-append "ac_cv_path_GIT="
|
||||
(search-input-file %build-inputs
|
||||
"/bin/git"))
|
||||
(search-input-file %build-inputs "/bin/git"))
|
||||
|
||||
;; To avoid problems with the length of shebangs,
|
||||
;; choose a fixed-width and short directory name
|
||||
;; for tests.
|
||||
;; To avoid problems with the length of shebangs, choose a
|
||||
;; fixed-width and short directory name for tests.
|
||||
"ac_cv_guix_test_root=/tmp/guix-tests")
|
||||
#:parallel-tests? #f ;work around <http://bugs.gnu.org/21097>
|
||||
|
||||
#:modules ((guix build gnu-build-system)
|
||||
#:modules `((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-26)
|
||||
(srfi srfi-1)
|
||||
(ice-9 match)
|
||||
(ice-9 popen)
|
||||
(ice-9 rdelim))
|
||||
|
||||
#:phases (modify-phases %standard-phases
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'bootstrap
|
||||
(lambda _
|
||||
;; Make sure 'msgmerge' can modify the PO files.
|
||||
@@ -265,30 +261,28 @@
|
||||
|
||||
(call-with-output-file ".tarball-version"
|
||||
(lambda (port)
|
||||
(display ,version port)))
|
||||
(display #$version port)))
|
||||
|
||||
;; Install SysV init files to $(prefix)/etc rather
|
||||
;; than to /etc.
|
||||
;; Install SysV init files to $(prefix)/etc rather than /etc.
|
||||
(substitute* "nix/local.mk"
|
||||
(("^sysvinitservicedir = .*$")
|
||||
(string-append "sysvinitservicedir = \
|
||||
$(prefix)/etc/init.d\n")))
|
||||
|
||||
;; Install OpenRC init files to $(prefix)/etc rather
|
||||
;; than to /etc.
|
||||
;; Install OpenRC init files to $(prefix)/etc rather than /etc.
|
||||
(substitute* "nix/local.mk"
|
||||
(("^openrcservicedir = .*$")
|
||||
(string-append "openrcservicedir = \
|
||||
$(prefix)/etc/openrc\n")))
|
||||
|
||||
(invoke "sh" "bootstrap")))
|
||||
,@(if (target-riscv64?)
|
||||
#$@(if (target-riscv64?)
|
||||
`((add-after 'unpack 'use-correct-guile-version-for-tests
|
||||
(lambda _
|
||||
(substitute* "tests/gexp.scm"
|
||||
(("2\\.0") "3.0")))))
|
||||
'())
|
||||
,@(if (system-hurd?)
|
||||
#$@(if (system-hurd?)
|
||||
`((add-after 'unpack 'disable-tests/hurd
|
||||
(lambda _
|
||||
(substitute* "Makefile.am"
|
||||
@@ -302,7 +296,7 @@ $(prefix)/etc/openrc\n")))
|
||||
(("tests/packages.scm") "")
|
||||
(("tests/processes.scm") "")
|
||||
(("tests/publish.scm") "")
|
||||
(("tests/pypi.scm") "")
|
||||
(("tests/import/pypi.scm") "")
|
||||
(("tests/size.scm") "")
|
||||
(("tests/store.scm") "")
|
||||
(("tests/substitute.scm") "")
|
||||
@@ -328,20 +322,13 @@ $(prefix)/etc/openrc\n")))
|
||||
(("tests/guix-gc.sh") "")
|
||||
(("tests/guix-daemon.sh") "")))))
|
||||
'())
|
||||
(add-before 'build 'use-host-compressors
|
||||
(lambda* (#:key inputs target #:allow-other-keys)
|
||||
(when target
|
||||
;; Use host compressors.
|
||||
(let ((bzip2 (assoc-ref inputs "bzip2"))
|
||||
(gzip (assoc-ref inputs "gzip"))
|
||||
(xz (assoc-ref inputs "xz")))
|
||||
#$@(if (%current-target-system)
|
||||
#~((add-before 'build 'use-host-compressors
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "guix/config.scm"
|
||||
(("\"[^\"]*/bin/bzip2")
|
||||
(string-append "\"" bzip2 "/bin/bzip2"))
|
||||
(("\"[^\"]*/bin/gzip") gzip
|
||||
(string-append "\"" gzip "/bin/gzip"))
|
||||
(("\"[^\"]*/bin//xz")
|
||||
(string-append "\"" xz "/bin/xz")))))))
|
||||
(("[^\"]*/(bin/(bzip2|gzip|xz))" _ bin)
|
||||
(search-input-file inputs bin))))))
|
||||
#~())
|
||||
(add-before 'build 'set-font-path
|
||||
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
||||
;; Tell 'dot' where to look for fonts.
|
||||
@@ -402,8 +389,8 @@ $(prefix)/etc/openrc\n")))
|
||||
(substitute* "tests/guix-environment-container.sh"
|
||||
(("guix environment --version")
|
||||
"exit 77\n")))))
|
||||
,@(if (target-arm32?)
|
||||
`((add-after
|
||||
#$@(if (target-arm32?)
|
||||
#~((add-after
|
||||
'disable-failing-tests
|
||||
'disable-failing-tests-on-arm32
|
||||
;; XXX FIXME: These tests fail on armhf architecture,
|
||||
@@ -414,61 +401,41 @@ $(prefix)/etc/openrc\n")))
|
||||
(string-append "(test-skip 1)\n" all))
|
||||
(("^\\(test-equal \"clone and unshare triggers EINVAL\"" all)
|
||||
(string-append "(test-skip 1)\n" all))))))
|
||||
'())
|
||||
#~())
|
||||
(add-before 'check 'set-SHELL
|
||||
(lambda _
|
||||
;; 'guix environment' tests rely on 'SHELL' having a
|
||||
;; correct value, so set it.
|
||||
(setenv "SHELL" (which "sh"))))
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs native-inputs outputs target
|
||||
#:allow-other-keys)
|
||||
(lambda* (#:key inputs native-inputs target #:allow-other-keys)
|
||||
(define (search-input-directories dir)
|
||||
(filter directory-exists?
|
||||
(map (match-lambda
|
||||
((name . directory)
|
||||
(string-append directory "/" dir)))
|
||||
inputs)))
|
||||
;; Make sure the 'guix' command finds GnuTLS,
|
||||
;; Guile-JSON, and Guile-Git automatically.
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(guile (assoc-ref (or native-inputs inputs)
|
||||
"guile"))
|
||||
(avahi (assoc-ref inputs "guile-avahi"))
|
||||
(gcrypt (assoc-ref inputs "guile-gcrypt"))
|
||||
(guile-lib (assoc-ref inputs "guile-lib"))
|
||||
(json (assoc-ref inputs "guile-json"))
|
||||
(sqlite (assoc-ref inputs "guile-sqlite3"))
|
||||
(zlib (assoc-ref inputs "guile-zlib"))
|
||||
(lzlib (assoc-ref inputs "guile-lzlib"))
|
||||
(zstd (assoc-ref inputs "guile-zstd"))
|
||||
(git (assoc-ref inputs "guile-git"))
|
||||
(bs (assoc-ref inputs
|
||||
"guile-bytestructures"))
|
||||
(ssh (assoc-ref inputs "guile-ssh"))
|
||||
(gnutls (assoc-ref inputs "guile-gnutls"))
|
||||
(disarchive (assoc-ref inputs "disarchive"))
|
||||
(bzip2 (assoc-ref inputs "guile-bzip2"))
|
||||
(lzma (assoc-ref inputs "guile-lzma"))
|
||||
(locales (assoc-ref inputs "glibc-utf8-locales"))
|
||||
(deps (list gcrypt json sqlite gnutls git
|
||||
bs ssh zlib lzlib zstd guile-lib
|
||||
disarchive bzip2 lzma))
|
||||
(deps* (if avahi (cons avahi deps) deps))
|
||||
(effective
|
||||
(let* ((effective
|
||||
(read-line
|
||||
(open-pipe* OPEN_READ
|
||||
(string-append guile "/bin/guile")
|
||||
(open-pipe*
|
||||
OPEN_READ
|
||||
(search-input-file (or native-inputs inputs)
|
||||
"bin/guile")
|
||||
"-c" "(display (effective-version))")))
|
||||
(path (map (cut string-append <>
|
||||
"/share/guile/site/"
|
||||
effective)
|
||||
(delete #f deps*)))
|
||||
(gopath (map (cut string-append <>
|
||||
"/lib/guile/" effective
|
||||
"/site-ccache")
|
||||
(delete #f deps*)))
|
||||
(locpath (string-append locales "/lib/locale")))
|
||||
(path (search-input-directories
|
||||
(string-append "share/guile/site/" effective)))
|
||||
(gopath (search-input-directories
|
||||
(string-append "lib/guile/" effective
|
||||
"/site-ccache")))
|
||||
(locpath (search-input-directory inputs "lib/locale")))
|
||||
|
||||
;; Modify 'guix' directly instead of using
|
||||
;; 'wrap-program'. This avoids the indirection
|
||||
;; through Bash, which in turn avoids getting Bash's
|
||||
;; own locale warnings.
|
||||
(substitute* (string-append out "/bin/guix")
|
||||
(substitute* (string-append #$output "/bin/guix")
|
||||
(("!#")
|
||||
(string-append
|
||||
"!#\n\n"
|
||||
@@ -492,39 +459,36 @@ $(prefix)/etc/openrc\n")))
|
||||
;; the 'patch-shebangs' phase, which would otherwise
|
||||
;; change it to 'GUILE/bin/guile'.
|
||||
(delete 'patch-shebangs))))
|
||||
(native-inputs `(("locales" ,(libc-utf8-locales-for-target
|
||||
(%current-system)))
|
||||
("pkg-config" ,pkg-config)
|
||||
|
||||
;; Guile libraries are needed here for
|
||||
;; cross-compilation.
|
||||
("guile" ,guile-3.0-latest) ;for faster builds
|
||||
("guile-gnutls" ,guile-gnutls)
|
||||
,@(if (target-hurd?)
|
||||
(native-inputs
|
||||
(append (if (target-hurd?)
|
||||
'()
|
||||
`(("guile-avahi" ,guile-avahi)))
|
||||
("guile-gcrypt" ,guile-gcrypt)
|
||||
("guile-json" ,guile-json-4)
|
||||
("guile-lib" ,guile-lib)
|
||||
("guile-sqlite3" ,guile-sqlite3)
|
||||
("guile-zlib" ,guile-zlib)
|
||||
("guile-lzlib" ,guile-lzlib)
|
||||
("guile-zstd" ,guile-zstd)
|
||||
("guile-ssh" ,guile-ssh)
|
||||
("guile-git" ,guile-git)
|
||||
("guile-semver" ,guile-semver)
|
||||
|
||||
(list guile-avahi))
|
||||
(list (libc-utf8-locales-for-target (%current-system))
|
||||
pkg-config
|
||||
;; Guile libraries are needed here for cross-compilation.
|
||||
guile-3.0-latest ;for faster builds
|
||||
guile-gnutls
|
||||
guile-gcrypt
|
||||
guile-json-4
|
||||
guile-lib
|
||||
guile-sqlite3
|
||||
guile-zlib
|
||||
guile-lzlib
|
||||
guile-zstd
|
||||
guile-ssh
|
||||
guile-git
|
||||
guile-semver
|
||||
;; XXX: Keep the development inputs here even though
|
||||
;; they're unnecessary, just so that 'guix environment
|
||||
;; guix' always contains them.
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("gettext" ,gettext-minimal)
|
||||
("texinfo" ,texinfo)
|
||||
("graphviz" ,graphviz-minimal)
|
||||
("font-ghostscript" ,font-ghostscript) ;fonts for 'dot'
|
||||
("help2man" ,help2man)
|
||||
("po4a" ,po4a-minimal)))
|
||||
autoconf
|
||||
automake
|
||||
gettext-minimal
|
||||
texinfo
|
||||
graphviz-minimal
|
||||
font-ghostscript ;fonts for 'dot'
|
||||
help2man
|
||||
po4a-minimal)))
|
||||
(inputs
|
||||
`(("bash-minimal" ,bash-minimal)
|
||||
("bzip2" ,bzip2)
|
||||
@@ -566,21 +530,21 @@ $(prefix)/etc/openrc\n")))
|
||||
|
||||
("glibc-utf8-locales" ,(libc-utf8-locales-for-target))))
|
||||
(propagated-inputs
|
||||
`(("guile-gnutls" ,guile-gnutls)
|
||||
;; Avahi requires "glib" which doesn't cross-compile yet.
|
||||
,@(if (target-hurd?)
|
||||
(append (if (target-hurd?)
|
||||
'()
|
||||
`(("guile-avahi" ,guile-avahi)))
|
||||
("guile-gcrypt" ,guile-gcrypt)
|
||||
("guile-json" ,guile-json-4)
|
||||
("guile-lib" ,guile-lib)
|
||||
("guile-semver" ,guile-semver)
|
||||
("guile-sqlite3" ,guile-sqlite3)
|
||||
("guile-ssh" ,guile-ssh)
|
||||
("guile-git" ,guile-git)
|
||||
("guile-zlib" ,guile-zlib)
|
||||
("guile-lzlib" ,guile-lzlib)
|
||||
("guile-zstd" ,guile-zstd)))
|
||||
;; Avahi requires "glib" which doesn't cross-compile yet.
|
||||
(list guile-avahi))
|
||||
(list guile-gnutls
|
||||
guile-gcrypt
|
||||
guile-json-4
|
||||
guile-lib
|
||||
guile-semver
|
||||
guile-sqlite3
|
||||
guile-ssh
|
||||
guile-git
|
||||
guile-zlib
|
||||
guile-lzlib
|
||||
guile-zstd)))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "GUIX_EXTENSIONS_PATH")
|
||||
@@ -637,13 +601,13 @@ the Nix package manager.")
|
||||
(substitute-keyword-arguments (package-arguments guix)
|
||||
((#:configure-flags flags '())
|
||||
;; Pretend we have those libraries; we don't actually need them.
|
||||
`(append ,flags
|
||||
#~(append #$flags
|
||||
'("guix_cv_have_recent_guile_sqlite3=yes"
|
||||
"guix_cv_have_recent_guile_ssh=yes")))
|
||||
((#:tests? #f #f)
|
||||
#f)
|
||||
((#:phases phases '%standard-phases)
|
||||
`(modify-phases ,phases
|
||||
#~(modify-phases #$phases
|
||||
(delete 'set-font-path)
|
||||
(replace 'build
|
||||
(lambda _
|
||||
|
||||
Reference in New Issue
Block a user