1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-15 11:30:44 +02:00
Commit graph

135 commits

Author SHA1 Message Date
Janneke Nieuwenhuizen
32d1dfb554
gnu: hurd: Add default case.
This fixes evaluation of ‘master’, which was failing with a ‘match’ error.

* gnu/packages/hurd.scm (hurd)[arguments]: Add default case.

Change-Id: Icf5f01481cd102036cb2b7d4dbaf9f326cdb152a
2024-12-03 15:51:05 +01:00
Ludovic Courtès
d897f1b440
gnu: netdde: Add default case.
This fixes evaluation of ‘master’, which was failing with a ‘match’
error.

* gnu/packages/hurd.scm (netdde)[arguments]: Add default case.

Change-Id: I093b21f629a930f6e6b43430f5a204d06e1f3aad
2024-12-03 14:59:05 +01:00
Janneke Nieuwenhuizen
1241699427
gnu: hurd: Add refcounts-assert patch.
See <https://logs.guix.gnu.org/hurd/2024-11-20.log#082237>.

* gnu/packages/patches/hurd-refcounts-assert.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/hurd.scm (hurd): Use it.

Change-Id: I51ee319f1b7e26a7ed0f4e9f69755aa596ea6877
2024-12-03 08:39:01 +01:00
Janneke Nieuwenhuizen
f21fb53a8d
gnu: hurd: Build fixes for the 64bit Hurd.
* gnu/packages/patches/hurd-64bit.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/hurd.scm (hurd)[source]: Use it.
[arguments]: When building for the 64bit Hurd, add "create-machine-symlink"
phase.  In phases "build-libdde-linux" and "install-goodies", do not assume
x86, rather use actual ARCH, and follow upstream's "amd64" symlinking voodoo.

Change-Id: If264a91b2433add13f9121c482f0abe67ae5f1e9
2024-12-03 08:39:00 +01:00
Janneke Nieuwenhuizen
de8196f571
gnu: rumpkernel: Support the 64bit Hurd.
* gnu/packages/hurd.scm (rumpkernel)[argument]: In stage "build", follow
Debian upstream to use -DPAE disable the DTRACE and ZFS builds.

Change-Id: I534da31eefb378c72b4896d64a51a73109e38aa6
2024-12-03 08:39:00 +01:00
Janneke Nieuwenhuizen
ba8fb8c2fb
gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337.
* gnu/packages/hurd.scm (rumpkernel): Update to
f1ffd6405f225336e595a0f99f01095ed7438337.
[arguments]: In stage "build", add "-Wno-error=sign-compare" to CWARNFLAGS.

Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05
2024-12-03 08:39:00 +01:00
Janneke Nieuwenhuizen
b331a07a46
gnu: netdde: Support the 64bit Hurd.
* gnu/packages/patches/netdde-csum.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/hurd.scm (netdde)[source]: Use it.
[arguments]: Do not assume x86, rather use actual ARCH in #:make-flags, and
follow upstream's "amd64" symlinking voodoo.

Change-Id: Ie825e56779dae2f489066569dc3c4405bac778c1
2024-12-03 08:39:00 +01:00
Janneke Nieuwenhuizen
c2a67e8743
gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df.
* gnu/packages/hurd.scm (netdde): Update to
c0ef248dc7c5ccc1273e2a796f3ece30c5b645df.
(dde-sources): Update to b6c8526c703f3ba76294d9002f195c63897ec661.

Change-Id: Id03f5c5124f16e9ffd6a77cbb2507d274e0f325a
2024-12-03 08:39:00 +01:00
Janneke Nieuwenhuizen
883869970c
gnu: netdde: Fix build with gcc-14.
* gnu/packages/hurd.scm (netdde)[arguments]: Disable some warnings breaking
the build, using "WARNINGS=..." in #:make-flags.

Change-Id: I39f577c51eaa3d86abf80a54f7c172324cf56749
2024-12-03 08:33:13 +01:00
Janneke Nieuwenhuizen
ee8a9cdcf3
gnu: hurd: Fix build with gcc-14.
* gnu/packages/hurd.scm (hurd)[arguments]: In phase "build-libdde-linux",
disable some warnings breaking the build, using "WARNINGS=...".

Change-Id: Ib70926a90e1d37080c5b9dd333f19636cdae3013
2024-12-03 08:33:13 +01:00
Janneke Nieuwenhuizen
ae2213ed98
gnu: hurd: Update to 0.9.git20240714.
* gnu/packages/hurd.scm (hurd-headers): Update to 0.9.git20240714.
(hurd)[arguments]: Remove rumpdisk build hack from "prepare-addons" stage.
Instead, when cross-compiling, add stage "fixup-cross-configure" to enable
rumpdisk.
* gnu/system.scm (hurd-multiboot-modules): Remove
"--x-xattr-translator-records" option that has been removed and is now the
default.

Change-Id: I4609b5a959c1ece98e2fe1aedbb1d31d6edadcca
2024-12-03 08:33:12 +01:00
Janneke Nieuwenhuizen
a3cce93271
gnu: mig: Update to 1.8+git20231217.
* gnu/packages/hurd.scm (mig): Update to 1.8+git20231217.

Change-Id: I0e531ecc7fdcfbefe2e0e24d7b2fb5e0fe8a3ae2
2024-12-03 08:33:12 +01:00
Janneke Nieuwenhuizen
d3eb509abe
gnu: gnumach: Update to v1.8+git20240714.
* gnu/packages/patches/gnumach-version.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/hurd.scm (gnumach-headers): Update to v1.8+git20240714 and use
it.
* gnu/packages/commencement.scm (gnumach-headers-boot0)[origin]: Reset
patches.

Change-Id: I147c64021c2ee79dfc4cd4fd9a29529eef8890c5
2024-12-03 08:33:12 +01:00
Janneke Nieuwenhuizen
b25d2ad5c7
gnu: hurd: Support second boot.
This avoids hanging upon second boot and ensures a declarative /hurd and /dev.

* gnu/packages/patches/hurd-startup.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/hurd.scm (hurd): Use it.
[arguments]: In stage create-runsystem remove /dev/urandom.

Change-Id: Ifcca5562c297204735c35132820a32ca0f273677
2024-11-11 07:28:33 +01:00
Janneke Nieuwenhuizen
85130e1a75
hurd: Support system init in /libexec/runsystem.
This is the first step to support booting after guix system init, which does
not create /servers.

* gnu/packages/hurd.scm (hurd)[arguments]: In stage create-runsystem, do not
assume /servers/socket/ exists, remove any existing /servers/socket/1.
2024-10-15 11:13:47 +02:00
Janneke Nieuwenhuizen
96e2eeee74
gnu: hurd: Update to v0.9.git20231217.
* gnu/packages/hurd.scm (hurd-headers): Update to v0.9.git20231217.
[arguments]: Avoid new link test for file_utimens.
* (hurd)[source]: Remove hurd-fix-rumpdisk-build.patch, which has been
included upstream.
* gnu/packages/patches/hurd-add-without-rump-configure-option.patch,
gnu/packages/patches/hurd-fix-rumpdisk-build.patch,
gnu/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch,
gnu/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch:
Remove.
* gnu/local.mk (dist_patch_DATA): Unregister them.

Change-Id: I0b42db19289e2fefeae99b18f0c29a21d3bf67a4
2024-08-31 10:44:47 +02:00
Janneke Nieuwenhuizen
30cacb63f8
gnu: gnumach: Update to 1.8-0.2556fde.
* gnu/packages/hurd.scm (gnumach-headers): Update to latest master,
2556fdece900d67529d5eda01f1bdaae4ffe96b0.
* gnu/packages/patches/gnumach-fix-i686-linux-build.patch,
gnu/packages/patches/gnumach-fix-task_info.patch,
gnu/packages/patches/gnumach-support-noide.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.
(gnumach)[source]: Do not use them.

Change-Id: Ifc6d15f7889854cd85698f4133f70d2046ca4bc8
2024-08-31 10:44:47 +02:00
Janneke Nieuwenhuizen
e5ee9403af
gnu: gnumach: Fix task_info.
This fixes the (times) call in Guile.

* gnu/packages/patches/gnumach-fix-task_info.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/hurd.scm (gnumach)[source]: Use it.

Change-Id: Ie7725d86465136a8e03838b86424c25cf68945c4
2024-08-31 10:44:46 +02:00
Janneke Nieuwenhuizen
9c1266bdc4
gnu: gnumach: Fix build for i686-linux.
* gnu/packages/patches/gnumach-fix-i686-linux-build.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/hurd.scm (gnumach)[source]: Use it.
[arguments]: Remove #:make-flags to avoid overriding now-essential CFLAGS set
by configure.  Rewrite to use gexps.
[supported-systems]: Add i686-linux.

Change-Id: Ibec03121f90b30160725c87e999e38f677b2e369
2024-08-31 10:44:41 +02:00
Janneke Nieuwenhuizen
7f2b754b33
gnu: netdde: Fix building libdde_linux26.
* gnu/packages/hurd.scm (netdde)[arguments]: Set "ARCH=x86" in make-flags.

Change-Id: I24760f55fd0ae231f4a73bda158c70c2ac880723
2024-08-31 10:44:28 +02:00
Janneke Nieuwenhuizen
cc2e13baec
gnu: hurd: Fix building libdde_linux26.
* gnu/packages/hurd.scm (hurd)[arguments]: In phases `build-libdde-linux' and
`install-goodies', also set ARCH=x86.

Change-Id: I2e7f14afda03c9e21ba9c3b24e195a00ae141701
2024-08-31 10:44:28 +02:00
Janneke Nieuwenhuizen
41e01a1224
Revert "gnu: hurd: Add gnumach-headers as native input."
gnumach-headers[-cross] are contained in the toolchain; it was only the
`include/mach/machine' symlink that was missing.

This reverts commit 2dd16f46766997c0b3e4ee973ce6e792a4d84fcb.
2024-08-31 10:44:28 +02:00
Janneke Nieuwenhuizen
feae33359f
gnu: hurd: Add gnumach-headers as native input.
This provides the include/mach/machine/mach_i386.h.

* gnu/packages/hurd.scm (hurd)[native-inputs]: Add gnumach-headers, or
gnumach-headers-cross when cross-building.
[arguments]: Remove #t from phases.

Change-Id: Id57e0cf184c7793be52192bdc5587c6e6ef2a312
2024-08-31 10:44:28 +02:00
Janneke Nieuwenhuizen
61f07911f7
gnu: gnumach-headers: Also build and install new `machine' symlink.
This is a follow-up to commit

    fe83aaf28369dd0548be6ced8a1f007eede01ded
    gnu: glibc/hurd: Update to 2.38.

and fixes

    No rule to make target 'mach/machine/mach_i386.h', needed by
    'trivfs_server.o'.  Stop.

* gnu/packages/hurd.scm (gnumach-headers)[arguments]: In phase `install' also
build `install-data-hook'.

Change-Id: I1985a17fa4a3fb789fe75791c2f9f4c8fd225d9a
2024-08-31 10:44:28 +02:00
Janneke Nieuwenhuizen
a5be456960
gnu: dde-sources: Update to 066797b576.
This fixes the build with reinforced build options:

    condvar.c: In function ‘ddekit_condvar_init’:
    condvar.c:16:19: error: old-style function definition [-Werror=old-style-definition]
       16 | ddekit_condvar_t *ddekit_condvar_init() {
          |                   ^~~~~~~~~~~~~~~~~~~

* gnu/packages/hurd.scm (dde-sources): Update to
066797b576ebf8364ad157f50bef2a655597deeb.

Change-Id: Icf6f97897852e21dfcf9b77629fde4ce6a7d1469
2024-08-31 10:44:28 +02:00
Ludovic Courtès
69663cdfa4
gnu: hurd: Prettify origin file names.
* gnu/packages/hurd.scm (hurd-headers): Drop “v” from ‘version’ string.
(dde-sources): Strip COMMIT in ‘file-name’ field.
(rumpkernel)[source]: Pass VERSION rather than COMMIT to ‘git-file-name’.

Change-Id: I403048d5ba79ef410383c567157aca416843a529
2024-08-31 10:44:24 +02:00
Janneke Nieuwenhuizen
febb860511
gnu: hurd-headers: Update to v0.9.git20231217.
* gnu/packages/hurd.scm (hurd-headers): Update to v0.9.git20231217.

Change-Id: I1d9739ba912e425e66accfcb56a91ac8efc4fe7c
2024-08-31 10:44:24 +02:00
Janneke Nieuwenhuizen
a036102c18
gnu: gnumach-headers: Update to v1.8+git20230410.
* gnu/packages/hurd.scm (gnumach-headers): Update to v1.8+git20230410.

Change-Id: I2ca1efb8610bbd2fa85b44c60ae065f0323b552c
2024-08-31 10:44:24 +02:00
Janneke Nieuwenhuizen
6547d3852b
gnu: hurd: Support native build on the Hurd.
* gnu/packages/hurd.scm (hurd)[arguments]: In phases 'build-libdde-linux' and
'install-goodies', also look in inputs for dependencies.  There is no check
target, so set #:tests? to #false.
2023-07-20 10:11:37 +02:00
Josselin Poiret
72dbad505a
gnu: mig: Use git-fetch.
Now that we have `git-fetch-from-tarball' to break the cycle in commencement
for git-fetch sources, we can finally update mig to use git-fetch to allow
`--with-commit' builds.

* gnu/packages/hurd.scm (mig)[source]: Use git-fetch again.
* gnu/packages/commencement.scm (mig-boot0)[source]: Use
git-fetch-from-tarball accordingly.
2023-07-19 07:33:55 +02:00
Ludovic Courtès
4e11cac6be
gnu: mig: Update to 1.8+git20230520.
This reinstates 999a6ac0cf, which was
reverted by a041bbb4bf, but without
resorting to 'git-fetch'.

* gnu/packages/hurd.scm (mig): Update to 1.8+git20220827.
[source]: Remove patch.
* gnu/packages/patches/mig-cpu.h-generation.patch: Delete.
* gnu/local.mk (dist_patch_DATA): Remove it.
2023-07-18 17:21:54 +02:00
Christopher Baines
5f7c714c63
gnu: rumpkernel: Don't error for non x86 systems.
As the lack of handling other systems, say aarch64-linux here seemed to cause
problems with guix pull on these systems.  This should work around #64609.

* gnu/packages/hurd.scm (rumpkernel)[arguments]: Don't error for any system.
2023-07-14 11:54:02 +01:00
Christopher Baines
a041bbb4bf
Revert "gnu: mig: Update to 1.8+git20230520."
As noted in the comment, I think using git-fetch caused problems computing
derivaations for i586-linux (Guix would just use more and more memory).

This reverts commit 999a6ac0cf.
2023-07-14 11:53:12 +01:00
Janneke Nieuwenhuizen
b4fe82bd8a
gnu: gnumach: Disable builtin networking.
See also

    https://logs.guix.gnu.org/hurd/2023-05-25.log#163610

* gnu/packages/hurd.scm (gnumach)[arguments]: Add --disable-net-group,
--disable-pcmcia-group, and --disable-wireless-group.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
2023-07-13 19:00:09 +02:00
Janneke Nieuwenhuizen
37256c02a2
gnu: netdde: Resurrect and update to 2.6.32.65-2-e67c284ac1.
* gnu/packages/patches/netdde-build-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/hurd.scm (netdde)[source]: Update to
e67c284ac113d939b10b4578334f27dab29d5b08 and use it.
[inputs]: Add zlib:static.
[arguments]: Remove #true from build phases.  In 'build' phase, remove
obsolete CFLAGS, and also build static version.  In 'install' phase,
install them in <out>/hurd.  There is no check target, so set #:tests?
to #false.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
2023-07-13 18:59:22 +02:00
Janneke Nieuwenhuizen
bbfb41ed9d
gnu: gnumach: Support "noide" argument.
* gnu/packages/patches/gnumach-support-noide.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/hurd.scm (gnumach-headers): Use it.
* doc/guix.texi (Bootloader Configuration): Document it.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
2023-07-13 18:59:17 +02:00
Janneke Nieuwenhuizen
5981e99f0a
gnu: hurd: Add rumpkernel.
* gnu/packages/patches/hurd-fix-rumpdisk-build.patch,
gnu/packages/patches/hurd-rumpdisk-no-hd.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/hurd.scm (hurd): Use them.
(hurd)[inputs]: Replace util-linux with util-linux:static, add parted,
rumpkernel.
[arguments]: Rename `prepare-dde' phase to 'prepare-addons'.  Add "rumpdisk"
directory.  Add --enable-static-progs=... option to #:configure-flags, and
remove --without-parted.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
2023-07-13 18:58:53 +02:00
Janneke Nieuwenhuizen
c8799fafa4
gnu: hurd-minimal: Include libshouldbeinlibc and libstore.
* gnu/packages/hurd.scm (hurd-minimal)[inputs]: Add gnumach-headers.
[arguments]: Rewrite to include libshouldbeinlibc and libstore.
* gnu/packages/cross-base.scm (cross-kernel-headers*): Update xhurd-minimal
accordingly: Add xgnumach-headers, add them to cpath, use gexps for
modify-phases, add delete-shared-target phase.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
2023-07-13 18:58:43 +02:00
Janneke Nieuwenhuizen
f86de02dde
gnu: Add rumpkernel.
This uses the Debian Salsa rumpkernel package git as upstream as that is where
delopment happens.  Once things have stabalized upstream may change to the
NetBSD git from where Debian takes their snapshots.

* gnu/packages/hurd.scm (rumpkernel): New variable.
(hurd-headers)[native-inputs]: Use cross-mig directly.
(gnumach)[native-inputs]: Likewise.
(hurd)[native-inputs]: Likewise.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
2023-07-13 18:58:39 +02:00
Janneke Nieuwenhuizen
18757f1a25
gnu: hurd: Update libpciaccess to 0.17.
As suggested by youpi on IRC

    https://logs.guix.gnu.org/hurd/2023-05-17.log#132259

libpciaccess-0.16 is too old for the Hurd and would need Hurd-specific patches
while libpciaccess-0.17 works out of the box.

* gnu/packages/hurd.scm (hurd)[inputs]: Use libpciaccess-0.17.
(netdde)[inputs]: Likewise.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
2023-07-13 18:58:34 +02:00
Josselin Poiret
1f19387ca7
gnu: hurd: Update to v0.9.git20230216.
* gnu/packages/hurd.scm (hurd-headers): Update to v0.9.git20230216.
2023-07-13 18:20:07 +02:00
Josselin Poiret
999a6ac0cf
gnu: mig: Update to 1.8+git20230520.
* gnu/packages/hurd.scm (mig)[source]: Update to 1.8+git20230520.
* gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch:
Drop patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
2023-07-13 18:20:06 +02:00
Josselin Poiret
2edd67d34b
gnu: gnumach: Update to 1.8+git20221224.
* gnu/packages/hurd.scm (gnumach-headers): Update to 1.8+git20221224.
2023-07-13 18:20:06 +02:00
Josselin Poiret
0613df90dd
gnu: hurd: Update supported systems.
* gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal,
hurd-core-headers, gnumach): Update supported systems to %hurd-systems.
2023-07-13 18:20:04 +02:00
Josselin Poiret
c2bb342b5f
gnu: gnumach-headers: Cross-build without relying on x86.
* gnu/packages/hurd.scm (gnumach-headers): Remove configure flags where we
say the builder is running x86.
* gnu/packages/cross-base.scm (cross-gnumach-headers): Work around limitation
of build system, by manually changing the target host_cpu without relying on
--host, because we don't have a working cross-compiler yet.
2023-07-13 18:20:04 +02:00
Janneke Nieuwenhuizen
ff690faf66
gnu: Use target-hurd?, system-hurd? instead of hurd-target?, hurd-system?.
* gnu/packages/hurd.scm (hurd-target?): Remove.
(hurd-system?): Move to...
* guix/utils.scm (system-hurd?): ...here.
* gnu/packages/*: Update all users, removing (gnu packages hurd) include where
now unused.
2023-06-17 14:38:32 +02:00
Josselin Poiret
2756d662aa
gnu: mig/32-bit: Remove.
* gnu/packages/hurd.scm (mig/32-bit): Remove unneeded variant.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2023-03-30 12:44:20 +02:00
Josselin Poiret
99f6cc0e54
gnu: hurd: Update DDE and use libdde_linux26.
* gnu/packages/hurd.scm (dde-sources): Update.
(hurd): Build libdde_linux26 and install it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2023-03-30 12:44:20 +02:00
Josselin Poiret
d509aab230
gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig.
* gnu/packages/hurd.scm (gnumach, hurd-headers, hurd): Switch to cross-mig when
cross-building.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2023-03-30 12:44:20 +02:00
Josselin Poiret
4b62a031a2
gnu: hurd: Remove useless glibc/hurd-headers input.
* gnu/packages/hurd.scm (hurd): Do it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2023-03-30 12:44:19 +02:00