git.iko.soy/typeable/nixpkgs
on master help sign in
glasgow: unstable-2019-08-31 -> unstable-2019-09-28
commitabcd56bd779e8c4b703ad7302ca79348f0fca375 authorEmily <vcs@emily.moe> dateFri 27 Sep 2019, 15:07 (7 years ago) parent32c6c0e
1 file changed+10−10
pkgs/development/python-modules/glasgow/default.nix+10−10
pkgs/development/python-modules/glasgow/default.nix+10−10
@@ -1,6 +1,8 @@
11{ lib
22, buildPythonPackage
33, fetchFromGitHub
4+, setuptools
5+, setuptools_scm
46, sdcc
57, nmigen
68, fx2
@@ -16,19 +18,21 @@
1618
1719buildPythonPackage rec {
1820 pname = "glasgow";
19− version = "unstable-2019-08-31";
20− realVersion = lib.substring 0 7 src.rev;
21+ version = "unstable-2019-09-28";
22+ # python setup.py --version
23+ realVersion = "0.1.dev1234+g${lib.substring 0 7 src.rev}";
2124
2225 src = fetchFromGitHub {
2326 owner = "GlasgowEmbedded";
2427 repo = "Glasgow";
25− rev = "21641a13c6a0daaf8618aff3c5bfffcb26ef6cca";
26− sha256 = "1dpm1jmm4fg8xf17s6h9g5sc09gq8b6xq955sv2x11nrbqf98l4v";
28+ rev = "a1cc0333315847980806fd0330021c6de05c5395";
29+ sha256 = "0rdx7fymz828i73bc559sr67aikydz1m8s2a0i6c86gznh1s3cfk";
2730 };
2831
29− nativeBuildInputs = [ sdcc ];
32+ nativeBuildInputs = [ setuptools_scm sdcc ];
3033
3134 propagatedBuildInputs = [
35+ setuptools
3236 nmigen
3337 fx2
3438 libusb1
@@ -38,15 +42,11 @@ buildPythonPackage rec {
3842 crcmod
3943 ];
4044
41− postPatch = ''
42− substituteInPlace software/setup.py \
43− --replace 'versioneer.get_version()' '"${realVersion}"'
44− '';
45−
4645 preBuild = ''
4746 make -C firmware LIBFX2=${fx2}/share/libfx2
4847 cp firmware/glasgow.ihex software/glasgow
4948 cd software
49+ export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
5050 '';
5151
5252 # a couple failing tests and also installCheck tries to build_ext again