From 2d3c98f2a3c2de92c88191458ee875069081c876 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Fri, 30 Dec 2022 11:37:11 -0700 Subject: [PATCH] haskellPackages.true-name: Add a patch to allow building with current template-haskell. This updates the `true-name` package to include changes up to version 0.1.0.4, as well as compilation failures when building with template-haskell version 2.16 and higher. --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aa053828999..fa599029392 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2370,4 +2370,16 @@ self: super: { } super.postgrest)); html-charset = dontCheck super.html-charset; + + # true-name-0.1.0.4 has been tagged, but has not been released to Hackage. + # Also, beyond 0.1.0.4 an additional patch is required to make true-name + # compatible with current versions of template-haskell + # https://github.com/liyang/true-name/pull/4 + true-name = appendPatch (fetchpatch { + url = "https://github.com/liyang/true-name/compare/0.1.0.3...nuttycom:true-name:update_template_haskell.patch"; + hash = "sha256-ZMBXGGc2X5AKXYbqgkLXkg5BhEwyj022E37sUEWahtc="; + }) (overrideCabal (drv: { + revision = null; + editedCabalFile = null; + }) super.true-name); } // 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 69a10689fb7..33e8627195f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5416,7 +5416,6 @@ broken-packages: - trivia - tropical - tropical-geometry - - true-name - tsession - tslib - tsparse