diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix new file mode 100644 index 000000000000..5745596f7969 --- /dev/null +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, amaranth +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "amaranth-boards"; + version = "unstable-2021-12-17"; + # python setup.py --version + realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}"; + + src = fetchFromGitHub { + owner = "amaranth-lang"; + repo = "amaranth-boards"; + rev = "8e2615765e255144403431ca95c5cdf6c78eb638"; + sha256 = "3EOG8SO5xBNevshXMRrxKWoJUbeaVi8ckbkmqd6Tw70="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ setuptools amaranth ]; + + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" + ''; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Board definitions for Amaranth HDL"; + homepage = "https://github.com/amaranth-lang/amaranth-boards"; + license = licenses.bsd2; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix deleted file mode 100644 index 209d1f090779..000000000000 --- a/pkgs/development/python-modules/nmigen-boards/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, nmigen -, setuptools -, setuptools-scm -}: - -buildPythonPackage rec { - pname = "nmigen-boards"; - version = "unstable-2021-02-09"; - # python setup.py --version - realVersion = "0.1.dev173+g${lib.substring 0 7 src.rev}"; - - src = fetchFromGitHub { - owner = "nmigen"; - repo = "nmigen-boards"; - rev = "a35d870a994c2919116b2c06166dc127febb1512"; - sha256 = "1flbcyb2xz174dgqv2964qra80xj2vbzbqwjb27shvxm6knj9ikf"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ setuptools nmigen ]; - - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" - ''; - - # no tests - doCheck = false; - - meta = with lib; { - description = "Board and connector definitions for nMigen"; - homepage = "https://github.com/nmigen/nmigen-boards"; - license = licenses.bsd2; - maintainers = with maintainers; [ emily ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ff95ce22726..24a0dcb52fc3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5374,7 +5374,7 @@ in { nmapthon2 = callPackage ../development/python-modules/nmapthon2 { }; - nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; + amaranth-boards = callPackage ../development/python-modules/amaranth-boards { }; amaranth = callPackage ../development/python-modules/amaranth { };