summaryrefslogtreecommitdiffstats
path: root/Zpkgs/tv/lentil
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-07-27 02:02:34 +0200
committertv <tv@shackspace.de>2015-07-27 02:02:34 +0200
commitafb6afff1d0f81d8a0dcfd94fa8e46a849bb094f (patch)
treeebdbaf99b0e2fcde8be0bd43455955e5cd17b3be /Zpkgs/tv/lentil
parent45b173c11ecc7d6e8a177d7121bd06d923691b4b (diff)
* tv -> tv *
Diffstat (limited to 'Zpkgs/tv/lentil')
-rw-r--r--Zpkgs/tv/lentil/1.patch39
-rw-r--r--Zpkgs/tv/lentil/default.nix17
-rw-r--r--Zpkgs/tv/lentil/syntaxes.patch11
3 files changed, 0 insertions, 67 deletions
diff --git a/Zpkgs/tv/lentil/1.patch b/Zpkgs/tv/lentil/1.patch
deleted file mode 100644
index 6e5a00c73..000000000
--- a/Zpkgs/tv/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/Zpkgs/tv/lentil/default.nix b/Zpkgs/tv/lentil/default.nix
deleted file mode 100644
index 1385cbd4d..000000000
--- a/Zpkgs/tv/lentil/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ 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
- ./syntaxes.patch
- ];
- doCheck = false;
- }));
- };
- };
-}).lentil
diff --git a/Zpkgs/tv/lentil/syntaxes.patch b/Zpkgs/tv/lentil/syntaxes.patch
deleted file mode 100644
index a9390ae51..000000000
--- a/Zpkgs/tv/lentil/syntaxes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rN -u old-lentil/src/Lentil/Parse/Syntaxes.hs new-lentil/src/Lentil/Parse/Syntaxes.hs
---- old-lentil/src/Lentil/Parse/Syntaxes.hs 2015-07-20 23:15:38.600539779 +0200
-+++ new-lentil/src/Lentil/Parse/Syntaxes.hs 2015-07-20 23:15:38.600539779 +0200
-@@ -30,6 +30,7 @@
- | ext `elem` [".pas", ".pp", ".inc"] = Just pascal
- | ext `elem` [".py"] = Just python
- | ext `elem` [".rb"] = Just ruby
-+ | ext `elem` [".nix"] = Just perl -- Nix
- | ext `elem` [".pl", ".pm", ".t"] = Just perl
- | ext `elem` [".sh"] = Just perl -- shell
- | ext `elem` [".txt"] = Just text