flake: remove dead code
Some of this code existed for installer tests, and indeed its removal is an indication that our daemon cross-compatibility tests were removed. Although these are not like, super critical tests, we would like to restore them. See: https://git.lix.systems/lix-project/lix/issues/33 Change-Id: I75c733b25c00eca3a9676d498703bbfc1d6ec21b
This commit is contained in:
parent
84599abd4c
commit
de20392c37
1 changed files with 0 additions and 37 deletions
37
flake.nix
37
flake.nix
|
@ -83,39 +83,6 @@
|
||||||
cross = forAllCrossSystems (crossSystem: make-pkgs crossSystem "stdenv");
|
cross = forAllCrossSystems (crossSystem: make-pkgs crossSystem "stdenv");
|
||||||
});
|
});
|
||||||
|
|
||||||
testNixVersions = pkgs: client: daemon: let
|
|
||||||
nix = pkgs.callPackage ./package.nix {
|
|
||||||
pname =
|
|
||||||
"nix-tests"
|
|
||||||
+ lib.optionalString
|
|
||||||
(lib.versionAtLeast daemon.version "2.4pre20211005" &&
|
|
||||||
lib.versionAtLeast client.version "2.4pre20211005")
|
|
||||||
"-${client.version}-against-${daemon.version}";
|
|
||||||
};
|
|
||||||
in nix.overrideAttrs (prevAttrs: {
|
|
||||||
NIX_DAEMON_PACKAGE = daemon;
|
|
||||||
NIX_CLIENT_PACKAGE = client;
|
|
||||||
|
|
||||||
dontBuild = true;
|
|
||||||
doInstallCheck = true;
|
|
||||||
|
|
||||||
configureFlags = prevAttrs.configureFlags ++ [
|
|
||||||
# We don't need the actual build here.
|
|
||||||
"--disable-build"
|
|
||||||
];
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out
|
|
||||||
'';
|
|
||||||
|
|
||||||
installCheckPhase = lib.optionalString pkgs.stdenv.hostPlatform.isDarwin ''
|
|
||||||
export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
|
|
||||||
'' + ''
|
|
||||||
mkdir -p src/nix-channel
|
|
||||||
make installcheck -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
|
|
||||||
binaryTarball = nix: pkgs:
|
binaryTarball = nix: pkgs:
|
||||||
let
|
let
|
||||||
inherit (pkgs) buildPackages;
|
inherit (pkgs) buildPackages;
|
||||||
|
@ -147,10 +114,6 @@
|
||||||
overlayFor = getStdenv: final: prev:
|
overlayFor = getStdenv: final: prev:
|
||||||
let
|
let
|
||||||
currentStdenv = getStdenv final;
|
currentStdenv = getStdenv final;
|
||||||
comDeps = with final; commonDeps {
|
|
||||||
inherit pkgs;
|
|
||||||
inherit (currentStdenv.hostPlatform) isStatic;
|
|
||||||
};
|
|
||||||
in {
|
in {
|
||||||
nixStable = prev.nix;
|
nixStable = prev.nix;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue