apio: migrate to by-name (#430393)

This commit is contained in:
Yohann Boniface 2025-08-04 21:07:34 +02:00 committed by GitHub
commit 41df9287f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 30 deletions

View File

@ -1,21 +1,12 @@
{ {
lib, lib,
buildPythonApplication, python3Packages,
fetchFromGitHub, fetchFromGitHub,
click,
semantic-version,
requests,
colorama,
pyserial,
wheel,
scons,
setuptools,
tinyprog, tinyprog,
flit-core, scons,
pytestCheckHook,
}: }:
buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "apio"; pname = "apio";
version = "0.9.5"; version = "0.9.5";
@ -24,7 +15,7 @@ buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FPGAwars"; owner = "FPGAwars";
repo = "apio"; repo = "apio";
rev = "v${version}"; tag = "v${version}";
hash = "sha256-VU4tOszGkw20DWW2SerFsnjFiSkrSwqBcwosGnHJfU8="; hash = "sha256-VU4tOszGkw20DWW2SerFsnjFiSkrSwqBcwosGnHJfU8=";
}; };
@ -50,24 +41,30 @@ buildPythonApplication rec {
'version = semantic_version.Version(pkg_version.replace(".dev", "-dev"))' 'version = semantic_version.Version(pkg_version.replace(".dev", "-dev"))'
''; '';
nativeBuildInputs = [ nativeBuildInputs = with python3Packages; [
flit-core flit-core
]; ];
propagatedBuildInputs = [ dependencies =
with python3Packages;
[
click click
semantic-version semantic-version
requests requests
colorama colorama
pyserial pyserial
wheel wheel
]
++ [
scons 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 tinyprog # needed for upload to TinyFPGA
]; ];
nativeCheckInputs = [ build-system = with python3Packages; [
setuptools # needs pkg_resources at runtime (technically not needed when tinyprog is also in this list because of the propagatedBuildInputs of tinyprog)
];
nativeCheckInputs = with python3Packages; [
pytestCheckHook pytestCheckHook
]; ];
@ -80,11 +77,11 @@ buildPythonApplication rec {
strictDeps = true; strictDeps = true;
meta = with lib; { meta = {
description = "Open source ecosystem for open FPGA boards"; description = "Open source ecosystem for open FPGA boards";
mainProgram = "apio"; mainProgram = "apio";
homepage = "https://github.com/FPGAwars/apio"; homepage = "https://github.com/FPGAwars/apio";
license = licenses.gpl2Only; license = lib.licenses.gpl2Only;
maintainers = with maintainers; [ Luflosi ]; maintainers = with lib.maintainers; [ Luflosi ];
}; };
} }

View File

@ -1587,8 +1587,6 @@ with pkgs;
arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { }; arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { };
arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { }; arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { };
apio = python3Packages.callPackage ../development/embedded/fpga/apio { };
apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { }; apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { };
arpack-mpi = arpack.override { useMpi = true; }; arpack-mpi = arpack.override { useMpi = true; };