diff options
| -rw-r--r-- | Zpkgs/tv/default.nix | 1 | ||||
| -rw-r--r-- | Zpkgs/tv/lentil/1.patch | 39 | ||||
| -rw-r--r-- | Zpkgs/tv/lentil/default.nix | 16 |
3 files changed, 56 insertions, 0 deletions
diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix index b700acb84..fa9fff84c 100644 --- a/Zpkgs/tv/default.nix +++ b/Zpkgs/tv/default.nix @@ -11,6 +11,7 @@ pkgs // genid = callPackage ./genid.nix {}; github-hosts-sync = callPackage ./github-hosts-sync.nix {}; github-known_hosts = callPackage ./github-known_hosts.nix {}; + lentil = callPackage ./lentil {}; much = callPackage ./much.nix {}; viljetic-pages = callPackage ./viljetic-pages {}; } diff --git a/Zpkgs/tv/lentil/1.patch b/Zpkgs/tv/lentil/1.patch new file mode 100644 index 000000000..6e5a00c73 --- /dev/null +++ b/Zpkgs/tv/lentil/1.patch @@ -0,0 +1,39 @@ +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/Zpkgs/tv/lentil/default.nix b/Zpkgs/tv/lentil/default.nix new file mode 100644 index 000000000..da3ca2be2 --- /dev/null +++ b/Zpkgs/tv/lentil/default.nix @@ -0,0 +1,16 @@ +{ pkgs, ... }: + +(pkgs.haskellngPackages.override { + overrides = self: super: { + lentil = super.lentil.override { + mkDerivation = (attrs: self.mkDerivation (attrs // { + version = "0.1.2.7"; + sha256 = "1g3if2y41li6wyg7ffvpybqvbywiq8bf5b5fb6pz499hinzahb9d"; + patches = [ + ./1.patch + ]; + doCheck = false; + })); + }; + }; +}).lentil |