qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

flake: fix eval of checks & devshell on i686-linux

Browse source 
Change-Id: I62da3161327051005e3f48f83974140efef4417e
This commit is contained in:
Qyriad 2024-05-06 22:54:18 -06:00
parent 9001de4255
commit 1a76a6e2d7
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
flake.nix
View file

@ -96,6 +96,10 @@
]; ];
forAllSystems = lib.genAttrs systems; forAllSystems = lib.genAttrs systems;
# Same as forAllSystems, but removes nulls, in case something is broken
# on that system.
forAvailableSystems =
f: lib.filterAttrs (name: value: value != null && value != { }) (forAllSystems f);
forAllCrossSystems = lib.genAttrs crossSystems; forAllCrossSystems = lib.genAttrs crossSystems;
@ -282,18 +286,21 @@
); );
}; };
pre-commit = forAllSystems ( pre-commit = forAvailableSystems (
system: system:
let let
pkgs = nixpkgsFor.${system}.native; pkgs = nixpkgsFor.${system}.native;
pre-commit-check = import ./misc/pre-commit.nix { inherit self pkgs pre-commit-hooks; };
# dotnet-sdk_6, a nativeBuildInputs of pre-commit, is broken on i686-linux.
available = lib.meta.availableOn { inherit system; } pkgs.dotnet-sdk_6;
in in
import ./misc/pre-commit.nix { inherit self pkgs pre-commit-hooks; } lib.optionalAttrs available pre-commit-check
); );
}; };
# NOTE *do not* add fresh derivations to checks, always add them to # NOTE *do not* add fresh derivations to checks, always add them to
# hydraJobs first (so CI will pick them up) and only link them here # hydraJobs first (so CI will pick them up) and only link them here
checks = forAllSystems ( checks = forAvailableSystems (
system: system:
{ {
binaryTarball = self.hydraJobs.binaryTarball.${system}; binaryTarball = self.hydraJobs.binaryTarball.${system};
@ -301,6 +308,7 @@
nixpkgsLibTests = self.hydraJobs.tests.nixpkgsLibTests.${system}; nixpkgsLibTests = self.hydraJobs.tests.nixpkgsLibTests.${system};
rl-next = self.hydraJobs.rl-next.${system}.user; rl-next = self.hydraJobs.rl-next.${system}.user;
rl-next-dev = self.hydraJobs.rl-next.${system}.dev; rl-next-dev = self.hydraJobs.rl-next.${system}.dev;
# Will be null on i686-linux, and filtered out by forAvailableSystems.
pre-commit = self.hydraJobs.pre-commit.${system}; pre-commit = self.hydraJobs.pre-commit.${system};
} }
// (lib.optionalAttrs (builtins.elem system linux64BitSystems)) { // (lib.optionalAttrs (builtins.elem system linux64BitSystems)) {