Merge pull request #164248 from Stunkymonkey/treewide-fetchFromGitHub-2

32 files changed, 200 insertions, 185 deletions

diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
index ea7fc1375747..45fedadee309 100644
--- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter
+{ lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter
 , dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
 , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
 
@@ -6,10 +6,11 @@ stdenv.mkDerivation {
   version = "0.2.1";
   pname = "lightdm-enso-os-greeter";
 
-  src = fetchgit {
-    url = "https://github.com/nick92/Enso-OS";
+  src = fetchFromGitHub {
+    owner = "nick92";
+    repo = "Enso-OS";
     rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427";
-    sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz";
+    sha256 = "sha256-v79J5KyjeJ99ifN7nK/B+J7f292qDAEHsmsHLAMKVYY=";
   };
 
   patches = [
diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
index 20bb0efdd663..2873be1787fa 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
@@ -1,11 +1,12 @@
 let
   pkgs = import ../../../../.. { };
 
-  src = pkgs.fetchgit {
-    url = "https://github.com/nix-community/emacs2nix.git";
-    fetchSubmodules = true;
+  src = pkgs.fetchFromGitHub {
+    owner = "nix-community";
+    repo = "emacs2nix";
     rev = "2e8d2c644397be57455ad32c2849f692eeac7797";
     sha256 = "sha256-qnOYDYHAQ+r5eegKP9GqHz5R2ig96B2W7M+uYa1ti9M=";
+    fetchSubmodules = true;
   };
 in
 pkgs.mkShell {
diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix
index f31b79c9ddf4..105728b7f044 100644
--- a/pkgs/applications/misc/mop/default.nix
+++ b/pkgs/applications/misc/mop/default.nix
@@ -1,9 +1,15 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "mop";
   version = "0.2.0";
-  rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
+
+  src = fetchFromGitHub {
+    owner = "mop-tracker";
+    repo = "mop";
+    rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
+    sha256 = "sha256-fX7G4M3gfv31Eb2HChTY4RfVF2U92000U4ZnFNML5X4=";
+  };
 
   goPackagePath = "github.com/michaeldv/mop";
   goDeps = ./deps.nix;
@@ -16,12 +22,6 @@ buildGoPackage rec {
     mv cmd mop
   '';
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/mop-tracker/mop";
-    sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx";
-  };
-
   meta = with lib; {
     description = "Simple stock tracker implemented in go";
     homepage =  "https://github.com/mop-tracker/mop";
diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix
index 57b1b6256906..7eed625f1e90 100644
--- a/pkgs/applications/misc/nix-tour/default.nix
+++ b/pkgs/applications/misc/nix-tour/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, electron, runtimeShell } :
+{ lib, stdenv, fetchFromGitHub, electron, runtimeShell } :
 
 stdenv.mkDerivation rec {
   pname = "nix-tour";
@@ -6,10 +6,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ electron ];
 
-  src = fetchgit {
-    url = "https://github.com/nixcloud/tour_of_nix";
+  src = fetchFromGitHub {
+    owner = "nixcloud";
+    repo = "tour_of_nix";
     rev = "v${version}";
-    sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb";
+    sha256 = "sha256-a/P2ZMc9OpM4PxRFklSO6oVCc96AGWkxtGF/EmnfYSU=";
   };
 
   installPhase = ''
diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix
index b2839a97efcc..a94363f4600c 100644
--- a/pkgs/applications/misc/tpmmanager/default.nix
+++ b/pkgs/applications/misc/tpmmanager/default.nix
@@ -1,13 +1,14 @@
-{ lib, stdenv, fetchgit, qt4, qmake4Hook, trousers }:
+{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, trousers }:
 
 stdenv.mkDerivation rec {
   version = "0.8.1";
   pname = "tpmmanager";
 
-  src = fetchgit {
-    url = "https://github.com/Sirrix-AG/TPMManager";
-    rev = "9f989206635a6d2c1342576c90fa73eb239519cd";
-    sha256 = "24a606f88fed67ed0d0e61dc220295e9e1ab8db3ef3d028fa34b04ff30652d8e";
+  src = fetchFromGitHub {
+    owner = "Rohde-Schwarz";
+    repo = "TPMManager";
+    rev = "v${version}";
+    sha256 = "sha256-JKYG+I/tZ+0NDmHcIgKV6eGrjbPvPQKPo0sE/zBlLY4=";
   };
 
   nativeBuildInputs = [ qmake4Hook ];
diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
index 7e88a77193b6..9b501facb7f6 100644
--- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
@@ -1,13 +1,14 @@
-{ lib, fetchgit
+{ lib, fetchFromGitHub
   , buildPythonApplication, buildPythonPackage
   , pygobject3, pytest-runner, requests, responses, pytest, python-olm
   , canonicaljson, olm
 }:
 let
-  mainsrc = fetchgit {
-    url = "https://github.com/saadnpq/matrixcli";
+  mainsrc = fetchFromGitHub {
+    owner = "saadnpq";
+    repo = "matrixcli";
     rev = "61ebde173ca2f77185c261c2b7f6db297ca89863";
-    sha256 = "0xcjjy2xwlcixr9fwgzcfjjkivqpk104h7dslfa7lz9jq9pzqzvq";
+    sha256 = "sha256-eH/8b8IyfXqUo7odSECYF+84pXTsP+5S7pFR3oWXknU=";
     fetchSubmodules = true;
   };
 
@@ -35,7 +36,6 @@ let
 
 in
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "matrixcli";
   version = "0.0.2019-08-15";
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
index a168eb984c33..2c6a0c5e7e64 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
@@ -1,16 +1,14 @@
-{ lib, stdenv, fetchgit, pkg-config, pidgin } :
+{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin } :
 
-let
-  version = "54b2992";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "pidgin-mra";
-  inherit version;
+  version = "unstable-2014-07-08";
 
-  src = fetchgit {
-    url = "https://github.com/dreadatour/pidgin-mra";
-    rev = version;
-    sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw";
+  src = fetchFromGitHub {
+    owner = "dreadatour";
+    repo = "pidgin-mra";
+    rev = "54b299266265cde800289b2d51f13b81f6bf379c";
+    sha256 = "sha256-fKdEOaijW2LfsH8RHlVGbMpL7Zhu+x2vW4fPEN4puKk=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
index 527af9ed98db..6f7aab564fac 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
@@ -1,16 +1,14 @@
-{ lib, stdenv, fetchgit, pkg-config, pidgin, libwebp, libgcrypt, gettext } :
+{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, libwebp, libgcrypt, gettext } :
 
-let
-  version = "1.3.1";
-in
 stdenv.mkDerivation rec {
   pname = "telegram-purple";
-  inherit version;
+  version = "1.3.1";
 
-  src = fetchgit {
-    url = "https://github.com/majn/telegram-purple";
+  src = fetchFromGitHub {
+    owner = "majn";
+    repo = "telegram-purple";
     rev = "v${version}";
-    sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp";
+    sha256 = "sha256-14VzCMvzAEmye0N98r+P+ub5CeA9vu8c/xqefuWVI10=";
   };
 
   NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix
index f26cd0109444..c7b5d56dbba3 100644
--- a/pkgs/applications/networking/instant-messengers/pond/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pond/default.nix
@@ -1,20 +1,20 @@
 { lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3,
-  fetchgit }:
+  fetchFromGitHub }:
 
 let
   gui = true; # Might be implemented with nixpkgs config.
 in
 buildGoPackage rec {
   pname = "pond";
-  version = "20150830-${lib.strings.substring 0 7 rev}";
-  rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
+  version = "unstable-2015-08-30";
 
   goPackagePath = "github.com/agl/pond";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/agl/pond";
-    sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4";
+  src = fetchFromGitHub {
+    owner = "agl";
+    repo = "pond";
+    rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
+    sha256 = "sha256-BE7+146E9hz8enrfA+sQhtqgHiSZAtjrW1OOqchbr7Y=";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix
index a87d57ecc91f..e2b4cafe9936 100644
--- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix
@@ -2,7 +2,7 @@
 , element-desktop # for seshat and keytar
 , schildichat-web
 , stdenv
-, fetchgit
+, fetchFromGitHub
 , makeWrapper
 , makeDesktopItem
 , copyDesktopItems
@@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
   pname = "schildichat-desktop";
   inherit (pinData) version;
 
-  src = fetchgit {
-    url = "https://github.com/SchildiChat/schildichat-desktop/";
+  src = fetchFromGitHub {
+    owner = "SchildiChat";
+    repo = "schildichat-desktop";
     inherit (pinData) rev;
     sha256 = pinData.srcHash;
     fetchSubmodules = true;
diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix
index f9e00c06470a..a7ad6fb4d9b1 100644
--- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix
+++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix
@@ -1,5 +1,5 @@
 { stdenv, lib
-, fetchgit
+, fetchFromGitHub
 , fetchYarnDeps
 , nodejs
 , yarn
@@ -18,8 +18,9 @@ in stdenv.mkDerivation rec {
   pname = "schildichat-web";
   inherit (pinData) version;
 
-  src = fetchgit {
-    url = "https://github.com/SchildiChat/schildichat-desktop/";
+  src = fetchFromGitHub {
+    owner = "SchildiChat";
+    repo = "schildichat-desktop";
     inherit (pinData) rev;
     sha256 = pinData.srcHash;
     fetchSubmodules = true;
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index 2d5f6e2dfb72..cbc93857c819 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation
 , lib
 , stdenv
-, fetchgit
+, fetchFromGitHub
 , qtbase
 , qtquickcontrols
 , qmake
@@ -15,10 +15,11 @@ mkDerivation rec {
   pname = "tensor";
   version = "unstable-2017-02-21";
 
-  src = fetchgit {
-    url = "https://github.com/davidar/tensor.git";
+  src = fetchFromGitHub {
+    owner = "davidar";
+    repo = "tensor";
     rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5";
-    sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9";
+    sha256 = "sha256-aR6TsfUxsxoSDaIWYgRCwd7BCgekSEqY6LpDoQ5DNqY=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index df7168ac308e..c8c36049a2a4 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -1,13 +1,14 @@
-{ fetchgit, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }:
+{ fetchFromGitHub, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "communi";
   version = "3.5.0";
 
-  src = fetchgit {
-    url = "https://github.com/communi/communi-desktop.git";
+  src = fetchFromGitHub {
+    owner = "communi";
+    repo = "communi-desktop";
     rev = "v${version}";
-    sha256 = "10grskhczh8601s90ikdsbjabgr9ypcp2j7vivjkl456rmg6xbji";
+    sha256 = "sha256-Ua5uXs2mEDrljvtIcdn1Kb+l5NJtRpB0AAbBz+DU+YE=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index 7113997c90f3..c5a4e93de785 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -1,35 +1,32 @@
-{ lib, stdenv, fetchgit, sqlite, wxGTK30, gettext, wrapGAppsHook }:
+{ lib, stdenv, fetchFromGitHub, sqlite, wxGTK30, gettext, wrapGAppsHook }:
 
-
-let
+stdenv.mkDerivation rec {
+  pname = "money-manager-ex";
   version = "1.3.3";
-in
-  stdenv.mkDerivation {
-    pname = "money-manager-ex";
-    inherit version;
 
-    src = fetchgit {
-      url = "https://github.com/moneymanagerex/moneymanagerex.git";
-      rev = "refs/tags/v${version}";
-      sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74";
-    };
+  src = fetchFromGitHub {
+    owner = "moneymanagerex";
+    repo = "moneymanagerex";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-5NgkP9gY4eDBoKSC/IaXiHoiz+ZdU4c/iGAzPf5IlmQ=";
+  };
 
-    nativeBuildInputs = [
-      wrapGAppsHook
-    ];
+  nativeBuildInputs = [
+    wrapGAppsHook
+  ];
 
-    buildInputs = [
-      gettext
-      sqlite
-      wxGTK30
-      wxGTK30.gtk
-    ];
+  buildInputs = [
+    gettext
+    sqlite
+    wxGTK30
+    wxGTK30.gtk
+  ];
 
-    meta = {
-      description = "Easy-to-use personal finance software";
-      homepage = "https://www.moneymanagerex.org/";
-      license = lib.licenses.gpl2Plus;
-      maintainers = with lib.maintainers; [viric];
-      platforms = with lib.platforms; linux;
-    };
-  }
+  meta = {
+    description = "Easy-to-use personal finance software";
+    homepage = "https://www.moneymanagerex.org/";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
index ba2225b903fa..eb14982575a2 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , fetchpatch
 , openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi
 , onebitSGDSupport ? false
@@ -22,11 +22,12 @@ in stdenv.mkDerivation rec {
   pname = "CNTK";
   version = "2.7";
 
-  # Submodules
-  src = fetchgit {
-    url = "https://github.com/Microsoft/CNTK";
+  src = fetchFromGitHub {
+    owner = "Microsoft";
+    repo = "CNTK";
     rev = "v${version}";
-    sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns";
+    sha256 = "sha256-2rIrPJyvZhnM5EO6tNhF6ARTocfUHce4N0IZk/SZiaI=";
+    fetchSubmodules = true;
   };
 
   patches = [
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
index 6d3b65547330..c32d29f2561a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
@@ -1,16 +1,16 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "git-annex-remote-b2";
-  version = "20151212-${lib.strings.substring 0 7 rev}";
-  rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
+  version = "unstable-2015-12-12";
 
   goPackagePath = "github.com/encryptio/git-annex-remote-b2";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/encryptio/git-annex-remote-b2";
-    sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2";
+  src = fetchFromGitHub {
+    owner = "encryptio";
+    repo = "git-annex-remote-b2";
+    rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
+    sha256 = "sha256-QhotoSdCpiuDyMARW5jExP2887XRMaaxVXBIutvPaYQ=";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix
index 7db42c71092f..cc2489356c5d 100644
--- a/pkgs/applications/virtualization/spike/default.nix
+++ b/pkgs/applications/virtualization/spike/default.nix
@@ -1,11 +1,12 @@
-{ lib, stdenv, fetchgit, dtc, fetchpatch, pkgsCross }:
+{ lib, stdenv, fetchFromGitHub, dtc, fetchpatch, pkgsCross }:
 
 stdenv.mkDerivation rec {
   pname = "spike";
   version = "1.0.0";
 
-  src = fetchgit {
-    url = "https://github.com/riscv/riscv-isa-sim.git";
+  src = fetchFromGitHub {
+    owner = "riscv";
+    repo = "riscv-isa-sim";
     rev = "v${version}";
     sha256 = "1hcl01nj96s3rkz4mrq747s5lkw81lgdjdimb8b1b9h8qnida7ww";
   };
diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix
index 5f107337ee44..a837c435204a 100644
--- a/pkgs/applications/window-managers/btops/default.nix
+++ b/pkgs/applications/window-managers/btops/default.nix
@@ -1,5 +1,4 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "btops";
@@ -7,10 +6,11 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/cmschuetz/btops";
 
-  src = fetchgit {
-    url = "https://github.com/cmschuetz/btops.git";
+  src = fetchFromGitHub {
+    owner = "cmschuetz";
+    repo = "btops";
     rev = version;
-    sha256 = "1ilidvpy7gz49zqp6rf0q7wjrc3r0brdrcp4r5f6i6p9cwybqkbq";
+    sha256 = "sha256-eE28PGfpmmhcyeSy3PICebAs+cHAZXPxT+S/4+9ukcY=";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
index ceed83070040..c8d8ca42f9e4 100644
--- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
+++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
@@ -1,13 +1,14 @@
-{ lib, stdenv, fetchgit, fontforge, python3 }:
+{ lib, stdenv, fetchFromGitHub, fontforge, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "rictydiminished-with-firacode";
   version = "1.2.2";
 
-  src = fetchgit {
-    url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
+  src = fetchFromGitHub {
+    owner = "hakatashi";
+    repo = "RictyDiminished-with-FiraCode";
     rev = version;
-    sha256 = "0khnbp1y5xrd77gfb2b19mzi3ll07im3d0rlbciwbq0cn347f25p";
+    sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix
index b3a2a44d2780..10407598fb96 100644
--- a/pkgs/development/chez-modules/chez-mit/default.nix
+++ b/pkgs/development/chez-modules/chez-mit/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, lib, fetchgit, chez, chez-srfi }:
+{ stdenv, lib, fetchFromGitHub, chez, chez-srfi }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "chez-mit";
-  version = "1.0";
+  version = "0.1";
 
-  src = fetchgit {
-    url = "https://github.com/fedeinthemix/chez-mit.git";
-    rev = "68f3d7562e77f694847dc74dabb5ecbd106cd6be";
-    sha256 = "0c7i3b6i90xk96nmxn1pc9272a4yal4v40dm1a4ybdi87x53zkk0";
+  src = fetchFromGitHub {
+    owner = "fedeinthemix";
+    repo = "chez-mit";
+    rev = "v${version}";
+    sha256 = "sha256-YM4/Sj8otuWJCrUBsglVnihxRGI32F6tSbODFM0a8TA=";
   };
 
   buildInputs = [ chez chez-srfi ];
diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix
index 39c1f73003e9..59aedd29f0ec 100644
--- a/pkgs/development/chez-modules/chez-scmutils/default.nix
+++ b/pkgs/development/chez-modules/chez-scmutils/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, lib, fetchgit, chez, chez-srfi, chez-mit }:
+{ stdenv, lib, fetchFromGitHub, chez, chez-srfi, chez-mit }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "chez-scmutils";
-  version = "1.0";
+  version = "0.1";
 
-  src = fetchgit {
-    url = "https://github.com/fedeinthemix/chez-scmutils.git";
-    rev = "5eaeea6289fd239358d7eed99cc9588528fb52b2";
-    sha256 = "0lb05wlf8qpgg8y0gdsyaxg1nbfx1qbaqdjvygrp64ndn8fnhq7l";
+  src = fetchFromGitHub {
+    owner = "fedeinthemix";
+    repo = "chez-scmutils";
+    rev = "v${version}";
+    sha256 = "sha256-9GBoHbLNEnPz81s2rBYO3S0bXldetwc8eu9i5CgvYFE=";
   };
 
   buildInputs = [ chez chez-srfi chez-mit ];
diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/development/chez-modules/chez-srfi/default.nix
index 1d8579ae106e..1780a1356c5c 100644
--- a/pkgs/development/chez-modules/chez-srfi/default.nix
+++ b/pkgs/development/chez-modules/chez-srfi/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, lib, fetchgit, chez }:
+{ stdenv, lib, fetchFromGitHub, chez }:
 
 stdenv.mkDerivation {
   pname = "chez-srfi";
   version = "1.0";
 
-  src = fetchgit {
-    url = "https://github.com/fedeinthemix/chez-srfi.git";
+  src = fetchFromGitHub {
+    owner = "fedeinthemix";
+    repo = "chez-srfi";
     rev = "5770486c2a85d0e3dd4ac62a97918e7c394ea507";
-    sha256 = "1s47v7b7w0ycd2g6gyv8qbzmh4jjln5iday8n9l3m996ns8is9zj";
+    sha256 = "sha256-8icdkbYmpTpossirFoulUhJY/8Jo+2eeaMwDftbZh+g=";
   };
 
   buildInputs = [ chez ];
diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix
index 1b87b508b6a1..ace8a3d2de39 100644
--- a/pkgs/development/compilers/aldor/default.nix
+++ b/pkgs/development/compilers/aldor/default.nix
@@ -1,14 +1,15 @@
-{ fetchgit, lib, stdenv, gmp, which, flex, bison, makeWrapper
+{ fetchFromGitHub, lib, stdenv, gmp, which, flex, bison, makeWrapper
 , autoconf, automake, libtool, jdk, perl }:
 
 stdenv.mkDerivation {
   pname = "aldor";
   version = "1.2.0";
 
-  src = fetchgit {
-    url = "https://github.com/pippijn/aldor";
-    sha256 = "19v07ffq4r1gjnmg7a8ifgjkwan9a3rwbj0qjz8fycwy221844m6";
+  src = fetchFromGitHub {
+    owner = "aldorlang";
+    repo = "aldor";
     rev = "15471e75f3d65b93150f414ebcaf59a03054b68d";
+    sha256 = "sha256-phKCghCeM+/QlxjIxfNQySo+5XMRqfOqlS9kgp07YKc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 4f3b200477f0..4b0e6e618e3a 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -78,11 +78,11 @@ let
     pname = "nim-bootstrap";
     version = "g${lib.substring 0 7 revision}";
 
-    src = fetchgit {
-      # A Git checkout is much smaller than a GitHub tarball.
-      url = "https://github.com/nim-lang/csources_v1.git";
+    src = fetchFromGitHub {
+      owner = "nim-lang";
+      repo = "csources_v1";
       rev = revision;
-      sha256 = "1c2k681knrha1zmf4abhb32i2wwd3nwflzylnqryxk753swla043";
+      sha256 = "sha256-gwBFuR7lzO4zttR/6rgdjXMRxVhwKeLqDwpmOwMyU7A=";
     };
 
     enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix
index 1ffc85a6ada5..f9ab0714b470 100644
--- a/pkgs/development/compilers/opendylan/default.nix
+++ b/pkgs/development/compilers/opendylan/default.nix
@@ -1,14 +1,15 @@
 # Build Open Dylan from source using the binary builds to bootstrap.
-{lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
+{lib, stdenv, fetchFromGitHub, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
 
 stdenv.mkDerivation {
   pname = "opendylan";
   version = "2016.1pre";
 
-  src = fetchgit {
-    url = "https://github.com/dylan-lang/opendylan";
+  src = fetchFromGitHub {
+    owner = "dylan-lang";
+    repo = "opendylan";
     rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd";
-    sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b";
+    sha256 = "sha256-i1wr4mBUbZhL8ENFGz8gV/mMzSJsj1AdJLd4WU9tIQM=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix
index 4e35ff35f660..fbb1b4c1fd40 100644
--- a/pkgs/development/embedded/bossa/default.nix
+++ b/pkgs/development/embedded/bossa/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, wxGTK, libX11, readline }:
+{ lib, stdenv, fetchFromGitHub, wxGTK, libX11, readline }:
 
 let
   # BOSSA needs a "bin2c" program to embed images.
@@ -13,14 +13,15 @@ let
   };
 
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "bossa";
   version = "1.8";
 
-  src = fetchgit {
-    url = "https://github.com/shumatech/BOSSA";
-    rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62";
-    sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm";
+  src = fetchFromGitHub {
+    owner = "shumatech";
+    repo = "BOSSA";
+    rev = version;
+    sha256 = "sha256-dZeBy63OzIaLUfAg6awnk83FtLKVxPoYAYs5t7BBM6Y=";
   };
 
   patches = [ ./bossa-no-applet-build.patch ];
diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix
index 56d37dd4e947..9771a8f72d2a 100644
--- a/pkgs/development/interpreters/ceptre/default.nix
+++ b/pkgs/development/interpreters/ceptre/default.nix
@@ -1,13 +1,15 @@
-{ lib, stdenv, fetchgit, mlton }:
+{ lib, stdenv, fetchFromGitHub, mlton }:
 
 stdenv.mkDerivation {
   pname = "ceptre";
   version = "unstable-2016-11-27";
 
-  src = fetchgit {
-    url = "https://github.com/chrisamaphone/interactive-lp";
+  src = fetchFromGitHub {
+    owner = "chrisamaphone";
+    repo = "interactive-lp";
     rev = "e436fda2ccd44e9c9d226feced9d204311deacf5";
-    sha256 = "174pxfnw3qyn2w8qxmx45fa68iddf106mkfi0kcmyqxzsc9jprh8";
+    sha256 = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ mlton ];
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index ca55eceaedbf..5b93357b2665 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
+{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc,
   pypy, libffi, libedit, libuv, boost, zlib,
   variant ? "jit", buildWithPypy ? false }:
 
@@ -11,10 +11,11 @@ let
     no-jit = { flags = ""; target = "target.py"; };
     no-jit-preload = { flags = ""; target = "target_preload.py"; };
   };
-  pixie-src = fetchgit {
-    url = "https://github.com/pixie-lang/pixie.git";
+  pixie-src = fetchFromGitHub {
+    owner = "pixie-lang";
+    repo = "pixie";
     rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62";
-    sha256 = "0pf31x5h2m6dpxlidv98qay1y179qw40cw4cb4v4xa88gmq2f3vm";
+    sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10=";
   };
   pypy-tag = "91db1a9";
   pypy-src = fetchurl {
diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
index 19bc3524c590..4b18cd7cfadc 100644
--- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix
+++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
@@ -1,13 +1,14 @@
-{ fetchgit, lib, stdenv, ant, jdk }:
+{ fetchFromGitHub, lib, stdenv, ant, jdk }:
 
 stdenv.mkDerivation {
   pname = "hydra-ant-logger";
   version = "2010.2";
 
-  src = fetchgit {
-    url = "https://github.com/NixOS/hydra-ant-logger.git";
+  src = fetchFromGitHub {
+    owner = "NixOS";
+    repo = "hydra-ant-logger";
     rev = "dae3224f4ed42418d3492bdf5bee4f825819006f";
-    sha256 = "01s7m6007rn9107rw5wcgna7i20x6p6kfzl4f79jrvpkjy6kz176";
+    sha256 = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc=";
   };
 
   buildInputs = [ ant jdk ];
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 7a7cc165fe51..fe31e2ba348b 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -14,10 +14,11 @@ let lispPackages = rec {
 
     description = "The Common Lisp package manager";
     deps = [];
-    src = pkgs.fetchgit {
-      url = "https://github.com/quicklisp/quicklisp-client/";
-      rev = "refs/tags/version-${version}";
-      sha256 = "sha256:102f1chpx12h5dcf659a9kzifgfjc482ylf73fg1cs3w34zdawnl";
+    src = pkgs.fetchFromGitHub {
+      owner = "quicklisp";
+      repo = "quicklisp-client";
+      rev = "version-${version}";
+      sha256 = "sha256-1HLVPhl8aBaeG8dRLxBh0j0X/0wqFeNYK1CEfiELToA=";
     };
     overrides = x: rec {
       inherit clwrapper;
diff --git a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
index 17bedd5e7d32..5c0b6b0eecb3 100644
--- a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
+++ b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
@@ -1,13 +1,14 @@
-{ mkDerivation, ansi-wl-pprint, base, fetchgit, lib, process, QuickCheck
+{ mkDerivation, ansi-wl-pprint, base, fetchFromGitHub, lib, process, QuickCheck
 , transformers, transformers-compat
 }:
 mkDerivation {
   pname = "hercules-ci-optparse-applicative";
   version = "0.16.1.0";
-  src = fetchgit {
-    url = "https://github.com/hercules-ci/optparse-applicative.git";
-    sha256 = "05vchaw2rf46hh2128qjpky686iy5hff964mbdhcyiz612jjflyp";
+  src = fetchFromGitHub {
+    owner = "hercules-ci";
+    repo = "optparse-applicative";
     rev = "9e2968c09a7c5b29d04578dc68d81ce5aec0591e";
+    sha256 = "sha256-11MnpQjmR89gW5WY5BwsPhpk/LwSIxEEhIa4LLiCbBc=";
   };
   libraryHaskellDepends = [
     ansi-wl-pprint base process transformers transformers-compat
diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix
index 0aea58572cba..2a9d6685b7ca 100644
--- a/pkgs/development/php-packages/memcached/default.nix
+++ b/pkgs/development/php-packages/memcached/default.nix
@@ -1,15 +1,14 @@
-{ buildPecl, lib, fetchgit, php, cyrus_sasl, zlib, pkg-config, libmemcached }:
-let
+{ buildPecl, lib, fetchFromGitHub, php, cyrus_sasl, zlib, pkg-config, libmemcached }:
+
+buildPecl rec {
   pname = "memcached";
   version = "3.1.5";
-in
-buildPecl {
-  inherit pname version;
 
-  src = fetchgit {
-    url = "https://github.com/php-memcached-dev/php-memcached";
+  src = fetchFromGitHub {
+    owner = "php-memcached-dev";
+    repo = "php-memcached";
     rev = "v${version}";
-    sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380";
+    sha256 = "sha256-AA3JakWxjk7HQl+8FEEGqLVNYHrjITZg3G25OaqAqwY=";
   };
 
   internalDeps = [