1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-08 22:20:38 +02:00
Commit Graph

84377 Commits

Author SHA1 Message Date
Maxime Devos
fcaed5b81e lint: check-wrapper-inputs: Remove mentions of core-updates.
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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:06 +00:00
Maxime Devos
77b98bf187 build/qt-utils: Allow overriding the shell interpreter used.
* 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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:06 +00:00
Maxime Devos
a7bc1c8dd3 gnu: libproxy: Respect #:tests?.
* gnu/packages/networking.scm (libproxy)[arguments]<#:phases>{check}: Don't
  run the tests if the value for #:tests? is false.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:06 +00:00
Maxime Devos
d3d6e8b31a gnu: libcap: Unconditionally use #$output.
* gnu/packages/linux.scm (libcap)[arguments]<#:phases>{configure}:
  Unconditionally use #$output instead of %output.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:06 +00:00
Maxime Devos
ea5039c765 gnu: heimdal: Make 'bash-minimal' input unconditional.
* gnu/packages/kerberos.scm (heimdal)[inputs]{bash-minimal}:
  Make it unconditional.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:06 +00:00
Maxime Devos
296599dac5 gnu: heimdal: Make some parts of phases unconditional.
* gnu/packages/kerberos.scm (heimdal)[arguments]<#:phases>{pre-configure}:
  Make the '(%current-target-system)' branches unconditional.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:06 +00:00
Maxime Devos
4acddaa659 gnu: json-glib: Make 'bash-minimal' input unconditional.
* gnu/packages/gnome.scm (json-glib)[inputs]{bash-minimal}:
  Make it unconditional.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:06 +00:00
Maxime Devos
97cd9b73a6 gnu: json-glib: Unconditionally lookup docbook in native-inputs.
* gnu/packages/gnome.scm
  (json-glib)[arguments]<#:phases>{patch-docbook}:
  Unconditionally look in (or native-inputs inputs) for docbook-xml and
  docbook-xsl.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:05 +00:00
Maxime Devos
65e5f1475d gnu: wayland: Unconditionally lookup docbook in native-inputs.
* 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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:05 +00:00
Maxime Devos
a4c40efa05 gnu: freedesktop: Unconditionally use alternatives to % variables.
* gnu/packages/freedesktop.scm
  (elogind)[arguments]<#:configure-flags>: Use #$output and this-package-input
  instead of %outputs and %build-inputs.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:05 +00:00
Maxime Devos
40e07889d1 gnu: avahi: Make the 'patch-more-shebangs' phase unconditional.
* gnu/packages/avahi.scm (avahi)[arguments]<#:phases>{patch-more-shebangs}:
  Make it unconditional.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:05 +00:00
Maxime Devos
9c96dfd43c gnu: avahi: Make 'bash-minimal' input unconditional.
* gnu/packages/avahi.scm (avahi)[inputs]{bash-minimal}:
  Make it unconditional.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:05 +00:00
Maxime Devos
c2f5510730 gnu: at-spi2-core: Remove trailing #t.
* gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>:
  Remove trailing #t.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:05 +00:00
Maxime Devos
c3417f0754 gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs.
* gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>{patch-docbook-sgml}:
  Unconditionally look in (or native-inputs inputs) for docbook-xml.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:05 +00:00
Maxime Devos
2d9c06c61d gnu: at-spi2-core: Respect #:tests?.
* gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>{check}:
  Don't run tests if the value of #:tests? if false.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:04 +00:00
Maxime Devos
d8ff47a75e gnu: at-spi2-core: Make 'bash-minimal' input unconditional.
* gnu/packages/gtk.scm (at-spi2-core)[inputs]{bash-minimal}:
  Make it unconditional.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:04 +00:00
Maxime Devos
2f817ab6ab gnu: gdk-pixbuf: Remove trailing #t.
* gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>: Remove
  the trailing #t.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:04 +00:00
Maxime Devos
90fb289b69 gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional.
* gnu/packages/gtk.scm (gdk-pixbuf)[inputs]{bash-minimal}:
  Make it unconditional.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:04 +00:00
Maxime Devos
744bfc61da gnu: gdk-pixbuf: Use target predicates.
This seems a little tidier to me.

* gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{check}: Use
  target-arm? instead of string=?.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:04 +00:00
Maxime Devos
1f7cf5834c gnu: gdk-pixbuf: Respect #:tests?.
* gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{check}: Don't
  run the tests if the value for #:tests? is false.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:04 +00:00
Maxime Devos
cf7c7e2596 gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs.
* gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}:
  Unconditionally look in (or native-inputs inputs) for docbook-xsl and
  docbook-xml.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:04 +00:00
Maxime Devos
9ccb0cf70a gnu: pango: Make 'bash-minimal' input unconditional.
* gnu/packages/gtk.scm (pango)[inputs]{bash-minimal}:
  Make it unconditional.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:03 +00:00
Maxime Devos
bbb5243817 gnu: libdatrie: Make input labels match the package name.
* 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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:03 +00:00
Maxime Devos
7f3da8f882 gnu: libthai: Make 'datrie' input unconditional.
* gnu/packages/gtk.scm (libthai)[native-inputs]{datrie}: Make this input
  unconditional.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:03 +00:00
Maxime Devos
e8176d3152 gnu: cairo: Make 'bash-minimal' input unconditional.
* gnu/packages/gtk.scm (cairo)[inputs]{bash-minimal}: Make this input
  unconditional.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:03 +00:00
Maxime Devos
f73758f6c2 gnu: gobject-introspection: Use python instead of python-wrapper.
'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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:03 +00:00
Maxime Devos
7b71cd6dab gnu: gobject-introspection: Move things to native-inputs.
* gnu/packages/glib.scm (gobject-introspection)[native-inputs]: Make
  'bison' and 'flex' inputs unconditional ...
  (gobject-introspection)[inputs]: ... and unconditionally remove them here.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:03 +00:00
Maxime Devos
9bf44750dc gnu: isc-dhcp: Remove trailing #t.
They aren't required anymore on core-updates.

* gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>: Remove trailing #t.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:03 +00:00
Maxime Devos
0fe0a3a8ee gnu: isc-dhcp: Remove unnecessary shebang patching.
* gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>{post-install}:
  Remove parts indicated by TODOs.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:03 +00:00
Maxime Devos
283bc45649 gnu: isc-dhcp: Make an input unconditional.
* gnu/packages/admin.scm (isc-dhcp)[inputs]{bash}: Always include this
  input, even when compiling natively.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:03 +00:00
Maxime Devos
9ca2f94b1b gnu: isc-dhcp: Don't use canonical-package.
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'.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos
034459cc67 gnu: mozjs: Make the quasiquote unconditional.
* gnu/packages/nss.scm (mozjs-60)[arguments]<#:configure-flags>: Always use
  quasiquote instead of quote.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos
e3d61d2082 gnu: mozjs: Make the native-inputs unconditional.
* gnu/packages/nss.scm (mozjs)[inputs]: Always include 'perl" and
  'bash-minimal', even when compiling natively.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos
8a55fde935 build/minetest-build-system: Move png-file? to (guix build utils).
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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos
9bf0652b08 gnu: icecat: Use mozilla-build-system.
This doesn't actually have any effect because the 'configure'
phase is replaced.

* gnu/packages/gnuzilla.scm (icecat)[build-system]: Use mozilla-build-system.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos
5d8515b337 gnu: mozjs: Use mozilla-build-system.
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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos
385ba2f369 gnu: nspr: Use mozilla-build-system.
* gnu/packages/nss.scm
  (nspr)[build-system]: Adjust it.
  (nspr)[arguments]<#:configure-flags>: Remove now superfluous --target and
  --host.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos
fae2fcdbc9 build-system/mozilla: New build system.
* 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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:01 +00:00
Mathieu Othacehe
0cccc2f52c Merge remote-tracking branch core-updates-frozen into core-updates 2021-09-22 06:25:20 +00:00
Mathieu Othacehe
d58e52b071 installer: keymap: Fix optional fields handling.
Fixes: <https://issues.guix.gnu.org/50723>.

The keymap xml contains optional shortDescription and description fields. The
assoc-ref call on those fields can return false, handle it correctly.

* gnu/installer/keymap.scm (xkb-rules->models+layouts): Introduce a new
"maybe-empty" helper to deal with optional fields. Use it for shortDescription
and description fields.
2021-09-21 20:35:49 +00:00
Felix Gruber
a3324e5753 gnu: 4dtris: Fix build.
* gnu/packages/games.scm (4dtris)[attributes]: Add -fcommon to CFLAGS
  and use search-input-directory to find SDL include path.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-09-21 13:50:53 +00:00
Ludovic Courtès
f762d63ec0 gnu: cmake: Skip CPack TXZ test on i686.
Fixes <https://issues.guix.gnu.org/50617>.

* gnu/packages/cmake.scm (%common-build-phases): Turn into a procedure
and adjust users.  When 'target-x86-32?' returns true, add
'skip-cpack-txz-test'.
2021-09-21 10:08:35 +02:00
Ludovic Courtès
68933659cb base32: Work around (ash x N) miscompilation at '-O1' and below.
Fixes <https://issues.guix.gnu.org/50696>.
Reported by Marius Bakke <marius@gnu.org>.

* guix/base32.scm (bit-field): Introduce 'minus-start' syntax and use it.
2021-09-21 09:45:21 +02:00
Mathieu Othacehe
baf8272d23 gnu: icedtea-7: Use pem certificates.
This is a follow-up of: 287a8c9048.

* gnu/packages/java.scm (icedtea-7)[arguments]{install-keystore}: Use pem
certificates.
2021-09-21 07:41:13 +00:00
Mathieu Othacehe
287a8c9048 gnu: nss-certs: Copy pem files.
* gnu/packages/certs.scm (nss-certs)[arguments]<#:phases>{install}: Copy pem
files instead of crt files.
2021-09-21 07:41:07 +00:00
Mathieu Othacehe
f87b987248 gnu: certdata2pem: Produce pem files.
Create files with pem extension instead of crt.

* gnu/packages/certs.scm (certdata2pem)[arguments]<#:phases>{fix-extension}:
New phase.
2021-09-21 07:41:07 +00:00
Maxime Devos
aacaa222d1 gnu: at-spi2-atk: Don't compile tests when cross-compiling.
* gnu/packages/gtk.scm
  (at-spi2-atk)[arguments]<#:configure-flags>: Set tests=false when
  cross-compiling.
2021-09-20 11:15:10 +00:00
Maxime Devos
d1737d44e6 gnu: pango: Add bash-minimal input when cross-compiling.
* gnu/packages/gtk.scm
  (pango)[inputs]: Add "bash-minimal" when cross-compiling.
2021-09-20 11:15:10 +00:00
Maxime Devos
99eff8138b gnu: gdk-pixbuf: Add bash-minimal input when cross-compiling.
* gnu/packages/gtk.scm
  (gdk-pixbuf)[inputs]: Add "bash-minimal" when cross-compiling.
2021-09-20 11:15:09 +00:00
Maxime Devos
26a336c20b gnu: gdk-pixbuf: Find docbook when cross-compiling.
* gnu/packages/gtk.scm
  (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}: Look for docbook
  in 'native-inputs' instead of 'inputs' when cross-compiling.
2021-09-20 11:15:09 +00:00