mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/arm-trusted-firmware/default.nix
View File

@@ -8,11 +8,11 @@
}: }:
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
fw = selected.sources.fw; fw = selected.sources.fw;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

6
packages/edk2/default.nix
View File

@@ -17,13 +17,13 @@
}: }:
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
pname = "edk2"; pname = "edk2";
version = "stable202511"; version = "stable202511";
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec (if MODEL == "5" then "mjallen" else null) null; selected = selectVariant versionSpec (if MODEL == "5" then "mjallen" else null) null;
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
edk2Src = sources.edk2; edk2Src = sources.edk2;

6
packages/librepods-beta/default.nix
View File

@@ -17,11 +17,11 @@
}: }:
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "librepods"; pname = "librepods";

6
packages/librepods/default.nix
View File

@@ -11,11 +11,11 @@
}: }:
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "librepods"; pname = "librepods";

10
packages/linux-cachyos/default.nix
View File

@@ -15,7 +15,7 @@
let let
inherit (stdenv) isx86_64 isAarch64 isLinux; inherit (stdenv) isx86_64 isAarch64 isLinux;
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
arch = (if isx86_64 then "x86_64" else "aarch64"); arch = (if isx86_64 then "x86_64" else "aarch64");
@@ -48,10 +48,10 @@ let
}; };
}; };
mainVersions = mkVersions (versioning.selectVariant versionSpec null null); mainVersions = mkVersions (selectVariant versionSpec null null);
ltsVersions = mkVersions (versioning.selectVariant versionSpec "lts" null); ltsVersions = mkVersions (selectVariant versionSpec "lts" null);
rcVersions = mkVersions (versioning.selectVariant versionSpec "rc" null); rcVersions = mkVersions (selectVariant versionSpec "rc" null);
hardenedVersions = mkVersions (versioning.selectVariant versionSpec "hardened" null); hardenedVersions = mkVersions (selectVariant versionSpec "hardened" null);
# ###################################################### # ######################################################
# Base LTO Config # # Base LTO Config #

4
packages/proton-cachyos/default.nix
View File

@@ -19,10 +19,10 @@
}: }:
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec variant null; selected = selectVariant versionSpec variant null;
vars = selected.variables or { }; vars = selected.variables or { };
base = vars.base; base = vars.base;
release = vars.release; release = vars.release;

6
packages/raspberrypi/libraspberrypi/default.nix
View File

@@ -7,11 +7,11 @@
}: }:
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
in in
stdenv.mkDerivation (_finalAttrs: { stdenv.mkDerivation (_finalAttrs: {
pname = "libraspberrypi"; pname = "libraspberrypi";

6
packages/raspberrypi/linux-rpi/default.nix
View File

@@ -11,12 +11,12 @@
let let
# stdenv = ccacheStdenv; # stdenv = ccacheStdenv;
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
vars = selected.variables or { }; vars = selected.variables or { };
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
modDirVersion = vars.modDirVersion; modDirVersion = vars.modDirVersion;
tag = vars.tag; tag = vars.tag;

6
packages/raspberrypi/raspberryPiWirelessFirmware/default.nix
View File

@@ -5,11 +5,11 @@
}: }:
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {

6
packages/raspberrypi/raspberrypi-overlays/default.nix
View File

@@ -5,12 +5,12 @@
}: }:
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
vars = selected.variables or { }; vars = selected.variables or { };
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {

6
packages/raspberrypi/raspberrypi-utils/default.nix
View File

@@ -9,11 +9,11 @@
}: }:
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
in in
stdenv.mkDerivation (_finalAttrs: { stdenv.mkDerivation (_finalAttrs: {
pname = "raspberrypi-utils"; pname = "raspberrypi-utils";

6
packages/raspberrypi/raspberrypifw/default.nix
View File

@@ -5,12 +5,12 @@
}: }:
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
vars = selected.variables or { }; vars = selected.variables or { };
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
# NOTE: this should be updated with linux_rpi # NOTE: this should be updated with linux_rpi

6
packages/raspberrypi/uefi-rpi4/default.nix
View File

@@ -5,12 +5,12 @@
}: }:
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
vars = selected.variables or { }; vars = selected.variables or { };
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
in in
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "uefi-rpi4"; pname = "uefi-rpi4";

6
packages/raspberrypi/uefi-rpi5/default.nix
View File

@@ -5,12 +5,12 @@
}: }:
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
vars = selected.variables or { }; vars = selected.variables or { };
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
defaultConfig = '' defaultConfig = ''
EOF EOF

6
packages/system/open-remote-ssh/default.nix
View File

@@ -7,12 +7,12 @@
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
vars = selected.variables or { }; vars = selected.variables or { };
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
in in
vscode-utils.buildVscodeMarketplaceExtension { vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {

6
packages/uboot/default.nix
View File

@@ -20,11 +20,11 @@
let let
inherit (lib.trivial) importJSON; inherit (lib.trivial) importJSON;
inherit (lib.${namespace}) versioning; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = versioning.selectVariant versionSpec null null; selected = selectVariant versionSpec null null;
sources = versioning.mkAllSources selected; sources = mkAllSources selected;
defaultVersion = selected.variables.version; defaultVersion = selected.variables.version;
defaultSrc = sources.uboot; defaultSrc = sources.uboot;