tv pkgs lentil: 0.1.2.7 -> 0.1.3.0

This commit is contained in:
tv 2015-07-27 17:49:02 +02:00
parent 6fcb2682db
commit 5a03593b3a
2 changed files with 2 additions and 43 deletions

View File

@ -1,39 +0,0 @@
diff -rN -u old-lentil/src/Lentil/File.hs new-lentil/src/Lentil/File.hs
--- old-lentil/src/Lentil/File.hs 2015-07-20 22:43:23.177620724 +0200
+++ new-lentil/src/Lentil/File.hs 2015-07-20 22:43:23.177620724 +0200
@@ -13,10 +13,13 @@
import Lentil.Types
import Lentil.Parse.Run
+import System.Directory
import System.FilePath
import System.FilePath.Find
+import Data.Either
import Data.Monoid
import Control.Applicative
+import Control.Exception.Base
import qualified Data.List as L
@@ -36,7 +39,12 @@
--------------
findIssues :: [FilePath] -> [FilePath] -> IO [Issue]
-findIssues is xs = find always (findClause is xs) "." >>= issueFinder
+findIssues is xs =
+ (mapM (try . canonicalizePath) is :: IO [Either SomeException FilePath]) >>=
+ return . rights >>=
+ mapM (\i -> find always (findClause [i] xs) i) >>=
+ return . concat >>=
+ issueFinder
-- fp to include, fp to exclude, clause
findClause :: [FilePath] -> [FilePath] -> FindClause Bool
@@ -47,6 +55,6 @@
(not <$> fmap getAny xc)
where
fp2fc :: FilePath -> FindClause Any
- fp2fc f = Any . L.isPrefixOf (combine "." f) <$> filePath
+ fp2fc f = Any . L.isPrefixOf f <$> filePath
-- TODO: combine funziona su windows? [feature:intermediate]

View File

@ -4,13 +4,11 @@
overrides = self: super: { overrides = self: super: {
lentil = super.lentil.override { lentil = super.lentil.override {
mkDerivation = (attrs: self.mkDerivation (attrs // { mkDerivation = (attrs: self.mkDerivation (attrs // {
version = "0.1.2.7"; version = "0.1.3.0";
sha256 = "1g3if2y41li6wyg7ffvpybqvbywiq8bf5b5fb6pz499hinzahb9d"; sha256 = "0xa59avh0bvfg69xh9p5b8dppfhx29mvfq8v41sk9j7qbcnzjivg";
patches = [ patches = [
./1.patch
./syntaxes.patch ./syntaxes.patch
]; ];
doCheck = false;
})); }));
}; };
}; };