Unverified Commit 062a0c54 authored by Renaud's avatar Renaud Committed by GitHub
Browse files

Merge pull request #159034 from oxzi/platformio-5.2.5 

platformio: 5.2.4 -> 5.2.5
parents 3cb36ada 9b87a779

pkgs/development/embedded/platformio/core.nix

+10 −32
Original line number Diff line number Diff line
@@ -9,54 +9,32 @@ 
let

  python = python3.override {

    packageOverrides = self: super: {

      aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec {

        version = "0.8.0";

        src = fetchFromGitHub {

          owner = "Tinche";

          repo = "aiofiles";

          rev = "v${version}";

          sha256 = "0mr9pzji4vqyf2yzh8yxz5q7fm8mgmkimx1xh49wh625m72pxcap";

        };

      });



      asgiref = super.asgiref.overridePythonAttrs (oldAttrs: rec {

        version = "3.4.1";

        src = fetchFromGitHub {

          owner = "django";

          repo = "asgiref";

          rev = version;

          sha256 = "0440321alpqb1cdsmfzmiiy8rpq0ic0wvraalzk39cgrl7mghw39";

        };

      });



      click = super.click.overridePythonAttrs (oldAttrs: rec {

        version = "8.0.3";

        src = fetchFromGitHub {

          owner = "pallets";

          repo = "click";

          rev = version;

          sha256 = "0pxvxgfhqjgsjbgfnilqjki1l24r0rdfd98cl77i71yqdd2f497g";

      semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec {

        version = "2.9.0";

        src = fetchPypi {

          pname = "semantic_version";

          version = version;

          sha256 = "1chjd8019wnwb5mnd4x4jw9f8nhzg0xnapsdznk0fpiyamrlixdb";

        };

      });



      starlette = super.starlette.overridePythonAttrs (oldAttrs: rec {

        version = "0.17.0";

        version = "0.18.0";

        src = fetchFromGitHub {

          owner = "encode";

          repo = "starlette";

          rev = version;

          sha256 = "1g76qpvqzivmwll5ir4bf45jx5kilnkadvy6b7qjisvr402i3qmw";

          sha256 = "1dpj33cggjjvpd3qdf6hv04z5ckcn9f5dfn98p5a8hx262kgsr9p";

        };

        disabledTestPaths = [];

      });



      uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec {

        version = "0.16.0";

        version = "0.17.0";

        src = fetchFromGitHub {

          owner = "encode";

          repo = "uvicorn";

          rev = version;

          sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s";

          sha256 = "142x8skb1yfys6gndfaay2r240j56dkr006p49pw4y9i0v85kynp";

        };

      });

    };

pkgs/development/embedded/platformio/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ 
let

  callPackage = newScope self;



  version = "5.2.4";

  version = "5.2.5";



  # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964

  src = fetchFromGitHub {

    owner = "platformio";

    repo = "platformio-core";

    rev = "v${version}";

    sha256 = "1dhyxrdxrca669qm6alxxn2jmvcwlpqrx9kfwh4iqy9za5717ag9";

    sha256 = "1x1jqprwzpb09ca953rqbh2jvizh7bz8yj30krphb6007bnjilwy";

  };



  self = {

pkgs/development/embedded/platformio/fix-searchpath.patch

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ diff --git a/platformio/proc.py b/platformio/proc.py 
index 80e50201..15cee5a5 100644

--- a/platformio/proc.py

+++ b/platformio/proc.py

@@ -167,7 +167,7 @@ def copy_pythonpath_to_osenv():

@@ -181,7 +181,7 @@ def copy_pythonpath_to_osenv():

             conditions.append(isdir(join(p, "click")) or isdir(join(p, "platformio")))

         if all(conditions):

             _PYTHONPATH.append(p)

pkgs/development/embedded/platformio/use-local-spdx-license-list.patch

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ index 416dccfd..896c3649 100644 
     @staticmethod

     @memoized(expire="1h")

     def load_spdx_licenses():

-        version = "3.15"

-        version = "3.16"

-        spdx_data_url = (

-            "https://raw.githubusercontent.com/spdx/license-list-data/"

-            "v%s/json/licenses.json" % version