diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix
index 9bfe3182d653..71966a32cf0f 100644
--- a/pkgs/servers/beanstalkd/default.nix
+++ b/pkgs/servers/beanstalkd/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, installShellFiles, nixosTests }:
+{ lib, stdenv, fetchFromGitHub, installShellFiles, nixosTests }:
 
 stdenv.mkDerivation rec {
   version = "1.12";
   pname = "beanstalkd";
 
-  src = fetchurl {
-    url = "https://github.com/kr/beanstalkd/archive/v${version}.tar.gz";
-    sha256 = "0gw8aygysnjzzfjgfzivy5vajla9adg2zcr4h8rrdf0xyykpwfpl";
+  src = fetchFromGitHub {
+    owner = "kr";
+    repo = "beanstalkd";
+    rev = "v${version}";
+    hash = "sha256-HChpVZ02l08CObrb4+ZEjBiXeQMMYi6zhSWUTDxuEao=";
   };
 
   hardeningDisable = [ "fortify" ];
diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix
index 40941123ebc4..d276c02487df 100644
--- a/pkgs/servers/couchpotato/default.nix
+++ b/pkgs/servers/couchpotato/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, python2Packages, lib }:
+{ fetchFromGitHub, python2Packages, lib }:
 
 with python2Packages;
 
@@ -7,9 +7,11 @@ buildPythonApplication rec {
   version = "3.0.1";
   disabled = isPy3k;
 
-  src = fetchurl {
-    url = "https://github.com/CouchPotato/CouchPotatoServer/archive/build/${version}.tar.gz";
-    sha256 = "1xwjis3ijh1rff32mpdsphmsclf0lkpd3phpgxkccrigq1m9r3zh";
+  src = fetchFromGitHub {
+    owner = "CouchPotato";
+    repo = "CouchPotatoServer";
+    rev = "build/${version}";
+    hash = "sha256-0k8MqLnqYjhHPE9/jncTFIj1T4F2aXU4mXdeEimDB7M=";
   };
 
   format = "other";
diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix
index 3e0a4e5d9940..eee65c3a5d1f 100644
--- a/pkgs/servers/fcgiwrap/default.nix
+++ b/pkgs/servers/fcgiwrap/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, systemd, fcgi, autoreconfHook, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "fcgiwrap";
   version = "1.1.0";
 
-  src = fetchurl {
-    url = "https://github.com/gnosek/fcgiwrap/archive/${version}.tar.gz";
-    sha256 = "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac";
+  src = fetchFromGitHub {
+    owner = "gnosek";
+    repo = "fcgiwrap";
+    rev = version;
+    hash = "sha256-znAsZk+aB2XO2NK8Mjc+DLwykYKHolnVQPErlaAx3Oc=";
   };
 
   NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough";
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index eeabbc1f30dc..39f21b189378 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, apacheHttpd }:
+{ lib, stdenv, fetchFromGitHub, fetchurl, apacheHttpd }:
 
 let
   apache-24-patch = fetchurl {
@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
   pname = "mod_fastcgi";
   version = "2.4.7.1";
 
-  src = fetchurl {
-    url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz";
-    sha256 = "12g6vcfl9jl8rqf8lzrkdxg2ngca310d3d6an563xqcgrkp8ga55";
+  src = fetchFromGitHub {
+    owner = "FastCGI-Archives";
+    repo = "mod_fastcgi";
+    rev = version;
+    hash = "sha256-ovir59kCjKkgbraX23nsmzlMzGdeNTyj3MQd8cgvLsg=";
   };
 
   patches = [ apache-24-patch ];
@@ -42,5 +44,6 @@ stdenv.mkDerivation rec {
 
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.peti ];
+    broken = true; # patch 'compile-against-apache24.diff' no longer works
   };
 }
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 6a029ce1dccd..945f34ac9161 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, apacheHttpd, python, ncurses }:
+{ lib, stdenv, fetchFromGitHub, apacheHttpd, python, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "mod_wsgi";
   version = "4.9.0";
 
-  src = fetchurl {
-    url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";
-    sha256 = "sha256-Cm84CvhUuFoxUeVKPDO1IMSm4hqZvK165d37/jGnS1A=";
+  src = fetchFromGitHub {
+    owner = "GrahamDumpleton";
+    repo = "mod_wsgi";
+    rev = version;
+    hash = "sha256-gaWA6m4ENYtm88hCaoqrcIooA0TBI7Kj6fU6pPShoo4=";
   };
 
   buildInputs = [ apacheHttpd python ncurses ];
diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 3e28f5010499..7296635c7ddc 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -1,13 +1,24 @@
-{ lib, fetchurl, makeWrapper
-, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }:
+{ lib
+, fetchFromGitHub
+, makeWrapper
+, perlPackages
+, flac
+, faad2
+, sox
+, lame
+, monkeysAudio
+, wavpack
+}:
 
 perlPackages.buildPerlPackage rec {
   pname = "slimserver";
   version = "7.9.2";
 
-  src = fetchurl {
-    url = "https://github.com/Logitech/slimserver/archive/${version}.tar.gz";
-    sha256 = "1rn9y7xvg5aqmgcbfpi7lcqy8d7hgwqx8b2llzpzrv7854zm1wcw";
+  src = fetchFromGitHub {
+    owner = "Logitech";
+    repo = "slimserver";
+    rev = version;
+    hash = "sha256-P4CSu/ff6i48uWV5gXsJgayZ1S1s0RAqa5O5y3Y0g9Y=";
   };
 
   buildInputs = [
@@ -73,7 +84,7 @@ perlPackages.buildPerlPackage rec {
     # relax audio scan version constraints
     substituteInPlace lib/Audio/Scan.pm --replace "0.93" "1.01"
     substituteInPlace modules.conf --replace "Audio::Scan 0.93 0.95" "Audio::Scan 0.93"
-    '';
+  '';
 
   preConfigurePhase = "";
 
diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix
index 5c699e5dfd28..836a5934d96b 100644
--- a/pkgs/servers/ursadb/default.nix
+++ b/pkgs/servers/ursadb/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, cmake, zeromq, cppzmq }:
+{ lib, stdenv, fetchFromGitHub, cmake, zeromq, cppzmq }:
 
 stdenv.mkDerivation rec {
   pname = "ursadb";
   version = "1.2.0";
 
-  src = fetchurl {
-    url = "https://github.com/CERT-Polska/ursadb/archive/v${version}.tar.gz";
-    sha256 = "10dax3mswq0x4cfrpi31b7ii7bxl536wz1j11b7f5c0zw9pjxzym";
+  src = fetchFromGitHub {
+    owner = "CERT-Polska";
+    repo = "ursadb";
+    rev = "v${version}";
+    hash = "sha256-/EK1CKJ0IR7fkKSpQkONbWcz6uhUoAwK430ljNYsV5U=";
   };
 
   installPhase = ''