about summary refs log tree commit diff
path: root/pkgs/development/embedded
diff options
context:
space:
mode:
authorKevin Cox <kevincox@kevincox.ca>2022-01-21 08:08:48 -0500
committerGitHub <noreply@github.com>2022-01-21 08:08:48 -0500
commitbc586b913b26efab436f01aecf68d45ed413b1b8 (patch)
tree0b82acfd2f0ee28e7c8f917a45638b12504a94d2 /pkgs/development/embedded
parent0bef0d60524fcdb2b609625e34d5c224e150c17a (diff)
parentd75f9fed05a658c70e9c745340552f99463b834d (diff)
Merge pull request #154017 from Luflosi/update/apio
apio: 0.7.6 -> 0.8.0
Diffstat (limited to 'pkgs/development/embedded')
-rw-r--r--pkgs/development/embedded/fpga/apio/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/embedded/fpga/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix
index 95de28113f84e..1bb5f336f1ebd 100644
--- a/pkgs/development/embedded/fpga/apio/default.nix
+++ b/pkgs/development/embedded/fpga/apio/default.nix
@@ -7,6 +7,7 @@
 , colorama
 , pyserial
 , wheel
+, scons
 , setuptools
 , tinyprog
 , pytestCheckHook
@@ -14,17 +15,20 @@
 
 buildPythonApplication rec {
   pname = "apio";
-  version = "0.7.6";
+  version = "0.8.0";
   format = "flit";
 
   src = fetchFromGitHub {
     owner = "FPGAwars";
     repo = "apio";
     rev = "v${version}";
-    sha256 = "sha256-KmqxwYKsvcTSuUSVXgegR47y9VeU/vICbYWD7z3aDRM=";
+    sha256 = "sha256-nOZI+FHdZRnkJF/No8z0mZ4Q5aHFnF7c20ajTPI00N4=";
   };
 
   postPatch = ''
+    substituteInPlace pyproject.toml --replace \
+      'scons==4.2.0' 'scons'
+
     substituteInPlace apio/managers/scons.py --replace \
       'return "tinyprog --libusb --program"' \
       'return "${tinyprog}/bin/tinyprog --libusb --program"'
@@ -49,6 +53,7 @@ buildPythonApplication rec {
     colorama
     pyserial
     wheel
+    scons
     setuptools # needs pkg_resources at runtime (technically not needed when tinyprog is also in this list because of the propagatedBuildInputs of tinyprog)
 
     tinyprog # needed for upload to TinyFPGA