manual_inherit

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;

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

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;
 

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;
 

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;
 

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;