diff --git a/nix/sources.json b/nix/sources.json

index c9904ecfaed74d3d25325fb795fe0a0493b0e876..c46d344fc493aec0c325b0b0431c3f090bd269c8 100644

--- a/nix/sources.json

+++ b/nix/sources.json

@@ -13,20 +13,6 @@ "type": "tarball",

     "url": "https://github.com/bopen/elevation/archive/6819b2931f5de412bd6b18bd07f1674f71fa35e5.tar.gz",

     "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"

 },

• "foma": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2020-09-28T19:00:09Z",
  

•    "description": "xfst-compatible C++ finite-state transducer library",
  

•    "homepage": "https://github.com/mhulden/foma",
  

•    "owner": "mhulden",
  

•    "repo": "foma",
  

•    "rev": "b44022c7d9d347dc7392aabbf72c82e558767675",
  

•    "sha256": "0bcgrnfl693dmg6yd5bnhmfikdqvv61d2l3mkbg524h0l38xv6ym",
  

•    "type": "tarball",
  

•    "url": "https://github.com/mhulden/foma/archive/b44022c7d9d347dc7392aabbf72c82e558767675.tar.gz",
  

•    "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
  

• },

 "geofabrik-estonia": {

     "builtin": false,

     "sha256": "07gy3280arvkvfpm82aqcing1w7av6hq3crf5wxm66ipk2viwmg7",

@@ -93,20 +79,6 @@ "type": "tarball",

     "url": "https://github.com/tumic0/GPXSee-maps/archive/cb60f47393f79ce0e279ee08b0697acda2ded7e9.tar.gz",

     "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"

 },

• "gpxtools": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2020-05-10T10:24:49Z",
  

•    "description": "A collection of c++ tools for using GPX files",
  

•    "homepage": "https://notabug.org/irdvo/gpxtools",
  

•    "owner": "irdvo",
  

•    "repo": "gpxtools",
  

•    "rev": "919fb5953af8de1e71f61244eb70dd56b670a429",
  

•    "sha256": "06q9kyhjsp1sjgfdrd5chkr49d1dq0csh898hhzhpigb1jzxsjhs",
  

•    "type": "tarball",
  

•    "url": "https://notabug.org/irdvo/gpxtools/archive/919fb5953af8de1e71f61244eb70dd56b670a429.tar.gz",
  

•    "url_template": "https://notabug.org/<owner>/<repo>/archive/<rev>.tar.gz"
  

• },

 "gt-bash-client": {

     "branch": "master",

     "builtin": false,

@@ -147,20 +119,6 @@ "rev": "1eafb28ffe9f843540aaf355bf7193cea963ccb0",

     "sha256": "0vkbsrwhiq3rm9nplxh5y3vpk3gvv09nqxnrqrxfvpp4sdm7vs30",

     "type": "tarball",

     "url": "https://github.com/hfst/hfst/archive/1eafb28ffe9f843540aaf355bf7193cea963ccb0.tar.gz",

•    "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
  

• },

• "how-to-use-pvs-studio-free": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2021-02-08T12:49:11Z",
  

•    "description": "How to use PVS-Studio for Free",
  

•    "homepage": "https://www.viva64.com/en/b/0457/",
  

•    "owner": "viva64",
  

•    "repo": "how-to-use-pvs-studio-free",
  

•    "rev": "abc39706151159d102d29e3e2f2b8d5688362ec3",
  

•    "sha256": "10xx1vyw2dd2qgwaswz7nk0c1h60vy39a3fn7dkvr716i37pccih",
  

•    "type": "tarball",
  

•    "url": "https://github.com/viva64/how-to-use-pvs-studio-free/archive/abc39706151159d102d29e3e2f2b8d5688362ec3.tar.gz",
  

     "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"

 },

 "klogg": {

diff --git a/pkgs/development/libraries/foma/default.nix b/pkgs/development/libraries/foma/default.nix

index ca87b9f2fef1e88949cd23611ec59bb3458cb96d..464c54c9fc173a8b79af249b17791fc39cf9f26d 100644

--- a/pkgs/development/libraries/foma/default.nix

+++ b/pkgs/development/libraries/foma/default.nix

@@ -1,12 +1,17 @@

-{ lib, stdenv, bison, flex, libtool, ncurses, readline, zlib, sources }:

+{ lib, stdenv, fetchFromGitHub, bison, flex, libtool, ncurses, readline, zlib }:

-stdenv.mkDerivation {

• pname = "foma-unstable";

• version = lib.substring 0 10 sources.foma.date;

+stdenv.mkDerivation rec {

• pname = "foma";

• version = "2020-09-28";

• src = sources.foma;

• src = fetchFromGitHub {

• owner = "mhulden";

• repo = pname;

• rev = "b44022c7d9d347dc7392aabbf72c82e558767675";

• hash = "sha256-1Zvd0aAAElHemnVQ0YLZG7cZXYV2lebNq20kQ53Njy0=";

• };

• sourceRoot = "foma-src/foma";

• sourceRoot = "${src.name}/foma";

nativeBuildInputs = [ bison flex libtool ];

@@ -21,7 +26,13 @@

makeFlags = [ "prefix=$(out)" ];

meta = with lib; {

• inherit (sources.foma) description homepage;

• description = "xfst-compatible C++ finite-state transducer library";

• longDescription = ''

•  Foma is designed to be a complete replacement for the
  

•  closed-source Xerox tool xfst. Everything that compiles
  

•  with xfst should compile with Foma. If not it is a bug.
  

• '';

• homepage = "https://code.google.com/p/foma/";

 license = licenses.asl20;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

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

index ddc4c447c3e493d9fbe466ce3cf6fa28842b7769..740e41ede8638b9dcd0cbbfbe245c5d2e8ba7fbe 100644

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

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

@@ -2,13 +2,13 @@ { lib, buildGoModule, fetchFromSourcehut }:

buildGoModule rec {

pname = "gmnigit";

• version = "2021-04-24";

• version = "2021-05-03";

src = fetchFromSourcehut {

 owner = "~kornellapacz";

 repo = pname;

• rev = "8070917b7e55893ecf4be648a55459e5a7a92ecc";

• hash = "sha256-cn4Netr/CYT8bG0qqBcbC+V7NrYCtxWbajD+3Sc4DkY=";

• rev = "6104fffa30382eac461668cd3e3334aeb9be5898";

• hash = "sha256-/1iicldvGgIm/GZEQBkdJ9ML/a/5PfJA/fvfBRTPVFs=";

};

vendorSha256 = "sha256-KYuJl/xqZ/ioMNMugqEKsfZPZNx6u9FBmEkg+1cQX04=";

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

index dfad9fe2af4168cdbeff07b459528cc6f0c16941..91968c7449577facce7fe213d50a84d77164aea1 100644

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

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

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

stdenv.mkDerivation rec {

pname = "gmnisrv";

• version = "2021-03-23";

• version = "2021-05-04";

src = fetchFromSourcehut {

 owner = "~sircmpwn";

 repo = pname;

• rev = "8b65e303b01fc573cb1c40a365fb5db166146a37";

• hash = "sha256-H+niIRCetKe2wwoC5pKpcYOd6z+DmHhy2LWN9syPEdg=";

• rev = "0dc0e4432a70eafde69509fde8a29802e46ae712";

• hash = "sha256-PvDU5QppUpkDtfk8IsD/Bo2SzS+4Igee3cGat+7Y0iM=";

};

nativeBuildInputs = [ pkg-config scdoc ];

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

index 7645def4e9a36cd05fa0f581fa830ee6aeb6d64f..22d5b099dd73f0b62525fd30c8207f10b9d999ee 100644

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

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

@@ -2,13 +2,13 @@ { lib, buildGoModule, fetchFromSourcehut, scdoc }:

buildGoModule rec {

pname = "kiln";

• version = "2021-04-26";

• version = "2021-05-01";

src = fetchFromSourcehut {

 owner = "~adnano";

 repo = pname;

• rev = "2409741e19577421ed8a1630b738f4facca1b041";

• hash = "sha256-/xbCThs/kGN/4Gym8hXW1FvlhB4Jd4Y80Y6YQl7km9E=";

• rev = "a6f582f284224a2e45241a0ff1efa14627f5882a";

• hash = "sha256-N/RWeSlwCnkhPVNFPu3UltKH6DXgwEDnEops5tCmqBo=";

};

nativeBuildInputs = [ scdoc ];

diff --git a/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix

index 5d0f84e31d059f91f45b307769b73ba5201d6836..0a168fb68d682bdb8c8626e35fd04ece03fd2e04 100644

--- a/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix

+++ b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix

@@ -1,10 +1,15 @@

-{ lib, stdenv, cmake, sources }:

+{ lib, stdenv, fetchFromGitHub, cmake }:

-stdenv.mkDerivation {

• pname = "how-to-use-pvs-studio-free-unstable";

• version = lib.substring 0 10 sources.how-to-use-pvs-studio-free.date;

+stdenv.mkDerivation rec {

• pname = "how-to-use-pvs-studio-free";

• version = "2021-02-08";

• src = sources.how-to-use-pvs-studio-free;

• src = fetchFromGitHub {

• owner = "viva64";

• repo = pname;

• rev = "abc39706151159d102d29e3e2f2b8d5688362ec3";

• hash = "sha256-MDJ2z4gmnLxnO9YNlYbfwMDAwLTnc634w6I1wf0OvYM=";

• };

nativeBuildInputs = [ cmake ];

@@ -17,7 +22,8 @@ --replace "stdc++fs" "c++fs"

'';

meta = with lib; {

• inherit (sources.how-to-use-pvs-studio-free) description homepage;

• description = "How to use PVS-Studio for Free?";

• homepage = "https://pvs-studio.com/en/blog/posts/0457/";

 license = licenses.asl20;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

diff --git a/pkgs/tools/geo/gpxtools/default.nix b/pkgs/tools/geo/gpxtools/default.nix

index 1c52c83d6b8708bd6e3cacdf3af8f6d4c4b85c09..8b5c8c264f110bc366c93a8a82931a87073dbb1d 100644

--- a/pkgs/tools/geo/gpxtools/default.nix

+++ b/pkgs/tools/geo/gpxtools/default.nix

@@ -1,10 +1,14 @@

-{ lib, stdenv, cmake, expat, exiv2, sources }:

+{ lib, stdenv, fetchgit, cmake, expat, exiv2 }:

stdenv.mkDerivation {

pname = "gpxtools";

• version = lib.substring 0 10 sources.gpxtools.date;

• version = "2020-05-10";

• src = sources.gpxtools;

• src = fetchgit {

• url = "https://notabug.org/irdvo/gpxtools.git";

• rev = "919fb5953af8de1e71f61244eb70dd56b670a429";

• sha256 = "sha256-GkrdvwzrxQs/hCghqBnALbRE8oSstNzckzpcLaGfCRs=";

• };

nativeBuildInputs = [ cmake ];

buildInputs = [ expat ];

@@ -17,7 +21,8 @@

installPhase = "install -Dm755 gpx* -t $out/bin";

meta = with lib; {

• inherit (sources.gpxtools) description homepage;

• description = "A collection of c++ tools for using GPX files";

• homepage = "https://notabug.org/irdvo/gpxtools";

 license = licenses.gpl3;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;