diff options
author | Robin Gloster <mail@glob.in> | 2016-04-18 13:00:40 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-04-18 13:49:22 +0000 |
commit | d020caa5b2eca90ea051403fbb4c52b99ee071b9 (patch) | |
tree | ba44ef1e784bca89e0df6b249956fd035b1d86e3 /pkgs/servers/irc | |
parent | 3e68106afd95df012ddb548575f0133681687a90 (diff) | |
parent | 0729f606973870c03d21bb2f21b70d91216943ca (diff) |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/servers/irc')
-rw-r--r-- | pkgs/servers/irc/charybdis/default.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index d00bcb7ef1a2..6ecad81973ba 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, bison, flex, openssl }: +{ stdenv, fetchFromGitHub, bison, flex, openssl }: stdenv.mkDerivation rec { - name = "charybdis-3.5.0-rc1"; + name = "charybdis-3.5.1"; - src = fetchgit { - url = "https://github.com/atheme/charybdis.git"; - rev = "43a9b61c427cd0f3fa2c192890b8a48d9ea6fb7f"; - sha256 = "ae2c8a72e6a29c901f9b51759b542ee12c4ec918050a2d9d65e5635077a0fcef"; + src = fetchFromGitHub { + owner = "charybdis-ircd"; + repo = "charybdis"; + rev = name; + sha256 = "12lwfcgszama7140l1qhmhf1v05csipswrvqzmg8pkaazbag4ka7"; }; patches = [ @@ -24,13 +25,12 @@ stdenv.mkDerivation rec { 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; + meta = with stdenv.lib; { + description = "IRCv3 server designed to be highly scalable"; + homepage = http://www.charybdis.io/; + license = licenses.gpl2; + maintainers = with maintainers; [ lassulus fpletz ]; + platforms = platforms.unix; }; - } |