substitute markupsafe

artiq-fast/artiq-board.nix

@@ -50,18 +50,6 @@ let
     sha256 = "sha256-Lf6M4M/jdRiO5MsWSoqtOSNfRIhbze+qvg4kaiiBWW4=";
   };
 
-  cargo-xbuild = rustPlatform.buildRustPackage rec {
-    pname = "cargo-xbuild";
-    version = "0.6.5";
-    src = pkgs.fetchFromGitHub {
-      owner = "rust-osdev";
-      repo = pname;
-      rev = "v${version}";
-      sha256 = "18djvygq9v8rmfchvi2hfj0i6fhn36m716vqndqnj56fiqviwxvf";
-    };
-    cargoSha256 = "13sj9j9kl6js75h9xq0yidxy63vixxm9q3f8jil6ymarml5wkhx8";
-  };
-
   artiq7 = pkgs.lib.strings.versionAtLeast artiqpkgs.artiq.version "7.0";
 
 in
@@ -88,7 +76,6 @@ pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation rec {
         pkgs.llvm_11
         pkgs.lld_11
         rustPlatform.cargoSetupHook
-        cargo-xbuild
       ] else [
         artiqpkgs.cargo-legacy
         artiqpkgs.rustc-legacy

artiq-fast/pkgs/python-deps.nix

@@ -238,6 +238,8 @@ rec {
         --replace "toolz==0.10.0" "toolz"
       substituteInPlace requirements.txt \
         --replace "pyserial==3.4" "pyserial"
+      substituteInPlace requirements.txt \
+        --replace "markupsafe==1.1.1" "markupsafe"
     '';