Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3679c8d2d100
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 61a03065fdf5
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 3, 2020

  1. platformio: 4.1.0 -> 4.3.1

    @oxzi
    oxzi committed Apr 3, 2020
    Copy the full SHA
    40998c8 View commit details

Commits on Apr 17, 2020

  1. Merge pull request #84190 from geistesk/platformio-4.3.1

    @Mic92
    Mic92 authored Apr 17, 2020

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    61a0306 View commit details
Showing with 7 additions and 10 deletions.
  1. +4 −7 pkgs/development/arduino/platformio/core.nix
  2. +3 −3 pkgs/development/arduino/platformio/use-local-spdx-license-list.patch
11 changes: 4 additions & 7 deletions pkgs/development/arduino/platformio/core.nix
View file
Original file line number Diff line number Diff line change
@@ -34,6 +34,8 @@ let
"commands/test_test.py::test_local_env"
"test_builder.py::test_build_flags"
"test_builder.py::test_build_unflags"
"test_builder.py::test_debug_default_build_flags"
"test_builder.py::test_debug_custom_build_flags"
"test_misc.py::test_api_cache"
"test_misc.py::test_ping_internet_ips"
"test_misc.py::test_platformio_cli"
@@ -49,14 +51,14 @@ let

in buildPythonApplication rec {
pname = "platformio";
version = "4.1.0";
version = "4.3.1";

# 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 = "10v9jw1zjfqr3wl6kills3cfp0ky7xbm1gc3z0n57wrqbc6cmz95";
sha256 = "1dxnjy60zpkgyrbvbf6b9qi6m37gm8gwjmxwfj30npr1y7rvxwrw";
};

propagatedBuildInputs = [
@@ -79,11 +81,6 @@ in buildPythonApplication rec {

patches = [
./fix-searchpath.patch
(fetchpatch {
url = "https://github.com/platformio/platformio-core/commit/442a7e357636522e844d95375c246644b21a7802.patch";
sha256 = "0a3kj3k02237gr2yk30gpwc6vm04dsd1wxldj4dsbzs4a9yyi70m";
excludes = ["HISTORY.rst"];
})
./use-local-spdx-license-list.patch
];

6 changes: 3 additions & 3 deletions pkgs/development/arduino/platformio/use-local-spdx-license-list.patch
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
index f1d68e08..9b7b1da8 100644
index be49b3ee..d1390a88 100644
--- a/platformio/package/manifest/schema.py
+++ b/platformio/package/manifest/schema.py
@@ -174,9 +174,5 @@ class ManifestSchema(Schema):
@@ -240,9 +240,5 @@ class ManifestSchema(BaseSchema):
@staticmethod
@memoized(expire="1h")
def load_spdx_licenses():
- r = requests.get(
- "https://raw.githubusercontent.com/spdx/license-list-data"
- "/v3.7/json/licenses.json"
- "/v3.8/json/licenses.json"
- )
- r.raise_for_status()
- return r.json()