summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-07-28 21:48:33 +0200
committerlassulus <lass@aidsballs.de>2015-07-28 21:48:33 +0200
commit12644fe303a6045d6d8ae75916cb601f95596f25 (patch)
tree05c118cffacead8bd127f23cf0144940de299686 /tv
parentac64527c5707cca5fc6e6e6ecf3957129cdb32b2 (diff)
parent5a03593b3a6eb97d2f369424b2631ad122b8de85 (diff)
Merge remote-tracking branch 'nomic/user-toplevel' into newmaster
Diffstat (limited to 'tv')
-rw-r--r--tv/configs/base.nix1
-rw-r--r--tv/pkgs/lentil/1.patch39
-rw-r--r--tv/pkgs/lentil/default.nix6
3 files changed, 2 insertions, 44 deletions
diff --git a/tv/configs/base.nix b/tv/configs/base.nix
index 06f83ea9e..997d4c235 100644
--- a/tv/configs/base.nix
+++ b/tv/configs/base.nix
@@ -10,7 +10,6 @@ in
{
krebs.enable = true;
- krebs.search-domain = "retiolum";
networking.hostName = config.krebs.build.host.name;
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;
}));
};
};