diff options
| -rw-r--r-- | pkgs/development/compilers/bluespec/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index aca207f06c62c..09e76d63235c9 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -6,7 +6,6 @@ , fontconfig , gmp , gperf -, haskell , libX11 , libpoly , perl @@ -14,16 +13,14 @@ , verilog , xorg , zlib +, ghc }: let # yices wants a libgmp.a and fails otherwise gmpStatic = gmp.override { withStatic = true; }; - # Compiling PreludeBSV fails with more recent GHC versions - # > imperative statement (not BVI context) - # https://github.com/B-Lang-org/bsc/issues/20#issuecomment-583724030 - ghcWithPackages = haskell.packages.ghc844.ghc.withPackages (g: (with g; [old-time regex-compat syb])); + ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb])); in stdenv.mkDerivation rec { pname = "bluespec"; version = "unstable-2020.02.09"; @@ -94,6 +91,5 @@ in stdenv.mkDerivation rec { # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562 # aarch64 fails, as GHC fails with "ghc: could not execute: opt" maintainers = with stdenv.lib.maintainers; [ flokli thoughtpolice ]; - broken = true; # ghc-8.4.4 is gone from Nixpkgs }; } |