diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml deleted file mode 100644 index 12aead6562c..00000000000 --- a/srcpkgs/hlint/files/stack.yaml +++ /dev/null @@ -1,7 +0,0 @@ -resolver: lts-16.13 -packages: [.] -extra-deps: - - ghc-lib-parser-8.8.4.20200716 - - ghc-lib-parser-ex-8.8.5.8 -ghc-options: - "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch index 27553e9fbed..643f56c7299 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 --- a/src/CmdLine.hs +++ b/src/CmdLine.hs -@@ -52,7 +52,7 @@ automatic cmd = case cmd of +@@ -58,7 +58,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/template b/srcpkgs/hlint/template index 16fbb03ce2b..fb30f947a45 100644 --- a/srcpkgs/hlint/template +++ b/srcpkgs/hlint/template @@ -1,16 +1,16 @@ # Template file for 'hlint' pkgname=hlint -version=2.2.11 -revision=2 +version=3.2.7 +revision=1 build_style=haskell-stack -stackage="lts-16.13" +stackage="lts-17.5" makedepends="ncurses-devel" short_desc="Haskell source code suggestions" maintainer="Inokentiy Babushkin " license="BSD-3-Clause" -homepage="https://github.com/ndmitchell/${pkgname}" +homepage="https://github.com/ndmitchell/hlint" distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz" -checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172 +checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e nocross=yes # Can't yet cross compile Haskell nopie_files="/usr/bin/hlint"