From c76656f9c4ae87c7c0fff2031309dd31852354d3 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 29 Jun 2021 10:48:08 -0500 Subject: [PATCH] Excise c2hs references `cabal` seems to want to download a newer c2hs than what is available on path at the current nixpkgs pin, and I haven't been able to figure out how to force it to do otherwise (open to suggestions). For now, we just cabal slurp it from Hackage rather than using the nixpkgs version. /shrug --- release.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/release.nix b/release.nix index bb8f72c..22d73c0 100644 --- a/release.nix +++ b/release.nix @@ -126,12 +126,6 @@ let buildDepends = [ pkgsNew.makeWrapper - # Give our nix-shell its own cabal so we don't pick up one - # from the user's environment by accident. - haskellPackagesNew.cabal-install - - # And likewise for c2hs - haskellPackagesNew.c2hs ]; patches = [ tests/tests.patch ]; @@ -186,7 +180,6 @@ let nativeBuildInputs = [ (with pkgsNew.haskellPackages; [ cabal-install - c2hs (ghcWithPackages (pkgs: with pkgs; [ grpc-haskell-core # No need to guard nix-shell entry on passing package tests