diff options
| author | David Anderson <dave@natulte.net> | 2022-03-29 00:17:20 -0700 |
|---|---|---|
| committer | Cole Helbling <cole.e.helbling@outlook.com> | 2022-04-09 11:29:27 -0700 |
| commit | c9346a6ac842706b2b3533603300654b515abf3f (patch) | |
| tree | 4d95f797cc93ba7dbe71244165276f48bca383be /pkgs/development/compilers/bluespec | |
| parent | 918a14988814948fc60ae69c830a00f72a91dbf4 (diff) | |
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>
Diffstat (limited to 'pkgs/development/compilers/bluespec')
| -rw-r--r-- | pkgs/development/compilers/bluespec/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index d89ed3e0d49ff..ae28923871c00 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/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 ]; |