From afb6afff1d0f81d8a0dcfd94fa8e46a849bb094f Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 27 Jul 2015 02:02:34 +0200 Subject: * tv -> tv * --- tv/pkgs/charybdis/default.nix | 34 +++++++++++++++++++ tv/pkgs/charybdis/remove-setenv.patch | 12 +++++++ tv/pkgs/default.nix | 13 +++++++ tv/pkgs/lentil/1.patch | 39 +++++++++++++++++++++ tv/pkgs/lentil/default.nix | 17 ++++++++++ tv/pkgs/lentil/syntaxes.patch | 11 ++++++ tv/pkgs/much.nix | 64 +++++++++++++++++++++++++++++++++++ tv/pkgs/viljetic-pages/default.nix | 16 +++++++++ tv/pkgs/viljetic-pages/index.html | 10 ++++++ tv/pkgs/viljetic-pages/logo.xpm | 24 +++++++++++++ 10 files changed, 240 insertions(+) create mode 100644 tv/pkgs/charybdis/default.nix create mode 100644 tv/pkgs/charybdis/remove-setenv.patch create mode 100644 tv/pkgs/default.nix create mode 100644 tv/pkgs/lentil/1.patch create mode 100644 tv/pkgs/lentil/default.nix create mode 100644 tv/pkgs/lentil/syntaxes.patch create mode 100644 tv/pkgs/much.nix create mode 100644 tv/pkgs/viljetic-pages/default.nix create mode 100644 tv/pkgs/viljetic-pages/index.html create mode 100644 tv/pkgs/viljetic-pages/logo.xpm (limited to 'tv/pkgs') diff --git a/tv/pkgs/charybdis/default.nix b/tv/pkgs/charybdis/default.nix new file mode 100644 index 000000000..f3e6be40e --- /dev/null +++ b/tv/pkgs/charybdis/default.nix @@ -0,0 +1,34 @@ +{ 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/tv/pkgs/charybdis/remove-setenv.patch b/tv/pkgs/charybdis/remove-setenv.patch new file mode 100644 index 000000000..bbaf95e19 --- /dev/null +++ b/tv/pkgs/charybdis/remove-setenv.patch @@ -0,0 +1,12 @@ +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/tv/pkgs/default.nix b/tv/pkgs/default.nix new file mode 100644 index 000000000..50625f868 --- /dev/null +++ b/tv/pkgs/default.nix @@ -0,0 +1,13 @@ +{ 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/tv/pkgs/lentil/1.patch b/tv/pkgs/lentil/1.patch new file mode 100644 index 000000000..1ed9818c7 --- /dev/null +++ b/tv/pkgs/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/tv/pkgs/lentil/default.nix b/tv/pkgs/lentil/default.nix new file mode 100644 index 000000000..1385cbd4d --- /dev/null +++ b/tv/pkgs/lentil/default.nix @@ -0,0 +1,17 @@ +{ 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/tv/pkgs/lentil/syntaxes.patch b/tv/pkgs/lentil/syntaxes.patch new file mode 100644 index 000000000..a9390ae51 --- /dev/null +++ b/tv/pkgs/lentil/syntaxes.patch @@ -0,0 +1,11 @@ +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/tv/pkgs/much.nix b/tv/pkgs/much.nix new file mode 100644 index 000000000..82586b422 --- /dev/null +++ b/tv/pkgs/much.nix @@ -0,0 +1,64 @@ +{ 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/tv/pkgs/viljetic-pages/default.nix b/tv/pkgs/viljetic-pages/default.nix new file mode 100644 index 000000000..1ae55cca7 --- /dev/null +++ b/tv/pkgs/viljetic-pages/default.nix @@ -0,0 +1,16 @@ +{ 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/tv/pkgs/viljetic-pages/index.html b/tv/pkgs/viljetic-pages/index.html new file mode 100644 index 000000000..c06b3f97b --- /dev/null +++ b/tv/pkgs/viljetic-pages/index.html @@ -0,0 +1,10 @@ + +blank page + +This page intentionally left blank. + diff --git a/tv/pkgs/viljetic-pages/logo.xpm b/tv/pkgs/viljetic-pages/logo.xpm new file mode 100644 index 000000000..bb263dad9 --- /dev/null +++ b/tv/pkgs/viljetic-pages/logo.xpm @@ -0,0 +1,24 @@ +/* XPM */ +static char *meh[] = { +/* columns rows colors chars-per-pixel */ +"16 16 2 1 ", +" c black", +". c None", +/* pixels */ +"................", +". ...... .", +". .. ...... .. .", +". .. ...... .. .", +". ...... .", +"................", +". . . .", +". .. . .. . .", +". .. . .. . .", +". . . .", +"................", +"...... . .", +"...... . .", +"...... . .", +"...... . .", +"................" +}; -- cgit v1.2.3