From ba497497836488c9b2e594be32e3135d3eb4e2ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Bourdeauducq?= <sb@m-labs.hk>
Date: Thu, 6 Jun 2024 14:50:02 +0800
Subject: [PATCH] gluelogic: update to nixos 24.05

---
 gluelogic/fpgatools.nix | 22 ++++++++++++++++------
 hydra/artiq.json        |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/gluelogic/fpgatools.nix b/gluelogic/fpgatools.nix
index c032e5b..3a5acde 100644
--- a/gluelogic/fpgatools.nix
+++ b/gluelogic/fpgatools.nix
@@ -29,8 +29,16 @@ rec {
   vivado = pkgs.buildFHSUserEnv {
     name = "vivado";
     targetPkgs = pkgs: (
-      with pkgs; [
-        ncurses5
+      with pkgs; let
+        # Apply patch from https://github.com/nix-community/nix-environments/pull/54
+        # to fix ncurses libtinfo.so's soname issue
+        ncurses' = ncurses5.overrideAttrs (old: {
+          configureFlags = old.configureFlags ++ [ "--with-termlib" ];
+          postFixup = "";
+        });
+      in [
+        libxcrypt-legacy
+        (ncurses'.override { unicodeSupport = false; })
         zlib
         libuuid
         xorg.libSM
@@ -40,20 +48,22 @@ rec {
         xorg.libXext
         xorg.libXtst
         xorg.libXi
-      ] ++ ( if pkgs ? libxcrypt-legacy then [ pkgs.libxcrypt-legacy ] else [])
+      ]
     );
     profile = "source ${vivadoPath}/settings64.sh";
     runScript = "vivado";
   };
   migen = pkgs.python3Packages.buildPythonPackage {
     pname = "migen";
-    version = "unstable-2021-12-16";
+    version = "unstable-2024-05-02";
     src = pkgs.fetchFromGitHub {
       owner = "m-labs";
       repo = "migen";
-      rev = "ac703010eaa06ac9b6e32f97c6fa98b15de22b31";
-      sha256 = "sha256-qpVj/yJf4hDDc99XXpVPH4EbLC8aCmEtACn5qNc3DGI=";
+      rev = "4790bb577681a8c3a8d226bc196a4e5deb39e4df";
+      sha256 = "sha256-4DCHBUBfc/VA+7NW2Hr0+JP4NnKPru2uVJyZjCCk0Ws=";
     };
+    format = "pyproject";
+    nativeBuildInputs = [ pkgs.python3Packages.setuptools ];
     propagatedBuildInputs = with pkgs.python3Packages; [ colorama ];
   };
   asyncserial = pkgs.python3Packages.buildPythonPackage {
diff --git a/hydra/artiq.json b/hydra/artiq.json
index fdd025e..bc735d7 100644
--- a/hydra/artiq.json
+++ b/hydra/artiq.json
@@ -147,7 +147,7 @@
         "emailoverride": "",
         "keepnr": 50,
         "inputs": {
-            "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false },
+            "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-24.05", "emailresponsible": false },
             "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
             "urukulSrc": { "type": "git", "value": "https://github.com/quartiq/urukul.git", "emailresponsible": false },
             "mirnySrc": { "type": "git", "value": "https://github.com/quartiq/mirny.git", "emailresponsible": false },