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

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