Unverified Commit bfeebd18 authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

Merge pull request #166366 from thefloweringash/expose-platformio-core 

platformio-core: expose unwrapped platformio as platformio-core
parents fa1b3baf 119a5219

pkgs/development/embedded/platformio/chrootenv.nix

+1 −2
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ let 
  pio-pkgs = pkgs:

    let

      python = pkgs.python3;

      platformio = python.pkgs.callPackage ./core.nix { inherit version src; };

    in

    (with pkgs; [

      platformio-core

      zlib

      git

      xdg-user-dirs
@@ -15,7 +15,6 @@ let 
      setuptools

      pip

      bottle

      platformio

    ]);



in

pkgs/development/embedded/platformio/default.nix

+3 −1
Original line number Diff line number Diff line 
{ newScope, fetchFromGitHub }:

{ newScope, fetchFromGitHub, python3Packages }:



let

  callPackage = newScope self;
@@ -14,6 +14,8 @@ let 
  };



  self = {

    platformio-core = python3Packages.callPackage ./core.nix { inherit version src; };



    platformio-chrootenv = callPackage ./chrootenv.nix { inherit version src; };

  };

pkgs/top-level/all-packages.nix

+2 −1
Original line number Diff line number Diff line
@@ -11105,7 +11105,8 @@ with pkgs; 
  };















  platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { });













  platformio = platformioPackages.platformio-chrootenv;













  platformio = if stdenv.isLinux then platformioPackages.platformio-chrootenv else platformioPackages.platformio-core;













  platformio-core = platformioPackages.platformio-core;





























  platinum-searcher = callPackage ../tools/text/platinum-searcher { };