useless_has_attr
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
{ inputs, ... }@args:
|
{ inputs, ... }@args:
|
||||||
let
|
let
|
||||||
# Get self from args or default to ../.. (the flake root)
|
# Get self from args or default to ../.. (the flake root)
|
||||||
self = if args ? self then args.self else ../..;
|
self = args.self or ../..;
|
||||||
|
|
||||||
inherit (inputs.nixpkgs.lib)
|
inherit (inputs.nixpkgs.lib)
|
||||||
genAttrs
|
genAttrs
|
||||||
|
|||||||
@@ -31,8 +31,8 @@ let
|
|||||||
applyVariantOnce =
|
applyVariantOnce =
|
||||||
selected: variant:
|
selected: variant:
|
||||||
let
|
let
|
||||||
vVars = if variant ? variables then variant.variables else { };
|
vVars = variant.variables or { };
|
||||||
vSrcs = if variant ? sources then variant.sources else { };
|
vSrcs = variant.sources or { };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
variables = selected.variables // vVars;
|
variables = selected.variables // vVars;
|
||||||
@@ -47,8 +47,8 @@ let
|
|||||||
else
|
else
|
||||||
let
|
let
|
||||||
p = variant.platforms.${system};
|
p = variant.platforms.${system};
|
||||||
pVars = if p ? variables then p.variables else { };
|
pVars = p.variables or { };
|
||||||
pSrcs = if p ? sources then p.sources else { };
|
pSrcs = p.sources or { };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
variables = selected.variables // pVars;
|
variables = selected.variables // pVars;
|
||||||
@@ -93,7 +93,7 @@ let
|
|||||||
mkSrcFromRendered' =
|
mkSrcFromRendered' =
|
||||||
pkgs': comp:
|
pkgs': comp:
|
||||||
let
|
let
|
||||||
fetcher = if comp ? fetcher then comp.fetcher else "none";
|
fetcher = comp.fetcher or "none";
|
||||||
in
|
in
|
||||||
if fetcher == "github" then
|
if fetcher == "github" then
|
||||||
pkgs'.fetchFromGitHub (
|
pkgs'.fetchFromGitHub (
|
||||||
@@ -102,7 +102,7 @@ let
|
|||||||
repo = comp.repo;
|
repo = comp.repo;
|
||||||
# Allow tag as rev (ignore null/empty tag)
|
# Allow tag as rev (ignore null/empty tag)
|
||||||
rev = if comp ? tag && comp.tag != null && comp.tag != "" then comp.tag else comp.rev;
|
rev = if comp ? tag && comp.tag != null && comp.tag != "" then comp.tag else comp.rev;
|
||||||
fetchSubmodules = if comp ? submodules then comp.submodules else false;
|
fetchSubmodules = comp.submodules or false;
|
||||||
hash = comp.hash;
|
hash = comp.hash;
|
||||||
}
|
}
|
||||||
// lib.optionalAttrs (comp ? name) { name = comp.name; }
|
// lib.optionalAttrs (comp ? name) { name = comp.name; }
|
||||||
@@ -111,12 +111,12 @@ let
|
|||||||
pkgs'.fetchgit {
|
pkgs'.fetchgit {
|
||||||
url = comp.url;
|
url = comp.url;
|
||||||
rev = comp.rev;
|
rev = comp.rev;
|
||||||
fetchSubmodules = if comp ? submodules then comp.submodules else false;
|
fetchSubmodules = comp.submodules or false;
|
||||||
hash = comp.hash;
|
hash = comp.hash;
|
||||||
}
|
}
|
||||||
else if fetcher == "url" then
|
else if fetcher == "url" then
|
||||||
let
|
let
|
||||||
url = if comp ? url then comp.url else comp.urlTemplate;
|
url = comp.url or comp.urlTemplate;
|
||||||
in
|
in
|
||||||
if useFetchZip comp then
|
if useFetchZip comp then
|
||||||
pkgs'.fetchzip (
|
pkgs'.fetchzip (
|
||||||
@@ -155,14 +155,10 @@ rec {
|
|||||||
selectVariant =
|
selectVariant =
|
||||||
spec: variantName: system:
|
spec: variantName: system:
|
||||||
let
|
let
|
||||||
chosen =
|
chosen = if variantName != null then variantName else (spec.defaultVariant or null);
|
||||||
if variantName != null then
|
|
||||||
variantName
|
|
||||||
else
|
|
||||||
(if spec ? defaultVariant then spec.defaultVariant else null);
|
|
||||||
baseSelected = {
|
baseSelected = {
|
||||||
variables = if spec ? variables then spec.variables else { };
|
variables = spec.variables or { };
|
||||||
sources = if spec ? sources then spec.sources else { };
|
sources = spec.sources or { };
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
resolveVariant spec baseSelected chosen system;
|
resolveVariant spec baseSelected chosen system;
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "arm-trusted-firmware";
|
pname = "arm-trusted-firmware";
|
||||||
version = if fw ? tag then fw.tag else fw.rev;
|
version = fw.tag or fw.rev;
|
||||||
|
|
||||||
src = sources.fw;
|
src = sources.fw;
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.anycubic;
|
src-meta = selected.sources.anycubic;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
in
|
in
|
||||||
buildHomeAssistantComponent {
|
buildHomeAssistantComponent {
|
||||||
owner = src-meta.owner;
|
owner = src-meta.owner;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.bambu_lab;
|
src-meta = selected.sources.bambu_lab;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
in
|
in
|
||||||
buildHomeAssistantComponent {
|
buildHomeAssistantComponent {
|
||||||
owner = src-meta.owner;
|
owner = src-meta.owner;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.bedjet;
|
src-meta = selected.sources.bedjet;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
in
|
in
|
||||||
buildHomeAssistantComponent {
|
buildHomeAssistantComponent {
|
||||||
owner = src-meta.owner;
|
owner = src-meta.owner;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.ge_home;
|
src-meta = selected.sources.ge_home;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
in
|
in
|
||||||
buildHomeAssistantComponent {
|
buildHomeAssistantComponent {
|
||||||
owner = src-meta.owner;
|
owner = src-meta.owner;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.govee;
|
src-meta = selected.sources.govee;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
in
|
in
|
||||||
buildHomeAssistantComponent {
|
buildHomeAssistantComponent {
|
||||||
owner = src-meta.owner;
|
owner = src-meta.owner;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.icloud3;
|
src-meta = selected.sources.icloud3;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
in
|
in
|
||||||
buildHomeAssistantComponent {
|
buildHomeAssistantComponent {
|
||||||
owner = src-meta.owner;
|
owner = src-meta.owner;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.llama_conversation;
|
src-meta = selected.sources.llama_conversation;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
in
|
in
|
||||||
buildHomeAssistantComponent {
|
buildHomeAssistantComponent {
|
||||||
owner = src-meta.owner;
|
owner = src-meta.owner;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.mail_and_packages;
|
src-meta = selected.sources.mail_and_packages;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
in
|
in
|
||||||
buildHomeAssistantComponent {
|
buildHomeAssistantComponent {
|
||||||
owner = src-meta.owner;
|
owner = src-meta.owner;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.nanokvm;
|
src-meta = selected.sources.nanokvm;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
|
|
||||||
# python-nanokvm must be built against HA's Python interpreter.
|
# python-nanokvm must be built against HA's Python interpreter.
|
||||||
# Re-use the source from its own version.json to avoid duplication.
|
# Re-use the source from its own version.json to avoid duplication.
|
||||||
@@ -26,10 +26,7 @@ let
|
|||||||
python-nanokvm = python3Packages.buildPythonPackage {
|
python-nanokvm = python3Packages.buildPythonPackage {
|
||||||
pname = "nanokvm";
|
pname = "nanokvm";
|
||||||
version =
|
version =
|
||||||
if nanokvm-selected.sources."python-nanokvm" ? tag then
|
nanokvm-selected.sources."python-nanokvm".tag or nanokvm-selected.sources."python-nanokvm".rev;
|
||||||
nanokvm-selected.sources."python-nanokvm".tag
|
|
||||||
else
|
|
||||||
nanokvm-selected.sources."python-nanokvm".rev;
|
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = nanokvm-sources."python-nanokvm";
|
src = nanokvm-sources."python-nanokvm";
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.openhasp;
|
src-meta = selected.sources.openhasp;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
in
|
in
|
||||||
buildHomeAssistantComponent {
|
buildHomeAssistantComponent {
|
||||||
owner = src-meta.owner;
|
owner = src-meta.owner;
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.overseerr;
|
src-meta = selected.sources.overseerr;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
in
|
in
|
||||||
buildHomeAssistantComponent {
|
buildHomeAssistantComponent {
|
||||||
owner = src-meta.owner;
|
owner = src-meta.owner;
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.petlibro;
|
src-meta = selected.sources.petlibro;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
in
|
in
|
||||||
buildHomeAssistantComponent {
|
buildHomeAssistantComponent {
|
||||||
owner = src-meta.owner;
|
owner = src-meta.owner;
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ let
|
|||||||
selected = selectVariant versionSpec null null;
|
selected = selectVariant versionSpec null null;
|
||||||
sources = mkAllSources pkgs selected;
|
sources = mkAllSources pkgs selected;
|
||||||
src-meta = selected.sources.wyzeapi;
|
src-meta = selected.sources.wyzeapi;
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
in
|
in
|
||||||
buildHomeAssistantComponent {
|
buildHomeAssistantComponent {
|
||||||
owner = src-meta.owner;
|
owner = src-meta.owner;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ let
|
|||||||
in
|
in
|
||||||
appimageTools.wrapType2 {
|
appimageTools.wrapType2 {
|
||||||
pname = "moondeck-buddy";
|
pname = "moondeck-buddy";
|
||||||
version = if moondeck-buddy ? tag then moondeck-buddy.tag else moondeck-buddy.rev;
|
version = moondeck-buddy.tag or moondeck-buddy.rev;
|
||||||
|
|
||||||
src = sources.moondeck-buddy;
|
src = sources.moondeck-buddy;
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ let
|
|||||||
in
|
in
|
||||||
python3Packages.buildPythonPackage {
|
python3Packages.buildPythonPackage {
|
||||||
pname = "comfy-aimdo";
|
pname = "comfy-aimdo";
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = sources."comfy-aimdo";
|
src = sources."comfy-aimdo";
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ let
|
|||||||
in
|
in
|
||||||
home-assistant.python.pkgs.buildPythonPackage {
|
home-assistant.python.pkgs.buildPythonPackage {
|
||||||
pname = "magicattr";
|
pname = "magicattr";
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = sources.magicattr;
|
src = sources.magicattr;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ let
|
|||||||
in
|
in
|
||||||
python3Packages.buildPythonPackage {
|
python3Packages.buildPythonPackage {
|
||||||
pname = "pipewire-python";
|
pname = "pipewire-python";
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = sources."pipewire-python";
|
src = sources."pipewire-python";
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ let
|
|||||||
in
|
in
|
||||||
home-assistant.python.pkgs.buildPythonPackage {
|
home-assistant.python.pkgs.buildPythonPackage {
|
||||||
pname = "pyoverseerr";
|
pname = "pyoverseerr";
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = sources.pyoverseerr;
|
src = sources.pyoverseerr;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ let
|
|||||||
in
|
in
|
||||||
python3Packages.buildPythonPackage {
|
python3Packages.buildPythonPackage {
|
||||||
pname = "nanokvm";
|
pname = "nanokvm";
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = sources."python-nanokvm";
|
src = sources."python-nanokvm";
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ let
|
|||||||
in
|
in
|
||||||
home-assistant.python.pkgs.buildPythonPackage {
|
home-assistant.python.pkgs.buildPythonPackage {
|
||||||
pname = "wyzeapy";
|
pname = "wyzeapy";
|
||||||
version = if src-meta ? tag then src-meta.tag else src-meta.rev;
|
version = src-meta.tag or src-meta.rev;
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = sources.wyzeapy;
|
src = sources.wyzeapy;
|
||||||
|
|||||||
@@ -4,14 +4,12 @@
|
|||||||
# useless_parens: many intentional parentheses for readability.
|
# useless_parens: many intentional parentheses for readability.
|
||||||
# empty_pattern: { ... }: is a valid and readable no-arg pattern.
|
# empty_pattern: { ... }: is a valid and readable no-arg pattern.
|
||||||
# unquoted_uri: false-positives inside shell heredocs in Nix strings.
|
# unquoted_uri: false-positives inside shell heredocs in Nix strings.
|
||||||
# useless_has_attr: if/has-attr patterns are sometimes clearer.
|
|
||||||
disabled = [
|
disabled = [
|
||||||
"manual_inherit",
|
"manual_inherit",
|
||||||
"manual_inherit_from",
|
"manual_inherit_from",
|
||||||
"useless_parens",
|
"useless_parens",
|
||||||
"empty_pattern",
|
"empty_pattern",
|
||||||
"unquoted_uri",
|
"unquoted_uri",
|
||||||
"useless_has_attr",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# Exclude files where statix's parser fails on complex shell-in-Nix content.
|
# Exclude files where statix's parser fails on complex shell-in-Nix content.
|
||||||
|
|||||||
Reference in New Issue
Block a user