colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/additional/linux-exynos5-mainline/default.nix
View File

@@ -1,13 +1,14 @@
{ buildLinux { lib
, buildLinux
, fetchFromGitLab , fetchFromGitLab
#v nixpkgs calls `.override` on the kernel to configure additional things #v nixpkgs calls `.override` on the kernel to configure additional things
, features ? {} , features ? {}
, kernelPatches ? [] , kernelPatches ? null
, randstructSeed ? "" , randstructSeed ? ""
, structuredExtraConfig ? {} , structuredExtraConfig ? {}
, ... , ...
}: }:
buildLinux { buildLinux ({
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "exynos5-mainline"; owner = "exynos5-mainline";
repo = "linux"; repo = "linux";
@@ -23,5 +24,9 @@ buildLinux {
autoModules = false; autoModules = false;
# preferBuiltin = 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;
})

5
scripts/check-nur
View File

@@ -1,7 +1,8 @@
#!/bin/sh #!/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>` # 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 \ --allowed-uris https://static.rust-lang.org \
--option restrict-eval true \ --option restrict-eval true \
--option allow-import-from-derivation true \ --option allow-import-from-derivation true \