From a5b53e66e767701832aa7d45a87f5fbcabc4366e Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Thu, 22 Jan 2026 08:49:09 -0600 Subject: [PATCH] cleanup --- packages/arm-trusted-firmware/default.nix | 6 +++--- packages/edk2/default.nix | 6 +++--- packages/librepods-beta/default.nix | 6 +++--- packages/librepods/default.nix | 6 +++--- packages/linux-cachyos/default.nix | 10 +++++----- packages/proton-cachyos/default.nix | 4 ++-- packages/raspberrypi/libraspberrypi/default.nix | 6 +++--- packages/raspberrypi/linux-rpi/default.nix | 6 +++--- .../raspberryPiWirelessFirmware/default.nix | 6 +++--- packages/raspberrypi/raspberrypi-overlays/default.nix | 6 +++--- packages/raspberrypi/raspberrypi-utils/default.nix | 6 +++--- packages/raspberrypi/raspberrypifw/default.nix | 6 +++--- packages/raspberrypi/uefi-rpi4/default.nix | 6 +++--- packages/raspberrypi/uefi-rpi5/default.nix | 6 +++--- packages/system/open-remote-ssh/default.nix | 6 +++--- packages/uboot/default.nix | 6 +++--- 16 files changed, 49 insertions(+), 49 deletions(-) diff --git a/packages/arm-trusted-firmware/default.nix b/packages/arm-trusted-firmware/default.nix index 9489a9a..6797d58 100644 --- a/packages/arm-trusted-firmware/default.nix +++ b/packages/arm-trusted-firmware/default.nix @@ -8,11 +8,11 @@ }: let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; - sources = versioning.mkAllSources selected; + selected = selectVariant versionSpec null null; + sources = mkAllSources selected; fw = selected.sources.fw; in stdenv.mkDerivation { diff --git a/packages/edk2/default.nix b/packages/edk2/default.nix index ff7a6d1..a31af89 100644 --- a/packages/edk2/default.nix +++ b/packages/edk2/default.nix @@ -17,13 +17,13 @@ }: let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; pname = "edk2"; version = "stable202511"; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec (if MODEL == "5" then "mjallen" else null) null; - sources = versioning.mkAllSources selected; + selected = selectVariant versionSpec (if MODEL == "5" then "mjallen" else null) null; + sources = mkAllSources selected; edk2Src = sources.edk2; diff --git a/packages/librepods-beta/default.nix b/packages/librepods-beta/default.nix index fbd8b5f..6cfb394 100644 --- a/packages/librepods-beta/default.nix +++ b/packages/librepods-beta/default.nix @@ -17,11 +17,11 @@ }: let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; - sources = versioning.mkAllSources selected; + selected = selectVariant versionSpec null null; + sources = mkAllSources selected; in rustPlatform.buildRustPackage rec { pname = "librepods"; diff --git a/packages/librepods/default.nix b/packages/librepods/default.nix index cb9339c..a65a8a1 100644 --- a/packages/librepods/default.nix +++ b/packages/librepods/default.nix @@ -11,11 +11,11 @@ }: let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; - sources = versioning.mkAllSources selected; + selected = selectVariant versionSpec null null; + sources = mkAllSources selected; in stdenv.mkDerivation { pname = "librepods"; diff --git a/packages/linux-cachyos/default.nix b/packages/linux-cachyos/default.nix index 976edf2..a0bc9f9 100644 --- a/packages/linux-cachyos/default.nix +++ b/packages/linux-cachyos/default.nix @@ -15,7 +15,7 @@ let inherit (stdenv) isx86_64 isAarch64 isLinux; inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; arch = (if isx86_64 then "x86_64" else "aarch64"); @@ -48,10 +48,10 @@ let }; }; - mainVersions = mkVersions (versioning.selectVariant versionSpec null null); - ltsVersions = mkVersions (versioning.selectVariant versionSpec "lts" null); - rcVersions = mkVersions (versioning.selectVariant versionSpec "rc" null); - hardenedVersions = mkVersions (versioning.selectVariant versionSpec "hardened" null); + mainVersions = mkVersions (selectVariant versionSpec null null); + ltsVersions = mkVersions (selectVariant versionSpec "lts" null); + rcVersions = mkVersions (selectVariant versionSpec "rc" null); + hardenedVersions = mkVersions (selectVariant versionSpec "hardened" null); # ###################################################### # Base LTO Config # diff --git a/packages/proton-cachyos/default.nix b/packages/proton-cachyos/default.nix index c4922fd..9d0fdac 100644 --- a/packages/proton-cachyos/default.nix +++ b/packages/proton-cachyos/default.nix @@ -19,10 +19,10 @@ }: let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec variant null; + selected = selectVariant versionSpec variant null; vars = selected.variables or { }; base = vars.base; release = vars.release; diff --git a/packages/raspberrypi/libraspberrypi/default.nix b/packages/raspberrypi/libraspberrypi/default.nix index c234c44..7bc410c 100644 --- a/packages/raspberrypi/libraspberrypi/default.nix +++ b/packages/raspberrypi/libraspberrypi/default.nix @@ -7,11 +7,11 @@ }: let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; - sources = versioning.mkAllSources selected; + selected = selectVariant versionSpec null null; + sources = mkAllSources selected; in stdenv.mkDerivation (_finalAttrs: { pname = "libraspberrypi"; diff --git a/packages/raspberrypi/linux-rpi/default.nix b/packages/raspberrypi/linux-rpi/default.nix index 77c7f16..61b4c0e 100644 --- a/packages/raspberrypi/linux-rpi/default.nix +++ b/packages/raspberrypi/linux-rpi/default.nix @@ -11,12 +11,12 @@ let # stdenv = ccacheStdenv; inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; + selected = selectVariant versionSpec null null; vars = selected.variables or { }; - sources = versioning.mkAllSources selected; + sources = mkAllSources selected; modDirVersion = vars.modDirVersion; tag = vars.tag; diff --git a/packages/raspberrypi/raspberryPiWirelessFirmware/default.nix b/packages/raspberrypi/raspberryPiWirelessFirmware/default.nix index d93d378..e0d717c 100644 --- a/packages/raspberrypi/raspberryPiWirelessFirmware/default.nix +++ b/packages/raspberrypi/raspberryPiWirelessFirmware/default.nix @@ -5,11 +5,11 @@ }: let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; - sources = versioning.mkAllSources selected; + selected = selectVariant versionSpec null null; + sources = mkAllSources selected; in stdenvNoCC.mkDerivation { diff --git a/packages/raspberrypi/raspberrypi-overlays/default.nix b/packages/raspberrypi/raspberrypi-overlays/default.nix index 2af5dde..b4229ed 100644 --- a/packages/raspberrypi/raspberrypi-overlays/default.nix +++ b/packages/raspberrypi/raspberrypi-overlays/default.nix @@ -5,12 +5,12 @@ }: let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; + selected = selectVariant versionSpec null null; vars = selected.variables or { }; - sources = versioning.mkAllSources selected; + sources = mkAllSources selected; in stdenvNoCC.mkDerivation { diff --git a/packages/raspberrypi/raspberrypi-utils/default.nix b/packages/raspberrypi/raspberrypi-utils/default.nix index 070c687..a167b4e 100644 --- a/packages/raspberrypi/raspberrypi-utils/default.nix +++ b/packages/raspberrypi/raspberrypi-utils/default.nix @@ -9,11 +9,11 @@ }: let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; - sources = versioning.mkAllSources selected; + selected = selectVariant versionSpec null null; + sources = mkAllSources selected; in stdenv.mkDerivation (_finalAttrs: { pname = "raspberrypi-utils"; diff --git a/packages/raspberrypi/raspberrypifw/default.nix b/packages/raspberrypi/raspberrypifw/default.nix index 1f1184d..5057af5 100644 --- a/packages/raspberrypi/raspberrypifw/default.nix +++ b/packages/raspberrypi/raspberrypifw/default.nix @@ -5,12 +5,12 @@ }: let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; + selected = selectVariant versionSpec null null; vars = selected.variables or { }; - sources = versioning.mkAllSources selected; + sources = mkAllSources selected; in stdenvNoCC.mkDerivation { # NOTE: this should be updated with linux_rpi diff --git a/packages/raspberrypi/uefi-rpi4/default.nix b/packages/raspberrypi/uefi-rpi4/default.nix index f0daeb0..4a574b5 100644 --- a/packages/raspberrypi/uefi-rpi4/default.nix +++ b/packages/raspberrypi/uefi-rpi4/default.nix @@ -5,12 +5,12 @@ }: let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; + selected = selectVariant versionSpec null null; vars = selected.variables or { }; - sources = versioning.mkAllSources selected; + sources = mkAllSources selected; in stdenvNoCC.mkDerivation rec { pname = "uefi-rpi4"; diff --git a/packages/raspberrypi/uefi-rpi5/default.nix b/packages/raspberrypi/uefi-rpi5/default.nix index cfa47a1..18ecf53 100644 --- a/packages/raspberrypi/uefi-rpi5/default.nix +++ b/packages/raspberrypi/uefi-rpi5/default.nix @@ -5,12 +5,12 @@ }: let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; + selected = selectVariant versionSpec null null; vars = selected.variables or { }; - sources = versioning.mkAllSources selected; + sources = mkAllSources selected; defaultConfig = '' EOF diff --git a/packages/system/open-remote-ssh/default.nix b/packages/system/open-remote-ssh/default.nix index eedb3d9..7ab4787 100644 --- a/packages/system/open-remote-ssh/default.nix +++ b/packages/system/open-remote-ssh/default.nix @@ -7,12 +7,12 @@ let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; + selected = selectVariant versionSpec null null; vars = selected.variables or { }; - sources = versioning.mkAllSources selected; + sources = mkAllSources selected; in vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/packages/uboot/default.nix b/packages/uboot/default.nix index e329b75..6f4be09 100644 --- a/packages/uboot/default.nix +++ b/packages/uboot/default.nix @@ -20,11 +20,11 @@ let inherit (lib.trivial) importJSON; - inherit (lib.${namespace}) versioning; + inherit (lib.${namespace}) selectVariant mkAllSources; versionSpec = importJSON ./version.json; - selected = versioning.selectVariant versionSpec null null; - sources = versioning.mkAllSources selected; + selected = selectVariant versionSpec null null; + sources = mkAllSources selected; defaultVersion = selected.variables.version; defaultSrc = sources.uboot;