Commit eb17e8bd authored by Guy Chronister's avatar Guy Chronister
Browse files

apio: migrate to by-name 

apio: refactor package definitions
parent 11ca73ac

pkgs/development/embedded/fpga/apio/default.nix→pkgs/by-name/ap/apio/package.nix

+25 −28
Original line number Diff line number Diff line 
{

  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 = [

  dependencies =

    with python3Packages;

    [

      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)



      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

  ];
@@ -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 ];

  };

}

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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; };