mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 18:32:23 +08:00
platformioPackages: move packages inside to top-level
This commit is contained in:
@@ -1,13 +0,0 @@
|
||||
{ newScope }:
|
||||
|
||||
let
|
||||
callPackage = newScope self;
|
||||
|
||||
self = {
|
||||
platformio-core = callPackage ./core.nix { };
|
||||
|
||||
platformio-chrootenv = callPackage ./chrootenv.nix { };
|
||||
};
|
||||
|
||||
in
|
||||
self
|
||||
@@ -1900,6 +1900,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
|
||||
plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28
|
||||
|
||||
@@ -3958,13 +3958,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 { };
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
with super;
|
||||
lib.mapAttrs (_: set: recurseIntoAttrs set) {
|
||||
inherit (super)
|
||||
platformioPackages
|
||||
rPackages
|
||||
sourceHanPackages
|
||||
;
|
||||
|
||||
Reference in New Issue
Block a user