platformioPackages: move packages inside to top-level

(cherry picked from commit 2e074e6537)
This commit is contained in:
jopejoe1
2025-09-04 13:37:33 +02:00
committed by Wolfgang Walther
parent 87d32579b4
commit a3d26832c7
9 changed files with 7 additions and 21 deletions

View File

@@ -1,13 +0,0 @@
{ newScope }:
let
callPackage = newScope self;
self = {
platformio-core = callPackage ./core.nix { };
platformio-chrootenv = callPackage ./chrootenv.nix { };
};
in
self

View File

@@ -1507,6 +1507,12 @@ mapAliases {
pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25
pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28
pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead.";
platformioPackages = {
inherit
platformio-core
platformio-chrootenv
;
}; # Added 2025-09-04
platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20
pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17
plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05

View File

@@ -4178,13 +4178,7 @@ with pkgs;
inherit (darwin) DarwinTools;
};
platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { });
platformio =
if stdenv.hostPlatform.isLinux then
platformioPackages.platformio-chrootenv
else
platformioPackages.platformio-core;
platformio-core = platformioPackages.platformio-core;
platformio = if stdenv.hostPlatform.isLinux then platformio-chrootenv else platformio-core;
playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { };

View File

@@ -11,7 +11,6 @@
with super;
lib.mapAttrs (_: set: recurseIntoAttrs set) {
inherit (super)
platformioPackages
rPackages
sourceHanPackages
;