nixos/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-09 20:16:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1657 from NixOS/no-instantiate

Browse source 
speed up ci
This commit is contained in:
Jörg Thalheim 2025-11-06 11:03:32 +00:00 • committed by GitHub
commit be02d168e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 50 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
asus/flow/gv302x/shared.nix
View file

@ -11,7 +11,6 @@ let
mkEnableOption mkEnableOption
mkIf mkIf
mkMerge mkMerge
version
versionAtLeast versionAtLeast
; ;

18
flake.nix
View file

@ -425,16 +425,16 @@
common-cpu-amd-zenpower = import ./common/cpu/amd/zenpower.nix; common-cpu-amd-zenpower = import ./common/cpu/amd/zenpower.nix;
common-cpu-amd-raphael-igpu = import ./common/cpu/amd/raphael/igpu.nix; common-cpu-amd-raphael-igpu = import ./common/cpu/amd/raphael/igpu.nix;
common-cpu-intel = import ./common/cpu/intel; common-cpu-intel = import ./common/cpu/intel;
common-gpu-intel-comet-lake = common-gpu-intel-comet-lake = deprecated "992" "common-gpu-intel-comet-lake" (
deprecated "992" "common-gpu-intel-comet-lake" import ./common/gpu/intel/comet-lake
(import ./common/gpu/intel/comet-lake); );
common-cpu-intel-cpu-only = import ./common/cpu/intel/cpu-only.nix; common-cpu-intel-cpu-only = import ./common/cpu/intel/cpu-only.nix;
common-gpu-intel-kaby-lake = common-gpu-intel-kaby-lake = deprecated "992" "common-gpu-intel-kaby-lake" (
deprecated "992" "common-gpu-intel-kaby-lake" import ./common/gpu/intel/kaby-lake
(import ./common/gpu/intel/kaby-lake); );
common-gpu-intel-sandy-bridge = common-gpu-intel-sandy-bridge = deprecated "992" "common-gpu-intel-sandy-bridge" (
deprecated "992" "common-gpu-intel-sandy-bridge" import ./common/gpu/intel/sandy-bridge
(import ./common/gpu/intel/sandy-bridge); );
common-gpu-amd = import ./common/gpu/amd; common-gpu-amd = import ./common/gpu/amd;
common-gpu-amd-sea-islands = import ./common/gpu/amd/sea-islands; common-gpu-amd-sea-islands = import ./common/gpu/amd/sea-islands;
common-gpu-amd-southern-islands = import ./common/gpu/amd/southern-islands; common-gpu-amd-southern-islands = import ./common/gpu/amd/southern-islands;

3
kobol/helios4/default.nix
View file

@ -5,6 +5,7 @@ let
# A patch to get both PWM fans working # A patch to get both PWM fans working
# the patch has been successfully applied to 5.15 and 5.19 # the patch has been successfully applied to 5.15 and 5.19
{ {
name = "mvebu-gpio-remove-hardcoded-timer-assignment";
patch = pkgs.fetchpatch { patch = pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/armbian/build/bd3466eef2106ea13e85e821f5d852ff97465e6c/patch/kernel/archive/mvebu-5.15/92-mvebu-gpio-remove-hardcoded-timer-assignment.patch"; url = "https://raw.githubusercontent.com/armbian/build/bd3466eef2106ea13e85e821f5d852ff97465e6c/patch/kernel/archive/mvebu-5.15/92-mvebu-gpio-remove-hardcoded-timer-assignment.patch";
sha256 = "sha256-eQqMp0+MZd30zkl8DE89oB7czvyqCkfwF2k0EZ69jr0="; sha256 = "sha256-eQqMp0+MZd30zkl8DE89oB7czvyqCkfwF2k0EZ69jr0=";
@ -12,12 +13,14 @@ let
} }
# support for Wake-On-Lan # support for Wake-On-Lan
{ {
name = "mvebu-gpio-add-wake-on-gpio-support";
patch = pkgs.fetchpatch { patch = pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/armbian/build/bd3466eef2106ea13e85e821f5d852ff97465e6c/patch/kernel/archive/mvebu-5.15/92-mvebu-gpio-add_wake_on_gpio_support.patch"; url = "https://raw.githubusercontent.com/armbian/build/bd3466eef2106ea13e85e821f5d852ff97465e6c/patch/kernel/archive/mvebu-5.15/92-mvebu-gpio-add_wake_on_gpio_support.patch";
sha256 = "sha256-OrvnVCU55P0U78jdoxGRJvl29i+Rvq8AdEGSCCpxa2I="; sha256 = "sha256-OrvnVCU55P0U78jdoxGRJvl29i+Rvq8AdEGSCCpxa2I=";
}; };
} }
{ {
name = "helios4-dts-add-wake-on-lan-support";
patch = pkgs.fetchpatch { patch = pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/armbian/build/bd3466eef2106ea13e85e821f5d852ff97465e6c/patch/kernel/archive/mvebu-5.15/94-helios4-dts-add-wake-on-lan-support.patch"; url = "https://raw.githubusercontent.com/armbian/build/bd3466eef2106ea13e85e821f5d852ff97465e6c/patch/kernel/archive/mvebu-5.15/94-helios4-dts-add-wake-on-lan-support.patch";
sha256 = "sha256-ai4161bTC22023eaVVWsvbk6fQKjkv0P4DQ4DA1Zgow="; sha256 = "sha256-ai4161bTC22023eaVVWsvbk6fQKjkv0P4DQ4DA1Zgow=";

15
mnt/reform/kernel.nix
View file

@ -34,12 +34,17 @@ let
hash = "sha256-XiTuH40b3VJqzwygZzU0FcvMDj41Rq6IsMbm+3+QxDY="; hash = "sha256-XiTuH40b3VJqzwygZzU0FcvMDj41Rq6IsMbm+3+QxDY=";
}; };
kernelPatches = # Use postPatch to apply patches from a directory without IFD
(map (patch: { inherit patch; }) ( postPatch = ''
lib.filesystem.listFilesRecursive "${reformDebianPackages}/linux/patches${lib.versions.majorMinor modDirVersion}" for patch in ${reformDebianPackages}/linux/patches${lib.versions.majorMinor modDirVersion}/*/*.patch; do
)) echo "Applying patch: $patch"
++ [ patch -p1 < "$patch"
done
'';
kernelPatches = [
{ {
name = "reform-dts";
patch = callPackage ./dtsPatch.nix { patch = callPackage ./dtsPatch.nix {
inherit reformDebianPackages; inherit reformDebianPackages;
kernelSource = src; kernelSource = src;

7
pine64/star64/linux-5.15.nix
View file

@ -32,6 +32,7 @@ let
defconfig = "pine64_star64_defconfig"; defconfig = "pine64_star64_defconfig";
kernelPatches = [ kernelPatches = [
{ {
name = "keys-dh-fix";
patch = fetchpatch { patch = fetchpatch {
url = "https://github.com/torvalds/linux/commit/215bebc8c6ac438c382a6a56bd2764a2d4e1da72.diff"; url = "https://github.com/torvalds/linux/commit/215bebc8c6ac438c382a6a56bd2764a2d4e1da72.diff";
hash = "sha256-1ZqmVOkgcDBRkHvVRPH8I5G1STIS1R/l/63PzQQ0z0I="; hash = "sha256-1ZqmVOkgcDBRkHvVRPH8I5G1STIS1R/l/63PzQQ0z0I=";
@ -39,12 +40,16 @@ let
}; };
} }
{ {
name = "starfive-vin-sensor-fix";
patch = fetchpatch { patch = fetchpatch {
url = "https://github.com/starfive-tech/linux/pull/108/commits/9ae8cb751c4d1fd2146b279a8e67887590e9d07a.diff"; url = "https://github.com/starfive-tech/linux/pull/108/commits/9ae8cb751c4d1fd2146b279a8e67887590e9d07a.diff";
hash = "sha256-EY0lno+HkY5mradBUPII3qqu0xh+BVQRzveCQcaht0M="; hash = "sha256-EY0lno+HkY5mradBUPII3qqu0xh+BVQRzveCQcaht0M=";
}; };
} }
{ patch = ./irq-desc-to-data.patch; } {
name = "irq-desc-to-data";
patch = ./irq-desc-to-data.patch;
}
] ]
++ kernelPatches; ++ kernelPatches;

10
purism/librem/5r4/u-boot/default.nix
View file

@ -1,6 +1,5 @@
{ {
stdenv, stdenv,
gcc11Stdenv,
buildUBoot, buildUBoot,
fetchurl, fetchurl,
fetchFromGitLab, fetchFromGitLab,
@ -28,7 +27,7 @@ let
meta.license = lib.licenses.unfree; meta.license = lib.licenses.unfree;
}); });
arm-trusted-firmware-imx8mq = gcc11Stdenv.mkDerivation (_fa: { arm-trusted-firmware-imx8mq = stdenv.mkDerivation (_fa: {
pname = "arm-trusted-firmware-bl31"; pname = "arm-trusted-firmware-bl31";
version = "unstable-2020-07-08"; version = "unstable-2020-07-08";
src = fetchFromGitLab { src = fetchFromGitLab {
@ -40,6 +39,7 @@ let
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];
NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds";
NIX_LDFLAGS = "--no-warn-rwx-segments"; NIX_LDFLAGS = "--no-warn-rwx-segments";
buildFlags = [ buildFlags = [
"PLAT=imx8mq" "PLAT=imx8mq"
@ -53,14 +53,14 @@ let
}); });
ubootLibrem5 = buildUBoot { ubootLibrem5 = buildUBoot {
version = "unstable-2022-12-15"; version = "unstable-2025-03-25";
defconfig = "librem5_defconfig"; defconfig = "librem5_defconfig";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "source.puri.sm"; domain = "source.puri.sm";
owner = "Librem5"; owner = "Librem5";
repo = "uboot-imx"; repo = "uboot-imx";
rev = "956aa590c93977992743b41c45d3c7ee5a024915"; # this is the latest commit on the upstream/librem5 branch rev = "72fcd4ee36e0874daac734c1195263cd9ce9d981"; # this is the latest commit on the upstream/librem5 branch
hash = "sha256-MsIIlarN+WFFEzc0ptLAgS7BwJ6Cosy42xo0EwPn1AU="; hash = "sha256-ymqZPuyyZoFTaCMQIJnuNs1fV0uVwJhyQdnGwv9m9lE=";
}; };
patches = [ ]; patches = [ ];
BL31 = "${arm-trusted-firmware-imx8mq}/bl31.bin"; BL31 = "${arm-trusted-firmware-imx8mq}/bl31.bin";

18
tests/flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixos-stable": { "nixos-stable": {
"locked": { "locked": {
"lastModified": 1755274400, "lastModified": 1761597516,
"narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899", "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,11 +18,11 @@
}, },
"nixos-unstable-small": { "nixos-unstable-small": {
"locked": { "locked": {
"lastModified": 1755375481, "lastModified": 1761789293,
"narHash": "sha256-43PgCQFgFD1nM/7dncytV0c5heNHe/gXrEud18ZWcZU=", "narHash": "sha256-zwQKLaUgHSpY6SvB/MDgPYRPomWAmbkS3Xfo6JvFVOA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "35f1742e4f1470817ff8203185e2ce0359947f12", "rev": "8d42228a0de7c23b012e2f7dd963425a372e1b0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -46,11 +46,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750931469, "lastModified": 1761311587,
"narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
tests/run.py
View file

@ -69,6 +69,7 @@ def run_eval_test(gcroot_dir: Path, jobs: int) -> list[str]:
failed_profiles = [] failed_profiles = []
cmd = [ cmd = [
"nix-eval-jobs", "nix-eval-jobs",
"--no-instantiate",
"--extra-experimental-features", "flakes", "--extra-experimental-features", "flakes",
"--option", "eval-cache", "false", "--option", "eval-cache", "false",
"--gc-roots-dir", "--gc-roots-dir",