@@ -2,6 +2,8 @@
22, buildPythonPackage
33, pythonOlder
44, fetchFromGitHub
5+, setuptools
6+, setuptools_scm
57, pyvcd
68, bitarray
79, jinja2
@@ -19,19 +21,22 @@
1921
2022buildPythonPackage rec {
2123 pname = "nmigen";
22− version = "unstable-2019-08-31";
23− realVersion = lib.substring 0 7 src.rev;
24+ version = "unstable-2019-09-28";
25+ # python setup.py --version
26+ realVersion = "0.1.dev689+g${lib.substring 0 7 src.rev}";
2427
2528 src = fetchFromGitHub {
2629 owner = "m-labs";
2730 repo = "nmigen";
28− rev = "2e206220462c67aa6ae97f7515a2191440fd61b3";
29− sha256 = "0y3w6vd493jqm9b8ppgwzs02v1al8w1n5gylljlsw70ci7fyk4qa";
31+ rev = "a02e3750bfeba44bcaad4c5de8d9eb0ef055d9c6";
32+ sha256 = "0m399c2nm7y54q2f0fbkmi4h35csbc2llckm6k9kqdf5qc6355wd";
3033 };
3134
3235 disabled = pythonOlder "3.6";
3336
34− propagatedBuildInputs = [ pyvcd bitarray jinja2 ];
37+ nativeBuildInputs = [ setuptools_scm ];
38+
39+ propagatedBuildInputs = [ setuptools pyvcd bitarray jinja2 ];
3540
3641 checkInputs = [ yosys yices ];
3742
@@ -48,14 +53,15 @@ buildPythonPackage rec {
4853 tool icestorm "icepack" //
4954 tool trellis "ecppack";
5055 in ''
51− substituteInPlace setup.py \
52− --replace 'versioneer.get_version()' '"${realVersion}"'
53−
5456 substituteInPlace nmigen/_toolchain.py \
5557 --replace 'overrides = {}' \
5658 'overrides = ${builtins.toJSON toolchainOverrides}'
5759 '';
5860
61+ preBuild = ''
62+ export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
63+ '';
64+
5965 meta = with lib; {
6066 description = "A refreshed Python toolbox for building complex digital hardware";
6167 homepage = https://github.com/m-labs/nmigen;