From 2e074e65372aa6dce545e62354142a9165fb5801 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 4 Sep 2025 13:37:33 +0200 Subject: [PATCH] platformioPackages: move packages inside to top-level --- .../pl/platformio-chrootenv/package.nix} | 0 .../builder-prioritize-python-env-in-path.patch | 0 .../pl/platformio-core}/interpreter.patch | 0 .../platformio-core}/missing-udev-rules-nixos.patch | 0 .../pl/platformio-core/package.nix} | 0 .../use-local-spdx-license-list.patch | 0 pkgs/development/embedded/platformio/default.nix | 13 ------------- pkgs/top-level/aliases.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 8 +------- pkgs/top-level/packages-config.nix | 1 - 10 files changed, 7 insertions(+), 21 deletions(-) rename pkgs/{development/embedded/platformio/chrootenv.nix => by-name/pl/platformio-chrootenv/package.nix} (100%) rename pkgs/{development/embedded/platformio => by-name/pl/platformio-core}/builder-prioritize-python-env-in-path.patch (100%) rename pkgs/{development/embedded/platformio => by-name/pl/platformio-core}/interpreter.patch (100%) rename pkgs/{development/embedded/platformio => by-name/pl/platformio-core}/missing-udev-rules-nixos.patch (100%) rename pkgs/{development/embedded/platformio/core.nix => by-name/pl/platformio-core/package.nix} (100%) rename pkgs/{development/embedded/platformio => by-name/pl/platformio-core}/use-local-spdx-license-list.patch (100%) delete mode 100644 pkgs/development/embedded/platformio/default.nix diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/by-name/pl/platformio-chrootenv/package.nix similarity index 100% rename from pkgs/development/embedded/platformio/chrootenv.nix rename to pkgs/by-name/pl/platformio-chrootenv/package.nix diff --git a/pkgs/development/embedded/platformio/builder-prioritize-python-env-in-path.patch b/pkgs/by-name/pl/platformio-core/builder-prioritize-python-env-in-path.patch similarity index 100% rename from pkgs/development/embedded/platformio/builder-prioritize-python-env-in-path.patch rename to pkgs/by-name/pl/platformio-core/builder-prioritize-python-env-in-path.patch diff --git a/pkgs/development/embedded/platformio/interpreter.patch b/pkgs/by-name/pl/platformio-core/interpreter.patch similarity index 100% rename from pkgs/development/embedded/platformio/interpreter.patch rename to pkgs/by-name/pl/platformio-core/interpreter.patch diff --git a/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch b/pkgs/by-name/pl/platformio-core/missing-udev-rules-nixos.patch similarity index 100% rename from pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch rename to pkgs/by-name/pl/platformio-core/missing-udev-rules-nixos.patch diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/by-name/pl/platformio-core/package.nix similarity index 100% rename from pkgs/development/embedded/platformio/core.nix rename to pkgs/by-name/pl/platformio-core/package.nix diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/by-name/pl/platformio-core/use-local-spdx-license-list.patch similarity index 100% rename from pkgs/development/embedded/platformio/use-local-spdx-license-list.patch rename to pkgs/by-name/pl/platformio-core/use-local-spdx-license-list.patch diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix deleted file mode 100644 index 53eb74caaf79..000000000000 --- a/pkgs/development/embedded/platformio/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ newScope }: - -let - callPackage = newScope self; - - self = { - platformio-core = callPackage ./core.nix { }; - - platformio-chrootenv = callPackage ./chrootenv.nix { }; - }; - -in -self diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2ce5c92790a8..e8fb4a9b402f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb1dcee87fe4..7e9654acd749 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 386a91305deb..ccff7dba3fd0 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -11,7 +11,6 @@ with super; lib.mapAttrs (_: set: recurseIntoAttrs set) { inherit (super) - platformioPackages rPackages sourceHanPackages ;