This commit is contained in:
mjallen18
2026-01-22 08:49:09 -06:00
parent 5d9613ee13
commit a5b53e66e7
16 changed files with 49 additions and 49 deletions

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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";

View File

@@ -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";

View File

@@ -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 #

View File

@@ -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;

View File

@@ -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";

View File

@@ -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;

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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";

View File

@@ -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

View File

@@ -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";

View File

@@ -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

View File

@@ -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 = {

View File

@@ -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;