Merge pull request #231177 from jleightcap/jl/glasgow-fix

glasgow: update, fix failing build

pkgs/tools/misc/glasgow/0001-Relax-Amaranth-git-dependency.patch

···
+From 95d86c080a559d9c9f0498fb93d43d3fef377080 Mon Sep 17 00:00:00 2001
+From: Jack Leightcap <[e-mail]>
+Date: Sat, 13 May 2023 17:28:54 -0400
+Subject: [PATCH] Relax Amaranth git dependency
+
+Signed-off-by: Jack Leightcap <[e-mail]>
+---
+ software/pyproject.toml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/software/pyproject.toml b/software/pyproject.toml
+index 6d1e2f1..6dfcc9e 100644
+--- a/software/pyproject.toml
++++ b/software/pyproject.toml
+@@ -20,8 +20,8 @@ classifiers = [
+ ]
+ 
+ dependencies = [
+-  "amaranth @ git+https://github.com/amaranth-lang/amaranth.git",
+-  "fx2>=0.11",
++  "amaranth",
++  "fx2",
+   "libusb1>=1.8.1",
+   "aiohttp~=3.8",
+   "pyvcd",
+-- 
+2.38.4
+

pkgs/tools/misc/glasgow/default.nix

···
 
 python3.pkgs.buildPythonApplication rec {
   pname = "glasgow";
-  version = "unstable-2021-12-12";
-  # python software/setup.py --version
-  realVersion = "0.1.dev1679+g${lib.substring 0 7 src.rev}";
+  version = "unstable-2023-04-15";
+  # python -m setuptools_scm
+  realVersion = "0.1.dev2+g${lib.substring 0 7 src.rev}";
+
+  patches = [ ./0001-Relax-Amaranth-git-dependency.patch ];
 
   src = fetchFromGitHub {
     owner = "GlasgowEmbedded";
     repo = "glasgow";
-    rev = "e640a778c446b7e9812727e73c560d12aeb41d7c";
-    sha256 = "EsQ9ZjalKDQ54JOonra4yPDI56cF5n86y/Rd798cZsU=";
+    rev = "406e06fae5c85f6f773c9839747513874bc3ec77";
+    sha256 = "sha256-s4fWpKJj6n2+CIAsD2bjr5K8RhJz1H1sFnjiartNGf0=";
   };
 
-  nativeBuildInputs = [ python3.pkgs.setuptools-scm sdcc ];
+  nativeBuildInputs = [
+    python3.pkgs.setuptools-scm
+    sdcc
+  ];
 
   propagatedBuildInputs = with python3.pkgs; [
-    setuptools
+    aiohttp
     amaranth
+    bitarray
+    crc
     fx2
     libusb1
-    aiohttp
     pyvcd
-    bitarray
-    crcmod
+    setuptools
   ];
 
   nativeCheckInputs = [ yosys icestorm nextpnr ];