cleanup
This commit is contained in:
@@ -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";
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user