Merge branch 'tv' into master

10 files changed, 0 insertions, 240 deletions

diff --git a/Zpkgs/tv/charybdis/default.nix b/Zpkgs/tv/charybdis/default.nix
deleted file mode 100644
index f3e6be40e..000000000
--- a/Zpkgs/tv/charybdis/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, bison, flex, openssl }:
-
-stdenv.mkDerivation rec {
-  name = "charybdis-3.5.0-rc1";
-
-  src = fetchgit {
-    url = "https://github.com/atheme/charybdis.git";
-    rev = "61815bf9324e872f51255e09fe37a8c595f94a60";
-    sha256 = "0zsd6xk2cnspc1cvryy2296p3ix4hwjd9k24wmgbh5wzks0wahwy";
-  };
-
-  patches = [
-    ./remove-setenv.patch
-  ];
-
-  configureFlags = [
-    "--enable-epoll"
-    "--enable-ipv6"
-    "--enable-openssl=${openssl}"
-    "--enable-small-net"
-    "--with-program-prefix=charybdis-"
-    "--sysconfdir=/tmp"
-  ];
-
-  buildInputs = [ bison flex openssl ];
-
-  meta = {
-    description = "An extremely scalable ircd with some cooperation with the ratbox and ircu guys";
-    homepage    = https://github.com/atheme/charybdis;
-    license     = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.lassulus ];
-    platforms   = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/Zpkgs/tv/charybdis/remove-setenv.patch b/Zpkgs/tv/charybdis/remove-setenv.patch
deleted file mode 100644
index c53c1ff29..000000000
--- a/Zpkgs/tv/charybdis/remove-setenv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/bandbi.c b/src/bandbi.c
-index 03dd907..3698e85 100644
---- a/src/bandbi.c
-+++ b/src/bandbi.c
-@@ -82,7 +82,6 @@ start_bandb(void)
- 	const char *suffix = "";
- #endif
- 
--	rb_setenv("BANDB_DBPATH", PKGLOCALSTATEDIR "/ban.db", 1);
- 	if(bandb_path == NULL)
- 	{
- 		rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix);
diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix
deleted file mode 100644
index 50625f868..000000000
--- a/Zpkgs/tv/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-
-let
-  inherit (pkgs) callPackage;
-  krebs = import ../../Zpkgs/krebs { inherit pkgs; };
-in
-
-krebs // {
-  charybdis = callPackage ./charybdis {};
-  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
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
diff --git a/Zpkgs/tv/much.nix b/Zpkgs/tv/much.nix
deleted file mode 100644
index 82586b422..000000000
--- a/Zpkgs/tv/much.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ pkgs, ... }:
-
-let
-   hspkgs = pkgs.haskellngPackages.override {
-     overrides = self: super: {
-       email-header = self.callPackage (
-{ mkDerivation, attoparsec, base, base64-bytestring, bytestring
-, case-insensitive, containers, exceptions, fetchgit, QuickCheck
-, stdenv, tasty, tasty-quickcheck, text, text-icu, time
-}:
-mkDerivation {
-  pname = "email-header";
-  version = "0.3.0";
-  src = fetchgit {
-    url = "https://github.com/4z3/email-header";
-    sha256 = "f33fba567a39b1f2448869b269c26c40d8007599c23ab83bde5b4dfd9fd76ebc";
-    rev = "7b179bd31192ead8afe7a0b6e34bcad4039deaa8";
-  };
-  buildDepends = [
-    attoparsec base base64-bytestring bytestring case-insensitive
-    containers exceptions text text-icu time
-  ];
-  testDepends = [
-    base bytestring case-insensitive containers QuickCheck tasty
-    tasty-quickcheck text time
-  ];
-  jailbreak = true;
-  homepage = "http://github.com/knrafto/email-header";
-  description = "Parsing and rendering of email and MIME headers";
-  license = stdenv.lib.licenses.bsd3;
-}
-) {};
-    };
-  };
-in
-
-hspkgs.callPackage (
-{ mkDerivation, aeson, attoparsec, base, base64-bytestring
-, blaze-builder, bytestring, case-insensitive, containers, deepseq
-, directory, docopt, email-header, fetchgit, filepath
-, friendly-time, hyphenation, linebreak, old-locale, process
-, random, rosezipper, safe, split, stdenv, terminal-size, text
-, time, transformers, transformers-compat, unix, vector
-}:
-mkDerivation {
-  pname = "much";
-  version = "0.0.0.0";
-  src = fetchgit {
-    url = "http://cgit.nomic/much";
-    sha256 = "f0bcc34456cb876d3439694d1e16db414a540e13f476fa3ff1ad70d1d3caccb2";
-    rev = "bfd854e05207a073eaa983c49f27c37555ccfce5";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec base base64-bytestring blaze-builder bytestring
-    case-insensitive containers deepseq directory docopt email-header
-    filepath friendly-time hyphenation linebreak old-locale process
-    random rosezipper safe split terminal-size text time transformers
-    transformers-compat unix vector
-  ];
-  license = stdenv.lib.licenses.mit;
-}
-) {}
diff --git a/Zpkgs/tv/viljetic-pages/default.nix b/Zpkgs/tv/viljetic-pages/default.nix
deleted file mode 100644
index 1ae55cca7..000000000
--- a/Zpkgs/tv/viljetic-pages/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs, stdenv, ... }:
-
-stdenv.mkDerivation {
-  name = "viljetic-pages-0";
-  phases = [
-    "installPhase"
-  ];
-  buildInputs = with pkgs; [
-    imagemagick
-  ];
-  installPhase = ''
-    mkdir -p $out
-    cp ${./index.html} $out/index.html
-    convert ${./logo.xpm} $out/favicon2.png
-  '';
-}
diff --git a/Zpkgs/tv/viljetic-pages/index.html b/Zpkgs/tv/viljetic-pages/index.html
deleted file mode 100644
index c06b3f97b..000000000
--- a/Zpkgs/tv/viljetic-pages/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML>
-<title>blank page</title>
-<link rel="shortcut icon" href="favicon2.png" type="image/png">
-<i>This page intentionally left blank.</i>
-<!--
-  Ok, it's not blank, here are the cookies (bots welcome):
-  mailto:tomislav@viljetic.de
-  https://github.com/4z3
-  irc://freenode.net/#krebs
--->
diff --git a/Zpkgs/tv/viljetic-pages/logo.xpm b/Zpkgs/tv/viljetic-pages/logo.xpm
deleted file mode 100644
index bb263dad9..000000000
--- a/Zpkgs/tv/viljetic-pages/logo.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *meh[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 2 1 ",
-"  c black",
-". c None",
-/* pixels */
-"................",
-".    ......    .",
-". .. ...... .. .",
-". .. ...... .. .",
-".    ......    .",
-"................",
-".    .    .    .",
-". .. . .. .    .",
-". .. . .. .    .",
-".    .    .    .",
-"................",
-"......    .    .",
-"......    .    .",
-"......    .    .",
-"......    .    .",
-"................"
-};