From ce4bd7bbc6d6abf9c7f536b68663c37e75bc963c Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Tue, 12 Jan 2016 23:11:10 +0100 Subject: [PATCH 1/6] znc-push: 1.0.0 -> git-2015-12-07 --- pkgs/applications/networking/znc/modules.nix | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 9836d1fbb3b3..abaabd4f409a 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchurl, fetchgit, znc }: +{ stdenv, fetchurl, fetchgit, znc }: let - zncDerivation = a@{ name, src, module_name, buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp", @@ -16,25 +15,6 @@ let in rec { - push = zncDerivation rec { - name = "znc-push-${version}"; - version = "1.0.0"; - module_name = "push"; - - src = fetchurl { - url = "https://github.com/jreese/znc-push/archive/v${version}.tar.gz"; - sha256 = "1v9a16b1d8mfzhddf4drh6rbxa0szr842g7614r8ninmc0gi7a2v"; - }; - - meta = { - description = "Push notification service module for ZNC"; - homepage = https://github.com/jreese/znc-push; - repositories.git = https://github.com/jreese/znc-push.git; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.offline ]; - }; - }; - fish = zncDerivation rec { name = "znc-fish-8e1f150fda"; module_name = "fish"; @@ -70,4 +50,24 @@ in rec { }; }; + push = zncDerivation rec { + name = "znc-push-${version}"; + version = "git-2015-12-07"; + module_name = "push"; + + src = fetchgit { + url = "https://github.com/jreese/znc-push.git"; + rev = "717a2b1741eee75456b0862ef76dbb5af906e936"; + sha256 = "1lr5bhcy8156f7sbah7kjgz4g4mhkkwgvwjd2rxpbwnpq3ssza9k"; + }; + + meta = { + description = "Push notification service module for ZNC"; + homepage = https://github.com/jreese/znc-push; + repositories.git = https://github.com/jreese/znc-push.git; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.offline ]; + }; + }; + } From 41480ae67bc7b645aa4efa7fecf86213c20ba49a Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Tue, 12 Jan 2016 23:12:34 +0100 Subject: [PATCH 2/6] znc-fish: 8e1f150fda -> git-2014-10-10 --- pkgs/applications/networking/znc/modules.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index abaabd4f409a..80631dec1e08 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -16,19 +16,21 @@ let in rec { fish = zncDerivation rec { - name = "znc-fish-8e1f150fda"; + name = "znc-fish-${version}"; + version = "git-2014-10-10"; module_name = "fish"; src = fetchgit { - url = meta.repositories.git; - rev = "8e1f150fdaf18dc33e023795584dec8255e6614e"; - sha256 = "0vpk4336c191irl3g7wibblnbqf3903hjrci4gs0qgg1wvj7fw66"; + url = meta.repositories.git; + rev = "9c580e018a1a08374e814fc06f551281cff827de"; + sha256 = "0yvs0jkwwp18qxqvw1dvir91ggczz56ka00k0zlsb81csdi8xfvl"; }; meta = { description = "ZNC FiSH module"; homepage = https://github.com/dctrwatson/znc-fish; - repositories.git = https://github.com/dctrwatson/znc-fish.git; + # this fork works with ZNC 1.6 + repositories.git = https://github.com/jarrydpage/znc-fish.git; maintainers = [ stdenv.lib.maintainers.offline ]; }; }; From 0765936b63adeba7deeafe68859eb9128a51e58d Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Tue, 12 Jan 2016 23:13:43 +0100 Subject: [PATCH 3/6] znc-privmsg: c9f98690be -> git-2015-02-22 --- pkgs/applications/networking/znc/modules.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 80631dec1e08..c36d867949e4 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -36,13 +36,14 @@ in rec { }; privmsg = zncDerivation rec { - name = "znc-privmsg-c9f98690be"; + name = "znc-privmsg-${version}"; + version = "git-2015-02-22"; module_name = "privmsg"; src = fetchgit { - url = meta.repositories.git; - rev = "c9f98690beb4e3a7681468d5421ff11dc8e1ee8b"; - sha256 = "dfeb28878b12b98141ab204191288cb4c3f7df153a01391ebf6ed6a32007247f"; + url = meta.repositories.git; + rev = "9f1f98db56cbbea96d83e6628f657e0d62cd9517"; + sha256 = "0n82z87gdxxragcaixjc80z8bw4bmfwbk0jrf9zs8kk42phlkkc2"; }; meta = { From bc63d669f597bed29842d5cf2725fd0a5e1c1f64 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Tue, 12 Jan 2016 23:14:23 +0100 Subject: [PATCH 4/6] znc-clientbuffer: init at git-2015-08-27 --- pkgs/applications/networking/znc/modules.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index c36d867949e4..f82d758cb9b9 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -15,6 +15,26 @@ let in rec { + clientbuffer = zncDerivation rec { + name = "znc-clientbuffer-${version}"; + version = "git-2015-08-27"; + module_name = "clientbuffer"; + + src = fetchgit { + url = meta.repositories.git; + rev = "fe0f368e1fcab2b89d5c94209822d9b616cea840"; + sha256 = "1knbkj1dm45s741qndsfclmk3pyxnihgwq2i1n75ip3wv8i1bf4b"; + }; + + meta = with stdenv.lib; { + description = "ZNC module for client specific buffers"; + homepage = https://github.com/jpnurmi/znc-clientbuffer; + repositories.git = https://github.com/jpnurmi/znc-clientbuffer.git; + license = licenses.asl20; + maintainers = with maintainers; [ hrdinka ]; + }; + }; + fish = zncDerivation rec { name = "znc-fish-${version}"; version = "git-2014-10-10"; From 94239516092d3fa8b34d2aa54f1a2b1110e078a7 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Tue, 12 Jan 2016 23:14:56 +0100 Subject: [PATCH 5/6] znc-playback: init at git-2015-08-04 --- pkgs/applications/networking/znc/modules.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index f82d758cb9b9..802c5f5ecb77 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -55,6 +55,26 @@ in rec { }; }; + playback = zncDerivation rec { + name = "znc-playback-${version}"; + version = "git-2015-08-04"; + module_name = "playback"; + + src = fetchgit { + url = meta.repositories.git; + rev = "8691abf75becc1f3d7b5bb5ad68dad17cd21863b"; + sha256 = "0pd89p00yfir4lvw0107lc3qxzx8bgbm5lqq0lpwb6cahv3ipdra"; + }; + + meta = with stdenv.lib; { + description = "An advanced playback module for ZNC"; + homepage = https://github.com/jpnurmi/znc-playback; + repositories.git = https://github.com/jpnurmi/znc-playback.git; + license = licenses.asl20; + maintainers = with maintainers; [ hrdinka ]; + }; + }; + privmsg = zncDerivation rec { name = "znc-privmsg-${version}"; version = "git-2015-02-22"; From c737ee5abaefefe388edaa005af295df9c418c17 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Wed, 13 Jan 2016 12:46:12 +0100 Subject: [PATCH 6/6] znc: delete 1.4 --- pkgs/applications/networking/znc/1.4.nix | 35 ------------------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 37 deletions(-) delete mode 100644 pkgs/applications/networking/znc/1.4.nix diff --git a/pkgs/applications/networking/znc/1.4.nix b/pkgs/applications/networking/znc/1.4.nix deleted file mode 100644 index fdd02aac0b5e..000000000000 --- a/pkgs/applications/networking/znc/1.4.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, openssl, pkgconfig -, withPerl ? false, perl -, withPython ? false, python3 -, withTcl ? false, tcl -, withCyrus ? true, cyrus_sasl -}: - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "znc-1.4"; - - src = fetchurl { - url = "http://znc.in/releases/${name}.tar.gz"; - sha256 = "0lkv58pq4d5lzcyx8v8anzinx0sx0zw0js4jij13jb8qxp88zsc6"; - }; - - buildInputs = [ openssl pkgconfig ] - ++ optional withPerl perl - ++ optional withPython python3 - ++ optional withTcl tcl - ++ optional withCyrus cyrus_sasl; - - configureFlags = optionalString withPerl "--enable-perl " - + optionalString withPython "--enable-python " - + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib " - + optionalString withCyrus "--enable-cyrus "; - - meta = with stdenv.lib; { - description = "Advanced IRC bouncer"; - homepage = http://wiki.znc.in/ZNC; - maintainers = with maintainers; [ viric ]; - license = licenses.asl20; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16a90aab7c7b..f0e5b734f368 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15914,8 +15914,6 @@ let znc = callPackage ../applications/networking/znc { }; - znc_14 = callPackage ../applications/networking/znc/1.4.nix { }; - zncModules = recurseIntoAttrs ( callPackage ../applications/networking/znc/modules.nix { } );