Skip to content

Commit

Permalink
bluespec: Fix build without ghc 844
Browse files Browse the repository at this point in the history
ghc 8.4.4 was only required before the merge of

B-Lang-org/bsc#42

which actually is already contained in the commit we are using.
  • Loading branch information
maralorn committed Jul 24, 2020
1 parent 359d2e6 commit 8605e1c
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions pkgs/development/compilers/bluespec/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,21 @@
, fontconfig
, gmp
, gperf
, haskell
, libX11
, libpoly
, perl
, pkgconfig
, 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";
Expand Down Expand Up @@ -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
};
}

0 comments on commit 8605e1c

Please sign in to comment.