yogsototh/mach-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't hardcode nix flake tests to be x86_64-linux

Browse source
This commit is contained in:
jared-w 2021-10-20 13:22:09 -07:00
parent 6f06aa09cd
commit 10bdb376f6
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/test_flakes.nix
View file

@ -2,12 +2,13 @@
baseArgsMkPython ? {},
baseArgsBuildPythonPackage ? {},
mach-nix ? import ../. {},
system ? builtins.currentSystem or "x86_64-linux",
...
}:
with builtins;
let
pyEnv = (builtins.getFlake (toString ../.)).packages.x86_64-linux.gen.python.requests;
pyEnvDockerImage = (builtins.getFlake (toString ../.)).packages.x86_64-linux.gen.docker.requests;
pyEnv = (builtins.getFlake (toString ../.)).packages.${system}.gen.python.requests;
pyEnvDockerImage = (builtins.getFlake (toString ../.)).packages.${system}.gen.docker.requests;
in
(map (p:
if p ? _passthru.python.pkgs.requests then

3
tests/test_flakes_legacy_consistent.nix
View file

@ -2,11 +2,12 @@
baseArgsMkPython ? {},
baseArgsBuildPythonPackage ? {},
mach-nix ? import ../. {},
system ? builtins.currentSystem or "x86_64-linux",
...
}:
with builtins;
let
mkPythonFlakes = (getFlake (toString ../.)).lib.x86_64-linux.mkPython;
mkPythonFlakes = (getFlake (toString ../.)).lib.${system}.mkPython;
pyFlakes = mkPythonFlakes {
requirements = "requests";
};

5
tests/test_flakes_lib.nix
View file

@ -2,11 +2,12 @@
baseArgsMkPython ? {},
baseArgsBuildPythonPackage ? {},
mach-nix ? import ../. {},
system ? builtins.currentSystem or "x86_64-linux",
...
}:
with builtins;
let
mkPython = (builtins.getFlake (toString ../.)).lib.x86_64-linux.mkPython;
buildPythonPackage = (builtins.getFlake (toString ../.)).lib.x86_64-linux.buildPythonPackage;
mkPython = (builtins.getFlake (toString ../.)).lib.${system}.mkPython;
buildPythonPackage = (builtins.getFlake (toString ../.)).lib.${system}.buildPythonPackage;
in
mkPython [ "https://github.com/psf/requests/tarball/v2.25.0" ]