aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/networking/znc
diff options
context:
space:
mode:
authorKatharina Fey <kookie@spacekookie.de>2019-10-18 16:32:00 +0000
committerKatharina Fey <kookie@spacekookie.de>2019-10-18 16:32:00 +0000
commit0f74f62ee25ac2d21bd67c29b8efc3ad079a72a8 (patch)
treebd701e982d896952f4291e4b795c85bb581593b8 /nixpkgs/pkgs/applications/networking/znc
parentdae1ae41b3a575e87d411e0cd9daa42a85c5aa89 (diff)
parent1c40ee6fc44f7eb474c69ea070a43247a1a2c83c (diff)
Merge commit '1c40ee6fc44f7eb474c69ea070a43247a1a2c83c'
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/znc')
-rw-r--r--nixpkgs/pkgs/applications/networking/znc/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/networking/znc/modules.nix10
2 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/applications/networking/znc/default.nix b/nixpkgs/pkgs/applications/networking/znc/default.nix
index 238864311ef..bf36a6f2bbb 100644
--- a/nixpkgs/pkgs/applications/networking/znc/default.nix
+++ b/nixpkgs/pkgs/applications/networking/znc/default.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "znc";
- version = "1.7.4";
+ version = "1.7.5";
src = fetchurl {
url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz";
- sha256 = "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi";
+ sha256 = "08a7yb2xs85hyyz8dpzfbsfjwj2r6kcii022lj3l4rf8hl9ix558";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/nixpkgs/pkgs/applications/networking/znc/modules.nix b/nixpkgs/pkgs/applications/networking/znc/modules.nix
index 54e148f0833..5e7bdd09b03 100644
--- a/nixpkgs/pkgs/applications/networking/znc/modules.nix
+++ b/nixpkgs/pkgs/applications/networking/znc/modules.nix
@@ -79,15 +79,15 @@ in {
fish = zncDerivation rec {
name = "znc-fish-${version}";
- version = "git-2014-10-10";
+ version = "git-2017-06-26";
module_name = "fish";
src = fetchFromGitHub {
- # this fork works with ZNC 1.6
- owner = "jarrydpage";
+ # this fork works with ZNC 1.7
+ owner = "oilslump";
repo = "znc-fish";
- rev = "9c580e018a1a08374e814fc06f551281cff827de";
- sha256 = "0yvs0jkwwp18qxqvw1dvir91ggczz56ka00k0zlsb81csdi8xfvl";
+ rev = "7d91467dbb195f7b591567911210523c6087662e";
+ sha256 = "1ky5xg17k5f393whrv5iv8zsmdvdyk2f7z5qdsmxcwy3pdxy6vsm";
};
meta = {