Skip to content

Commit e06bdd5

Browse files
committed
default.nix: rm cryptohash-sha512 override
Use of cross-project overlay complicated this and so the package override was required. Nixpkgs makes it simple, Core derivation and Nix infra takes care of it.
1 parent fc6c50e commit e06bdd5

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

default.nix

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,6 @@ let
223223
root = packageRoot;
224224

225225
overrides = self: super: {
226-
# 2020-12-07 We really want cryptohash-sha512, but it conflicts with
227-
# recent versions of base, for seemingly no valid reason.
228-
# As the update is slow to happen, just jailbreak here
229-
# See https://github.com/haskell-hvr/cryptohash-sha512 PRs 3, 5 and issue 4
230-
# See also https://github.com/NixOS/nixpkgs/pull/106333 for a temporary fix.
231-
cryptohash-sha512 = pkgs.haskell.lib.unmarkBroken ( pkgs.haskell.lib.doJailbreak super.cryptohash-sha512 );
232226

233227
# 2021-01-06: NOTE:
234228
# Core is on Stackage and pinned at `0.2`: https://github.com/haskell-nix/hnix-store/issues/104
@@ -238,6 +232,7 @@ let
238232
# probably due to nix sandbox restrictions.
239233
# Upstream issue @ https://github.com/haskell-nix/hnix-store/issues/80
240234
hnix-store-remote = pkgs.haskell.lib.unmarkBroken super.hnix-store-remote;
235+
241236
};
242237

243238
modifier = drv: pkgs.haskell.lib.overrideCabal drv (attrs: {

0 commit comments

Comments
 (0)