From af3fa3e279e7214f44fd3ec466d0f3ce723eceb1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 20 Nov 2021 13:06:38 +0100 Subject: [PATCH] haskell.packages.ghc9{0,2}1.lens: 5.0.1 -> 5.1 Latest on Hackage has been updated, so let's try to follow. Stackage LTS still doesn't support GHC >= 9.0 --- .../haskell-modules/configuration-ghc-9.0.x.nix | 2 +- .../haskell-modules/configuration-ghc-9.2.x.nix | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 6aae6f1c6385..08d1ba3b2107 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -105,7 +105,7 @@ self: super: { base64-bytestring = dontCheck super.base64-bytestring; # 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet - lens = super.lens_5_0_1; + lens = super.lens_5_1; # 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0 memory = super.memory_0_16_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index e2fca5199a61..e4bcdd736205 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -157,11 +157,8 @@ self: super: { sha256 = "02bvvy3hx3cf4y4dr64zl5pjvq8giwk4286j5g1n6k8ikyn2403p"; }) (doJailbreak super.vector-th-unbox); - # base 4.15 support from head.hackage - lens = appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/lens-5.0.1.patch"; - sha256 = "1s8qqg7ymvv94dnfnr1ragx91chh9y7ydc4jx25zn361wbn00pv7"; - }) (doJailbreak super.lens_5_0_1); + # lens >= 5.1 supports 9.2.1 + lens = super.lens_5_1; # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760 alex = dontCheck super.alex;