From 117a9e2ed8d2375f64f162b751bdd11272ee0659 Mon Sep 17 00:00:00 2001
From: Robert Gerus <ar@is-a.cat>
Date: Wed, 20 Sep 2023 23:12:20 +0200
Subject: glasgow: 2023-04-15 -> 2023-09-20: bump

Multiple bugfixes, especially with revC3 hardware: partially fixed
selftests, and firmware/usb fixes
---
 pkgs/tools/misc/glasgow/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'pkgs/tools/misc/glasgow')

diff --git a/pkgs/tools/misc/glasgow/default.nix b/pkgs/tools/misc/glasgow/default.nix
index 6db7296b64db3..693660667ea7a 100644
--- a/pkgs/tools/misc/glasgow/default.nix
+++ b/pkgs/tools/misc/glasgow/default.nix
@@ -9,17 +9,15 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "glasgow";
-  version = "unstable-2023-04-15";
+  version = "unstable-2023-09-20";
   # python -m setuptools_scm
-  realVersion = "0.1.dev2+g${lib.substring 0 7 src.rev}";
-
-  patches = [ ./0001-Relax-Amaranth-git-dependency.patch ];
+  realVersion = "0.1.dev1798+g${lib.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
     owner = "GlasgowEmbedded";
     repo = "glasgow";
-    rev = "406e06fae5c85f6f773c9839747513874bc3ec77";
-    sha256 = "sha256-s4fWpKJj6n2+CIAsD2bjr5K8RhJz1H1sFnjiartNGf0=";
+    rev = "e9a9801d5be3dcba0ee188dd8a6e9115e337795d";
+    sha256 = "sha256-ztB3I/jrDSm1gKB1e5igivUVloq+YYhkshDlWg75NMA=";
   };
 
   nativeBuildInputs = [
@@ -30,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
   propagatedBuildInputs = with python3.pkgs; [
     aiohttp
     amaranth
+    appdirs
     bitarray
     crc
     fx2
@@ -58,6 +57,8 @@ python3.pkgs.buildPythonApplication rec {
   '';
 
   checkPhase = ''
+    # tests attempt to cache bitstreams
+    export XDG_CACHE_HOME=$TMPDIR
     ${python3.interpreter} -W ignore::DeprecationWarning test.py
   '';
 
-- 
cgit 1.4.1