From f97c7b38a1c7289069282e2603ec0ec9ecf81e0a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 7 Oct 2022 18:16:51 +0300 Subject: [PATCH 1/4] python3.pkgs.myhdl: init at unstable-2022-04-26 --- .../python-modules/myhdl/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/myhdl/default.nix diff --git a/pkgs/development/python-modules/myhdl/default.nix b/pkgs/development/python-modules/myhdl/default.nix new file mode 100644 index 000000000000..77e793266e70 --- /dev/null +++ b/pkgs/development/python-modules/myhdl/default.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, verilog +, ghdl +, pytest +, pytest-xdist +}: + +buildPythonPackage rec { + pname = "myhdl"; + # The stable version is from 2019 and it doesn't pass tests + version = "unstable-2022-04-26"; + # The pypi src doesn't contain the ci script used in checkPhase + src = fetchFromGitHub { + owner = "myhdl"; + repo = "myhdl"; + rev = "1a4f5cd4e9de2e7bbf1053c3c2bc9526b5cc524a"; + hash = "sha256-Tgoem88Y6AhlCKVhMm0Khg6GPcrEktYOqV8xcMaNkl4="; + }; + + checkInputs = [ + pytest + pytest-xdist + verilog + ghdl + ]; + passthru = { + # If using myhdl as a dependency, use these if needed and not ghdl and + # verlog from all-packages.nix + inherit ghdl verilog; + }; + checkPhase = '' + runHook preCheck + + for target in {core,iverilog,ghdl}; do + env CI_TARGET="$target" bash ./scripts/ci.sh + done; + + runHook postCheck + ''; + + meta = with lib; { + description = "A free, open-source package for using Python as a hardware description and verification language."; + homepage = "http://www.myhdl.org/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af0c07084a9f..160ea34bb6ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5949,6 +5949,10 @@ self: super: with self; { mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + myhdl = callPackage ../development/python-modules/myhdl { + inherit (pkgs) ghdl verilog; + }; + myhome = callPackage ../development/python-modules/myhome { }; myjwt = callPackage ../development/python-modules/myjwt { }; From b6429927c04f8ae66aa3e9eed55d6ed7aa0e6d98 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 7 Oct 2022 19:03:38 +0300 Subject: [PATCH 2/4] python3.pkgs.asyncserial: init at unstable-2022-06-10 --- .../python-modules/asyncserial/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/asyncserial/default.nix diff --git a/pkgs/development/python-modules/asyncserial/default.nix b/pkgs/development/python-modules/asyncserial/default.nix new file mode 100644 index 000000000000..34ab492b9ae8 --- /dev/null +++ b/pkgs/development/python-modules/asyncserial/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +}: + +buildPythonPackage rec { + pname = "asyncserial"; + version = "unstable-2022-06-10"; + + src = fetchFromGitHub { + owner = "m-labs"; + repo = "asyncserial"; + rev = "446559fec892a556876b17d17f182ae9647d5952"; + hash = "sha256-WExmgh55sTH2w7wV3i96J1F1FN7L5rX3L/Ayvt2Kw/g="; + }; + + propagatedBuildInputs = [ + pyserial + ]; + + pythonImportsCheck = [ "asyncserial" ]; + + meta = with lib; { + description = "asyncio support for pyserial"; + homepage = "https://github.com/m-labs/asyncserial"; + license = licenses.bsd2; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 160ea34bb6ac..b8a5b53fff96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -682,6 +682,8 @@ self: super: with self; { asyncpg = callPackage ../development/python-modules/asyncpg { }; + asyncserial = callPackage ../development/python-modules/asyncserial { }; + asyncsleepiq = callPackage ../development/python-modules/asyncsleepiq { }; asyncssh = callPackage ../development/python-modules/asyncssh { }; From 3e3fe0b2e21107bfcc59a958571f23b98ba5b51a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 7 Oct 2022 19:41:11 +0300 Subject: [PATCH 3/4] python3.pkgs.migen: unstable-2021-09-14 -> unstable-2022-09-02 --- pkgs/development/python-modules/migen/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/migen/default.nix b/pkgs/development/python-modules/migen/default.nix index 41396e1c623b..0bbecefff967 100644 --- a/pkgs/development/python-modules/migen/default.nix +++ b/pkgs/development/python-modules/migen/default.nix @@ -7,14 +7,13 @@ buildPythonPackage rec { pname = "migen"; - version = "unstable-2021-09-14"; - disabled = pythonOlder "3.3"; + version = "unstable-2022-09-02"; src = fetchFromGitHub { owner = "m-labs"; repo = "migen"; - rev = "a5bc262560238f93ceaad423820eb06843326274"; - sha256 = "32UjaIam/B7Gx6XbPcR067LcXfokJH2mATG9mU38a6o="; + rev = "639e66f4f453438e83d86dc13491b9403bbd8ec6"; + hash = "sha256-IPyhoFZLhY8d3jHB8jyvGdbey7V+X5eCzBZYSrJ18ec="; }; propagatedBuildInputs = [ From 7b365ed51518ba4727c3a9130d5ddb5011608062 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 7 Oct 2022 19:22:12 +0300 Subject: [PATCH 4/4] python3.pkgs.misoc: init at unstable-2022-10-08 --- .../python-modules/misoc/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/misoc/default.nix diff --git a/pkgs/development/python-modules/misoc/default.nix b/pkgs/development/python-modules/misoc/default.nix new file mode 100644 index 000000000000..447bde58c328 --- /dev/null +++ b/pkgs/development/python-modules/misoc/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, asyncserial +, jinja2 +, migen +, numpy +}: + +buildPythonPackage rec { + pname = "misoc"; + version = "unstable-2022-10-08"; + + src = fetchFromGitHub { + owner = "m-labs"; + repo = "misoc"; + rev = "6a7c670ab6120b8136f652c41d907eb0fb16ed54"; + hash = "sha256-dLDp0xg5y5b443hD7vbJFobHxbhtnj68RdZnQ7ckgp4="; + }; + + propagatedBuildInputs = [ + pyserial + asyncserial + jinja2 + migen + ]; + + checkInputs = [ + numpy + ]; + + pythonImportsCheck = [ "misoc" ]; + + meta = with lib; { + description = "The original high performance and small footprint system-on-chip based on Migen"; + homepage = "https://github.com/m-labs/misoc"; + license = licenses.bsd2; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8a5b53fff96..b3a6e109a848 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5722,6 +5722,8 @@ self: super: with self; { misaka = callPackage ../development/python-modules/misaka { }; + misoc = callPackage ../development/python-modules/misoc { }; + mistletoe = callPackage ../development/python-modules/mistletoe { }; mistune = callPackage ../development/python-modules/mistune { };