diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/IPy/default.nix
index 05587ef07401b..7e5a6c79ec12f 100644
--- a/pkgs/development/python-modules/IPy/default.nix
+++ b/pkgs/development/python-modules/IPy/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, nose }:
+{ lib, buildPythonPackage, fetchFromGitHub, nose }:
 
 buildPythonPackage rec {
   pname = "IPy";
   version = "1.01";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "edeca741dea2d54aca568fa23740288c3fe86c0f3ea700344571e9ef14a7cc1a";
+  src = fetchFromGitHub {
+     owner = "autocracy";
+     repo = "python-ipy";
+     rev = "IPy-1.01";
+     sha256 = "106rirmirlpb5ppznn3fd8189a8z02zf99jvk6j4hcq05ajclfc6";
   };
 
   checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/JayDeBeApi/default.nix b/pkgs/development/python-modules/JayDeBeApi/default.nix
index 0263b4b752d4b..311064997d035 100644
--- a/pkgs/development/python-modules/JayDeBeApi/default.nix
+++ b/pkgs/development/python-modules/JayDeBeApi/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , JPype1
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "JayDeBeApi";
   version = "1.2.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f25e9307fbb5960cb035394c26e37731b64cc465b197c4344cee85ec450ab92f";
+  src = fetchFromGitHub {
+     owner = "baztian";
+     repo = "jaydebeapi";
+     rev = "v1.2.3";
+     sha256 = "08xhrxmc167hdylzvjfi392q0a6v2g9lwwr4nprlr2fbqfq2h29y";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix
index 480970f04a111..ee04c1aa8f3a4 100644
--- a/pkgs/development/python-modules/Theano/default.nix
+++ b/pkgs/development/python-modules/Theano/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv
 , runCommandCC
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
 , isPyPy
 , pythonOlder
@@ -47,9 +47,11 @@ in buildPythonPackage rec {
 
   disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "129f43ww2a6badfdr6b88kzjzz2b0wk0dwkvwb55z6dsagfkk53f";
+  src = fetchFromGitHub {
+     owner = "Theano";
+     repo = "Theano";
+     rev = "rel-1.0.5";
+     sha256 = "08m2awwfybg7c1kcafjw3km9c0bldp5rsff3vm20syfmv145q0qq";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/aadict/default.nix b/pkgs/development/python-modules/aadict/default.nix
index de3ec6fa7f051..cf6c899acfcd3 100644
--- a/pkgs/development/python-modules/aadict/default.nix
+++ b/pkgs/development/python-modules/aadict/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , six
 , nose
 , coverage
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "aadict";
   version = "0.2.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "013pn9ii6mkql6khgdvsd1gi7zmya418fhclm5fp7dfvann2hwx7";
+  src = fetchFromGitHub {
+     owner = "metagriffin";
+     repo = "aadict";
+     rev = "v0.2.3";
+     sha256 = "0419s6jdz99ibd949bj5i2sdlqcjah7crh9c5xywjwl1li8dwgin";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix
index e888d1241a506..bdb29e4e5b999 100644
--- a/pkgs/development/python-modules/acoustics/default.nix
+++ b/pkgs/development/python-modules/acoustics/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , matplotlib
 , numpy
 , pandas
@@ -16,9 +16,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a162625e5e70ed830fab8fab0ddcfe35333cb390cd24b0a827bcefc5bbcae97d";
+  src = fetchFromGitHub {
+     owner = "python-acoustics";
+     repo = "python-acoustics";
+     rev = "v0.2.4.post0";
+     sha256 = "0fhj02611590rci5vb2r236jn1jbj3zaaza40dfw6rqx9jwfqizn";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/addict/default.nix b/pkgs/development/python-modules/addict/default.nix
index 2bb531cff908d..94502bf3abf1f 100644
--- a/pkgs/development/python-modules/addict/default.nix
+++ b/pkgs/development/python-modules/addict/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytestCheckHook
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "addict";
   version = "2.4.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494";
+  src = fetchFromGitHub {
+     owner = "mewwts";
+     repo = "addict";
+     rev = "v2.4.0";
+     sha256 = "1dcqwmi6xbcc7zmsmq3djhvbybsz806lh837sgbrxppcmw2sfma3";
   };
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/affine/default.nix b/pkgs/development/python-modules/affine/default.nix
index 89062cde4d977..73f8d201fc334 100644
--- a/pkgs/development/python-modules/affine/default.nix
+++ b/pkgs/development/python-modules/affine/default.nix
@@ -1,12 +1,14 @@
-{ buildPythonPackage, pytest, lib, fetchPypi }:
+{ buildPythonPackage, pytest, lib, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "affine";
   version = "2.3.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "00jil4q3b17qml6azim7s7zar6qb1vhsf0g888y637m23bpms11f";
+  src = fetchFromGitHub {
+     owner = "sgillies";
+     repo = "affine";
+     rev = "2.3.0";
+     sha256 = "1nj4sfgm3ri36zaapvpz9k7bwzgc7m569rwgq0p5nhi8f480adv0";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix
index c2e741bef1769..e274dc6aea915 100644
--- a/pkgs/development/python-modules/agate-sql/default.nix
+++ b/pkgs/development/python-modules/agate-sql/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , isPy27
-, fetchPypi
+, fetchFromGitHub
 , agate
 , sqlalchemy
 , crate
@@ -15,9 +15,11 @@ buildPythonPackage rec {
 
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "581e062ae878cc087d3d0948670d46b16589df0790bf814524b0587a359f2ada";
+  src = fetchFromGitHub {
+     owner = "wireservice";
+     repo = "agate-sql";
+     rev = "0.5.8";
+     sha256 = "1l9mnm5jifxp69v9qdfh1lw2j093jancj6v37hvsmn8x3qr64h00";
   };
 
   propagatedBuildInputs = [ agate sqlalchemy ];
diff --git a/pkgs/development/python-modules/aioapns/default.nix b/pkgs/development/python-modules/aioapns/default.nix
index 47e8de0f8d26a..212a70f7238d9 100644
--- a/pkgs/development/python-modules/aioapns/default.nix
+++ b/pkgs/development/python-modules/aioapns/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , h2
 , lib
 , pyjwt
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "aioapns";
   version = "2.0.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ea58ce685aa6d0ffbdc3be4a6999c7268b9c765f806d3e4da7677c098fb72cbc";
+  src = fetchFromGitHub {
+     owner = "Fatal1ty";
+     repo = "aioapns";
+     rev = "v2.0.2";
+     sha256 = "1k3j3ciffzvyvia1h2abn6y4w7w2ckfbcs8d4apx4wyp1gwnf05w";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix
index 3568e98a59ecc..8b1410c560f78 100644
--- a/pkgs/development/python-modules/aioazuredevops/default.nix
+++ b/pkgs/development/python-modules/aioazuredevops/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , isPy27
-, fetchPypi
+, fetchFromGitHub
 , aiohttp
 , click
 }:
@@ -12,9 +12,11 @@ buildPythonPackage rec {
 
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4c98a995d0516f502ba191fa3ac973ee72b93425e7eab3cdf770516c6e93c780";
+  src = fetchFromGitHub {
+     owner = "timmo001";
+     repo = "aioazuredevops";
+     rev = "v1.3.5";
+     sha256 = "033710qa0l7r67x9813kr5ari5p2qrf1zjp1zj2c8wvd084h8jfy";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix
index 9fbbbac43ef8a..b26543a5b91f9 100644
--- a/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/pkgs/development/python-modules/aiobotocore/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , wrapt
 , aioitertools
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   version = "1.4.2";
   disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c2f4ef325aaa839e9e2a53346b4c1c203656783a4985ab36fd4c2a9ef2dc1d2b";
+  src = fetchFromGitHub {
+     owner = "aio-libs";
+     repo = "aiobotocore";
+     rev = "1.4.2";
+     sha256 = "11wvcsxpzbfz4iwvr35lvpf5padfnkfydrnr9m9m9virila8npgl";
   };
 
   # relax version constraints: aiobotocore works with newer botocore versions
diff --git a/pkgs/development/python-modules/aiocron/default.nix b/pkgs/development/python-modules/aiocron/default.nix
index 56f3561d84f34..a3ea3b33c6066 100644
--- a/pkgs/development/python-modules/aiocron/default.nix
+++ b/pkgs/development/python-modules/aiocron/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python
 , croniter
 , tzlocal
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "aiocron";
   version = "1.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-SFRlE/ry63kB5lpk66e2U8gBBu0A7ZyjQZw9ELZVWgE=";
+  src = fetchFromGitHub {
+     owner = "gawel";
+     repo = "aiocron";
+     rev = "1.8";
+     sha256 = "1j8x7wx0ga7g1r84xbrcm7hmw7zd42z6qhws41fdjq0g2j1lncg9";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix
index fea1956e3311a..64d920f70f295 100644
--- a/pkgs/development/python-modules/aioharmony/default.nix
+++ b/pkgs/development/python-modules/aioharmony/default.nix
@@ -2,7 +2,7 @@
 , aiohttp
 , async-timeout
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , slixmpp
 }:
@@ -13,9 +13,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0adf08955810a227db489556dc3ca808e4f825a00183f613797856114c2a2a47";
+  src = fetchFromGitHub {
+     owner = "ehendrix23";
+     repo = "aioharmony";
+     rev = "v0.2.8";
+     sha256 = "1k6smns8klvymd7h6649454ssg3z66xl886lhzm2gqj33yw4c0cf";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aiohttp-cors/default.nix b/pkgs/development/python-modules/aiohttp-cors/default.nix
index fc5dc87f4ef2a..b8a08183c7c9e 100644
--- a/pkgs/development/python-modules/aiohttp-cors/default.nix
+++ b/pkgs/development/python-modules/aiohttp-cors/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
 , typing ? null, aiohttp
 }:
 
@@ -6,9 +6,11 @@ buildPythonPackage rec {
   pname = "aiohttp-cors";
   version = "0.7.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0pczn54bqd32v8zhfbjfybiza6xh1szwxy6as577dn8g23bwcfad";
+  src = fetchFromGitHub {
+     owner = "aio-libs";
+     repo = "aiohttp-cors";
+     rev = "v0.7.0";
+     sha256 = "1zmh6c76r4qrn9wsndqcd7j9xnnd8g8glazl63gnkrfhqrsx51sd";
   };
 
   disabled = pythonOlder "3.5";
diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
index 890a37e24dd3c..3b0c1fcb7ee35 100644
--- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix
+++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytest-cov }:
+{ lib, buildPythonPackage, fetchFromGitHub, aiohttp, jinja2, pytest, pytest-aiohttp, pytest-cov }:
 
 buildPythonPackage rec {
   pname = "aiohttp-jinja2";
   version = "1.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "7c3ba5eac060b691f4e50534af2d79fca2a75712ebd2b25e6fcb1295859f910b";
+  src = fetchFromGitHub {
+     owner = "aio-libs";
+     repo = "aiohttp_jinja2";
+     rev = "v1.5";
+     sha256 = "0f2qxzsjd0jqgd7zzmc0n9j4pknx4axfpsj6ldpfhpmxb4dczyjs";
   };
 
   propagatedBuildInputs = [ aiohttp jinja2 ];
diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix
index 5aba9f4f1c005..58481d8ed97ac 100644
--- a/pkgs/development/python-modules/aiohue/default.nix
+++ b/pkgs/development/python-modules/aiohue/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , aiohttp
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "aiohue";
   version = "3.0.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "8aaee7fef3fff4c9271728c645896226f3df1e00bfab8dcea2456edfb3395fd0";
+  src = fetchFromGitHub {
+     owner = "home-assistant-libs";
+     repo = "aiohue";
+     rev = "3.0.2";
+     sha256 = "03sdqlc1k9dp4k8wna1rknflh8mkmwwj0r0b5wq5w3fik2mjr8gz";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aioinflux/default.nix b/pkgs/development/python-modules/aioinflux/default.nix
index 25aa7f587b25c..15ea57071fa64 100644
--- a/pkgs/development/python-modules/aioinflux/default.nix
+++ b/pkgs/development/python-modules/aioinflux/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , aiohttp
 , ciso8601
 , pandas
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "aioinflux";
   version = "0.9.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1jy5mcg9wdz546s9wdwsgkxhm2ac4dmphd9vz243db39j1m0a3bj";
+  src = fetchFromGitHub {
+     owner = "gusutabopb";
+     repo = "aioinflux";
+     rev = "v0.9.0";
+     sha256 = "0cvzkd05i8bzh76m75s7na2gb0kh5msyyz60ajxpj2by9x6qkxmc";
   };
 
   propagatedBuildInputs = [ aiohttp ciso8601 pandas ];
diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix
index 100405c1abedf..09f3c8a4ae927 100644
--- a/pkgs/development/python-modules/aiolifx/default.nix
+++ b/pkgs/development/python-modules/aiolifx/default.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
 , pythonOlder
 , ifaddr
@@ -12,9 +12,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-9FwTYcaXwGMMnhp+MXe1Iu8Og5aHL6qo9SVKWHFtc7o=";
+  src = fetchFromGitHub {
+     owner = "frawau";
+     repo = "aiolifx";
+     rev = "0.7.0";
+     sha256 = "10zyfpd5n607rpd07an15sh2vxdp1jm2d2adafl5mn9v8d72pwfm";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix
index a4571a79b05d0..6222c597c1c3b 100644
--- a/pkgs/development/python-modules/aioprocessing/default.nix
+++ b/pkgs/development/python-modules/aioprocessing/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 }:
 
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   version = "2.0.0";
   disabled = pythonOlder "3.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "469dfb746e8c4e0c727ba135cfabf9e034c554f6a73c27f908bfe3625dd74b9e";
+  src = fetchFromGitHub {
+     owner = "dano";
+     repo = "aioprocessing";
+     rev = "v2.0.0";
+     sha256 = "007wfapyydicj9a7pliiacnx0hzfbi21ryn9qzhydf06zsshz2rf";
   };
 
   # Tests aren't included in pypi package
diff --git a/pkgs/development/python-modules/aiopulse/default.nix b/pkgs/development/python-modules/aiopulse/default.nix
index c2d4add41daca..7ab56ee77cfe0 100644
--- a/pkgs/development/python-modules/aiopulse/default.nix
+++ b/pkgs/development/python-modules/aiopulse/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , async-timeout
 , pythonOlder
 }:
@@ -12,9 +12,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-Wp8NUjRlO+6ASqIt3C0YJRh0EKcEukXVMp4I+TCTElo=";
+  src = fetchFromGitHub {
+     owner = "atmurray";
+     repo = "aiopulse";
+     rev = "v0.4.3";
+     sha256 = "15kwil3y3a0jlh01vm4bmrvxmxmhchqrpg01vv58x22ylli9j8ki";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ajsonrpc/default.nix b/pkgs/development/python-modules/ajsonrpc/default.nix
index b3482cd746797..8c2b54a7d8d84 100644
--- a/pkgs/development/python-modules/ajsonrpc/default.nix
+++ b/pkgs/development/python-modules/ajsonrpc/default.nix
@@ -1,4 +1,4 @@
-{ lib, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook }:
+{ lib, pythonOlder, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "ajsonrpc";
@@ -6,9 +6,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "791bac18f0bf0dee109194644f151cf8b7ff529c4b8d6239ac48104a3251a19f";
+  src = fetchFromGitHub {
+     owner = "pavlov99";
+     repo = "ajsonrpc";
+     rev = "1.2.0";
+     sha256 = "0c7jxfkv5q2m95j54dn650gcvdbpag2qcki7phvmrwsgb36w09kd";
   };
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix
index 72eda332f9519..5e7024095741d 100644
--- a/pkgs/development/python-modules/alabaster/default.nix
+++ b/pkgs/development/python-modules/alabaster/default.nix
@@ -1,13 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchFromGitHub
 , pygments }:
 
 buildPythonPackage rec {
   pname = "alabaster";
   version = "0.7.12";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02";
+  src = fetchFromGitHub {
+     owner = "bitprophet";
+     repo = "alabaster";
+     rev = "0.7.12";
+     sha256 = "1j84iy6bqn73pm3npz25vpyzyqbg3k05zpz7605rylcid59m0hkq";
   };
 
   propagatedBuildInputs = [ pygments ];
diff --git a/pkgs/development/python-modules/alectryon/default.nix b/pkgs/development/python-modules/alectryon/default.nix
index 08fcd9f9651f5..84cda54b147fc 100644
--- a/pkgs/development/python-modules/alectryon/default.nix
+++ b/pkgs/development/python-modules/alectryon/default.nix
@@ -1,13 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchFromGitHub
 , pygments, dominate, beautifulsoup4, docutils, sphinx }:
 
 buildPythonPackage rec {
   pname = "alectryon";
   version = "1.4.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "00cxzfifvgcf3d3s8lsj1yxcwyf3a1964p86fj7b42q8pa0b4r3i";
+  src = fetchFromGitHub {
+     owner = "cpitclaudel";
+     repo = "alectryon";
+     rev = "v1.4.0";
+     sha256 = "1vpsddfjxpvylq70r7ip6c0iaqn10jdkxmwd93r1zzkxg30hzsf3";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix
index 9e1aac84f307b..bd81f446e8958 100644
--- a/pkgs/development/python-modules/allpairspy/default.nix
+++ b/pkgs/development/python-modules/allpairspy/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, six, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, six, pytest }:
 
 buildPythonPackage rec {
   pname = "allpairspy";
   version = "2.5.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "9358484c91abe74ba18daf9d6d6904c5be7cc8818397d05248c9d336023c28b1";
+  src = fetchFromGitHub {
+     owner = "thombashi";
+     repo = "allpairspy";
+     rev = "v2.5.0";
+     sha256 = "1xdmvsq99jf687p44iwzzadlhqv0w2rffr3am127i7d80xj2w5bg";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index 6e686d9fc9073..3bdf8b832b863 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
 , entrypoints
 , glibcLocales
 , ipython
@@ -21,9 +21,11 @@ buildPythonPackage rec {
   version = "4.1.0";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0c99q5dy6f275yg1f137ird08wmwc1z8wmvjickkf2mvyka31p9y";
+  src = fetchFromGitHub {
+     owner = "altair-viz";
+     repo = "altair";
+     rev = "v4.1.0";
+     sha256 = "0da0ry4qdwwz40rw4rwx77y5jks9bq9s7l96jc55g0v13nwc1ar9";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix
index 6156472896ada..852d36953060d 100644
--- a/pkgs/development/python-modules/amqp/default.nix
+++ b/pkgs/development/python-modules/amqp/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, case, vine }:
 
 buildPythonPackage rec {
   pname = "amqp";
   version = "5.0.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "03e16e94f2b34c31f8bf1206d8ddd3ccaa4c315f7f6a1879b7b1210d229568c2";
+  src = fetchFromGitHub {
+     owner = "celery";
+     repo = "py-amqp";
+     rev = "v5.0.6";
+     sha256 = "1jp192bp8wjcq0z7y41hlxmh3iqm55s94f3k4dk7xhghp99yjifd";
   };
 
   propagatedBuildInputs = [ vine ];
diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix
index 9ea365079451c..0a1c7925555dd 100644
--- a/pkgs/development/python-modules/annexremote/default.nix
+++ b/pkgs/development/python-modules/annexremote/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   pname = "annexremote";
   version = "1.6.0";
 
-  # use fetchFromGitHub instead of fetchPypi because the test suite of
+  # use fetchFromGitHub instead of fetchFromGitHub because the test suite of
   # the package is not included into the PyPI tarball
   src = fetchFromGitHub {
     rev = "v${version}";
diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix
index d5f24492c90ae..34b0cc9c38b70 100644
--- a/pkgs/development/python-modules/annoy/default.nix
+++ b/pkgs/development/python-modules/annoy/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , h5py
 , nose
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   version = "1.17.0";
   pname = "annoy";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "9891e264041d1dcf3af42f67fbb16cb273c5404bc8c869d0915a3087f71d58dd";
+  src = fetchFromGitHub {
+     owner = "spotify";
+     repo = "annoy";
+     rev = "v1.17.0";
+     sha256 = "0s4q2srd3fqinjklcp7mg8c6k64vrwyl5m5dy7rdhi2swy03rwcn";
   };
 
   nativeBuildInputs = [ h5py ];
diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix
index d198fde80bb82..75ac168cb50f1 100644
--- a/pkgs/development/python-modules/ansi/default.nix
+++ b/pkgs/development/python-modules/ansi/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "ansi";
   version = "0.2.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "98e9b27c4bb187867a69480cbc63b843331622fec7e7d090873d806e1b5d8a80";
+  src = fetchFromGitHub {
+     owner = "tehmaze";
+     repo = "ansi";
+     rev = "ansi-0.2.0";
+     sha256 = "05ic2kf8bazj9f0yk63ifs3ap0y1naqn1y44z0w1z65phi9vay81";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix
index 07a8190727bc2..d3c02e99be7a2 100644
--- a/pkgs/development/python-modules/ansicolor/default.nix
+++ b/pkgs/development/python-modules/ansicolor/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "ansicolor";
   version = "0.3.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3b840a6b1184b5f1568635b1adab28147947522707d41ceba02d5ed0a0877279";
+  src = fetchFromGitHub {
+     owner = "numerodix";
+     repo = "ansicolor";
+     rev = "0.3.2";
+     sha256 = "1q5qahpvva9wdh5mv3a4a6iazx4jrdmc41ny1dyc8z40im9l1w3b";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix
index fa92bc44891ae..94c942646b38d 100644
--- a/pkgs/development/python-modules/anytree/default.nix
+++ b/pkgs/development/python-modules/anytree/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , substituteAll
 , six
@@ -16,9 +16,11 @@ buildPythonPackage rec {
   pname = "anytree";
   version = "2.8.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab";
+  src = fetchFromGitHub {
+     owner = "c0fec0de";
+     repo = "anytree";
+     rev = "2.8.0";
+     sha256 = "145hlgvcncinpz75hnlxbf2ybm6p6fyya216rq883rb9gbas191r";
   };
 
   patches = lib.optionals withGraphviz [
diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
index 9c15537af3517..647380df0ef85 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/pkgs/development/python-modules/apispec/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , pyyaml
 , prance
@@ -15,9 +15,11 @@ buildPythonPackage rec {
   version = "5.1.1";
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d167890e37f14f3f26b588ff2598af35faa5c27612264ea1125509c8ff860834";
+  src = fetchFromGitHub {
+     owner = "marshmallow-code";
+     repo = "apispec";
+     rev = "5.1.1";
+     sha256 = "0awcp4mb6q3cka86yw8cc5bzbwzs3c45yb36nlfjd3cnccv9vjzw";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix
index 22fa3dc98fb07..603b174694014 100644
--- a/pkgs/development/python-modules/appdirs/default.nix
+++ b/pkgs/development/python-modules/appdirs/default.nix
@@ -1,15 +1,17 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "appdirs";
   version = "1.4.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41";
+  src = fetchFromGitHub {
+     owner = "ActiveState";
+     repo = "appdirs";
+     rev = "1.4.4";
+     sha256 = "0d8hzhb1f1h16q1pxdx2h5xs6nmfjfjvkgqbb2rrsapj36r864za";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/applicationinsights/default.nix b/pkgs/development/python-modules/applicationinsights/default.nix
index 7576bcbdf1dcd..eada4ceeae445 100644
--- a/pkgs/development/python-modules/applicationinsights/default.nix
+++ b/pkgs/development/python-modules/applicationinsights/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage
 , lib
-, fetchPypi
+, fetchFromGitHub
 , portalocker
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   version = "0.11.10";
   pname = "applicationinsights";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0b761f3ef0680acf4731906dfc1807faa6f2a57168ae74592db0084a6099f7b3";
+  src = fetchFromGitHub {
+     owner = "Microsoft";
+     repo = "ApplicationInsights-Python";
+     rev = "0.11.10";
+     sha256 = "08arvy3pbvfsdnhq0xf639a1gyfi0hzxya1mr1m9wvjrl0zqqy5z";
   };
 
   propagatedBuildInputs = [ portalocker ];
diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix
index 18b829249198e..5d2864a6aac86 100644
--- a/pkgs/development/python-modules/apprise/default.nix
+++ b/pkgs/development/python-modules/apprise/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, installShellFiles
+{ lib, buildPythonPackage, fetchFromGitHub, installShellFiles
 , Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography
 , pytest-runner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp
 }:
@@ -7,9 +7,11 @@ buildPythonPackage rec {
   pname = "apprise";
   version = "0.9.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-Fe0GIIGXydKP2DzWnnJ7SCgIeaTGEa/Wta6l0N7zl/g=";
+  src = fetchFromGitHub {
+     owner = "caronc";
+     repo = "apprise";
+     rev = "v0.9.6";
+     sha256 = "02jklkcknlahjdmkzp1x08ji0fcg02f2bsb8nfjnjj91354745mq";
   };
 
   nativeBuildInputs = [ Babel installShellFiles ];
diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix
index 4ee3add12b131..841c627a3ac3b 100644
--- a/pkgs/development/python-modules/apptools/default.nix
+++ b/pkgs/development/python-modules/apptools/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage
+{ lib, fetchFromGitHub, buildPythonPackage
 , fetchpatch, configobj, six, traitsui
 , pytestCheckHook, tables, pandas
 , pythonOlder, importlib-resources
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "apptools";
   version = "5.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "12x5lcs1cllpybz7f0i1lcwvmqsaa5n818wb2165lj049wqxx4yh";
+  src = fetchFromGitHub {
+     owner = "enthought";
+     repo = "apptools";
+     rev = "5.1.0";
+     sha256 = "1vlld68hhl4mda8rkiflq9nbzgk43j29hk3k2f41rm4h0l3hqiax";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/area/default.nix b/pkgs/development/python-modules/area/default.nix
index 37d7369dbeeef..e6b56375e88ee 100644
--- a/pkgs/development/python-modules/area/default.nix
+++ b/pkgs/development/python-modules/area/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "area";
   version = "1.1.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "18k5hwmlxhajlq306zxndsglb11vv8vd4vpmwx8dpvfxd1kbksya";
+  src = fetchFromGitHub {
+     owner = "scisco";
+     repo = "area";
+     rev = "v1.1.1";
+     sha256 = "1r755xnskdvd51was0kx70ddbb96r08lycgaqzm55fiwi7f91ppz";
   };
 
   # tests not working on the package from pypi
diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix
index bbe120ec14fed..8c9ef293f09e8 100644
--- a/pkgs/development/python-modules/argh/default.nix
+++ b/pkgs/development/python-modules/argh/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytest
 , py
 , mock
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   pname = "argh";
   version = "0.26.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65";
+  src = fetchFromGitHub {
+     owner = "neithere";
+     repo = "argh";
+     rev = "v0.26.2";
+     sha256 = "1829wivrzi0an7aai07cfc0arsrzjk2dh6mc4phf2s44q6vacb9k";
   };
 
   checkInputs = [ pytest py mock glibcLocales iocapture ];
diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix
index 9faf16037d042..27c2b80b12b67 100644
--- a/pkgs/development/python-modules/args/default.nix
+++ b/pkgs/development/python-modules/args/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "args";
   version = "0.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814";
+  src = fetchFromGitHub {
+     owner = "kennethreitz";
+     repo = "args";
+     rev = "v0.1.0";
+     sha256 = "1n8ayb1gc6zp32qicj3y5b20sniqgb24i0gq33dp6wmv9yddm805";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix
index fa4b7d0bffdf5..3f25165685088 100644
--- a/pkgs/development/python-modules/arrayqueues/default.nix
+++ b/pkgs/development/python-modules/arrayqueues/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
 , numpy
 }:
 
@@ -7,9 +7,11 @@ buildPythonPackage rec {
   version = "1.3.1";
   disabled = !isPy3k;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a955df768e39d459de28c7ea10ee02f67b1c70996cfa229846ab98df77a6fb69";
+  src = fetchFromGitHub {
+     owner = "portugueslab";
+     repo = "arrayqueues";
+     rev = "v1.3.1";
+     sha256 = "138977clr7yfc5h1p64by0bc6z0xk1dzqmqma2a0y618iizjxzyx";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix
index 989b974c64a64..e3fd2bd650e6a 100644
--- a/pkgs/development/python-modules/asn1crypto/default.nix
+++ b/pkgs/development/python-modules/asn1crypto/default.nix
@@ -1,15 +1,17 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "asn1crypto";
   version = "1.4.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c";
+  src = fetchFromGitHub {
+     owner = "wbond";
+     repo = "asn1crypto";
+     rev = "1.4.0";
+     sha256 = "19abibn6jw20mzi1ln4n9jjvpdka8ygm4m439hplyrdfqbvgm01r";
   };
 
   # No tests included
diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix
index ab68c91d5d6bb..1ceb068cf7e10 100644
--- a/pkgs/development/python-modules/astor/default.nix
+++ b/pkgs/development/python-modules/astor/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "astor";
   version = "0.8.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0ppscdzzvxpznclkmhhj53iz314x3pfv4yc7c6gwxqgljgdgyvka";
+  src = fetchFromGitHub {
+     owner = "berkerpeksag";
+     repo = "astor";
+     rev = "0.8.1";
+     sha256 = "1svh9wjfvx1j2ljd8agnbbzm71572nf7z2rvf4j3byxlipgv9kd3";
   };
 
   # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89
diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix
index 8c97ef6750f77..eb99d405f46ac 100644
--- a/pkgs/development/python-modules/astral/default.nix
+++ b/pkgs/development/python-modules/astral/default.nix
@@ -1,13 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pytz, requests, pytest, freezegun }:
 
 buildPythonPackage rec {
   pname = "astral";
   version = "2.2";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e41d9967d5c48be421346552f0f4dedad43ff39a83574f5ff2ad32b6627b6fbe";
+  src = fetchFromGitHub {
+     owner = "sffjunkie";
+     repo = "astral";
+     rev = "2.2";
+     sha256 = "1vxls9z4w7c7hsj62z8yq0p8km0zf8rrjx3nk9b9lj60rn9m6s0s";
   };
 
   propagatedBuildInputs = [ pytz requests freezegun ];
diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/pkgs/development/python-modules/astropy-helpers/default.nix
index dd8897ab13907..736e71cbb4fd5 100644
--- a/pkgs/development/python-modules/astropy-helpers/default.nix
+++ b/pkgs/development/python-modules/astropy-helpers/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , isPy3k
 }:
 
@@ -12,9 +12,11 @@ buildPythonPackage rec {
 
   doCheck = false; # tests requires sphinx-astropy
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f1096414d108778218d6bea06d4d9c7b2ff7c83856a451331ac194e74de9f413";
+  src = fetchFromGitHub {
+     owner = "astropy";
+     repo = "astropy-helpers";
+     rev = "v4.0.1";
+     sha256 = "0nfy7zy8yshw0s7bs19g92wg4dm4jvi2lrk31yl8rji9w0izycij";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix
index b32df24f5bbd0..8620015151a9e 100644
--- a/pkgs/development/python-modules/astunparse/default.nix
+++ b/pkgs/development/python-modules/astunparse/default.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
 , six
 , wheel
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "astunparse";
   version =  "1.6.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "5ad93a8456f0d084c3456d059fd9a92cce667963232cbf763eac3bc5b7940872";
+  src = fetchFromGitHub {
+     owner = "simonpercivall";
+     repo = "astunparse";
+     rev = "v1.6.3";
+     sha256 = "10kqdhr2qn62ymsjv7wd853b29vc5386jvlahxq7rdmbazpgf8vw";
   };
 
   propagatedBuildInputs = [ six wheel ];
diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix
index dfbd0dbb9968e..3c93311d93836 100644
--- a/pkgs/development/python-modules/async_generator/default.nix
+++ b/pkgs/development/python-modules/async_generator/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy35, pytest, pytest-asyncio }:
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy35, pytest, pytest-asyncio }:
 
 buildPythonPackage rec {
   pname = "async_generator";
@@ -6,9 +6,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144";
+  src = fetchFromGitHub {
+     owner = "python-trio";
+     repo = "async_generator";
+     rev = "v1.10";
+     sha256 = "1qa5082j4jf66z14hi8ihbzk5hbdfw9aj4qvsqbaicmn0bi8sws3";
   };
 
   checkInputs = [ pytest pytest-asyncio ];
diff --git a/pkgs/development/python-modules/async_stagger/default.nix b/pkgs/development/python-modules/async_stagger/default.nix
index 3dafd2b21941e..219624aeac504 100644
--- a/pkgs/development/python-modules/async_stagger/default.nix
+++ b/pkgs/development/python-modules/async_stagger/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , pytestCheckHook
 , pytest-asyncio
@@ -14,9 +14,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1mj3daaqxjdavbxcjrdwx5ky9maa2blbv53aa6d7w9zxkrz3b7xa";
+  src = fetchFromGitHub {
+     owner = "twisteroidambassador";
+     repo = "async_stagger";
+     rev = "v0.3.1";
+     sha256 = "0971ah19z9n52xhbylssh5nmdays9rmxhg3hjy0iv8bnfykz62xc";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
index ae8bacc944151..e1f05f1c21334 100644
--- a/pkgs/development/python-modules/async_timeout/default.nix
+++ b/pkgs/development/python-modules/async_timeout/default.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
 , pythonOlder
 , typing-extensions
@@ -11,9 +11,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-uTDLFho5BC+SIvbvtzATmch+6rOUcn7FQ3kko21u71E=";
+  src = fetchFromGitHub {
+     owner = "aio-libs";
+     repo = "async_timeout";
+     rev = "v4.0.1";
+     sha256 = "0jgpd5qs9flg7gz56a48bx6m365mf0ldim8aa2xpcqnsxq81zxyp";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix
index dda3d35f6adda..848195f060e1a 100644
--- a/pkgs/development/python-modules/asynctest/default.nix
+++ b/pkgs/development/python-modules/asynctest/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, python }:
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, python }:
 
 buildPythonPackage rec {
   pname = "asynctest";
@@ -6,9 +6,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1b3zsy7p84gag6q8ai2ylyrhx213qdk2h2zb6im3xn0m5n264y62";
+  src = fetchFromGitHub {
+     owner = "Martiusweb";
+     repo = "asynctest";
+     rev = "v0.13.0";
+     sha256 = "1mqip290iyc028drmrd5dy1ay08hdgvyfs04ncylcll86v64a5vz";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix
index 4a8c0ff0f31ad..88044c2abe312 100644
--- a/pkgs/development/python-modules/atenpdu/default.nix
+++ b/pkgs/development/python-modules/atenpdu/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pysnmp
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "atenpdu";
   version = "0.3.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-hlbrjx6WKVJYaxrMT4fiRXlxKRcQU4AIQUVgA8mbWa8=";
+  src = fetchFromGitHub {
+     owner = "mtdcr";
+     repo = "pductl";
+     rev = "0.3.2";
+     sha256 = "0l59za3qfpq75d8iikd92p8v8vwia29zlpzs15h571kl83z9qj1i";
   };
 
   propagatedBuildInputs = [ pysnmp ];
diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix
index 08730e3d689ec..6849a5952c066 100644
--- a/pkgs/development/python-modules/attrs/default.nix
+++ b/pkgs/development/python-modules/attrs/default.nix
@@ -1,16 +1,18 @@
 { lib
 , callPackage
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "attrs";
   version = "21.2.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb";
+  src = fetchFromGitHub {
+     owner = "hynek";
+     repo = "attrs";
+     rev = "21.2.0";
+     sha256 = "1bn7745ddxm4wsdzqxp1d7dvgqnzvnxjazz1g02di4nmxncxp051";
   };
 
   outputs = [ "out" "testout" ];
diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix
index d2964accc144a..3f30d1cb99093 100644
--- a/pkgs/development/python-modules/audioread/default.nix
+++ b/pkgs/development/python-modules/audioread/default.nix
@@ -1,15 +1,17 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "audioread";
   version = "2.1.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089";
+  src = fetchFromGitHub {
+     owner = "sampsyo";
+     repo = "audioread";
+     rev = "v2.1.9";
+     sha256 = "1s1x2xcym69mbcgp6sf5a1dk1kqfn91hd8c5d3sv4r9j0d1skv4p";
   };
 
   # No tests, need to disable or py3k breaks
diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix
index 224b8bec4015f..466a30c9bf39d 100644
--- a/pkgs/development/python-modules/auth0-python/default.nix
+++ b/pkgs/development/python-modules/auth0-python/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , mock
 , pyjwt
 , pytestCheckHook
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "auth0-python";
   version = "3.19.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ed33557f252cf8b022b788ebd2b851c681979f200171498acde2b92d760db026";
+  src = fetchFromGitHub {
+     owner = "auth0";
+     repo = "auth0-python";
+     rev = "3.19.0";
+     sha256 = "0anplgppx9xcq8h8nacvfqwbcjv6p5yh8ksi07cw71p0qag4h103";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix
index 8593f7f4d742e..1106e6ffc6e81 100644
--- a/pkgs/development/python-modules/authheaders/default.nix
+++ b/pkgs/development/python-modules/authheaders/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, isPy27, lib
+{ buildPythonPackage, fetchFromGitHub, isPy27, lib
 , authres, dnspython, dkimpy, ipaddress, publicsuffix2
 }:
 
@@ -6,9 +6,11 @@ buildPythonPackage rec {
   pname = "authheaders";
   version = "0.14.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4e601b5b54080019a2f548fadf80ddf9c5538615607c7fb602936404aafe67e2";
+  src = fetchFromGitHub {
+     owner = "ValiMail";
+     repo = "authentication-headers";
+     rev = "0.14.1";
+     sha256 = "0snm0afyc55k45hgw6w98336np83l66xl2jkiz0jjabyrihh7nzs";
   };
 
   propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ]
diff --git a/pkgs/development/python-modules/autopage/default.nix b/pkgs/development/python-modules/autopage/default.nix
index 9a2ca722a62bc..b0199497b6d80 100644
--- a/pkgs/development/python-modules/autopage/default.nix
+++ b/pkgs/development/python-modules/autopage/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "autopage";
@@ -6,9 +6,11 @@ buildPythonPackage rec {
 
   format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "18f511d8ef2e4d3cc22a986d345eab0e03f95b9fa80b74ca63b7fb001551dc42";
+  src = fetchFromGitHub {
+     owner = "zaneb";
+     repo = "autopage";
+     rev = "v0.4.0";
+     sha256 = "14a1r6c1ll22687mbx6mckh1c542i2rwvnvd8as66m87v2v6wzfy";
   };
 
   pythonImportsCheck = [ "autopage" ];
diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix
index 461ce9d90d9d6..9d137a205bbcb 100644
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/pkgs/development/python-modules/aws-adfs/default.nix
@@ -3,7 +3,7 @@
 , buildPythonPackage
 , click
 , configparser
-, fetchPypi
+, fetchFromGitHub
 , fido2
 , glibcLocales
 , isPy27
@@ -20,9 +20,11 @@ buildPythonPackage rec {
   version = "1.24.5";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6a78bd31477ea9988166215ae86abcbfe1413bee20373ecdf0dd170b7290db55";
+  src = fetchFromGitHub {
+     owner = "venth";
+     repo = "aws-adfs";
+     rev = "1.24.5";
+     sha256 = "03h4xfz83kyy8w5l8b1x00yj9rvncl28gpqwd92yqagl628cfx14";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix
index a304fae19df13..88fe08e3ebb5a 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , importlib-metadata
 , jsonpickle
@@ -14,9 +14,11 @@ buildPythonPackage rec {
   pname = "aws-xray-sdk";
   version = "2.8.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "90c2fcc982a770e86d009a4c3d2b5c3e372da91cb8284d982bae458e2c0bb268";
+  src = fetchFromGitHub {
+     owner = "aws";
+     repo = "aws-xray-sdk-python";
+     rev = "2.8.0";
+     sha256 = "1kxhplfhb1asnqk0vr0r3adq0ainwhy5fn0x7xjvihslrj6f77xl";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
index 7db161b86110a..99f5c2d47781b 100644
--- a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
+++ b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "backports-datetime-fromisoformat";
   version = "1.0.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0p0gyhfqq6gssf3prsy0pcfq5w0wx2w3pcjqbwx3imvc92ls4xwm";
+  src = fetchFromGitHub {
+     owner = "movermeyer";
+     repo = "backports.datetime_fromisoformat";
+     rev = "v1.0.0";
+     sha256 = "0bj10ab5b15wdjhngi9hcmyy3y18dqi9c3x9573f8c9n145zs39p";
   };
 
   # no tests in pypi package
diff --git a/pkgs/development/python-modules/backports_abc/default.nix b/pkgs/development/python-modules/backports_abc/default.nix
index d67117613d7fa..9e06a9b3432bc 100644
--- a/pkgs/development/python-modules/backports_abc/default.nix
+++ b/pkgs/development/python-modules/backports_abc/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "backports_abc";
   version = "0.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde";
+  src = fetchFromGitHub {
+     owner = "cython";
+     repo = "backports_abc";
+     rev = "0.5";
+     sha256 = "1myg9k25p95dcng3rsn7kvc56ly3lbx4pbvfy7al5zk3mvjvzixk";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/banal/default.nix b/pkgs/development/python-modules/banal/default.nix
index 793de7d3a7659..2a8e24c4ac4b5 100644
--- a/pkgs/development/python-modules/banal/default.nix
+++ b/pkgs/development/python-modules/banal/default.nix
@@ -1,14 +1,16 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
 }:
 buildPythonPackage rec {
   pname = "banal";
   version = "1.0.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "2fe02c9305f53168441948f4a03dfbfa2eacc73db30db4a93309083cb0e250a5";
+  src = fetchFromGitHub {
+     owner = "pudo";
+     repo = "banal";
+     rev = "1.0.6";
+     sha256 = "19042ka89czaic3sm1aj5014xvw854id6yy9z07msmymmz5l9cqx";
   };
 
   # no tests
diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix
index 6fe7a111b5d4d..de61de2c8747b 100644
--- a/pkgs/development/python-modules/base58/default.nix
+++ b/pkgs/development/python-modules/base58/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pyhamcrest
 , pytest-benchmark
 , pytestCheckHook
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   version = "2.1.1";
   disabled = pythonOlder "3.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c5d0cb3f5b6e81e8e35da5754388ddcc6d0d14b6c6a132cb93d69ed580a7278c";
+  src = fetchFromGitHub {
+     owner = "keis";
+     repo = "base58";
+     rev = "v2.1.1";
+     sha256 = "0mi9m7wmp93qzv0n92r1qi0yskj2vr0ffh0wpl0r4x6krfvyy7xm";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix
index 17d28c129141a..e43954519b106 100644
--- a/pkgs/development/python-modules/batinfo/default.nix
+++ b/pkgs/development/python-modules/batinfo/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "batinfo";
   version = "0.4.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "497e29efc9353ec52e71d43bd040bdfb6d685137ddc2b9143cded4583af572f5";
+  src = fetchFromGitHub {
+     owner = "nicolargo";
+     repo = "batinfo";
+     rev = "v0.4.2";
+     sha256 = "1wzkn2n7qkrzksz6hd1qfx6cb4kb0dlwd9sg055h5k8v1wj0j00s";
   };
 
   # No tests included
diff --git a/pkgs/development/python-modules/bcdoc/default.nix b/pkgs/development/python-modules/bcdoc/default.nix
index 29c267aa45fbe..aa2c08a53b516 100644
--- a/pkgs/development/python-modules/bcdoc/default.nix
+++ b/pkgs/development/python-modules/bcdoc/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, docutils, six }:
+{ lib, buildPythonPackage, fetchFromGitHub, docutils, six }:
 
 buildPythonPackage rec {
   pname = "bcdoc";
   version = "0.16.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f568c182e06883becf7196f227052435cffd45604700c82362ca77d3427b6202";
+  src = fetchFromGitHub {
+     owner = "boto";
+     repo = "bcdoc";
+     rev = "0.16.0";
+     sha256 = "0m6w5rrfwmhdh8g90rapbc8v2d4ynwhqlpys7zwc0920yyjmgvfw";
   };
 
   buildInputs = [ docutils six ];
diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index d6347b1790465..b7f2e3cc9b5c3 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, isPyPy, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, isPyPy, fetchFromGitHub, pythonOlder
 , cffi, pycparser, mock, pytest, py, six }:
 
 buildPythonPackage rec {
@@ -6,9 +6,11 @@ buildPythonPackage rec {
   pname = "bcrypt";
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29";
+  src = fetchFromGitHub {
+     owner = "pyca";
+     repo = "bcrypt";
+     rev = "3.2.0";
+     sha256 = "1vb9yx8bqxp2r94jxsckhwzplcn92cic521r76jv0q58kfxx7x8c";
   };
 
   buildInputs = [ pycparser mock pytest py ];
diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix
index 51f641c51eb48..1b981e10d69a1 100644
--- a/pkgs/development/python-modules/beniget/default.nix
+++ b/pkgs/development/python-modules/beniget/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , gast
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "beniget";
   version = "0.4.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c";
+  src = fetchFromGitHub {
+     owner = "serge-sans-paille";
+     repo = "beniget";
+     rev = "0.4.1";
+     sha256 = "0zamp3a3qxs47lwd8sr89pa0w20hfri34k0r4dr07wg6fgk1jv52";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix
index da6820ef6ecc2..7a02fea18ac83 100644
--- a/pkgs/development/python-modules/bespon/default.nix
+++ b/pkgs/development/python-modules/bespon/default.nix
@@ -1,15 +1,17 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   version = "0.6.0";
   pname = "BespON";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "2f2bda67fea8ee95c8aa7e885835ab88bdbfa392a94077ce1c9d29017420ce7a";
+  src = fetchFromGitHub {
+     owner = "gpoore";
+     repo = "bespon_py";
+     rev = "v0.6.0";
+     sha256 = "0x1ifklhh88fa6i693zgpb63646jxsyhj4j64lrvarckrb31wk23";
   };
 
   propagatedBuildInputs = [ ];
diff --git a/pkgs/development/python-modules/betacode/default.nix b/pkgs/development/python-modules/betacode/default.nix
index 79136e479d261..4d6d70313a209 100644
--- a/pkgs/development/python-modules/betacode/default.nix
+++ b/pkgs/development/python-modules/betacode/default.nix
@@ -1,10 +1,12 @@
-{ fetchPypi, buildPythonPackage, pygtrie, isPy3k, lib, }:
+{ fetchFromGitHub, buildPythonPackage, pygtrie, isPy3k, lib, }:
 buildPythonPackage rec {
   pname = "betacode";
   version = "1.0";
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0s84kd9vblbjz61q7zchx64a6hmdqb4lillna5ryh0g9ij76g6r5";
+  src = fetchFromGitHub {
+     owner = "matgrioni";
+     repo = "betacode";
+     rev = "v1.0";
+     sha256 = "1fcix00g7zwgwbi0gfzq544y8i10b8h5hlarq469isyh3x4jz08g";
   };
   preBuild = "echo > README.rst";
   # setup.py uses a python3 os.path.join
diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix
index 087329d103e7d..6f7ecc6e37453 100644
--- a/pkgs/development/python-modules/betamax-matchers/default.nix
+++ b/pkgs/development/python-modules/betamax-matchers/default.nix
@@ -1,13 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchFromGitHub
 , betamax, requests-toolbelt }:
 
 buildPythonPackage rec {
   pname = "betamax-matchers";
   version = "0.4.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43";
+  src = fetchFromGitHub {
+     owner = "sigmavirus24";
+     repo = "betamax_matchers";
+     rev = "0.4.0";
+     sha256 = "0lyg3r91hwfvavyi5k6sddcla37igigycfv1mx40c32byqwl6pq5";
   };
 
   buildInputs = [ betamax requests-toolbelt ];
diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix
index 4b5ebc912b24b..9e3729b990a47 100644
--- a/pkgs/development/python-modules/bidict/default.nix
+++ b/pkgs/development/python-modules/bidict/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , sphinx
 , hypothesis
 , py
@@ -17,9 +17,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-QshP++b43omK9gc7S+nqfM7c1400dKqETFTknVoHn28=";
+  src = fetchFromGitHub {
+     owner = "jab";
+     repo = "bidict";
+     rev = "v0.21.4";
+     sha256 = "1hh40q05k0bh2kp8shsa47hka1bp982np5zldswvqhrhwv4whgi1";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix
index 79aca1e4a99fe..02a2860dd3714 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/pkgs/development/python-modules/billiard/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , isPyPy
 , pytestCheckHook
 , case
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   version = "3.6.4.0";
   disabled = isPyPy;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0ismj2p8c66ykpss94rs0bfra5agxxmljz8r3gaq79r8valfb799";
+  src = fetchFromGitHub {
+     owner = "celery";
+     repo = "billiard";
+     rev = "v3.6.4.0";
+     sha256 = "1wg9sg8kcvhhqliq5dpgslcfw4xah67yjnrrz69lmk70lc32jkib";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/binaryornot/default.nix b/pkgs/development/python-modules/binaryornot/default.nix
index 103bd79294e65..bac367500fc63 100644
--- a/pkgs/development/python-modules/binaryornot/default.nix
+++ b/pkgs/development/python-modules/binaryornot/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, chardet, hypothesis }:
+{ lib, buildPythonPackage, fetchFromGitHub, chardet, hypothesis }:
 
 buildPythonPackage rec {
   pname = "binaryornot";
   version = "0.4.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061";
+  src = fetchFromGitHub {
+     owner = "audreyr";
+     repo = "binaryornot";
+     rev = "0.4.4";
+     sha256 = "1k1a77s4ynd7gbnw4cmdnmy5pzbxxvxfcvrv217h0g7zrhzwivm4";
   };
 
   prePatch = ''
diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
index 43cc2dbd5bce2..c5a4730c3bcbb 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "bitarray";
   version = "2.3.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f19c62425576d3d1821ed711b94d1a4e5ede8f05ca121e99b6d978ed49c7a765";
+  src = fetchFromGitHub {
+     owner = "ilanschnell";
+     repo = "bitarray";
+     rev = "2.3.4";
+     sha256 = "0jd5r8ggz870y3165b3p0na684g1jmf17gkfhl8fxw34hbvsmiwb";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix
index c9d317a81c3c3..f8f956158e14b 100644
--- a/pkgs/development/python-modules/bitcoin-price-api/default.nix
+++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix
@@ -1,13 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchFromGitHub
 , python-dateutil, requests }:
 
 buildPythonPackage rec {
   pname = "bitcoin-price-api";
   version = "0.0.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bc68076f9632aaa9a8009d916d67a709c1e045dd904cfc7a3e8be33960d32029";
+  src = fetchFromGitHub {
+     owner = "dursk";
+     repo = "bitcoin-price-api";
+     rev = "v0.0.4";
+     sha256 = "1fjigd0v9r7hnjdnpyslzy1hh5njjqsbj2k5xy812x0j4pkbyqra";
   };
 
   propagatedBuildInputs = [ python-dateutil requests ];
diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix
index 66a42858650c4..b6cbc30b5b9ce 100644
--- a/pkgs/development/python-modules/bitmath/default.nix
+++ b/pkgs/development/python-modules/bitmath/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, progressbar231 ? null, progressbar33, mock }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, progressbar231 ? null, progressbar33, mock }:
 
 buildPythonPackage rec {
   pname = "bitmath";
   version = "1.3.3.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "293325f01e65defe966853111df11d39215eb705a967cb115851da8c4cfa3eb8";
+  src = fetchFromGitHub {
+     owner = "tbielawa";
+     repo = "bitmath";
+     rev = "1.3.3.1";
+     sha256 = "1hln7rlvlmh7xs8axc9znf2hfdbsby7r0kzvwc39a3d8c7rxp81f";
   };
 
   checkInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ];
diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/pkgs/development/python-modules/bkcharts/default.nix
index 9e105c09d57bc..0083733b9128b 100644
--- a/pkgs/development/python-modules/bkcharts/default.nix
+++ b/pkgs/development/python-modules/bkcharts/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , numpy
 , pandas
 }:
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "bkcharts";
   version = "0.2";
 
-  src = fetchPypi {
-    inherit version pname;
-    sha256 = "a5eaa8e78853dcecaa46345812e4fabe9cd3b96330ebf0809f640a4a0556d72e";
+  src = fetchFromGitHub {
+     owner = "bokeh";
+     repo = "bkcharts";
+     rev = "0.2";
+     sha256 = "0yzdsaackpnfhiy0jhkhhmysiaj695140dl6pz99c6vcpwd89q5v";
   };
 
   propagatedBuildInputs = [ numpy pandas ];
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index 6d3c7fffe6adc..2d10d0d404269 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytestCheckHook
 , six
 , html5lib
@@ -14,9 +14,11 @@ buildPythonPackage rec {
   version = "4.1.0";
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=";
+  src = fetchFromGitHub {
+     owner = "mozilla";
+     repo = "bleach";
+     rev = "v4.1.0";
+     sha256 = "0ihp050fwq3vzd8i35jh6ab2r4sdxskp1lny8sca81nrbgqcgsv2";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index d159811efbcc2..26793e5d00aa8 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi
+{ lib, buildPythonPackage, isPy3k, fetchFromGitHub
 , bluez, dbus-next, pytestCheckHook, pytest-cov
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1vnwk36qfws9amqrdaynf63dcj2gzxm0ns1l75hrczmd5j2ic1zb";
+  src = fetchFromGitHub {
+     owner = "hbldh";
+     repo = "bleak";
+     rev = "v0.13.0";
+     sha256 = "1vfrxjxpcbsldknvg65ri71h6ndk4pjcdalj4gj4qr8z3w9y4gps";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix
index c2b03d35a21c3..84d29b5b48404 100644
--- a/pkgs/development/python-modules/blessed/default.nix
+++ b/pkgs/development/python-modules/blessed/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, six
+{ lib, buildPythonPackage, fetchFromGitHub, six
 , wcwidth, pytest, mock, glibcLocales
 }:
 
@@ -6,9 +6,11 @@ buildPythonPackage rec {
   pname = "blessed";
   version = "1.19.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4db0f94e5761aea330b528e84a250027ffe996b5a94bf03e502600c9a5ad7a61";
+  src = fetchFromGitHub {
+     owner = "jquast";
+     repo = "blessed";
+     rev = "1.19.0";
+     sha256 = "15yg7qjg83xdfdh62zplsi0spnniqpxs6h5p2k5v35w3h43sh50r";
   };
 
   checkInputs = [ pytest mock glibcLocales ];
diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix
index 00b7fd9a63d75..7b8c6c5cbeb10 100644
--- a/pkgs/development/python-modules/blessings/default.nix
+++ b/pkgs/development/python-modules/blessings/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , six
 , nose
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "blessings";
   version = "1.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "98e5854d805f50a5b58ac2333411b0482516a8210f23f43308baeb58d77c157d";
+  src = fetchFromGitHub {
+     owner = "erikrose";
+     repo = "blessings";
+     rev = "1.7";
+     sha256 = "0g6fqywhkww5pqgyxwmlahj0g0lh96vph0qm2661mmf788nbyc7y";
   };
 
   # 4 failing tests, 2to3
diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix
index 6f0370f044c64..efff298c48177 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/pkgs/development/python-modules/blis/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , cython
 , hypothesis
 , numpy
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "blis";
   version = "0.7.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "833e01e9eaff4c01aa6e049bbc1e6acb9eca6ee513d7b35b5bf135d49705ad33";
+  src = fetchFromGitHub {
+     owner = "explosion";
+     repo = "cython-blis";
+     rev = "v0.7.5";
+     sha256 = "18npb3z8xqhs9ka2h55inzs1pdvqpss3p5fq30cv8jzfmlgwdc6l";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/blockchain/default.nix b/pkgs/development/python-modules/blockchain/default.nix
index e6d523c3c7b89..2e9ba419bb1eb 100644
--- a/pkgs/development/python-modules/blockchain/default.nix
+++ b/pkgs/development/python-modules/blockchain/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , future
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "blockchain";
   version = "1.4.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1qpbmz6dk5gx1996dswpipwhj6sp5j0dlfap012l46zqnvmkxanv";
+  src = fetchFromGitHub {
+     owner = "blockchain";
+     repo = "api-v1-client-python";
+     rev = "1.4.4";
+     sha256 = "1ijxfb6jr5wr0vv0p0l2kvq4n2bbjikkcb6iyfgqyqv07qjdqnhx";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/bluepy/default.nix b/pkgs/development/python-modules/bluepy/default.nix
index 11930050ba346..20c67409f94cf 100644
--- a/pkgs/development/python-modules/bluepy/default.nix
+++ b/pkgs/development/python-modules/bluepy/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pkg-config
 , glib
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "bluepy";
   version = "1.3.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1v0wjy1rz0rbwghr1z3xhdm06lqn9iig6vr5j2wmymh3w6pysw9a";
+  src = fetchFromGitHub {
+     owner = "IanHarvey";
+     repo = "bluepy";
+     rev = "v/1.3.0";
+     sha256 = "0rlzq4rj929m8rn0391fpc4awpr2z1l4hv5wmba3vg610wzi8ak4";
   };
 
   buildInputs = [ glib ];
diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
index f7e7dc7c390c1..3c8b4d1f28daf 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchFromGitHub
 , nose
 , numpy
 , pytest
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "Bottleneck";
   version = "1.3.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "20179f0b66359792ea283b69aa16366419132f3b6cf3adadc0c48e2e8118e573";
+  src = fetchFromGitHub {
+     owner = "pydata";
+     repo = "bottleneck";
+     rev = "v1.3.2";
+     sha256 = "0avm1j9x4d2xl1kyncmn199fnf3cxbiwldmdqll72xzjwm7p7r1b";
   };
 
   propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/braceexpand/default.nix b/pkgs/development/python-modules/braceexpand/default.nix
index c5e711bb8043d..44e8c37214c86 100644
--- a/pkgs/development/python-modules/braceexpand/default.nix
+++ b/pkgs/development/python-modules/braceexpand/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , pythonOlder
-, fetchPypi
+, fetchFromGitHub
 , pytestCheckHook
 }:
 
@@ -11,9 +11,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit version pname;
-    sha256 = "01gpcnksnqv6np28i4x8s3wkngawzgs99zvjfia57spa42ykkrg6";
+  src = fetchFromGitHub {
+     owner = "trendels";
+     repo = "braceexpand";
+     rev = "v0.1.7";
+     sha256 = "07nmh2556d46fnnhh1643sf4yg0ljifjkgjp6vkjfp9zbz43bd0s";
   };
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/bracex/default.nix b/pkgs/development/python-modules/bracex/default.nix
index 176385bceca30..c6c2f27fac976 100644
--- a/pkgs/development/python-modules/bracex/default.nix
+++ b/pkgs/development/python-modules/bracex/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "bracex";
   version = "2.2.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1c8d1296e00ad9a91030ccb4c291f9e4dc7c054f12c707ba3c5ff3e9a81bcd21";
+  src = fetchFromGitHub {
+     owner = "facelessuser";
+     repo = "bracex";
+     rev = "2.2.1";
+     sha256 = "12894hxf9gr5v209xrrzz0rax3bb61q3pxqikppfnzn7b0q1mklk";
   };
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix
index 4251c88058cda..39019b64b9503 100644
--- a/pkgs/development/python-modules/branca/default.nix
+++ b/pkgs/development/python-modules/branca/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytest
 , jinja2
 , selenium
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   pname = "branca";
   version = "0.4.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c111453617b17ab2bda60a4cd71787d6f2b59c85cdf71ab160a737606ac66c31";
+  src = fetchFromGitHub {
+     owner = "python-visualization";
+     repo = "branca";
+     rev = "v0.4.2";
+     sha256 = "016gvpmw5hggs1q77f9k014k7mb03yxk1aashyd24cw908zjlqgz";
   };
 
   checkInputs = [ pytest selenium ];
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index 7770996f423d4..ff6c629a39314 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,13 +1,15 @@
-{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
+{ lib, fetchFromGitHub, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
 
 buildPythonPackage rec {
   version = "4.31.0";
   pname = "breathe";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "925eeff96c6640cd857e4ddeae6f75464a1d5e2e08ee56dccce4043583ae2050";
+  src = fetchFromGitHub {
+     owner = "michaeljones";
+     repo = "breathe";
+     rev = "v4.31.0";
+     sha256 = "0zziqfcap2s1h9apq60vlkzgqn7bawh79rnnkr5awyq8bgppwmdk";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];
diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix
index dc1e4f37f3c49..2b0dbd29baf46 100644
--- a/pkgs/development/python-modules/broadlink/default.nix
+++ b/pkgs/development/python-modules/broadlink/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , cryptography
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "broadlink";
   version = "0.18.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c66b3e4a097d6549f0fcc9ccdf289bd88f73f647ad9449e1c4e2958301ad1b04";
+  src = fetchFromGitHub {
+     owner = "mjg59";
+     repo = "python-broadlink";
+     rev = "0.18.0";
+     sha256 = "0nh9rn1zpc44qsc50360ycg02gwbgq59784mnkp01nhavnwwwx10";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix
index cbc75ef2843f1..a661d61504a52 100644
--- a/pkgs/development/python-modules/bsdiff4/default.nix
+++ b/pkgs/development/python-modules/bsdiff4/default.nix
@@ -1,15 +1,17 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "bsdiff4";
   version = "1.2.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "87cffc7522effdda03fd1564b212ad2279c0af50d16c3e65776f80acb6705d4b";
+  src = fetchFromGitHub {
+     owner = "ilanschnell";
+     repo = "bsdiff4";
+     rev = "1.2.1";
+     sha256 = "0can34y5gmmi2c5bifyvj8a838gqdllpq1hdcb4h4d31r2q1gzgd";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/bson/default.nix b/pkgs/development/python-modules/bson/default.nix
index ca78b0806f0dd..6fb7402570993 100644
--- a/pkgs/development/python-modules/bson/default.nix
+++ b/pkgs/development/python-modules/bson/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python-dateutil
 , six
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "bson";
   version = "0.5.10";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "14355m3dchz446fl54ym78bn4wi20hddx1614f8rl4sin0m1nlfn";
+  src = fetchFromGitHub {
+     owner = "py-bson";
+     repo = "bson";
+     rev = "0.5.10";
+     sha256 = "1vpy4rsvm3hhawvbg9rbw4j36ck8qylkhm8cjy0q6imvinkd2als";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix
index 72bf870c37b5f..f56722a516c3f 100644
--- a/pkgs/development/python-modules/cached-property/default.nix
+++ b/pkgs/development/python-modules/cached-property/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytestCheckHook
 , freezegun
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "cached-property";
   version = "1.5.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130";
+  src = fetchFromGitHub {
+     owner = "pydanny";
+     repo = "cached-property";
+     rev = "1.5.2";
+     sha256 = "0fw36p0wjq6najlyd69sjbxq8c6c6k02jhz01ndxs593l4akqqhc";
   };
 
   checkInputs = [ pytestCheckHook freezegun ];
diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix
index b5679978c2cc8..5bdc048fabfa0 100644
--- a/pkgs/development/python-modules/canonicaljson/default.nix
+++ b/pkgs/development/python-modules/canonicaljson/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , frozendict
 , pytestCheckHook
 , pythonOlder
@@ -13,9 +13,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-Xr3c10xbBm7mjsylZGUzjpsTgEZ+CpBvR5dpfJ+zgeI=";
+  src = fetchFromGitHub {
+     owner = "matrix-org";
+     repo = "python-canonicaljson";
+     rev = "v1.5.0";
+     sha256 = "0p8nr5b7cqdm1yr3gw3fv0jhidn6vv41v71j1hk8nm1nsk4g7n5m";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/casttube/default.nix b/pkgs/development/python-modules/casttube/default.nix
index 9d29a01374367..2d0c55bbcc86e 100644
--- a/pkgs/development/python-modules/casttube/default.nix
+++ b/pkgs/development/python-modules/casttube/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchFromGitHub, requests }:
 
 buildPythonPackage rec {
   pname = "casttube";
   version = "0.2.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "10pw2sjy648pvp42lbbdmkkx79bqlkq1xcbzp1frraj9g66azljl";
+  src = fetchFromGitHub {
+     owner = "ur1katz";
+     repo = "casttube";
+     rev = "0.2.1";
+     sha256 = "1860cw42qzbqpvmxj4851qnqqgiyd1scyf49g0cd4iz0gzwhfgb0";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix
index a62dcbd249a58..805586218c26a 100644
--- a/pkgs/development/python-modules/catalogue/default.nix
+++ b/pkgs/development/python-modules/catalogue/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytestCheckHook
 , pythonOlder
 , typing-extensions
@@ -12,9 +12,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0idjhx2s8cy6ppd18k1zy246d97gdd6i217m5q26fwa47xh3asik";
+  src = fetchFromGitHub {
+     owner = "explosion";
+     repo = "catalogue";
+     rev = "v2.0.6";
+     sha256 = "0024jqhmpwa86l0a2x5f61ycz465168p979kc32qwi27ayykwdbs";
   };
 
   propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix
index c7b074089a687..7cb1565eab50f 100644
--- a/pkgs/development/python-modules/cfgv/default.nix
+++ b/pkgs/development/python-modules/cfgv/default.nix
@@ -1,13 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, six }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27, six }:
 
 buildPythonPackage rec {
   pname = "cfgv";
   version = "3.3.1";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736";
+  src = fetchFromGitHub {
+     owner = "asottile";
+     repo = "cfgv";
+     rev = "v3.3.1";
+     sha256 = "1pci97cmn3v45sfch9s3lshidrl0309ls9byidic0l8drkwnkwcj";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix
index 06beebc2f3260..0b599be59a602 100644
--- a/pkgs/development/python-modules/cgen/default.nix
+++ b/pkgs/development/python-modules/cgen/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytools
 , numpy
 , pytest
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "cgen";
   version = "2020.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4ec99d0c832d9f95f5e51dd18a629ad50df0b5464ce557ef42c6e0cd9478bfcf";
+  src = fetchFromGitHub {
+     owner = "inducer";
+     repo = "cgen";
+     rev = "v2020.1";
+     sha256 = "0hpm5j7kh5xqcn5x2p1ykyhd6aa3cysj4y0qg6hb6gg00gjrwzpd";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix
index 7753d6ccfdebc..b78052dd78ded 100644
--- a/pkgs/development/python-modules/chardet/default.nix
+++ b/pkgs/development/python-modules/chardet/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , hypothesis
 , pythonOlder
 , pytestCheckHook
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   version = "4.0.0";
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-DW9ToV20Eg8rCMlPEefZPSyRHuEYtrMKBOw+6DEBefo=";
+  src = fetchFromGitHub {
+     owner = "chardet";
+     repo = "chardet";
+     rev = "4.0.0";
+     sha256 = "0c9jzwya4mll9hv4zad27d1nnj9p0x8g4ficx3km33v61wrjj4qk";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/ci-info/default.nix b/pkgs/development/python-modules/ci-info/default.nix
index d27f7cf0a82a5..e1ce4e4c91ec2 100644
--- a/pkgs/development/python-modules/ci-info/default.nix
+++ b/pkgs/development/python-modules/ci-info/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, isPy27, fetchPypi, pytest, pytestCheckHook }:
+{ lib, buildPythonPackage, isPy27, fetchFromGitHub, pytest, pytestCheckHook }:
 
 buildPythonPackage rec {
   version = "0.2.0";
@@ -6,9 +6,11 @@ buildPythonPackage rec {
 
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "05j6pamk8sd51qmvpkl3f7sxajmncrqm0cz6n6bqgsvzjwn66w6x";
+  src = fetchFromGitHub {
+     owner = "mgxd";
+     repo = "ci-info";
+     rev = "0.2.0";
+     sha256 = "1z40pbpbcsqbxnldgggpi94c5gp9azf3b2c68nfjww13m1qizsdm";
   };
 
   checkInputs = [ pytest pytestCheckHook ];
diff --git a/pkgs/development/python-modules/ciscomobilityexpress/default.nix b/pkgs/development/python-modules/ciscomobilityexpress/default.nix
index d48ba03ad5377..81430fa36fcc2 100644
--- a/pkgs/development/python-modules/ciscomobilityexpress/default.nix
+++ b/pkgs/development/python-modules/ciscomobilityexpress/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , requests
 , python
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "ciscomobilityexpress";
   version = "1.0.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d8787245598e8371a83baa4db1df949d8a942c43f13454fa26ee3b09c3ccafc0";
+  src = fetchFromGitHub {
+     owner = "fbradyirl";
+     repo = "ciscomobilityexpress";
+     rev = "v1.0.2";
+     sha256 = "0mg1r07z1lqb06426zj8pdc7mxzmch04s3408i88bfm60piwpvqc";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix
index fc5a6b0e54bc2..5d739994adfc8 100644
--- a/pkgs/development/python-modules/cld2-cffi/default.nix
+++ b/pkgs/development/python-modules/cld2-cffi/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six, cffi, nose }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, cffi, nose }:
 
 buildPythonPackage rec {
   pname = "cld2-cffi";
   version = "0.1.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0rvcdx4fdh5yk4d2nlddq1q1r2r0xqp86hpmbdn447pdcj1r8a9s";
+  src = fetchFromGitHub {
+     owner = "GregBowyer";
+     repo = "cld2-cffi";
+     rev = "0.1.4";
+     sha256 = "0mk09idn8rdmb8q31fdf3gr8dxywmc0jzp9z6hmh6pw553inspc3";
   };
 
   propagatedBuildInputs = [ six cffi ];
diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix
index 19fdac37615a3..e279f2a39de5c 100644
--- a/pkgs/development/python-modules/click-completion/default.nix
+++ b/pkgs/development/python-modules/click-completion/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k,
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k,
   click, jinja2, shellingham, six
 }:
 
@@ -7,9 +7,11 @@ buildPythonPackage rec {
   version = "0.5.2";
   disabled = (!isPy3k);
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "5bf816b81367e638a190b6e91b50779007d14301b3f9f3145d68e3cade7bce86";
+  src = fetchFromGitHub {
+     owner = "click-contrib";
+     repo = "click-completion";
+     rev = "v0.5.2";
+     sha256 = "17wpygrbd7xfb8mrbl9v2v4vljapcjbgp787imi5cgff01r242k7";
   };
 
   propagatedBuildInputs = [ click jinja2 shellingham six ];
diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix
index 3145d4775e397..249e165c41c13 100644
--- a/pkgs/development/python-modules/click-log/default.nix
+++ b/pkgs/development/python-modules/click-log/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, click }:
+{ lib, buildPythonPackage, fetchFromGitHub, click }:
 
 buildPythonPackage rec {
   pname = "click-log";
   version = "0.3.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124";
+  src = fetchFromGitHub {
+     owner = "click-contrib";
+     repo = "click-log";
+     rev = "0.3.2";
+     sha256 = "01zpjyqnyzrx6xi7cii2180bqdcg2a6b1sdbjijri8jv755r7ray";
   };
 
   propagatedBuildInputs = [ click ];
diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix
index 31ae00a348df9..ab2cbba5aae93 100644
--- a/pkgs/development/python-modules/click-plugins/default.nix
+++ b/pkgs/development/python-modules/click-plugins/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchFromGitHub,
   click, pytest
 }:
 
@@ -6,9 +6,11 @@ buildPythonPackage rec {
   pname = "click-plugins";
   version = "1.1.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "46ab999744a9d831159c3411bb0c79346d94a444df9a3a3742e9ed63645f264b";
+  src = fetchFromGitHub {
+     owner = "click-contrib";
+     repo = "click-plugins";
+     rev = "1.1.1";
+     sha256 = "04bx148n8v656zrx350g4bxw14fsapncdl3kzy6qwydk8x4zir4i";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix
index 84665ecb0950a..fb16cb7ccb1c7 100644
--- a/pkgs/development/python-modules/click-repl/default.nix
+++ b/pkgs/development/python-modules/click-repl/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, click, prompt-toolkit }:
+{ lib, buildPythonPackage, fetchFromGitHub, click, prompt-toolkit }:
 
 buildPythonPackage rec {
   pname = "click-repl";
   version = "0.2.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8";
+  src = fetchFromGitHub {
+     owner = "click-contrib";
+     repo = "click-repl";
+     rev = "0.2.0";
+     sha256 = "16ybsnwlj2jlqcfxflky8jz7i3nhrd3f6mvkpgs95618l8lx994i";
   };
 
   propagatedBuildInputs = [ click prompt-toolkit ];
diff --git a/pkgs/development/python-modules/click-spinner/default.nix b/pkgs/development/python-modules/click-spinner/default.nix
index e0d862ab13102..c600f1ea8b59a 100644
--- a/pkgs/development/python-modules/click-spinner/default.nix
+++ b/pkgs/development/python-modules/click-spinner/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , click
 , six
 , pytestCheckHook
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "click-spinner";
   version = "0.1.10";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "h+rPnXKYlzol12Fe9X1Hgq6/kTpTK7pLKKN+Nm6XXa8=";
+  src = fetchFromGitHub {
+     owner = "click-contrib";
+     repo = "click-spinner";
+     rev = "v0.1.10";
+     sha256 = "1b8fm9c0zldx0q0br8vqmrln3bk4by4q8lqjmvgih51x83lcd42y";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix
index 529ee08e4f8e2..eb6df02608e3f 100644
--- a/pkgs/development/python-modules/click-threading/default.nix
+++ b/pkgs/development/python-modules/click-threading/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytest
 , click
 , isPy3k
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "click-threading";
   version = "0.5.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-rc/mI8AqWVwQfDFAcvZ6Inj+TrQLcsDRoskDzHivNDk=";
+  src = fetchFromGitHub {
+     owner = "click-contrib";
+     repo = "click-threading";
+     rev = "0.5.0";
+     sha256 = "185pzw12ap7wrjpyxhsyrkhh7i1l5qclaa3zlpn8qvm39fz0kjni";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/pkgs/development/python-modules/clickhouse-cityhash/default.nix
index 4e632cb34038b..6e543986b82ce 100644
--- a/pkgs/development/python-modules/clickhouse-cityhash/default.nix
+++ b/pkgs/development/python-modules/clickhouse-cityhash/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , setuptools
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "clickhouse-cityhash";
   version = "1.0.2.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0z8nl0ly2p1h6nygwxs6y40q8y424w40fkjv3jyf8vvcg4h7sdrg";
+  src = fetchFromGitHub {
+     owner = "xzkostyan";
+     repo = "python-cityhash";
+     rev = "1.0.2.3";
+     sha256 = "0b6w0cp66y5d600srp1hp7ibmywac6aymmldksl8swl5jvb9rffg";
   };
 
   propagatedBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix
index 66e2d5f52f382..eda143927f4ee 100644
--- a/pkgs/development/python-modules/clint/default.nix
+++ b/pkgs/development/python-modules/clint/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python
 , mock
 , blessings
@@ -15,9 +15,11 @@ buildPythonPackage rec {
   pname = "clint";
   version = "0.5.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1an5lkkqk1zha47198p42ji3m94xmzx1a03dn7866m87n4r4q8h5";
+  src = fetchFromGitHub {
+     owner = "kennethreitz";
+     repo = "clint";
+     rev = "v0.5.1";
+     sha256 = "1qv7d8h16klk3n9a8aw6bldpg3gxvvpffzrwjwq83yjrynn1psww";
   };
 
   LC_ALL="en_US.UTF-8";
diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix
index 4f9a562543b93..f479c32afb9af 100644
--- a/pkgs/development/python-modules/clize/default.nix
+++ b/pkgs/development/python-modules/clize/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python-dateutil
 , sigtools
 , six
@@ -17,9 +17,11 @@ buildPythonPackage rec {
   pname = "clize";
   version = "4.2.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3177a028e4169d8865c79af82bdd441b24311d4bd9c0ae8803641882d340a51d";
+  src = fetchFromGitHub {
+     owner = "epsy";
+     repo = "clize";
+     rev = "4.2.1";
+     sha256 = "0l68bdmbyjrp8dwz7ww206r8jbmxx2wbwma99rcpyymm2dfikkhr";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix
index a21faa492dfec..28fd3ecc942ba 100644
--- a/pkgs/development/python-modules/cloudflare/default.nix
+++ b/pkgs/development/python-modules/cloudflare/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , beautifulsoup4
 , requests
 , future
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   pname = "cloudflare";
   version = "2.8.15";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1f47bd324f80e91487dea2c79be934b1dc612bcfa63e784dcf74c6a2f52a41cc";
+  src = fetchFromGitHub {
+     owner = "cloudflare";
+     repo = "python-cloudflare";
+     rev = "2.8.15";
+     sha256 = "1ygh3xh3b6600v17jfagjjxkzn6jsmrm51p1lifanl4rq4p927pr";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix
index f525b6e7f1dfd..2a4d7c5f2dd5f 100644
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/pkgs/development/python-modules/cloudpickle/default.nix
@@ -1,13 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, mock }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pytest, mock }:
 
 buildPythonPackage rec {
   pname = "cloudpickle";
   version = "1.6.0";
   disabled = isPy27; # abandoned upstream
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "9bc994f9e9447593bd0a45371f0e7ac7333710fcf64a4eb9834bf149f4ef2f32";
+  src = fetchFromGitHub {
+     owner = "cloudpipe";
+     repo = "cloudpickle";
+     rev = "v1.6.0";
+     sha256 = "1584d21d4rcpryn8yfz0pjnjprk4zm367m0razdcz8cjbsh0dxp6";
   };
 
   buildInputs = [ pytest mock ];
diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix
index cd11aa03f863b..e01ea3cec6f18 100644
--- a/pkgs/development/python-modules/cloudscraper/default.nix
+++ b/pkgs/development/python-modules/cloudscraper/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , isPy3k
-, fetchPypi
+, fetchFromGitHub
 , requests
 , requests-toolbelt
 , pyparsing
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   version = "1.2.58";
   disabled = !isPy3k;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1wnzv2k8cm8q1x18r4zg8pcnpm4gsdp82hywwjimp2v2qll918nx";
+  src = fetchFromGitHub {
+     owner = "venomous";
+     repo = "cloudscraper";
+     rev = "1.2.58";
+     sha256 = "18fbp086imabjxly04rrchbf6n6m05bpd150zxbw7z2w3mjnpsqd";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix
index 71273ed1a226d..bd2039f9ae09d 100644
--- a/pkgs/development/python-modules/cmdline/default.nix
+++ b/pkgs/development/python-modules/cmdline/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, pyyaml }:
+{ lib, buildPythonPackage, fetchFromGitHub, pyyaml }:
 
 buildPythonPackage rec {
   pname = "cmdline";
   version = "0.2.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "7cf6af53549892b2218c2f56a199dff54a733be5c5515c0fd626812070b0a86a";
+  src = fetchFromGitHub {
+     owner = "rca";
+     repo = "cmdline";
+     rev = "0.2.0";
+     sha256 = "1jda3hp3hdlzxk4p1z6g0x52pbf0w66llakddcn9874g8nsh4v65";
   };
 
   # No tests, https://github.com/rca/cmdline/issues/1
diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix
index 20f45f1fa75fb..071009e35aafb 100644
--- a/pkgs/development/python-modules/colanderalchemy/default.nix
+++ b/pkgs/development/python-modules/colanderalchemy/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , colander
 , sqlalchemy
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "ColanderAlchemy";
   version = "0.3.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "006wcfch2skwvma9bq3l06dyjnz309pa75h1rviq7i4pd9g463bl";
+  src = fetchFromGitHub {
+     owner = "stefanofontanelli";
+     repo = "ColanderAlchemy";
+     rev = "v0.3.4";
+     sha256 = "1j4c7lrra0cywj4zsx1z8yjldn63x8diwz6jjid8vq502smyz4ym";
   };
 
   propagatedBuildInputs = [ colander sqlalchemy ];
diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix
index 1d472035b2f2e..fb4af7b86e301 100644
--- a/pkgs/development/python-modules/colorama/default.nix
+++ b/pkgs/development/python-modules/colorama/default.nix
@@ -1,12 +1,14 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib, fetchFromGitHub, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "colorama";
   version = "0.4.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b";
+  src = fetchFromGitHub {
+     owner = "tartley";
+     repo = "colorama";
+     rev = "0.4.4";
+     sha256 = "0m45zy6h6ab5137b9qpkx2m9kd55rfm4yzbja676cd58cwbp01jy";
   };
 
   # No tests in archive
diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix
index 50a052ec1f942..e0f8451070e0f 100644
--- a/pkgs/development/python-modules/colorclass/default.nix
+++ b/pkgs/development/python-modules/colorclass/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "colorclass";
   version = "2.2.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b05c2a348dfc1aff2d502527d78a5b7b7e2f85da94a96c5081210d8e9ee8e18b";
+  src = fetchFromGitHub {
+     owner = "Robpol86";
+     repo = "colorclass";
+     rev = "v2.2.0";
+     sha256 = "1c9r7v888wavaq8mhzihg42rlfynwzvgw95r5h7sjkqz2zd1pf4b";
   };
 
   # No tests in archive
diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix
index 690a54813f414..b846bcf0b41f2 100644
--- a/pkgs/development/python-modules/colorlog/default.nix
+++ b/pkgs/development/python-modules/colorlog/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytestCheckHook
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "colorlog";
   version = "6.6.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-NE9zIEAJ5Mg8W2vrALPEXccPza48gNuRngpBcdAG/eg=";
+  src = fetchFromGitHub {
+     owner = "borntyping";
+     repo = "python-colorlog";
+     rev = "v6.6.0";
+     sha256 = "0sfs2alhhnjmxzgbqdhbh1ylykdcj9vkm7rs6i7xymsgpf26qinb";
   };
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix
index 70dd66e8f8139..2c8a4338264e1 100644
--- a/pkgs/development/python-modules/colorlover/default.nix
+++ b/pkgs/development/python-modules/colorlover/default.nix
@@ -1,15 +1,17 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "colorlover";
   version = "0.3.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b8fb7246ab46e1f5e6715649453c1762e245a515de5ff2d2b4aab7a6e67fa4e2";
+  src = fetchFromGitHub {
+     owner = "jackparmer";
+     repo = "colorlover";
+     rev = "v0.3.0";
+     sha256 = "1zqc92hj0h9h8aijxb68gz3nv78zv3fzihwy7jyi57bxarfc5jp7";
   };
 
   # no tests included in distributed archive
diff --git a/pkgs/development/python-modules/colorspacious/default.nix b/pkgs/development/python-modules/colorspacious/default.nix
index 6f75d343066a8..17e39a2959a03 100644
--- a/pkgs/development/python-modules/colorspacious/default.nix
+++ b/pkgs/development/python-modules/colorspacious/default.nix
@@ -1,13 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi, numpy
+{ lib, buildPythonPackage, fetchFromGitHub, numpy
 }:
 
 buildPythonPackage rec {
   pname = "colorspacious";
   version = "1.1.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "065n24zbm9ymy2gvf03vx5cggk1258vcjdaw8jn9v26arpl7542y";
+  src = fetchFromGitHub {
+     owner = "njsmith";
+     repo = "colorspacious";
+     rev = "v1.1.2";
+     sha256 = "0x7nkphr6g5ql5fvgss8l56rgiyjgh6fm8zzs73i94ci9wzlm63w";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix
index 142245221312d..fca42819b627e 100644
--- a/pkgs/development/python-modules/commoncode/default.nix
+++ b/pkgs/development/python-modules/commoncode/default.nix
@@ -4,7 +4,7 @@
 , beautifulsoup4
 , buildPythonPackage
 , click
-, fetchPypi
+, fetchFromGitHub
 , intbitset
 , pytest-xdist
 , pytestCheckHook
@@ -22,9 +22,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-6SeU4u6pfDuGCgCYAO5fdbWBxW9XN3WvM8j6DwUlFwM=";
+  src = fetchFromGitHub {
+     owner = "nexB";
+     repo = "commoncode";
+     rev = "v30.0.0";
+     sha256 = "07s9qijnrzk2jpc0gzzg4p7ig7kxp7f2pp11prf5mvk74wc1bzbn";
   };
 
   dontConfigure = true;
diff --git a/pkgs/development/python-modules/confight/default.nix b/pkgs/development/python-modules/confight/default.nix
index ff07a0f8b6460..2fe3c472e6cc0 100644
--- a/pkgs/development/python-modules/confight/default.nix
+++ b/pkgs/development/python-modules/confight/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , toml
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "confight";
   version = "1.3.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-fJr7f9Y/zEpCedWYd04AMuhkOFqZLJOw4sDiz8SDQ/Y=";
+  src = fetchFromGitHub {
+     owner = "avature";
+     repo = "confight";
+     rev = "1.3.1";
+     sha256 = "0flqn940yxaklg1v5wl07pfvfa8bqm6iv0sqvpfl7yzai08h1lsi";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix
index 793db7d5e4e49..a198b7d6e4ae8 100644
--- a/pkgs/development/python-modules/cornice/default.nix
+++ b/pkgs/development/python-modules/cornice/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pyramid
 , simplejson
 , six
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "cornice";
   version = "6.0.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "532485ed53cae81ef476aaf4cc7c2e0208749ad1959119c46efefdeea5546eba";
+  src = fetchFromGitHub {
+     owner = "mozilla-services";
+     repo = "cornice";
+     rev = "6.0.0";
+     sha256 = "14n8n7adxhigybbdam5lsnz4j6rrblxiwanl6fwxbi6jk0d7an2n";
   };
 
   propagatedBuildInputs = [ pyramid simplejson six venusian ];
diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix
index 72e8f6d45a728..4c4f435df006d 100644
--- a/pkgs/development/python-modules/coveralls/default.nix
+++ b/pkgs/development/python-modules/coveralls/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage
 , lib
-, fetchPypi
+, fetchFromGitHub
 , isPy27
 , mock
 , pytest
@@ -20,9 +20,11 @@ buildPythonPackage rec {
   disabled = isPy27;
 
   # wanted by tests
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b32a8bb5d2df585207c119d6c01567b81fba690c9c10a753bfe27a335bfc43ea";
+  src = fetchFromGitHub {
+     owner = "coveralls-clients";
+     repo = "coveralls-python";
+     rev = "3.3.1";
+     sha256 = "0ww5yamljj9w8zfg79pmqm00gs05wlsbqlvq6lqan4r20dgx0cgy";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/cppy/default.nix b/pkgs/development/python-modules/cppy/default.nix
index fffa91744248e..2f8a922411ba8 100644
--- a/pkgs/development/python-modules/cppy/default.nix
+++ b/pkgs/development/python-modules/cppy/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , isPy3k
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "cppy";
   version = "1.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4eda6f1952054a270f32dc11df7c5e24b259a09fddf7bfaa5f33df9fb4a29642";
+  src = fetchFromGitHub {
+     owner = "nucleic";
+     repo = "cppy";
+     rev = "1.1.0";
+     sha256 = "1jlnrhrplhvi0p4ymak2lcv1wg3npf0np86vb911rj05fnplpwly";
   };
 
   # Headers-only library, no tests
diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix
index 53caec6659647..619bf8bfc4972 100644
--- a/pkgs/development/python-modules/crayons/default.nix
+++ b/pkgs/development/python-modules/crayons/default.nix
@@ -1,12 +1,14 @@
-{ lib, fetchPypi, buildPythonPackage, colorama }:
+{ lib, fetchFromGitHub, buildPythonPackage, colorama }:
 
 buildPythonPackage rec {
   pname = "crayons";
   version = "0.4.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bd33b7547800f2cfbd26b38431f9e64b487a7de74a947b0fafc89b45a601813f";
+  src = fetchFromGitHub {
+     owner = "kennethreitz";
+     repo = "crayons";
+     rev = "v0.4.0";
+     sha256 = "0zmls5c67mxyxzlwvagiidlrxy1f6f8kwm5afjsydhn19h4rd7za";
   };
 
   propagatedBuildInputs = [ colorama ];
diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index 0267aee761008..b85fa839c8093 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }:
+{ lib, buildPythonPackage, fetchFromGitHub, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }:
 
 buildPythonPackage rec {
   pname = "credstash";
   version = "1.17.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6c04e8734ef556ab459018da142dd0b244093ef176b3be5583e582e9a797a120";
+  src = fetchFromGitHub {
+     owner = "LuminalOSS";
+     repo = "credstash";
+     rev = "v1.17.1";
+     sha256 = "1vanakwqn28nyrzkh48ixzzi2g8hr52mh01dha3rirmdy5yv78vb";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix
index 3628609259c18..c903f0689a748 100644
--- a/pkgs/development/python-modules/croniter/default.nix
+++ b/pkgs/development/python-modules/croniter/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python-dateutil
 , pytestCheckHook
 , pytz
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   pname = "croniter";
   version = "1.0.15";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "06c2smrjskd9di8lcpymcxmygncxr14932qjhslc37yyaafzq3d7";
+  src = fetchFromGitHub {
+     owner = "kiorky";
+     repo = "croniter";
+     rev = "1.0.15";
+     sha256 = "1n6nnzyifdy4yc54mj99cvapqz0xr36vhpd29j8ifxk9gl5pj04n";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index d21e6d060fe1a..13ac43fbb8a5b 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , rustPlatform
 , setuptools-rust
 , openssl
@@ -23,9 +23,11 @@ buildPythonPackage rec {
   pname = "cryptography";
   version = "3.4.8"; # Also update the hash in vectors.nix
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l";
+  src = fetchFromGitHub {
+     owner = "pyca";
+     repo = "cryptography";
+     rev = "3.4.8";
+     sha256 = "1gv7agic13iw2hpvzqhbk46zkkw98v9iizf0ywyz6mflrylm231x";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
diff --git a/pkgs/development/python-modules/css-parser/default.nix b/pkgs/development/python-modules/css-parser/default.nix
index 7791c2b9a2371..d137888be8a38 100644
--- a/pkgs/development/python-modules/css-parser/default.nix
+++ b/pkgs/development/python-modules/css-parser/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "css-parser";
   version = "1.0.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4ed448a8a5622edb1d30d616bbc4bd3d30f11be922343d7a92d7e418e324af2e";
+  src = fetchFromGitHub {
+     owner = "ebook-utils";
+     repo = "css-parser";
+     rev = "v1.0.6";
+     sha256 = "0nk444f01c7c7cqc3v51698kqgijyg65mg0a882bngydzixf1qwn";
   };
 
   # Test suite not included in tarball yet
diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix
index 929640a7c1e84..cd43b09049ac2 100644
--- a/pkgs/development/python-modules/cssmin/default.nix
+++ b/pkgs/development/python-modules/cssmin/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "cssmin";
   version = "0.2.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1dk723nfm2yf8cp4pj785giqlwv42l0kj8rk40kczvq1hk6g04p0";
+  src = fetchFromGitHub {
+     owner = "zacharyvoase";
+     repo = "cssmin";
+     rev = "v0.2.0";
+     sha256 = "04bzpal6j26pjjjf3p7iq6g2wcr61j4g0ygqz6h847h4hsyah9qg";
   };
 
   # no tests
diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
index f286cd4a7f02e..e9a93560327d9 100644
--- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
+++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
@@ -1,12 +1,14 @@
-{ lib, fetchPypi, buildPythonPackage, pytest, pytest-html }:
+{ lib, fetchFromGitHub, buildPythonPackage, pytest, pytest-html }:
 
 buildPythonPackage rec {
   pname = "cucumber-tag-expressions";
   version = "4.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960";
+  src = fetchFromGitHub {
+     owner = "cucumber";
+     repo = "tag-expressions-python";
+     rev = "v4.1.0";
+     sha256 = "0iyx0mwhbikhmrhwh1i9z95igj6hsz5sa3vgxxamyy0ldzzc4s9m";
   };
 
   checkInputs = [ pytest pytest-html ];
diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix
index 1a0f4e2d9fe75..34c361f5d189b 100644
--- a/pkgs/development/python-modules/curio/default.nix
+++ b/pkgs/development/python-modules/curio/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , isPy3k
 , pytestCheckHook
 , sphinx
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   version = "1.5";
   disabled = !isPy3k;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-rwghLlkLt9qOTMOcQgEnEUlNwg1iLxYhVbopbMLjvBA=";
+  src = fetchFromGitHub {
+     owner = "dabeaz";
+     repo = "curio";
+     rev = "1.5";
+     sha256 = "06rvcqs8qysdl7sn1h5w53s0xfgmrqvmdxp9ycbfh0y8ff1c582w";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix
index ede96fc3b41d7..ecef41342d1cd 100644
--- a/pkgs/development/python-modules/cwcwidth/default.nix
+++ b/pkgs/development/python-modules/cwcwidth/default.nix
@@ -1,13 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi, cython, pytestCheckHook }:
+{ lib, buildPythonPackage, fetchFromGitHub, cython, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "cwcwidth";
   version = "0.1.4";
   format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1azrphpkcyggg38xvkfb9dpc4xmmm90p02kf8dkqd4d6j5w96aj8";
+  src = fetchFromGitHub {
+     owner = "sebastinas";
+     repo = "cwcwidth";
+     rev = "v0.1.4";
+     sha256 = "1w6sfkim23l6mcyj303iwisfv77c338rlxf5zpcxsrs6b9r3s2lx";
   };
 
   nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index a553aeab65c0d..596234eeb1caf 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , python
 , fetchpatch
-, fetchPypi
+, fetchFromGitHub
 , pari
 , gmp
 , cython
@@ -14,9 +14,11 @@ buildPythonPackage rec {
   # upgrade may break sage, please test the sage build or ping @timokau on upgrade
   version = "2.1.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a";
+  src = fetchFromGitHub {
+     owner = "defeo";
+     repo = "cypari2";
+     rev = "2.1.2b1";
+     sha256 = "1f43ygyxn10nysajvina0bsbmdp5hyb8j5xagc2y5xwz61jbk164";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/daemonize/default.nix b/pkgs/development/python-modules/daemonize/default.nix
index 26f23b7156ddf..8a484587b97b4 100644
--- a/pkgs/development/python-modules/daemonize/default.nix
+++ b/pkgs/development/python-modules/daemonize/default.nix
@@ -1,15 +1,17 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "daemonize";
   version = "2.5.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1hwbl3gf9fdds9sc14zgjyjisjvxidrvqc11xlbb0b6jz17nw0nx";
+  src = fetchFromGitHub {
+     owner = "thesharp";
+     repo = "daemonize";
+     rev = "v2.5.0";
+     sha256 = "0pz914x6dfq133nfv0y8q8fss4zr52ip8mq3ds50rx0ddlbb0k2x";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix
index 7a14fbd57796b..0bc5e2f85e80d 100644
--- a/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -3,7 +3,7 @@
 , dask
 , distributed
 , docrep
-, fetchPypi
+, fetchFromGitHub
 , pytest-asyncio
 , pytestCheckHook
 }:
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   version = "0.7.3";
   pname = "dask-jobqueue";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "682d7cc0e6b319b6ab83a7a898680c12e9c77ddc77df380b40041290f55d4e79";
+  src = fetchFromGitHub {
+     owner = "dask";
+     repo = "dask-jobqueue";
+     rev = "0.7.3";
+     sha256 = "060yndyv2i7vrrfca5xg1xkx5g0kdb8asp1ddwvsyy58rznjs63h";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix
index bb8bda9228721..a9ffa155be991 100644
--- a/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/pkgs/development/python-modules/databricks-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchFromGitHub
 , click
 , requests
 , tabulate
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "databricks-cli";
   version = "0.16.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3e9a65a19a589b795ebbd9b3b16a8e470d612d57d6216ae44a9c7a735e4080e6";
+  src = fetchFromGitHub {
+     owner = "databricks";
+     repo = "databricks-cli";
+     rev = "0.16.2";
+     sha256 = "0immd6csbdfkbls237lk9ajhr6s7m878n5jkw5m4gsd7049ns1f4";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index a24f726e346de..413d3553ea5c4 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , decorator
 , requests
@@ -19,9 +19,11 @@ buildPythonPackage rec {
   pname = "datadog";
   version = "0.42.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-em+sF6fQnxiDq5pFzk/3oWqhpes8xMbN2sf4xT59Hps=";
+  src = fetchFromGitHub {
+     owner = "DataDog";
+     repo = "datadogpy";
+     rev = "v0.42.0";
+     sha256 = "0xvpsp9jc6hij8j9llnk5irrli494k2k8382g6yljdi241v2izzq";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix
index 50bde25cf4446..10938dc7d173b 100644
--- a/pkgs/development/python-modules/datashape/default.nix
+++ b/pkgs/development/python-modules/datashape/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  # Fetcher function looks similar to fetchPypi.
+  # Fetcher function looks similar to fetchFromGitHub.
   # Allows for easier overriding, without having to know
   # how the source is actually fetched.
   fetcher = {pname, version, sha256}: fetchFromGitHub {
diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix
index 9008270fc79e3..5495d0ba0da79 100644
--- a/pkgs/development/python-modules/datatable/default.nix
+++ b/pkgs/development/python-modules/datatable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder
 , pipInstallHook, writeText
 , blessed
 , docutils
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   version = "0.11.0";
   disabled = pythonOlder "3.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "19c602711e00f72e9ae296d8fa742d46da037c2d3a2d254bdf68f817a8da76bb";
+  src = fetchFromGitHub {
+     owner = "h2oai";
+     repo = "datatable";
+     rev = "v0.11.0";
+     sha256 = "0isf66dahz403y96zph9cs509q1fsfw45ksrknmrfvy8dxq2zpxl";
   };
   # authors seem to have created their own build system
   format = "other";
diff --git a/pkgs/development/python-modules/dateutils/default.nix b/pkgs/development/python-modules/dateutils/default.nix
index faa3b11554838..9af93e3c19571 100644
--- a/pkgs/development/python-modules/dateutils/default.nix
+++ b/pkgs/development/python-modules/dateutils/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, python-dateutil, pytz }:
+{ lib, buildPythonPackage, fetchFromGitHub, python-dateutil, pytz }:
 
 buildPythonPackage rec {
   pname = "dateutils";
   version = "0.6.12";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E=";
+  src = fetchFromGitHub {
+     owner = "jmcantrell";
+     repo = "python-dateutils";
+     rev = "v0.6.12";
+     sha256 = "1qa48j7v23c65v8hxpjvi6a8qm08n8pj7g1m992r0qbvnyjx073z";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix
index bc5964c737699..56688692fe22b 100644
--- a/pkgs/development/python-modules/ddt/default.nix
+++ b/pkgs/development/python-modules/ddt/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , six, pyyaml, mock
 , pytestCheckHook
 , enum34
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "ddt";
   version = "1.4.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "8de39a69730442dc835e4d33f9d2e33043ff91151c8d18086959ee556febb9f8";
+  src = fetchFromGitHub {
+     owner = "txels";
+     repo = "ddt";
+     rev = "1.4.4";
+     sha256 = "1n0xyvwyfqalyz5jvpg0yd7dfi753in4707vpcxxjjjanmskksxb";
   };
 
   checkInputs = [ six pyyaml mock pytestCheckHook ];
diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix
index 6ac1bab0845eb..ad373c298ad4c 100644
--- a/pkgs/development/python-modules/defusedxml/default.nix
+++ b/pkgs/development/python-modules/defusedxml/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "defusedxml";
   version = "0.7.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69";
+  src = fetchFromGitHub {
+     owner = "tiran";
+     repo = "defusedxml";
+     rev = "v0.7.1";
+     sha256 = "0x2mmqf8g67bbvl66sxg1jnd0pyz1pc694nk554ipj4wkcd0w6ng";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/delorean/default.nix b/pkgs/development/python-modules/delorean/default.nix
index 3435b461d09b6..a8f545302a260 100644
--- a/pkgs/development/python-modules/delorean/default.nix
+++ b/pkgs/development/python-modules/delorean/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , Babel
 , humanize
 , python-dateutil
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "Delorean";
   version = "1.0.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0d31ay7yq2w7xz7m3ssk5phjbm64b2k8hmgcif22719k29p7hrzy";
+  src = fetchFromGitHub {
+     owner = "myusuf3";
+     repo = "delorean";
+     rev = "1.0.0";
+     sha256 = "01ccr453z11cfgzijcj6xq9c2jr4wa4q2qhl15a2987mx0z379r2";
   };
 
   propagatedBuildInputs = [ Babel humanize python-dateutil tzlocal ];
diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix
index 4426fe65bf5e0..a1312aec4d2b3 100644
--- a/pkgs/development/python-modules/deluge-client/default.nix
+++ b/pkgs/development/python-modules/deluge-client/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "deluge-client";
   version = "1.9.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0d2f12108a147d44590c8df63997fcb32f8b2fbc18f8cbb221f0136e2e372b85";
+  src = fetchFromGitHub {
+     owner = "JohnDoee";
+     repo = "deluge-client";
+     rev = "1.9.0";
+     sha256 = "0kjx808w6crpak0ihs32zxg6lmy3g3bv5amsfcf98h23kqz4vk5m";
   };
 
   # it will try to connect to a running instance
diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix
index 25e2692af3ba2..38e0f4c8f2ea2 100644
--- a/pkgs/development/python-modules/demjson/default.nix
+++ b/pkgs/development/python-modules/demjson/default.nix
@@ -1,12 +1,14 @@
-{ lib, python, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, python, buildPythonPackage, fetchFromGitHub, isPy3k }:
 
 buildPythonPackage rec {
   pname = "demjson";
   version = "2.2.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
+  src = fetchFromGitHub {
+     owner = "dmeranda";
+     repo = "demjson";
+     rev = "release-2.2.4";
+     sha256 = "08af460dw1awn3ywdpgk34ghqfz6afsxv1mr1m5hak9q4x6jpqlc";
   };
 
   checkPhase = lib.optionalString isPy3k ''
diff --git a/pkgs/development/python-modules/demjson3/default.nix b/pkgs/development/python-modules/demjson3/default.nix
index 5887ec54c2ab6..3f821e048e9ec 100644
--- a/pkgs/development/python-modules/demjson3/default.nix
+++ b/pkgs/development/python-modules/demjson3/default.nix
@@ -1,7 +1,7 @@
 { lib
 , python
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 }:
 
@@ -11,9 +11,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "103dc4pzwg8791q3zll1vv4gcc17d9v3jvr9zj23cpv9hpfsp6mb";
+  src = fetchFromGitHub {
+     owner = "nielstron";
+     repo = "demjson3";
+     rev = "release-3.0.5";
+     sha256 = "1zknismng6s1z1fj7shp916fwpdp9z5jfv2qn98jpkckpk8b3myq";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix
index d519aa76c8b1b..e5c4cbcd60ce5 100644
--- a/pkgs/development/python-modules/diceware/default.nix
+++ b/pkgs/development/python-modules/diceware/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchFromGitHub
 , pytest-runner
 , setuptools
 , coverage, pytest
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "diceware";
   version = "0.9.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby";
+  src = fetchFromGitHub {
+     owner = "ulif";
+     repo = "diceware";
+     rev = "v0.9.6";
+     sha256 = "14z94wjdcnz4lvb7r0dsfx8qjndmxkc55dn5qy1namqs01s8n1hd";
   };
 
   nativeBuildInputs = [ pytest-runner ];
diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix
index 3e05deb5e2d32..ad9fcedd7ab84 100644
--- a/pkgs/development/python-modules/diff-match-patch/default.nix
+++ b/pkgs/development/python-modules/diff-match-patch/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, python }:
+{ lib, buildPythonPackage, fetchFromGitHub, python }:
 
 buildPythonPackage rec {
   pname = "diff-match-patch";
@@ -10,9 +10,11 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
   };
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "da6f5a01aa586df23dfc89f3827e1cafbb5420be9d87769eeb079ddfd9477a18";
+  src = fetchFromGitHub {
+     owner = "diff-match-patch-python";
+     repo = "diff-match-patch";
+     rev = "v20200713";
+     sha256 = "0834fvsxyw52426lq0qd38vxjk5bpy03sqqg6byayxz5hml1qdqh";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix
index 025939f2db287..2fc273911181f 100644
--- a/pkgs/development/python-modules/digi-xbee/default.nix
+++ b/pkgs/development/python-modules/digi-xbee/default.nix
@@ -1,13 +1,15 @@
-{ buildPythonPackage, fetchPypi, isPy27, pyserial, srp, lib }:
+{ buildPythonPackage, fetchFromGitHub, isPy27, pyserial, srp, lib }:
 
 buildPythonPackage rec {
   pname = "digi-xbee";
   version = "1.4.0";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "664737d1aab453ea40b9745f1ee1e88920acff1cce2e07c42e7f5aa64a16e6aa";
+  src = fetchFromGitHub {
+     owner = "digidotcom";
+     repo = "xbee-python";
+     rev = "1.4.0";
+     sha256 = "1c2mavpf31vfjd7plrfw87hcxmhkwf7p5bnazsc3dn5xqjdh3j3f";
   };
 
   propagatedBuildInputs = [ pyserial srp ];
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
index bf8675af941d3..99402180daa0a 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -1,12 +1,14 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib, fetchFromGitHub, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "distro";
   version = "1.6.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424";
+  src = fetchFromGitHub {
+     owner = "nir0s";
+     repo = "distro";
+     rev = "v1.6.0";
+     sha256 = "157yyhw5y8z7ib2zks887a10jxg0a1l8ffiprzrrzgxl0ghybcnb";
   };
 
   # tests are very targeted at individual linux distributions
diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix
index 698e2a0c30524..d8a1507ada8c9 100644
--- a/pkgs/development/python-modules/dj-database-url/default.nix
+++ b/pkgs/development/python-modules/dj-database-url/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "dj-database-url";
   version = "0.5.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163";
+  src = fetchFromGitHub {
+     owner = "kennethreitz";
+     repo = "dj-database-url";
+     rev = "v0.5.0";
+     sha256 = "00rl0qyhmb5rrz2b8illxrxd707fzf2h9cx2x69d83p1xyw6890y";
   };
 
   # Tests access a DB via network
diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix
index ee2d8e2f21e8c..24680c685b849 100644
--- a/pkgs/development/python-modules/dj-email-url/default.nix
+++ b/pkgs/development/python-modules/dj-email-url/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   version = "1.0.2";
   pname = "dj-email-url";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "838fd4ded9deba53ae757debef431e25fa7fca31d3948b3c4808ccdc84fab2b7";
+  src = fetchFromGitHub {
+     owner = "migonzalvar";
+     repo = "dj-email-url";
+     rev = "v1.0.2";
+     sha256 = "1rdy4l6k5w1qmws00nc15qlg2jzrcp6zckvj8r5zw2gxszy2i1fb";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix
index ab329cd37aba5..b4f945e82ce49 100644
--- a/pkgs/development/python-modules/django-auth-ldap/default.nix
+++ b/pkgs/development/python-modules/django-auth-ldap/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi, isPy27
+, fetchFromGitHub, isPy27
 , ldap , django
 , mock
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "django-auth-ldap";
   version = "3.0.0";
   disabled = isPy27;
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1f2d5c562d9ba9a5e9a64099ae9798e1a63840a11afe4d1c4a9c74121f066eaa";
+  src = fetchFromGitHub {
+     owner = "django-auth-ldap";
+     repo = "django-auth-ldap";
+     rev = "3.0.0";
+     sha256 = "0v1fb9mrhfvpi570rb2id9q9zz1p72psvrzkih7fp756z2hy8xhj";
   };
 
   propagatedBuildInputs = [ ldap django ];
diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix
index 58900ac2cbf4e..549fdd92cc894 100644
--- a/pkgs/development/python-modules/django-cacheops/default.nix
+++ b/pkgs/development/python-modules/django-cacheops/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , lib
 , django
 , funcy
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "django-cacheops";
   version = "6.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "78e161ebd96a32e28e19ec7da31f2afed9e62a79726b8b5f0ed12dd16c2e5841";
+  src = fetchFromGitHub {
+     owner = "Suor";
+     repo = "django-cacheops";
+     rev = "6.0";
+     sha256 = "1gfn83dv4bmd0092mz8h24jw14fpgcfjxcc7msq9d5yvrk2id3qh";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix
index 8d07148ce1824..cf974eb61913d 100644
--- a/pkgs/development/python-modules/django-discover-runner/default.nix
+++ b/pkgs/development/python-modules/django-discover-runner/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , django
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   version = "1.0";
   pname = "django-discover-runner";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0ba91fe722c256bcbfdeb36fac7eac0f27e5bfda55d98c4c1cf9ab62b5b084fe";
+  src = fetchFromGitHub {
+     owner = "jezdez";
+     repo = "django-discover-runner";
+     rev = "1.0";
+     sha256 = "0v25pgcyqwc4n9p073zqy2f60q1wpyal10x77f18q3vyxk0lpg8g";
   };
 
   propagatedBuildInputs = [ django ];
diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix
index 9f04f25f4648c..f81e16200c14e 100644
--- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix
+++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchFromGitHub
 , django, persisting-theory, six
 }:
 
@@ -6,9 +6,11 @@ buildPythonPackage rec {
   pname = "django-dynamic-preferences";
   version = "1.11.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f214c938b5872a17647e2b2ccfd9ad00a90a3c6c4aa83fa65d3c5c446e7a66c7";
+  src = fetchFromGitHub {
+     owner = "EliotBerriot";
+     repo = "django-dynamic-preferences";
+     rev = "1.11.0";
+     sha256 = "0lyrc4pqrsybq6abc4dd3k0cfgaimsv5mldk7jgla1yxvlw7k9vf";
   };
 
   propagatedBuildInputs = [ six django persisting-theory ];
diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix
index d773c1490bcc4..c68a73d603c63 100644
--- a/pkgs/development/python-modules/django-ipware/default.nix
+++ b/pkgs/development/python-modules/django-ipware/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, django }:
+{ lib, buildPythonPackage, fetchFromGitHub, django }:
 
 buildPythonPackage rec {
   pname = "django-ipware";
   version = "4.0.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1294f916f3b3475e40e1b0ec1bd320aa2397978eae672721c81cbc2ed517e9ee";
+  src = fetchFromGitHub {
+     owner = "un33k";
+     repo = "django-ipware";
+     rev = "v4.0.0";
+     sha256 = "1sr2vbnpiq6hqqs4xdfhsylvjcq9ygpjafc25gzvhwlq5zrh8vbq";
   };
 
   propagatedBuildInputs = [ django ];
diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix
index 04885072c6788..9cf22d4ee74c6 100644
--- a/pkgs/development/python-modules/django-jinja2/default.nix
+++ b/pkgs/development/python-modules/django-jinja2/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchFromGitHub,
   django, jinja2, pytz, tox
  }:
 
@@ -12,9 +12,11 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
   };
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6c1fc68b0f4b1fb21b208a3e5dc19a3b11bab2812c06f827d5fdbd24001a1910";
+  src = fetchFromGitHub {
+     owner = "niwinz";
+     repo = "django-jinja";
+     rev = "2.9.1";
+     sha256 = "0p9pkn6jjzagpnvcrl9c2vjqamkms7ymvyhhmaqqqhrlv89qnzp7";
   };
 
   buildInputs = [ django pytz tox ];
diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix
index 046c60989a74d..596ec48072023 100644
--- a/pkgs/development/python-modules/django-multiselectfield/default.nix
+++ b/pkgs/development/python-modules/django-multiselectfield/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , django
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "django-multiselectfield";
   version = "0.1.12";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1ygra8s394d1szgj7yawlca17q08hygsrzvq2k3k48zvd0awg96h";
+  src = fetchFromGitHub {
+     owner = "goinnn";
+     repo = "django-multiselectfield";
+     rev = "v0.1.12";
+     sha256 = "1bjydd4zh6wzxmv4drx5fslwcv51qa57l3lc2216fni89islnj2m";
   };
 
   propagatedBuildInputs = [ django ];
diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix
index e04581b3574bb..0803e565e365a 100644
--- a/pkgs/development/python-modules/django-rest-auth/default.nix
+++ b/pkgs/development/python-modules/django-rest-auth/default.nix
@@ -1,5 +1,5 @@
 { lib,
-  fetchPypi,
+  fetchFromGitHub,
   django,
   djangorestframework,
   six,
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "django-rest-auth";
   version = "0.9.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f11e12175dafeed772f50d740d22caeab27e99a3caca24ec65e66a8d6de16571";
+  src = fetchFromGitHub {
+     owner = "Tivix";
+     repo = "django-rest-auth";
+     rev = "0.9.5";
+     sha256 = "0rpngmvifn00cxar7v09sdb5ggp5rmrndhmh282k3cgwgd8a285c";
   };
 
   propagatedBuildInputs = [ django djangorestframework six ];
diff --git a/pkgs/development/python-modules/django-taggit/default.nix b/pkgs/development/python-modules/django-taggit/default.nix
index 7f7cfd2b4bcbd..74146b4bfa0b4 100644
--- a/pkgs/development/python-modules/django-taggit/default.nix
+++ b/pkgs/development/python-modules/django-taggit/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , pythonOlder
-, fetchPypi
+, fetchFromGitHub
 , django
 , djangorestframework
 , python
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   format = "setuptools";
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e5bb62891f458d55332e36a32e19c08d20142c43f74bc5656c803f8af25c084a";
+  src = fetchFromGitHub {
+     owner = "jazzband";
+     repo = "django-taggit";
+     rev = "1.5.1";
+     sha256 = "1pnbspkwm9zllx1f983vzk5ww2jz2fgld7fg0r27aw5ksv8dqqw4";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix
index 2656dd593c1c2..6bd9f11e7241d 100644
--- a/pkgs/development/python-modules/django-webpack-loader/default.nix
+++ b/pkgs/development/python-modules/django-webpack-loader/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "django-webpack-loader";
   version = "1.4.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "7e34085b7fc4d352e482ff9cf7d09ae4524e730675e25432ab1d25a2dd94e583";
+  src = fetchFromGitHub {
+     owner = "owais";
+     repo = "django-webpack-loader";
+     rev = "1.4.1";
+     sha256 = "1gi578x34vva22rf05y24jlfs2nxiy4vrbqsdnlmnvyfcbsi24yh";
   };
 
   # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?)
diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix
index e9a31b461fd6e..b87b78241dfa2 100644
--- a/pkgs/development/python-modules/dockerfile-parse/default.nix
+++ b/pkgs/development/python-modules/dockerfile-parse/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, six, pytest-cov, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, six, pytest-cov, pytest }:
 
 buildPythonPackage rec {
   version = "1.2.0";
   pname = "dockerfile-parse";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "07e65eec313978e877da819855870b3ae47f3fac94a40a965b9ede10484dacc5";
+  src = fetchFromGitHub {
+     owner = "DBuildService";
+     repo = "dockerfile-parse";
+     rev = "1.2.0";
+     sha256 = "0mpgqvfn2h5ijl20ilvf4cbgqzl2y4crz33i32akjp18bf5kvffz";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/docopt-ng/default.nix b/pkgs/development/python-modules/docopt-ng/default.nix
index 7a18bfbc7cfa2..1a36dd61eff0a 100644
--- a/pkgs/development/python-modules/docopt-ng/default.nix
+++ b/pkgs/development/python-modules/docopt-ng/default.nix
@@ -1,15 +1,17 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "docopt-ng";
   version = "0.7.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-hs7qAy8M+lnmB3brDPOKxzZTWBAihyMg9H3IdGeNckQ=";
+  src = fetchFromGitHub {
+     owner = "bazaar-projects";
+     repo = "docopt-ng";
+     rev = "0.7.2";
+     sha256 = "0cwj40pfd6s4jw1hshcjrbalsqz537sv0pakb588cgl4k97wvnl1";
   };
 
   pythonImportsCheck = [ "docopt" ];
diff --git a/pkgs/development/python-modules/docrep/default.nix b/pkgs/development/python-modules/docrep/default.nix
index 3e5d9f21a2bb5..c3b81b7fc8fe1 100644
--- a/pkgs/development/python-modules/docrep/default.nix
+++ b/pkgs/development/python-modules/docrep/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytest
 , six
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "docrep";
   version = "0.3.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ed8a17e201abd829ef8da78a0b6f4d51fb99a4cbd0554adbed3309297f964314";
+  src = fetchFromGitHub {
+     owner = "Chilipp";
+     repo = "docrep";
+     rev = "v0.3.2";
+     sha256 = "0xcb3wpzy4k5aka3x4wmrn84r9mz2paygcw73rcqgrdi4aa1m65s";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix
index 3f0cca295dcb6..4504fd24d8dbd 100644
--- a/pkgs/development/python-modules/dominate/default.nix
+++ b/pkgs/development/python-modules/dominate/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k }:
 
 buildPythonPackage rec {
   pname = "dominate";
   version = "2.6.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4";
+  src = fetchFromGitHub {
+     owner = "Knio";
+     repo = "dominate";
+     rev = "2.6.0";
+     sha256 = "0i9lf7mz5y91xfga6dycj7d4z57f4cdyrhar38qxg9kzwci1xx5n";
   };
 
   doCheck = !isPy3k;
diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix
index 2154f33bb8ba8..f56b1566f18f9 100644
--- a/pkgs/development/python-modules/dot2tex/default.nix
+++ b/pkgs/development/python-modules/dot2tex/default.nix
@@ -1,7 +1,7 @@
 { lib
 , python
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , substituteAll
 , pyparsing
 , graphviz
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   pname = "dot2tex";
   version = "2.11.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9";
+  src = fetchFromGitHub {
+     owner = "kjellmf";
+     repo = "dot2tex";
+     rev = "2.11.3";
+     sha256 = "02n73vbz2xafpkl5izmsq9swwzkm0msbnbhz1cgb9qdmh3iba0zg";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix
index 59fed703e227e..21dd68e8bc478 100644
--- a/pkgs/development/python-modules/dparse/default.nix
+++ b/pkgs/development/python-modules/dparse/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , isPy27
 , toml
 , pyyaml
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   version = "0.5.1";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a1b5f169102e1c894f9a7d5ccf6f9402a836a5d24be80a986c7ce9eaed78f367";
+  src = fetchFromGitHub {
+     owner = "pyupio";
+     repo = "dparse";
+     rev = "0.5.1";
+     sha256 = "0c0ws1v4f3vwv4w1rlhq0n8bdrpd7lc3a6h901d6giqcif9kqp8x";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix
index c9f3d5be6d495..12be3f9ec90ed 100644
--- a/pkgs/development/python-modules/dpath/default.nix
+++ b/pkgs/development/python-modules/dpath/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , hypothesis
 , isPy27
 , mock
@@ -14,9 +14,11 @@ buildPythonPackage rec {
 
   disabled = isPy27; # uses python3 imports
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0kk7wl15r305496q13ka4r6n2r13j99rrrpy2b4575j704dk4x7g";
+  src = fetchFromGitHub {
+     owner = "akesterson";
+     repo = "dpath-python";
+     rev = "v2.0.5";
+     sha256 = "1ga5k3phgn6kmg41m33w3w65vdwnsil3r1y4a6wlhgsnxci5n4vl";
   };
 
   # use pytest as nosetests hangs
diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix
index a1036e099ea85..90d433435db19 100644
--- a/pkgs/development/python-modules/dpkt/default.nix
+++ b/pkgs/development/python-modules/dpkt/default.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
 }:
 
@@ -7,9 +7,11 @@ buildPythonPackage rec {
   pname = "dpkt";
   version = "1.9.7.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b";
+  src = fetchFromGitHub {
+     owner = "kbandla";
+     repo = "dpkt";
+     rev = "v1.9.7.2";
+     sha256 = "115m0n7lda54yqy0ax8aqlqwf8c07pdxcxf3fz8437gpwnrbyh5a";
   };
 
   # Project has no tests
diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix
index 4b55a08f842da..73246588b3f17 100644
--- a/pkgs/development/python-modules/drf-yasg/default.nix
+++ b/pkgs/development/python-modules/drf-yasg/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , inflection
 , ruamel-yaml
 , setuptools-scm
@@ -16,9 +16,11 @@ buildPythonPackage rec {
   pname = "drf-yasg";
   version = "1.20.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d50f197c7f02545d0b736df88c6d5cf874f8fea2507ad85ad7de6ae5bf2d9e5a";
+  src = fetchFromGitHub {
+     owner = "axnsan12";
+     repo = "drf-yasg";
+     rev = "1.20.0";
+     sha256 = "1k0b7n7cydhw204mzw658q9skakfy95nf4p0rhlrgz1nsvyvxz6d";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/dwdwfsapi/default.nix b/pkgs/development/python-modules/dwdwfsapi/default.nix
index 1a68e7474af0c..df2c4a3dab84e 100644
--- a/pkgs/development/python-modules/dwdwfsapi/default.nix
+++ b/pkgs/development/python-modules/dwdwfsapi/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , requests
 , ciso8601
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "dwdwfsapi";
   version = "1.0.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-JOIg6rLrU8v39z1I6smIPEeiUPdSdJcD2avUsTQq+bU=";
+  src = fetchFromGitHub {
+     owner = "stephan192";
+     repo = "dwdwfsapi";
+     rev = "v1.0.4";
+     sha256 = "1lg067nfqjqc12nwmwr4b40vbdhq62mimmmx16s3sgxdiv7kmcxp";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix
index e1898d3fc9e45..1ad781ab71d50 100644
--- a/pkgs/development/python-modules/easydict/default.nix
+++ b/pkgs/development/python-modules/easydict/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "easydict";
   version = "1.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3f3f0dab07c299f0f4df032db1f388d985bb57fa4c5be30acd25c5f9a516883b";
+  src = fetchFromGitHub {
+     owner = "makinacorpus";
+     repo = "easydict";
+     rev = "1.9";
+     sha256 = "0nv0asrdixi16qmafvasmxprgja9g07gxk5fz87lw13n9bfjb9z7";
   };
 
   docheck = false; # No tests in archive
diff --git a/pkgs/development/python-modules/ebaysdk/default.nix b/pkgs/development/python-modules/ebaysdk/default.nix
index 8c80ccd4c3629..07aa8e6b00452 100644
--- a/pkgs/development/python-modules/ebaysdk/default.nix
+++ b/pkgs/development/python-modules/ebaysdk/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , lxml
 , requests
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "ebaysdk";
   version = "2.2.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-Lrh11wa0gfWcqN0wdFON9+UZaBT5zhLQ74RpA0Opx/M=";
+  src = fetchFromGitHub {
+     owner = "timotheus";
+     repo = "ebaysdk-python";
+     rev = "v2.2.0";
+     sha256 = "1ym2qa0q89cd5agw07kkbzw0i5jyj1nm2zm58g94vjsg7acsbdkq";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix
index 15d034bae406d..0f2e260ffd4c4 100644
--- a/pkgs/development/python-modules/ecdsa/default.nix
+++ b/pkgs/development/python-modules/ecdsa/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pkgs
 , six
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "ecdsa";
   version = "0.17.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa";
+  src = fetchFromGitHub {
+     owner = "warner";
+     repo = "python-ecdsa";
+     rev = "python-ecdsa-0.17.0";
+     sha256 = "1i8ykkf07q7s3aijbdxsybpclsxjkfj2pv2f2n8nf241n0wibsaz";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/ecoaliface/default.nix b/pkgs/development/python-modules/ecoaliface/default.nix
index f37a85da7d01e..946cb6ec77f8f 100644
--- a/pkgs/development/python-modules/ecoaliface/default.nix
+++ b/pkgs/development/python-modules/ecoaliface/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , requests
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "ecoaliface";
   version = "0.5.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f17b3452cfd31bb8c3509d59b846889c81db5fb85082c061c32703162cbe9083";
+  src = fetchFromGitHub {
+     owner = "matkor";
+     repo = "ecoaliface";
+     rev = "v0.5.0";
+     sha256 = "0r3k53gdp122ig595fqkqg1gnqfgv8rr6b63jg83gfzr2hf4gw9b";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
index 37bbb183ff40c..41b5965d15a2a 100644
--- a/pkgs/development/python-modules/ecpy/default.nix
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -1,12 +1,14 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k, future }:
+{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, future }:
 
 buildPythonPackage rec {
   pname = "ECPy";
   version = "1.2.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "9635cffb9b6ecf7fd7f72aea1665829ac74a1d272006d0057d45a621aae20228";
+  src = fetchFromGitHub {
+     owner = "ubinity";
+     repo = "ECPy";
+     rev = "1.2.5";
+     sha256 = "0p642bpqicxjkwqk4q46wqkbxhad1qiir6xz4w7xx0d4cdq7yps8";
   };
 
   prePatch = ''
diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix
index 47692075d3bc8..01ba5a56d6497 100644
--- a/pkgs/development/python-modules/ed25519/default.nix
+++ b/pkgs/development/python-modules/ed25519/default.nix
@@ -1,12 +1,14 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib, fetchFromGitHub, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "ed25519";
   version = "1.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0n1k83ww0pr4q6z0h7p8hvy21hcgb96jvgllfbwhvvyf37h3w182";
+  src = fetchFromGitHub {
+     owner = "warner";
+     repo = "python-ed25519";
+     rev = "1.5";
+     sha256 = "0c7sh54divx1sar2914yljy3hli6fjknxpfri0jw9j86jl3y2283";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix
index ac2d5023cc970..2f545e78e75a6 100644
--- a/pkgs/development/python-modules/edward/default.nix
+++ b/pkgs/development/python-modules/edward/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pythonAtLeast
 , Keras, numpy, scipy, six, tensorflow }:
 
 buildPythonPackage rec {
@@ -7,9 +7,11 @@ buildPythonPackage rec {
 
   disabled = !(isPy27 || pythonAtLeast "3.4");
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3818b39e77c26fc1a37767a74fdd5e7d02877d75ed901ead2f40bd03baaa109f";
+  src = fetchFromGitHub {
+     owner = "blei-lab";
+     repo = "edward";
+     rev = "1.3.5";
+     sha256 = "0v1ng40rvya1wc7vk6piv2wiaf830mib8ij0qgm17n3ld4ai4in6";
   };
 
   # disabled for now due to Tensorflow trying to create files in $HOME:
diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix
index 67537dd1f48bb..ad944e55d421a 100644
--- a/pkgs/development/python-modules/effect/default.nix
+++ b/pkgs/development/python-modules/effect/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , lib
 , isPy3k
 , six
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   pname = "effect";
   disabled = (!isPy3k);
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "7affb603707c648b07b11781ebb793a4b9aee8acf1ac5764c3ed2112adf0c9ea";
+  src = fetchFromGitHub {
+     owner = "python-effect";
+     repo = "effect";
+     rev = "1.1.0";
+     sha256 = "08c38kj3fs63r4ycwr8kr3hck901bqjmlapx3n699nm1bp39pn8j";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
index 5f55a3ac4733f..f3d00f1cc3b27 100644
--- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix
+++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , isPy3k
 , elasticsearch
 , ipaddress
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   pname = "elasticsearch-dsl";
   version = "7.4.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c4a7b93882918a413b63bed54018a1685d7410ffd8facbc860ee7fd57f214a6d";
+  src = fetchFromGitHub {
+     owner = "elasticsearch";
+     repo = "elasticsearch-dsl-py";
+     rev = "v7.4.0";
+     sha256 = "1zg6bl99kw5igksc77pmdlm4i49n1rjvnw7pw4f4gvar4yp6lkd4";
   };
 
   propagatedBuildInputs = [ elasticsearch python-dateutil six ]
diff --git a/pkgs/development/python-modules/eliqonline/default.nix b/pkgs/development/python-modules/eliqonline/default.nix
index b972d6addd258..a0b75920e5f5f 100644
--- a/pkgs/development/python-modules/eliqonline/default.nix
+++ b/pkgs/development/python-modules/eliqonline/default.nix
@@ -2,7 +2,7 @@
 , aiohttp
 , buildPythonPackage
 , docopt
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , pyyaml
 }:
@@ -14,9 +14,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "hOUN4cA4pKVioIrfJM02GOnZdDRc7xbNtvHfoD3//bM=";
+  src = fetchFromGitHub {
+     owner = "molobrakos";
+     repo = "eliqonline";
+     rev = "v1.2.2";
+     sha256 = "17grl8nkrf7mhn3rz4zr78k387vjiyhg1nbhgb62ba59fx001qcp";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix
index 8f58720bd264a..b9eb85e3f63ea 100644
--- a/pkgs/development/python-modules/enlighten/default.nix
+++ b/pkgs/development/python-modules/enlighten/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , blessed
 , prefixed
 , pytestCheckHook
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "enlighten";
   version = "1.10.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3391916586364aedced5d6926482b48745e4948f822de096d32258ba238ea984";
+  src = fetchFromGitHub {
+     owner = "Rockhopper-Technologies";
+     repo = "enlighten";
+     rev = "1.10.1";
+     sha256 = "1dsscsp9q67ky91b43zabqlq67wavizbbcxfw6xq2451xls53sap";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/entrypoint2/default.nix b/pkgs/development/python-modules/entrypoint2/default.nix
index d1325f6f0e109..80cb9150e503e 100644
--- a/pkgs/development/python-modules/entrypoint2/default.nix
+++ b/pkgs/development/python-modules/entrypoint2/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, EasyProcess, pathpy, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, EasyProcess, pathpy, pytest }:
 
 buildPythonPackage rec {
   pname = "entrypoint2";
   version = "0.2.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4770c3afcf3865c606a6e5f7cfcc5c59212f555fcee9b2540270399149c1dde3";
+  src = fetchFromGitHub {
+     owner = "ponty";
+     repo = "entrypoint2";
+     rev = "0.2.4";
+     sha256 = "0vbiv9l509rsi94rbhcjz56d71bgy9nq8xmjzd1f4q0iblkvg5pi";
   };
 
   propagatedBuildInputs = [ ];
diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/pkgs/development/python-modules/enum-compat/default.nix
index 42a4b63479ca6..f7b5535a6df6b 100644
--- a/pkgs/development/python-modules/enum-compat/default.nix
+++ b/pkgs/development/python-modules/enum-compat/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, enum34 }:
+{ lib, buildPythonPackage, fetchFromGitHub, enum34 }:
 
 buildPythonPackage rec {
   pname = "enum-compat";
   version = "0.0.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3677daabed56a6f724451d585662253d8fb4e5569845aafa8bb0da36b1a8751e";
+  src = fetchFromGitHub {
+     owner = "jstasiak";
+     repo = "enum-compat";
+     rev = "0.0.3";
+     sha256 = "1bgwvi5yvh11yilbarycq06az424hav0ihql225pn61jnnklx1nw";
   };
 
   propagatedBuildInputs = [ enum34 ];
diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix
index ee547ad9b7bc6..846028a7227ae 100644
--- a/pkgs/development/python-modules/enzyme/default.nix
+++ b/pkgs/development/python-modules/enzyme/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib, fetchFromGitHub, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "enzyme";
@@ -7,9 +7,11 @@ buildPythonPackage rec {
   # Tests rely on files obtained over the network
   doCheck = false;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1fv2kh2v4lwj0hhrhj9pib1pdjh01yr4xgyljhx11l94gjlpy5pj";
+  src = fetchFromGitHub {
+     owner = "Diaoul";
+     repo = "enzyme";
+     rev = "0.4.1";
+     sha256 = "1xcsc05c7jgph133mg19fl3mnc7q43vrlq58pkzsbybgxv8v813q";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/epc/default.nix b/pkgs/development/python-modules/epc/default.nix
index 3950afa578e97..686d617458e65 100644
--- a/pkgs/development/python-modules/epc/default.nix
+++ b/pkgs/development/python-modules/epc/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , sexpdata
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "epc";
   version = "0.0.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a14d2ea74817955a20eb00812e3a4630a132897eb4d976420240f1152c0d7d25";
+  src = fetchFromGitHub {
+     owner = "tkf";
+     repo = "python-epc";
+     rev = "v0.0.5";
+     sha256 = "1r6g1s1xb5756wr4904h9c917mx7k7343ay89a5z2sqmg327l8ah";
   };
 
   propagatedBuildInputs = [ sexpdata ];
diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix
index 45f0599ea2d71..25f89a9cf277f 100644
--- a/pkgs/development/python-modules/eradicate/default.nix
+++ b/pkgs/development/python-modules/eradicate/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "eradicate";
   version = "2.0.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "27434596f2c5314cc9b31410c93d8f7e8885747399773cd088d3adea647a60c8";
+  src = fetchFromGitHub {
+     owner = "myint";
+     repo = "eradicate";
+     rev = "v2.0.0";
+     sha256 = "18vbahs105gznwdymnb9j0vwdk6f7hby7harf7nr2lsjia61pgah";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix
index 6093e16d4b500..2d9e642a15d47 100644
--- a/pkgs/development/python-modules/escapism/default.nix
+++ b/pkgs/development/python-modules/escapism/default.nix
@@ -1,15 +1,17 @@
 { pkgs
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "escapism";
   version = "1.0.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "73256bdfb4f22230f0428fc6efecee61cdc4fad531b6f98b849cb9c80711e4ec";
+  src = fetchFromGitHub {
+     owner = "minrk";
+     repo = "escapism";
+     rev = "1.0.1";
+     sha256 = "1447mamrdbyv9v47f9wrc4fyvbwz5qrwl8qrdzqdq3q62q4xrawj";
   };
 
   # No tests distributed
diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix
index 622dd0b373538..e04bedec5632c 100644
--- a/pkgs/development/python-modules/eth-hash/default.nix
+++ b/pkgs/development/python-modules/eth-hash/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto
+{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto
 , pycryptodome
 }:
 
@@ -6,9 +6,11 @@ buildPythonPackage rec {
   pname = "eth-hash";
   version = "0.3.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3f40cecd5ead88184aa9550afc19d057f103728108c5102f592f8415949b5a76";
+  src = fetchFromGitHub {
+     owner = "ethereum";
+     repo = "eth-hash";
+     rev = "v0.3.2";
+     sha256 = "1d0qq8619kac09qm2bppa27nb1xnnlanhzarzhiqhggc98ayvh1c";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/ewmh/default.nix b/pkgs/development/python-modules/ewmh/default.nix
index c9ac68ae74d81..97be88739f3bd 100644
--- a/pkgs/development/python-modules/ewmh/default.nix
+++ b/pkgs/development/python-modules/ewmh/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, xlib }:
+{ lib, buildPythonPackage, fetchFromGitHub, xlib }:
 
 buildPythonPackage rec {
   pname = "ewmh";
   version = "0.1.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0g9l14my3v8zlgq1yd8wh5gpara0qcapsfmvg7lq2lapglzhjsy5";
+  src = fetchFromGitHub {
+     owner = "parkouss";
+     repo = "pyewmh";
+     rev = "v0.1.6";
+     sha256 = "1hydpyqr5v1qd05aafhahfhpdl0gybfrs5knrgs5pslhygy80qyq";
   };
 
   propagatedBuildInputs = [ xlib ];
diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix
index d369b3645ab6a..2071a78c0779b 100644
--- a/pkgs/development/python-modules/exdown/default.nix
+++ b/pkgs/development/python-modules/exdown/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , isPy27
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , importlib-metadata
 , pytestCheckHook
@@ -14,9 +14,11 @@ buildPythonPackage rec {
 
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-r0SCigkUpOiba4MDf80+dLjOjjruVNILh/raWfvjXA0=";
+  src = fetchFromGitHub {
+     owner = "nschloe";
+     repo = "exdown";
+     rev = "v0.9.0";
+     sha256 = "1i74py33pvmg0517b1028xa0d18nw7pfqr38k32lgigksmc091fc";
   };
 
   propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
diff --git a/pkgs/development/python-modules/extras/default.nix b/pkgs/development/python-modules/extras/default.nix
index ff8432ab2d274..1c7f8ce5edb51 100644
--- a/pkgs/development/python-modules/extras/default.nix
+++ b/pkgs/development/python-modules/extras/default.nix
@@ -1,15 +1,17 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "extras";
   version = "1.0.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e";
+  src = fetchFromGitHub {
+     owner = "testing-cabal";
+     repo = "extras";
+     rev = "1.0.0";
+     sha256 = "0a3lm96bppwa2k5v7pzjb705ix5dsx75i8dk8zgdxi2ph3wvkdi7";
   };
 
   # error: invalid command 'test'
diff --git a/pkgs/development/python-modules/faadelays/default.nix b/pkgs/development/python-modules/faadelays/default.nix
index 7cd0e291999c8..de8f42026fb48 100644
--- a/pkgs/development/python-modules/faadelays/default.nix
+++ b/pkgs/development/python-modules/faadelays/default.nix
@@ -1,7 +1,7 @@
 { lib
 , aiohttp
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 }:
 
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   version = "0.0.7";
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-osZqfSYlKPYZMelBR6YB331iRB4DTjCUlmX7pcrIiGk=";
+  src = fetchFromGitHub {
+     owner = "ntilley905";
+     repo = "faadelays";
+     rev = "v0.0.7";
+     sha256 = "1jhwb3qcwa18q4gm0b5h6bnd9l4drqm89ngw9s093spz7a664q1n";
   };
 
   propagatedBuildInputs = [ aiohttp ];
diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix
index db1810ca056d5..8e5b0ba977e23 100644
--- a/pkgs/development/python-modules/face/default.nix
+++ b/pkgs/development/python-modules/face/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, boltons, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, boltons, pytest }:
 
 buildPythonPackage rec {
   pname = "face";
   version = "20.1.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "7d59ca5ba341316e58cf72c6aff85cca2541cf5056c4af45cb63af9a814bed3e";
+  src = fetchFromGitHub {
+     owner = "mahmoud";
+     repo = "face";
+     rev = "v20.1.1";
+     sha256 = "09slk25vp2dbmaacgk06ga4pay4x2valc469xr7mzzvxpailjlr1";
   };
 
   propagatedBuildInputs = [ boltons ];
diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix
index e9300edab09d2..f456c701814de 100644
--- a/pkgs/development/python-modules/facebook-sdk/default.nix
+++ b/pkgs/development/python-modules/facebook-sdk/default.nix
@@ -1,6 +1,6 @@
 { pkgs
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , requests
 , python
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "facebook-sdk";
   version = "3.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "138grz0n6plzdqgi4h6hhszf58bsvx9v76cwj51g1nd3kvkd5g6a";
+  src = fetchFromGitHub {
+     owner = "pythonforfacebook";
+     repo = "facebook-sdk";
+     rev = "v3.1.0";
+     sha256 = "0p7p0wvcspd9p8d6r25bgjbf0ihdw5g1jw3dylwngrazdmc3g36b";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index eff55de1d90ef..08637a36f011f 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -2,7 +2,7 @@
 , aioredis
 , async_generator
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , hypothesis
 , lupa
 , pytest-asyncio
@@ -21,9 +21,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-yb0S5DAzbL0+GJ+uDpHrmZl7k+dtv91u1n+jUtxoTHE=";
+  src = fetchFromGitHub {
+     owner = "jamesls";
+     repo = "fakeredis";
+     rev = "1.7.0";
+     sha256 = "0vfyirrcmm31f1w4apa9kwndbg3nf5fqkzpqjqhhplcqsj1x98rz";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/fastcache/default.nix b/pkgs/development/python-modules/fastcache/default.nix
index 100af5244b574..2e63434a385d2 100644
--- a/pkgs/development/python-modules/fastcache/default.nix
+++ b/pkgs/development/python-modules/fastcache/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
 
 buildPythonPackage rec {
   pname = "fastcache";
   version = "1.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0avqpswfmw5b08xx3ib6zchc5bis390fn1v74vg7nnrkf1pb3qbd";
+  src = fetchFromGitHub {
+     owner = "pbrady";
+     repo = "fastcache";
+     rev = "v1.1.0";
+     sha256 = "097q19wnx7a2c0vjaxr08xf5vhm1z1a2lza05ccsfgrn189681xp";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/fastecdsa/default.nix b/pkgs/development/python-modules/fastecdsa/default.nix
index e7dbea075870d..aa1e9ff1dae75 100644
--- a/pkgs/development/python-modules/fastecdsa/default.nix
+++ b/pkgs/development/python-modules/fastecdsa/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , gmp
 , pytestCheckHook
 }:
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   version = "2.2.2";
   format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1eb6f3ac86ec483a10df62fcda1fb9a9d5d895a436871a8aa935dd20ccd82c6f";
+  src = fetchFromGitHub {
+     owner = "AntonKueltz";
+     repo = "fastecdsa";
+     rev = "v2.2.2";
+     sha256 = "03g11r6pcrcl0i9zsa3b8yrwkak0hyqfpfi7py7zx31jslnrlz0f";
   };
 
   buildInputs = [ gmp ];
diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix
index 0364022fa2864..8108481a806f2 100644
--- a/pkgs/development/python-modules/fasteners/default.nix
+++ b/pkgs/development/python-modules/fasteners/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , six
 , monotonic
 , diskcache
@@ -15,9 +15,11 @@ buildPythonPackage rec {
   pname = "fasteners";
   version = "0.16.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b1ab4e5adfbc28681ce44b3024421c4f567e705cc3963c732bf1cba3348307de";
+  src = fetchFromGitHub {
+     owner = "harlowja";
+     repo = "fasteners";
+     rev = "0.16.3";
+     sha256 = "1nsyy4b90gvcw1cma2mwwilcy8791z1hdf3a220nccxazndbay34";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix
index 1a3917fbdb7af..8f4aea18985a2 100644
--- a/pkgs/development/python-modules/favicon/default.nix
+++ b/pkgs/development/python-modules/favicon/default.nix
@@ -1,13 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi, requests, beautifulsoup4, pytest, requests-mock,
+{ lib, buildPythonPackage, fetchFromGitHub, requests, beautifulsoup4, pytest, requests-mock,
   pytest-runner }:
 
 buildPythonPackage rec {
   pname = "favicon";
   version = "0.7.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6d6b5a78de2a0d0084589f687f384b2ecd6a6527093fec564403b1a30605d7a8";
+  src = fetchFromGitHub {
+     owner = "scottwernervt";
+     repo = "favicon";
+     rev = "v0.7.0";
+     sha256 = "0dl83y6lp17jjf2p09r09a7v2rnaqd3hry9w350m80sghvpllyrz";
   };
 
   buildInputs = [ pytest-runner ];
diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix
index 32a6a1d60ca10..004bde56c3b3c 100644
--- a/pkgs/development/python-modules/fb-re2/default.nix
+++ b/pkgs/development/python-modules/fb-re2/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , re2
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "fb-re2";
   version = "1.0.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf";
+  src = fetchFromGitHub {
+     owner = "facebook";
+     repo = "pyre2";
+     rev = "v1.0.7";
+     sha256 = "0snprxdnh3m45r3b0az4v0l28h90ycmfbybzla6xg1qviwv9w1ak";
   };
 
   buildInputs = [ re2 ];
diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix
index 9ca3627e74cab..81863ff12ac20 100644
--- a/pkgs/development/python-modules/feedgen/default.nix
+++ b/pkgs/development/python-modules/feedgen/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, python-dateutil, lxml }:
+{ lib, buildPythonPackage, fetchFromGitHub, python-dateutil, lxml }:
 
 buildPythonPackage rec {
   pname = "feedgen";
   version = "0.9.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0jl0b87l7v6c0f1nx6k81skjhdj5i11kmchdjls00mynpvdip0cf";
+  src = fetchFromGitHub {
+     owner = "lkiesow";
+     repo = "python-feedgen";
+     rev = "v0.9.0";
+     sha256 = "1plfhxj44avkd3qx4gsv678dnckj1yr0r5ci5ivhsin09qymz8zf";
   };
 
   propagatedBuildInputs = [ python-dateutil lxml ];
diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix
index c1e988ca769a3..2c71dca208b34 100644
--- a/pkgs/development/python-modules/feedgenerator/default.nix
+++ b/pkgs/development/python-modules/feedgenerator/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , glibcLocales
 , pytestCheckHook
 , pythonOlder
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   version = "1.9.2";
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-sG1pQej9aiyecXkQeehsvno3iMciRKzAbwWTtJzaN5s=";
+  src = fetchFromGitHub {
+     owner = "getpelican";
+     repo = "feedgenerator";
+     rev = "1.9.2";
+     sha256 = "0p81m7zyzf5hd68ls95mx8qn6iaiwjylzinmy1h3d960ndihdykj";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix
index 56059e6dfef77..70ee9052d4550 100644
--- a/pkgs/development/python-modules/feedparser/default.nix
+++ b/pkgs/development/python-modules/feedparser/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , sgmllib3k
 }:
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   version = "6.0.8";
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-XOBBCgWrJIyMfPyjoOoiA5aO6f9EhgZzea9IJ6WflmE=";
+  src = fetchFromGitHub {
+     owner = "kurtmckee";
+     repo = "feedparser";
+     rev = "6.0.8";
+     sha256 = "0qdaakqv3k23gl8r1w3lzn6hlnx0fm5sild6kp11iziz25dgbwzd";
   };
 
   propagatedBuildInputs = [ sgmllib3k ];
diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix
index e550fe89ec78a..77c12ac8fe160 100644
--- a/pkgs/development/python-modules/fido2/default.nix
+++ b/pkgs/development/python-modules/fido2/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , six
 , cryptography
 , mock
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "fido2";
   version = "0.9.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b45e89a6109cfcb7f1bb513776aa2d6408e95c4822f83a253918b944083466ec";
+  src = fetchFromGitHub {
+     owner = "Yubico";
+     repo = "python-fido2";
+     rev = "0.9.3";
+     sha256 = "0wh7d4imdlnxvvdg05xkg2g5lj949g4f00kayh0ywh5a1qgam7b9";
   };
 
   propagatedBuildInputs = [ six cryptography ];
diff --git a/pkgs/development/python-modules/fields/default.nix b/pkgs/development/python-modules/fields/default.nix
index 35bf686b43530..83d2d6af53159 100644
--- a/pkgs/development/python-modules/fields/default.nix
+++ b/pkgs/development/python-modules/fields/default.nix
@@ -1,12 +1,14 @@
-{ buildPythonPackage, lib, fetchPypi }:
+{ buildPythonPackage, lib, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "fields";
   version = "5.0.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-MdSqA9jUTjXfE8Qx3jUTaZfwR6kkpZfYT3vCCeG+Vyc=";
+  src = fetchFromGitHub {
+     owner = "ionelmc";
+     repo = "python-fields";
+     rev = "v5.0.0";
+     sha256 = "0jzf90i3sig9alm96jvp8l0i5mpvwzqwbi0kgjsb69n6dca3nbnc";
   };
 
   pythonImportsCheck = [ "fields" ];
diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix
index 2ec3807476d1e..1d645c2464859 100644
--- a/pkgs/development/python-modules/filetype/default.nix
+++ b/pkgs/development/python-modules/filetype/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "filetype";
   version = "1.0.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "77df14879b73fd9711b8bd4f465dadf2ecdafff0eac3b22c0bdb0ccba68db316";
+  src = fetchFromGitHub {
+     owner = "h2non";
+     repo = "filetype.py";
+     rev = "v1.0.8";
+     sha256 = "1hib7h2lg58mnck1l1vhg2j1svyyj5pcmg81xpc7v7sjl80idpih";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/fingerprints/default.nix b/pkgs/development/python-modules/fingerprints/default.nix
index ea68c6fa8d4ae..138302d01de7b 100644
--- a/pkgs/development/python-modules/fingerprints/default.nix
+++ b/pkgs/development/python-modules/fingerprints/default.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
 , normality
 , mypy
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "fingerprints";
   version = "1.0.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "cafd5f92b5b91e4ce34af2b954da9c05b448a4778947785abb19a14f363352d0";
+  src = fetchFromGitHub {
+     owner = "alephdata";
+     repo = "fingerprints";
+     rev = "1.0.3";
+     sha256 = "0kvprp0rcaqdbqp6sm08vch53dlfgvcc6xyvi6v9lwhrhx8i3hgi";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix
index 491fcd3980530..2473783d351db 100644
--- a/pkgs/development/python-modules/first/default.nix
+++ b/pkgs/development/python-modules/first/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "first";
   version = "2.0.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1gykyrm6zlrbf9iz318p57qwk594mx1jf0d79v79g32zql45na7z";
+  src = fetchFromGitHub {
+     owner = "hynek";
+     repo = "first";
+     rev = "2.0.2";
+     sha256 = "0g0ly8b4m5n6kgam0l1nsgiy00v5k8px7cczcpp7v5q9qgqarwlx";
   };
 
   doCheck = false; # no tests
diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix
index c3974d0e007b8..f1ac71537faad 100644
--- a/pkgs/development/python-modules/flake8-blind-except/default.nix
+++ b/pkgs/development/python-modules/flake8-blind-except/default.nix
@@ -1,11 +1,13 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib, fetchFromGitHub, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "flake8-blind-except";
   version = "0.2.0";
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "02a860a1a19cb602c006a3fe0778035b0d14d3f57929b4b798bc7d6684f204e5";
+  src = fetchFromGitHub {
+     owner = "elijahandrews";
+     repo = "flake8-blind-except";
+     rev = "v0.2.0";
+     sha256 = "1qgfg77x6xgg0db416drak1yw15lpfsg9mfzj7n0qbmh6qbvdw4i";
   };
   meta = {
     homepage = "https://github.com/elijahandrews/flake8-blind-except";
diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix
index 25aa995f91222..1cfe0e1c1b6f7 100644
--- a/pkgs/development/python-modules/flake8-import-order/default.nix
+++ b/pkgs/development/python-modules/flake8-import-order/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, enum34, pycodestyle, pytest, flake8, pylama }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, enum34, pycodestyle, pytest, flake8, pylama }:
 
 buildPythonPackage rec {
   pname = "flake8-import-order";
   version = "0.18.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "14kfvsagqc6lrplvf3x58ia6x744bk8fj91wmk0hcipa8naw73d2";
+  src = fetchFromGitHub {
+     owner = "PyCQA";
+     repo = "flake8-import-order";
+     rev = "0.18.1";
+     sha256 = "0l1sbl056zv0lxvvm7v2q6ynbqpw2nxhybsq5pryna3727qisznq";
   };
 
   propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34;
diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix
index c707cb3caaa1b..177af063c4267 100644
--- a/pkgs/development/python-modules/flake8/default.nix
+++ b/pkgs/development/python-modules/flake8/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , configparser
 , enum34
@@ -18,9 +18,11 @@ buildPythonPackage rec {
   pname = "flake8";
   version = "4.0.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "03c7mnk34wfz7a0m5zq0273y94awz69fy5iww8alh4a4v96h6vl0";
+  src = fetchFromGitHub {
+     owner = "pycqa";
+     repo = "flake8";
+     rev = "4.0.1";
+     sha256 = "1nrzyr11lmbaa8wygkyncgj2vifswab1n52szdfk9zfjj0r8x9dr";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix
index fe068211dfbf4..fcd2d3465cf62 100644
--- a/pkgs/development/python-modules/flaky/default.nix
+++ b/pkgs/development/python-modules/flaky/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , mock
 , nose
 , pytest
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "flaky";
   version = "3.7.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3ad100780721a1911f57a165809b7ea265a7863305acb66708220820caf8aa0d";
+  src = fetchFromGitHub {
+     owner = "box";
+     repo = "flaky";
+     rev = "v3.7.0";
+     sha256 = "0kpdrckmqnsnpqb5icrv39g1pklnyrabf88q52ypy175rcc8yy58";
   };
 
   checkInputs = [ mock nose pytest ];
diff --git a/pkgs/development/python-modules/flammkuchen/default.nix b/pkgs/development/python-modules/flammkuchen/default.nix
index 1349e10c5397a..69a52025722e5 100644
--- a/pkgs/development/python-modules/flammkuchen/default.nix
+++ b/pkgs/development/python-modules/flammkuchen/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
 , numpy
 , scipy
 , tables
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "flammkuchen";
   version = "0.9.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f249fe5bf85f717d3836e0db6fa9443a8a43101ce07704715b42251c44fc968e";
+  src = fetchFromGitHub {
+     owner = "portugueslab";
+     repo = "flammkuchen";
+     rev = "v0.9.2";
+     sha256 = "1sscj4fsp97g2bfpg08v0bbkp4jy16j3a17zmq4bv80q4lzdq1gd";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix
index 602564d162689..eaed09c95ce7b 100644
--- a/pkgs/development/python-modules/flask-babel/default.nix
+++ b/pkgs/development/python-modules/flask-babel/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , python
-, fetchPypi
+, fetchFromGitHub
 , flask
 , Babel
 , jinja2
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   pname = "Flask-Babel";
   version = "2.0.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d";
+  src = fetchFromGitHub {
+     owner = "python-babel";
+     repo = "flask-babel";
+     rev = "v2.0.0";
+     sha256 = "1n6d499viq8crmgvp04vi3nzh1bc4n60wjgh57djkzxm0ssvxvpd";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix
index 9fd80ac6d6778..7b60bb271ce36 100644
--- a/pkgs/development/python-modules/flask-caching/default.nix
+++ b/pkgs/development/python-modules/flask-caching/default.nix
@@ -1,13 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytest-cov, pytest-xprocess, pytestcache }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27, flask, pytestCheckHook, pytest-cov, pytest-xprocess, pytestcache }:
 
 buildPythonPackage rec {
   pname = "Flask-Caching";
   version = "1.10.1";
   disabled = isPy27; # invalid python2 syntax
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "cf19b722fcebc2ba03e4ae7c55b532ed53f0cbf683ce36fafe5e881789a01c00";
+  src = fetchFromGitHub {
+     owner = "sh4nks";
+     repo = "flask-caching";
+     rev = "v1.10.1";
+     sha256 = "038zrahcn7lm5y9v532kc7abiwypb39s0g6kz6pbrrdw700s3y84";
   };
 
   propagatedBuildInputs = [ flask ];
diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix
index 25c054b231bb4..4ca2afee9daca 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/pkgs/development/python-modules/flask-cors/default.nix
@@ -1,13 +1,15 @@
-{ lib, fetchPypi, buildPythonPackage
+{ lib, fetchFromGitHub, buildPythonPackage
 , nose, flask, six, packaging }:
 
 buildPythonPackage rec {
   pname = "Flask-Cors";
   version = "3.0.10";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de";
+  src = fetchFromGitHub {
+     owner = "corydolphin";
+     repo = "flask-cors";
+     rev = "3.0.10";
+     sha256 = "1q8l56wfwjj5vzr6j4lq2s90f8qj7vlk5913437s85b56gghkmdz";
   };
 
   checkInputs = [ nose packaging ];
diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix
index db3a209d4d017..798bda8d8cbc7 100644
--- a/pkgs/development/python-modules/flask-paginate/default.nix
+++ b/pkgs/development/python-modules/flask-paginate/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, flask }:
+{ lib, buildPythonPackage, fetchFromGitHub, flask }:
 
 buildPythonPackage rec {
   pname = "flask-paginate";
   version = "2021.10.29";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "660ba1451e4cb168d3a42ed63914fe507bb5c0b30c26a6286b923077bba2362b";
+  src = fetchFromGitHub {
+     owner = "lixxu";
+     repo = "flask-paginate";
+     rev = "v2021.10.29";
+     sha256 = "0n55yxh7irj3lghrcx1670n8fj3qkshvplpf74ihpflfcmr5xqzh";
   };
 
   propagatedBuildInputs = [ flask ];
diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix
index 3de74531c2886..dcab096f4291a 100644
--- a/pkgs/development/python-modules/flask-restplus/default.nix
+++ b/pkgs/development/python-modules/flask-restplus/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , nose
 , blinker
 , tzlocal
@@ -20,9 +20,11 @@ buildPythonPackage rec {
   pname = "flask-restplus";
   version = "0.13.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0p4zz8b5bwbw7w0vhbyihl99d2gw13cb81rxzj4z626a1cnl8vm6";
+  src = fetchFromGitHub {
+     owner = "noirbizarre";
+     repo = "flask-restplus";
+     rev = "0.13.0";
+     sha256 = "0p49m0z7nbq5wx8znhafmwdrqp606p049hczi6zkwbjwhb5rkqp9";
   };
 
   checkInputs = [ nose blinker tzlocal mock rednose ];
diff --git a/pkgs/development/python-modules/flask-sockets/default.nix b/pkgs/development/python-modules/flask-sockets/default.nix
index aa29fd4fbc943..5147a13b0b249 100644
--- a/pkgs/development/python-modules/flask-sockets/default.nix
+++ b/pkgs/development/python-modules/flask-sockets/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , flask
 , gevent
 , gevent-websocket
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "Flask-Sockets";
   version = "0.2.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "072927da8edca0e81e024f5787e643c87d80b351b714de95d723becb30e0643b";
+  src = fetchFromGitHub {
+     owner = "heroku-python";
+     repo = "flask-sockets";
+     rev = "v0.2.1";
+     sha256 = "0k63x380gpjjr5j3bmkzsa1qp9gaq1jrm5ai2fnpqw459g1y4bwq";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/flask-sslify/default.nix b/pkgs/development/python-modules/flask-sslify/default.nix
index ad4bc4dc05235..6068a71ab292d 100644
--- a/pkgs/development/python-modules/flask-sslify/default.nix
+++ b/pkgs/development/python-modules/flask-sslify/default.nix
@@ -1,12 +1,14 @@
-{ lib, fetchPypi, buildPythonPackage, flask }:
+{ lib, fetchFromGitHub, buildPythonPackage, flask }:
 
 buildPythonPackage rec {
   pname = "Flask-SSLify";
   version = "0.1.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0gjl1m828z5dm3c5dpc2qjgi4llf84cp72mafr0ib5fd14y1sgnk";
+  src = fetchFromGitHub {
+     owner = "kennethreitz42";
+     repo = "flask-sslify";
+     rev = "v0.1.5";
+     sha256 = "17rqdlwsmyzcxk6sp95spbxn9fjd93yjpl11afihvb8lfv8jmch2";
   };
 
   propagatedBuildInputs = [ flask ];
diff --git a/pkgs/development/python-modules/flask-swagger-ui/default.nix b/pkgs/development/python-modules/flask-swagger-ui/default.nix
index d238ba5acb752..e7ab40f9847e3 100644
--- a/pkgs/development/python-modules/flask-swagger-ui/default.nix
+++ b/pkgs/development/python-modules/flask-swagger-ui/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, flask }:
+{ lib, buildPythonPackage, fetchFromGitHub, flask }:
 
 buildPythonPackage rec {
   pname = "flask-swagger-ui";
   version = "3.36.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f329752a65b2940ada8eeb57bce613f7c0a12856a9c31063bb9e33798554c9ed";
+  src = fetchFromGitHub {
+     owner = "sveint";
+     repo = "flask-swagger-ui";
+     rev = "3.36.0";
+     sha256 = "0mg3skydq15gv5gv3i2f6131fijdvq9607is01fx26dczs57nii2";
   };
 
   doCheck = false;  # there are no tests
diff --git a/pkgs/development/python-modules/flask-talisman/default.nix b/pkgs/development/python-modules/flask-talisman/default.nix
index b57d588247056..e9baefa28c7d5 100644
--- a/pkgs/development/python-modules/flask-talisman/default.nix
+++ b/pkgs/development/python-modules/flask-talisman/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , flask
 , six
 , pytestCheckHook
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "flask-talisman";
   version = "0.8.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "11gjgqkpj2yqydb0pfhjyx56iy4l9szgz33vg5d7bw8vqp02wl2x";
+  src = fetchFromGitHub {
+     owner = "wntrblm";
+     repo = "flask-talisman";
+     rev = "v0.8.1";
+     sha256 = "0rjdi73aq7idgig0whsidqf5qc3bjhf5d7qv4kh9f3jhwjnd5mqs";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix
index d15950bba9a4a..b842ebd1de8d6 100644
--- a/pkgs/development/python-modules/flaskbabel/default.nix
+++ b/pkgs/development/python-modules/flaskbabel/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , flask
 , jinja2
 , speaklater
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   pname = "Flask-Babel";
   version = "2.0.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d";
+  src = fetchFromGitHub {
+     owner = "mitsuhiko";
+     repo = "flask-babel";
+     rev = "v2.0.0";
+     sha256 = "1n6d499viq8crmgvp04vi3nzh1bc4n60wjgh57djkzxm0ssvxvpd";
   };
 
   propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ];
diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix
index 00cc8bf58a3f5..a4adcd6552f27 100644
--- a/pkgs/development/python-modules/fluent-logger/default.nix
+++ b/pkgs/development/python-modules/fluent-logger/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, msgpack }:
+{ lib, buildPythonPackage, fetchFromGitHub, msgpack }:
 
 buildPythonPackage rec {
   pname = "fluent-logger";
   version = "0.10.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "678bda90c513ff0393964b64544ce41ef25669d2089ce6c3b63d9a18554b9bfa";
+  src = fetchFromGitHub {
+     owner = "fluent";
+     repo = "fluent-logger-python";
+     rev = "v0.10.0";
+     sha256 = "12pq5x3hqypr0dhx7x0xrlzx610ax4b5n1ispfcd2v041vlpz89m";
   };
 
   prePatch = ''
diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix
index ca05660feb340..fe4630df37c5e 100644
--- a/pkgs/development/python-modules/fpdf/default.nix
+++ b/pkgs/development/python-modules/fpdf/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "fpdf";
   version = "1.7.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0yb73c2clv581sgak5jvlvkj4wy3jav6ms5ia8jx3rw969w40n0j";
+  src = fetchFromGitHub {
+     owner = "reingart";
+     repo = "pyfpdf";
+     rev = "1.7.2";
+     sha256 = "19rl2x2mm4kg4sayk1j251wxmdnc8dbilxz4sfri13bnrcn5jw35";
   };
 
   # No tests available
diff --git a/pkgs/development/python-modules/fritzprofiles/default.nix b/pkgs/development/python-modules/fritzprofiles/default.nix
index b998f9949807c..277e455bf956e 100644
--- a/pkgs/development/python-modules/fritzprofiles/default.nix
+++ b/pkgs/development/python-modules/fritzprofiles/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , lxml
 , requests
 }:
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   version = "0.7.3";
   format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-VoKgLJWF9x8dW8A6CNwLtK+AmehtgZP41nUGQO819es=";
+  src = fetchFromGitHub {
+     owner = "AaronDavidSchneider";
+     repo = "fritzprofiles";
+     rev = "v0.7.3";
+     sha256 = "1gbmzcbicpcc94rawz1cvs5xcl90lj5dwn94r7ijaswm9h4dqgy0";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index 5ea93ec179ecb..e4be242bb533d 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , isPy3k
-, fetchPypi
+, fetchFromGitHub
 , wcwidth
 , pytestCheckHook
 }:
@@ -12,9 +12,11 @@ buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ba71121a9c8d7790d3e833c6c1021143f3e5c4118293ec3afb5d43ed9ca8e72b";
+  src = fetchFromGitHub {
+     owner = "LuminosoInsight";
+     repo = "python-ftfy";
+     rev = "v6.0.3";
+     sha256 = "00670f9zjhiqq054cc4rh532w5m8ir9wajf4hmrn14y1a1k5v8a1";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix
index 19e2dd146d205..b220d263cd08f 100644
--- a/pkgs/development/python-modules/funcparserlib/default.nix
+++ b/pkgs/development/python-modules/funcparserlib/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python
 , isPy3k
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "funcparserlib";
   version = "0.3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d";
+  src = fetchFromGitHub {
+     owner = "vlasovskikh";
+     repo = "funcparserlib";
+     rev = "0.3.6";
+     sha256 = "00fxdkrgap8cgsy983id1xj8mhlddg9gjwcy6vsz5zjj8byglhk8";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/fuzzyfinder/default.nix b/pkgs/development/python-modules/fuzzyfinder/default.nix
index a422e5606b0b0..55b186ac70986 100644
--- a/pkgs/development/python-modules/fuzzyfinder/default.nix
+++ b/pkgs/development/python-modules/fuzzyfinder/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytestCheckHook
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "fuzzyfinder";
   version = "2.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c56d86f110866becad6690c7518f7036c20831c0f82fc87eba8fdb943132f04b";
+  src = fetchFromGitHub {
+     owner = "amjith";
+     repo = "fuzzyfinder";
+     rev = "2.1.0";
+     sha256 = "10wmapzb3v5rn93bsa3nsi5ajk84s9msy39lsr43arw2v07fralv";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix
index 0bcf8efc359e9..a287d8aee8310 100644
--- a/pkgs/development/python-modules/fuzzywuzzy/default.nix
+++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, python-Levenshtein, pycodestyle, hypothesis, pytest }:
 
 buildPythonPackage rec {
   pname = "fuzzywuzzy";
   version = "0.18.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5";
+  src = fetchFromGitHub {
+     owner = "seatgeek";
+     repo = "fuzzywuzzy";
+     rev = "0.18.0";
+     sha256 = "0zh8xd9k95waipsdz516rn51ya9xxlxbd7ivbka4gnkqm9ah79mc";
   };
 
   propagatedBuildInputs = [ python-Levenshtein ];
diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix
index a6351aeeadd79..5c356d9d3e034 100644
--- a/pkgs/development/python-modules/gaphas/default.nix
+++ b/pkgs/development/python-modules/gaphas/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , pythonOlder
-, fetchPypi
+, fetchFromGitHub
 , poetry-core
 , gobject-introspection
 , gtk3
@@ -17,9 +17,11 @@ buildPythonPackage rec {
 
   format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-S6cRsfqXYM4mSVSs2M8fET5ShFClKkGkod2w2y6F2gc=";
+  src = fetchFromGitHub {
+     owner = "gaphor";
+     repo = "gaphas";
+     rev = "3.1.9";
+     sha256 = "03mnxi0r5cs4pn9qmac2brb1ib2nyqzp5vcma2jaccldhapxss95";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/gemfileparser/default.nix b/pkgs/development/python-modules/gemfileparser/default.nix
index 8aa4b81923195..06ead3279864a 100644
--- a/pkgs/development/python-modules/gemfileparser/default.nix
+++ b/pkgs/development/python-modules/gemfileparser/default.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
 , pytestCheckHook
 }:
@@ -7,9 +7,11 @@ buildPythonPackage rec {
   pname = "gemfileparser";
   version = "0.8.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "839592e49ea3fd985cec003ef58f8e77009a69ed7644a0c0acc94cf6dd9b8d6e";
+  src = fetchFromGitHub {
+     owner = "gemfileparser";
+     repo = "gemfileparser";
+     rev = "v0.8.0";
+     sha256 = "10qq6p1i60g72cxxawhpndbf4w9amgcmc50jfprb7p96bgcc0cbg";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 87dca630a1b82..c4107d6bc227e 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , pythonOlder
-, fetchPypi
+, fetchFromGitHub
 , poetry-core
 }:
 
@@ -12,9 +12,11 @@ buildPythonPackage rec {
 
   format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-ex93I+ofo5lP6qoolZwzjxSspeqJimY3vpB32RLJ00k=";
+  src = fetchFromGitHub {
+     owner = "gaphor";
+     repo = "generic";
+     rev = "1.0.1";
+     sha256 = "1y82b032khzcwpny0qy6vl3dhfj02amj1h1i6wl6mnqkd4yvfyiq";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/genpy/default.nix b/pkgs/development/python-modules/genpy/default.nix
index d5e82332c30be..12c36c7450e37 100644
--- a/pkgs/development/python-modules/genpy/default.nix
+++ b/pkgs/development/python-modules/genpy/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytools
 , numpy
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "genpy";
   version = "2021.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "9bc062fa98c5c466ff464d8974be81a6bf67af9247b5e5176215ad1e81a6cdac";
+  src = fetchFromGitHub {
+     owner = "inducer";
+     repo = "genpy";
+     rev = "v2021.1";
+     sha256 = "0vjmgzjzbd5kz0rwccdlkp3magrwyinvb4dbvhkdp8nxnp1jcaar";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/getkey/default.nix b/pkgs/development/python-modules/getkey/default.nix
index c0cbec29145ab..e72fca630f7f3 100644
--- a/pkgs/development/python-modules/getkey/default.nix
+++ b/pkgs/development/python-modules/getkey/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytestCheckHook
 , flake8
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "getkey";
   version = "0.6.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0ng0ihfagh9g8hral0bq5nhjlp3csqghyv3z8b7ylkdkqc1cgiv8";
+  src = fetchFromGitHub {
+     owner = "kcsaff";
+     repo = "getkey";
+     rev = "v0.6.5";
+     sha256 = "0bj1yzq28z8k5ghbpdpsr1vzkqxwi5fq4r074k5gb8pf92cdqm2v";
   };
 
   # disable coverage, because we don't care and python-coveralls is not in nixpkgs
diff --git a/pkgs/development/python-modules/ghp-import/default.nix b/pkgs/development/python-modules/ghp-import/default.nix
index 03aabc4ab6e27..3f68ded3e37cd 100644
--- a/pkgs/development/python-modules/ghp-import/default.nix
+++ b/pkgs/development/python-modules/ghp-import/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python-dateutil
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "ghp-import";
   version = "2.0.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-lHs3cfEb6FDIUsZLVhxgD93feUurNjBghUwe560F4HE=";
+  src = fetchFromGitHub {
+     owner = "c-w";
+     repo = "ghp-import";
+     rev = "2.0.2";
+     sha256 = "0i4lxsgqri1y8sw4k44bkwbzmdmk4vpmdi882mw148j8gk4i7vvj";
   };
 
   propagatedBuildInputs = [ python-dateutil ];
diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix
index 2d7da28535cf7..f3c1bd11040c2 100644
--- a/pkgs/development/python-modules/git-sweep/default.nix
+++ b/pkgs/development/python-modules/git-sweep/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , GitPython
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "git-sweep";
   version = "0.1.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1csp0zd049d643d409rfivbswwzrayb4i6gkypp5mc27fb1z2afd";
+  src = fetchFromGitHub {
+     owner = "arc90";
+     repo = "git-sweep";
+     rev = "0.1.1";
+     sha256 = "1237q8c5jk09gci5x26zc99xhw7irypwfp0snz7z4dfa6l76a0pb";
   };
 
   propagatedBuildInputs = [ GitPython ];
diff --git a/pkgs/development/python-modules/glob2/default.nix b/pkgs/development/python-modules/glob2/default.nix
index 29028e6d32d89..cc7e8e2e781cd 100644
--- a/pkgs/development/python-modules/glob2/default.nix
+++ b/pkgs/development/python-modules/glob2/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "glob2";
   version = "0.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "135bj8gm6vn45vv0phrvhyir36kfm17y7kmasxinv8lagk8dphw5";
+  src = fetchFromGitHub {
+     owner = "miracle2k";
+     repo = "python-glob2";
+     rev = "v0.7";
+     sha256 = "160nh2ay9lw2hi0rixpzb2k87r6ql56k0j2cm87lqz8xc8zbw919";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix
index d30a0c7eb1cb7..2e7dace7ee521 100644
--- a/pkgs/development/python-modules/glom/default.nix
+++ b/pkgs/development/python-modules/glom/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , boltons
 , attrs
 , face
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   pname = "glom";
   version = "20.11.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "54051072bccc9cdb3ebbd8af0559195137a61d308f04bff19678e4b61350eb12";
+  src = fetchFromGitHub {
+     owner = "mahmoud";
+     repo = "glom";
+     rev = "v20.11.0";
+     sha256 = "09yaqd4acmbzpmscxa11z7v8vz4i2y3q20f2ksnz06908y3jgmqw";
   };
 
   propagatedBuildInputs = [ boltons attrs face ];
diff --git a/pkgs/development/python-modules/gntp/default.nix b/pkgs/development/python-modules/gntp/default.nix
index 364a59732e11f..877444870b7bf 100644
--- a/pkgs/development/python-modules/gntp/default.nix
+++ b/pkgs/development/python-modules/gntp/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "gntp";
   version = "1.0.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1q6scs8lp84v0aph6b5c9jhv51rhq2vmzpdd38db92ybkq0g597l";
+  src = fetchFromGitHub {
+     owner = "kfdm";
+     repo = "gntp";
+     rev = "v1.0.3";
+     sha256 = "082qm9gz7qxm6zi543yr9vhfgny2fq9rf2sbj2kr1wshw3kzqcrc";
   };
 
   pythonImportsCheck = [ "gntp" "gntp.notifier" ];
diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix
index 6f3ae30e8cde2..c0be3d641ec99 100644
--- a/pkgs/development/python-modules/gnureadline/default.nix
+++ b/pkgs/development/python-modules/gnureadline/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , isPyPy
 , pkgs
 }:
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "gnureadline";
   disabled = isPyPy;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0xllr43dizvybmb68i0ybk1xhaqx5abjwxa9vrg43b9ds0pggvk1";
+  src = fetchFromGitHub {
+     owner = "ludwigschwardt";
+     repo = "python-gnureadline";
+     rev = "v8.0.0";
+     sha256 = "130ph0l2wapax33wdkgdw0lla3agigmwdp3v73w7a7r3sn019qm5";
   };
 
   buildInputs = [ pkgs.ncurses ];
diff --git a/pkgs/development/python-modules/goalzero/default.nix b/pkgs/development/python-modules/goalzero/default.nix
index d21b6335a7ff9..c4cde5c6b1aa2 100644
--- a/pkgs/development/python-modules/goalzero/default.nix
+++ b/pkgs/development/python-modules/goalzero/default.nix
@@ -1,7 +1,7 @@
 { lib
 , aiohttp
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 }:
 
@@ -12,9 +12,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-PveHE317p5fGSxgx7LQkpRYF55HwdzpZFY8/F8s3CBQ=";
+  src = fetchFromGitHub {
+     owner = "tkdrob";
+     repo = "goalzero";
+     rev = "v0.2.1";
+     sha256 = "091c7jsqwxb5vgq2vkhi1m8vk21zxghlbzbhc1dnv25cdfv2hjv1";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix
index 0109175ab85cb..558be501f2712 100644
--- a/pkgs/development/python-modules/google-auth-httplib2/default.nix
+++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , flask
 , google-auth
 , httplib2
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   pname = "google-auth-httplib2";
   version = "0.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac";
+  src = fetchFromGitHub {
+     owner = "GoogleCloudPlatform";
+     repo = "google-auth-library-python-httplib2";
+     rev = "v0.1.0";
+     sha256 = "14l3ck0s32f7qsg7va5zriz8p3n684j0ybhvp1ih4zskxd6z2iv0";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index 1d23af5a3d46c..e5a8af81b4b7e 100644
--- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , click
 , mock
 , pytestCheckHook
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   pname = "google-auth-oauthlib";
   version = "0.4.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-qQoHL2mT8sMnBnv2UnAEY4TNpajssguU6ppofx8jOno=";
+  src = fetchFromGitHub {
+     owner = "GoogleCloudPlatform";
+     repo = "google-auth-library-python-oauthlib";
+     rev = "v0.4.6";
+     sha256 = "1k9vg8wwwqygqv0sghgnglj9hxfkzmy5v6668smq39zs92awks3q";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
index 67296f667ab26..ca472cdfa6883 100644
--- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , google-api-core
 , grpc-google-iam-v1
 , mock
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   pname = "google-cloud-appengine-logging";
   version = "1.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "91fe9b0833f6e1a46293dcc0e483716372c9ff4a95ebe51276c5f0092cb9defd";
+  src = fetchFromGitHub {
+     owner = "googleapis";
+     repo = "python-appengine-logging";
+     rev = "v1.1.0";
+     sha256 = "0awxfas34az5s4xhigjrhlhy88av9ybw12i80lfp9jlcwsmqzkz6";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix
index fabd8dad68e26..e3e7a01428b82 100644
--- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix
+++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, googleapis-common-protos, protobuf }:
+{ lib, buildPythonPackage, fetchFromGitHub, googleapis-common-protos, protobuf }:
 
 buildPythonPackage rec {
   pname = "google-cloud-audit-log";
   version = "0.2.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d0852f525ad65705f9fbff6288be4493e1449a7906fb5e01bd71c8d1e424d1fc";
+  src = fetchFromGitHub {
+     owner = "googleapis";
+     repo = "python-audit-log";
+     rev = "v0.2.0";
+     sha256 = "06m3m3m0khdryg1l51q7640vs2zvvjrhak8dy2hz16m0g189slh7";
   };
 
   propagatedBuildInputs = [ googleapis-common-protos protobuf ];
diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
index 32988e35deac1..a3fe7f2878954 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , google-api-core
 , grpc-google-iam-v1
 , mock
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   pname = "google-cloud-bigquery-logging";
   version = "1.0.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3cdbf4f82199d2ee0d07fa2c75527661fe034130e27e5c05fd070ed615cd7e23";
+  src = fetchFromGitHub {
+     owner = "googleapis";
+     repo = "python-bigquery-logging";
+     rev = "v1.0.1";
+     sha256 = "1nnp1wjgjw8d3lkwsz23nl2w0d6233mx3klb5qhjnsd59gwyvi4w";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix
index 3ce93893a9401..4c852eda15310 100644
--- a/pkgs/development/python-modules/google-cloud-dns/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dns/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , google-api-core
 , google-cloud-core
 , pytestCheckHook
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "google-cloud-dns";
   version = "0.34.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bd75d6e9fd456ce643ee936a113a1ead5405704515caa679db30d7f036e447f3";
+  src = fetchFromGitHub {
+     owner = "googleapis";
+     repo = "python-dns";
+     rev = "v0.34.0";
+     sha256 = "1sq9ny38zsn5gdydac6rn2f7761zyy6nn9fyrzcrm3jm1lbv263g";
   };
 
   propagatedBuildInputs = [ google-api-core google-cloud-core ];
diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix
index 50a08e66f3606..daccb66f5405c 100644
--- a/pkgs/development/python-modules/google-cloud-firestore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , aiounittest
 , google-api-core
 , google-cloud-testutils
@@ -15,9 +15,11 @@ buildPythonPackage rec {
   pname = "google-cloud-firestore";
   version = "2.3.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-cU4bwfxRAp14qmSTO+8u/APa7clWXqeeyRuEOwUgFuw=";
+  src = fetchFromGitHub {
+     owner = "googleapis";
+     repo = "python-firestore";
+     rev = "v2.3.4";
+     sha256 = "00cm1g5cwnhq8l5ihbv4y2wwj4p02gj4cbpnlysv6zzc171m1405";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
index 47ca59ab2a213..fb727d7f64447 100644
--- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , google-api-core
 , grpc-google-iam-v1
 , mock
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   pname = "google-cloud-iam-logging";
   version = "1.0.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4ac688593279c48d7863f0a90457202ff9b235e3ee8862498e8a5b8f867cc137";
+  src = fetchFromGitHub {
+     owner = "googleapis";
+     repo = "python-iam-logging";
+     rev = "v1.0.0";
+     sha256 = "1q2zzd4w3iwwfncfavzypfsx7qhn6lf43qr7fcsmnh8mhqxhg8v3";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix
index 5bada28d01dc1..ef27358615c97 100644
--- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix
+++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, google-api-core, mock, proto-plus, protobuf, pytest-asyncio }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, google-api-core, mock, proto-plus, protobuf, pytest-asyncio }:
 
 buildPythonPackage rec {
   pname = "google-cloud-org-policy";
   version = "1.2.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "cdb2d6878c426ed34af8950b052845a76b0f5fab3f96a2ec5dc80be994ca5cf8";
+  src = fetchFromGitHub {
+     owner = "googleapis";
+     repo = "python-org-policy";
+     rev = "v1.2.1";
+     sha256 = "0iz2mmxah4610kq58hvvgqnxn2bnslm9ph3bar7mxgfhwr87zdry";
   };
 
   propagatedBuildInputs = [ google-api-core proto-plus ];
diff --git a/pkgs/development/python-modules/gorilla/default.nix b/pkgs/development/python-modules/gorilla/default.nix
index 22e71df324514..340adfd1f42f6 100644
--- a/pkgs/development/python-modules/gorilla/default.nix
+++ b/pkgs/development/python-modules/gorilla/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi}:
+{ lib, buildPythonPackage, fetchFromGitHub}:
 
 buildPythonPackage rec {
   pname = "gorilla";
   version = "0.4.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "005ab8853b037162a7c77bb824604c6e081878ee03c09ad01ef41744856019d3";
+  src = fetchFromGitHub {
+     owner = "christophercrouzet";
+     repo = "gorilla";
+     rev = "v0.4.0";
+     sha256 = "1dr4qm5k15s7a8la2isg686fms6hhc94giyjmdjgzlyzswf050hc";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix
index 6c2454dbbfeb5..e9d2ebe763b9d 100644
--- a/pkgs/development/python-modules/gpapi/default.nix
+++ b/pkgs/development/python-modules/gpapi/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage
 , cryptography
-, fetchPypi
+, fetchFromGitHub
 , lib
 , pythonOlder
 , protobuf
@@ -13,9 +13,11 @@ buildPythonPackage rec {
   pname = "gpapi";
   disabled = pythonOlder "3.3"; # uses shutil.which(), added in 3.3
 
-  src = fetchPypi {
-    inherit version pname;
-    sha256 = "0ampvsv97r3hy1cakif4kmyk1ynf3scbvh4fbk02x7xrxn4kl38w";
+  src = fetchFromGitHub {
+     owner = "NoMore201";
+     repo = "googleplay-api";
+     rev = "v0.4.4";
+     sha256 = "0rr73wzx3phq9kcx6js8ydlw667wq6nwc747kcmdn1ra6296cyb4";
   };
 
   # package doesn't contain unit tests
diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix
index 08e27c1948734..dae5aff993f56 100644
--- a/pkgs/development/python-modules/graphql-relay/default.nix
+++ b/pkgs/development/python-modules/graphql-relay/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , graphql-core
 , pytest-asyncio
 , pytestCheckHook
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   pname = "graphql-relay";
   version = "3.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-cNWn7lmV6nwqmjflEidmOxpGTx9A6Y/d6VC+VBXf4LQ=";
+  src = fetchFromGitHub {
+     owner = "graphql-python";
+     repo = "graphql-relay-py";
+     rev = "v3.1.0";
+     sha256 = "06ybi4bwqdffa5kn8xnns06wh3l0zj3qlzrxk1wpxqq320hyzx9x";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix
index ae7ddb0c76b4f..fc6570c8c4ad5 100644
--- a/pkgs/development/python-modules/grappelli_safe/default.nix
+++ b/pkgs/development/python-modules/grappelli_safe/default.nix
@@ -1,15 +1,17 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   version = "0.5.2";
   pname = "grappelli_safe";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "35b7ccaf9acc54684c73aeefbeaddc63b8a16143bd981bd5b3ebef253def07df";
+  src = fetchFromGitHub {
+     owner = "stephenmcd";
+     repo = "grappelli-safe";
+     rev = "v0.5.2";
+     sha256 = "0k0j3173wai3w0b61mndxvy2ad6qbydrafj4ll0k172dgawz2cb8";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index 78ac1668b6f8d..e70f01aa6b5d3 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , isPyPy
 , python
 }:
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   version = "1.1.2";
   disabled = isPyPy;  # builtin for pypy
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a";
+  src = fetchFromGitHub {
+     owner = "python-greenlet";
+     repo = "greenlet";
+     rev = "1.1.2";
+     sha256 = "15z4v2j3yh5x91hj7yr0hd79bmhgvvv0q8l1w79q3cd8n9zyy7l6";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix
index 50c95df7dc91c..311fc8171cf29 100644
--- a/pkgs/development/python-modules/grequests/default.nix
+++ b/pkgs/development/python-modules/grequests/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , requests
 , gevent
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "grequests";
   version = "0.6.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0rpnim3ppxjdsaa869h1jdimcyc66mamcs593rd7brk8cq68kv3x";
+  src = fetchFromGitHub {
+     owner = "kennethreitz";
+     repo = "grequests";
+     rev = "v0.6.0";
+     sha256 = "1vc9qj1fjyaisbfcqhzzkll0g1fj3lwk941bvnnq03lj5z63wdcz";
   };
 
   # No tests in archive
diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
index df2615cd3bdf1..37d8ccb5b285f 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , requests
 , google-auth
 , google-auth-oauthlib
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   version = "4.0.1";
   pname = "gspread";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "236a0f24e3724b49bae4cbd5144ed036b0ae6feaf5828ad033eb2824bf05e5be";
+  src = fetchFromGitHub {
+     owner = "burnash";
+     repo = "gspread";
+     rev = "v4.0.1";
+     sha256 = "1cp4lvp9552mv1xx353a9mh2m7iq8llncwj3l7ds8nf91465hsfg";
   };
 
   propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];
diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index ba948a68915a2..7912db8ac7bb3 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
 , coverage
 , mock
 , pytest
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   version = "20.1.0";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e0a968b5ba15f8a328fdfd7ab1fcb5af4470c28aaf7e55df02a99bc13138e6e8";
+  src = fetchFromGitHub {
+     owner = "benoitc";
+     repo = "gunicorn";
+     rev = "20.1.0";
+     sha256 = "1zhy6c69g8zyd76nlv9ipqrjicfz6f3pys2wgqjm0njhqfdlgly5";
   };
 
   propagatedBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
index 6f765bd98d6b2..1ff672edf7403 100644
--- a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
+++ b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
@@ -1,11 +1,13 @@
-{ lib, buildPythonPackage, sphinx, fetchPypi }:
+{ lib, buildPythonPackage, sphinx, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "guzzle_sphinx_theme";
   version = "0.7.11";
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v";
+  src = fetchFromGitHub {
+     owner = "guzzle";
+     repo = "guzzle_sphinx_theme";
+     rev = "0.7.11";
+     sha256 = "18mgk1rl1345zf9i7nihfw2mr609ylxcksrklyz6m2xbh19bbrja";
   };
 
   doCheck = false; # no tests
diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix
index f3d37dacfa3c7..70a8383e072b5 100644
--- a/pkgs/development/python-modules/h11/default.nix
+++ b/pkgs/development/python-modules/h11/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytestCheckHook
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "h11";
   version = "0.12.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0hk0nll6qazsambp3kl8cxxsbl4gv5y9252qadyk0jky0sv2q8j7";
+  src = fetchFromGitHub {
+     owner = "python-hyper";
+     repo = "h11";
+     rev = "v0.12.0";
+     sha256 = "16hxhk588im1d9bpgmvsjyg732zbq5hvz5xbmb19jnxdf2rkig7l";
   };
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix
index 23a8c4ddcb262..a07131ef38dbf 100644
--- a/pkgs/development/python-modules/h5netcdf/default.nix
+++ b/pkgs/development/python-modules/h5netcdf/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , fetchpatch
 , h5py
 , pytestCheckHook
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   pname = "h5netcdf";
   version = "0.8.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "09bbnpsvwksb07wijn7flyyza56h5b2g2cw0hb3slmwxz6cgcjmr";
+  src = fetchFromGitHub {
+     owner = "shoyer";
+     repo = "h5netcdf";
+     rev = "v0.8.1";
+     sha256 = "0rir0n3ffp8v7wc54bbc3dqvzy6gwg6rw9586ryq5sds5d3g7dx8";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix
index 9fd1295733c46..5b749cb0d97bc 100644
--- a/pkgs/development/python-modules/ha-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
 , async-timeout }:
 
 buildPythonPackage rec {
@@ -7,9 +7,11 @@ buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "8d92f2f5790da038d828ac862673e0bb43e8e972e4c70b1714dd9a0fb776c8d1";
+  src = fetchFromGitHub {
+     owner = "pvizeli";
+     repo = "ha-ffmpeg";
+     rev = "3.0.2";
+     sha256 = "0xh54f1m0c5y145dnm1hv18n0kk0d0iy44gd3jwil7gjfn7q98q6";
   };
 
   propagatedBuildInputs = [ async-timeout ];
diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index 3183560ba00cd..7fec19b4ad9fe 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , future
 , requests
 , python-dateutil
@@ -16,9 +16,11 @@ buildPythonPackage rec {
   version = "1.16.0";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c8b94557d93bcfe437f20a8176693ea4f54358b74986cc19d94ebc23f48e40cc";
+  src = fetchFromGitHub {
+     owner = "hetznercloud";
+     repo = "hcloud-python";
+     rev = "v1.16.0";
+     sha256 = "12wx796ag02z8lpjkcsy6jqk3faji9pfgxhkmxgcg09l4dh9pi8d";
   };
 
   propagatedBuildInputs = [ future requests python-dateutil ];
diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix
index cc953aa696e3f..96d78937ef449 100644
--- a/pkgs/development/python-modules/hdmedians/default.nix
+++ b/pkgs/development/python-modules/hdmedians/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , nose
 , cython
 , numpy
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   version = "0.14.2";
   pname = "hdmedians";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b47aecb16771e1ba0736557255d80ae0240b09156bff434321de559b359ac2d6";
+  src = fetchFromGitHub {
+     owner = "daleroberts";
+     repo = "hdmedians";
+     rev = "v0.14.2";
+     sha256 = "033lszvdgcv47zyc6azy21w7adn37gk717yv006xwl81kkhdrhkq";
   };
 
   # nose was specified in setup.py as a build dependency...
diff --git a/pkgs/development/python-modules/hid/default.nix b/pkgs/development/python-modules/hid/default.nix
index ce6e1d58def34..eb1bb598b70f8 100644
--- a/pkgs/development/python-modules/hid/default.nix
+++ b/pkgs/development/python-modules/hid/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , hidapi
 , nose
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "hid";
   version = "1.0.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-9hsDgvN6M0vIuoYEvIS5SHXuT1lPu6+CssOz6CeIP8E=";
+  src = fetchFromGitHub {
+     owner = "apmorton";
+     repo = "pyhidapi";
+     rev = "1.0.4";
+     sha256 = "0n0hv9x8g2wpn69jmh9k03lxvk8ljlc4j7rfzdxx4jwy37h2xid4";
   };
 
   propagatedBuildInputs = [ hidapi ];
diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix
index d7fa9af5efaef..7c65b3fa32779 100644
--- a/pkgs/development/python-modules/hieroglyph/default.nix
+++ b/pkgs/development/python-modules/hieroglyph/default.nix
@@ -1,13 +1,15 @@
-{ lib, fetchPypi, buildPythonPackage, isPy27, sphinx }:
+{ lib, fetchFromGitHub, buildPythonPackage, isPy27, sphinx }:
 
 buildPythonPackage rec {
   pname = "hieroglyph";
   version = "2.1.0";
   disabled = isPy27; # python2 compatible sphinx is too low
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b4b5db13a9d387438e610c2ca1d81386ccd206944d9a9dd273f21874486cddaf";
+  src = fetchFromGitHub {
+     owner = "nyergler";
+     repo = "hieroglyph";
+     rev = "hieroglyph-2.1.0";
+     sha256 = "1q84q8dz1p291y9yfh3md2418qqa8z7a1kpr8aink0qbblf5rgly";
   };
 
   propagatedBuildInputs = [ sphinx ];
diff --git a/pkgs/development/python-modules/hijri-converter/default.nix b/pkgs/development/python-modules/hijri-converter/default.nix
index ba9511a078d50..4351103ebf1b8 100644
--- a/pkgs/development/python-modules/hijri-converter/default.nix
+++ b/pkgs/development/python-modules/hijri-converter/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytestCheckHook
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "hijri-converter";
   version = "2.2.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-1KENsAnBQXWSu/s96+yt+gTY2NXVG2Spcelp12Gp8+E=";
+  src = fetchFromGitHub {
+     owner = "dralshehri";
+     repo = "hijri-converter";
+     rev = "v2.2.2";
+     sha256 = "19hvqs8cp07y5xjrd9kkw2sbykl2xpb1986r9gwgnwhnl7hacyr0";
   };
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/hole/default.nix b/pkgs/development/python-modules/hole/default.nix
index 3175a8fabb580..2e9346191eaf2 100644
--- a/pkgs/development/python-modules/hole/default.nix
+++ b/pkgs/development/python-modules/hole/default.nix
@@ -2,7 +2,7 @@
 , aiohttp
 , async-timeout
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 }:
 
@@ -13,9 +13,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-yZpzGfB5RTWaRn2DmT+cbSDC0pL16FyUc0Nr/V6TlhU=";
+  src = fetchFromGitHub {
+     owner = "home-assistant-ecosystem";
+     repo = "python-hole";
+     rev = "0.7.0";
+     sha256 = "10d3cksfv29g00z6s1iqacspd7iybwsn7wlyj21flknd74ww78yj";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix
index 98aab26ffac80..d5ff36fc39562 100644
--- a/pkgs/development/python-modules/homeconnect/default.nix
+++ b/pkgs/development/python-modules/homeconnect/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , requests
 , requests_oauthlib
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "homeconnect";
   version = "0.6.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0n4h4mi23zw3v6fbkz17fa6kkl5v9bfmj0p57jvfzcfww511y9mn";
+  src = fetchFromGitHub {
+     owner = "DavidMStraub";
+     repo = "homeconnect";
+     rev = "v0.6.3";
+     sha256 = "122nhng2drjz280zq9j4fpc3wz647xynfzlqwzwadbk0rq91zxm4";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix
index a7d4240db1439..90ff3a8f0676d 100644
--- a/pkgs/development/python-modules/httpauth/default.nix
+++ b/pkgs/development/python-modules/httpauth/default.nix
@@ -1,15 +1,17 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   version = "0.3";
   pname = "httpauth";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0qas7876igyz978pgldp5r7n7pis8n4vf0v87gxr9l7p7if5lr3l";
+  src = fetchFromGitHub {
+     owner = "jonashaag";
+     repo = "httpauth";
+     rev = "0.3";
+     sha256 = "0vwpgl5sh4l5wzjb5j1s60mrvddsbcgspn4wmyn6vvd6ijflsg08";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix
index ace9a7041e3fa..e6a782cdcbb36 100644
--- a/pkgs/development/python-modules/httpbin/default.nix
+++ b/pkgs/development/python-modules/httpbin/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , flask
 , flask-limiter
 , markupsafe
@@ -15,9 +15,11 @@ buildPythonPackage rec {
   pname = "httpbin";
   version = "0.7.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1yldvf3585zcwj4vxvfm4yr9wwlz3pa2mx2pazqz8x8mr687gcyb";
+  src = fetchFromGitHub {
+     owner = "kennethreitz";
+     repo = "httpbin";
+     rev = "v0.7.0";
+     sha256 = "1r9zcccsibp98844nb439zkd89q6795v6rl5wgsczndh27hpdcdj";
   };
 
   propagatedBuildInputs = [ brotlipy flask flask-limiter markupsafe decorator itsdangerous raven six ];
diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix
index 9726069746023..198b848e3db05 100644
--- a/pkgs/development/python-modules/hupper/default.nix
+++ b/pkgs/development/python-modules/hupper/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytestCheckHook
 , watchdog
 }:
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "hupper";
   version = "1.10.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-zW9Rtyx1h7ybzopl7NAloelfGwMoRRm/6RKE0BAxbNk=";
+  src = fetchFromGitHub {
+     owner = "Pylons";
+     repo = "hupper";
+     rev = "1.10.3";
+     sha256 = "1kvnry8svh6mzja4mm77g81y7n666zgbqry128n9qdqsg273c6v1";
   };
 
   # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent
diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix
index c30566a451097..e72a07c3e8427 100644
--- a/pkgs/development/python-modules/hvac/default.nix
+++ b/pkgs/development/python-modules/hvac/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pyhcl
 , requests
 , six
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "hvac";
   version = "0.11.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f905c59d32d88d3f67571fe5a8a78de4659e04798ad809de439f667247d13626";
+  src = fetchFromGitHub {
+     owner = "ianunruh";
+     repo = "hvac";
+     rev = "v0.11.2";
+     sha256 = "0cd7am9q73b5r7lhqsx0i0flvpykxkk4c5zmxpdix8ljxbj4qn8p";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix
index 21927683b18b9..d852bd59e1e41 100644
--- a/pkgs/development/python-modules/hyperlink/default.nix
+++ b/pkgs/development/python-modules/hyperlink/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , isPy27
 , idna
 , typing ? null
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "hyperlink";
   version = "21.0.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0sx50lkivsfjxx9zr4yh7l9gll2l9kvl0v0w8w4wk2x5v9bzjyj2";
+  src = fetchFromGitHub {
+     owner = "python-hyper";
+     repo = "hyperlink";
+     rev = "v21.0.0";
+     sha256 = "0jrsbgzfaikzv0zsymmzsnsisqd4mkdbw9hvqfxvlj7z9b26rrx5";
   };
 
   propagatedBuildInputs = [ idna ]
diff --git a/pkgs/development/python-modules/iapws/default.nix b/pkgs/development/python-modules/iapws/default.nix
index 76330af43eeb4..10699cd1dc6ba 100644
--- a/pkgs/development/python-modules/iapws/default.nix
+++ b/pkgs/development/python-modules/iapws/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, scipy }:
+{ lib, buildPythonPackage, fetchFromGitHub, scipy }:
 
 buildPythonPackage rec {
   pname = "iapws";
   version = "1.5.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "781285acaedff49d72c074aa308aabf7ca17f486cca490e5ed3f35526bbe4153";
+  src = fetchFromGitHub {
+     owner = "jjgomera";
+     repo = "iapws";
+     rev = "v1.5.2";
+     sha256 = "1pj1wgb7ri69aprjqy19rnz7wzn63xlazg6gw5s1gjinpmmsix0f";
   };
 
   propagatedBuildInputs = [ scipy ];
diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix
index 28fed3bcb7887..94b43ae43a2e5 100644
--- a/pkgs/development/python-modules/icecream/default.nix
+++ b/pkgs/development/python-modules/icecream/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchFromGitHub
 , asttokens, colorama, executing, pygments
 }:
 
@@ -6,9 +6,11 @@ buildPythonPackage rec {
   pname = "icecream";
   version = "2.1.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "47e00e3f4e8477996e7dc420b6fa8ba53f8ced17de65320fedb5b15997b76589";
+  src = fetchFromGitHub {
+     owner = "gruns";
+     repo = "icecream";
+     rev = "v2.1.1";
+     sha256 = "1mj7cjvydksmv60n2zkrr7a7ci2vcck3x9w0mifcah1cs4cdcc6d";
   };
 
   propagatedBuildInputs = [ asttokens colorama executing pygments ];
diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix
index ba11a39f5d9c3..84d2e8a52d1ea 100644
--- a/pkgs/development/python-modules/idna-ssl/default.nix
+++ b/pkgs/development/python-modules/idna-ssl/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, idna }:
+{ lib, buildPythonPackage, fetchFromGitHub, idna }:
 
 buildPythonPackage rec {
   pname = "idna-ssl";
   version = "1.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c";
+  src = fetchFromGitHub {
+     owner = "aio-libs";
+     repo = "idna-ssl";
+     rev = "v1.1.0";
+     sha256 = "1jqwpv769np7zkwrpfivj82in7x84101w6s9v340ajw80bdqlaqv";
   };
 
   propagatedBuildInputs = [ idna ];
diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix
index 35bafd67fa977..c96ae5ea94891 100644
--- a/pkgs/development/python-modules/ifaddr/default.nix
+++ b/pkgs/development/python-modules/ifaddr/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , ipaddress
 , python
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   version = "0.1.7";
   pname = "ifaddr";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94";
+  src = fetchFromGitHub {
+     owner = "pydron";
+     repo = "ifaddr";
+     rev = "0.1.7";
+     sha256 = "1wj8hq62f6fr9j7hdxkfylh4iw588x9yp9r5fj58k1imkw7lvb3s";
   };
 
   propagatedBuildInputs = [ ipaddress ];
diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix
index 3f65b9291ae65..d2aa52dfe78b1 100644
--- a/pkgs/development/python-modules/ijson/default.nix
+++ b/pkgs/development/python-modules/ijson/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "ijson";
   version = "3.1.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea";
+  src = fetchFromGitHub {
+     owner = "ICRAR";
+     repo = "ijson";
+     rev = "v3.1.4";
+     sha256 = "0bf2r8l52q5ayar32q0k9x7nykyj5l8ra90mvlc8byrgxnzaf3wh";
   };
 
   doCheck = false; # something about yajl
diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix
index ee1df820a401a..882fe76a42ba6 100644
--- a/pkgs/development/python-modules/imagecorruptions/default.nix
+++ b/pkgs/development/python-modules/imagecorruptions/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , numpy
 , scikitimage
 , lib
@@ -10,9 +10,11 @@ buildPythonPackage rec {
   pname = "imagecorruptions";
   version = "1.1.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "044e173f24d5934899bdbf3596bfbec917e8083e507eed583ab217abebbe084d";
+  src = fetchFromGitHub {
+     owner = "bethgelab";
+     repo = "imagecorruptions";
+     rev = "v1.1.2";
+     sha256 = "17hg5akbkngxa66zn0922icd1vyblns6pw3hg8lmpll3xqal20f4";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
index a249b2dbfe19d..490c8d2e56e85 100644
--- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , isPy3k
-, fetchPypi
+, fetchFromGitHub
 , substituteAll
 , ffmpeg
 , python
@@ -13,9 +13,11 @@ buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f2ea4245a2adad25dedf98d343159579167e549ac8c4691cef5eff980e20c139";
+  src = fetchFromGitHub {
+     owner = "imageio";
+     repo = "imageio-ffmpeg";
+     rev = "v0.4.5";
+     sha256 = "1srwfnh964nh6r7z0k6s7rb61phzrdb25kgjvksq23hn1rxv6kf0";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix
index bb29504d63e68..34c9784131482 100644
--- a/pkgs/development/python-modules/imbalanced-learn/default.nix
+++ b/pkgs/development/python-modules/imbalanced-learn/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , isPy27
 , pandas
 , pytestCheckHook
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   version = "0.8.1";
   disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "eaf576b1ba3523a0facf3aaa483ca17e326301e53e7678c54d73b7e0250edd43";
+  src = fetchFromGitHub {
+     owner = "scikit-learn-contrib";
+     repo = "imbalanced-learn";
+     rev = "0.8.1";
+     sha256 = "0xsx0j93bz4v7bp3pnkwk4x6jcpprmykhh0ccmn7kd2304lwdaw9";
   };
 
   propagatedBuildInputs = [ scikit-learn ];
diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix
index 54308d632b276..c40e85c2bb234 100644
--- a/pkgs/development/python-modules/importmagic/default.nix
+++ b/pkgs/development/python-modules/importmagic/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , six
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "importmagic";
   version = "0.1.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3f7757a5b74c9a291e20e12023bb3bf71bc2fa3adfb15a08570648ab83eaf8d8";
+  src = fetchFromGitHub {
+     owner = "alecthomas";
+     repo = "importmagic";
+     rev = "0.1.7";
+     sha256 = "1asijinpirq9ips9drsibyg2bj6qbpryz27n91akhvmzn78pbz7s";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix
index f6d327d229d89..dc13c0078c5b1 100644
--- a/pkgs/development/python-modules/inflection/default.nix
+++ b/pkgs/development/python-modules/inflection/default.nix
@@ -1,13 +1,15 @@
-{ lib, fetchPypi, buildPythonPackage, isPy27, pytest } :
+{ lib, fetchFromGitHub, buildPythonPackage, isPy27, pytest } :
 
 buildPythonPackage rec {
   pname = "inflection";
   version = "0.5.1";
   disabled = isPy27;
 
-  src = fetchPypi {
-   inherit pname version;
-   sha256 = "1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417";
+  src = fetchFromGitHub {
+     owner = "jpvanhal";
+     repo = "inflection";
+     rev = "0.5.1";
+     sha256 = "0mvs6wgpi963k7mqrwzdkh32m29zcm772q0fy7pwszlcsh3l50kg";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix
index 90761f76f9d54..84469b918ff7c 100644
--- a/pkgs/development/python-modules/iniconfig/default.nix
+++ b/pkgs/development/python-modules/iniconfig/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "iniconfig";
   version = "1.1.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32";
+  src = fetchFromGitHub {
+     owner = "RonnyPfannschmidt";
+     repo = "iniconfig";
+     rev = "v1.1.1";
+     sha256 = "0ysy6945513cbfnhzmvlk78qar1zk4pilmw50zsvpy3xd7nc14mz";
   };
 
   doCheck = false; # avoid circular import with pytest
diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix
index e4473c0bd1c17..f81a80232fe22 100644
--- a/pkgs/development/python-modules/iniparse/default.nix
+++ b/pkgs/development/python-modules/iniparse/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , python
 , six
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "iniparse";
   version = "0.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "932e5239d526e7acb504017bb707be67019ac428a6932368e6851691093aa842";
+  src = fetchFromGitHub {
+     owner = "candlepin";
+     repo = "python-iniparse";
+     rev = "0.5";
+     sha256 = "0sykrswby83gkcvnxh242m58ydz2idldkjhw8g8bb4m1ygphkpx2";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/injector/default.nix b/pkgs/development/python-modules/injector/default.nix
index 921db5d1a8774..ed5a029e4eb49 100644
--- a/pkgs/development/python-modules/injector/default.nix
+++ b/pkgs/development/python-modules/injector/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, typing-extensions }:
+{ lib, buildPythonPackage, fetchFromGitHub, typing-extensions }:
 
 buildPythonPackage rec {
   pname = "injector";
   version = "0.18.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "10miwi58g4b8rvdf1pl7s7x9j91qyxxv3kdn5idzkfc387hqxn6f";
+  src = fetchFromGitHub {
+     owner = "alecthomas";
+     repo = "injector";
+     rev = "0.18.4";
+     sha256 = "1axn2sbimj8fyr4zjgxf569h9hq1xn6xqnmpfkfnnazy2im4nm9n";
   };
 
   propagatedBuildInputs = [ typing-extensions ];
diff --git a/pkgs/development/python-modules/inotifyrecursive/default.nix b/pkgs/development/python-modules/inotifyrecursive/default.nix
index d0f81abaa47f7..f6fec27583033 100644
--- a/pkgs/development/python-modules/inotifyrecursive/default.nix
+++ b/pkgs/development/python-modules/inotifyrecursive/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , inotify-simple
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "inotifyrecursive";
   version = "0.3.5";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "osRQsxdpPkU4QW+Q6x14WFBtr+a4uIUDe9LdmuLa+h4=";
+  src = fetchFromGitHub {
+     owner = "letorbi";
+     repo = "inotifyrecursive";
+     rev = "0.3.5";
+     sha256 = "16kdww3iqpgqcn5za687shbijbvi5f38qrsh5wklyhf6r77llsh4";
   };
 
   propagatedBuildInputs = [ inotify-simple ];
diff --git a/pkgs/development/python-modules/insegel/default.nix b/pkgs/development/python-modules/insegel/default.nix
index 499d380675398..008f0ae934631 100644
--- a/pkgs/development/python-modules/insegel/default.nix
+++ b/pkgs/development/python-modules/insegel/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, pygments }:
+{ lib, buildPythonPackage, fetchFromGitHub, pygments }:
 
 buildPythonPackage rec {
   pname = "insegel";
   version = "1.3.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1d055dd64f6eb335580a485271511ba2f4e3b5e315f48f827f58da3cace4b4ae";
+  src = fetchFromGitHub {
+     owner = "autophagy";
+     repo = "insegel";
+     rev = "1.3.1";
+     sha256 = "1af61ziqy32bklaa56f1fmhvsmvjmhjf5sdj0znqlawbwsnayavd";
   };
 
   propagatedBuildInputs = [ pygments ];
diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix
index db98be8276c59..12b7b212652ce 100644
--- a/pkgs/development/python-modules/intbitset/default.nix
+++ b/pkgs/development/python-modules/intbitset/default.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
 , six
 , nose
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "intbitset";
   version = "2.4.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "44bca80b8cc702d5a56f0686f2bb5e028ab4d0c2c1761941589d46b7fa2c701c";
+  src = fetchFromGitHub {
+     owner = "inveniosoftware";
+     repo = "intbitset";
+     rev = "v2.4.1";
+     sha256 = "1bl0w2mv92qv5xml19mzlypghz0dk8br3bqnpwp34gx3af8a2s7d";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix
index e5b0cc6fbc746..ec15eb5924301 100644
--- a/pkgs/development/python-modules/intelhex/default.nix
+++ b/pkgs/development/python-modules/intelhex/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytestCheckHook
 }:
 
@@ -8,9 +8,11 @@ buildPythonPackage rec {
   pname = "intelhex";
   version = "2.3.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-iStzYacZ9JRSN9qMz3VOlRPbMvViiFJ4WuoQjc0lAJM=";
+  src = fetchFromGitHub {
+     owner = "bialix";
+     repo = "intelhex";
+     rev = "2.3.0";
+     sha256 = "13p7x4ygfgqn27q3c8lam7a0z09764iymgs7lcvjvxgq52nqwf9c";
   };
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index b878929060725..bcd91e41168fb 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytest
 , six
 , tqdm
@@ -22,9 +22,11 @@ buildPythonPackage rec {
   pname = "internetarchive";
   version = "2.2.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ebd11ecd038c71e75a3aef8d87750b46480169ecaefb23074c4ae48440bf2836";
+  src = fetchFromGitHub {
+     owner = "jjjake";
+     repo = "internetarchive";
+     rev = "v2.2.0";
+     sha256 = "19xyfdrmmq5sn19md94191yr9j0zqfhlaz8yxdnzlzmbpcszmipq";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix
index dca73a93e8f4c..671bb9560f356 100644
--- a/pkgs/development/python-modules/intervaltree/default.nix
+++ b/pkgs/development/python-modules/intervaltree/default.nix
@@ -1,13 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchFromGitHub
 , python, pytest, sortedcontainers }:
 
 buildPythonPackage rec {
   version = "3.1.0";
   pname = "intervaltree";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "902b1b88936918f9b2a19e0e5eb7ccb430ae45cde4f39ea4b36932920d33952d";
+  src = fetchFromGitHub {
+     owner = "chaimleib";
+     repo = "intervaltree";
+     rev = "3.1.0";
+     sha256 = "0d9jfbramihsg7d2axxh4s3kkkrbd6ch555nf7g1l3zjxvp8kxw9";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix
index cc56f8d0bdea5..c70e4876afa73 100644
--- a/pkgs/development/python-modules/iocapture/default.nix
+++ b/pkgs/development/python-modules/iocapture/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , flexmock
 , pytest
 , pytest-cov
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   pname = "iocapture";
   version = "0.1.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "86670e1808bcdcd4f70112f43da72ae766f04cd8311d1071ce6e0e0a72e37ee8";
+  src = fetchFromGitHub {
+     owner = "oinume";
+     repo = "iocapture";
+     rev = "0.1.2";
+     sha256 = "0q1r14lfxl1rf7wq6ha8ns2c6lcrnpmypf28xrharmznm28d5igp";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix
index 363c8a4f57687..d367ee435345e 100644
--- a/pkgs/development/python-modules/ipdb/default.nix
+++ b/pkgs/development/python-modules/ipdb/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , ipython
 , isPyPy
 , mock
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   version = "0.13.9";
   disabled = isPyPy;  # setupterm: could not find terminfo database
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "951bd9a64731c444fd907a5ce268543020086a697f6be08f7cc2c9a752a278c5";
+  src = fetchFromGitHub {
+     owner = "gotcha";
+     repo = "ipdb";
+     rev = "0.13.9";
+     sha256 = "1nhjk53xn3bmf338xazq8znqifa8zm2swl3cvy3jwydfhcs7fzf2";
   };
 
   propagatedBuildInputs = [ ipython toml ];
diff --git a/pkgs/development/python-modules/zipstream/default.nix b/pkgs/development/python-modules/zipstream/default.nix
index 00c291a1c5103..ba049a8907298 100644
--- a/pkgs/development/python-modules/zipstream/default.nix
+++ b/pkgs/development/python-modules/zipstream/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, nose }:
+{ lib, buildPythonPackage, fetchFromGitHub, nose }:
 
 buildPythonPackage rec {
   pname = "zipstream";
   version = "1.1.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif";
+  src = fetchFromGitHub {
+     owner = "allanlei";
+     repo = "python-zipstream";
+     rev = "v1.1.4";
+     sha256 = "0ymcz7q0mmj44blhzxvbhphy1psmgrf4ik1q1cnqnmrg9wylc7g4";
   };
 
   checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix
old mode 100755
new mode 100644
index 5d2066f45f21f..8a5763c37fb62
--- a/pkgs/development/python-modules/zstandard/default.nix
+++ b/pkgs/development/python-modules/zstandard/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , cffi
 , hypothesis
 }:
@@ -9,9 +9,11 @@ buildPythonPackage rec {
   pname = "zstandard";
   version = "0.16.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "eaae2d3e8fdf8bfe269628385087e4b648beef85bb0c187644e7df4fb0fe9046";
+  src = fetchFromGitHub {
+     owner = "indygreg";
+     repo = "python-zstandard";
+     rev = "0.16.0";
+     sha256 = "0ca26anlb4kkl98hm02nxcn9ldfl03c97wz7nkwgd2yas34fh67d";
   };
 
   propagatedNativeBuildInputs = [ cffi ];
diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix
index e7ee8dd68cb9d..b69c065e050bc 100644
--- a/pkgs/development/python-modules/zstd/default.nix
+++ b/pkgs/development/python-modules/zstd/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkg-config, fetchPypi, buildPythonPackage
+{ lib, pkg-config, fetchFromGitHub, buildPythonPackage
 , buildPackages
 , zstd, pytest }:
 
@@ -6,9 +6,11 @@ buildPythonPackage rec {
   pname = "zstd";
   version = "1.5.0.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "8d3388a15135c481b28ca67d079cb5fd79a9691626fd9979e6b4ec00eabb9e79";
+  src = fetchFromGitHub {
+     owner = "sergey-dryabzhinsky";
+     repo = "python-zstd";
+     rev = "v1.5.0.2";
+     sha256 = "1v87syk7ldqm3mv4hmf5d10cprqm4n1qfmf81w8anbg1qn56hd22";
   };
 
   postPatch = ''