From da2e9d26ef8383f0c170e39e0ca444fa89f4d52a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-HStringTemplate: jailbreak when building with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 41925d89550f..9e613c6f9337 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -163,4 +163,8 @@ self: super: { url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch"; sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5"; }); + + # break out of 'time >=1.4.2 && <1.9' + HStringTemplate = doJailbreak super.HStringTemplate; + } -- cgit 1.4.1 From fbd700b12824ea644801b4b709f2a6aac458e95e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-X11: patch the build to succeed with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 9e613c6f9337..cead355b1457 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -167,4 +167,10 @@ self: super: { # break out of 'time >=1.4.2 && <1.9' HStringTemplate = doJailbreak super.HStringTemplate; + # don't use obsolete "defaultUserHooks" in Setup.hs + X11 = appendPatch super.X11 (pkgs.fetchpatch { + url = "https://github.com/xmonad/X11/commit/8d817617afa1b54e6c50a9cc552dc1c0804c1794.patch"; + sha256 = "0zsgzn0nvdxvqi5z0za3gzlhql2x5d5cr0kkr19j5c67fy177w6b"; + }); + } -- cgit 1.4.1 From ec49ae6fe19785940424ba2e2ae00c50883b2d2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-HStringTemplate: drop obsolete override --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 --- 1 file changed, 3 deletions(-) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index cead355b1457..aaef02f058ff 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -164,9 +164,6 @@ self: super: { sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5"; }); - # break out of 'time >=1.4.2 && <1.9' - HStringTemplate = doJailbreak super.HStringTemplate; - # don't use obsolete "defaultUserHooks" in Setup.hs X11 = appendPatch super.X11 (pkgs.fetchpatch { url = "https://github.com/xmonad/X11/commit/8d817617afa1b54e6c50a9cc552dc1c0804c1794.patch"; -- cgit 1.4.1 From c464e35b69ac60fef29ed90e9499557c8e66856e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-lens: use the latest version when building with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index aaef02f058ff..3db1f35bf112 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -113,10 +113,7 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch"; sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp"; }); - lens = appendPatch (doJailbreak super.lens) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch"; - sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1"; - }); + lens = self.lens_4_18_1; polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch"; sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5"; -- cgit 1.4.1 From a0ac8c878465e34ca4576ca077ed78ebf3633387 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-xmonad-contrib: use the latest version when building with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 3db1f35bf112..0e9097db5ce3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -114,6 +114,7 @@ self: super: { sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp"; }); lens = self.lens_4_18_1; + xmonad-contrib = self.xmonad-contrib_0_16; polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch"; sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5"; -- cgit 1.4.1 From cab7cea53cae57a769fbf073dcf69fb40e6596d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-cassava: use the latest version when building with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 0e9097db5ce3..8ff184cb2807 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -101,10 +101,6 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch"; sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7"; }); - cassava = appendPatch super.cassava (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch"; - sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g"; - }); shakespeare = appendPatch super.shakespeare (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch"; sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y"; -- cgit 1.4.1 From 4f21e87fbe32f9aa260eb0cdf576e47d1e321892 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-aeson-diff: jailbreak when building with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 8ff184cb2807..93dd837b1066 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -164,4 +164,7 @@ self: super: { sha256 = "0zsgzn0nvdxvqi5z0za3gzlhql2x5d5cr0kkr19j5c67fy177w6b"; }); + # over-specified version constraints + aeson-diff = doJailbreak super.aeson-diff; + } -- cgit 1.4.1 From a62a68e1253278f4a308861a4df677f74a66ec8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-hpack: mark the build as broken when compiling with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 93dd837b1066..314c11e245de 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -167,4 +167,7 @@ self: super: { # over-specified version constraints aeson-diff = doJailbreak super.aeson-diff; + # https://github.com/sol/hpack/issues/371 + hpack = markBrokenVersion "0.32.0" super.hpack; + } -- cgit 1.4.1 From 9b4cd7c36b8e9fb19bcfc21e48016eac6ab7174c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-csv: patch the build to succeed when compiling with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 314c11e245de..9626c9f89202 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -170,4 +170,7 @@ self: super: { # https://github.com/sol/hpack/issues/371 hpack = markBrokenVersion "0.32.0" super.hpack; + # Upstream ships a broken Setup.hs file. + csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; }); + } -- cgit 1.4.1 From 373796c4112fcacca3688f1825d327f012388328 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-shakespeare: drop obsolete patch to fix the build with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 9626c9f89202..49ccfbaf8e51 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -101,10 +101,6 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch"; sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7"; }); - shakespeare = appendPatch super.shakespeare (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch"; - sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y"; - }); socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch"; sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp"; -- cgit 1.4.1 From 7832aefa8064aeca26c0a2249897a785067d6aad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-monad-par: disable the test suite when building with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 49ccfbaf8e51..799f8cc37b42 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -147,6 +147,7 @@ self: super: { }); tls = self.tls_1_5_1; vault = dontHaddock super.vault; + monad-par = dontCheck super.monad-par; # test suite does not compile in monad-par-0.3.4.8 # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved alex = appendPatch super.alex (pkgs.fetchpatch { -- cgit 1.4.1 From 666dac71ac18e313912525733a74d7c995dcdec6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-string-qq: patch the build to succeed when compiling with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 799f8cc37b42..143e7259d583 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -170,4 +170,14 @@ self: super: { # Upstream ships a broken Setup.hs file. csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; }); + # Upstream ships a broken Setup.hs file. + string-qq = overrideSrc (dontCheck super.string-qq) { + src = pkgs.fetchFromGitHub { + owner = "dmwit"; + repo = "string-qq"; + rev = "b396f5ef36a9b23f1d3fafcc91f2222cd1ad24fe"; + sha256 = "1z2f1yry8wi0jb38dgz7rl89zl63fhngf7xk4ljw240vn315jj8s"; + }; + }; + } -- cgit 1.4.1 From 38a0df1867f7ad330741fee9d2386feb67bc740a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: haskell-easytest: mark the build as broken when compiling with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 143e7259d583..a233185cf4b8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -96,7 +96,8 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch"; sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw"; }); - easytest = self.easytest_0_3; + easytest = markBroken super.easytest; + easytest_0_3 = markBroken super.easytest_0_3; regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch"; sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7"; -- cgit 1.4.1