Skip to content

Commit

Permalink
bluespec: 2023.01 -> 2024.01
Browse files Browse the repository at this point in the history
  • Loading branch information
jcumming authored and thoughtpolice committed Mar 31, 2024
1 parent 3db4469 commit d188d7e
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions pkgs/development/compilers/bluespec/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
, tcl
, tk
, xorg
, yices
, yices # bsc uses a patched version of yices
, zlib
, ghc
, gmp-static
Expand All @@ -28,13 +28,13 @@ let

in stdenv.mkDerivation rec {
pname = "bluespec";
version = "2023.01";
version = "2024.01";

src = fetchFromGitHub {
owner = "B-Lang-org";
repo = "bsc";
rev = version;
sha256 = "sha256-kFHQtRaQmZiHo+IQ+mwbW23i3kbdAh/XH0OE7P/ibd0=";
sha256 = "sha256-yqmtydv94p7qhps0t4EdPaSZNh/9XCuUwOzLqz0gjxE=";
};

yices-src = fetchurl {
Expand All @@ -46,7 +46,8 @@ in stdenv.mkDerivation rec {

outputs = [ "out" "doc" ];

# https://github.com/B-Lang-org/bsc/pull/278
# https://github.com/B-Lang-org/bsc/pull/278 is still applicable, but will probably not be applied as such
# there is work ongoing: https://github.com/B-Lang-org/bsc/issues/595 https://github.com/B-Lang-org/bsc/pull/600
patches = [ ./libstp_stub_makefile.patch ];

postUnpack = ''
Expand All @@ -67,6 +68,10 @@ in stdenv.mkDerivation rec {
# allow running bsc to bootstrap
export LD_LIBRARY_PATH=$PWD/inst/lib/SAT
# use more cores for GHC building, 44 causes heap overflows in ghc, and
# there is not much speedup after 8..
if [[ $NIX_BUILD_CORES -gt 8 ]] ; then export GHCJOBS=8; else export GHCJOBS=$NIX_BUILD_CORES; fi
'';

buildInputs = yices.buildInputs ++ [
Expand Down Expand Up @@ -96,7 +101,7 @@ in stdenv.mkDerivation rec {
"NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices-src instead of the subrepo)
"NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12
"LDCONFIG=ldconfig" # https://github.com/B-Lang-org/bsc/pull/43
"STP_STUB=1"
"STP_STUB=1" # uses yices as a SMT solver and stub out STP
];

doCheck = true;
Expand All @@ -106,7 +111,7 @@ in stdenv.mkDerivation rec {
verilog
];

checkTarget = "check-smoke";
checkTarget = "check-smoke"; # this is the shortest check but "check-suite" tests much more

installPhase = ''
mkdir -p $out
Expand Down

0 comments on commit d188d7e

Please sign in to comment.