From 26e666d33ce5351061bff37aafe15d3cb3a365e4 Mon Sep 17 00:00:00 2001 From: Deniz Alp Durmaz Date: Sun, 9 Oct 2022 12:27:34 +0300 Subject: [PATCH] haskellPackages.espial: Apply patch to work with GHC 9.X --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4d3ab525ef78..fbc72ab16270 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1380,6 +1380,13 @@ self: super: { }) ] super.svgcairo; + # Espial is waiting for a hackage release to be compatible with GHC 9.X. + espial = appendPatch (fetchpatch { + url = "https://github.com/jonschoning/espial/commit/70177f9efb9666c3616e8a474681d3eb763d0e84.patch"; + sha256 = "sha256-aJtwZGp9DUpACBV0WYRL7k32m6qWf5vq6eKBFq/G23s="; + excludes = ["package.yaml" "stack.yaml" "stack.yaml.lock"]; + }) super.espial; + # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) # https://github.com/lehins/massiv/pull/104 massiv = dontCheck super.massiv; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b6c31d273939..11c95037d3b2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1341,7 +1341,6 @@ broken-packages: - ert - escape-artist - escoger - - espial - esqueleto-pgcrypto - ess - essence-of-live-coding-gloss-example diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9e4f568fe942..4b3c13ede1e8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -92409,8 +92409,6 @@ self: { ]; description = "Espial is an open-source, web-based bookmarking server"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "esqueleto" = callPackage