zncModules: refactor fetchgit -> fetchFromGitHub

1 files changed, 17 insertions, 17 deletions

diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index b70dae9053b5..b1f8e9c838f6 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, znc }:
+{ stdenv, fetchurl, fetchFromGitHub, znc }:
 
 let
   zncDerivation = a@{
@@ -20,8 +20,9 @@ in rec {
     version = "git-2015-08-27";
     module_name = "clientbuffer";
 
-    src = fetchgit {
-      url = meta.repositories.git;
+    src = fetchFromGitHub {
+      owner = "jpnurmi";
+      repo = "znc-clientbuffer";
       rev = "fe0f368e1fcab2b89d5c94209822d9b616cea840";
       sha256 = "1s8bqqlwy9kmcpmavil558rd2b0wigjlzp2lpqpcqrd1cg25g4a7";
     };
@@ -29,7 +30,6 @@ in rec {
     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 ];
     };
@@ -40,8 +40,10 @@ in rec {
     version = "git-2014-10-10";
     module_name = "fish";
 
-    src = fetchgit {
-      url = meta.repositories.git;
+    src = fetchFromGitHub {
+      # this fork works with ZNC 1.6
+      owner = "jarrydpage";
+      repo = "znc-fish";
       rev = "9c580e018a1a08374e814fc06f551281cff827de";
       sha256 = "0yvs0jkwwp18qxqvw1dvir91ggczz56ka00k0zlsb81csdi8xfvl";
     };
@@ -49,8 +51,6 @@ in rec {
     meta = {
       description = "ZNC FiSH module";
       homepage = https://github.com/dctrwatson/znc-fish;
-      # this fork works with ZNC 1.6
-      repositories.git = https://github.com/jarrydpage/znc-fish.git;
       maintainers = [ stdenv.lib.maintainers.offline ];
     };
   };
@@ -60,8 +60,9 @@ in rec {
     version = "git-2015-08-04";
     module_name = "playback";
 
-    src = fetchgit {
-      url = meta.repositories.git;
+    src = fetchFromGitHub {
+      owner = "jpnurmi";
+      repo = "znc-playback";
       rev = "8691abf75becc1f3d7b5bb5ad68dad17cd21863b";
       sha256 = "0mgfajljy035051b2sx70i8xrb51zw9q2z64kf85zw1lynihzyh4";
     };
@@ -69,7 +70,6 @@ in rec {
     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 ];
     };
@@ -80,8 +80,9 @@ in rec {
     version = "git-2015-02-22";
     module_name = "privmsg";
 
-    src = fetchgit {
-      url = meta.repositories.git;
+    src = fetchFromGitHub {
+      owner = "kylef";
+      repo = "znc-contrib";
       rev = "9f1f98db56cbbea96d83e6628f657e0d62cd9517";
       sha256 = "0n82z87gdxxragcaixjc80z8bw4bmfwbk0jrf9zs8kk42phlkkc2";
     };
@@ -89,7 +90,6 @@ in rec {
     meta = {
       description = "ZNC privmsg module";
       homepage = https://github.com/kylef/znc-contrib;
-      repositories.git = https://github.com/kylef/znc-contrib.git;
     };
   };
 
@@ -98,8 +98,9 @@ in rec {
     version = "git-2016-07-28";
     module_name = "push";
 
-    src = fetchgit {
-      url = "https://github.com/jreese/znc-push.git";
+    src = fetchFromGitHub {
+      owner = "jreese";
+      repo = "znc-push";
       rev = "ca11c9b10062a7399a7f2a1b9653c9cc15854bb8";
       sha256 = "0qk2qzjawy89p7s0cac2sjdbf8wmks592xc5c3i5gj10l0iyri5w";
     };
@@ -107,7 +108,6 @@ in rec {
     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 = with stdenv.lib.maintainers; [ offline schneefux ];
     };