From 8170b281964688b542fb151054c5d86d819008b3 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 28 Jul 2015 20:40:25 +0200
Subject: tv: reintroduce directory numbers

---
 tv/pkgs/charybdis/default.nix         | 34 ----------------------------------
 tv/pkgs/charybdis/remove-setenv.patch | 12 ------------
 2 files changed, 46 deletions(-)
 delete mode 100644 tv/pkgs/charybdis/default.nix
 delete mode 100644 tv/pkgs/charybdis/remove-setenv.patch

(limited to 'tv/pkgs/charybdis')

diff --git a/tv/pkgs/charybdis/default.nix b/tv/pkgs/charybdis/default.nix
deleted file mode 100644
index f3e6be40e..000000000
--- a/tv/pkgs/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/tv/pkgs/charybdis/remove-setenv.patch b/tv/pkgs/charybdis/remove-setenv.patch
deleted file mode 100644
index bbaf95e19..000000000
--- a/tv/pkgs/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);
-- 
cgit v1.2.3