From b21ae11b04fe1a74cdaadc1e0f43a5e82c0dc793 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 21 Oct 2024 22:16:55 +0000 Subject: [PATCH] NUR: fix eval locally, at least: hopefully this fixes the CI jobs as well --- pkgs/by-name/linux-armbian/package.nix | 9 ++++++--- scripts/check-nur | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/linux-armbian/package.nix b/pkgs/by-name/linux-armbian/package.nix index 21f6813f4..7c9b3ed7a 100644 --- a/pkgs/by-name/linux-armbian/package.nix +++ b/pkgs/by-name/linux-armbian/package.nix @@ -20,7 +20,10 @@ let linux = linux_latest; patches = import ./patches.nix { inherit fetchFromGitHub lib newScope; }; - + nullPatch = { + name = "null-patch"; + patch = null; + }; in linux.override { # inherit (linux_latest) src version modDirVersion; @@ -346,7 +349,7 @@ linux.override { # notably, it defines several of the voltage regulators, one of which is required to power the modem. byName."arm64-dts-sun50i-a64-pinephone-Add-Type-C-support-for-all-PP-va" patches.sane.vbat-bb-always-on #< slight tweak to `Add-Type-C-support...` to ensure power to the modem - (if withModemPower then byName."arm64-dts-sun50i-a64-pinephone-Add-modem-power-manager" else { patch = null; }) + (if withModemPower then byName."arm64-dts-sun50i-a64-pinephone-Add-modem-power-manager" else nullPatch) # byName."arm64-dts-sun50i-a64-pinephone-Fix-BH-modem-manager-behavior" # byName."arm64-dts-sun50i-a64-pinephone-Add-detailed-OCV-to-capactiy-con" # byName."arm64-dts-sun50i-a64-pinephone-Shorten-post-power-on-delay-on-m" @@ -422,7 +425,7 @@ linux.override { # # byName."arm64-dts-allwinner-h6-Add-SCPI-protocol" # # byName."ARM-dts-sun8i-a83t-tbs-a711-Give-Linux-more-privileges-over-SCP" # # byName."rtc-sun6i-Allow-RTC-wakeup-after-shutdown" - (if withModemPower then byName."misc-modem-power-Power-manager-for-modems" else { patch = null; }) + (if withModemPower then byName."misc-modem-power-Power-manager-for-modems" else nullPatch) # # byName."ARM-dts-sun8i-a83t-Add-missing-GPU-trip-point" # # byName."arm64-dts-sun50i-h5-Add-missing-GPU-trip-point" # byName."arm64-dts-sun50i-a64-Add-missing-trip-points-for-GPU" diff --git a/scripts/check-nur b/scripts/check-nur index 7384a73c8..c075dac12 100755 --- a/scripts/check-nur +++ b/scripts/check-nur @@ -1,13 +1,15 @@ #!/bin/sh NIX_FILES_TOP=/home/colin/nixos +nixpkgs=$(nix-store --realize $(nix-instantiate -A nixpkgs-bootstrap.master.src)) + cd $NIX_FILES_TOP/integrations/nur -# TODO: should include `-I nixpkgs=` + NIX_PATH= NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 nix-env -f . -qa \* --meta --xml \ --allowed-uris https://static.rust-lang.org \ --option restrict-eval true \ --option allow-import-from-derivation true \ --drv-path --show-trace \ + -I nixpkgs=$nixpkgs \ -I ../../ \ "$@" \ | tee # tee to prevent interactive mode -