diff options
| author | Artturin <Artturin@artturin.com> | 2023-11-04 00:32:06 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-11-04 00:52:15 +0200 |
| commit | 70902269fdc4cc8e24e6df1fd58e0672c2d930e7 (patch) | |
| tree | e505e2ca859e32554430260271239b803411fae9 /pkgs/test | |
| parent | 9ac60d31c0fa0bb2bbd7d166c4eaf19e9ba8db35 (diff) | |
| download | nixpkgs-70902269fdc4cc8e24e6df1fd58e0672c2d930e7.tar nixpkgs-70902269fdc4cc8e24e6df1fd58e0672c2d930e7.tar.gz nixpkgs-70902269fdc4cc8e24e6df1fd58e0672c2d930e7.tar.bz2 nixpkgs-70902269fdc4cc8e24e6df1fd58e0672c2d930e7.tar.lz nixpkgs-70902269fdc4cc8e24e6df1fd58e0672c2d930e7.tar.xz nixpkgs-70902269fdc4cc8e24e6df1fd58e0672c2d930e7.tar.zst nixpkgs-70902269fdc4cc8e24e6df1fd58e0672c2d930e7.zip | |
tests: fix eval failures
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/cross/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/test/default.nix | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index b13c41a1905..f844fc2b8ec 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -13,7 +13,7 @@ let compareTest = { emulator, pkgFun, hostPkgs, crossPkgs, exec, args ? [] }: let pkgName = (pkgFun hostPkgs).name; args' = lib.concatStringsSep " " args; - in crossPkgs.runCommand "test-${pkgName}-${crossPkgs.hostPlatform.config}" { + in crossPkgs.runCommand "test-${pkgName}-${crossPkgs.stdenv.hostPlatform.config}" { nativeBuildInputs = [ pkgs.dos2unix ]; } '' # Just in case we are using wine, get rid of that annoying extra @@ -59,12 +59,12 @@ let crossSystem = crossSystemFun system; }; - emulator = crossPkgs.hostPlatform.emulator pkgs; + emulator = crossPkgs.stdenv.hostPlatform.emulator pkgs; # Apply some transformation on windows to get dlls in the right # place. Unfortunately mingw doesn’t seem to be able to do linking # properly. - platformFun = pkg: if crossPkgs.hostPlatform.isWindows then + platformFun = pkg: if crossPkgs.stdenv.hostPlatform.isWindows then pkgs.buildEnv { name = "${pkg.name}-winlinks"; paths = [pkg] ++ pkg.buildInputs; @@ -92,7 +92,7 @@ let }; pkg-config = {platformFun, crossPkgs, emulator}: crossPkgs.runCommand - "test-pkg-config-${crossPkgs.hostPlatform.config}" + "test-pkg-config-${crossPkgs.stdenv.hostPlatform.config}" { depsBuildBuild = [ crossPkgs.pkgsBuildBuild.pkg-config ]; nativeBuildInputs = [ crossPkgs.pkgsBuildHost.pkg-config crossPkgs.buildPackages.zlib ]; diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 595c3413d5e..06c275edc70 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -9,6 +9,8 @@ with pkgs; pkgSets = lib.pipe pkgNames [ (filter (lib.hasPrefix "llvmPackages")) (filter (n: n != "rocmPackages.llvm")) + # Is a throw alias. + (filter (n: n != "llvmPackages_rocm")) (filter (n: n != "llvmPackages_latest")) (filter (n: n != "llvmPackages_git")) ]; |