Hello community, here is the log from the commit of package hlint for openSUSE:Factory checked in at 2016-06-14 23:08:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hlint (Old) and /work/SRC/openSUSE:Factory/.hlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hlint" Changes: -------- --- /work/SRC/openSUSE:Factory/hlint/hlint.changes 2016-06-07 23:48:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hlint.new/hlint.changes 2016-06-14 23:08:25.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Jun 11 11:19:42 UTC 2016 - [email protected] + +- update to 1.9.35 +* fix parse error reports +* update hlint.ghci to work with modern GHC +* Require extra-1.4.9 + +------------------------------------------------------------------- Old: ---- hlint-1.9.34.tar.gz New: ---- hlint-1.9.35.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hlint.spec ++++++ --- /var/tmp/diff_new_pack.LVGRBf/_old 2016-06-14 23:08:26.000000000 +0200 +++ /var/tmp/diff_new_pack.LVGRBf/_new 2016-06-14 23:08:26.000000000 +0200 @@ -19,7 +19,7 @@ %global pkg_name hlint # no useful debuginfo for Haskell packages without C sources Name: hlint -Version: 1.9.34 +Version: 1.9.35 Release: 0 Summary: Source code suggestions License: BSD-3-Clause ++++++ hlint-1.9.34.tar.gz -> hlint-1.9.35.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hlint-1.9.34/CHANGES.txt new/hlint-1.9.35/CHANGES.txt --- old/hlint-1.9.34/CHANGES.txt 2016-06-01 12:15:21.000000000 +0200 +++ new/hlint-1.9.35/CHANGES.txt 2016-06-10 11:32:08.000000000 +0200 @@ -1,5 +1,9 @@ Changelog for HLint +1.9.35 + #245, fix parse error reports + #243, update hlint.ghci to work with modern GHC + Require extra-1.4.9 1.9.34 #154, fix some incorrect line numbers in literate Haskell #161, fix literate Haskell and CPP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hlint-1.9.34/README.md new/hlint-1.9.35/README.md --- old/hlint-1.9.34/README.md 2016-06-01 12:15:21.000000000 +0200 +++ new/hlint-1.9.35/README.md 2016-06-10 11:32:08.000000000 +0200 @@ -97,7 +97,7 @@ ### GHCi Integration -GHCi integration has been provided by Gwern Branwen. The integration allows running `:hlint` from the GHCi prompt. The script is at [hlint.ghci](https://raw.githubusercontent.com/ndmitchell/hlint/master/data/hlint.ghci), and a copy is installed locally in the data directory. To use, add the contents to your [GHCi startup file](http://www.haskell.org/ghc/docs/latest/html/users_guide/ghci-dot-files.html). +GHCi integration has been provided by Gwern Branwen. The integration allows running `:hlint` from the GHCi prompt. The script is at [hlint.ghci](https://raw.githubusercontent.com/ndmitchell/hlint/master/data/hlint.ghci), and a copy is installed locally in the data directory. To use, add the contents to your [GHCi startup file](https://www.haskell.org/ghc/docs/latest/html/users_guide/ghci.html#the-ghci-and-haskeline-files). ### Parallel Operation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hlint-1.9.34/data/hlint.ghci new/hlint-1.9.35/data/hlint.ghci --- old/hlint-1.9.34/data/hlint.ghci 2016-06-01 12:15:21.000000000 +0200 +++ new/hlint-1.9.35/data/hlint.ghci 2016-06-10 11:32:08.000000000 +0200 @@ -8,11 +8,11 @@ [":set -fno-print-bind-result" ,"tmp <- System.Directory.getTemporaryDirectory" ,"(f,h) <- System.IO.openTempFile tmp \"ghci\"" - ,"sto <- GHC.Handle.hDuplicate System.IO.stdout" - ,"GHC.Handle.hDuplicateTo h System.IO.stdout" + ,"sto <- GHC.IO.Handle.hDuplicate System.IO.stdout" + ,"GHC.IO.Handle.hDuplicateTo h System.IO.stdout" ,"System.IO.hClose h" ,cmd - ,"GHC.Handle.hDuplicateTo sto System.IO.stdout" + ,"GHC.IO.Handle.hDuplicateTo sto System.IO.stdout" ,"let readFileNow f = readFile f >>= \\t->Data.List.length t `seq` return t" ,var++" <- readFileNow f" ,"System.Directory.removeFile f" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hlint-1.9.34/hlint.cabal new/hlint-1.9.35/hlint.cabal --- old/hlint-1.9.34/hlint.cabal 2016-06-01 12:15:21.000000000 +0200 +++ new/hlint-1.9.35/hlint.cabal 2016-06-10 11:32:08.000000000 +0200 @@ -1,7 +1,7 @@ cabal-version: >= 1.8 build-type: Simple name: hlint -version: 1.9.34 +version: 1.9.35 license: BSD3 license-file: LICENSE category: Development @@ -52,7 +52,7 @@ haskell-src-exts >= 1.17 && < 1.18, uniplate >= 1.5, ansi-terminal >= 0.6.2, - extra >= 0.5, + extra >= 1.4.9, refact >= 0.3 if flag(gpl) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hlint-1.9.34/src/HSE/All.hs new/hlint-1.9.35/src/HSE/All.hs --- old/hlint-1.9.34/src/HSE/All.hs 2016-06-01 12:15:21.000000000 +0200 +++ new/hlint-1.9.35/src/HSE/All.hs 2016-06-10 11:32:08.000000000 +0200 @@ -1,3 +1,4 @@ +{-# LANGUAGE ViewPatterns #-} module HSE.All( module X, @@ -52,7 +53,11 @@ runCpp :: CppFlags -> FilePath -> String -> IO String runCpp NoCpp _ x = return x runCpp CppSimple _ x = return $ unlines [if "#" `isPrefixOf` trimStart x then "" else x | x <- lines x] -runCpp (Cpphs o) file x = drop 1 . dropWhile (/= '\n') <$> runCpphs o file x +runCpp (Cpphs o) file x = dropLine <$> runCpphs o file x + where + -- LINE pragmas always inserted when locations=True + dropLine (line1 -> (a,b)) | "{-# LINE " `isPrefixOf` a = b + dropLine x = x --------------------------------------------------------------------- @@ -76,6 +81,7 @@ ParseOk (x, cs) -> return $ Right (applyFixity fixity x, cs) ParseFailed sl msg -> do -- figure out the best line number to grab context from, by reparsing + -- but not generating {-# LINE #-} pragmas flags <- return $ parseFlagsNoLocations flags ppstr2 <- runCpp (cppFlags flags) file str let pe = case parseFileContentsWithMode (mode flags) ppstr2 of
