diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix
index fc6f7752a3a4..f0150e931551 100644
--- a/pkgs/tools/X11/bgs/default.nix
+++ b/pkgs/tools/X11/bgs/default.nix
@@ -1,13 +1,15 @@
-{lib, stdenv, fetchurl, pkg-config, libX11, libXinerama, imlib2}:
+{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, libXinerama, imlib2 }:
 
 stdenv.mkDerivation rec {
 
   pname = "bgs";
   version = "0.8";
 
-  src = fetchurl {
-    url = "https://github.com/Gottox/bgs/archive/v${version}.tar.gz";
-    sha256 = "1rw9ingkkpvvr2dixx126ziim67a54r8k49918h1mbph0fjj08n5";
+  src = fetchFromGitHub {
+    owner = "Gottox";
+    repo = "bgs";
+    rev = "v${version}";
+    sha256 = "V8GP+xLSiCvaYZt8Bi3/3KlTBaGnMYQUeNCHwH6Ejzo=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix
index 9250a10064ff..01c84c869aa5 100644
--- a/pkgs/tools/X11/wmutils-core/default.nix
+++ b/pkgs/tools/X11/wmutils-core/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, libxcb, xcbutil, xcb-util-cursor }:
+{ lib, stdenv, fetchFromGitHub, libxcb, xcbutil, xcb-util-cursor }:
 
 stdenv.mkDerivation rec {
   pname = "wmutils-core";
   version = "1.5";
 
-  src = fetchurl {
-    url = "https://github.com/wmutils/core/archive/v${version}.tar.gz";
-    sha256 = "0wk39aq2lrnc0wjs8pv3cigw3lwy2qzaw0v61bwknd5wabm25bvj";
+  src = fetchFromGitHub {
+    owner = "wmutils";
+    repo = "core";
+    rev = "v${version}";
+    sha256 = "XPVH7vXlpmUsvNyGKMxLSZnWLnH/J5nGkXizcVqDwzM=";
   };
 
   buildInputs = [ libxcb xcbutil xcb-util-cursor ];
diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix
index 2f74db17c372..2e5a4eca2910 100644
--- a/pkgs/tools/X11/xinput_calibrator/default.nix
+++ b/pkgs/tools/X11/xinput_calibrator/default.nix
@@ -1,11 +1,14 @@
-{ lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "xinput_calibrator";
   version = "0.7.5";
-  src = fetchurl {
-    url = "https://github.com/tias/${pname}/archive/v${version}.tar.gz";
-    sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9";
+
+  src = fetchFromGitHub {
+    owner = "tias";
+    repo = "xinput_calibrator";
+    rev = "v${version}";
+    sha256 = "5ZkNw+CKNUcPt1PY5PLzB/OT2wcf5n3UcaQlmMcwRVE=";
   };
 
   preConfigure = "./autogen.sh --with-gui=X11";
diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix
index 393043df6758..bf415e7554e6 100644
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, openmp ? null }:
+{ lib, stdenv, fetchFromGitHub, openmp ? null }:
 
 with lib;
 
@@ -6,9 +6,11 @@ stdenv.mkDerivation {
   pname = "b2sum";
   version = "unstable-2018-06-11";
 
-  src = fetchzip {
-    url = "https://github.com/BLAKE2/BLAKE2/archive/320c325437539ae91091ce62efec1913cd8093c2.tar.gz";
-    sha256 = "0agmc515avdpr64bsgv87wby2idm0d3wbndxzkhdfjgzhgv0rb8k";
+  src = fetchFromGitHub {
+    owner = "BLAKE2";
+    repo = "BLAKE2";
+    rev = "320c325437539ae91091ce62efec1913cd8093c2";
+    sha256 = "E60M9oP/Sdfg/L3ZxUcDtUXhFz9oP72IybdtVUJh9Sk=";
   };
 
   sourceRoot = "source/b2sum";
diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix
index b79da1986d73..b3cf2a4356f6 100644
--- a/pkgs/tools/system/daemonize/default.nix
+++ b/pkgs/tools/system/daemonize/default.nix
@@ -1,18 +1,20 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "daemonize";
   version = "1.7.8";
 
-  src = fetchurl {
-    url    = "https://github.com/bmc/daemonize/archive/release-${version}.tar.gz";
-    sha256 = "0q2c3i3si3k7wfhl6fyckkmkc81yp67pz52p3ggis79p4nczri10";
+  src = fetchFromGitHub {
+    owner = "bmc";
+    repo = "daemonize";
+    rev = "release-${version}";
+    sha256 = "1e6LZXf/lK7sB2CbXwOg7LOi0Q8IBQNAa4d7rX0Ej3A=";
   };
 
   meta = with lib; {
     description = "Runs a command as a Unix daemon";
-    homepage    = "http://software.clapper.org/daemonize/";
-    license     = licenses.bsd3;
+    homepage = "http://software.clapper.org/daemonize/";
+    license = licenses.bsd3;
     platforms = with platforms; linux ++ freebsd ++ darwin;
   };
 }
diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/tools/system/symlinks/default.nix
index ad275a2d4479..8d1213c0afef 100644
--- a/pkgs/tools/system/symlinks/default.nix
+++ b/pkgs/tools/system/symlinks/default.nix
@@ -1,12 +1,14 @@
-{ fetchurl, lib, stdenv }:
+{ fetchFromGitHub, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   pname = "symlinks";
   version = "1.4.3";
 
-  src = fetchurl {
-    url = "https://github.com/brandt/symlinks/archive/v${version}.tar.gz";
-    sha256 = "1cihrd3dap52z1msdhhgda7b7wy1l5ysfvyba8yxb3zjk0l5n417";
+  src = fetchFromGitHub {
+    owner = "brandt";
+    repo = "symlinks";
+    rev = "v${version}";
+    sha256 = "EMWd7T/k4v1uvXe2QxhyPoQKUpKIUANE9AOwX461FgU=";
   };
 
   buildFlags = [ "CC=${stdenv.cc}/bin/cc" ];
diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix
index e918d620c678..de8405aed43b 100644
--- a/pkgs/tools/text/cconv/default.nix
+++ b/pkgs/tools/text/cconv/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, autoreconfHook, libiconv }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "cconv";
   version = "0.6.3";
 
-  src = fetchurl {
-    url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz";
-    sha256 = "82f46a94829f5a8157d6f686e302ff5710108931973e133d6e19593061b81d84";
+  src = fetchFromGitHub {
+    owner = "xiaoyjy";
+    repo = "cconv";
+    rev = "v${version}";
+    sha256 = "RAFl/+I+usUfeG/l17F3ltThK7G4+TekyQGwzQIgeH8=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix
index 251427f03c5b..8396e39e6d1c 100644
--- a/pkgs/tools/text/qshowdiff/default.nix
+++ b/pkgs/tools/text/qshowdiff/default.nix
@@ -1,12 +1,14 @@
-{lib, stdenv, fetchurl, qt4, perl, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, qt4, perl, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "qshowdiff";
   version = "1.2";
 
-  src = fetchurl {
-    url = "https://github.com/danfis/qshowdiff/archive/v${version}.tar.gz";
-    sha256 = "027959xbzvi5c2w9y1x122sr5i26k9mvp43banz2wln6gd860n1a";
+  src = fetchFromGitHub {
+    owner = "danfis";
+    repo = "qshowdiff";
+    rev = "v${version}";
+    sha256 = "g3AWQ6/LSF59ztzdgNuLi+8d6fFTPiC9z0yXMdPdB5U=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix
index 7b20d230b9f7..85dcece956fb 100644
--- a/pkgs/tools/typesetting/odpdown/default.nix
+++ b/pkgs/tools/typesetting/odpdown/default.nix
@@ -1,13 +1,15 @@
-{ lib, fetchurl, pythonPackages, libreoffice }:
+{ lib, fetchFromGitHub, pythonPackages, libreoffice }:
 
 pythonPackages.buildPythonApplication rec {
 
   pname = "odpdown";
   version = "0.4.1";
 
-  src = fetchurl {
-    url = "https://github.com/thorstenb/odpdown/archive/v${version}.tar.gz";
-    sha256 = "005eecc73c65b9d4c09532547940718a7b308cd565f62a213dfa040827d4d565";
+  src = fetchFromGitHub {
+    owner = "thorstenb";
+    repo = "odpdown";
+    rev = "v${version}";
+    sha256 = "r2qbgD9PAalbypt+vjp2YcYggUGPQMEG2FDxMtohqG4=";
   };
 
   propagatedBuildInputs = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ];