From 6b491e513bf6bcfe723ded1a27248503e00113b1 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 9 May 2021 23:25:09 +0200 Subject: [PATCH] haskellPackages.large-hashable: unbreak Compilation failures are related to GHC updates and other issues which have been resolved on the package's development repository, but not yet released. Fetching two patches resolves the problems which is probably a midterm solution since the repository hasn't seen any activity this year yet. --- .../haskell-modules/configuration-common.nix | 19 +++++++++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 5 +---- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4c93e6fa77a9..7cad4d339f46 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1879,4 +1879,23 @@ cat > example_data/acs100k.csv <= 8.8 + (pkgs.fetchpatch { + url = "https://github.com/factisresearch/large-hashable/commit/ee7afe4bd181cf15a324c7f4823f7a348e4a0e6b.patch"; + sha256 = "1ha77v0bc6prxacxhpdfgcsgw8348gvhl9y81smigifgjbinphxv"; + excludes = [ + ".travis.yml" + "stack**" + ]; + }) + # Fix cpp invocation + (pkgs.fetchpatch { + url = "https://github.com/factisresearch/large-hashable/commit/7b7c2ed6ac6e096478e8ee00160fa9d220df853a.patch"; + sha256 = "1sf9h3k8jbbgfshzrclaawlwx7k2frb09z2a64f93jhvk6ci6vgx"; + }) + ]; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f59c6a2f3404..803bea92a18a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2600,7 +2600,6 @@ broken-packages: - language-vhdl - language-webidl - lapack-ffi - - large-hashable - Lastik - latest-npm-version - latex-formulae-image diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 7019f2009996..e8d904052cd0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -220,6 +220,7 @@ package-maintainers: - gitit - yarn-lock - yarn2nix + - large-hashable poscat: - hinit bdesham: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a7f5d975a6c4..23ac0354ddf8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6447,8 +6447,6 @@ self: { ]; description = "A streamly layer for Frames I/O"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Frank" = callPackage @@ -158217,8 +158215,7 @@ self: { ]; description = "Efficiently hash (large) Haskell values"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "largeword" = callPackage