From 5f4bc1b9510363e8b0896fdbb8a1955eeff5b34b Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@tuta.io>
Date: Thu, 14 May 2020 18:54:39 +0200
Subject: [PATCH] hlint: update to 3.1.1

---
 srcpkgs/hlint/files/stack.yaml       |  8 ++++++++
 srcpkgs/hlint/patches/data.patch     | 14 ++++++--------
 srcpkgs/hlint/patches/ghc8.8.3.patch | 13 -------------
 srcpkgs/hlint/template               |  5 ++---
 4 files changed, 16 insertions(+), 24 deletions(-)
 create mode 100644 srcpkgs/hlint/files/stack.yaml
 delete mode 100644 srcpkgs/hlint/patches/ghc8.8.3.patch

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
new file mode 100644
index 00000000000..a8d4bb8d6e8
--- /dev/null
+++ b/srcpkgs/hlint/files/stack.yaml
@@ -0,0 +1,8 @@
+resolver: lts-15.4
+packages:
+  - .
+extra-deps:
+  - ghc-lib-parser-8.10.1.20200412
+  - ghc-lib-parser-ex-8.10.0.6
+  - extra-1.7.1
+ghc-options: {"$locals": -ddump-to-file -ddump-hi -Werror=unused-imports -Werror=unused-top-binds -Werror=orphans}
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f47..4ea1a8ee768 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
---- src/CmdLine.hs
-+++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+--- src/CmdLine.hs	2020-05-14 18:18:22.540116272 +0200
++++ src/CmdLine.hs	2020-05-13 18:38:51.000000000 +0200
+@@ -61,7 +61,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/patches/ghc8.8.3.patch b/srcpkgs/hlint/patches/ghc8.8.3.patch
deleted file mode 100644
index 356800d31cd..00000000000
--- a/srcpkgs/hlint/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- stack.yaml	2020-02-09 22:30:02.000000000 +0100
-+++ stack.yaml	2020-03-28 12:06:31.711342411 +0100
-@@ -4,8 +4,7 @@
- resolver: nightly-2019-08-07 # Don't roll to an 8.8.1 or 8.8.2 resolver because of the Windows linker bug
- packages: [.]
- extra-deps:
--  - ghc-lib-parser-8.8.2.20200205
--  - ghc-lib-parser-ex-8.8.5.1
-+  - ghc-lib-parser-8.8.3.20200224
-+  - ghc-lib-parser-ex-8.8.6.0
--  - haskell-src-exts-1.23.0
- ghc-options:
-     "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 53151062add..e23ab6546f2 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,15 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
+version=3.1.1
 revision=1
 build_style=haskell-stack
-stackage="lts-15.4"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/ndmitchell/${pkgname}"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=c3df1a754e04e1185a9bfe6d7505701adaf0f336e2b5d60661c327a4e5b54fa5
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"