Merge remote-tracking branch 'tv/master'
This commit is contained in:
commit
09018f17c3
|
@ -164,6 +164,7 @@ let
|
||||||
ciko.mail = "wieczorek.stefan@gmail.com";
|
ciko.mail = "wieczorek.stefan@gmail.com";
|
||||||
Mic92.mail = "joerg@higgsboson.tk";
|
Mic92.mail = "joerg@higgsboson.tk";
|
||||||
in {
|
in {
|
||||||
|
"anmeldung@eloop.org" = eloop-ml;
|
||||||
"cfp@eloop.org" = eloop-ml;
|
"cfp@eloop.org" = eloop-ml;
|
||||||
"kontakt@eloop.org" = eloop-ml;
|
"kontakt@eloop.org" = eloop-ml;
|
||||||
"root@eloop.org" = eloop-ml;
|
"root@eloop.org" = eloop-ml;
|
||||||
|
|
|
@ -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;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -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);
|
|
|
@ -4,9 +4,9 @@ stdenv.mkDerivation {
|
||||||
name = "dic";
|
name = "dic";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = https://github.com/krebscode/painload;
|
url = http://cgit.ni.krebsco.de/dic;
|
||||||
rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3";
|
rev = "refs/tags/v1.0.0";
|
||||||
sha256 = "0arsfcd8qdrqafw7cxiag7f0kn95nwxxwrs0kdzxxdryfr6l1h07";
|
sha256 = "0f3f5dqpw5y79p2k68qw6jdlkrnapqs3nvnc41zwacyhgppiww0k";
|
||||||
};
|
};
|
||||||
|
|
||||||
phases = [
|
phases = [
|
||||||
|
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
sed \
|
sed \
|
||||||
's,^main() {$,&\n PATH=${path}; export PATH,' \
|
's,^main() {$,&\n PATH=${path}; export PATH,' \
|
||||||
< ./util/bin/dic \
|
< ./dic \
|
||||||
> $out/bin/dic
|
> $out/bin/dic
|
||||||
|
|
||||||
chmod +x $out/bin/dic
|
chmod +x $out/bin/dic
|
||||||
|
|
|
@ -30,7 +30,6 @@ with import <stockholm/lib>;
|
||||||
iotop
|
iotop
|
||||||
iptables
|
iptables
|
||||||
nethogs
|
nethogs
|
||||||
rxvt_unicode.terminfo
|
|
||||||
tcpdump
|
tcpdump
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,7 +60,6 @@ with import <stockholm/lib>;
|
||||||
esac
|
esac
|
||||||
'')
|
'')
|
||||||
gnupg
|
gnupg
|
||||||
rxvt_unicode.terminfo
|
|
||||||
tmux
|
tmux
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ with import <stockholm/lib>;
|
||||||
stockholm.file = "/home/tv/stockholm";
|
stockholm.file = "/home/tv/stockholm";
|
||||||
nixpkgs.git = {
|
nixpkgs.git = {
|
||||||
url = https://github.com/NixOS/nixpkgs;
|
url = https://github.com/NixOS/nixpkgs;
|
||||||
ref = "1e1112edc57e93046f35707b874d2a4f3ff321e6";
|
ref = "5ddaca179c15154efae4e5b7efea843d2c67cff8";
|
||||||
};
|
};
|
||||||
} // optionalAttrs host.secure {
|
} // optionalAttrs host.secure {
|
||||||
secrets-master.file = "/home/tv/secrets/master";
|
secrets-master.file = "/home/tv/secrets/master";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user