packages

packages/raspberrypi/ffmpeg-rpi/default.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  fetchFromGitHub,
   ffmpeg,
   ffmpegVariant ? "small",
   withVoutEgl ? false,
@@ -9,13 +8,14 @@
   udev,
   systemd,
   withVoutDrm ? true,
-  pkgs,
+  namespace,
 }:
 
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;

packages/raspberrypi/libraspberrypi/default.nix

@@ -1,15 +1,15 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
   cmake,
   pkg-config,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   sources = versioning.mkAllSources selected;
 in

packages/raspberrypi/linux-rpi/default.nix

@@ -2,18 +2,18 @@
   # ccacheStdenv,
   stdenv,
   lib,
-  fetchFromGitHub,
   buildLinux,
-  pkgs,
   rpiVersion ? 5,
+  namespace,
   ...
 }@args:
 
 let
   # stdenv = ccacheStdenv;
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;

packages/raspberrypi/raspberryPiWirelessFirmware/default.nix

@@ -1,13 +1,13 @@
 {
   lib,
   stdenvNoCC,
-  fetchFromGitHub,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+  
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   sources = versioning.mkAllSources selected;
 in

packages/raspberrypi/raspberrypi-overlays/default.nix

@@ -1,19 +1,19 @@
 {
   lib,
   stdenvNoCC,
-  fetchFromGitHub,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;
 in
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
   # NOTE: this should be updated with linux_rpi
   pname = "raspberrypi-dtoverlays";
   version = vars.version;
@@ -29,10 +29,10 @@ stdenvNoCC.mkDerivation rec {
   dontBuild = true;
   dontFixup = true;
 
-  meta = with lib; {
+  meta = {
     description = "Overlays for the Raspberry Pi board";
     homepage = "https://github.com/raspberrypi/linux";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # Hash mismatch on source, mystery.
     # Maybe due to https://github.com/NixOS/nix/issues/847
     broken = stdenvNoCC.hostPlatform.isDarwin;

packages/raspberrypi/raspberrypi-utils/default.nix

@@ -3,15 +3,15 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
   cmake,
   dtc,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   sources = versioning.mkAllSources selected;
 in

packages/raspberrypi/raspberrypifw/default.nix

@@ -1,18 +1,18 @@
 {
   lib,
   stdenvNoCC,
-  fetchFromGitHub,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;
 in
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
   # NOTE: this should be updated with linux_rpi
   pname = "raspberrypi-firmware";
   version = vars.version;

packages/raspberrypi/uefi-rpi4/default.nix

@@ -1,13 +1,13 @@
 {
   lib,
   stdenvNoCC,
-  fetchzip,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;
@@ -39,6 +39,6 @@ stdenvNoCC.mkDerivation rec {
     description = "RPI4 UEFI firmware";
     homepage = "https://github.com/pftf/RPi4";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }

packages/raspberrypi/uefi-rpi5/default.nix

@@ -1,13 +1,13 @@
 {
   lib,
   stdenvNoCC,
-  fetchurl,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;
@@ -91,6 +91,6 @@ stdenvNoCC.mkDerivation rec {
     description = "RPI5 UEFI firmware";
     homepage = "https://github.com/NumberOneGit/rpi5-uefi";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }