From 05ae990c7bb8ccd37a2de9a0e742b43cba183179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 28 May 2020 14:25:09 +0200
Subject: [PATCH] stack: update to 2.3.1, lts-15.5

This still fails to build with errors in src/Stack/Config.hs,
so this is WIP and not yet ready to merge.

[ci skip]
---
 .../stack_types_resolver_disambiguate.patch   | 62 +++++++++++++++++++
 srcpkgs/stack/template                        |  8 +--
 2 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/stack/patches/stack_types_resolver_disambiguate.patch

diff --git a/srcpkgs/stack/patches/stack_types_resolver_disambiguate.patch b/srcpkgs/stack/patches/stack_types_resolver_disambiguate.patch
new file mode 100644
index 00000000000..93726475245
--- /dev/null
+++ b/srcpkgs/stack/patches/stack_types_resolver_disambiguate.patch
@@ -0,0 +1,62 @@
+--- src/Stack/Types/Resolver.hs	2020-04-29 01:04:43.000000000 +0200
++++ src/Stack/Types/Resolver.hs	2020-05-28 11:15:37.491947065 +0200
+@@ -68,7 +68,7 @@
+     = LTS !Int !Int
+     | Nightly !Day
+     deriving (Generic, Typeable, Show, Data, Eq)
+-instance NFData SnapName
++instance NFData Stack.Types.Resolver.SnapName
+ instance Display SnapName where
+   display = display . renderSnapName
+ 
+@@ -79,7 +79,7 @@
+     deriving Typeable
+ instance Exception BuildPlanTypesException
+ instance Show BuildPlanTypesException where
+-    show (ParseSnapNameException t) = "Invalid snapshot name: " ++ T.unpack t
++    show (Stack.Types.Resolver.ParseSnapNameException t) = "Invalid snapshot name: " ++ T.unpack t
+     show (ParseResolverException t) = concat
+         [ "Invalid resolver value: "
+         , T.unpack t
+@@ -102,7 +102,7 @@
+-parseSnapName :: MonadThrow m => Text -> m SnapName
++parseSnapName :: MonadThrow m => Text -> m Stack.Types.Resolver.SnapName
+ parseSnapName t0 =
+     case lts <|> nightly of
+-        Nothing -> throwM $ ParseSnapNameException t0
++        Nothing -> throwM $ Stack.Types.Resolver.ParseSnapNameException t0
+         Just sn -> return sn
+   where
+     lts = do
+@@ -110,10 +110,10 @@
+         Right (x, t2) <- Just $ decimal t1
+         t3 <- T.stripPrefix "." t2
+         Right (y, "") <- Just $ decimal t3
+-        return $ LTS x y
++        return $ Stack.Types.Resolver.LTS x y
+     nightly = do
+         t1 <- T.stripPrefix "nightly-" t0
+-        Nightly <$> readMaybe (T.unpack t1)
++        Stack.Types.Resolver.Nightly <$> readMaybe (T.unpack t1)
+ 
+ -- | Most recent Nightly and newest LTS version per major release.
+ data Snapshots = Snapshots
+@@ -132,7 +132,7 @@
+-            case parseSnapName t of
++            case Stack.Types.Resolver.parseSnapName t of
+                 Left e -> fail $ show e
+-                Right (LTS _ _) -> fail "Unexpected LTS value"
+-                Right (Nightly d) -> return d
++                Right (Stack.Types.Resolver.LTS _ _) -> fail "Unexpected LTS value"
++                Right (Stack.Types.Resolver.Nightly d) -> return d
+ 
+         isLTS = ("lts-" `T.isPrefixOf`)
+ 
+@@ -140,4 +140,4 @@
+-            case parseSnapName t of
++            case Stack.Types.Resolver.parseSnapName t of
+                 Left e -> fail $ show e
+-                Right (LTS x y) -> return $ IntMap.singleton x y
+-                Right (Nightly _) -> fail "Unexpected nightly value"
++                Right (Stack.Types.Resolver.LTS x y) -> return $ IntMap.singleton x y
++                Right (Stack.Types.Resolver.Nightly _) -> fail "Unexpected nightly value"
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 38817375fa2..8469d4282e2 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.3.0.1
+version=2.3.1
 revision=1
-_stackage="lts-15.4"
+_stackage="lts-15.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -12,8 +12,8 @@ license="BSD-3-Clause"
 homepage="https://haskellstack.org"
 distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="a303a144dd3a37479e5b0fbf14d24e8d25d510bb038e413f14680ddb91036fd6
- 4147e6738cf6ef38cfd48048ef0992fb00e786068592e359fdb804e3d9ed4781"
+checksum="6701ddfc6d0be0c2bf0f75c84375e41923c5617f04222c5e582e7011c7f8fb83
+ 6faba729a0c8baf4c00eaa9e6431a846ff4ab398155dcc3558676d850cf42546"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"