From 5a03593b3a6eb97d2f369424b2631ad122b8de85 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 27 Jul 2015 17:49:02 +0200 Subject: tv pkgs lentil: 0.1.2.7 -> 0.1.3.0 --- tv/pkgs/lentil/1.patch | 39 --------------------------------------- tv/pkgs/lentil/default.nix | 6 ++---- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 tv/pkgs/lentil/1.patch (limited to 'tv/pkgs/lentil') diff --git a/tv/pkgs/lentil/1.patch b/tv/pkgs/lentil/1.patch deleted file mode 100644 index 1ed9818c7..000000000 --- a/tv/pkgs/lentil/1.patch +++ /dev/null @@ -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] - diff --git a/tv/pkgs/lentil/default.nix b/tv/pkgs/lentil/default.nix index 1385cbd4d..fc9b4fd31 100644 --- a/tv/pkgs/lentil/default.nix +++ b/tv/pkgs/lentil/default.nix @@ -4,13 +4,11 @@ overrides = self: super: { lentil = super.lentil.override { mkDerivation = (attrs: self.mkDerivation (attrs // { - version = "0.1.2.7"; - sha256 = "1g3if2y41li6wyg7ffvpybqvbywiq8bf5b5fb6pz499hinzahb9d"; + version = "0.1.3.0"; + sha256 = "0xa59avh0bvfg69xh9p5b8dppfhx29mvfq8v41sk9j7qbcnzjivg"; patches = [ - ./1.patch ./syntaxes.patch ]; - doCheck = false; })); }; }; -- cgit v1.2.3