From 34d3df28d58878dcfacb50ad55f24af509320e29 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Sat, 1 Jan 2022 23:55:07 -0500 Subject: [PATCH] amaranth: rename from nmigen, unstable-2021-02-09 -> 0.3 Cherry-picked from #153163. Signed-off-by: Austin Seipp --- .../{nmigen => amaranth}/default.nix | 20 +++++++++---------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) rename pkgs/development/python-modules/{nmigen => amaranth}/default.nix (68%) diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/amaranth/default.nix similarity index 68% rename from pkgs/development/python-modules/nmigen/default.nix rename to pkgs/development/python-modules/amaranth/default.nix index 0228e7b3185c..a01d5eb42f73 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -18,17 +18,17 @@ }: buildPythonPackage rec { - pname = "nmigen"; - version = "unstable-2021-02-09"; + pname = "amaranth"; + version = "0.3"; # python setup.py --version - realVersion = "0.3.dev243+g${lib.substring 0 7 src.rev}"; + realVersion = "0.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "nmigen"; - repo = "nmigen"; - rev = "f7c2b9419f9de450be76a0e9cf681931295df65f"; - sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1"; + owner = "amaranth-lang"; + repo = "amaranth"; + rev = "39a83f4d995d16364cc9b99da646ff8db6394166"; + sha256 = "P9AG3t30eGeeCN5+t7mjhRoOWIGZVzWQji9eYXphjA0="; }; SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"; @@ -59,11 +59,11 @@ buildPythonPackage rec { --replace "pyvcd~=0.2.2" "pyvcd" ''; - pythonImportsCheck = [ "nmigen" ]; + pythonImportsCheck = [ "amaranth" ]; meta = with lib; { - description = "A refreshed Python toolbox for building complex digital hardware"; - homepage = "https://nmigen.info/nmigen"; + description = "A modern hardware definition language and toolchain based on Python"; + homepage = "https://amaranth-lang.org/docs/amaranth"; license = licenses.bsd2; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 569c10d69094..749c77ab1b29 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5376,7 +5376,7 @@ in { nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; - nmigen = callPackage ../development/python-modules/nmigen { }; + amaranth = callPackage ../development/python-modules/amaranth { }; nmigen-soc = callPackage ../development/python-modules/nmigen-soc { };