From 2b7997e91e071e5cd2db87ae068e005b81cfe935 Mon Sep 17 00:00:00 2001
From: BattleCh1cken <BattleCh1cken@Larkov.de>
Date: Tue, 16 Aug 2022 11:57:36 -0400
Subject: [PATCH] Update platformio

---
 pkgs/development/embedded/platformio/default.nix     |  8 ++++----
 .../platformio/use-local-spdx-license-list.patch     | 12 +++++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix
index ad2d897af830..e0443c080c32 100644
--- a/pkgs/development/embedded/platformio/default.nix
+++ b/pkgs/development/embedded/platformio/default.nix
@@ -1,21 +1,21 @@
-
 { newScope, fetchFromGitHub }:
 
 let
   callPackage = newScope self;
 
-  version = "6.0.2";
+  version = "6.1.4";
 
   # 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 = "sha256-yfUF9+M45ZSjmB275kTs8+/Q8Q5FMmr63e3Om8dPi2k=";
+    sha256 = "sha256-PLVsXnaflEZdn12lWrpnm8+uNfwB+T7JXnvjQihfuSs=";
   };
 
   self = {
     platformio-chrootenv = callPackage ./chrootenv.nix { inherit version src; };
   };
 
-in self
+in
+self
diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
index 65fcbd39d6a1..1f809822cb58 100644
--- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
+++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
@@ -1,17 +1,23 @@
 diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
-index 416dccfd..896c3649 100644
+index 1e5f935a..26d1ac6a 100644
 --- a/platformio/package/manifest/schema.py
 +++ b/platformio/package/manifest/schema.py
-@@ -253,9 +253,6 @@ class ManifestSchema(BaseSchema):
+@@ -276,9 +276,12 @@ class ManifestSchema(BaseSchema):
      @staticmethod
      @memoized(expire="1h")
      def load_spdx_licenses():
--        version = "3.17"
+-        version = "3.18"
 -        spdx_data_url = (
 -            "https://raw.githubusercontent.com/spdx/license-list-data/"
 -            "v%s/json/licenses.json" % version
 -        )
 -        return json.loads(fetch_remote_content(spdx_data_url))
++        # version = "3.18"
++        # spdx_data_url = (
++            # "https://raw.githubusercontent.com/spdx/license-list-data/"
++            # "v%s/json/licenses.json" % version
++        # )
++        # return json.loads(fetch_remote_content(spdx_data_url))
 +        with open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json") as f:
 +            spdx = json.load(f)
 +        return spdx