Merge pull request #163582 from Stunkymonkey/treewide-fetchFromGitHub-1

41 files changed, 302 insertions, 251 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 45fedadee309..e84f305526b4 100644
--- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
@@ -3,8 +3,8 @@
 , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
 
 stdenv.mkDerivation {
-  version = "0.2.1";
   pname = "lightdm-enso-os-greeter";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "nick92";
diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix
index 6449a3da767c..520167c100f1 100644
--- a/pkgs/development/python-modules/editorconfig/default.nix
+++ b/pkgs/development/python-modules/editorconfig/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 , cmake
 }:
 
@@ -8,11 +8,12 @@ buildPythonPackage rec {
   pname = "editorconfig";
   version = "0.12.3";
 
-  # fetchgit used to ensure test submodule is available
-  src = fetchgit {
-    url = "https://github.com/editorconfig/editorconfig-core-py";
-    rev = "1a8fb62b9941fded9e4fb83a3d0599427f5484cb"; # Not tagged
-    sha256 = "0vx8rl7kii72965jsi01mdsz9rfi1q9bwy13x47iaqm6rmcwc1rb";
+  src = fetchFromGitHub {
+    owner = "editorconfig";
+    repo = "editorconfig-core-py";
+    rev = "v${version}";
+    sha256 = "sha256-KwfGWc2mYhUP6SN4vhIO0eX0dasBRC2LSeLEOA/NqG8=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix
index ee190008f592..b9701073e0bd 100644
--- a/pkgs/development/python-modules/mutag/default.nix
+++ b/pkgs/development/python-modules/mutag/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 , isPy3k
 , pyparsing
 }:
@@ -10,10 +10,11 @@ buildPythonPackage {
   version = "0.0.2-2ffa0258ca";
   disabled = ! isPy3k;
 
-  src = fetchgit {
-    url = "https://github.com/aroig/mutag.git";
-    sha256 = "0axdnwdypfd74a9dnw0g25m16xx1yygyl828xy0kpj8gyqdc6gb1";
+  src = fetchFromGitHub {
+    owner = "aroig";
+    repo = "mutag";
     rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2";
+    sha256 = "sha256-YT3DGvYPyTuB70gg6p/3oXcTahEPcNuSIqe56xu3rSs=";
   };
 
   propagatedBuildInputs = [ pyparsing ];
diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix
index 9c26c9e2e2b3..99424bbc67c2 100644
--- a/pkgs/development/python-modules/samplerate/default.nix
+++ b/pkgs/development/python-modules/samplerate/default.nix
@@ -2,16 +2,18 @@
 , buildPythonPackage
 , numpy
 , pkgs
+, fetchFromGitHub
 }:
 
 buildPythonPackage {
   pname = "scikits.samplerate";
   version = "0.3.3";
 
-  src = pkgs.fetchgit {
-    url = "https://github.com/cournape/samplerate";
+  src = fetchFromGitHub {
+    owner = "cournape";
+    repo = "samplerate";
     rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210";
-    sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg";
+    sha256 = "sha256-7x03Q6VXfP9p8HCk15IDZ9HeqTyi5F1AlGX/otdh8VU=";
   };
 
   buildInputs =  [ pkgs.libsamplerate ];
diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix
index 38516ab73c3e..c15e88ebeb24 100644
--- a/pkgs/development/python-modules/svg2tikz/default.nix
+++ b/pkgs/development/python-modules/svg2tikz/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 , lxml
 , isPy27
 }:
@@ -12,10 +12,12 @@ buildPythonPackage {
 
   propagatedBuildInputs = [ lxml ];
 
-  src = fetchgit {
-    url = "https://github.com/kjellmf/svg2tikz";
-    sha256 = "429428ec435e53672b85cdfbb89bb8af0ff9f8238f5d05970729e5177d252d5f";
+  src = fetchFromGitHub {
+    owner = "kjellmf";
+    repo = "svg2tikz";
     rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4";
+    sha256 = "sha256-QpQo7ENeU2crhc37uJu4rw/5+COPXQWXBynlF30lLV8=";
+    fetchSubmodules = true;
   };
 
   meta = with lib; {
diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix
index b7653aa144e4..d17b2d0c5388 100644
--- a/pkgs/development/tools/go-repo-root/default.nix
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -1,16 +1,16 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-repo-root";
-  version = "20140911-${lib.strings.substring 0 7 rev}";
-  rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
+  version = "unstable-2014-09-11";
 
   goPackagePath = "github.com/cstrahan/go-repo-root";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/cstrahan/go-repo-root";
-    sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4";
+  src = fetchFromGitHub {
+    owner = "cstrahan";
+    repo = "go-repo-root";
+    rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
+    sha256 = "sha256-5FVELoUq34KjBl1kzYpExDQFvH2PYQ+dbUOBLSe6n+Y=";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
index 274f7a476c2b..0a55fc66830f 100644
--- a/pkgs/development/tools/gotags/default.nix
+++ b/pkgs/development/tools/gotags/default.nix
@@ -1,15 +1,15 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gotags";
-  version = "20150803-${lib.strings.substring 0 7 rev}";
-  rev = "be986a34e20634775ac73e11a5b55916085c48e7";
+  version = "unstable-2015-08-03";
 
   goPackagePath = "github.com/jstemmer/gotags";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/jstemmer/gotags";
-    sha256 = "071wyq90b06xlb3bb0l4qjz1gf4nnci4bcngiddfcxf2l41w1vja";
+  src = fetchFromGitHub {
+    owner = "jstemmer";
+    repo = "gotags";
+    rev = "be986a34e20634775ac73e11a5b55916085c48e7";
+    sha256 = "sha256-Su7AA6HCdeZai8+yRSKzlrgXvsSEgrXGot2ABRL2PBw=";
   };
 }
diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
index 6ac6605797eb..8d6e19124711 100644
--- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
+++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
@@ -1,14 +1,14 @@
-{ mkDerivation, base, containers, fetchgit, hedgehog, lib
+{ mkDerivation, base, containers, fetchFromGitHub, hedgehog, lib
 , optparse-applicative, parsec, template-haskell, text
 }:
 mkDerivation {
   pname = "dconf2nix";
   version = "0.0.11";
-  src = fetchgit {
-    url = "https://github.com/gvolpe/dconf2nix.git";
-    sha256 = "1kv88bxi7l5kcm66m5y85b8fz1zsdshvw37k715g2biwa0an5s6f";
+  src = fetchFromGitHub {
+    owner = "gvolpe";
+    repo = "dconf2nix";
     rev = "fe7e3d973caa87b1b706096aff3d670f65e39fda";
-    fetchSubmodules = true;
+    sha256 = "sha256-zuhiFVA8LvFKOPMMvqFu+ofv0CrIl2pMZbPQE/tCaM8=";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix
index 96d2807b9ab9..f6ed3f59ac0d 100644
--- a/pkgs/development/tools/jd/default.nix
+++ b/pkgs/development/tools/jd/default.nix
@@ -1,16 +1,16 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "jd";
   version = "0.3.1";
-  rev = "2729b5af166cfd72bd953ef8959b456c4db940fc";
 
   goPackagePath = "github.com/tidwall/jd";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/tidwall/jd";
-    sha256 = "0dj4k38pf80dl77jns29vx2dj265s4ksg2q2s9n240b7b8z8mn5h";
+  src = fetchFromGitHub {
+    owner = "tidwall";
+    repo = "jd";
+    rev = "2729b5af166cfd72bd953ef8959b456c4db940fc";
+    sha256 = "sha256-sNiKPlpnASJs0gKLpyfRxQjZRN9JaCvPoQ0gd9GYRDY=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix
index 88b2f63fd5a5..1582ca874026 100644
--- a/pkgs/development/tools/literate-programming/Literate/default.nix
+++ b/pkgs/development/tools/literate-programming/Literate/default.nix
@@ -1,13 +1,15 @@
-{ lib, stdenv, fetchgit, ldc, dub }:
+{ lib, stdenv, fetchFromGitHub, ldc, dub }:
 
 stdenv.mkDerivation {
   pname = "Literate";
   version = "unstable-2021-01-22";
 
-  src = fetchgit {
-    url = "https://github.com/zyedidia/Literate.git";
+  src = fetchFromGitHub {
+    owner = "zyedidia";
+    repo = "Literate";
     rev = "7004dffec0cff3068828514eca72172274fd3f7d";
-    sha256 = "0x4xgrdskybaa7ssv81grmwyc1k167v3nwj320jvp5l59xxlbcvs";
+    sha256 = "sha256-erNFe0+FlrslEENyO/YxYQbmec0voK31UWr5qVt+nXQ=";
+    fetchSubmodules = true;
   };
 
   buildInputs = [ ldc dub ];
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index f77ced3a2ada..5853d40eceb1 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python
+{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages, boost, python
 , withGocode ? true, gocode
 , withGodef ? true, godef
 , withGotools? true, gotools
@@ -12,10 +12,12 @@ stdenv.mkDerivation {
   disabled = !python.isPy3k;
 
   # required for third_party directory creation
-  src = fetchgit {
-    url = "https://github.com/Valloric/ycmd.git";
+  src = fetchFromGitHub {
+    owner = "Valloric";
+    repo = "ycmd";
     rev = "9a6b86e3a156066335b678c328f226229746bae5";
-    sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7";
+    sha256 = "sha256-xzLELjp4DsG6mkzaFqpuquSa0uoaZWrYLrKr/mzrqrA=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake ]
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 6ecbe058328f..6693e80e1161 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }:
+{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "rtags";
@@ -8,11 +8,12 @@ stdenv.mkDerivation rec {
     ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]
     ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
 
-  src = fetchgit {
-    rev = "refs/tags/v${version}";
+  src = fetchFromGitHub {
+    owner = "andersbakken";
+    repo = "rtags";
+    rev = "v${version}";
+    sha256 = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c=";
     fetchSubmodules = true;
-    url = "https://github.com/andersbakken/rtags.git";
-    sha256 = "1iwvp7a69sj3wqjgcnyh581qrpicxzi2lfjkxqpabpyjkl5nk7hh";
     # unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation
     postFetch = ''
diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix
index bef8eb906cf1..95013006010d 100644
--- a/pkgs/development/tools/ws/default.nix
+++ b/pkgs/development/tools/ws/default.nix
@@ -1,17 +1,16 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "ws";
   version = "0.2.1";
-  rev = "e9404cb37e339333088b36f6a7909ff3be76931d";
 
   goPackagePath = "github.com/hashrocket/ws";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/hashrocket/ws";
-    sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb";
+  src = fetchFromGitHub {
+    owner = "hashrocket";
+    repo = "ws";
+    rev = "e9404cb37e339333088b36f6a7909ff3be76931d";
+    sha256 = "sha256-q6c761Evz7Q6nH1fHgEn2uCFokoN0OzqhyxIFn6mWqQ=";
   };
 
   meta = with lib; {
diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix
index 5f0c5ad9e29e..87c81531122a 100644
--- a/pkgs/misc/screensavers/alock/default.nix
+++ b/pkgs/misc/screensavers/alock/default.nix
@@ -1,14 +1,15 @@
-{ lib, stdenv, fetchgit, pkg-config, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
 , libX11, pam, libgcrypt, libXrender, imlib2 }:
 
 stdenv.mkDerivation rec {
   pname = "alock";
   version = "unstable-2017-07-20";
 
-  src = fetchgit {
-    url = "https://github.com/Arkq/alock";
+  src = fetchFromGitHub {
+    owner = "Arkq";
+    repo = "alock";
     rev = "2035e1d4a2293432f5503e82d10f899232eb0f38";
-    sha256 = "1by954fjn0ryqda89zlmq3gclakg3gz7zy1wjrbgw4lzsk538va6";
+    sha256 = "sha256-Rm00ytSfEv5Wljz4f/4bbyrK3sCV/oRUwz4DKx0pya8=";
   };
 
   PAM_DEFAULT_SERVICE = "login";
diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix
index ffb9d0da8570..ac4c8197e554 100644
--- a/pkgs/misc/screensavers/xtrlock-pam/default.nix
+++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix
@@ -1,13 +1,14 @@
-{ lib, stdenv, fetchgit, python2, pkg-config, xlibsWrapper, pam }:
+{ lib, stdenv, fetchFromGitHub, python2, pkg-config, xlibsWrapper, pam }:
 
 stdenv.mkDerivation {
   pname = "xtrlock-pam";
   version = "3.4-post-20150909";
 
-  src = fetchgit {
-    url = "https://github.com/aanatoly/xtrlock-pam";
+  src = fetchFromGitHub {
+    owner = "aanatoly";
+    repo = "xtrlock-pam";
     rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6";
-    sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc";
+    sha256 = "sha256-TFfs418fpjBrAJNGW8U3jE0K7jQkfL4vCquAViKkXPw=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/os-specific/linux/firmware/rt5677/default.nix
index f5d84179fd29..f21d34bbe533 100644
--- a/pkgs/os-specific/linux/firmware/rt5677/default.nix
+++ b/pkgs/os-specific/linux/firmware/rt5677/default.nix
@@ -1,15 +1,15 @@
-{ lib, stdenv, fetchgit }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   name = "rt5677-firmware";
 
-  src = fetchgit {
-    url = "https://github.com/raphael/linux-samus";
+  src = fetchFromGitHub {
+    owner = "raphael";
+    repo = "linux-samus";
     rev = "995de6c2093797905fbcd79f1a3625dd3f50be37";
-    sha256 = "0a6lz9wadm47cmva136q6wd0lw03bmymf9ispnzb091a7skwacry";
+    sha256 = "sha256-PjPFpz4qJLC+vTomV31dA3AKGjfYjKB2ZYfUpnj61Cg=";
   };
 
-
   installPhase = ''
     mkdir -p $out/lib/firmware
     cp ./firmware/rt5677_elf_vad $out/lib/firmware
diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix
index 8da12d78bc93..95b766aec05b 100644
--- a/pkgs/os-specific/linux/lightum/default.nix
+++ b/pkgs/os-specific/linux/lightum/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }:
+{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }:
 
 stdenv.mkDerivation {
   pname = "lightum";
   version = "unstable-2014-06-07";
-  src = fetchgit {
-    url = "https://github.com/poliva/lightum";
+
+  src = fetchFromGitHub {
+    owner = "poliva";
+    repo = "lightum";
     rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8";
-    sha256 = "01x24rcrkgksyvqpgkr9zafg3jgs8nqng8yf0hx0kbmcimar8dbp";
+    sha256 = "sha256-dzWUVY2srgk6BM6jZ7FF+snxnPopz3fx9nq+mVkmogc=";
   };
 
   buildInputs = [
diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix
index 87b38b9af6e4..934367dcd11b 100644
--- a/pkgs/os-specific/linux/usermount/default.nix
+++ b/pkgs/os-specific/linux/usermount/default.nix
@@ -1,13 +1,14 @@
-{ lib, stdenv, fetchgit, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }:
 
 stdenv.mkDerivation {
   pname = "usermount";
   version = "0.1";
 
-  src = fetchgit {
-    url = "https://github.com/tom5760/usermount.git";
+  src = fetchFromGitHub {
+    owner = "tom5760";
+    repo = "usermount";
     rev = "0d6aba3c1f8fec80de502f5b92fd8b28041cc8e4";
-    sha256 = "0gpp0vwiwr7kgbhh26jspv3255662mnvnav6g8i2h0qxar8hf8w2";
+    sha256 = "sha256-giMHUVYdAygiemYru20VxpQixr5aGgHhevNkHvkG9z4=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix
index b29f9ca9e8e0..3977521a6f52 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/pkgs/servers/brickd/default.nix
@@ -1,24 +1,24 @@
-{ lib, stdenv, fetchgit, libusb1, pkg-config, pmutils, udev} :
+{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config, pmutils, udev} :
 
 let
-
-version = "2.1.1";
-daemonlib = fetchgit {
-    url = "https://github.com/Tinkerforge/daemonlib.git";
-    rev = "refs/tags/brickd-${version}";
-    sha256 = "097kaz7d0rzg0ijvcna3y620k3m5fgxpqsac5gbhah8pd7vlj1a4";
+  version = "2.1.1";
+  daemonlib = fetchFromGitHub {
+    owner = "Tinkerforge";
+    repo = "daemonlib";
+    rev = "brickd-${version}";
+    sha256 = "sha256-0HhuC4r1S4NJa2FSJa7+fNCfcoRTBckikYbGSE+2FbE=";
   };
-
 in
 
 stdenv.mkDerivation {
   pname = "brickd";
   inherit version;
 
-  src = fetchgit {
-    url = "git://github.com/Tinkerforge/brickd.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "0m2q01sbgf8z4559jpr6k3jivb8x98vxv1fhgx8nfcjbwz1q83gb";
+  src = fetchFromGitHub {
+    owner = "Tinkerforge";
+    repo = "brickd";
+    rev = "v${version}";
+    sha256 = "sha256-6w2Ew+dLMmdRf9CF3TdKHa0d5ZgmX5lKIR+5t3QAWFQ=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix
index 6ee0e3ea366b..12c4e2545a5a 100644
--- a/pkgs/servers/ps3netsrv/default.nix
+++ b/pkgs/servers/ps3netsrv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "ps3netsrv";
@@ -6,11 +6,12 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  src = fetchgit {
-    url = "https://github.com/dirkvdb/ps3netsrv--";
-    fetchSubmodules = true;
+  src = fetchFromGitHub {
+    owner = "dirkvdb";
+    repo = "ps3netsrv--";
     rev = "e54a66cbf142b86e2cffc1701984b95adb921e81";
-    sha256 = "09hvmfzqy2jckpsml0z1gkcnar8sigmgs1q66k718fph2d3g54sa";
+    sha256 = "sha256-SpPyRhPwOhTONAYH/eqLGmVl2XzhA1r1nUwKj7+rGyY=";
+    fetchSubmodules = true;
   };
 
   buildPhase = "make CXX=$CXX";
diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix
index a2de1d8fad3a..b0d63905ff96 100644
--- a/pkgs/servers/rippled/data-api.nix
+++ b/pkgs/servers/rippled/data-api.nix
@@ -1,4 +1,4 @@
-{ lib, fetchgit, nodePackages }:
+{ lib, fetchFromGitHub, nodePackages }:
 
 with lib;
 
@@ -6,13 +6,13 @@ let
   np = nodePackages.override { generated = ./package.nix; self = np; };
 in nodePackages.buildNodePackage rec {
   pname = "ripple-data-api";
-  version = lib.strings.substring 0 7 rev;
-  rev = "c56b860105f36c1c44ae011189d495272648c589";
+  version = "unstable-2015-03-26";
 
-  src = fetchgit {
-    url = "https://github.com/ripple/ripple-data-api.git";
-    inherit rev;
-    sha256 = "1iygp26ilradxj268g1l2y93cgrpchqwn71qdag67lv273dbq48m";
+  src = fetchFromGitHub {
+    owner = "ripple";
+    repo = "ripple-data-api";
+    rev = "c56b860105f36c1c44ae011189d495272648c589";
+    sha256 = "sha256-QEBdYdW55sAz6jshIAr2dSfXuqE/vqA2/kBeoxf75a8=";
   };
 
   deps = (filter (v: nixType v == "derivation") (attrValues np));
diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix
index 2ae3d9f486fb..d44885360f9a 100644
--- a/pkgs/servers/scylladb/default.nix
+++ b/pkgs/servers/scylladb/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchgit,
+  fetchFromGitHub,
   python3Packages,
   pkg-config,
   gcc8Stdenv,
@@ -34,10 +34,11 @@ gcc8Stdenv.mkDerivation {
   pname = "scylladb";
   version = "3.0.5";
 
-  src = fetchgit {
-    url = "https://github.com/scylladb/scylla.git";
+  src = fetchFromGitHub {
+    owner = "scylladb";
+    repo = "scylla";
     rev = "403f66ecad6bc773712c69c4a80ebd172eb48b13";
-    sha256 = "14mg0kzpkrxvwqyiy19ndy4rsc7s5gnv2gwd3xdwm1lx1ln8ywsi";
+    sha256 = "sha256-UXOPLA2dhspbH40/se0r+jCdiW82BR895rvnef8Er5I=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix
index 04f1e14d5ccf..85731d14d63f 100644
--- a/pkgs/servers/web-apps/morty/default.nix
+++ b/pkgs/servers/web-apps/morty/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "morty";
@@ -6,10 +6,11 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/asciimoo/morty";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
+    owner = "asciimoo";
+    repo = "morty";
     rev = "v${version}";
-    url = "https://github.com/asciimoo/morty";
-    sha256 = "1wvrdlwbpzizfg7wrcfyf1x6qllp3aw425n88z516wc9jalfqrrm";
+    sha256 = "sha256-NWfsqJKJcRPKR8gWQbgal1JsenDesczPcz/+uzhtefM=";
   };
 
   goDeps = ./deps.nix;
@@ -37,6 +38,6 @@ buildGoPackage rec {
       * No Caching/Etag
       * Supports GET/POST forms and IFrames
       * Optional HMAC URL verifier key to prevent service abuse
-'';
-   };
+    '';
+  };
 }
diff --git a/pkgs/tools/admin/bash-my-aws/default.nix b/pkgs/tools/admin/bash-my-aws/default.nix
index 7d2f878f742d..9ca14bbe3376 100644
--- a/pkgs/tools/admin/bash-my-aws/default.nix
+++ b/pkgs/tools/admin/bash-my-aws/default.nix
@@ -3,19 +3,20 @@
 , awscli
 , jq
 , unixtools
-, fetchgit
+, fetchFromGitHub
 , installShellFiles
 , bashInteractive
 }:
 
 stdenv.mkDerivation rec {
   pname = "bash-my-aws";
-  version = "20200111";
+  version = "unstable-2020-01-11";
 
-  src = fetchgit {
-    url = "https://github.com/bash-my-aws/bash-my-aws";
+  src = fetchFromGitHub {
+    owner = "bash-my-aws";
+    repo = "bash-my-aws";
     rev = "5a97ce2c22affca1299022a5afa109d7b62242ba";
-    sha256 = "459bda8b244af059d96c7c8b916cf956b01cb2732d1c2888a3ae06a4d660bea6";
+    sha256 = "sha256-RZvaiyRK8FnZbHyLkWz5VrAcsnMtHCiIo64GpNZgvqY=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index 852f538d6e31..7df594d88ece 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -1,13 +1,14 @@
-{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }:
+{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchFromGitHub, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }:
 
 stdenv.mkDerivation {
   pname = "gvolicon";
   version = "unstable-2014-04-28";
 
-  src = fetchgit {
-    url = "https://github.com/Unia/gvolicon";
+  src = fetchFromGitHub {
+    owner = "Unia";
+    repo = "gvolicon";
     rev = "0d65a396ba11f519d5785c37fec3e9a816217a07";
-    sha256 = "1sr9wyy7w898vq63yd003yp3k66hd4vm8b0qsm9zvmwmpiz4wvln";
+    sha256 = "sha256-lm5OfryV1/1T1RgsVDdp0Jg5rh8AND8M3ighfrznKes=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix
index 624bcc08b41f..2d764d2f7da0 100644
--- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix
+++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }:
+{ lib, stdenv, fetchFromGitHub, cmake, libtiff, pkg-config, tesseract }:
 
 stdenv.mkDerivation rec {
   pname = "vobsub2srt";
   version = "unstable-2014-08-17";
-  rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/ruediger/VobSub2SRT.git";
-    sha256 = "1rpanrv8bgdh95v2320qbd44xskncvq6y84cbbfc86gw0qxpd9cb";
+  src = fetchFromGitHub {
+    owner = "ruediger";
+    repo = "VobSub2SRT";
+    rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
+    sha256 = "sha256-i6V2Owb8GcTcWowgb/BmdupOSFsYiCF2SbC9hXa26uY=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
index bd6e0fe67fc2..6a05d71d0218 100644
--- a/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ b/pkgs/tools/filesystems/go-mtpfs/default.nix
@@ -1,20 +1,20 @@
-{ pkg-config, libusb1, buildGoPackage, fetchgit }:
+{ pkg-config, libusb1, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-mtpfs";
-  version = "2018-02-09";
-  rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb";
+  version = "unstable-2018-02-09";
 
   goPackagePath = "github.com/hanwen/go-mtpfs";
 
+  src = fetchFromGitHub {
+    owner = "hanwen";
+    repo = "go-mtpfs";
+    rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb";
+    sha256 = "sha256-sz+ikhZGwSIAI2YBSQKURF3WXB8dHgQ/C/dbkXwrDSg=";
+  };
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libusb1 ];
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/hanwen/go-mtpfs";
-    sha256 = "0a0d5dy92nzp1czh87hx3xfdcpa4jh14j0b64c025ha62s9a4gxk";
-  };
-
   goDeps = ./deps.nix;
 }
diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix
index ad48eae7a87f..79dd9d6b538b 100644
--- a/pkgs/tools/misc/azure-vhd-utils/default.nix
+++ b/pkgs/tools/misc/azure-vhd-utils/default.nix
@@ -1,17 +1,16 @@
-# This file was generated by go2nix.
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "azure-vhd-utils";
-  version = "20160614-${lib.strings.substring 0 7 rev}";
-  rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
+  version = "unstable-2016-06-14";
 
   goPackagePath = "github.com/Microsoft/azure-vhd-utils";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/Microsoft/azure-vhd-utils";
-    sha256 = "0b9kbavlb92rhnb1swwq8bdn4l9a994rmf1ywyfq4yc0kd3gnhgh";
+  src = fetchFromGitHub {
+    owner = "Microsoft";
+    repo = "azure-vhd-utils";
+    rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
+    sha256 = "sha256-8EH7RpuAeYKd5z64mklKKlFi20KYcx2WhVmkRbdaMy0=";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index 5c7953a766ee..bd102e868aeb 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -1,18 +1,16 @@
-{ lib, buildGoPackage, fetchgit }:
-
-with builtins;
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gawp";
-  version = "20160121-${lib.strings.substring 0 7 rev}";
-  rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
+  version = "unstable-2016-01-21";
 
   goPackagePath = "github.com/martingallagher/gawp";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/martingallagher/gawp";
-    sha256 = "0bbmbb1xxdgvqvg1ssn9d4j213li7bbbx3y42iz4fs10xv7x4r0c";
+  src = fetchFromGitHub {
+    owner = "martingallagher";
+    repo = "gawp";
+    rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
+    sha256 = "sha256-DGTSz+4gaEd+FMSPvtY6kY4gJGnJah3exvu13sNadS0=";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix
index 033883ab1c8c..d4c233007d26 100644
--- a/pkgs/tools/misc/gosu/default.nix
+++ b/pkgs/tools/misc/gosu/default.nix
@@ -1,16 +1,16 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gosu";
-  version = "2017-05-09";
-  rev = "e87cf95808a7b16208515c49012aa3410bc5bba8";
+  version = "unstable-2017-05-09";
 
   goPackagePath = "github.com/tianon/gosu";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/tianon/gosu";
-    sha256 = "1qp1cfx0hrr4qlnh7rhjb4xlxv9697flmgzzl6jcdkrpk1f0bz8m";
+  src = fetchFromGitHub {
+    owner = "tianon";
+    repo = "gosu";
+    rev = "e87cf95808a7b16208515c49012aa3410bc5bba8";
+    sha256 = "sha256-Ff0FXJg3z8akof+/St1JJu1OO1kS5gMtxSRnCLpj4eI=";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index 13f3c42faa46..4947949ac5bb 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -1,5 +1,20 @@
-{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python2, autoconf, automake
-, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2
+{ lib
+, stdenv
+, fetchurl
+, fetchFromGitHub
+, fetchpatch
+, autogen
+, flex
+, bison
+, python2
+, autoconf
+, automake
+, gettext
+, ncurses
+, libusb-compat-0_1
+, freetype
+, qemu
+, lvm2
 , for_HP_laptop ? false
 }:
 
@@ -32,17 +47,15 @@ stdenv.mkDerivation rec {
   pname = "trustedGRUB2";
   inherit version;
 
-  src = if for_HP_laptop
-        then fetchgit {
-          url = "https://github.com/Sirrix-AG/TrustedGRUB2";
-          rev = "ab483d389bda3115ca0ae4202fd71f2e4a31ad41";
-          sha256 = "1760d9hsnqkdvlag9nn8f613mqhnsxmidgvdkpmb37b0yi7p6lhz";
-        }
-        else fetchgit {
-          url = "https://github.com/Sirrix-AG/TrustedGRUB2";
-          rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76";
-          sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k";
-        };
+  src = fetchFromGitHub {
+    owner = "Sirrix-AG";
+    repo = "TrustedGRUB2";
+    rev = version;
+    sha256 =
+      if for_HP_laptop
+      then "sha256-H1JzT/RgnbHqnW2/FmvXFuI6gnHI2vQU3W1iq2FqwJw="
+      else "sha256-k8DGHjTIpnjWw7GNN2kyR8rRl2MAq1xkfOndd0znLns=";
+  };
 
   nativeBuildInputs = [ autogen flex bison python2 autoconf automake ];
   buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ]
@@ -91,9 +104,10 @@ stdenv.mkDerivation rec {
   ];
 
   # save target that grub is compiled for
-  grubTarget = if inPCSystems
-               then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"
-               else "";
+  grubTarget =
+    if inPCSystems
+    then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"
+    else "";
 
   doCheck = false;
   # On -j16 races with early header creation:
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
index e91b17856ed7..79e93847932f 100644
--- a/pkgs/tools/misc/i3cat/default.nix
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -1,17 +1,24 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "i3cat";
-  version = "20150321-${lib.strings.substring 0 7 rev}";
-  rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
+  version = "1.0";
 
   goPackagePath = "github.com/vincent-petithory/i3cat";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/vincent-petithory/i3cat";
-    sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72";
+  src = fetchFromGitHub {
+    owner = "vincent-petithory";
+    repo = "i3cat";
+    rev = "v${version}";
+    sha256 = "sha256-BxiiYzSjvXAMUQSUTKviLvrmGjkCLW6QPrgBBHvvF+Q=";
   };
 
   goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "combine multiple i3bar JSON inputs into one to forward to i3bar";
+    homepage = "https://vincent-petithory.github.io/i3cat/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+  };
 }
diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix
index c299a140b079..d6c336990cf0 100644
--- a/pkgs/tools/misc/sdl-jstest/default.nix
+++ b/pkgs/tools/misc/sdl-jstest/default.nix
@@ -1,14 +1,15 @@
-{ lib, stdenv, fetchgit, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }:
 
 stdenv.mkDerivation {
   pname = "sdl-jstest";
   version = "2018-06-15";
 
-  # Submodules
-  src = fetchgit {
-    url = "https://github.com/Grumbel/sdl-jstest";
+  src = fetchFromGitHub {
+    owner = "Grumbel";
+    repo = "sdl-jstest";
     rev = "aafbdb1ed3e687583037ba55ae88b1210d6ce98b";
-    sha256 = "0p4cjzcq0bbkzad19jwdklylqhq2q390q7dpg8bfzl2rwls883rk";
+    sha256 = "sha256-Mw+ENOVZ0O8WercdDNLAAkNMPZ2NyxSa+nMtgNmXjFw=";
+    fetchSubmodules = true;
   };
 
   buildInputs = [ SDL SDL2 ncurses ];
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
index 79460f3a5b79..c46ad10a40af 100644
--- a/pkgs/tools/misc/upower-notify/default.nix
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix:
 #
@@ -8,16 +8,22 @@
 # '';
 buildGoPackage rec {
   pname = "upower-notify";
-  version = "20160310-${lib.strings.substring 0 7 rev}";
-  rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
+  version = "unstable-2016-03-10";
 
   goPackagePath = "github.com/omeid/upower-notify";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/omeid/upower-notify";
+  src = fetchFromGitHub {
+    owner = "omeid";
+    repo = "upower-notify";
+    rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
     sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw";
   };
 
   goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "simple tool to give you Desktop Notifications about your battery";
+    homepage = "https://github.com/omeid/upower-notify";
+    maintainers = with maintainers; [ kamilchm ];
+  };
 }
diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix
index 7a4bd5adcba0..3fa3988dfa07 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/pkgs/tools/networking/bud/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, lib, fetchgit, python2, util-linux }:
+{ stdenv, lib, fetchFromGitHub, python2, util-linux }:
 
 stdenv.mkDerivation {
   pname = "bud";
-
   version = "0.34.1";
 
-  src = fetchgit {
-    url = "https://github.com/indutny/bud.git";
+  src = fetchFromGitHub {
+    owner = "indutny";
+    repo = "bud";
     rev = "b112852c9667632f692d2ce3dcd9a8312b61155a";
-    sha256 = "08yr6l4lc2m6rng06253fcaznf6sq0v053wfr8bbym42c32z0xdh";
+    sha256 = "sha256-sHXwxWCCVL8Wyo6PAjbA2jj7FXOjCAOezaYKRgk12SM=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix
index 4623b68ad4cf..19422c3ec8e2 100644
--- a/pkgs/tools/networking/s3gof3r/default.nix
+++ b/pkgs/tools/networking/s3gof3r/default.nix
@@ -1,17 +1,24 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "s3gof3r";
-  version = "20151109-${lib.strings.substring 0 7 rev}";
-  rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445";
+  version = "0.5.0";
 
   goPackagePath = "github.com/rlmcpherson/s3gof3r";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/rlmcpherson/s3gof3r";
-    sha256 = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k";
+  src = fetchFromGitHub {
+    owner = "rlmcpherson";
+    repo = "s3gof3r";
+    rev = "v${version}";
+    sha256 = "sha256-88C6c4DRD/4ePTO1+1YiI8ApXWE2uUlr07dDCxGzaoE=";
   };
 
   goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "Fast, concurrent, streaming access to Amazon S3, including gof3r, a CLI";
+    homepage = "https://pkg.go.dev/github.com/rlmcpherson/s3gof3r";
+    maintainers = with maintainers; [ ];
+    license = licenses.mit;
+  };
 }
diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix
index feb17b283de5..4190e8102147 100644
--- a/pkgs/tools/networking/ua/default.nix
+++ b/pkgs/tools/networking/ua/default.nix
@@ -1,19 +1,19 @@
-{ lib, buildGoPackage, fetchgit
+{ lib, buildGoPackage, fetchFromGitHub
 , pkg-config
 , glib, libxml2
 }:
 
 buildGoPackage rec {
-  pname = "ua-unstable";
-  version = "2017-02-24";
-  rev = "325dab92c60e0f028e55060f0c288aa70905fb17";
+  pname = "ua";
+  version = "unstable-2017-02-24";
 
   goPackagePath = "github.com/sloonz/ua";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/sloonz/ua.git";
-    sha256 = "0452qknc8km9495324g6b5ja3shvk8jl7aa9nrjhdylf09dp2nif";
+  src = fetchFromGitHub {
+    owner = "sloonz";
+    repo = "ua";
+    rev = "325dab92c60e0f028e55060f0c288aa70905fb17";
+    sha256 = "sha256-LlpxWwKO+gZltkmpQyWaG+qhZFnmETFKIqlOxOzEohA=";
   };
 
   goDeps = ./deps.nix;
@@ -21,11 +21,10 @@ buildGoPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib libxml2 ];
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/sloonz/ua";
-    license = lib.licenses.isc;
+    license = licenses.isc;
     description = "Universal Aggregator";
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ ttuegel ];
+    maintainers = with maintainers; [ ttuegel ];
   };
 }
diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix
index c37d82024fe6..4f2f634d4942 100644
--- a/pkgs/tools/networking/waitron/default.nix
+++ b/pkgs/tools/networking/waitron/default.nix
@@ -1,17 +1,16 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-{ lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ lib, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   pname = "waitron";
   version = "unstable-2020-01-24";
-  rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6";
 
   goPackagePath = "github.com/ns1/waitron";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/ns1/waitron";
-    sha256 = "0lgw37iq1cvg3mqc94nzf0027mvv721ay8x6dw3fc814ww8a2hb6";
+  src = fetchFromGitHub {
+    owner = "ns1";
+    repo = "waitron";
+    rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6";
+    sha256 = "sha256-ZkGhEOckIOYGb6Yjr4I4e9cjAHDfksRwHW+zgOMZ/FE=";
   };
 
   patches = [
diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix
index 4aab72cb5dfc..6063cdecc67a 100644
--- a/pkgs/tools/security/tpm-luks/default.nix
+++ b/pkgs/tools/security/tpm-luks/default.nix
@@ -1,13 +1,14 @@
-{ lib, stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, gawk, trousers, cryptsetup, openssl }:
 
 stdenv.mkDerivation {
   pname = "tpm-luks";
   version = "unstable-2015-07-11";
 
-  src = fetchgit {
-    url = "https://github.com/momiji/tpm-luks";
+  src = fetchFromGitHub {
+    owner = "momiji";
+    repo = "tpm-luks";
     rev = "c9c5b7fdddbcdac1cd4d2ea6baddd0617cc88ffa";
-    sha256 = "1ms2v57f13r9km6mvf9rha5ndmlmjvrz3mcikai6nzhpj0nrjz0w";
+    sha256 = "sha256-HHyZLZAXfmuimpHV8fOWldZmi4I5uV1NnSmP4E7ZQtc=";
   };
 
   patches = [
diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix
index 65be63bffe12..ec7eb2b173d0 100644
--- a/pkgs/tools/system/das_watchdog/default.nix
+++ b/pkgs/tools/system/das_watchdog/default.nix
@@ -1,13 +1,14 @@
-{ lib, stdenv, fetchgit, libgtop, xmessage, which, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, libgtop, xmessage, which, pkg-config }:
 
 stdenv.mkDerivation {
   pname = "das_watchdog";
   version = "unstable-2015-09-12";
 
-  src = fetchgit {
-    url = "https://github.com/kmatheussen/das_watchdog.git";
+  src = fetchFromGitHub {
+    owner = "kmatheussen";
+    repo = "das_watchdog";
     rev = "5ac0db0b98e5b4e690aca0aa7fb6ec60ceddcb06";
-    sha256 = "02y1vfb3wh4908xjj1kpyf8kgxk29x8dw7yl3pnl220qz2gi99vr";
+    sha256 = "sha256-eacUn/gYCEHtHdQf3lBPYvY3kfN3Bik7AolAPpbbwQs=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix
index 9c3e9fbd8409..40ee8c58fbcc 100644
--- a/pkgs/tools/text/codesearch/default.nix
+++ b/pkgs/tools/text/codesearch/default.nix
@@ -1,24 +1,22 @@
-# This file was generated by go2nix.
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "codesearch";
-  version = "20150717-${lib.strings.substring 0 7 rev}";
-  rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
+  version = "1.0.0";
 
   goPackagePath = "github.com/google/codesearch";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/google/codesearch";
-    sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny";
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "codesearch";
+    rev = "v${version}";
+    sha256 = "sha256-3kJ/JT89krbIvprWayBL4chUmT77Oa1W13UNCr4fe4k=";
   };
 
-  meta = {
+  meta = with lib; {
     description = "Fast, indexed regexp search over large file trees";
     homepage = "https://github.com/google/codesearch";
-    license = [ lib.licenses.bsd3 ];
-    maintainers = [ lib.maintainers.bennofs ];
-    platforms = lib.platforms.unix;
+    license = [ licenses.bsd3 ];
+    maintainers = with maintainers; [ bennofs ];
   };
 }