raito/shared-public-infra
0
1
Fork 3
Code Issues Pull requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: raito:jade/lix-update-cleanup
Branches Tags
raito:main
raito:jade/lix-update-cleanup
raito:disable-autoUpgrade
raito:so-it-has-begun
raito:pennae
raito:vieuxtype
..
compare: raito:main
Branches Tags
raito:main
raito:jade/lix-update-cleanup
raito:disable-autoUpgrade
raito:so-it-has-begun
raito:pennae
raito:vieuxtype

8 commits
jade/lix-u ... main

Author SHA1 Message Date
raito 5aeb620a66 chore: disable the lix bug details plz patch 
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
 2024-10-19 12:29:43 +02:00
raito 8e72e4585e chore: lix can sometimes… have no patch! 
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
 2024-10-19 12:29:01 +02:00
raito 852d0c107b chore: get rid of the deadlock factory 
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
 2024-10-19 12:27:56 +02:00
Linus Heckemann fe3e4a50fb nix-daemon: set MaxSessions to 100 
This makes more simultaneous remote builds possible when using a
multiplexed SSH connection.
 2024-10-19 10:24:25 +00:00
jade c1f9e26c06 nix config: misc tidying 
Let's be real, I am doing this because I got impatient with the
gratuitous copy to the store this eliminates caused by pkgs.path.

Also gets rid of stuff in nix.extraOptions which is deprecated.
 2024-10-19 10:21:17 +00:00
jade 227e8a381a lix: link debuginfo into the closure 
This is to ease debugging of lix-project/lix#549
 2024-10-19 10:21:17 +00:00
jade 4ae36d6b79 lix: use the lix module 
This is primarily to banish CppNix from Colmena's closure among other
places.
 2024-10-19 10:21:17 +00:00
raito 7248adf458 chore: update lix 
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
 2024-10-19 12:17:03 +02:00
5 changed files with 8 additions and 16 deletions
Show stats Expand all files Collapse all files

2
flake.lock
View file

@ -324,6 +324,8 @@
"url": "https://git.lix.systems/lix-project/lix.git"
},
"original": {
"ref": "refs/heads/main",
"rev": "60578b4d7d0dfc296c61cae963b6b2763422788e",
"type": "git",
"url": "https://git.lix.systems/lix-project/lix.git"
}

2
flake.nix
View file

@ -4,7 +4,7 @@
# To update all inputs:
# $ nix flake update --recreate-lock-file
inputs = {
lix.url = "git+https://git.lix.systems/lix-project/lix.git";
lix.url = "git+https://git.lix.systems/lix-project/lix.git?ref=refs/heads/main&rev=60578b4d7d0dfc296c61cae963b6b2763422788e";
lix.inputs.nixpkgs.follows = "nixpkgs";
lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";

14
hosts/epyc.nix
View file

@ -43,19 +43,7 @@ in
'';
networking.firewall.allowedTCPPorts = [ 5432 ];
nix.buildMachines = [
{
hostName = "localhost";
systems = [
"x86_64-linux"
"riscv64-linux"
];
supportedFeatures = [ "kvm" "nixos-test" "big-parallel" "benchmark" ] ++ gcc-system-features "znver3";
maxJobs = 2;
}
];
boot.binfmt.emulatedSystems = [ "riscv64-linux" "aarch64-linux" "riscv64-linux" ];
boot.binfmt.emulatedSystems = [ "riscv64-linux" "aarch64-linux" ];
simd.arch = "znver3";
system.stateVersion = "23.05";

5
modules/lix-bug-details-pls/default.nix
View file

@ -12,8 +12,9 @@
nixpkgs.overlays = [
(final: prev: {
lix = prev.lix.overrideAttrs (old: {
patches = old.patches ++ [
./0001-wip-complain-about-failing-goals-at-warn-level.patch
patches = (old.patches or [ ]) ++ [
# This patch doesn't apply anymore.
# ./0001-wip-complain-about-failing-goals-at-warn-level.patch
];
});
})

1
modules/nix-daemon.nix
View file

@ -35,6 +35,7 @@ in
# Avoid weird failures for builders.
services.openssh.settings.MaxStartups = 100;
services.openssh.settings.MaxSessions = 100;
# Memory accounting techniques
systemd.services.nix-daemon.serviceConfig = {