[PATCH 1/2] vm/sys/net: build against pkgsMusl
Some of the following changes do not work with pkgsStatic, specifically it is difficult to link libbpf statically[1]. [1] https://lists.fedorahosted.org/archives/list/elfutils-devel@lists.fedorahost... Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev> Reviewed-by: Alyssa Ross <hi@alyssa.is> --- vm/sys/net/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index b8dc964..4cdb1c4 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -2,8 +2,8 @@ # SPDX-FileCopyrightText: 2021-2023 Alyssa Ross <hi@alyssa.is> import ../../../lib/call-package.nix ( -{ spectrum-build-tools, src, terminfo, pkgsStatic }: -pkgsStatic.callPackage ( +{ spectrum-build-tools, src, terminfo, pkgsMusl }: +pkgsMusl.callPackage ( { lib, stdenvNoCC, nixos, runCommand, writeClosure , erofs-utils, jq, s6-rc, util-linux, xorg -- 2.51.0
Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev> --- lib/nixpkgs.default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/nixpkgs.default.nix b/lib/nixpkgs.default.nix index c119aef..ff5b679 100644 --- a/lib/nixpkgs.default.nix +++ b/lib/nixpkgs.default.nix @@ -4,6 +4,6 @@ # Generated by scripts/update-nixpkgs.sh. import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/a870b7409045459d9a4011ddd6a42acbb2f..."; - sha256 = "0a2plvg99na3g9ma17lq77mc6vxjn4nazf0zpdjmaj869b1dg4fn"; + url = "https://github.com/NixOS/nixpkgs/archive/c91d2da044a9e4af299c989ca9d395ae53d..."; + sha256 = "1xlvihrr1m3zxy3bwjr0lp8fkfn5b2kra52x8264bl75b30kcwa5"; }) -- 2.51.0
Yureka Lilian <yureka@cyberchaos.dev> writes:
Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev> --- lib/nixpkgs.default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Alyssa Ross <hi@alyssa.is> Very grateful to have somebody else having taken care of a Nixpkgs update. I'm hoping we can get a fix for the BPF x86_64 issue before I apply this so that the builders can do a complete build. It sounds like Demi should have a new patch soon.
diff --git a/lib/nixpkgs.default.nix b/lib/nixpkgs.default.nix index c119aef..ff5b679 100644 --- a/lib/nixpkgs.default.nix +++ b/lib/nixpkgs.default.nix @@ -4,6 +4,6 @@ # Generated by scripts/update-nixpkgs.sh.
import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/a870b7409045459d9a4011ddd6a42acbb2f..."; - sha256 = "0a2plvg99na3g9ma17lq77mc6vxjn4nazf0zpdjmaj869b1dg4fn"; + url = "https://github.com/NixOS/nixpkgs/archive/c91d2da044a9e4af299c989ca9d395ae53d..."; + sha256 = "1xlvihrr1m3zxy3bwjr0lp8fkfn5b2kra52x8264bl75b30kcwa5"; }) -- 2.51.0
Yureka Lilian <yureka@cyberchaos.dev> writes:
Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev> --- lib/nixpkgs.default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
I'm seeing a timeout in the networking test in release/checks/integration with this patch applied. I'll try bisecting, but I get the impression you might have the resources to be able to do that faster, if you want to try to beat me. Note that the default timeout on aarch64 is quite high if you have good hardware, so if you do try you might want to adjust it to something more raesonable. (On my MacBook Pro it takes under two minutes.)
diff --git a/lib/nixpkgs.default.nix b/lib/nixpkgs.default.nix index c119aef..ff5b679 100644 --- a/lib/nixpkgs.default.nix +++ b/lib/nixpkgs.default.nix @@ -4,6 +4,6 @@ # Generated by scripts/update-nixpkgs.sh.
import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/a870b7409045459d9a4011ddd6a42acbb2f..."; - sha256 = "0a2plvg99na3g9ma17lq77mc6vxjn4nazf0zpdjmaj869b1dg4fn"; + url = "https://github.com/NixOS/nixpkgs/archive/c91d2da044a9e4af299c989ca9d395ae53d..."; + sha256 = "1xlvihrr1m3zxy3bwjr0lp8fkfn5b2kra52x8264bl75b30kcwa5"; }) -- 2.51.0
On 10/26/25 05:09, Alyssa Ross wrote:
Yureka Lilian <yureka@cyberchaos.dev> writes:
Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev> --- lib/nixpkgs.default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
I'm seeing a timeout in the networking test in release/checks/integration with this patch applied. I'll try bisecting, but I get the impression you might have the resources to be able to do that faster, if you want to try to beat me. I wonder if this is not a new bug, but rather a pre-existing race being exposed. I have run into this before on x86.
I think it would be better to actually figure out what is happening. One option would be allow the person running the tests to break into a shell. -- Sincerely, Demi Marie Obenour (she/her/hers)
Demi Marie Obenour <demiobenour@gmail.com> writes:
On 10/26/25 05:09, Alyssa Ross wrote:
Yureka Lilian <yureka@cyberchaos.dev> writes:
Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev> --- lib/nixpkgs.default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
I'm seeing a timeout in the networking test in release/checks/integration with this patch applied. I'll try bisecting, but I get the impression you might have the resources to be able to do that faster, if you want to try to beat me. I wonder if this is not a new bug, but rather a pre-existing race being exposed. I have run into this before on x86.
I think it would be better to actually figure out what is happening. One option would be allow the person running the tests to break into a shell.
Interesting — I haven't. It should be possible to get a shell by entering the nix-shell for release/checks/integration, running the test with meson test -v networking, and then running vm-console in the graphical QEMU that spawns. I'd be a bit surprised if this turns out to be the same issue, since this happens consistently, but I guess not /that/ surprised.
Alyssa Ross <hi@alyssa.is> writes:
Yureka Lilian <yureka@cyberchaos.dev> writes:
Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev> --- lib/nixpkgs.default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
I'm seeing a timeout in the networking test in release/checks/integration with this patch applied. I'll try bisecting, but I get the impression you might have the resources to be able to do that faster, if you want to try to beat me.
https://lore.kernel.org/regressions/87y0ota32b.fsf@alyssa.is/
This patch has been committed as 57d800d6645aafb742d6e22bdc6e99fd68f06188, which can be viewed online at https://spectrum-os.org/git/spectrum/commit/?id=57d800d6645aafb742d6e22bdc6e.... This is an automated message. Send comments/questions/requests to: Alyssa Ross <hi@alyssa.is>
This patch has been committed as 2bac0c01cd7184f584385647a5892beedae685a0, which can be viewed online at https://spectrum-os.org/git/spectrum/commit/?id=2bac0c01cd7184f584385647a589.... This is an automated message. Send comments/questions/requests to: Alyssa Ross <hi@alyssa.is>
participants (4)
-
Alyssa Ross -
Alyssa Ross -
Demi Marie Obenour -
Yureka Lilian