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.
This commit is contained in:
parent
52271f44b1
commit
160c5e9376
@ -1,11 +1,11 @@
|
|||||||
{ lib, buildFHSUserEnv, fetchFromGitHub }:
|
{ lib, buildFHSUserEnv, version, src }:
|
||||||
|
|
||||||
let
|
let
|
||||||
pio-pkgs = pkgs:
|
pio-pkgs = pkgs:
|
||||||
let
|
let
|
||||||
python = pkgs.python3.override {
|
python = pkgs.python3.override {
|
||||||
packageOverrides = self: super: {
|
packageOverrides = self: super: {
|
||||||
platformio = self.callPackage ./core.nix { };
|
platformio = self.callPackage ./core.nix { inherit version src; };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in (with pkgs; [
|
in (with pkgs; [
|
||||||
@ -19,14 +19,6 @@ let
|
|||||||
platformio
|
platformio
|
||||||
]);
|
]);
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "platformio";
|
|
||||||
repo = "platformio-core";
|
|
||||||
rev = "v5.0.2";
|
|
||||||
sha256 = "1hbw8nbllyj0xyx1rz2chx9vyqf9949dcdx4v9hnfbsjwwpcfi0a";
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
in buildFHSUserEnv {
|
in buildFHSUserEnv {
|
||||||
name = "platformio";
|
name = "platformio";
|
||||||
|
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
{ stdenv, lib, buildPythonApplication, fetchFromGitHub, fetchpatch
|
{ stdenv, lib, buildPythonApplication, fetchpatch
|
||||||
, bottle, click, colorama, semantic-version
|
, bottle, click, colorama, semantic-version
|
||||||
, lockfile, pyserial, requests
|
, lockfile, pyserial, requests
|
||||||
, tabulate, pyelftools, marshmallow
|
, tabulate, pyelftools, marshmallow
|
||||||
, pytest, tox, jsondiff
|
, pytest, tox, jsondiff
|
||||||
, git, spdx-license-list-data
|
, git, spdx-license-list-data
|
||||||
|
, version, src
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -75,15 +76,7 @@ let
|
|||||||
|
|
||||||
in buildPythonApplication rec {
|
in buildPythonApplication rec {
|
||||||
pname = "platformio";
|
pname = "platformio";
|
||||||
version = "5.0.2";
|
inherit version src;
|
||||||
|
|
||||||
# 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";
|
|
||||||
};
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
bottle click colorama git lockfile
|
bottle click colorama git lockfile
|
||||||
|
@ -1,11 +1,21 @@
|
|||||||
|
|
||||||
{ newScope }:
|
{ newScope, fetchFromGitHub }:
|
||||||
|
|
||||||
let
|
let
|
||||||
callPackage = newScope self;
|
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 = {
|
self = {
|
||||||
platformio-chrootenv = callPackage ./chrootenv.nix { };
|
platformio-chrootenv = callPackage ./chrootenv.nix { inherit version src; };
|
||||||
};
|
};
|
||||||
|
|
||||||
in self
|
in self
|
||||||
|
Loading…
Reference in New Issue
Block a user