summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2023-09-21 16:52:37 +0200
committersternenseemann <sternenseemann@systemli.org>2023-09-21 16:52:37 +0200
commit8eff84a4fe91c8bed051864d0003474fbc1f5421 (patch)
treef81786cbf85a19ab306996c66a56b0357e199742 /pkgs/development/haskell-modules/configuration-common.nix
parent5c87b0f67283ce4a31c1d89318bbf6a64c9a6960 (diff)
downloadnixpkgs-8eff84a4fe91c8bed051864d0003474fbc1f5421.tar
nixpkgs-8eff84a4fe91c8bed051864d0003474fbc1f5421.tar.gz
nixpkgs-8eff84a4fe91c8bed051864d0003474fbc1f5421.tar.bz2
nixpkgs-8eff84a4fe91c8bed051864d0003474fbc1f5421.tar.lz
nixpkgs-8eff84a4fe91c8bed051864d0003474fbc1f5421.tar.xz
nixpkgs-8eff84a4fe91c8bed051864d0003474fbc1f5421.tar.zst
nixpkgs-8eff84a4fe91c8bed051864d0003474fbc1f5421.zip
jacinda: build with alex >= 3.4 as new release requires
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix9
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b0017c51ad7..6f2ac7a7cd9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -531,13 +531,8 @@ self: super: {
   # https://github.com/ekmett/structures/issues/3
   structures = dontCheck super.structures;
 
-  jacinda = appendPatches [
-    (pkgs.fetchpatch {
-      name = "jacinda-alex-3.3.patch";
-      url = "https://github.com/vmchale/jacinda/commit/b8e18871900402e6ab0addae2e41a0f360682ae3.patch";
-      sha256 = "0c1b9hp9j44zafzjidp301dz0m54vplgfisqvb1zrh1plk6vsxsa";
-    })
-  ] (overrideCabal { revision = null; editedCabalFile = null; } super.jacinda);
+  # Requires alex >= 3.4
+  jacinda = super.jacinda.override { alex = self.alex_3_4_0_0; };
 
   # Disable test suites to fix the build.
   acme-year = dontCheck super.acme-year;                # http://hydra.cryp.to/build/497858/log/raw