bluespec: 2021.07 -> 2022.01

Current bsc releases ship a tarball of the expected version of the yices
source, so switch to using that rather than gamble on the nixpkgs yices
version.

Signed-off-by: David Anderson <dave@natulte.net>

pkgs/development/compilers/bluespec/default.nix

@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchurl
 , autoconf
 , automake
 , fontconfig
@@ -18,20 +19,27 @@
 , gmp-static
 , verilog
 , asciidoctor
-, tex }:
+, tex
+, which
+}:
 
 let
   ghcWithPackages = ghc.withPackages (g: (with g; [ old-time regex-compat syb split ]));
 
 in stdenv.mkDerivation rec {
   pname = "bluespec";
-  version = "2021.07";
+  version = "2022.01";
 
   src = fetchFromGitHub {
     owner = "B-Lang-org";
     repo = "bsc";
     rev = version;
-    sha256 = "0gw8wyp65lpkyfhv3laazz9qypdl8qkp1j7cqp0gv11592a9p5qw";
+    sha256 = "sha256-ivTua3MLa8akma3MGkhsqwSdwswYX916kywKdlj7TqY=";
+  };
+
+  yices-src = fetchurl {
+    url = "https://github.com/B-Lang-org/bsc/releases/download/${version}/yices-src-for-bsc-${version}.tar.gz";
+    sha256 = "sha256-ey5yIIVFZyG4EnYGqbIJqmxK1rZ70FWM0Jz+2hIoGXE=";
   };
 
   enableParallelBuilding = true;
@@ -43,8 +51,7 @@ in stdenv.mkDerivation rec {
 
   postUnpack = ''
     mkdir -p $sourceRoot/src/vendor/yices/v2.6/yices2
-    # XXX: only works because yices.src isn't a tarball.
-    cp -av ${yices.src}/* $sourceRoot/src/vendor/yices/v2.6/yices2
+    tar -C $sourceRoot/src/vendor/yices/v2.6/yices2 -xf ${yices-src}
     chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2
   '';
 
@@ -68,6 +75,7 @@ in stdenv.mkDerivation rec {
     libX11 # tcltk
     tcl
     tk
+    which
     xorg.libXft
     zlib
   ];