Merge pull request #104767 from oxzi/platformio-5.0.3
platformio: 5.0.2 -> 5.0.3
This commit is contained in:
commit
84fd68150b
@ -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";
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user