From 1c88b276c3f2c319e548a91959c645d66230b612 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:45:53 +0300 Subject: [PATCH 01/19] ghc8 | config: active: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 3611b19db1b6..5becbb2beecf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -74,4 +74,6 @@ self: super: { # https://github.com/haskell-suite/haskell-src-exts/issues/302 haskell-src-exts = dontCheck super.haskell-src-exts; + active = doJailbreak super.active; + } From 6d18c0555146ae1d4d7cbdc3a1e7c6e9c98d3137 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:46:11 +0300 Subject: [PATCH 02/19] ghc8 | config: authenticate-oauth: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 5becbb2beecf..03ff30d464f0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -76,4 +76,6 @@ self: super: { active = doJailbreak super.active; + authenticate-oauth = doJailbreak super.authenticate-oauth; + } From 4d2b957b8b5618375f03ecff3026183cd2ac3433 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:46:41 +0300 Subject: [PATCH 03/19] ghc8 | config: diagrams: jailbreak (doesn't make them build, issue filed) --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 03ff30d464f0..8b0e66e5b79e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -78,4 +78,8 @@ self: super: { authenticate-oauth = doJailbreak super.authenticate-oauth; + diagrams-core = doJailbreak super.diagrams-core; + + diagrams-lib = doJailbreak super.diagrams-lib; + } From 82b4224835901b8a4801cd51c9eef6974328e626 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:46:52 +0300 Subject: [PATCH 04/19] ghc8 | config: foldl: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 8b0e66e5b79e..298d748da979 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -82,4 +82,6 @@ self: super: { diagrams-lib = doJailbreak super.diagrams-lib; + foldl = doJailbreak super.foldl; + } From 38f9a1abdffa5136bb5ac99295df32cb7e191a4a Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:47:01 +0300 Subject: [PATCH 05/19] ghc8 | config: force-layout: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 298d748da979..140ab03479fc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -84,4 +84,6 @@ self: super: { foldl = doJailbreak super.foldl; + force-layout = doJailbreak super.force-layout; + } From 944b28f7c50beb6cde40d1e8c9fab41b31829303 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:48:10 +0300 Subject: [PATCH 06/19] ghc8 | config: linear -> git, unreleased fixes --- .../haskell-modules/configuration-ghc-8.0.x.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 140ab03479fc..282a0b49e522 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -86,4 +86,15 @@ self: super: { force-layout = doJailbreak super.force-layout; + # Partial fixes released in 1.20.5 upstream, full fixes only in git + linear = pkgs.haskell.lib.overrideCabal super.linear (oldAttrs: { + editedCabalFile = null; + revision = null; + src = pkgs.fetchgit { + url = https://github.com/ekmett/linear.git; + rev = "8da21dc72714441cb34d6eabd6c224819787365c"; + sha256 = "08l0z6zrlbals2bwc2abbh31j9gf90vgp8sy3dcrp0knc98bgaa1"; + }; + }); + } From 62db2406174e7ad9202b0a4ab5ca011b360d1350 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:48:23 +0300 Subject: [PATCH 07/19] ghc8 | config: lucid-svg: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 282a0b49e522..784ea0327cfc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -97,4 +97,6 @@ self: super: { }; }); + lucid-svg = doJailbreak super.lucid-svg; + } From 2018121298985ee0eab8b0d8cd9c07a6e054117e Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:48:32 +0300 Subject: [PATCH 08/19] ghc8 | config: monads-tf: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 784ea0327cfc..f859a2387ee3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -99,4 +99,6 @@ self: super: { lucid-svg = doJailbreak super.lucid-svg; + monads-tf = doJailbreak super.monads-tf; + } From 4015f60d1ddbe67f5a4558c0083db27f622fb8d0 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:48:40 +0300 Subject: [PATCH 09/19] ghc8 | config: parsers: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index f859a2387ee3..8e2f72d5f535 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -101,4 +101,6 @@ self: super: { monads-tf = doJailbreak super.monads-tf; + parsers = doJailbreak super.parsers; + } From 1fa1be62b6dec9eb67fa5d7c4f85c5bf57436299 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:53:06 +0300 Subject: [PATCH 10/19] ghc8 | config: pointed -> pointed_5 --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 8e2f72d5f535..6d26474f5efb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -103,4 +103,6 @@ self: super: { parsers = doJailbreak super.parsers; + pointed = super.pointed_5; + } From 5e08a820dc748b2d9e7ca51bd75167e63528257a Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:53:55 +0300 Subject: [PATCH 11/19] ghc8 | config: reducers: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 6d26474f5efb..d3b522fcb73a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -105,4 +105,6 @@ self: super: { pointed = super.pointed_5; + reducers = doJailbreak super.reducers; + } From d27186a9cae8bd26fa96b725e545cfc939d3f534 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:54:08 +0300 Subject: [PATCH 12/19] ghc8 | config: sdl2: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index d3b522fcb73a..97d5452fac79 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -107,4 +107,6 @@ self: super: { reducers = doJailbreak super.reducers; + sdl2 = doJailbreak super.sdl2; + } From 6ce39b317ed13af912da0325efd871d99819f1e5 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:54:27 +0300 Subject: [PATCH 13/19] ghc8 | config: servant*: jailbreak, disable tests --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 97d5452fac79..3f3b5171c008 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -109,4 +109,8 @@ self: super: { sdl2 = doJailbreak super.sdl2; + servant = dontCheck (doJailbreak super.servant_0_7); + servant-client = dontCheck (doJailbreak super.servant-client_0_7); + servant-server = dontCheck (doJailbreak super.servant-server_0_7); + } From 49a92137604172670a99af0fa0601a735923dc91 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:55:49 +0300 Subject: [PATCH 14/19] ghc8 | config: singletons -> git --- .../haskell-modules/configuration-ghc-8.0.x.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 3f3b5171c008..7a30431fa9ef 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -113,4 +113,13 @@ self: super: { servant-client = dontCheck (doJailbreak super.servant-client_0_7); servant-server = dontCheck (doJailbreak super.servant-server_0_7); + # The essential part is released in 2.1 upstream (needs hackage import) + singletons = (pkgs.haskell.lib.overrideCabal super.singletons (oldAttrs: { + src = pkgs.fetchgit { + url = https://github.com/goldfirere/singletons.git; + rev = "277fa943e8c260973effb2291672b166bdd951c1"; + sha256 = "1ll9fcgs5nxqihvv5vr2bf9z6ijvn3yyk5ss3cgcfvcd95ayy1wz"; + }; + })); + } From c03af86d39177e82cc5212b378645d1b83a0c15c Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:56:33 +0300 Subject: [PATCH 15/19] ghc8 | config: stm-conduit -> git --- .../haskell-modules/configuration-ghc-8.0.x.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 7a30431fa9ef..71fef2ecf23b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -122,4 +122,13 @@ self: super: { }; })); + # The essential part only in upstream git, last released upstream version 2.7.0, Dec 8 + stm-conduit = doJailbreak (pkgs.haskell.lib.overrideCabal super.stm-conduit (oldAttrs: { + src = pkgs.fetchgit { + url = https://github.com/cgaebel/stm-conduit.git; + rev = "3f831d703c422239e56a9da0f42db8a7059238e0"; + sha256 = "0bmym2ps0yjcsbyg02r8v1q8z5hpml99n72hf2pjmd31dy8iz7v9"; + }; + })); + } From 81f12377e448c9d5a5c0f5351e6e9fadce9c9295 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:57:37 +0300 Subject: [PATCH 16/19] ghc8 | config: th-desugar -> git --- .../haskell-modules/configuration-ghc-8.0.x.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 71fef2ecf23b..4f25f42cf3fa 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -131,4 +131,13 @@ self: super: { }; })); + # The essential part only in upstream git, last released upstream version 1.6.0, Jan 27 + th-desugar = doJailbreak (pkgs.haskell.lib.overrideCabal super.th-desugar (oldAttrs: { + src = pkgs.fetchgit { + url = https://github.com/goldfirere/th-desugar.git; + rev = "7496de0243a12c14be1b37b89eb41cf9ef6f5229"; + sha256 = "10awknqviq7jb738r6n9rlyra0pvkrpnk0hikz4459hny4hamn75"; + }; + })); + } From c9553d7b6d46a1c5e7a0d329b5a0869c566bad53 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:58:15 +0300 Subject: [PATCH 17/19] ghc8 | config: th-reify-many -> 0.1.4.1 --- .../haskell-modules/configuration-ghc-8.0.x.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 4f25f42cf3fa..161d1647bda7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -140,4 +140,13 @@ self: super: { }; })); + # The essential part is released in 0.1.4.1 upstream (needs hackage import) + th-reify-many = doJailbreak (pkgs.haskell.lib.overrideCabal super.th-reify-many (oldAttrs: { + src = pkgs.fetchgit { + url = https://github.com/mgsloan/th-reify-many.git; + rev = "699eed232c2ccaf9fb109f131e80ed8d654d6f08"; + sha256 = "001fvpq039l9wj9v8id7kfjwmp4acf53zr4z6sppdvrv6npzz5yb"; + }; + })); + } From 2e7200201270ca50bef007e151d07780a71ccdec Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:58:27 +0300 Subject: [PATCH 18/19] ghc8 | config: trifecta: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 161d1647bda7..345808f5aee5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -149,4 +149,6 @@ self: super: { }; })); + trifecta = doJailbreak super.trifecta; + } From 0438192122d115244504bc489dc96c9f33b223b7 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 2 May 2016 18:58:39 +0300 Subject: [PATCH 19/19] ghc8 | config: turtle: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 345808f5aee5..f5ca9626be6b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -151,4 +151,5 @@ self: super: { trifecta = doJailbreak super.trifecta; + turtle = doJailbreak super.turtle; }