Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'

1 files changed, 19 insertions, 12 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/glasgow/default.nix b/nixpkgs/pkgs/development/python-modules/glasgow/default.nix
index 264a13aed5e7..7717682afda5 100644
--- a/nixpkgs/pkgs/development/python-modules/glasgow/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/glasgow/default.nix
@@ -1,6 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, setuptools
+, setuptools_scm
 , sdcc
 , nmigen
 , fx2
@@ -16,19 +18,21 @@
 
 buildPythonPackage rec {
   pname = "glasgow";
-  version = "unstable-2019-08-31";
-  realVersion = lib.substring 0 7 src.rev;
+  version = "unstable-2019-10-16";
+  # python software/setup.py --version
+  realVersion = "0.1.dev1286+g${lib.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
     owner = "GlasgowEmbedded";
-    repo = "Glasgow";
-    rev = "21641a13c6a0daaf8618aff3c5bfffcb26ef6cca";
-    sha256 = "1dpm1jmm4fg8xf17s6h9g5sc09gq8b6xq955sv2x11nrbqf98l4v";
+    repo = "glasgow";
+    rev = "4f968dbe6cf4e9d8e2d0a5163d82e996c24d5e30";
+    sha256 = "1b50n12dc0b3jmim5ywg7daq62k5j4wkgmwzk88ric5ri3b8dl2r";
   };
 
-  nativeBuildInputs = [ sdcc ];
+  nativeBuildInputs = [ setuptools_scm sdcc ];
 
   propagatedBuildInputs = [
+    setuptools
     nmigen
     fx2
     libusb1
@@ -38,25 +42,28 @@ buildPythonPackage rec {
     crcmod
   ];
 
-  postPatch = ''
-    substituteInPlace software/setup.py \
-      --replace 'versioneer.get_version()' '"${realVersion}"'
-  '';
+  checkInputs = [ yosys icestorm nextpnr ];
 
   preBuild = ''
     make -C firmware LIBFX2=${fx2}/share/libfx2
     cp firmware/glasgow.ihex software/glasgow
     cd software
+    export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
   '';
 
-  # a couple failing tests and also installCheck tries to build_ext again
+  # installCheck tries to build_ext again
   doInstallCheck = false;
-  doCheck = false;
 
   checkPhase = ''
     python -m unittest discover
   '';
 
+  makeWrapperArgs = [
+    "--set" "YOSYS" "${yosys}/bin/yosys"
+    "--set" "ICEPACK" "${icestorm}/bin/icepack"
+    "--set" "NEXTPNR_ICE40" "${nextpnr}/bin/nextpnr-ice40"
+  ];
+
   meta = with lib; {
     description = "Software for Glasgow, a digital interface multitool";
     homepage = https://github.com/GlasgowEmbedded/Glasgow;