* [bug#50905] [PATCH core-updates 00/38] Clean up TODO(core-updates)
@ 2021-09-29 22:18 Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos
0 siblings, 2 replies; 80+ messages in thread
From: Maxime Devos @ 2021-09-29 22:18 UTC (permalink / raw)
To: 50905
[-- Attachment #1: Type: text/plain, Size: 1295 bytes --]
Hi guix,
This addresses things like
;; TODO(core-updates): make this unconditional
`(,@(if (%current-target-system)
`(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap
'())
It also introduces a mozilla-build-system, which is like gnu-build-system
except it overrides --target and --host to what mozilla software expects
and uses it for all Mozilla software I could identify that needs this.
I also removed a 'canonical-package' in isc-dhcp's input, because as I
understand it, ‘canonical packages’ aren't supposed to appear in the
references, except for gcc:lib and glibc perhaps? (Not 100% sure,
but noone suggested using canonical-package when I told people to add
bash-minimal to package inputs.)
I also added a #:sh argument to wrap-qt-program to address a TODO(core-updates)
in guix/lint.scm and for consistency with wrap-program, but didn't test it
because of the many rebuilds.
I noted #:tests? wasn't respected in some packages I modified, which I fixed in
a few places. I also removed trailing #t for some packages.
avahi and atk appear to (cross-)compile. (I reverted
‘build/minetest-build-system: Move png-file? to (guix build utils).’ first to avoid
some rebuilds though.)
Greetings,
Maxime
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 80+ messages in thread* [bug#50905] [PATCH 01/38] build-system/mozilla: New build system. 2021-09-29 22:18 [bug#50905] [PATCH core-updates 00/38] Clean up TODO(core-updates) Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 02/38] gnu: nspr: Use mozilla-build-system Maxime Devos ` (37 more replies) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos 1 sibling, 38 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * guix/build-system/mozilla.scm (lower-mozilla): New procedure. (mozilla-build-system): New variable. * Makefile.am (MODULES): Add it. --- Makefile.am | 1 + guix/build-system/mozilla.scm | 52 +++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 guix/build-system/mozilla.scm diff --git a/Makefile.am b/Makefile.am index 56f60278b7..76166f4eec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,7 @@ MODULES = \ guix/build-system/font.scm \ guix/build-system/go.scm \ guix/build-system/meson.scm \ + guix/build-system/mozilla.scm \ guix/build-system/minify.scm \ guix/build-system/minetest.scm \ guix/build-system/asdf.scm \ diff --git a/guix/build-system/mozilla.scm b/guix/build-system/mozilla.scm new file mode 100644 index 0000000000..b4141c8177 --- /dev/null +++ b/guix/build-system/mozilla.scm @@ -0,0 +1,52 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; 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 (guix build-system mozilla) + #:use-module (guix build-system gnu) + #:use-module (guix build-system) + #:use-module (guix utils) + #:export (mozilla-build-system)) + +;; +;; Build procedure for packages using Autotools with the Mozillian conventions +;; for --target, --host and --build, which are different from the GNU +;; conventions. +;; +;; Code: + +(define* (lower-mozilla name #:key system target #:allow-other-keys + #:rest arguments) + (define lower (build-system-lower gnu-build-system)) + (if target + (apply lower + (substitute-keyword-arguments arguments + ;; Override --target and --host to what Mozillian configure + ;; scripts expect. + ((#:configure-flags configure-flags ''()) + `(cons* ,(string-append "--target=" target) + ,(string-append "--host=" (nix-system->gnu-triplet system)) + ,configure-flags)))) + (apply lower name arguments))) ; not cross-compiling + +(define mozilla-build-system + (build-system + (name 'mozilla) + (description "The build system for Mozilla software using the Autotools") + (lower lower-mozilla))) + +;;; mozilla.scm ends here base-commit: 0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 02/38] gnu: nspr: Use mozilla-build-system. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 03/38] gnu: mozjs: " Maxime Devos ` (36 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/nss.scm (nspr)[build-system]: Adjust it. (nspr)[arguments]<#:configure-flags>: Remove now superfluous --target and --host. --- gnu/packages/nss.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 381756e387..6196ad692d 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -29,6 +29,7 @@ #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system mozilla) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages bash) @@ -49,7 +50,7 @@ (sha256 (base32 "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap")))) - (build-system gnu-build-system) + (build-system mozilla-build-system) (inputs ;; TODO(core-updates): Make these inputs unconditional. ;; For 'compile-et.pl' and 'nspr-config'. @@ -72,16 +73,7 @@ (list "--disable-static" "--enable-64bit" (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib") - ;; Mozilla deviates from Autotools conventions - ;; due to historical reasons. Adjust to Mozilla conventions, - ;; otherwise the Makefile will try to use TARGET-gcc - ;; as a ‘native’ compiler. - ,@(if (%current-target-system) - `(,(string-append "--host=" - (nix-system->gnu-triplet (%current-system))) - ,(string-append "--target=" (%current-target-system))) - '())) + (assoc-ref %outputs "out") "/lib")) ;; Use fixed timestamps for reproducibility. #:make-flags '("SH_DATE='1970-01-01 00:00:01'" ;; This is epoch 1 in microseconds. -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 03/38] gnu: mozjs: Use mozilla-build-system. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 02/38] gnu: nspr: Use mozilla-build-system Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 04/38] gnu: icecat: " Maxime Devos ` (35 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos Due to the use of 'inherit', all versions of mozjs are adjusted. * gnu/packages/gnuzilla.scm (mozjs)[build-system]: Adjust it. (mozjs)[arguments]<#:configure-flags>: Remove now superfluous --target and --host. --- gnu/packages/gnuzilla.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 5dd90e4e20..9647bb7db5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -49,6 +49,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cargo) #:use-module (guix build-system trivial) + #:use-module (guix build-system mozilla) #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -108,7 +109,7 @@ (substitute* '("js/src/config/milestone.pl") (("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE")) #t)))) - (build-system gnu-build-system) + (build-system mozilla-build-system) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -390,15 +391,7 @@ in C/C++.") ;; This is important because without it gjs will segfault during the ;; configure phase. With jemalloc only the standalone mozjs console ;; will work. - "--disable-jemalloc" - ;; Mozilla deviates from Autotools conventions due to historical - ;; reasons. - #$@(if (%current-target-system) - #~(#$(string-append - "--host=" - (nix-system->gnu-triplet (%current-system))) - #$(string-append "--target=" (%current-target-system))) - #~()))) + "--disable-jemalloc")) #:phases (modify-phases %standard-phases ;; Make sure pkg-config will be found. -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 04/38] gnu: icecat: Use mozilla-build-system. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 02/38] gnu: nspr: Use mozilla-build-system Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 03/38] gnu: mozjs: " Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 05/38] build/minetest-build-system: Move png-file? to (guix build utils) Maxime Devos ` (34 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos This doesn't actually have any effect because the 'configure' phase is replaced. * gnu/packages/gnuzilla.scm (icecat)[build-system]: Use mozilla-build-system. --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 9647bb7db5..655b0c04c3 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -884,7 +884,7 @@ from forcing GEXP-PROMISE." (name "icecat") (version %icecat-version) (source icecat-source) - (build-system gnu-build-system) + (build-system mozilla-build-system) (inputs `(("alsa-lib" ,alsa-lib) ("bzip2" ,bzip2) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 05/38] build/minetest-build-system: Move png-file? to (guix build utils). 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (2 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 04/38] gnu: icecat: " Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 06/38] gnu: mozjs: Make the native-inputs unconditional Maxime Devos ` (33 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos It's not really Minetest-specific. It was only placed in (guix build minetest-build-system) to avoid a world rebuild. * guix/build/minetest-build-system.scm (%png-magic-bytes,png-file?): Move to ... * guix/build/utils.scm (%png-magic-bytes,png-file?): ... here. --- guix/build/minetest-build-system.scm | 9 --------- guix/build/utils.scm | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm index 477cc3d1d0..5d7d8d2292 100644 --- a/guix/build/minetest-build-system.scm +++ b/guix/build/minetest-build-system.scm @@ -90,15 +90,6 @@ If it is unknown, make an educated guess." #:install-plan (mod-install-plan (apply guess-mod-name arguments)) arguments)) -(define %png-magic-bytes - ;; Magic bytes of PNG images, see ‘5.2 PNG signatures’ in - ;; ‘Portable Network Graphics (PNG) Specification (Second Edition)’ - ;; on <https://www.w3.org/TR/PNG/>. - #vu8(137 80 78 71 13 10 26 10)) - -(define png-file? - ((@@ (guix build utils) file-header-match) %png-magic-bytes)) - (define* (minimise-png #:key inputs native-inputs #:allow-other-keys) "Minimise PNG images found in the working directory." (define optipng (which "optipng")) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 3beb7da67a..39e581b0fa 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -61,6 +61,8 @@ symbolic-link? call-with-temporary-output-file call-with-ascii-input-file + file-header-match + png-file? elf-file? ar-file? gzip-file? @@ -290,6 +292,15 @@ with the bytes in HEADER, a bytevector." #f ;FILE is a directory (apply throw args)))))) +(define %png-magic-bytes + ;; Magic bytes of PNG images, see ‘5.2 PNG signatures’ in + ;; ‘Portable Network Graphics (PNG) Specification (Second Edition)’ + ;; on <https://www.w3.org/TR/PNG/>. + #vu8(137 80 78 71 13 10 26 10)) + +(define png-file? + (file-header-match %png-magic-bytes)) + (define %elf-magic-bytes ;; Magic bytes of ELF files. See <elf.h>. (u8-list->bytevector (map char->integer (string->list "\x7FELF")))) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 06/38] gnu: mozjs: Make the native-inputs unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (3 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 05/38] build/minetest-build-system: Move png-file? to (guix build utils) Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 07/38] gnu: mozjs: Make the quasiquote unconditional Maxime Devos ` (32 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/nss.scm (mozjs)[inputs]: Always include 'perl" and 'bash-minimal', even when compiling natively. --- gnu/packages/nss.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 6196ad692d..6315138c89 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -52,12 +52,9 @@ "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap")))) (build-system mozilla-build-system) (inputs - ;; TODO(core-updates): Make these inputs unconditional. ;; For 'compile-et.pl' and 'nspr-config'. - (if (%current-target-system) - `(("perl" ,perl) ; for 'compile-et.pl' - ("bash-minimal" ,bash-minimal)) ; for 'nspr-config' - '())) + `(("perl" ,perl) ; for 'compile-et.pl' + ("bash-minimal" ,bash-minimal))) ; for 'nspr-config' (native-inputs `(("perl" ,perl))) (arguments -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 07/38] gnu: mozjs: Make the quasiquote unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (4 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 06/38] gnu: mozjs: Make the native-inputs unconditional Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 08/38] gnu: isc-dhcp: Don't use canonical-package Maxime Devos ` (31 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/nss.scm (mozjs-60)[arguments]<#:configure-flags>: Always use quasiquote instead of quote. --- gnu/packages/gnuzilla.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 655b0c04c3..5273fbddf0 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -370,11 +370,7 @@ in C/C++.") `(#:tests? #f ; FIXME: all tests pass, but then the check phase fails anyway. #:test-target "check-jstests" #:configure-flags - ;; TODO(core-updates): unconditionally use 'quasiquote - ,#~(#$(if (%current-target-system) - #~quasiquote - #~quote) - ("--enable-ctypes" + ,#~`("--enable-ctypes" "--enable-optimize" "--enable-pie" "--enable-readline" @@ -391,7 +387,7 @@ in C/C++.") ;; This is important because without it gjs will segfault during the ;; configure phase. With jemalloc only the standalone mozjs console ;; will work. - "--disable-jemalloc")) + "--disable-jemalloc") #:phases (modify-phases %standard-phases ;; Make sure pkg-config will be found. -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 08/38] gnu: isc-dhcp: Don't use canonical-package. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (5 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 07/38] gnu: mozjs: Make the quasiquote unconditional Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 09/38] gnu: isc-dhcp: Make an input unconditional Maxime Devos ` (30 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos As I understand it, canonical-package is only for things that won't end up in the closure, so canonical-package shouldn't be used here. * gnu/packages/admin.scm (isc-dhcp)[inputs]{bash}: Remove 'canonical-package'. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index aad8586a71..c535baf1d6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1318,7 +1318,7 @@ connection alive.") ;; TODO(core-updates): simply make this unconditional ,@(if (%current-target-system) ;; for wrap-program - `(("bash" ,(canonical-package bash-minimal))) + `(("bash" ,bash-minimal)) '()) ,@(if (hurd-target?) '() `(("net-tools" ,net-tools) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 09/38] gnu: isc-dhcp: Make an input unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (6 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 08/38] gnu: isc-dhcp: Don't use canonical-package Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching Maxime Devos ` (29 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/admin.scm (isc-dhcp)[inputs]{bash}: Always include this input, even when compiling natively. --- gnu/packages/admin.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c535baf1d6..744692bb6c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1315,11 +1315,7 @@ connection alive.") ("file" ,file))) (inputs `(("inetutils" ,inetutils) - ;; TODO(core-updates): simply make this unconditional - ,@(if (%current-target-system) - ;; for wrap-program - `(("bash" ,bash-minimal)) - '()) + ("bash" ,bash-minimal) ,@(if (hurd-target?) '() `(("net-tools" ,net-tools) ("iproute" ,iproute))) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (7 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 09/38] gnu: isc-dhcp: Make an input unconditional Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 11/38] gnu: isc-dhcp: Remove trailing #t Maxime Devos ` (28 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>{post-install}: Remove parts indicated by TODOs. --- gnu/packages/admin.scm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 744692bb6c..57801200bd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1267,11 +1267,7 @@ connection alive.") "--owner=root:0" "--group=root:0"))))) (add-after 'install 'post-install - ;; TODO(core-updates): native-inputs isn't required anymore. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; Install the dhclient script for GNU/Linux and make sure ;; if finds all the programs it needs. (let* ((out (assoc-ref outputs "out")) @@ -1295,19 +1291,6 @@ connection alive.") (string-append dir "/bin:" dir "/sbin")) (list inetutils net-tools coreutils sed)))) - ;; TODO(core-updates): should not be required anymore, - ;; once <https://issues.guix.gnu.org/49290> has been merged. - ,@(if (%current-target-system) - '((for-each - (lambda (file) - (substitute* file - (((assoc-ref native-inputs "bash")) - (assoc-ref inputs "bash")))) - (list (string-append libexec - "/dhclient-script") - (string-append libexec - "/.dhclient-script-real")))) - '()) #t)))))) (native-inputs -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 11/38] gnu: isc-dhcp: Remove trailing #t. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (8 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 12/38] gnu: gobject-introspection: Move things to native-inputs Maxime Devos ` (27 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos They aren't required anymore on core-updates. * gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>: Remove trailing #t. --- gnu/packages/admin.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 57801200bd..78b37c04d7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1218,8 +1218,7 @@ connection alive.") (("^RELEASETYPE=.*") (format #f "RELEASETYPE=~a\n" ,bind-release-type)) (("^RELEASEVER=.*") - (format #f "RELEASEVER=~a\n" ,bind-release-version))) - #t)) + (format #f "RELEASEVER=~a\n" ,bind-release-version))))) ,@(if (%current-target-system) '((add-before 'configure 'fix-bind-cross-compilation (lambda _ @@ -1290,8 +1289,7 @@ connection alive.") ,(map (lambda (dir) (string-append dir "/bin:" dir "/sbin")) - (list inetutils net-tools coreutils sed)))) - #t)))))) + (list inetutils net-tools coreutils sed)))))))))) (native-inputs `(("perl" ,perl) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 12/38] gnu: gobject-introspection: Move things to native-inputs. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (9 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 11/38] gnu: isc-dhcp: Remove trailing #t Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 13/38] gnu: gobject-introspection: Use python instead of python-wrapper Maxime Devos ` (26 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/glib.scm (gobject-introspection)[native-inputs]: Make 'bison' and 'flex' inputs unconditional ... (gobject-introspection)[inputs]: ... and unconditionally remove them here. --- gnu/packages/glib.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index bdcc108ac1..cbaece6cf1 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -486,18 +486,12 @@ be used when cross-compiling." (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config) - ;; TODO(core-updates): Unconditionally place "flex" and "bison" - ;; in 'native-inputs'. - ,@(if (%current-target-system) - `(("bison" ,bison) - ("flex" ,flex)) - '()))) + ("bison" ,bison) + ("flex" ,flex))) (inputs `(,@(if (%current-target-system) `(("python" ,python)) - `(("bison" ,bison) - ("flex" ,flex) - ("python" ,python-wrapper))) + `(("python" ,python-wrapper))) ("zlib" ,zlib))) (propagated-inputs `(("glib" ,glib) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 13/38] gnu: gobject-introspection: Use python instead of python-wrapper. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (10 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 12/38] gnu: gobject-introspection: Move things to native-inputs Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 14/38] gnu: cairo: Make 'bash-minimal' input unconditional Maxime Devos ` (25 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos 'python' is a tiny bit simpler than 'python-wrapper', and is already used when cross-compiling. Use it unconditionally. * gnu/packages/glib.scm (gobject-introspection)[inputs]{python}: Use 'python' even when compiling natively. --- gnu/packages/glib.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index cbaece6cf1..8117d7904d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -489,9 +489,7 @@ be used when cross-compiling." ("bison" ,bison) ("flex" ,flex))) (inputs - `(,@(if (%current-target-system) - `(("python" ,python)) - `(("python" ,python-wrapper))) + `(("python" ,python) ("zlib" ,zlib))) (propagated-inputs `(("glib" ,glib) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 14/38] gnu: cairo: Make 'bash-minimal' input unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (11 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 13/38] gnu: gobject-introspection: Use python instead of python-wrapper Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 15/38] gnu: libthai: Make 'datrie' " Maxime Devos ` (24 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gtk.scm (cairo)[inputs]{bash-minimal}: Make this input unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9868b11e48..aa5b48dac8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -182,10 +182,7 @@ tools have full access to view and control running applications.") ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs - ;; TODO(core-updates): make this unconditional - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ; for glib-or-gtk-wrap ("drm" ,libdrm) ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 15/38] gnu: libthai: Make 'datrie' input unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (12 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 14/38] gnu: cairo: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 16/38] gnu: libdatrie: Make input labels match the package name Maxime Devos ` (23 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gtk.scm (libthai)[native-inputs]{datrie}: Make this input unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index aa5b48dac8..5ae4aeb66c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -326,10 +326,7 @@ representing trie. Trie is a kind of digital search tree.") (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config) - ;; TODO(core-updates): Make this input unconditional. - ,@(if (%current-target-system) - `(("datrie" ,libdatrie)) ; for 'trietool' - '()))) + ("datrie" ,libdatrie))) ; for 'trietool' (propagated-inputs `(("datrie" ,libdatrie))) (synopsis "Thai language support library") -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 16/38] gnu: libdatrie: Make input labels match the package name. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (13 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 15/38] gnu: libthai: Make 'datrie' " Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 17/38] gnu: pango: Make 'bash-minimal' input unconditional Maxime Devos ` (22 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gtk.scm (libthai)[native-inputs]{datrie}: Rename to ... (libthai)[native-inputs]{libdatrie}: ... this. (libthai)[propagated-inputs]{datrie}: Rename to ... (libthai)[propagated-inputs]{libdatrie}: ... this. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5ae4aeb66c..219971a40e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -326,9 +326,9 @@ representing trie. Trie is a kind of digital search tree.") (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config) - ("datrie" ,libdatrie))) ; for 'trietool' + ("libdatrie" ,libdatrie))) ; for 'trietool' (propagated-inputs - `(("datrie" ,libdatrie))) + `(("libdatrie" ,libdatrie))) (synopsis "Thai language support library") (description "LibThai is a set of Thai language support routines aimed to ease developers’ tasks to incorporate Thai language support in their -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 17/38] gnu: pango: Make 'bash-minimal' input unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (14 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 16/38] gnu: libdatrie: Make input labels match the package name Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs Maxime Devos ` (21 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gtk.scm (pango)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 219971a40e..4f8b87ea48 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -377,10 +377,7 @@ applications.") ("libxft" ,libxft) ("libxrender" ,libxrender))) (inputs - ;; TODO(core-updates): Unconditionally add "bash-minimal" - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ; for glib-or-gtk-wrap ("zlib" ,zlib))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums, etc. -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (15 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 17/38] gnu: pango: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 19/38] gnu: gdk-pixbuf: Respect #:tests? Maxime Devos ` (20 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}: Unconditionally look in (or native-inputs inputs) for docbook-xsl and docbook-xml. --- gnu/packages/gtk.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4f8b87ea48..fd7feab69b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -623,23 +623,17 @@ highlighting and other features typical of a source code editor.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Unconditionally look in (or native-inputs inputs) - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "docs" (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/"))) (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") "/xml/dtd/docbook/")))) #t)) (add-before 'configure 'disable-failing-tests -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 19/38] gnu: gdk-pixbuf: Respect #:tests?. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (16 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 20/38] gnu: gdk-pixbuf: Use target predicates Maxime Devos ` (19 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{check}: Don't run the tests if the value for #:tests? is false. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fd7feab69b..bbef514dd7 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -646,8 +646,9 @@ highlighting and other features typical of a source code editor.") ,@(if (any (cute string=? <> (%current-system)) '("armhf-linux" "aarch64-linux")) '((replace 'check - (lambda _ - (invoke "meson" "test" "--timeout-multiplier" "5")))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "meson" "test" "--timeout-multiplier" "5"))))) '())))) (propagated-inputs `( ;; Required by gdk-pixbuf-2.0.pc -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 20/38] gnu: gdk-pixbuf: Use target predicates. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (17 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 19/38] gnu: gdk-pixbuf: Respect #:tests? Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional Maxime Devos ` (18 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos This seems a little tidier to me. * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{check}: Use target-arm? instead of string=?. --- gnu/packages/gtk.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bbef514dd7..691e207165 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -643,8 +643,7 @@ highlighting and other features typical of a source code editor.") "")) #t)) ;; The slow tests take longer than the specified timeout. - ,@(if (any (cute string=? <> (%current-system)) - '("armhf-linux" "aarch64-linux")) + ,@(if (target-arm? (%current-system)) '((replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (18 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 20/38] gnu: gdk-pixbuf: Use target predicates Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 22/38] gnu: gdk-pixbuf: Remove trailing #t Maxime Devos ` (17 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gtk.scm (gdk-pixbuf)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gtk.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 691e207165..cfc4c61235 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -657,9 +657,7 @@ highlighting and other features typical of a source code editor.") ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ; for glib-or-gtk-wrap ("jasper" ,jasper) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 22/38] gnu: gdk-pixbuf: Remove trailing #t. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (19 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional Maxime Devos ` (16 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>: Remove the trailing #t. --- gnu/packages/gtk.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cfc4c61235..f37dfaf89d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -634,14 +634,12 @@ highlighting and other features typical of a source code editor.") (("http://www.oasis-open.org/docbook/xml/4\\.3/") (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") - "/xml/dtd/docbook/")))) - #t)) + "/xml/dtd/docbook/")))))) (add-before 'configure 'disable-failing-tests (lambda _ (substitute* "tests/meson.build" (("\\[ 'pixbuf-fail', \\['conform', 'slow'\\], \\],") - "")) - #t)) + "")))) ;; The slow tests take longer than the specified timeout. ,@(if (target-arm? (%current-system)) '((replace 'check -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (20 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 22/38] gnu: gdk-pixbuf: Remove trailing #t Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 24/38] gnu: at-spi2-core: Respect #:tests? Maxime Devos ` (15 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gtk.scm (at-spi2-core)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f37dfaf89d..adb4d847a4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -778,10 +778,7 @@ scaled, composited, modified, saved, or rendered.") (invoke "dbus-launch" "ninja" "test"))) (delete 'check)))) (inputs - ;; TODO(core-updates): Make this input unconditional. - (if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '())) + `(("bash-minimal" ,bash-minimal))) (propagated-inputs ;; atspi-2.pc refers to all these. `(("dbus" ,dbus) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 24/38] gnu: at-spi2-core: Respect #:tests?. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (21 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs Maxime Devos ` (14 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>{check}: Don't run tests if the value of #:tests? if false. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index adb4d847a4..d829218305 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -768,14 +768,15 @@ scaled, composited, modified, saved, or rendered.") (string-append out "/share/gtk-doc"))) #t)))) (add-after 'install 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME ;; Run test-suite under a dbus session. (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service (string-append %output "/share")) ;; Don't fail on missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") ; - (invoke "dbus-launch" "ninja" "test"))) + (when tests? + (invoke "dbus-launch" "ninja" "test")))) (delete 'check)))) (inputs `(("bash-minimal" ,bash-minimal))) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (22 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 24/38] gnu: at-spi2-core: Respect #:tests? Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 26/38] gnu: at-spi2-core: Remove trailing #t Maxime Devos ` (13 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>{patch-docbook-sgml}: Unconditionally look in (or native-inputs inputs) for docbook-xml. --- gnu/packages/gtk.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d829218305..634a0125d8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -740,15 +740,10 @@ scaled, composited, modified, saved, or rendered.") (lambda* (#:key outputs #:allow-other-keys) (mkdir-p (string-append (assoc-ref outputs "doc") "/share")) #t)) - ;; TODO(core-updates): Unconditionally use (or native-inputs inputs) (add-after 'unpack 'patch-docbook-sgml - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((xmldoc - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) + (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") "/xml/dtd/docbook"))) (substitute* "doc/libatspi/libatspi-docs.sgml" -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 26/38] gnu: at-spi2-core: Remove trailing #t. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (23 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 27/38] gnu: avahi: Make 'bash-minimal' input unconditional Maxime Devos ` (12 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>: Remove trailing #t. --- gnu/packages/gtk.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 634a0125d8..842a46a846 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -734,12 +734,11 @@ scaled, composited, modified, saved, or rendered.") ;; Ensure that the cross-references point to the "doc" output. (substitute* "doc/libatspi/meson.build" (("docpath =.*") - (string-append "docpath = '" (assoc-ref outputs "doc") "/share/gtk-doc/html'\n"))) - #t)) + (string-append "docpath = '" (assoc-ref outputs "doc") + "/share/gtk-doc/html'\n"))))) (add-before 'install 'prepare-doc-directory (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "doc") "/share")) - #t)) + (mkdir-p (string-append (assoc-ref outputs "doc") "/share")))) (add-after 'unpack 'patch-docbook-sgml (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((xmldoc @@ -748,8 +747,7 @@ scaled, composited, modified, saved, or rendered.") "/xml/dtd/docbook"))) (substitute* "doc/libatspi/libatspi-docs.sgml" (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd"))) - #t))) + (string-append xmldoc "/docbookx.dtd")))))) ,@(if (%current-target-system) '() '((add-after 'install 'move-documentation @@ -760,8 +758,7 @@ scaled, composited, modified, saved, or rendered.") (string-append out "/share/gtk-doc") (string-append doc "/share/gtk-doc")) (delete-file-recursively - (string-append out "/share/gtk-doc"))) - #t)))) + (string-append out "/share/gtk-doc"))))))) (add-after 'install 'check (lambda* (#:key tests? #:allow-other-keys) (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 27/38] gnu: avahi: Make 'bash-minimal' input unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (24 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 26/38] gnu: at-spi2-core: Remove trailing #t Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional Maxime Devos ` (11 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/avahi.scm (avahi)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/avahi.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 7dcaa17a76..20c0f2708e 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -91,10 +91,7 @@ (find-files (string-append #$output "/etc/avahi"))))))) '()))) (inputs - ;; TODO(core-updates): Make this input unconditional. - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '()) + `(("bash-minimal" ,bash-minimal) ("dbus" ,dbus) ("expat" ,expat) ("gdbm" ,gdbm) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (25 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 27/38] gnu: avahi: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables Maxime Devos ` (10 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/avahi.scm (avahi)[arguments]<#:phases>{patch-more-shebangs}: Make it unconditional. --- gnu/packages/avahi.scm | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 20c0f2708e..797e35e7eb 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -75,21 +75,18 @@ ,@(if (%current-target-system) '("ac_cv_prog_have_pkg_config=yes") '())) - ;; TODO(core-updates): Make this unconditional. - ,@(if (%current-target-system) - `(#:modules ((srfi srfi-26) - (guix build utils) - (guix build gnu-build-system)) - #:phases - ,#~(modify-phases %standard-phases - (add-after 'patch-shebangs 'patch-more-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (define path - `(,(dirname (search-input-file inputs "bin/sh")))) - (for-each - (cut patch-shebang <> path) - (find-files (string-append #$output "/etc/avahi"))))))) - '()))) + #:modules ((srfi srfi-26) + (guix build utils) + (guix build gnu-build-system)) + #:phases + ,#~(modify-phases %standard-phases + (add-after 'patch-shebangs 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + (define path + `(,(dirname (search-input-file inputs "bin/sh")))) + (for-each + (cut patch-shebang <> path) + (find-files (string-append #$output "/etc/avahi")))))))) (inputs `(("bash-minimal" ,bash-minimal) ("dbus" ,dbus) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (26 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs Maxime Devos ` (9 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/freedesktop.scm (elogind)[arguments]<#:configure-flags>: Use #$output and this-package-input instead of %outputs and %build-inputs. --- gnu/packages/freedesktop.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 550253bc34..9bcf2d8d3e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -583,20 +583,12 @@ the freedesktop.org XDG Base Directory specification.") (build-system meson-build-system) (arguments `(#:configure-flags - ;; TODO(core-updates): Use #$output unconditionally. - ,#~(let* ((out #$(if (%current-target-system) - #~#$output - #~(assoc-ref %outputs "out"))) + ,#~(let* ((out #$output) (sysconf (string-append out "/etc")) (libexec (string-append out "/libexec/elogind")) (dbuspolicy (string-append out "/etc/dbus-1/system.d")) - ;; TODO(core-updates): use this-package-input unconditionally. - (shadow #$(if (%current-target-system) - (this-package-input "shadow") - #~(assoc-ref %build-inputs "shadow"))) - (shepherd #$(if (%current-target-system) - (this-package-input "shepherd") - #~(assoc-ref %build-inputs "shepherd"))) + (shadow #$(this-package-input "shadow")) + (shepherd #$(this-package-input "shepherd")) (halt-path (string-append shepherd "/sbin/halt")) (kexec-path "") ;not available in Guix yet (nologin-path (string-append shadow "/sbin/nologin")) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (27 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 31/38] gnu: json-glib: " Maxime Devos ` (8 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/freedesktop.scm (wayland)[arguments]<#:phases>{patch-docbook-sgml}: Unconditionally look in (or native-inputs inputs) for docbook-xml and docbook-xml-4.2. --- gnu/packages/freedesktop.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9bcf2d8d3e..0f04a38c00 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -975,22 +975,16 @@ Python.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook-xml - ;; TODO(core-updates): Use 'native-inputs' unconditionally - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "doc" (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.5/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") "/xml/dtd/docbook/")) (("http://www.oasis-open.org/docbook/xml/4\\.2/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml-4.2") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml-4.2") "/xml/dtd/docbook/")))) #t)) (add-after 'install 'move-doc -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (28 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional Maxime Devos ` (7 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gnome.scm (json-glib)[arguments]<#:phases>{patch-docbook}: Unconditionally look in (or native-inputs inputs) for docbook-xml and docbook-xsl. --- gnu/packages/gnome.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 497713cddc..57d9a9be79 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4607,24 +4607,17 @@ configuration storage systems.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Use (or native-inputs inputs) - ;; unconditionally. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "doc" (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) + (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") "/xml/dtd/docbook/"))) (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/")))) #t)) ;; When cross-compiling, there are no docs to move. -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (29 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 31/38] gnu: json-glib: " Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 33/38] gnu: heimdal: Make some parts of phases unconditional Maxime Devos ` (6 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/gnome.scm (json-glib)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gnome.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 57d9a9be79..b00a02b81f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4645,10 +4645,7 @@ configuration storage systems.") ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) (inputs - ;; TODO(core-updates): Make this input unconditional. - (if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '())) + `(("bash-minimal" ,bash-minimal))) (propagated-inputs `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 33/38] gnu: heimdal: Make some parts of phases unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (30 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional Maxime Devos ` (5 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/kerberos.scm (heimdal)[arguments]<#:phases>{pre-configure}: Make the '(%current-target-system)' branches unconditional. --- gnu/packages/kerberos.scm | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 82609ce66e..6bfb758900 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -237,14 +237,7 @@ After installation, the system administrator should generate keys using #~())) #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure - ;; TODO(core-updates): Unconditionally use the - ;; %current-target-system branch. - (,(if (%current-target-system) - 'lambda* - 'lambda) - ,(if (%current-target-system) - '(#:key inputs #:allow-other-keys) - '_) + (lambda* (#:key inputs #:allow-other-keys) ,@(if (%current-target-system) `((substitute* "configure" ;; The e2fsprogs input is included for libcom_err, @@ -256,22 +249,17 @@ After installation, the system administrator should generate keys using (("ac_cv_prog_COMPILE_ET=\\$\\{with_cross_tools\\}compile_et") "ac_cv_PROG_COMPILE_ET=compile_et"))) '()) - ,@(if (%current-target-system) - '((substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") - (("/bin/sh") - (search-input-file inputs "bin/sh")) - ;; Use the cross-compiled bash instead of the - ;; native bash (XXX shouldn't _PATH_BSHELL point - ;; to a cross-compiled bash?). - (("_PATH_BSHELL") - (string-append - "\"" (search-input-file inputs "bin/sh") "\""))) - (substitute* '("tools/Makefile.in") - (("/bin/sh") (which "sh")))) - '((substitute* '("appl/afsutil/pagsh.c" - "tools/Makefile.in") - (("/bin/sh") (which "sh"))) - #t)))) + (substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") + (("/bin/sh") + (search-input-file inputs "bin/sh")) + ;; Use the cross-compiled bash instead of the + ;; native bash (XXX shouldn't _PATH_BSHELL point + ;; to a cross-compiled bash?). + (("_PATH_BSHELL") + (string-append + "\"" (search-input-file inputs "bin/sh") "\""))) + (substitute* '("tools/Makefile.in") + (("/bin/sh") (which "sh"))))) (add-before 'check 'pre-check (lambda _ ;; For 'getxxyyy-test'. -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (31 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 33/38] gnu: heimdal: Make some parts of phases unconditional Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 35/38] gnu: libcap: Unconditionally use #$output Maxime Devos ` (4 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/kerberos.scm (heimdal)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/kerberos.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 6bfb758900..739b0169dc 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -280,10 +280,7 @@ After installation, the system administrator should generate keys using `(("perl" ,perl)) '()))) (inputs `(("readline" ,readline) - ;; TODO(core-updates): Make this input unconditional. - ,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '()) + ("bash-minimal" ,bash-minimal) ("bdb" ,bdb) ("e2fsprogs" ,e2fsprogs) ;for libcom_err ("sqlite" ,sqlite))) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 35/38] gnu: libcap: Unconditionally use #$output. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (32 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 36/38] gnu: libproxy: Respect #:tests? Maxime Devos ` (3 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/linux.scm (libcap)[arguments]<#:phases>{configure}: Unconditionally use #$output instead of %output. --- gnu/packages/linux.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b771f65d92..3c8b4546af 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3004,12 +3004,7 @@ configuration (iptunnel, ipmaddr).") (substitute* "Make.Rules" (("LDFLAGS \\?= #-g") (string-append "LDFLAGS ?= -Wl,-rpath=" - ;; TODO(core-updates): Use #$output - ;; unconditionally. - #$(if (%current-target-system) - #~#$output - '%output) - "/lib")))))) + #$output "/lib")))))) #:test-target "test" #:make-flags (list "lib=lib" -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 36/38] gnu: libproxy: Respect #:tests?. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (33 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 35/38] gnu: libcap: Unconditionally use #$output Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 37/38] build/qt-utils: Allow overriding the shell interpreter used Maxime Devos ` (2 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * gnu/packages/networking.scm (libproxy)[arguments]<#:phases>{check}: Don't run the tests if the value for #:tests? is false. --- gnu/packages/networking.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c426c95e71..d6a2b6bb6b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2251,16 +2251,12 @@ sockets in Perl.") `(("dbus" ,dbus) ("zlib" ,zlib))) (arguments - `(#:phases + '(#:phases (modify-phases %standard-phases (replace 'check - ;; TODO(core-updates): Make this unconditional. - ,(if (%current-target-system) - '(lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" "url-test"))) - '(lambda _ - (invoke "ctest" "-E" "url-test"))))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" "url-test"))))))) (synopsis "Library providing automatic proxy configuration management") (description "Libproxy handles the details of HTTP/HTTPS proxy configuration for applications across all scenarios. Applications using -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 37/38] build/qt-utils: Allow overriding the shell interpreter used. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (34 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 36/38] gnu: libproxy: Respect #:tests? Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates Maxime Devos 2021-10-01 9:52 ` [bug#50905] [PATCH core-updates 00/38] Clean up TODO(core-updates) Mathieu Othacehe 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos * guix/build/qt-utils.scm (wrap-qt-program*): Add #:sh argument and pass it to 'wrap-program'. (wrap-qt-program): Likewise, but pass it to 'wrap-qt-program*' instead. (wrap-all-qt-programs): Likewise, but pass it to 'wrap-qt-program' instead. --- guix/build/qt-utils.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80cab7d..97145a116d 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -90,7 +90,7 @@ '("QTWEBENGINEPROCESS_PATH" = regular "/lib/qt5/libexec/QtWebEngineProcess")))) -(define* (wrap-qt-program* program #:key inputs output-dir +(define* (wrap-qt-program* program #:key sh inputs output-dir qt-wrap-excluded-inputs) (define input-directories @@ -105,9 +105,9 @@ (cons output-dir input-directories) output-dir))) (when (not (null? vars-to-wrap)) - (apply wrap-program program vars-to-wrap)))) + (apply wrap-program program #:sh sh vars-to-wrap)))) -(define* (wrap-qt-program program-name #:key inputs output +(define* (wrap-qt-program program-name #:key (sh (which "bash")) inputs output (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)) "Wrap the specified programm (which must reside in the OUTPUT's \"/bin\" directory) with suitably set environment variables. @@ -115,10 +115,11 @@ directory) with suitably set environment variables. This is like qt-build-systems's phase \"qt-wrap\", but only the named program is wrapped." (wrap-qt-program* (string-append output "/bin/" program-name) + #:sh sh #:output-dir output #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)) -(define* (wrap-all-qt-programs #:key inputs outputs +(define* (wrap-all-qt-programs #:key (sh (which "bash")) inputs outputs (qt-wrap-excluded-outputs '()) (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs) #:allow-other-keys) @@ -144,6 +145,7 @@ add a dependency of that output on Qt." ((output . output-dir) (unless (member output qt-wrap-excluded-outputs) (for-each (cut wrap-qt-program* <> + #:sh sh #:output-dir output-dir #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs) (find-files-to-wrap output-dir)))))) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates. 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (35 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 37/38] build/qt-utils: Allow overriding the shell interpreter used Maxime Devos @ 2021-09-29 22:19 ` Maxime Devos 2021-10-01 9:52 ` [bug#50905] [PATCH core-updates 00/38] Clean up TODO(core-updates) Mathieu Othacehe 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-09-29 22:19 UTC (permalink / raw) To: 50905; +Cc: Maxime Devos The #:sh argument of 'wrap-program' and 'wrap-qt-program' is now in the current branch, so some comments aren't relevant anymore. * guix/lint.scm (check-wrapper-inputs)[check-procedure-body]: Remove mentions of core-updates. --- guix/lint.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index 217a0d6696..2a703f9b6d 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -552,13 +552,10 @@ or \"bash-minimal\" is not in its inputs. 'wrap-script' is not supported." (define (check-procedure-body body) (match body ;; Explicitely setting an interpreter is acceptable, - ;; #:sh support is added on 'core-updates'. - ;; TODO(core-updates): remove mention of core-updates. (('wrap-program _ '#:sh . _) '()) (('wrap-program _ . _) (list (report-wrap-program-error package 'wrap-program))) ;; Wrapper of 'wrap-program' for Qt programs. - ;; TODO #:sh is not yet supported but probably will be. (('wrap-qt-program _ '#:sh . _) '()) (('wrap-qt-program _ . _) (list (report-wrap-program-error package 'wrap-qt-program))) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates 00/38] Clean up TODO(core-updates) 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos ` (36 preceding siblings ...) 2021-09-29 22:19 ` [bug#50905] [PATCH 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates Maxime Devos @ 2021-10-01 9:52 ` Mathieu Othacehe 2021-10-01 14:23 ` Maxime Devos 37 siblings, 1 reply; 80+ messages in thread From: Mathieu Othacehe @ 2021-10-01 9:52 UTC (permalink / raw) To: Maxime Devos; +Cc: 50905 Hello Maxime, > +(define mozilla-build-system > + (build-system > + (name 'mozilla) > + (description "The build system for Mozilla software using the Autotools") > + (lower lower-mozilla))) This new build system should be documented in the "Build systems" section of the documentation. Otherwise, the series looks fine and I'll probably apply it once the above comment is fixed. Thanks, Mathieu ^ permalink raw reply [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates 00/38] Clean up TODO(core-updates) 2021-10-01 9:52 ` [bug#50905] [PATCH core-updates 00/38] Clean up TODO(core-updates) Mathieu Othacehe @ 2021-10-01 14:23 ` Maxime Devos 0 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:23 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: 50905 [-- Attachment #1: Type: text/plain, Size: 634 bytes --] Mathieu Othacehe schreef op vr 01-10-2021 om 09:52 [+0000]: > Hello Maxime, > > > +(define mozilla-build-system > > + (build-system > > + (name 'mozilla) > > + (description "The build system for Mozilla software using the Autotools") > > + (lower lower-mozilla))) > > This new build system should be documented in the "Build systems" > section of the documentation. > > Otherwise, the series looks fine and I'll probably apply it once the > above comment is fixed. I sent a v2, wherein the ‘gnu: icecat: Use mozilla-build-system.’ documents the build system in doc/guix.texi. Greetings, Maxime. [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 260 bytes --] ^ permalink raw reply [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system. 2021-09-29 22:18 [bug#50905] [PATCH core-updates 00/38] Clean up TODO(core-updates) Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 02/38] gnu: nspr: Use mozilla-build-system Maxime Devos ` (37 more replies) 1 sibling, 38 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * guix/build-system/mozilla.scm (lower-mozilla): New procedure. (mozilla-build-system): New variable. * Makefile.am (MODULES): Add it. * doc/guix.texi (Build Systems): Document it. --- Makefile.am | 1 + doc/guix.texi | 9 ++++++ guix/build-system/mozilla.scm | 52 +++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 guix/build-system/mozilla.scm diff --git a/Makefile.am b/Makefile.am index 56f60278b7..76166f4eec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,7 @@ MODULES = \ guix/build-system/font.scm \ guix/build-system/go.scm \ guix/build-system/meson.scm \ + guix/build-system/mozilla.scm \ guix/build-system/minify.scm \ guix/build-system/minetest.scm \ guix/build-system/asdf.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 830a230bd0..996526eb83 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8000,6 +8000,15 @@ directory, the parameter @code{#:javascript-files} can be used to specify a list of file names to feed to the minifier. @end defvr +@defvr {Scheme Variable} mozilla-build-system +This variable is exported by @code{(guix build-system mozilla)}. It +sets the @code{--target} and @code{--host} configuration flags to what +software developed by Mozilla expects -- due to historical reasons, +Mozilla software expects @code{--host} to be the system that is +cross-compiled from and @code{--target} to be the system that is +cross-compiled to, contrary to the standard Autotools conventions. +@end defvr + @defvr {Scheme Variable} ocaml-build-system This variable is exported by @code{(guix build-system ocaml)}. It implements a build procedure for @uref{https://ocaml.org, OCaml} packages, which consists diff --git a/guix/build-system/mozilla.scm b/guix/build-system/mozilla.scm new file mode 100644 index 0000000000..b4141c8177 --- /dev/null +++ b/guix/build-system/mozilla.scm @@ -0,0 +1,52 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; 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 (guix build-system mozilla) + #:use-module (guix build-system gnu) + #:use-module (guix build-system) + #:use-module (guix utils) + #:export (mozilla-build-system)) + +;; +;; Build procedure for packages using Autotools with the Mozillian conventions +;; for --target, --host and --build, which are different from the GNU +;; conventions. +;; +;; Code: + +(define* (lower-mozilla name #:key system target #:allow-other-keys + #:rest arguments) + (define lower (build-system-lower gnu-build-system)) + (if target + (apply lower + (substitute-keyword-arguments arguments + ;; Override --target and --host to what Mozillian configure + ;; scripts expect. + ((#:configure-flags configure-flags ''()) + `(cons* ,(string-append "--target=" target) + ,(string-append "--host=" (nix-system->gnu-triplet system)) + ,configure-flags)))) + (apply lower name arguments))) ; not cross-compiling + +(define mozilla-build-system + (build-system + (name 'mozilla) + (description "The build system for Mozilla software using the Autotools") + (lower lower-mozilla))) + +;;; mozilla.scm ends here base-commit: 0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 02/38] gnu: nspr: Use mozilla-build-system. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 03/38] gnu: mozjs: " Maxime Devos ` (36 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/nss.scm (nspr)[build-system]: Adjust it. (nspr)[arguments]<#:configure-flags>: Remove now superfluous --target and --host. --- gnu/packages/nss.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 381756e387..6196ad692d 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -29,6 +29,7 @@ #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system mozilla) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages bash) @@ -49,7 +50,7 @@ (sha256 (base32 "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap")))) - (build-system gnu-build-system) + (build-system mozilla-build-system) (inputs ;; TODO(core-updates): Make these inputs unconditional. ;; For 'compile-et.pl' and 'nspr-config'. @@ -72,16 +73,7 @@ (list "--disable-static" "--enable-64bit" (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib") - ;; Mozilla deviates from Autotools conventions - ;; due to historical reasons. Adjust to Mozilla conventions, - ;; otherwise the Makefile will try to use TARGET-gcc - ;; as a ‘native’ compiler. - ,@(if (%current-target-system) - `(,(string-append "--host=" - (nix-system->gnu-triplet (%current-system))) - ,(string-append "--target=" (%current-target-system))) - '())) + (assoc-ref %outputs "out") "/lib")) ;; Use fixed timestamps for reproducibility. #:make-flags '("SH_DATE='1970-01-01 00:00:01'" ;; This is epoch 1 in microseconds. -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 03/38] gnu: mozjs: Use mozilla-build-system. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 02/38] gnu: nspr: Use mozilla-build-system Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 04/38] gnu: icecat: " Maxime Devos ` (35 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 Due to the use of 'inherit', all versions of mozjs are adjusted. * gnu/packages/gnuzilla.scm (mozjs)[build-system]: Adjust it. (mozjs)[arguments]<#:configure-flags>: Remove now superfluous --target and --host. --- gnu/packages/gnuzilla.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 5dd90e4e20..9647bb7db5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -49,6 +49,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cargo) #:use-module (guix build-system trivial) + #:use-module (guix build-system mozilla) #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -108,7 +109,7 @@ (substitute* '("js/src/config/milestone.pl") (("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE")) #t)))) - (build-system gnu-build-system) + (build-system mozilla-build-system) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -390,15 +391,7 @@ in C/C++.") ;; This is important because without it gjs will segfault during the ;; configure phase. With jemalloc only the standalone mozjs console ;; will work. - "--disable-jemalloc" - ;; Mozilla deviates from Autotools conventions due to historical - ;; reasons. - #$@(if (%current-target-system) - #~(#$(string-append - "--host=" - (nix-system->gnu-triplet (%current-system))) - #$(string-append "--target=" (%current-target-system))) - #~()))) + "--disable-jemalloc")) #:phases (modify-phases %standard-phases ;; Make sure pkg-config will be found. -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 04/38] gnu: icecat: Use mozilla-build-system. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 02/38] gnu: nspr: Use mozilla-build-system Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 03/38] gnu: mozjs: " Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 05/38] build/minetest-build-system: Move png-file? to (guix build utils) Maxime Devos ` (34 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 This doesn't actually have any effect because the 'configure' phase is replaced. * gnu/packages/gnuzilla.scm (icecat)[build-system]: Use mozilla-build-system. --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 9647bb7db5..655b0c04c3 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -884,7 +884,7 @@ from forcing GEXP-PROMISE." (name "icecat") (version %icecat-version) (source icecat-source) - (build-system gnu-build-system) + (build-system mozilla-build-system) (inputs `(("alsa-lib" ,alsa-lib) ("bzip2" ,bzip2) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 05/38] build/minetest-build-system: Move png-file? to (guix build utils). 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (2 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 04/38] gnu: icecat: " Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 06/38] gnu: mozjs: Make the native-inputs unconditional Maxime Devos ` (33 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 It's not really Minetest-specific. It was only placed in (guix build minetest-build-system) to avoid a world rebuild. * guix/build/minetest-build-system.scm (%png-magic-bytes,png-file?): Move to ... * guix/build/utils.scm (%png-magic-bytes,png-file?): ... here. --- guix/build/minetest-build-system.scm | 9 --------- guix/build/utils.scm | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm index 477cc3d1d0..5d7d8d2292 100644 --- a/guix/build/minetest-build-system.scm +++ b/guix/build/minetest-build-system.scm @@ -90,15 +90,6 @@ If it is unknown, make an educated guess." #:install-plan (mod-install-plan (apply guess-mod-name arguments)) arguments)) -(define %png-magic-bytes - ;; Magic bytes of PNG images, see ‘5.2 PNG signatures’ in - ;; ‘Portable Network Graphics (PNG) Specification (Second Edition)’ - ;; on <https://www.w3.org/TR/PNG/>. - #vu8(137 80 78 71 13 10 26 10)) - -(define png-file? - ((@@ (guix build utils) file-header-match) %png-magic-bytes)) - (define* (minimise-png #:key inputs native-inputs #:allow-other-keys) "Minimise PNG images found in the working directory." (define optipng (which "optipng")) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 3beb7da67a..39e581b0fa 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -61,6 +61,8 @@ symbolic-link? call-with-temporary-output-file call-with-ascii-input-file + file-header-match + png-file? elf-file? ar-file? gzip-file? @@ -290,6 +292,15 @@ with the bytes in HEADER, a bytevector." #f ;FILE is a directory (apply throw args)))))) +(define %png-magic-bytes + ;; Magic bytes of PNG images, see ‘5.2 PNG signatures’ in + ;; ‘Portable Network Graphics (PNG) Specification (Second Edition)’ + ;; on <https://www.w3.org/TR/PNG/>. + #vu8(137 80 78 71 13 10 26 10)) + +(define png-file? + (file-header-match %png-magic-bytes)) + (define %elf-magic-bytes ;; Magic bytes of ELF files. See <elf.h>. (u8-list->bytevector (map char->integer (string->list "\x7FELF")))) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 06/38] gnu: mozjs: Make the native-inputs unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (3 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 05/38] build/minetest-build-system: Move png-file? to (guix build utils) Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 07/38] gnu: mozjs: Make the quasiquote unconditional Maxime Devos ` (32 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/nss.scm (mozjs)[inputs]: Always include 'perl" and 'bash-minimal', even when compiling natively. --- gnu/packages/nss.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 6196ad692d..6315138c89 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -52,12 +52,9 @@ "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap")))) (build-system mozilla-build-system) (inputs - ;; TODO(core-updates): Make these inputs unconditional. ;; For 'compile-et.pl' and 'nspr-config'. - (if (%current-target-system) - `(("perl" ,perl) ; for 'compile-et.pl' - ("bash-minimal" ,bash-minimal)) ; for 'nspr-config' - '())) + `(("perl" ,perl) ; for 'compile-et.pl' + ("bash-minimal" ,bash-minimal))) ; for 'nspr-config' (native-inputs `(("perl" ,perl))) (arguments -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 07/38] gnu: mozjs: Make the quasiquote unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (4 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 06/38] gnu: mozjs: Make the native-inputs unconditional Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 08/38] gnu: isc-dhcp: Don't use canonical-package Maxime Devos ` (31 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/nss.scm (mozjs-60)[arguments]<#:configure-flags>: Always use quasiquote instead of quote. --- gnu/packages/gnuzilla.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 655b0c04c3..5273fbddf0 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -370,11 +370,7 @@ in C/C++.") `(#:tests? #f ; FIXME: all tests pass, but then the check phase fails anyway. #:test-target "check-jstests" #:configure-flags - ;; TODO(core-updates): unconditionally use 'quasiquote - ,#~(#$(if (%current-target-system) - #~quasiquote - #~quote) - ("--enable-ctypes" + ,#~`("--enable-ctypes" "--enable-optimize" "--enable-pie" "--enable-readline" @@ -391,7 +387,7 @@ in C/C++.") ;; This is important because without it gjs will segfault during the ;; configure phase. With jemalloc only the standalone mozjs console ;; will work. - "--disable-jemalloc")) + "--disable-jemalloc") #:phases (modify-phases %standard-phases ;; Make sure pkg-config will be found. -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 08/38] gnu: isc-dhcp: Don't use canonical-package. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (5 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 07/38] gnu: mozjs: Make the quasiquote unconditional Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 09/38] gnu: isc-dhcp: Make an input unconditional Maxime Devos ` (30 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 As I understand it, canonical-package is only for things that won't end up in the closure, so canonical-package shouldn't be used here. * gnu/packages/admin.scm (isc-dhcp)[inputs]{bash}: Remove 'canonical-package'. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index aad8586a71..c535baf1d6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1318,7 +1318,7 @@ connection alive.") ;; TODO(core-updates): simply make this unconditional ,@(if (%current-target-system) ;; for wrap-program - `(("bash" ,(canonical-package bash-minimal))) + `(("bash" ,bash-minimal)) '()) ,@(if (hurd-target?) '() `(("net-tools" ,net-tools) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 09/38] gnu: isc-dhcp: Make an input unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (6 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 08/38] gnu: isc-dhcp: Don't use canonical-package Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching Maxime Devos ` (29 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/admin.scm (isc-dhcp)[inputs]{bash}: Always include this input, even when compiling natively. --- gnu/packages/admin.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c535baf1d6..744692bb6c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1315,11 +1315,7 @@ connection alive.") ("file" ,file))) (inputs `(("inetutils" ,inetutils) - ;; TODO(core-updates): simply make this unconditional - ,@(if (%current-target-system) - ;; for wrap-program - `(("bash" ,bash-minimal)) - '()) + ("bash" ,bash-minimal) ,@(if (hurd-target?) '() `(("net-tools" ,net-tools) ("iproute" ,iproute))) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (7 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 09/38] gnu: isc-dhcp: Make an input unconditional Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 11/38] gnu: isc-dhcp: Remove trailing #t Maxime Devos ` (28 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>{post-install}: Remove parts indicated by TODOs. --- gnu/packages/admin.scm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 744692bb6c..57801200bd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1267,11 +1267,7 @@ connection alive.") "--owner=root:0" "--group=root:0"))))) (add-after 'install 'post-install - ;; TODO(core-updates): native-inputs isn't required anymore. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; Install the dhclient script for GNU/Linux and make sure ;; if finds all the programs it needs. (let* ((out (assoc-ref outputs "out")) @@ -1295,19 +1291,6 @@ connection alive.") (string-append dir "/bin:" dir "/sbin")) (list inetutils net-tools coreutils sed)))) - ;; TODO(core-updates): should not be required anymore, - ;; once <https://issues.guix.gnu.org/49290> has been merged. - ,@(if (%current-target-system) - '((for-each - (lambda (file) - (substitute* file - (((assoc-ref native-inputs "bash")) - (assoc-ref inputs "bash")))) - (list (string-append libexec - "/dhclient-script") - (string-append libexec - "/.dhclient-script-real")))) - '()) #t)))))) (native-inputs -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 11/38] gnu: isc-dhcp: Remove trailing #t. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (8 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 12/38] gnu: gobject-introspection: Move things to native-inputs Maxime Devos ` (27 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 They aren't required anymore on core-updates. * gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>: Remove trailing #t. --- gnu/packages/admin.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 57801200bd..78b37c04d7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1218,8 +1218,7 @@ connection alive.") (("^RELEASETYPE=.*") (format #f "RELEASETYPE=~a\n" ,bind-release-type)) (("^RELEASEVER=.*") - (format #f "RELEASEVER=~a\n" ,bind-release-version))) - #t)) + (format #f "RELEASEVER=~a\n" ,bind-release-version))))) ,@(if (%current-target-system) '((add-before 'configure 'fix-bind-cross-compilation (lambda _ @@ -1290,8 +1289,7 @@ connection alive.") ,(map (lambda (dir) (string-append dir "/bin:" dir "/sbin")) - (list inetutils net-tools coreutils sed)))) - #t)))))) + (list inetutils net-tools coreutils sed)))))))))) (native-inputs `(("perl" ,perl) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 12/38] gnu: gobject-introspection: Move things to native-inputs. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (9 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 11/38] gnu: isc-dhcp: Remove trailing #t Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 13/38] gnu: gobject-introspection: Use python instead of python-wrapper Maxime Devos ` (26 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/glib.scm (gobject-introspection)[native-inputs]: Make 'bison' and 'flex' inputs unconditional ... (gobject-introspection)[inputs]: ... and unconditionally remove them here. --- gnu/packages/glib.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index bdcc108ac1..cbaece6cf1 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -486,18 +486,12 @@ be used when cross-compiling." (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config) - ;; TODO(core-updates): Unconditionally place "flex" and "bison" - ;; in 'native-inputs'. - ,@(if (%current-target-system) - `(("bison" ,bison) - ("flex" ,flex)) - '()))) + ("bison" ,bison) + ("flex" ,flex))) (inputs `(,@(if (%current-target-system) `(("python" ,python)) - `(("bison" ,bison) - ("flex" ,flex) - ("python" ,python-wrapper))) + `(("python" ,python-wrapper))) ("zlib" ,zlib))) (propagated-inputs `(("glib" ,glib) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 13/38] gnu: gobject-introspection: Use python instead of python-wrapper. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (10 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 12/38] gnu: gobject-introspection: Move things to native-inputs Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 14/38] gnu: cairo: Make 'bash-minimal' input unconditional Maxime Devos ` (25 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 'python' is a tiny bit simpler than 'python-wrapper', and is already used when cross-compiling. Use it unconditionally. * gnu/packages/glib.scm (gobject-introspection)[inputs]{python}: Use 'python' even when compiling natively. --- gnu/packages/glib.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index cbaece6cf1..8117d7904d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -489,9 +489,7 @@ be used when cross-compiling." ("bison" ,bison) ("flex" ,flex))) (inputs - `(,@(if (%current-target-system) - `(("python" ,python)) - `(("python" ,python-wrapper))) + `(("python" ,python) ("zlib" ,zlib))) (propagated-inputs `(("glib" ,glib) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 14/38] gnu: cairo: Make 'bash-minimal' input unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (11 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 13/38] gnu: gobject-introspection: Use python instead of python-wrapper Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 15/38] gnu: libthai: Make 'datrie' " Maxime Devos ` (24 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gtk.scm (cairo)[inputs]{bash-minimal}: Make this input unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9868b11e48..aa5b48dac8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -182,10 +182,7 @@ tools have full access to view and control running applications.") ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs - ;; TODO(core-updates): make this unconditional - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ; for glib-or-gtk-wrap ("drm" ,libdrm) ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 15/38] gnu: libthai: Make 'datrie' input unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (12 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 14/38] gnu: cairo: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 16/38] gnu: libdatrie: Make input labels match the package name Maxime Devos ` (23 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gtk.scm (libthai)[native-inputs]{datrie}: Make this input unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index aa5b48dac8..5ae4aeb66c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -326,10 +326,7 @@ representing trie. Trie is a kind of digital search tree.") (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config) - ;; TODO(core-updates): Make this input unconditional. - ,@(if (%current-target-system) - `(("datrie" ,libdatrie)) ; for 'trietool' - '()))) + ("datrie" ,libdatrie))) ; for 'trietool' (propagated-inputs `(("datrie" ,libdatrie))) (synopsis "Thai language support library") -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 16/38] gnu: libdatrie: Make input labels match the package name. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (13 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 15/38] gnu: libthai: Make 'datrie' " Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 17/38] gnu: pango: Make 'bash-minimal' input unconditional Maxime Devos ` (22 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gtk.scm (libthai)[native-inputs]{datrie}: Rename to ... (libthai)[native-inputs]{libdatrie}: ... this. (libthai)[propagated-inputs]{datrie}: Rename to ... (libthai)[propagated-inputs]{libdatrie}: ... this. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5ae4aeb66c..219971a40e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -326,9 +326,9 @@ representing trie. Trie is a kind of digital search tree.") (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config) - ("datrie" ,libdatrie))) ; for 'trietool' + ("libdatrie" ,libdatrie))) ; for 'trietool' (propagated-inputs - `(("datrie" ,libdatrie))) + `(("libdatrie" ,libdatrie))) (synopsis "Thai language support library") (description "LibThai is a set of Thai language support routines aimed to ease developers’ tasks to incorporate Thai language support in their -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 17/38] gnu: pango: Make 'bash-minimal' input unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (14 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 16/38] gnu: libdatrie: Make input labels match the package name Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs Maxime Devos ` (21 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gtk.scm (pango)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 219971a40e..4f8b87ea48 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -377,10 +377,7 @@ applications.") ("libxft" ,libxft) ("libxrender" ,libxrender))) (inputs - ;; TODO(core-updates): Unconditionally add "bash-minimal" - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ; for glib-or-gtk-wrap ("zlib" ,zlib))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums, etc. -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (15 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 17/38] gnu: pango: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 19/38] gnu: gdk-pixbuf: Respect #:tests? Maxime Devos ` (20 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}: Unconditionally look in (or native-inputs inputs) for docbook-xsl and docbook-xml. --- gnu/packages/gtk.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4f8b87ea48..fd7feab69b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -623,23 +623,17 @@ highlighting and other features typical of a source code editor.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Unconditionally look in (or native-inputs inputs) - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "docs" (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/"))) (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") "/xml/dtd/docbook/")))) #t)) (add-before 'configure 'disable-failing-tests -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 19/38] gnu: gdk-pixbuf: Respect #:tests?. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (16 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 20/38] gnu: gdk-pixbuf: Use target predicates Maxime Devos ` (19 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{check}: Don't run the tests if the value for #:tests? is false. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fd7feab69b..bbef514dd7 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -646,8 +646,9 @@ highlighting and other features typical of a source code editor.") ,@(if (any (cute string=? <> (%current-system)) '("armhf-linux" "aarch64-linux")) '((replace 'check - (lambda _ - (invoke "meson" "test" "--timeout-multiplier" "5")))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "meson" "test" "--timeout-multiplier" "5"))))) '())))) (propagated-inputs `( ;; Required by gdk-pixbuf-2.0.pc -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 20/38] gnu: gdk-pixbuf: Use target predicates. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (17 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 19/38] gnu: gdk-pixbuf: Respect #:tests? Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional Maxime Devos ` (18 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 This seems a little tidier to me. * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{check}: Use target-arm? instead of string=?. --- gnu/packages/gtk.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bbef514dd7..691e207165 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -643,8 +643,7 @@ highlighting and other features typical of a source code editor.") "")) #t)) ;; The slow tests take longer than the specified timeout. - ,@(if (any (cute string=? <> (%current-system)) - '("armhf-linux" "aarch64-linux")) + ,@(if (target-arm? (%current-system)) '((replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (18 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 20/38] gnu: gdk-pixbuf: Use target predicates Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 22/38] gnu: gdk-pixbuf: Remove trailing #t Maxime Devos ` (17 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gtk.scm (gdk-pixbuf)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gtk.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 691e207165..cfc4c61235 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -657,9 +657,7 @@ highlighting and other features typical of a source code editor.") ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ; for glib-or-gtk-wrap ("jasper" ,jasper) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 22/38] gnu: gdk-pixbuf: Remove trailing #t. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (19 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional Maxime Devos ` (16 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>: Remove the trailing #t. --- gnu/packages/gtk.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cfc4c61235..f37dfaf89d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -634,14 +634,12 @@ highlighting and other features typical of a source code editor.") (("http://www.oasis-open.org/docbook/xml/4\\.3/") (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") - "/xml/dtd/docbook/")))) - #t)) + "/xml/dtd/docbook/")))))) (add-before 'configure 'disable-failing-tests (lambda _ (substitute* "tests/meson.build" (("\\[ 'pixbuf-fail', \\['conform', 'slow'\\], \\],") - "")) - #t)) + "")))) ;; The slow tests take longer than the specified timeout. ,@(if (target-arm? (%current-system)) '((replace 'check -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (20 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 22/38] gnu: gdk-pixbuf: Remove trailing #t Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 24/38] gnu: at-spi2-core: Respect #:tests? Maxime Devos ` (15 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gtk.scm (at-spi2-core)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f37dfaf89d..adb4d847a4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -778,10 +778,7 @@ scaled, composited, modified, saved, or rendered.") (invoke "dbus-launch" "ninja" "test"))) (delete 'check)))) (inputs - ;; TODO(core-updates): Make this input unconditional. - (if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '())) + `(("bash-minimal" ,bash-minimal))) (propagated-inputs ;; atspi-2.pc refers to all these. `(("dbus" ,dbus) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 24/38] gnu: at-spi2-core: Respect #:tests?. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (21 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs Maxime Devos ` (14 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>{check}: Don't run tests if the value of #:tests? if false. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index adb4d847a4..d829218305 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -768,14 +768,15 @@ scaled, composited, modified, saved, or rendered.") (string-append out "/share/gtk-doc"))) #t)))) (add-after 'install 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME ;; Run test-suite under a dbus session. (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service (string-append %output "/share")) ;; Don't fail on missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") ; - (invoke "dbus-launch" "ninja" "test"))) + (when tests? + (invoke "dbus-launch" "ninja" "test")))) (delete 'check)))) (inputs `(("bash-minimal" ,bash-minimal))) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (22 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 24/38] gnu: at-spi2-core: Respect #:tests? Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 26/38] gnu: at-spi2-core: Remove trailing #t Maxime Devos ` (13 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>{patch-docbook-sgml}: Unconditionally look in (or native-inputs inputs) for docbook-xml. --- gnu/packages/gtk.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d829218305..634a0125d8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -740,15 +740,10 @@ scaled, composited, modified, saved, or rendered.") (lambda* (#:key outputs #:allow-other-keys) (mkdir-p (string-append (assoc-ref outputs "doc") "/share")) #t)) - ;; TODO(core-updates): Unconditionally use (or native-inputs inputs) (add-after 'unpack 'patch-docbook-sgml - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((xmldoc - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) + (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") "/xml/dtd/docbook"))) (substitute* "doc/libatspi/libatspi-docs.sgml" -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 26/38] gnu: at-spi2-core: Remove trailing #t. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (23 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 27/38] gnu: avahi: Make 'bash-minimal' input unconditional Maxime Devos ` (12 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>: Remove trailing #t. --- gnu/packages/gtk.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 634a0125d8..842a46a846 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -734,12 +734,11 @@ scaled, composited, modified, saved, or rendered.") ;; Ensure that the cross-references point to the "doc" output. (substitute* "doc/libatspi/meson.build" (("docpath =.*") - (string-append "docpath = '" (assoc-ref outputs "doc") "/share/gtk-doc/html'\n"))) - #t)) + (string-append "docpath = '" (assoc-ref outputs "doc") + "/share/gtk-doc/html'\n"))))) (add-before 'install 'prepare-doc-directory (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "doc") "/share")) - #t)) + (mkdir-p (string-append (assoc-ref outputs "doc") "/share")))) (add-after 'unpack 'patch-docbook-sgml (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((xmldoc @@ -748,8 +747,7 @@ scaled, composited, modified, saved, or rendered.") "/xml/dtd/docbook"))) (substitute* "doc/libatspi/libatspi-docs.sgml" (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd"))) - #t))) + (string-append xmldoc "/docbookx.dtd")))))) ,@(if (%current-target-system) '() '((add-after 'install 'move-documentation @@ -760,8 +758,7 @@ scaled, composited, modified, saved, or rendered.") (string-append out "/share/gtk-doc") (string-append doc "/share/gtk-doc")) (delete-file-recursively - (string-append out "/share/gtk-doc"))) - #t)))) + (string-append out "/share/gtk-doc"))))))) (add-after 'install 'check (lambda* (#:key tests? #:allow-other-keys) (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 27/38] gnu: avahi: Make 'bash-minimal' input unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (24 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 26/38] gnu: at-spi2-core: Remove trailing #t Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional Maxime Devos ` (11 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/avahi.scm (avahi)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/avahi.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 7dcaa17a76..20c0f2708e 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -91,10 +91,7 @@ (find-files (string-append #$output "/etc/avahi"))))))) '()))) (inputs - ;; TODO(core-updates): Make this input unconditional. - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '()) + `(("bash-minimal" ,bash-minimal) ("dbus" ,dbus) ("expat" ,expat) ("gdbm" ,gdbm) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (25 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 27/38] gnu: avahi: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables Maxime Devos ` (10 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/avahi.scm (avahi)[arguments]<#:phases>{patch-more-shebangs}: Make it unconditional. --- gnu/packages/avahi.scm | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 20c0f2708e..797e35e7eb 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -75,21 +75,18 @@ ,@(if (%current-target-system) '("ac_cv_prog_have_pkg_config=yes") '())) - ;; TODO(core-updates): Make this unconditional. - ,@(if (%current-target-system) - `(#:modules ((srfi srfi-26) - (guix build utils) - (guix build gnu-build-system)) - #:phases - ,#~(modify-phases %standard-phases - (add-after 'patch-shebangs 'patch-more-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (define path - `(,(dirname (search-input-file inputs "bin/sh")))) - (for-each - (cut patch-shebang <> path) - (find-files (string-append #$output "/etc/avahi"))))))) - '()))) + #:modules ((srfi srfi-26) + (guix build utils) + (guix build gnu-build-system)) + #:phases + ,#~(modify-phases %standard-phases + (add-after 'patch-shebangs 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + (define path + `(,(dirname (search-input-file inputs "bin/sh")))) + (for-each + (cut patch-shebang <> path) + (find-files (string-append #$output "/etc/avahi")))))))) (inputs `(("bash-minimal" ,bash-minimal) ("dbus" ,dbus) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (26 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs Maxime Devos ` (9 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/freedesktop.scm (elogind)[arguments]<#:configure-flags>: Use #$output and this-package-input instead of %outputs and %build-inputs. --- gnu/packages/freedesktop.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 550253bc34..9bcf2d8d3e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -583,20 +583,12 @@ the freedesktop.org XDG Base Directory specification.") (build-system meson-build-system) (arguments `(#:configure-flags - ;; TODO(core-updates): Use #$output unconditionally. - ,#~(let* ((out #$(if (%current-target-system) - #~#$output - #~(assoc-ref %outputs "out"))) + ,#~(let* ((out #$output) (sysconf (string-append out "/etc")) (libexec (string-append out "/libexec/elogind")) (dbuspolicy (string-append out "/etc/dbus-1/system.d")) - ;; TODO(core-updates): use this-package-input unconditionally. - (shadow #$(if (%current-target-system) - (this-package-input "shadow") - #~(assoc-ref %build-inputs "shadow"))) - (shepherd #$(if (%current-target-system) - (this-package-input "shepherd") - #~(assoc-ref %build-inputs "shepherd"))) + (shadow #$(this-package-input "shadow")) + (shepherd #$(this-package-input "shepherd")) (halt-path (string-append shepherd "/sbin/halt")) (kexec-path "") ;not available in Guix yet (nologin-path (string-append shadow "/sbin/nologin")) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (27 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 31/38] gnu: json-glib: " Maxime Devos ` (8 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/freedesktop.scm (wayland)[arguments]<#:phases>{patch-docbook-sgml}: Unconditionally look in (or native-inputs inputs) for docbook-xml and docbook-xml-4.2. --- gnu/packages/freedesktop.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9bcf2d8d3e..0f04a38c00 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -975,22 +975,16 @@ Python.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook-xml - ;; TODO(core-updates): Use 'native-inputs' unconditionally - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "doc" (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.5/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") "/xml/dtd/docbook/")) (("http://www.oasis-open.org/docbook/xml/4\\.2/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml-4.2") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml-4.2") "/xml/dtd/docbook/")))) #t)) (add-after 'install 'move-doc -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (28 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional Maxime Devos ` (7 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gnome.scm (json-glib)[arguments]<#:phases>{patch-docbook}: Unconditionally look in (or native-inputs inputs) for docbook-xml and docbook-xsl. --- gnu/packages/gnome.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 497713cddc..57d9a9be79 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4607,24 +4607,17 @@ configuration storage systems.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Use (or native-inputs inputs) - ;; unconditionally. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "doc" (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) + (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") "/xml/dtd/docbook/"))) (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/")))) #t)) ;; When cross-compiling, there are no docs to move. -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (29 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 31/38] gnu: json-glib: " Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 33/38] gnu: heimdal: Make some parts of phases unconditional Maxime Devos ` (6 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/gnome.scm (json-glib)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gnome.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 57d9a9be79..b00a02b81f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4645,10 +4645,7 @@ configuration storage systems.") ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) (inputs - ;; TODO(core-updates): Make this input unconditional. - (if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '())) + `(("bash-minimal" ,bash-minimal))) (propagated-inputs `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 33/38] gnu: heimdal: Make some parts of phases unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (30 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional Maxime Devos ` (5 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/kerberos.scm (heimdal)[arguments]<#:phases>{pre-configure}: Make the '(%current-target-system)' branches unconditional. --- gnu/packages/kerberos.scm | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 82609ce66e..6bfb758900 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -237,14 +237,7 @@ After installation, the system administrator should generate keys using #~())) #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure - ;; TODO(core-updates): Unconditionally use the - ;; %current-target-system branch. - (,(if (%current-target-system) - 'lambda* - 'lambda) - ,(if (%current-target-system) - '(#:key inputs #:allow-other-keys) - '_) + (lambda* (#:key inputs #:allow-other-keys) ,@(if (%current-target-system) `((substitute* "configure" ;; The e2fsprogs input is included for libcom_err, @@ -256,22 +249,17 @@ After installation, the system administrator should generate keys using (("ac_cv_prog_COMPILE_ET=\\$\\{with_cross_tools\\}compile_et") "ac_cv_PROG_COMPILE_ET=compile_et"))) '()) - ,@(if (%current-target-system) - '((substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") - (("/bin/sh") - (search-input-file inputs "bin/sh")) - ;; Use the cross-compiled bash instead of the - ;; native bash (XXX shouldn't _PATH_BSHELL point - ;; to a cross-compiled bash?). - (("_PATH_BSHELL") - (string-append - "\"" (search-input-file inputs "bin/sh") "\""))) - (substitute* '("tools/Makefile.in") - (("/bin/sh") (which "sh")))) - '((substitute* '("appl/afsutil/pagsh.c" - "tools/Makefile.in") - (("/bin/sh") (which "sh"))) - #t)))) + (substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") + (("/bin/sh") + (search-input-file inputs "bin/sh")) + ;; Use the cross-compiled bash instead of the + ;; native bash (XXX shouldn't _PATH_BSHELL point + ;; to a cross-compiled bash?). + (("_PATH_BSHELL") + (string-append + "\"" (search-input-file inputs "bin/sh") "\""))) + (substitute* '("tools/Makefile.in") + (("/bin/sh") (which "sh"))))) (add-before 'check 'pre-check (lambda _ ;; For 'getxxyyy-test'. -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (31 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 33/38] gnu: heimdal: Make some parts of phases unconditional Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 35/38] gnu: libcap: Unconditionally use #$output Maxime Devos ` (4 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/kerberos.scm (heimdal)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/kerberos.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 6bfb758900..739b0169dc 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -280,10 +280,7 @@ After installation, the system administrator should generate keys using `(("perl" ,perl)) '()))) (inputs `(("readline" ,readline) - ;; TODO(core-updates): Make this input unconditional. - ,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '()) + ("bash-minimal" ,bash-minimal) ("bdb" ,bdb) ("e2fsprogs" ,e2fsprogs) ;for libcom_err ("sqlite" ,sqlite))) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 35/38] gnu: libcap: Unconditionally use #$output. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (32 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 36/38] gnu: libproxy: Respect #:tests? Maxime Devos ` (3 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/linux.scm (libcap)[arguments]<#:phases>{configure}: Unconditionally use #$output instead of %output. --- gnu/packages/linux.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b771f65d92..3c8b4546af 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3004,12 +3004,7 @@ configuration (iptunnel, ipmaddr).") (substitute* "Make.Rules" (("LDFLAGS \\?= #-g") (string-append "LDFLAGS ?= -Wl,-rpath=" - ;; TODO(core-updates): Use #$output - ;; unconditionally. - #$(if (%current-target-system) - #~#$output - '%output) - "/lib")))))) + #$output "/lib")))))) #:test-target "test" #:make-flags (list "lib=lib" -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 36/38] gnu: libproxy: Respect #:tests?. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (33 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 35/38] gnu: libcap: Unconditionally use #$output Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 37/38] build/qt-utils: Allow overriding the shell interpreter used Maxime Devos ` (2 subsequent siblings) 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * gnu/packages/networking.scm (libproxy)[arguments]<#:phases>{check}: Don't run the tests if the value for #:tests? is false. --- gnu/packages/networking.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c426c95e71..d6a2b6bb6b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2251,16 +2251,12 @@ sockets in Perl.") `(("dbus" ,dbus) ("zlib" ,zlib))) (arguments - `(#:phases + '(#:phases (modify-phases %standard-phases (replace 'check - ;; TODO(core-updates): Make this unconditional. - ,(if (%current-target-system) - '(lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" "url-test"))) - '(lambda _ - (invoke "ctest" "-E" "url-test"))))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" "url-test"))))))) (synopsis "Library providing automatic proxy configuration management") (description "Libproxy handles the details of HTTP/HTTPS proxy configuration for applications across all scenarios. Applications using -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 37/38] build/qt-utils: Allow overriding the shell interpreter used. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (34 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 36/38] gnu: libproxy: Respect #:tests? Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates Maxime Devos 2021-10-02 16:54 ` bug#50905: [PATCH core-updates 00/38] Clean up TODO(core-updates) Mathieu Othacehe 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 * guix/build/qt-utils.scm (wrap-qt-program*): Add #:sh argument and pass it to 'wrap-program'. (wrap-qt-program): Likewise, but pass it to 'wrap-qt-program*' instead. (wrap-all-qt-programs): Likewise, but pass it to 'wrap-qt-program' instead. --- guix/build/qt-utils.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80cab7d..97145a116d 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -90,7 +90,7 @@ '("QTWEBENGINEPROCESS_PATH" = regular "/lib/qt5/libexec/QtWebEngineProcess")))) -(define* (wrap-qt-program* program #:key inputs output-dir +(define* (wrap-qt-program* program #:key sh inputs output-dir qt-wrap-excluded-inputs) (define input-directories @@ -105,9 +105,9 @@ (cons output-dir input-directories) output-dir))) (when (not (null? vars-to-wrap)) - (apply wrap-program program vars-to-wrap)))) + (apply wrap-program program #:sh sh vars-to-wrap)))) -(define* (wrap-qt-program program-name #:key inputs output +(define* (wrap-qt-program program-name #:key (sh (which "bash")) inputs output (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)) "Wrap the specified programm (which must reside in the OUTPUT's \"/bin\" directory) with suitably set environment variables. @@ -115,10 +115,11 @@ directory) with suitably set environment variables. This is like qt-build-systems's phase \"qt-wrap\", but only the named program is wrapped." (wrap-qt-program* (string-append output "/bin/" program-name) + #:sh sh #:output-dir output #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)) -(define* (wrap-all-qt-programs #:key inputs outputs +(define* (wrap-all-qt-programs #:key (sh (which "bash")) inputs outputs (qt-wrap-excluded-outputs '()) (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs) #:allow-other-keys) @@ -144,6 +145,7 @@ add a dependency of that output on Qt." ((output . output-dir) (unless (member output qt-wrap-excluded-outputs) (for-each (cut wrap-qt-program* <> + #:sh sh #:output-dir output-dir #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs) (find-files-to-wrap output-dir)))))) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* [bug#50905] [PATCH core-updates v2 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates. 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (35 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 37/38] build/qt-utils: Allow overriding the shell interpreter used Maxime Devos @ 2021-10-01 14:21 ` Maxime Devos 2021-10-02 16:54 ` bug#50905: [PATCH core-updates 00/38] Clean up TODO(core-updates) Mathieu Othacehe 37 siblings, 0 replies; 80+ messages in thread From: Maxime Devos @ 2021-10-01 14:21 UTC (permalink / raw) To: Mathieu Othacehe; +Cc: Maxime Devos, 50905 The #:sh argument of 'wrap-program' and 'wrap-qt-program' is now in the current branch, so some comments aren't relevant anymore. * guix/lint.scm (check-wrapper-inputs)[check-procedure-body]: Remove mentions of core-updates. --- guix/lint.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index 217a0d6696..2a703f9b6d 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -552,13 +552,10 @@ or \"bash-minimal\" is not in its inputs. 'wrap-script' is not supported." (define (check-procedure-body body) (match body ;; Explicitely setting an interpreter is acceptable, - ;; #:sh support is added on 'core-updates'. - ;; TODO(core-updates): remove mention of core-updates. (('wrap-program _ '#:sh . _) '()) (('wrap-program _ . _) (list (report-wrap-program-error package 'wrap-program))) ;; Wrapper of 'wrap-program' for Qt programs. - ;; TODO #:sh is not yet supported but probably will be. (('wrap-qt-program _ '#:sh . _) '()) (('wrap-qt-program _ . _) (list (report-wrap-program-error package 'wrap-qt-program))) -- 2.33.0 ^ permalink raw reply related [flat|nested] 80+ messages in thread
* bug#50905: [PATCH core-updates 00/38] Clean up TODO(core-updates) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos ` (36 preceding siblings ...) 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates Maxime Devos @ 2021-10-02 16:54 ` Mathieu Othacehe 37 siblings, 0 replies; 80+ messages in thread From: Mathieu Othacehe @ 2021-10-02 16:54 UTC (permalink / raw) To: Maxime Devos; +Cc: 50905-done > * guix/build-system/mozilla.scm > (lower-mozilla): New procedure. > (mozilla-build-system): New variable. > * Makefile.am (MODULES): Add it. > * doc/guix.texi (Build Systems): Document it. Pushed the v2 on core-updates, Thanks, Mathieu ^ permalink raw reply [flat|nested] 80+ messages in thread
end of thread, other threads:[~2021-10-02 16:55 UTC | newest] Thread overview: 80+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-09-29 22:18 [bug#50905] [PATCH core-updates 00/38] Clean up TODO(core-updates) Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 02/38] gnu: nspr: Use mozilla-build-system Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 03/38] gnu: mozjs: " Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 04/38] gnu: icecat: " Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 05/38] build/minetest-build-system: Move png-file? to (guix build utils) Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 06/38] gnu: mozjs: Make the native-inputs unconditional Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 07/38] gnu: mozjs: Make the quasiquote unconditional Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 08/38] gnu: isc-dhcp: Don't use canonical-package Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 09/38] gnu: isc-dhcp: Make an input unconditional Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 11/38] gnu: isc-dhcp: Remove trailing #t Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 12/38] gnu: gobject-introspection: Move things to native-inputs Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 13/38] gnu: gobject-introspection: Use python instead of python-wrapper Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 14/38] gnu: cairo: Make 'bash-minimal' input unconditional Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 15/38] gnu: libthai: Make 'datrie' " Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 16/38] gnu: libdatrie: Make input labels match the package name Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 17/38] gnu: pango: Make 'bash-minimal' input unconditional Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 19/38] gnu: gdk-pixbuf: Respect #:tests? Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 20/38] gnu: gdk-pixbuf: Use target predicates Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 22/38] gnu: gdk-pixbuf: Remove trailing #t Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 24/38] gnu: at-spi2-core: Respect #:tests? Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 26/38] gnu: at-spi2-core: Remove trailing #t Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 27/38] gnu: avahi: Make 'bash-minimal' input unconditional Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 31/38] gnu: json-glib: " Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 33/38] gnu: heimdal: Make some parts of phases unconditional Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 35/38] gnu: libcap: Unconditionally use #$output Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 36/38] gnu: libproxy: Respect #:tests? Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 37/38] build/qt-utils: Allow overriding the shell interpreter used Maxime Devos 2021-09-29 22:19 ` [bug#50905] [PATCH 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates Maxime Devos 2021-10-01 9:52 ` [bug#50905] [PATCH core-updates 00/38] Clean up TODO(core-updates) Mathieu Othacehe 2021-10-01 14:23 ` Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 02/38] gnu: nspr: Use mozilla-build-system Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 03/38] gnu: mozjs: " Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 04/38] gnu: icecat: " Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 05/38] build/minetest-build-system: Move png-file? to (guix build utils) Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 06/38] gnu: mozjs: Make the native-inputs unconditional Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 07/38] gnu: mozjs: Make the quasiquote unconditional Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 08/38] gnu: isc-dhcp: Don't use canonical-package Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 09/38] gnu: isc-dhcp: Make an input unconditional Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 11/38] gnu: isc-dhcp: Remove trailing #t Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 12/38] gnu: gobject-introspection: Move things to native-inputs Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 13/38] gnu: gobject-introspection: Use python instead of python-wrapper Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 14/38] gnu: cairo: Make 'bash-minimal' input unconditional Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 15/38] gnu: libthai: Make 'datrie' " Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 16/38] gnu: libdatrie: Make input labels match the package name Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 17/38] gnu: pango: Make 'bash-minimal' input unconditional Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 19/38] gnu: gdk-pixbuf: Respect #:tests? Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 20/38] gnu: gdk-pixbuf: Use target predicates Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 22/38] gnu: gdk-pixbuf: Remove trailing #t Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 24/38] gnu: at-spi2-core: Respect #:tests? Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 26/38] gnu: at-spi2-core: Remove trailing #t Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 27/38] gnu: avahi: Make 'bash-minimal' input unconditional Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 31/38] gnu: json-glib: " Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 33/38] gnu: heimdal: Make some parts of phases unconditional Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 35/38] gnu: libcap: Unconditionally use #$output Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 36/38] gnu: libproxy: Respect #:tests? Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 37/38] build/qt-utils: Allow overriding the shell interpreter used Maxime Devos 2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates Maxime Devos 2021-10-02 16:54 ` bug#50905: [PATCH core-updates 00/38] Clean up TODO(core-updates) Mathieu Othacehe
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/guix.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.