manual_inherit

2026-04-05 19:10:23 -05:00
parent a363622659
commit ff469102ea
84 changed files with 248 additions and 329 deletions
--- a/packages/bcachefs/default.nix
+++ b/packages/bcachefs/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) src;
-    hash = sources.cargoDeps.hash;
+    inherit (sources.cargoDeps) hash;
  };

  postPatch = ''
--- a/packages/cockpit-benchmark/default.nix
+++ b/packages/cockpit-benchmark/default.nix
@@ -102,10 +102,9 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "cockpit-benchmark";
+  inherit (sources) src;
  inherit version;

-  src = sources.src;
-
  npmDeps = fetchNpmDeps {
    src = "${finalAttrs.src}/benchmark";
    packageLock = patchedPackageLock;
--- a/packages/cockpit-machines/default.nix
+++ b/packages/cockpit-machines/default.nix
@@ -16,10 +16,9 @@ let
 in
 stdenv.mkDerivation {
  pname = "cockpit-machines";
+  inherit (sources) src;
  inherit version;

-  src = sources.src;
-
  # Pre-vendored node_modules from cockpit-project/node-cache, pinned via the
  # node_modules submodule reference in the source tree.
  inherit (sources) nodeModules;
--- a/packages/cockpit-podman/default.nix
+++ b/packages/cockpit-podman/default.nix
@@ -8,6 +8,7 @@
 let
  inherit (lib.trivial) importJSON;
  inherit (lib.${namespace}) mkAllSources selectVariant;
+  inherit lib;

  versionSpec = importJSON ./version.json;
  selected = selectVariant versionSpec null null;
@@ -18,11 +19,7 @@ stdenv.mkDerivation {
  pname = "cockpit-podman";
  inherit version;

-  src = sources.src;
-
-  # Pre-vendored node_modules from cockpit-project/node-cache, pinned via the
-  # node_modules submodule reference in the source tree.
-  inherit (sources) nodeModules;
+  inherit (sources) src nodeModules;

  # pkg/lib checked out from the main cockpit repo at the commit pinned in
  # the Makefile (COCKPIT_REPO_COMMIT).
--- a/packages/fastflowlm/default.nix
+++ b/packages/fastflowlm/default.nix
@@ -66,7 +66,7 @@ let
  version = "0.9.36";

  # XRT userspace runtime — built from packages/xrt in this flake.
-  xrt = pkgs.${namespace}.xrt;
+  inherit (pkgs.${namespace}) xrt;

  # ── tokenizers-cpp submodule ──────────────────────────────────────────────
  # Pinned to the commit referenced in FastFlowLM v0.9.36 .gitmodules.
--- a/packages/homeassistant/ha-anycubic/default.nix
+++ b/packages/homeassistant/ha-anycubic/default.nix
@@ -16,9 +16,9 @@ let
  version = src-meta.tag or src-meta.rev;
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
-  domain = "anycubic_wifi";
+  inherit (src-meta) owner;
  inherit version;
+  domain = "anycubic_wifi";

  src = sources.anycubic;

--- a/packages/homeassistant/ha-bambulab/default.nix
+++ b/packages/homeassistant/ha-bambulab/default.nix
@@ -17,9 +17,9 @@ let
  version = src-meta.tag or src-meta.rev;
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
-  domain = "bambu_lab";
+  inherit (src-meta) owner;
  inherit version;
+  domain = "bambu_lab";

  src = sources.bambu_lab;

--- a/packages/homeassistant/ha-bedjet/default.nix
+++ b/packages/homeassistant/ha-bedjet/default.nix
@@ -17,7 +17,7 @@ let
  version = src-meta.tag or src-meta.rev;
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
+  inherit (src-meta) owner;
  domain = "bedjet";
  inherit version;

--- a/packages/homeassistant/ha-gehome/default.nix
+++ b/packages/homeassistant/ha-gehome/default.nix
@@ -17,7 +17,7 @@ let
  version = src-meta.tag or src-meta.rev;
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
+  inherit (src-meta) owner;
  domain = "ge_home";
  inherit version;

--- a/packages/homeassistant/ha-govee/default.nix
+++ b/packages/homeassistant/ha-govee/default.nix
@@ -17,9 +17,9 @@ let
  version = src-meta.tag or src-meta.rev;
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
-  domain = "govee";
+  inherit (src-meta) owner;
  inherit version;
+  domain = "govee";

  src = sources.govee;

--- a/packages/homeassistant/ha-icloud3/default.nix
+++ b/packages/homeassistant/ha-icloud3/default.nix
@@ -17,7 +17,7 @@ let
  version = src-meta.tag or src-meta.rev;
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
+  inherit (src-meta) owner;
  domain = "icloud3";
  inherit version;

--- a/packages/homeassistant/ha-local-llm/default.nix
+++ b/packages/homeassistant/ha-local-llm/default.nix
@@ -17,9 +17,9 @@ let
  version = src-meta.tag or src-meta.rev;
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
-  domain = "llama_conversation";
+  inherit (src-meta) owner;
  inherit version;
+  domain = "llama_conversation";

  src = sources.llama_conversation;

--- a/packages/homeassistant/ha-mail-and-packages/default.nix
+++ b/packages/homeassistant/ha-mail-and-packages/default.nix
@@ -17,9 +17,9 @@ let
  version = src-meta.tag or src-meta.rev;
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
-  domain = "mail_and_packages";
+  inherit (src-meta) owner;
  inherit version;
+  domain = "mail_and_packages";

  src = sources.mail_and_packages;

--- a/packages/homeassistant/ha-nanokvm/default.nix
+++ b/packages/homeassistant/ha-nanokvm/default.nix
@@ -78,7 +78,7 @@ let
  };
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
+  inherit (src-meta) owner;
  domain = "nanokvm";
  inherit version;

--- a/packages/homeassistant/ha-openhasp/default.nix
+++ b/packages/homeassistant/ha-openhasp/default.nix
@@ -17,7 +17,7 @@ let
  version = src-meta.tag or src-meta.rev;
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
+  inherit (src-meta) owner;
  domain = "openhasp";
  inherit version;

--- a/packages/homeassistant/ha-overseerr/default.nix
+++ b/packages/homeassistant/ha-overseerr/default.nix
@@ -16,9 +16,9 @@ let
  version = src-meta.tag or src-meta.rev;
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
-  domain = "overseerr";
+  inherit (src-meta) owner;
  inherit version;
+  domain = "overseerr";

  src = sources.overseerr;

--- a/packages/homeassistant/ha-petlibro/default.nix
+++ b/packages/homeassistant/ha-petlibro/default.nix
@@ -16,9 +16,9 @@ let
  version = src-meta.tag or src-meta.rev;
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
-  domain = "petlibro";
+  inherit (src-meta) owner;
  inherit version;
+  domain = "petlibro";

  src = sources.petlibro;

--- a/packages/homeassistant/ha-wyzeapi/default.nix
+++ b/packages/homeassistant/ha-wyzeapi/default.nix
@@ -16,7 +16,7 @@ let
  version = src-meta.tag or src-meta.rev;
 in
 buildHomeAssistantComponent {
-  owner = src-meta.owner;
+  inherit (src-meta) owner;
  domain = "wyzeapi";
  inherit version;

--- a/packages/librepods-beta/default.nix
+++ b/packages/librepods-beta/default.nix
@@ -21,14 +21,13 @@
 let
  inherit (lib.trivial) importJSON;
  inherit (lib.${namespace}) selectVariant mkAllSources;
+  inherit lib;

  versionSpec = importJSON ./version.json;
  selected = selectVariant versionSpec null null;
  sources = mkAllSources pkgs selected;
-  # cargoHash is stored alongside the source in version.json so the TUI can update it
+  inherit (stdenv.hostPlatform) system;
  cargoHash = selected.sources.librepods.cargoHash;
-
-  system = stdenv.hostPlatform.system;
 in
 rustPlatform.buildRustPackage rec {
  pname = "librepods";
--- a/packages/moondeck-buddy/default.nix
+++ b/packages/moondeck-buddy/default.nix
@@ -12,7 +12,7 @@ let
  versionSpec = importJSON ./version.json;
  selected = selectVariant versionSpec null null;
  sources = mkAllSources pkgs selected;
-  moondeck-buddy = selected.sources.moondeck-buddy;
+  inherit (selected.sources) moondeck-buddy;
 in
 appimageTools.wrapType2 {
  pname = "moondeck-buddy";
--- a/packages/proton-cachyos/default.nix
+++ b/packages/proton-cachyos/default.nix
@@ -23,19 +23,16 @@ let
  versionSpec = importJSON ./version.json;
  selected = selectVariant versionSpec variant null;
  vars = selected.variables or { };
-  base = vars.base;
-  release = vars.release;

  toolTitle = "proton-${variant}-latest";

-  # Derived values for the current variant
-  releaseVersion = "${releasePrefix}${base}-${release}${releaseSuffix}";
-  homepage = "https://github.com/${owner}/${repo}";
+  releaseVersion = "${releasePrefix}${vars.base}-${vars.release}${releaseSuffix}";
+  homepage = "https://${owner}/${repo}";
  url = "${homepage}/releases/download/${releaseVersion}/${tarballPrefix}${releaseVersion}${tarballSuffix}";

  # Choose fetcher based on file type
  intake =
-    if lib.strings.hasSuffix ".zip" url then
+    if lib.hasSuffix ".zip" url then
      {
        fetcher = fetchzip;
        input = "$src/*.tar.xz";
@@ -48,7 +45,7 @@ let
 in
 stdenvNoCC.mkDerivation {
  name = repo;
-  version = "${base}.${release}";
+  version = "${vars.base}.${vars.release}";

  src = intake.fetcher {
    inherit url;
@@ -60,7 +57,7 @@ stdenvNoCC.mkDerivation {
    tar -C $out/bin --strip=1 -x -f ${intake.input}
  ''
  # Allow to keep the same name between updates
-  + lib.strings.optionalString (toolTitle != null) ''
+  + lib.optionalString (toolTitle != null) ''
    sed -i -r 's|"${toolPattern}"|"${toolTitle}"|' $out/bin/compatibilitytool.vdf
  '';

--- a/packages/python/comfy-kitchen/default.nix
+++ b/packages/python/comfy-kitchen/default.nix
@@ -12,7 +12,7 @@ let
  versionSpec = importJSON ./version.json;
  selected = selectVariant versionSpec null null;
  sources = mkAllSources pkgs selected;
-  version = selected.variables.version;
+  inherit (selected.variables) version;
 in
 python3Packages.buildPythonPackage {
  pname = "comfy-kitchen";
--- a/packages/python/gehomesdk/default.nix
+++ b/packages/python/gehomesdk/default.nix
@@ -12,7 +12,7 @@ let
  versionSpec = importJSON ./version.json;
  selected = selectVariant versionSpec null null;
  sources = mkAllSources pkgs selected;
-  version = selected.variables.version;
+  inherit (selected.variables) version;
 in
 home-assistant.python.pkgs.buildPythonPackage {
  pname = "gehomesdk";
--- a/packages/python/python-steam/default.nix
+++ b/packages/python/python-steam/default.nix
@@ -12,7 +12,7 @@ let
  versionSpec = importJSON ./version.json;
  selected = selectVariant versionSpec null null;
  sources = mkAllSources pkgs selected;
-  version = selected.variables.version;
+  inherit (selected.variables) version;
 in
 python3Packages.buildPythonPackage {
  pname = "steam";
--- a/packages/python/pyvesync/default.nix
+++ b/packages/python/pyvesync/default.nix
@@ -12,8 +12,8 @@ let
  versionSpec = importJSON ./version.json;
  selected = selectVariant versionSpec null null;
  sources = mkAllSources pkgs selected;
-  src-meta = selected.sources.pyvesync;
-  version = selected.variables.version;
+  inherit (selected.sources) pyvesync;
+  inherit (selected.variables) version;
 in
 python3Packages.buildPythonPackage {
  pname = "pyvesync";
@@ -37,7 +37,7 @@ python3Packages.buildPythonPackage {
  meta = with lib; {
    description = "Python library to manage Etekcity Devices and Levoit Air Purifier";
    homepage = "https://github.com/webdjoe/pyvesync";
-    changelog = "https://github.com/webdjoe/pyvesync/releases/tag/${src-meta.tag}";
+    changelog = "https://github.com/webdjoe/pyvesync/releases/tag/${pyvesync.tag}";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ fab ];
  };
--- a/packages/raspberrypi/ffmpeg-rpi/default.nix
+++ b/packages/raspberrypi/ffmpeg-rpi/default.nix
@@ -71,9 +71,9 @@ in
    ];
 })).override
  {
+    inherit (rpiFfmpegSrc) hash;
    version = ffmpegVersion;
    source = rpiFfmpegSrc;
-    hash = rpiFfmpegSrc.hash;

    # version = ffmpegVersion + "-rpi";
    # source = rpiFfmpegSrc;
--- a/packages/raspberrypi/linux-rpi/default.nix
+++ b/packages/raspberrypi/linux-rpi/default.nix
@@ -19,8 +19,8 @@ let
  selected = selectVariant versionSpec kernelVersion null;
  sources = mkAllSources pkgs selected;

-  modDirVersion = selected.variables.modDirVersion;
-  tag = kernelVersion; # sources.tag;
+  inherit (selected.variables) modDirVersion;
+  tag = kernelVersion;
  # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this

  # all of these fail for various reasons
--- a/packages/raspberrypi/raspberrypi-overlays/default.nix
+++ b/packages/raspberrypi/raspberrypi-overlays/default.nix
@@ -17,7 +17,7 @@ in
 stdenvNoCC.mkDerivation {
  # NOTE: this should be updated with linux_rpi
  pname = "raspberrypi-dtoverlays";
-  version = vars.version;
+  inherit (vars) version;

  src = sources.linux;

--- a/packages/raspberrypi/raspberrypifw/default.nix
+++ b/packages/raspberrypi/raspberrypifw/default.nix
@@ -16,7 +16,7 @@ in
 stdenvNoCC.mkDerivation {
  # NOTE: this should be updated with linux_rpi
  pname = "raspberrypi-firmware";
-  version = vars.version;
+  inherit (vars) version;

  src = sources.firmware-next;

--- a/packages/raspberrypi/uefi-rpi4/default.nix
+++ b/packages/raspberrypi/uefi-rpi4/default.nix
@@ -14,8 +14,8 @@ let
  sources = mkAllSources pkgs selected;
 in
 stdenvNoCC.mkDerivation rec {
+  inherit (vars) version;
  pname = "uefi-rpi4";
-  version = vars.version;

  src = sources.firmware;

--- a/packages/raspberrypi/uefi-rpi5/default.nix
+++ b/packages/raspberrypi/uefi-rpi5/default.nix
@@ -50,7 +50,7 @@ let
 in
 stdenvNoCC.mkDerivation rec {
  pname = "uefi-rpi5";
-  version = vars.version;
+  inherit (vars) version;

  src = sources.firmware;