treewide: replace deprecated aliases

This commit is contained in:
Weijia Wang 2024-06-30 23:27:13 +02:00
parent b10c573212
commit 7c8efe638c
5 changed files with 9 additions and 9 deletions

View File

@ -153,7 +153,7 @@ import ../make-test-python.nix {
})
'';
}
]) (lib.cartesianProductOfSets {
]) (lib.cartesianProduct {
user = [ "root" "dynamic-user" "static-user" ];
privateTmp = [ true false ];
});

View File

@ -364,14 +364,14 @@ let
patches = [
(substitute {
src = ../common/libcxxabi/wasm.patch;
replacements = [
substitutions = [
"--replace-fail" "/cmake/" "/llvm/cmake/"
];
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
(substitute {
src = ../common/libcxx/libcxx-0001-musl-hacks.patch;
replacements = [
substitutions = [
"--replace-fail" "/include/" "/libcxx/include/"
];
})

View File

@ -394,14 +394,14 @@ in let
patches = [
(substitute {
src = ../common/libcxxabi/wasm.patch;
replacements = [
substitutions = [
"--replace-fail" "/cmake/" "/llvm/cmake/"
];
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
(substitute {
src = ../common/libcxx/libcxx-0001-musl-hacks.patch;
replacements = [
substitutions = [
"--replace-fail" "/include/" "/libcxx/include/"
];
})

View File

@ -367,14 +367,14 @@ in let
patches = [
(substitute {
src = ../common/libcxxabi/wasm.patch;
replacements = [
substitutions = [
"--replace-fail" "/cmake/" "/llvm/cmake/"
];
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
(substitute {
src = ../common/libcxx/libcxx-0001-musl-hacks.patch;
replacements = [
substitutions = [
"--replace-fail" "/include/" "/libcxx/include/"
];
})

View File

@ -420,14 +420,14 @@ in let
})
(substitute {
src = ../common/libcxxabi/wasm.patch;
replacements = [
substitutions = [
"--replace-fail" "/cmake/" "/llvm/cmake/"
];
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
(substitute {
src = ../common/libcxx/libcxx-0001-musl-hacks.patch;
replacements = [
substitutions = [
"--replace-fail" "/include/" "/libcxx/include/"
];
})