scripts/check-nur: fix (linux-exynos5-mainline was invalid in default eval)

This commit is contained in:
Colin 2024-06-21 07:43:33 +00:00
parent 78f4cd9be2
commit 3d871e8d7c
2 changed files with 13 additions and 7 deletions

View File

@ -1,13 +1,14 @@
{ buildLinux
{ lib
, buildLinux
, fetchFromGitLab
#v nixpkgs calls `.override` on the kernel to configure additional things
, features ? {}
, kernelPatches ? []
, kernelPatches ? null
, randstructSeed ? ""
, structuredExtraConfig ? {}
, ...
}:
buildLinux {
buildLinux ({
src = fetchFromGitLab {
owner = "exynos5-mainline";
repo = "linux";
@ -23,5 +24,9 @@ buildLinux {
autoModules = false;
# preferBuiltin = false;
inherit features kernelPatches randstructSeed structuredExtraConfig;
}
inherit features randstructSeed structuredExtraConfig;
} // lib.optionalAttrs (builtins.isList kernelPatches) {
# callPackage mucks with `kernelPatches`: only forward this argument if it's a list,
# as expected by `buildLinux`
inherit kernelPatches;
})

View File

@ -1,7 +1,8 @@
#!/bin/sh
cd ../integrations/nur
NIX_FILES_TOP=/home/colin/nixos
cd $NIX_FILES_TOP/integrations/nur
# TODO: should include `-I nixpkgs=</path/to/an/unpatched/nixpkgs>`
NIX_PATH= NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 nix-env -f . -qa \* --meta --xml \
NIX_PATH= NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 nix-env -f . -qa linux\* --meta --xml \
--allowed-uris https://static.rust-lang.org \
--option restrict-eval true \
--option allow-import-from-derivation true \