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: 77e2529875fd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 84fd68150b7f
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 24, 2020

  1. platformio: 5.0.2 -> 5.0.3 

    In addition to the version change, the source is managed in a central
location, since previously the same change had to be made in two places.
    @oxzi
    oxzi committed Nov 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    160c5e9 View commit details

  2. Merge pull request #104767 from oxzi/platformio-5.0.3 

    platformio: 5.0.2 -> 5.0.3
    @SuperSandro2000
    SuperSandro2000 authored Nov 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    84fd681 View commit details
Showing with 17 additions and 22 deletions.
  1. +2 −10 pkgs/development/arduino/platformio/chrootenv.nix
  2. +3 −10 pkgs/development/arduino/platformio/core.nix
  3. +12 −2 pkgs/development/arduino/platformio/default.nix
12 changes: 2 additions & 10 deletions pkgs/development/arduino/platformio/chrootenv.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ lib, buildFHSUserEnv, fetchFromGitHub }:
{ lib, buildFHSUserEnv, version, src }:

let
pio-pkgs = pkgs:
let
python = pkgs.python3.override {
packageOverrides = self: super: {
platformio = self.callPackage ./core.nix { };
platformio = self.callPackage ./core.nix { inherit version src; };
};
};
in (with pkgs; [
@@ -19,14 +19,6 @@ let
platformio
]);

src = fetchFromGitHub {
owner = "platformio";
repo = "platformio-core";
rev = "v5.0.2";
sha256 = "1hbw8nbllyj0xyx1rz2chx9vyqf9949dcdx4v9hnfbsjwwpcfi0a";
};


in buildFHSUserEnv {
name = "platformio";

13 changes: 3 additions & 10 deletions pkgs/development/arduino/platformio/core.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{ stdenv, lib, buildPythonApplication, fetchFromGitHub, fetchpatch
{ stdenv, lib, buildPythonApplication, fetchpatch
, bottle, click, colorama, semantic-version
, lockfile, pyserial, requests
, tabulate, pyelftools, marshmallow
, pytest, tox, jsondiff
, git, spdx-license-list-data
, version, src
}:

let
@@ -75,15 +76,7 @@ let

in buildPythonApplication rec {
pname = "platformio";
version = "5.0.2";

# 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 = "1hbw8nbllyj0xyx1rz2chx9vyqf9949dcdx4v9hnfbsjwwpcfi0a";
};
inherit version src;

propagatedBuildInputs = [
bottle click colorama git lockfile
14 changes: 12 additions & 2 deletions pkgs/development/arduino/platformio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@

{ newScope }:
{ newScope, fetchFromGitHub }:

let
callPackage = newScope self;

version = "5.0.3";

# 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 = "0sf5dy0cmhy66rmk0hq1by7nrmf7qz0a99hrk55dpbp6r6vnk3hw";
};

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

in self