From eb17e8bd7030fd76a47b2f361b2bf0cd4f533e11 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 2 Aug 2025 14:28:03 +0000 Subject: [PATCH] apio: migrate to by-name apio: refactor package definitions --- .../ap/apio/package.nix} | 53 +++++++++---------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 25 insertions(+), 30 deletions(-) rename pkgs/{development/embedded/fpga/apio/default.nix => by-name/ap/apio/package.nix} (77%) diff --git a/pkgs/development/embedded/fpga/apio/default.nix b/pkgs/by-name/ap/apio/package.nix similarity index 77% rename from pkgs/development/embedded/fpga/apio/default.nix rename to pkgs/by-name/ap/apio/package.nix index 8708ad84bf7d..f700bb53578c 100644 --- a/pkgs/development/embedded/fpga/apio/default.nix +++ b/pkgs/by-name/ap/apio/package.nix @@ -1,21 +1,12 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - click, - semantic-version, - requests, - colorama, - pyserial, - wheel, - scons, - setuptools, tinyprog, - flit-core, - pytestCheckHook, + scons, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "apio"; version = "0.9.5"; @@ -24,7 +15,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "FPGAwars"; repo = "apio"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-VU4tOszGkw20DWW2SerFsnjFiSkrSwqBcwosGnHJfU8="; }; @@ -50,24 +41,30 @@ buildPythonApplication rec { 'version = semantic_version.Version(pkg_version.replace(".dev", "-dev"))' ''; - nativeBuildInputs = [ + nativeBuildInputs = with python3Packages; [ flit-core ]; - propagatedBuildInputs = [ - click - semantic-version - requests - 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) + dependencies = + with python3Packages; + [ + click + semantic-version + requests + colorama + pyserial + wheel + ] + ++ [ + scons + tinyprog # needed for upload to TinyFPGA + ]; - tinyprog # needed for upload to TinyFPGA + 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 = [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; @@ -80,11 +77,11 @@ buildPythonApplication rec { strictDeps = true; - meta = with lib; { + meta = { description = "Open source ecosystem for open FPGA boards"; mainProgram = "apio"; homepage = "https://github.com/FPGAwars/apio"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ Luflosi ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ Luflosi ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15b7b79653f4..9e086a6aef2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1597,8 +1597,6 @@ with pkgs; arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { }; arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { }; - apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; - apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { }; arpack-mpi = arpack.override { useMpi = true; };