aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnu/packages/acl.scm8
-rw-r--r--gnu/packages/admin.scm13
-rw-r--r--gnu/packages/attr.scm7
-rw-r--r--gnu/packages/base.scm28
-rw-r--r--gnu/packages/cmake.scm3
-rw-r--r--gnu/packages/commencement.scm12
-rw-r--r--gnu/packages/gdb.scm4
-rw-r--r--gnu/packages/gettext.scm7
-rw-r--r--gnu/packages/guile-xyz.scm5
-rw-r--r--gnu/packages/guile.scm7
-rw-r--r--gnu/packages/hurd.scm15
-rw-r--r--gnu/packages/make-bootstrap.scm4
-rw-r--r--gnu/packages/package-management.scm10
-rw-r--r--gnu/packages/pciutils.scm5
-rw-r--r--gnu/packages/python.scm9
-rw-r--r--gnu/packages/ssh.scm7
-rw-r--r--gnu/packages/texinfo.scm5
-rw-r--r--gnu/packages/tls.scm15
-rw-r--r--gnu/packages/web.scm5
-rw-r--r--gnu/system/hurd.scm2
-rw-r--r--guix/utils.scm6
21 files changed, 80 insertions, 97 deletions
diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm
index da6dead3c2..eb20fdd549 100644
--- a/gnu/packages/acl.scm
+++ b/gnu/packages/acl.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Lars-Dominik Braun <ldb@leibniz-psychology.org>
;;;
;;; This file is part of GNU Guix.
@@ -28,14 +28,14 @@
#:use-module (gnu packages attr)
#:use-module (gnu packages base)
#:use-module (gnu packages check)
- #:use-module (gnu packages hurd)
#:use-module (gnu packages gettext)
#:use-module (gnu packages perl)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (gnu packages)
#:use-module (guix build-system gnu)
- #:use-module (guix build-system python))
+ #:use-module (guix build-system python)
+ #:use-module (guix utils))
(define-public acl
(package
@@ -55,7 +55,7 @@
,@%gnu-build-system-modules)
#:configure-flags '("--disable-static")
#:tests? ,(not (or (%current-target-system)
- (hurd-target?)))
+ (target-hurd?)))
#:phases
(modify-phases %standard-phases
;; XXX After repacking the sources the timestamps are reset to the
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 5bae16157e..529a477ed0 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -31,7 +31,7 @@
;;; Copyright © 2019, 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
@@ -130,7 +130,6 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
- #:use-module (gnu packages hurd)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages inkscape)
@@ -913,7 +912,7 @@ re-executing them as necessary.")
,@(if (%current-target-system)
'("--with-path-procnet-dev=/proc/net/dev")
'())
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
'("--disable-rcp"
"--disable-rexec"
"--disable-rexecd"
@@ -967,7 +966,7 @@ hostname.")
`(;; Assume System V `setpgrp (void)', which is the default on GNU
;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
#:configure-flags
- '(,@(if (hurd-target?)
+ '(,@(if (target-hurd?)
'()
'("--with-libpam"))
"shadow_cv_logdir=/var/log"
@@ -1018,7 +1017,7 @@ hostname.")
(delete-file (string-append bin "/groups"))
(for-each delete-file (find-files man "^groups\\."))))))))
(inputs
- `(,@(if (hurd-target?)
+ `(,@(if (target-hurd?)
'()
`(("linux-pam" ,linux-pam)))
,@(if (%current-target-system)
@@ -1527,7 +1526,7 @@ connection alive.")
(inputs `(("inetutils" ,inetutils)
("bash" ,bash-minimal)
- ,@(if (hurd-target?) '()
+ ,@(if (target-hurd?) '()
`(("net-tools" ,net-tools)
("iproute" ,iproute)))
@@ -2037,7 +2036,7 @@ system administrator.")
(list groff))
(inputs
`(("coreutils" ,coreutils)
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
'()
`(("linux-pam" ,linux-pam)))
("zlib" ,zlib)))
diff --git a/gnu/packages/attr.scm b/gnu/packages/attr.scm
index 8c1a4aca7c..cd0a997474 100644
--- a/gnu/packages/attr.scm
+++ b/gnu/packages/attr.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2012, 2013, 2016, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -23,10 +24,10 @@
#:use-module (guix licenses)
#:use-module (gnu packages perl)
#:use-module (gnu packages gettext)
- #:use-module (gnu packages hurd)
#:use-module (guix packages)
#:use-module (guix download)
- #:use-module (guix build-system gnu))
+ #:use-module (guix build-system gnu)
+ #:use-module (guix utils))
(define-public attr
(package
@@ -43,7 +44,7 @@
(arguments
`(#:phases
(modify-phases %standard-phases
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
`((add-before 'configure 'skip-linux-syscalls
(lambda _
;; Starting from 2.5.1, libattr includes Linux-specific
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 39c7e5ef5f..ada9edf0e6 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016, 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -132,7 +132,7 @@ command-line arguments, multiple languages, and so on.")
(string-append bin "/fgrep"))
(("^exec grep")
(string-append "exec " bin "/grep"))))))
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
'((add-before 'check 'skip-triple-backref-test
(lambda _
;; This test is marked as malfunctioning on glibc systems
@@ -144,7 +144,7 @@ command-line arguments, multiple languages, and so on.")
(("^warn_" all)
(string-append "exit 77\n" all))))))
'()))
- #:make-flags ,(if (hurd-target?)
+ #:make-flags ,(if (target-hurd?)
''("XFAIL_TESTS=test-perror2 equiv-classes") ;XXX
''())))
(synopsis "Print lines matching a pattern")
@@ -186,7 +186,7 @@ including, for example, recursive directory searching.")
(modules '((guix build utils)))))
(build-system gnu-build-system)
(arguments
- `(#:make-flags ,(if (hurd-target?)
+ `(#:make-flags ,(if (target-hurd?)
''("XFAIL_TESTS=test-perror2")
''())))
(synopsis "Stream editor")
@@ -217,7 +217,7 @@ implementation offers several extensions over the standard utility.")
;; Note: test suite requires ~1GiB of disk space.
(arguments
`(,@(cond
- ((hurd-target?)
+ ((target-hurd?)
'(#:make-flags
(list (string-append
"TESTSUITEFLAGS= -k '"
@@ -309,7 +309,7 @@ differences.")
(patches (search-patches "diffutils-fix-signal-processing.patch"))))
(build-system gnu-build-system)
(arguments
- `(#:make-flags ,(if (hurd-target?)
+ `(#:make-flags ,(if (target-hurd?)
''("XFAIL_TESTS=test-perror2 large-subopt")
''())))
(native-inputs (list perl))
@@ -347,7 +347,7 @@ interactive means to merge two files.")
"tests/find/exec-plus-last-file.sh")
(("#!/bin/sh")
(string-append "#!" (which "sh")))))))
- #:make-flags ,(if (hurd-target?)
+ #:make-flags ,(if (target-hurd?)
''("XFAIL_TESTS=test-strerror_r")
''())))
(synopsis "Operating on files matching given criteria")
@@ -395,7 +395,7 @@ used to apply commands with arbitrarily long arguments.")
(outputs '("out" "debug"))
(arguments
`(#:parallel-build? #f ; help2man may be called too early
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
'(#:make-flags ; these tests fail deterministically
(list (string-append "XFAIL_TESTS=tests/misc/env-S.pl"
" tests/misc/kill.sh"
@@ -433,7 +433,7 @@ used to apply commands with arbitrarily long arguments.")
(("#!/bin/sh") (string-append "#!" (which "sh"))))))
(add-after 'unpack 'remove-tests
(lambda _
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
'((substitute* "Makefile.in"
;; this test hangs
(("^ *tests/misc/timeout-group.sh.*") ""))
@@ -511,7 +511,7 @@ standard.")
(inputs (list guile-3.0))
(outputs '("out" "debug"))
(arguments
- `(,@(if (hurd-target?)
+ `(,@(if (target-hurd?)
'(#:configure-flags '("CFLAGS=-D__alloca=alloca"
"ac_cv_func_posix_spawn=no"))
'())
@@ -798,7 +798,7 @@ the store.")
;; libc provides <hurd.h>, which includes a bunch of Hurd and Mach headers,
;; so both should be propagated.
(propagated-inputs
- (if (hurd-target?)
+ (if (target-hurd?)
`(("hurd-core-headers" ,hurd-core-headers))
`(("kernel-headers" ,linux-libre-headers))))
@@ -864,7 +864,7 @@ the store.")
;; On GNU/Hurd we get discarded-qualifiers warnings for
;; 'device_write_inband' among other things. Ignore them.
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
`("--disable-werror"
,@%glibc/hurd-configure-flags)
'()))
@@ -992,7 +992,7 @@ the store.")
(map (cut string-append slib "/" <>)
files))))))
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
'((add-after 'install 'augment-libc.so
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
@@ -1012,7 +1012,7 @@ the store.")
("gettext" ,gettext-minimal)
("python" ,python-minimal)
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
`(("mig" ,mig)
("perl" ,perl))
'())))
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index bccb035854..821b8808f7 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -46,7 +46,6 @@
#:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
#:use-module (gnu packages file)
- #:use-module (gnu packages hurd)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libevent)
#:use-module (gnu packages ncurses)
@@ -214,7 +213,7 @@ using the CMake build system.")
(apply invoke "./configure" configure-flags))))))
(inputs
(append
- (if (hurd-target?)
+ (if (target-hurd?)
'()
(list libuv)) ;not supported on the Hurd
(list bzip2
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 7c7c11c174..669d54099d 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2018, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019-2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020, 2022 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
@@ -2786,7 +2786,7 @@ memoized as a function of '%current-system'."
"/lib/python"
,(version-major+minor version)
"/test"))))
- ,@(if (hurd-system?)
+ ,@(if (system-hurd?)
`((add-before 'build 'fix-regen
(lambda* (#:key inputs #:allow-other-keys)
(let ((libc (assoc-ref inputs "libc")))
@@ -2841,7 +2841,7 @@ memoized as a function of '%current-system'."
`(append (list ,(string-append "--host=" (boot-triplet))
,(string-append "--build="
(nix-system->gnu-triplet))
- ,(if (hurd-system?) "--disable-werror"
+ ,(if (system-hurd?) "--disable-werror"
""))
,flags))
((#:phases phases)
@@ -2853,7 +2853,7 @@ memoized as a function of '%current-system'."
(unsetenv "CPLUS_INCLUDE_PATH")
;; Tell 'libpthread' where to find 'libihash' on Hurd systems.
- ,@(if (hurd-system?)
+ ,@(if (system-hurd?)
'((substitute* '("sysdeps/mach/Makefile"
"sysdeps/mach/hurd/Makefile")
(("LDLIBS-pthread.so =.*")
@@ -2873,7 +2873,7 @@ memoized as a function of '%current-system'."
,@(%boot1-inputs)
;; A native MiG is needed to build Glibc on Hurd.
- ,@(if (hurd-system?)
+ ,@(if (system-hurd?)
`(("mig" ,mig-boot0))
'())
@@ -3024,7 +3024,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(,(gexp-input gcc-boot0 "lib")
,(kernel-headers-boot0)
,static-bash-for-glibc
- ,@(if (hurd-system?)
+ ,@(if (system-hurd?)
`(,gnumach-headers-boot0
,hurd-headers-boot0)
'())
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index a8d8a86ea8..34d081dc9e 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -114,14 +114,14 @@
("libxml2" ,libxml2)
;; The Hurd needs -lshouldbeinlibc.
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
`(("hurd" ,hurd))
'())))
(native-inputs
`(("texinfo" ,texinfo)
("dejagnu" ,dejagnu)
("pkg-config" ,pkg-config)
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
;; When cross-compiling from x86_64-linux, make sure to use a
;; 32-bit MiG because we assume target i586-pc-gnu.
`(("mig" ,(if (%current-target-system)
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 9387f4fb8a..114d8cf7af 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Miguel <rosen644835@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 EuAndreh <eu@euandre.org>
;;; Copyright © 2022 gemmaro <gemmaro.dev@gmail.com>
;;; Copyright © 2023 Maxim Cournoyer maxim.cournoyer@gmail.com>
@@ -42,7 +42,6 @@
#:use-module (gnu packages check)
#:use-module (gnu packages docbook)
#:use-module (gnu packages emacs)
- #:use-module (gnu packages hurd)
#:use-module (gnu packages libunistring)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
@@ -124,7 +123,7 @@
"coreutils-gnulib-tests.patch")))))
'())
- #$@(if (hurd-target?)
+ #$@(if (target-hurd?)
#~((substitute*
"gettext-tools/gnulib-tests/Makefile.in"
;; See 'coreutils' for the rationale.
@@ -135,7 +134,7 @@
;; When tests fail, we want to know the details.
#:make-flags #~'("VERBOSE=yes"
- #$@(if (hurd-target?)
+ #$@(if (target-hurd?)
'("XFAIL_TESTS=test-perror2")
'()))))
(home-page "https://www.gnu.org/software/gettext/")
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 4fea60ff11..db7be432cc 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2016, 2017, 2021 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;; Copyright © 2016, 2021 Amirouche <amirouche@hypermove.net>
-;;; Copyright © 2016, 2019, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016, 2019, 2021, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 David Thompson <davet@gnu.org>
;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -89,7 +89,6 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages haskell-xyz) ;pandoc
- #:use-module (gnu packages hurd)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages libevent)
@@ -822,7 +821,7 @@ Unix-style DSV format and RFC 4180 format.")
gettext-minimal))
(inputs
(append (list guile-3.0) ;for libguile-3.0.so
- (if (hurd-target?)
+ (if (target-hurd?)
(list libevent)
'())))
(synopsis "Lightweight concurrency facility for Guile")
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 322eda1fc8..292ee10bcb 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2014, 2016, 2018 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2017 Christine Lemmer-Webber <cwebber@dustycloud.org>
-;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
@@ -47,7 +47,6 @@
#:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gperf)
- #:use-module (gnu packages hurd)
#:use-module (gnu packages libffi)
#:use-module (gnu packages libunistring)
#:use-module (gnu packages linux)
@@ -202,7 +201,7 @@ without requiring the source code to be rewritten.")
#:phases
(modify-phases %standard-phases
- ,@(if (hurd-system?)
+ ,@(if (system-hurd?)
'((add-after 'unpack 'disable-tests
(lambda _
;; Hangs at: "Running 00-repl-server.test"
@@ -345,7 +344,7 @@ without requiring the source code to be rewritten.")
(not (%current-target-system)))
((#:configure-flags flags #~'())
;; XXX: JIT-enabled Guile crashes in obscure ways on GNU/Hurd.
- #~(cons* #$@(if (hurd-target?)
+ #~(cons* #$@(if (target-hurd?)
#~("--disable-jit")
#~())
;; -fexcess-precision=standard is required when compiling for
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 34c7c00f2d..c9f77d799a 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -46,20 +46,7 @@
#:use-module (gnu packages texinfo)
#:use-module (gnu packages onc-rpc)
#:use-module (gnu packages xorg) ; libpciaccess
- #:use-module (guix git-download)
- #:export (hurd-system?
- hurd-target?))
-
-(define (hurd-target?)
- "Return true if the cross-compilation target or the current system is
-GNU/Hurd."
- (or (and=> (%current-target-system) target-hurd?)
- (and (not (%current-target-system))
- (and=> (%current-system) target-hurd?))))
-
-(define (hurd-system?)
- "Return true if the current system is the Hurd."
- (and=> (%current-system) target-hurd?))
+ #:use-module (guix git-download))
(define (hurd-source-url version)
(string-append "mirror://gnu/hurd/hurd-"
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 6bafc5697c..7b40f395f3 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2017, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2018, 2019, 2021, 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2018, 2019, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
@@ -626,7 +626,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
#~("AR=gcc-ar" "RANLIB=gcc-ranlib")
#~())
- #$@(if (hurd-target?)
+ #$@(if (target-hurd?)
#~("--disable-jit")
#~())))
((#:phases phases '%standard-phases)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 3a5ba3420c..e3dba508f0 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -12,7 +12,7 @@
;;; Copyright © 2019-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
@@ -216,7 +216,7 @@
;; choose a fixed-width and short directory name
;; for tests.
"ac_cv_guix_test_root=/tmp/guix-tests"
- ,@(if (hurd-target?) '("--with-courage") '()))
+ ,@(if (target-hurd?) '("--with-courage") '()))
#:parallel-tests? #f ;work around <http://bugs.gnu.org/21097>
#:modules ((guix build gnu-build-system)
@@ -416,7 +416,7 @@ $(prefix)/etc/openrc\n")))
;; cross-compilation.
("guile" ,guile-3.0-latest) ;for faster builds
("guile-gnutls" ,guile-gnutls)
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
'()
`(("guile-avahi" ,guile-avahi)))
("guile-gcrypt" ,guile-gcrypt)
@@ -476,7 +476,7 @@ $(prefix)/etc/openrc\n")))
(propagated-inputs
`(("guile-gnutls" ,guile-gnutls)
;; Avahi requires "glib" which doesn't cross-compile yet.
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
'()
`(("guile-avahi" ,guile-avahi)))
("guile-gcrypt" ,guile-gcrypt)
@@ -1442,7 +1442,7 @@ environments.")
"guile-zlib"
"guile-sqlite3"
"guile-gnutls"
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
'()
'("guile-fibers")))))
(wrap-program file
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm
index 741dcdf787..140bbd0e90 100644
--- a/gnu/packages/pciutils.scm
+++ b/gnu/packages/pciutils.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;;
@@ -33,7 +33,6 @@
#:use-module (gnu packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages pkg-config)
- #:use-module (gnu packages hurd)
#:use-module (gnu packages linux)
#:use-module (gnu packages base))
@@ -162,7 +161,7 @@ Each database is contained in a specific package output, such as the
(native-inputs
(list `(,hwdata "pci") pkg-config which))
(inputs
- `(,@(if (not (hurd-target?))
+ `(,@(if (not (target-hurd?))
`(("kmod" ,kmod))
'())
("zlib" ,zlib)))
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index bfe8a68352..302f995b0f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -56,7 +56,7 @@
;;; Copyright © 2018 Luther Thompson <lutheroto@gmail.com>
;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2022 jgart <jgart@dismail.de>
@@ -85,7 +85,6 @@
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages dbm)
- #:use-module (gnu packages hurd)
#:use-module (gnu packages libffi)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python-build)
@@ -245,7 +244,7 @@
"Lib/test/support/__init__.py"
"Lib/test/test_subprocess.py"))
(("/bin/sh") (which "sh")))))
- ,@(if (hurd-system?)
+ ,@(if (system-hurd?)
`((add-before 'build 'patch-regen-for-hurd
(lambda* (#:key inputs #:allow-other-keys)
(let ((libc (assoc-ref inputs "libc")))
@@ -458,7 +457,7 @@ data types.")
(format #f "TESTOPTS=-j~d" (parallel-job-count))
;; test_mmap fails on low-memory systems
" --exclude test_mmap test_socket"
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
'(" test_posix" ;multiple errors
" test_time"
" test_pty"
@@ -492,7 +491,7 @@ data types.")
'()))))
((#:phases phases)
`(modify-phases ,phases
- ,@(if (hurd-system?)
+ ,@(if (system-hurd?)
`((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9
'())
(add-after 'unpack 'remove-windows-binaries
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 71926c6795..b973efc291 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -13,7 +13,7 @@
;;; Copyright © 2018 Manuel Graf <graf@init.at>
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
@@ -49,7 +49,6 @@
#:use-module (gnu packages gperf)
#:use-module (gnu packages groff)
#:use-module (gnu packages guile)
- #:use-module (gnu packages hurd)
#:use-module (gnu packages libedit)
#:use-module (gnu packages linux)
#:use-module (gnu packages logging)
@@ -213,7 +212,7 @@ a server that supports the SSH-2 protocol.")
(native-inputs (list groff pkg-config))
(inputs `(("libedit" ,libedit)
("openssl" ,openssl)
- ,@(if (hurd-target?)
+ ,@(if (target-hurd?)
'()
`(("pam" ,linux-pam)
("libfido2" ,libfido2))) ;fails to build on GNU/Hurd
@@ -239,7 +238,7 @@ a server that supports the SSH-2 protocol.")
"--with-libedit"
;; Enable PAM support in sshd.
- ,,@(if (hurd-target?)
+ ,,@(if (target-hurd?)
'()
'("--with-pam"
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index 3296c468c1..f45ae06810 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 ( <paren@disroot.org>
;;;
@@ -40,7 +40,6 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages gettext)
- #:use-module ((gnu packages hurd) #:select (hurd-target?))
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-compression)
@@ -77,7 +76,7 @@
%standard-phases)
;; XXX: Work around <https://issues.guix.gnu.org/59616>.
- #:tests? ,(and (not (hurd-target?))
+ #:tests? ,(and (not (target-hurd?))
(not (%current-target-system)))))
(inputs (list ncurses perl))
;; When cross-compiling, texinfo will build some of its own binaries with
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index d162094ed4..140932a809 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -14,7 +14,7 @@
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
@@ -65,7 +65,6 @@
#:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
#:use-module (gnu packages guile)
- #:use-module (gnu packages hurd)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libffi)
#:use-module (gnu packages libidn)
@@ -153,12 +152,12 @@ in intelligent transportation networks.")
(build-system gnu-build-system)
(native-inputs
(append (list pkg-config)
- (if (hurd-target?)
+ (if (target-hurd?)
(list autoconf automake gettext-minimal libtool)
'())))
(inputs
(append (list libffi libtasn1)
- (if (hurd-target?)
+ (if (target-hurd?)
(list libbsd)
'())))
(arguments
@@ -167,7 +166,7 @@ in intelligent transportation networks.")
;; find them. See <https://issues.guix.gnu.org/49957>.
#~'("--with-trust-paths=/etc/ssl/certs/ca-certificates.crt")
#:phases #~(modify-phases %standard-phases
- #$@(if (hurd-target?)
+ #$@(if (target-hurd?)
#~((add-after 'unpack 'apply-hurd-patch
(lambda* (#:key inputs #:allow-other-keys)
(define patch
@@ -216,9 +215,9 @@ living in the same process.")
(build-system gnu-build-system)
(arguments
(list #:tests? (not (or (%current-target-system)
- (hurd-target?)))
+ (target-hurd?)))
;; Ensure we don't keep a reference to the tools used for testing.
- #:disallowed-references (if (hurd-target?)
+ #:disallowed-references (if (target-hurd?)
'()
(list net-tools iproute socat))
#:configure-flags
@@ -276,7 +275,7 @@ living in the same process.")
(native-inputs
(append (list pkg-config texinfo which
util-linux) ;one test needs 'setsid'
- (if (hurd-target?)
+ (if (target-hurd?)
'()
(list net-tools
iproute ;for 'ss'
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index daa569263b..f5b6c8cd2f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -40,7 +40,7 @@
;;; Copyright © 2019, 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
-;;; Copyright © 2020, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2021, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018, 2019, 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020, 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
@@ -142,7 +142,6 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
- #:use-module (gnu packages hurd)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages java)
@@ -7785,7 +7784,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
(inputs
;; Required to build the tools (i.e. without ‘--enable-lib-only’).
(append
- (if (hurd-target?)
+ (if (target-hurd?)
`((,openssl "static"))
(list jemalloc)) ; fight nghttpd{,x} heap fragmentation
(list c-ares
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 558d1ee9e3..387605ec4f 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -57,7 +57,7 @@
;;; Code:
(define %hurd-default-operating-system-kernel
- (if (hurd-system?)
+ (if (system-hurd?)
gnumach
;; A cross-built GNUmach does not work
(with-parameters ((%current-system "i686-linux")
diff --git a/guix/utils.scm b/guix/utils.scm
index b9657df292..e9af33bdeb 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; Copyright © 2023 Philip McGrath <philip@philipmcgrath.com>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -89,6 +90,7 @@
package-name->name+version
target-linux?
target-hurd?
+ system-hurd?
target-mingw?
target-x86-32?
target-x86-64?
@@ -674,6 +676,10 @@ a character other than '@'."
(and (string-suffix? "-gnu" target)
(not (string-contains target "linux"))))
+(define* (system-hurd?)
+ "Is the current system the GNU(/Hurd) system?"
+ (and=> (%current-system) target-hurd?))
+
(define* (target-mingw? #:optional (target (%current-target-system)))
"Is the operating system of TARGET Windows?"
(and target
generated by cgit v1.2.3 (git 2.25.4) at 2024-06-07 08:07:41 +0000