diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/applications/networking/znc | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/applications/networking/znc')
-rw-r--r-- | pkgs/applications/networking/znc/default.nix | 24 | ||||
-rw-r--r-- | pkgs/applications/networking/znc/modules.nix | 42 |
2 files changed, 34 insertions, 32 deletions
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 13803556a47..e5aec911706 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, pkgconfig +{ lib, stdenv, fetchurl, openssl, pkg-config , withPerl ? false, perl , withPython ? false, python3 , withTcl ? false, tcl @@ -9,18 +9,18 @@ , withDebug ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "znc"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz"; - sha256 = "0hb1v167aa6gv5bcwz352l6b8gnd74ymjw92y4x882l099hzg59i"; + sha256 = "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ optional withPerl perl @@ -31,15 +31,17 @@ stdenv.mkDerivation rec { ++ optional withZlib zlib; configureFlags = [ - (stdenv.lib.enableFeature withPerl "perl") - (stdenv.lib.enableFeature withPython "python") - (stdenv.lib.enableFeature withTcl "tcl") - (stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib") - (stdenv.lib.enableFeature withCyrus "cyrus") + (lib.enableFeature withPerl "perl") + (lib.enableFeature withPython "python") + (lib.enableFeature withTcl "tcl") + (lib.withFeatureAs withTcl "tcl" "${tcl}/lib") + (lib.enableFeature withCyrus "cyrus") ] ++ optional (!withIPv6) [ "--disable-ipv6" ] ++ optional withDebug [ "--enable-debug" ]; - meta = with stdenv.lib; { + enableParallelBuilding = true; + + meta = with lib; { description = "Advanced IRC bouncer"; homepage = "https://wiki.znc.in/ZNC"; maintainers = with maintainers; [ schneefux lnl7 ]; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 3fd447b8b09..a72618d935d 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, znc }: +{ lib, stdenv, fetchFromGitHub, znc }: let zncDerivation = a@{ @@ -11,7 +11,7 @@ let buildInputs = znc.buildInputs; - meta = a.meta // { platforms = stdenv.lib.platforms.unix; }; + meta = a.meta // { platforms = lib.platforms.unix; }; passthru.module_name = module_name; }); @@ -29,7 +29,7 @@ in { sha256 = "1k7ifpqqzzf2j7w795q4mx1nvmics2higzjqr3mid3lp43sqg5s6"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Request backlog for IRC channels."; homepage = "https://github.com/fruitiex/znc-backlog/"; license = licenses.asl20; @@ -39,21 +39,21 @@ in { clientbuffer = zncDerivation rec { name = "znc-clientbuffer-${version}"; - version = "git-2015-08-27"; + version = "git-2020-04-24"; module_name = "clientbuffer"; src = fetchFromGitHub { - owner = "jpnurmi"; + owner = "CyberShadow"; repo = "znc-clientbuffer"; - rev = "fe0f368e1fcab2b89d5c94209822d9b616cea840"; - sha256 = "1s8bqqlwy9kmcpmavil558rd2b0wigjlzp2lpqpcqrd1cg25g4a7"; + rev = "2e32d508aa975c0a307d09575a0198f8c56c11fa"; + sha256 = "1jaspnrbv3pzsnbysqygc8s8g3q07zx5nlrdpgwv9j8aryg0pcnh"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "ZNC module for client specific buffers"; - homepage = "https://github.com/jpnurmi/znc-clientbuffer"; + homepage = "https://github.com/CyberShadow/znc-clientbuffer"; license = licenses.asl20; - maintainers = with maintainers; [ hrdinka ]; + maintainers = with maintainers; [ hrdinka szlend ]; }; }; @@ -69,7 +69,7 @@ in { sha256 = "0ikd3dzjjlr0gs0ikqfk50msm6mij99ln2rjzqavh58iwzr7n5r8"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "ZNC clientaway module"; homepage = "https://github.com/kylef/znc-contrib"; license = licenses.gpl2; @@ -93,7 +93,7 @@ in { meta = { description = "ZNC FiSH module"; homepage = "https://github.com/dctrwatson/znc-fish"; - maintainers = [ stdenv.lib.maintainers.offline ]; + maintainers = [ lib.maintainers.offline ]; }; }; @@ -109,7 +109,7 @@ in { sha256 = "0ikd3dzjjlr0gs0ikqfk50msm6mij99ln2rjzqavh58iwzr7n5r8"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "ZNC ignore module"; homepage = "https://github.com/kylef/znc-contrib"; license = licenses.gpl2; @@ -119,21 +119,21 @@ in { palaver = zncDerivation rec { name = "znc-palaver-${version}"; - version = "2018-09-18"; + version = "2020-07-18"; module_name = "palaver"; src = fetchFromGitHub { owner = "cocodelabs"; repo = "znc-palaver"; - rev = "c70e8112686f917d39197d582db36c3ea37a4cb6"; - sha256 = "1gjr8yqgpkpcc18rf0zfgil3rcd1ihqk0q9f8rwbfvs5381h3c58"; + rev = "825cb6814d64006ca0f85fec23fa0a8a3a2d14ca"; + sha256 = "zXWPIxhO5Z2L6f+Hf3vIpEh6V4kjUONWAaKexKLECc8="; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Palaver ZNC module"; homepage = "https://github.com/cocodelabs/znc-palaver"; license = licenses.mit; - maintainers = with maintainers; [ kiwi ]; + maintainers = with maintainers; [ kiwi szlend ]; }; }; @@ -149,7 +149,7 @@ in { sha256 = "0mgfajljy035051b2sx70i8xrb51zw9q2z64kf85zw1lynihzyh4"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An advanced playback module for ZNC"; homepage = "https://github.com/jpnurmi/znc-playback"; license = licenses.asl20; @@ -190,8 +190,8 @@ in { meta = { description = "Push notification service module for ZNC"; homepage = "https://github.com/jreese/znc-push"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ offline schneefux ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ offline schneefux ]; }; }; |