diff options
author | adisbladis <adisbladis@gmail.com> | 2023-04-01 19:30:52 +1300 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2023-04-01 19:34:06 +1300 |
commit | fcbc5d74e73dbac4d2bb28c628a09630561b52d1 (patch) | |
tree | faae4d9b7fc4af2b2bedfdd3a678b1d1d9f09de9 /pkgs/development/embedded | |
parent | 8d8dd6fdbf6406c82faee1b3293a0b491b3b3751 (diff) |
platformio-core: move src & version to main expression
Diffstat (limited to 'pkgs/development/embedded')
-rw-r--r-- | pkgs/development/embedded/platformio/core.nix | 12 | ||||
-rw-r--r-- | pkgs/development/embedded/platformio/default.nix | 12 |
2 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index c0127fae5acbd..1ac707f014616 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -3,12 +3,20 @@ , fetchPypi , git , spdx-license-list-data -, version, src }: with python3.pkgs; buildPythonApplication rec { pname = "platformio"; - inherit version src; + + version = "6.1.6"; + + # 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-BEeMfdmAWqFbQUu8YKKrookQVgmhfZBqXnzeb2gfhms="; + }; outputs = [ "out" "udev" ]; diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix index 70a11f5736f3e..956d7dee06cd9 100644 --- a/pkgs/development/embedded/platformio/default.nix +++ b/pkgs/development/embedded/platformio/default.nix @@ -3,18 +3,8 @@ let callPackage = newScope self; - version = "6.1.6"; - - # 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-BEeMfdmAWqFbQUu8YKKrookQVgmhfZBqXnzeb2gfhms="; - }; - self = { - platformio-core = python3Packages.callPackage ./core.nix { inherit version src; }; + platformio-core = python3Packages.callPackage ./core.nix { }; platformio-chrootenv = callPackage ./chrootenv.nix { }; }; |