diff --git a/pkgs/gemini/gemreader/default.nix b/pkgs/gemini/gemreader/default.nix

index ddf1481b91490a7051d567db6ffc64235dd526cf..e97aa58456221b9fa99aaa71ff67e0333ff7c5c6 100644

--- a/pkgs/gemini/gemreader/default.nix

+++ b/pkgs/gemini/gemreader/default.nix

@@ -1,11 +1,12 @@

-{ lib, buildGoModule, fetchgit, sources }:

+{ lib, buildGoModule, fetchFromSourcehut }:

-buildGoModule {

+buildGoModule rec {

pname = "gemreader";

version = "2021-03-08";

• src = fetchgit {

• url = "https://git.sr.ht/~sircmpwn/gemreader";

• src = fetchFromSourcehut {

• owner = "~sircmpwn";

• repo = pname;

 rev = "7f9df147d6785d5f2b77ce9d44513de65985657a";

 sha256 = "0w6jky5qz6p7i67jm6ab9rrlym2xkfqiaxgxfr4g2wg628qb32nl";

};

diff --git a/pkgs/gemini/gmni/default.nix b/pkgs/gemini/gmni/default.nix

index 8b69fe5fa5c6852acd3bd9f943979cd10f926f01..e942c683830beeb8399cbf63b2797d5fb0a884b1 100644

--- a/pkgs/gemini/gmni/default.nix

+++ b/pkgs/gemini/gmni/default.nix

@@ -1,11 +1,12 @@

-{ lib, stdenv, fetchgit, openssl, pkg-config, scdoc }:

+{ lib, stdenv, fetchFromSourcehut, openssl, pkg-config, scdoc }:

-stdenv.mkDerivation {

+stdenv.mkDerivation rec {

pname = "gmni";

version = "2021-01-07";

• src = fetchgit {

• url = "https://git.sr.ht/~sircmpwn/gmni";

• src = fetchFromSourcehut {

• owner = "~sircmpwn";

• repo = pname;

 rev = "4fbc632b22172daa976d8e1c9a2db75d52ee3232";

 sha256 = "1jasamkjy90b169hwl8p78ns92fs5vlpzr50pxcfsfgny8628sin";

};

diff --git a/pkgs/gemini/gmnisrv/default.nix b/pkgs/gemini/gmnisrv/default.nix

index 48abbf018d88773c60148c360eab5d66d5b666ae..0bf3c99aaa9d4e2a23bc110b6ee53b3774218852 100644

--- a/pkgs/gemini/gmnisrv/default.nix

+++ b/pkgs/gemini/gmnisrv/default.nix

@@ -1,11 +1,12 @@

-{ lib, stdenv, fetchgit, mailcap, openssl, pkg-config, scdoc }:

+{ lib, stdenv, fetchFromSourcehut, mailcap, openssl, pkg-config, scdoc }:

-stdenv.mkDerivation {

+stdenv.mkDerivation rec {

pname = "gmnisrv";

version = "2020-12-27";

• src = fetchgit {

• url = "https://git.sr.ht/~sircmpwn/gmnisrv";

• src = fetchFromSourcehut {

• owner = "~sircmpwn";

• repo = pname;

 rev = "fbef1d34a1abd2614f85afee415fe0f417038efe";

 sha256 = "0y42vj5vy8pk732dkbdywgixr9bxpg11hf4w2qsa1vwqw3xbvdka";

};

diff --git a/pkgs/gemini/kiln/default.nix b/pkgs/gemini/kiln/default.nix

index d7690d5fd5079e7bb1a718cda0374fcf8fcc8665..c7b10813e01cc648ddeda7556c66fab2f68bba75 100644

--- a/pkgs/gemini/kiln/default.nix

+++ b/pkgs/gemini/kiln/default.nix

@@ -1,11 +1,12 @@

-{ lib, buildGoModule, fetchgit, sources }:

+{ lib, buildGoModule, fetchFromSourcehut }:

buildGoModule rec {

pname = "kiln";

version = "0.1.0";

• src = fetchgit {

• url = "https://git.sr.ht/~adnano/kiln";

• src = fetchFromSourcehut {

• owner = "~adnano";

• repo = pname;

 rev = "v${version}";

 sha256 = "0rj2h8l5b92kjfb3hhm77w6zwmvxwrrd3yjs1718q77xxf2l83m1";

};

diff --git a/pkgs/gemini/kineto/default.nix b/pkgs/gemini/kineto/default.nix

index b7a8d4bbe7a0219c87ac44356f541183f2e1fd73..4297c103140a94b21a3b7acdbf4d927028b61fac 100644

--- a/pkgs/gemini/kineto/default.nix

+++ b/pkgs/gemini/kineto/default.nix

@@ -1,11 +1,12 @@

-{ lib, buildGoModule, fetchgit }:

+{ lib, buildGoModule, fetchFromSourcehut }:

-buildGoModule {

+buildGoModule rec {

pname = "kineto";

version = "2021-01-15";

• src = fetchgit {

• url = "https://git.sr.ht/~sircmpwn/kineto";

• src = fetchFromSourcehut {

• owner = "~sircmpwn";

• repo = pname;

 rev = "8f35e0a2b17b70691b8634c2bd8c99f98557105c";

 sha256 = "0vh28k3mnqv27nr3s6c4b4zcf5q1q2c1fs73np1cb0l4fpl6l7s2";

};

diff --git a/pkgs/gemini/shavit/default.nix b/pkgs/gemini/shavit/default.nix

index 74646641043a4c126cfd76c7512f6c77f6230a7c..ddb50180aeced74e5d348727005199496392d0e2 100644

--- a/pkgs/gemini/shavit/default.nix

+++ b/pkgs/gemini/shavit/default.nix

@@ -1,11 +1,12 @@

-{ lib, buildGoModule, fetchgit, sources }:

+{ lib, buildGoModule, fetchFromSourcehut }:

-buildGoModule {

+buildGoModule rec {

pname = "shavit";

version = "2020-03-14";

• src = fetchgit {

• url = "https://git.sr.ht/~yotam/shavit";

• src = fetchFromSourcehut {

• owner = "~yotam";

• repo = pname;

 rev = "129b3e7fc700d02843c4fbd3e7cc73bf714f9cc2";

 sha256 = "02g1igsx441q20yv2ylc50mf598whl0lfnwrj9nzab1jk5q3nhic";

};