From fac34c91b1437b3246dd76c9765b2f7efe737d33 Mon Sep 17 00:00:00 2001 From: Viacheslav Lotsmanov Date: Fri, 29 Jul 2022 02:15:18 +0300 Subject: [PATCH] Fetch patch for data-diverse from GitHub repo My merge request was merged so the patch is already in the repo. --- nix/data-diverse.patch | 13 ------------- release.nix | 7 ++++++- 2 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 nix/data-diverse.patch diff --git a/nix/data-diverse.patch b/nix/data-diverse.patch deleted file mode 100644 index c37cd7c..0000000 --- a/nix/data-diverse.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/Data/Diverse/ManySpec.hs b/test/Data/Diverse/ManySpec.hs -index eb7203f..9672af8 100644 ---- a/test/Data/Diverse/ManySpec.hs -+++ b/test/Data/Diverse/ManySpec.hs -@@ -305,7 +305,7 @@ spec = do - - it "with duplicate fields has setter for unique fields 'amend''" $ do - let x = (5 :: Int) ./ False ./ 'X' ./ Just 'O' ./ (6 :: Int) ./ Just 'A' ./ nil -- amend' @ '[Bool, Char] x (True ./ 'B' ./ nil) `shouldBe` -+ amend' @'[Bool, Char] x (True ./ 'B' ./ nil) `shouldBe` - (5 :: Int) ./ True ./ 'B' ./ Just 'O' ./ (6 :: Int) ./ Just 'A' ./ nil - - it "can be folded with 'Many' handlers using 'forMany' or 'collect'" $ do diff --git a/release.nix b/release.nix index a3c3bd6..1c4de11 100644 --- a/release.nix +++ b/release.nix @@ -73,7 +73,12 @@ let data-diverse = pkgsNew.lib.pipe haskellPackagesOld.data-diverse [ - (haskellAddPatch pkgsNew ./nix/data-diverse.patch) + # Patch for GHC 9.x support + (haskellAddPatch pkgsNew (pkgsNew.fetchpatch { + url = "https://github.com/louispan/data-diverse/commit/4033c90c44dab5824f76d64b7128bb6dea2b5dc7.patch"; + sha256 = "sha256-d6bC1Z7uCLtYF3FXGzo3XNdRPQgeAUjL1RW1Tiv7MnM="; + })) + (haskellMarkUnbroken pkgsNew) ];