From 7d027d09e3c8e7935fac85104fd02a538fa922c9 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 11 Nov 2016 09:03:51 +0100 Subject: [PATCH 1/6] cd,nomic: use default rxvt_unicode.terminfo --- tv/1systems/cd.nix | 1 - tv/1systems/nomic.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index dd8e2cc64..108006f34 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -30,7 +30,6 @@ with import ; iotop iptables nethogs - rxvt_unicode.terminfo tcpdump ]; } diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 793e1f80b..6669b5dcf 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -60,7 +60,6 @@ with import ; esac '') gnupg - rxvt_unicode.terminfo tmux ]; } From da9b4660932e8400f36ac81e023fc1d797374f32 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 11 Nov 2016 09:17:17 +0100 Subject: [PATCH 2/6] charybdis: RIP --- krebs/5pkgs/charybdis/default.nix | 34 ----------------------- krebs/5pkgs/charybdis/remove-setenv.patch | 12 -------- 2 files changed, 46 deletions(-) delete mode 100644 krebs/5pkgs/charybdis/default.nix delete mode 100644 krebs/5pkgs/charybdis/remove-setenv.patch diff --git a/krebs/5pkgs/charybdis/default.nix b/krebs/5pkgs/charybdis/default.nix deleted file mode 100644 index 6968be264..000000000 --- a/krebs/5pkgs/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 = "1q9h7j2pm1wsbcybmm7r7hzimp1zda04lw9x2akb26l9p12zgfgc"; - }; - - 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/krebs/5pkgs/charybdis/remove-setenv.patch b/krebs/5pkgs/charybdis/remove-setenv.patch deleted file mode 100644 index bbaf95e19..000000000 --- a/krebs/5pkgs/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); From bc1d6f9c597f0b61062b8e6f9bf9c07e20cfb7ee Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 11 Nov 2016 11:37:45 +0100 Subject: [PATCH 3/6] dic: reinit at 1.0.0 --- krebs/5pkgs/dic/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/krebs/5pkgs/dic/default.nix b/krebs/5pkgs/dic/default.nix index 12cbedc60..ea70f34d7 100644 --- a/krebs/5pkgs/dic/default.nix +++ b/krebs/5pkgs/dic/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation { name = "dic"; src = fetchgit { - url = https://github.com/krebscode/painload; - rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3"; - sha256 = "0arsfcd8qdrqafw7cxiag7f0kn95nwxxwrs0kdzxxdryfr6l1h07"; + url = http://cgit.ni.krebsco.de/dic; + rev = "refs/tags/v1.0.0"; + sha256 = "0f3f5dqpw5y79p2k68qw6jdlkrnapqs3nvnc41zwacyhgppiww0k"; }; phases = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation { sed \ 's,^main() {$,&\n PATH=${path}; export PATH,' \ - < ./util/bin/dic \ + < ./dic \ > $out/bin/dic chmod +x $out/bin/dic From e753862bf64c0594e9fbedbb98125abaca5f9688 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 12 Nov 2016 12:41:59 +0100 Subject: [PATCH 4/6] tv nixpkgs: 1e1112e -> 301fc57 --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index dbf311479..7ebfd962f 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import ; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "1e1112edc57e93046f35707b874d2a4f3ff321e6"; + ref = "301fc5752beae35eb9b33a583c8f71fef7e773bc"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; From 31dcab94b0cf8c82f43702f1bb293a49cab2ebe2 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 12 Nov 2016 14:37:07 +0100 Subject: [PATCH 5/6] exim-smarthost: add anmeldung@eloop.org --- krebs/3modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 82ede952d..7f5d2c7bd 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -164,6 +164,7 @@ let ciko.mail = "wieczorek.stefan@gmail.com"; Mic92.mail = "joerg@higgsboson.tk"; in { + "anmeldung@eloop.org" = eloop-ml; "cfp@eloop.org" = eloop-ml; "kontakt@eloop.org" = eloop-ml; "root@eloop.org" = eloop-ml; From be75ad7e7c0771170ccaddfe99b7a64a9004bfcd Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 15 Nov 2016 10:52:10 +0100 Subject: [PATCH 6/6] tv nixpkgs: 301fc57 -> 5ddaca1 --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 7ebfd962f..87727a865 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import ; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "301fc5752beae35eb9b33a583c8f71fef7e773bc"; + ref = "5ddaca179c15154efae4e5b7efea843d2c67cff8"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master";