Skip to content

Commit

Permalink
apio: 0.8.1 -> 0.9.5
Browse files Browse the repository at this point in the history
https://github.com/FPGAwars/apio/releases/tag/v0.9.5

Also:
- Enable `strictDeps`
- Disable failing test
- Use `pyproject = true` instead of `format = "pyproject"`
-
- Use `--replace-fail` instead of `--replace`
  • Loading branch information
Luflosi committed Jun 19, 2024
1 parent d11a62c commit 0662ae4
Showing 1 changed file with 17 additions and 9 deletions.
26 changes: 17 additions & 9 deletions pkgs/development/embedded/fpga/apio/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,35 @@

buildPythonApplication rec {
pname = "apio";
version = "0.8.1";
format = "pyproject";
version = "0.9.5";

pyproject = true;

src = fetchFromGitHub {
owner = "FPGAwars";
repo = "apio";
rev = "v${version}";
sha256 = "sha256-04qAGTzusMT3GsaRxDoXNJK1Mslzxu+ugQclBJx8xzE=";
hash = "sha256-VU4tOszGkw20DWW2SerFsnjFiSkrSwqBcwosGnHJfU8=";
};

postPatch = ''
substituteInPlace pyproject.toml \
--replace 'scons==4.2.0' 'scons' \
--replace '==' '>='
--replace-fail 'scons==4.2.0' 'scons' \
--replace-fail '==' '>='
substituteInPlace apio/managers/scons.py --replace \
substituteInPlace apio/managers/scons.py --replace-fail \
'return "tinyprog --libusb --program"' \
'return "${tinyprog}/bin/tinyprog --libusb --program"'
substituteInPlace apio/util.py --replace \
'_command = join(get_bin_dir(), "tinyprog")' \
substituteInPlace apio/util.py --replace-fail \
'_command = apio_bin_dir / "tinyprog"' \
'_command = "${tinyprog}/bin/tinyprog"'
# semantic-version seems to not support version numbers like the one of tinyprog in Nixpkgs (1.0.24.dev114+gxxxxxxx).
# See https://github.com/rbarrois/python-semanticversion/issues/47.
# This leads to an error like "Error: Invalid version string: '1.0.24.dev114+g97f6353'"
# when executing "apio upload" for a TinyFPGA.
# Replace the dot with a dash to work around this problem.
substituteInPlace apio/managers/scons.py --replace \
substituteInPlace apio/managers/scons.py --replace-fail \
'version = semantic_version.Version(pkg_version)' \
'version = semantic_version.Version(pkg_version.replace(".dev", "-dev"))'
'';
Expand All @@ -69,8 +70,15 @@ buildPythonApplication rec {
pytestCheckHook
];

disabledTestPaths = [
# This test fails and is also not executed in upstream's CI
"test2"
];

pytestFlagsArray = [ "--offline" ];

strictDeps = true;

meta = with lib; {
description = "Open source ecosystem for open FPGA boards";
mainProgram = "apio";
Expand Down

0 comments on commit 0662ae4

Please sign in to comment.