public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93772 from maralorn/fix-bluespec

Browse Source 
[haskell-updates] bluespec: Fix build without ghc 844
This commit is contained in:
Peter Simons 2020-07-24 20:24:32 +02:00 committed by GitHub
commit 5f8e67bffd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/bluespec/default.nix
View File

@ -6,7 +6,6 @@
, fontconfig , fontconfig
, gmp , gmp
, gperf , gperf
, haskell
, libX11 , libX11
, libpoly , libpoly
, perl , perl
@ -14,16 +13,14 @@
, verilog , verilog
, xorg , xorg
, zlib , zlib
, ghc
}: }:
let let
# yices wants a libgmp.a and fails otherwise # yices wants a libgmp.a and fails otherwise
gmpStatic = gmp.override { withStatic = true; }; gmpStatic = gmp.override { withStatic = true; };
# Compiling PreludeBSV fails with more recent GHC versions ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb]));
# > 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]));
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "bluespec"; pname = "bluespec";
version = "unstable-2020.02.09"; 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 # 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" # aarch64 fails, as GHC fails with "ghc: could not execute: opt"
maintainers = with stdenv.lib.maintainers; [ flokli thoughtpolice ]; maintainers = with stdenv.lib.maintainers; [ flokli thoughtpolice ];
broken = true; # ghc-8.4.4 is gone from Nixpkgs
}; };
} }