diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix

index 16bb49d38a2900038de70913444e49d8532c4f21..1a8f28faa4687ea62e809e1b11dec25de2250369 100644

--- a/pkgs/data/maps/maptourist/default.nix

+++ b/pkgs/data/maps/maptourist/default.nix

@@ -2,11 +2,11 @@ { lib, stdenvNoCC, fetchurl, unzip }:

stdenvNoCC.mkDerivation rec {

pname = "maptourist";

• version = "2021-09-12";

• version = "2021-09-15";

src = fetchurl {

 url = "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_${version}.zip";

• hash = "sha256-oR4TOdA82TYumMdDBwP4bTy/HgjI4TRTzZgtOgT44Rg=";

• hash = "sha256-5Fv0scOCdPoI8L//InjljJE/Tx1yq1KQYfb86DD4V/U=";

};

sourceRoot = ".";

diff --git a/pkgs/data/misc/routinodb/default.nix b/pkgs/data/misc/routinodb/default.nix

index bca141a47c58bece5e5d8196ebe9897a35d9297e..fd01b02bd8cffe5264c1b647d88c908f7045df6d 100644

--- a/pkgs/data/misc/routinodb/default.nix

+++ b/pkgs/data/misc/routinodb/default.nix

@@ -2,20 +2,20 @@ { lib, stdenv, fetchurl, routino }:

stdenv.mkDerivation rec {

pname = "routinodb";

• version = "210905";

• version = "210915";

srcs = [

 (fetchurl {

   url = "https://download.geofabrik.de/europe/finland-${version}.osm.pbf";

•  hash = "sha256-f7tD1coF+PQelYI4OqfQ0mS1yhGzgl/H84cF9wwNjkY=";
  

•  hash = "sha256-YjA7rxO3DRDP8f2nm7ZCXJfKj68XqEHP0+QpzY/jn5A=";
  

 })

 (fetchurl {

   url = "https://download.geofabrik.de/europe/estonia-${version}.osm.pbf";

•  hash = "sha256-i9LIojA2Zh8MwWKJa7967S832tT8joifmFwxiWZvW9o=";
  

•  hash = "sha256-b1PXUUdja93kp4Oy8cvhnJPrX7Wspp3WiExGpCpjLzI=";
  

 })

 (fetchurl {

   url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";

•  hash = "sha256-ZFVnt7AbMZZdUgiv3AHvH4v+qrwRPNjJ1xyw4NMJFaM=";
  

•  hash = "sha256-PGVHpwc82x/LfV71L8DrgGpAYl438VoEhWcl0g3Ankw=";
  

 })

];

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

index b8b849f95fede103156133974487bb0539208efa..4e32c106530a71b9a5d0d4c12d712a2d84f59c98 100644

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

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

@@ -2,11 +2,11 @@ { lib, stdenv, fetchurl }:

stdenv.mkDerivation rec {

pname = "geographiclib";

• version = "1.51";

• version = "1.52";

src = fetchurl {

 url = "mirror://sourceforge/geographiclib/GeographicLib-${version}.tar.gz";

• sha256 = "046k49h52n2qxclqdzjmqj6pbvqsb28hn7lnsrdi1xbxc54hjdrl";

• hash = "sha256-XUFFzRbr9Rov+XySRDMKNAeH0TEWXP0VDksoQMDorCs=";

};

meta = with lib; {

diff --git a/pkgs/development/python-modules/cjkwrap/default.nix b/pkgs/development/python-modules/cjkwrap/default.nix

index 38db4f7a9de37cf66f82c727f8b49346d64c102c..1bc8f360dc8604311392fe2516813118b24bdd38 100644

--- a/pkgs/development/python-modules/cjkwrap/default.nix

+++ b/pkgs/development/python-modules/cjkwrap/default.nix

@@ -6,7 +6,7 @@ version = "2.2";

src = python3Packages.fetchPypi {

 inherit pname version;

• sha256 = "1b603sg6c2gv9vmlxwr6r1qvhadqk3qp6vifmijris504zjx5ix2";

• hash = "sha256-osfS5Seg6JhlrC5uc/GYuCm4ccgm807rTvsJZp4ewKw=";

};

meta = with lib; {

diff --git a/pkgs/development/python-modules/mikatools/default.nix b/pkgs/development/python-modules/mikatools/default.nix

index 26944b25fc94c4121f4433ef8055eb2328cb788c..51bd4d9675b480dc5365ebe745c691960b7724a5 100644

--- a/pkgs/development/python-modules/mikatools/default.nix

+++ b/pkgs/development/python-modules/mikatools/default.nix

@@ -8,7 +8,7 @@ src = fetchFromGitHub {

 owner = "mikahama";

 repo = pname;

 rev = version;

• sha256 = "1sj39slscbk8zqxs15bc31r0vn3wr6sq7zk18gw8plfk6ccs9yq9";

• hash = "sha256-CfukGTPT0Yv4Q2H+g7XJfNgNchhslaA7/mgupqlOQ+o=";

};

propagatedBuildInputs = with python3Packages; [ requests clint cryptography ];

diff --git a/pkgs/garmin/cgpsmapper/default.nix b/pkgs/garmin/cgpsmapper/default.nix

index af5fd0363ff7facb61d72fb2f681c728214b3739..837974a7a0fb39869dc96c3532d6d0fccb67ddfa 100644

--- a/pkgs/garmin/cgpsmapper/default.nix

+++ b/pkgs/garmin/cgpsmapper/default.nix

@@ -7,7 +7,7 @@

src = fetchwebarchive {

 url = "http://cgpsmapper.com/download/cgpsmapper-static.gz";

 timestamp = "20160817191046";

• sha256 = "0h2xjkzkg566bgvg8gbl1hmjjimv2xbhv2csd54naq1vqphqjchx";

• hash = "sha256-HTKJ4cU7YGVJaZqJDVcXu0YpKwx0PfT2W8aUN/+UXUA=";

};

sourceRoot = ".";

diff --git a/pkgs/garmin/gmaptool/default.nix b/pkgs/garmin/gmaptool/default.nix

index 1117d41ceacd9bd3ad667b875c9f7af1ba5e24bb..a54b515b4b5a987888c0a328ebdef425d2ec79e2 100644

--- a/pkgs/garmin/gmaptool/default.nix

+++ b/pkgs/garmin/gmaptool/default.nix

@@ -9,7 +9,7 @@ inherit version;

src = fetchzip {

 url = "https://www.gmaptool.eu/sites/default/files/${filename}";

• sha256 = "0wf9ys52slf2hzmfl81d8754alfqiylsk7g5af3lxsiivd5284gy";

• hash = "sha256-/hEkStsx6k6HU+WdqamP2FFFykEtIOrqh8JRLYr2yXE=";

 stripRoot = false;

};

diff --git a/pkgs/garmin/libgarmin/default.nix b/pkgs/garmin/libgarmin/default.nix

index 6410e204c3ec3d1296e8c229598ef0aa98de47e3..acb58f0526c9b0855b1d1eec81108fe0c8dd0fa0 100644

--- a/pkgs/garmin/libgarmin/default.nix

+++ b/pkgs/garmin/libgarmin/default.nix

@@ -7,7 +7,7 @@

src = fetchsvn {

 url = "https://svn.code.sf.net/p/libgarmin/svn/libgarmin/dev";

 rev = "320";

• sha256 = "1gv7j0kisql7jwchiby3rv7ni6pp5xpz4727v8h1nr64g7wc6mb8";

• sha256 = "sha256-aFXD+HnEZBsg2kcc8m8v95poz87DrwgZl4diHSeQZ78=";

};

nativeBuildInputs = [ autoconf automake libtool ];

diff --git a/pkgs/garmin/ocad2mp/default.nix b/pkgs/garmin/ocad2mp/default.nix

index 634cd9107e4f9467abb46d367bb1a14864a71afd..34fa5fbb015f5c948e87b8304443a769ebc59949 100644

--- a/pkgs/garmin/ocad2mp/default.nix

+++ b/pkgs/garmin/ocad2mp/default.nix

@@ -1,13 +1,13 @@

{ lib, stdenv, fetchsvn }:

stdenv.mkDerivation {

• pname = "ocad2mp-unstable";

• pname = "ocad2mp";

version = "2011-01-26";

src = fetchsvn {

 url = "svn://svn.code.sf.net/p/ocad2mp/code/trunk/ocad2mp";

 rev = "269";

• sha256 = "1700apfsjd27q9jsvvr94mk7rd0x24ib3bkn4y8hak0zvknib563";

• sha256 = "sha256-w5QV7dwfTAWRJ3ausSIRHbR8ZiUp761lwkc0qd1VAJw=";

};

postPatch = lib.optionalString stdenv.isDarwin ''

diff --git a/pkgs/garmin/sendmap20/default.nix b/pkgs/garmin/sendmap20/default.nix

index 31f2c8607c57e68dbf035491bb02ef35c6324a2c..d7e17e89ef5f699f35a73fcf67a9698773ead5a5 100644

--- a/pkgs/garmin/sendmap20/default.nix

+++ b/pkgs/garmin/sendmap20/default.nix

@@ -7,7 +7,7 @@

src = fetchwebarchive {

 url = "http://cgpsmapper.com/download/sendmap20.gz";

 timestamp = "20160622234550";

• sha256 = "08fm3q3qpirxd2l6rwffs2h997vk04bl4jvq8fbjlymrsmdlqx4s";

• hash = "sha256-mnRMW9W5eiqXQ3hLQhcBc5+UoNDO8WyoaD3Hiwce1SE=";

};

sourceRoot = ".";

diff --git a/pkgs/gpx/gpx-layer/default.nix b/pkgs/gpx/gpx-layer/default.nix

index a733d9629642df5a321c8316df15294d51fcd699..d6cd78eb57c0b30310750331c237a7bc47dd5e8e 100644

--- a/pkgs/gpx/gpx-layer/default.nix

+++ b/pkgs/gpx/gpx-layer/default.nix

@@ -8,7 +8,7 @@ src = fetchFromGitHub {

 owner = "e-n-f";

 repo = pname;

 rev = "746b4723cf1f69fb86d45cf2d4efeaae9e711d2d";

• sha256 = "0v5vfjqm5flmr30mpgabjwzy4avxl620051pcw03sdf3za8xkpr3";

• hash = "sha256-I9/ZkfrDNT0AZzcUAIShfSviP5dLvVvByJW6UrF0u2w=";

};

outputs = [ "out" ];

diff --git a/pkgs/gpx/gpx2yaml/default.nix b/pkgs/gpx/gpx2yaml/default.nix

index 716bf08cf1515598db8a6f6457d5e192ddc03051..9c35ff0a6194732e24304abf49c62139c54fc310 100644

--- a/pkgs/gpx/gpx2yaml/default.nix

+++ b/pkgs/gpx/gpx2yaml/default.nix

@@ -8,7 +8,7 @@ src = fetchFromSourcehut {

 owner = "~sikmir";

 repo = pname;

 rev = "d4a102ab079edf239a095bdd3564be3cac193971";

• sha256 = "sha256-82RYdC1tUYwYZELTHOC+Llz+KcdLgyipB9wEWekDRww=";

• hash = "sha256-82RYdC1tUYwYZELTHOC+Llz+KcdLgyipB9wEWekDRww=";

};

installFlags = [ "PREFIX=$(out)" ];

diff --git a/pkgs/gpx/gpxtrackposter/default.nix b/pkgs/gpx/gpxtrackposter/default.nix

index 0d8f4f4f6422cf99f4fc8fd7efa5d0964abf7d00..fe9d9a23efe1fcae0ac14dc64c1b2d3fdf121dad 100644

--- a/pkgs/gpx/gpxtrackposter/default.nix

+++ b/pkgs/gpx/gpxtrackposter/default.nix

@@ -42,7 +42,7 @@ pname = "pytest-mock";

   version = "3.3.1";

   src = fetchPypi {

     inherit pname version;

•    sha256 = "10mv262aq0y70g7q9689vkalaayx73l8kylzgpkr7a7455rx7mm4";
  

•    hash = "sha256-pNbTcynkqJPnfZ/6ieg43StF1dwJmYTPA8cDrIQRu4I=";
  

   };

 }))

];

diff --git a/pkgs/misc/aamath/default.nix b/pkgs/misc/aamath/default.nix

index d5edba998d8250788ccf63d825d3315d98000aef..1d95da2ab8f43f4f92558a56eb9545bf7add0814 100644

--- a/pkgs/misc/aamath/default.nix

+++ b/pkgs/misc/aamath/default.nix

@@ -7,12 +7,12 @@

src = fetchwebarchive {

 url = "http://fuse.superglue.se/aamath/aamath-${version}.tar.gz";

 timestamp = "20190303013301";

• sha256 = "0cdnfy7zdwyxvkhnk5gdcl75w9ag3n95i3sxrrawvqlmhrcg8hwq";

• hash = "sha256-mEP0WIaV4s1Vzl2PWJIdTyVeDmXtlWnh3N3z9o93tjE=";

};

patches = (fetchpatch {

 url = "https://raw.githubusercontent.com/macports/macports-ports/6c3088afddcf34ca2bcc5c209f85f264dcf0bc69/math/aamath/files/patch-expr.h.diff";

• sha256 = "0ls6xpjhldrivfbva2529i6maid44w33by38g80wzzvas2lxrli6";

• sha256 = "sha256-JtLcqdBq/88Bemj4NQYnpEVVTUyiCLWX2zE3CuXtRlM=";

});

patchFlags = [ "-p0" ];

diff --git a/pkgs/misc/ascii-dash/default.nix b/pkgs/misc/ascii-dash/default.nix

index 84287a0b41a462458e1340085386deb1309adb7f..0e4a9e9c5a2a9927730e5c99a76df898278781a8 100644

--- a/pkgs/misc/ascii-dash/default.nix

+++ b/pkgs/misc/ascii-dash/default.nix

@@ -6,7 +6,7 @@ version = "1.2.1";

src = fetchurl {

 url = "mirror://sourceforge/ascii-dash/ASCII-DASH-${version}.zip";

• sha256 = "0wkfj7h16ini1jcx7f38lv8sf15xim1cp1bs0k5islg7jlsfrplb";

• hash = "sha256-i97sNJXnUR3LBHqFy0KNvQSn0aZouNOZDNFGE+CRbnI=";

};

postPatch = ''

diff --git a/pkgs/misc/ish/default.nix b/pkgs/misc/ish/default.nix

index 4405c876c0484f5c796622cff87e8bee6692d1e9..58488d5e853ae47ac2fd67b53e699a00e078f8e3 100644

--- a/pkgs/misc/ish/default.nix

+++ b/pkgs/misc/ish/default.nix

@@ -6,7 +6,7 @@ version = "0.2";

src = fetchurl {

 url = "mirror://sourceforge/icmpshell/ish-v${version}.tar.gz";

• sha256 = "10jp7l0in91n5prc83ykma14r8wd6gyd1amzfi8jysw1jprc92qb";

• hash = "sha256-C4vE8pWBay9RdL+q0PwzjaNMgqrTD8TyLTYkGwE9V4I=";

};

postPatch = ''

diff --git a/pkgs/misc/ptunnel/default.nix b/pkgs/misc/ptunnel/default.nix

index 6a375d36fde19f7937666acd6e7e6f507ffcf0d3..f7f9d5d8e3a0d2e877915ee7e5a5c72094b528a6 100644

--- a/pkgs/misc/ptunnel/default.nix

+++ b/pkgs/misc/ptunnel/default.nix

@@ -6,7 +6,7 @@ version = "0.72";

src = fetchurl {

 url = "https://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-${version}.tar.gz";

• sha256 = "19076k3rjb6bfsdd8yzlf247vy84dziafm6hd5i8p4c8gnmgf65k";

• hash = "sha256-sxj3qn2IkYtiadBUp+JvBPl9iHD0e9Sadsssmcc0B6Q=";

};

buildInputs = [ libpcap ];

diff --git a/pkgs/misc/taskcoach/default.nix b/pkgs/misc/taskcoach/default.nix

index 64526a1569fd5e5ca6a46605bfd93cf434643e22..ddc89ad66473c7156a0857cbee2f5ea2fd92dea8 100644

--- a/pkgs/misc/taskcoach/default.nix

+++ b/pkgs/misc/taskcoach/default.nix

@@ -6,7 +6,7 @@ version = "1.4.6";

src = fetchurl {

 url = "mirror://sourceforge/taskcoach/taskcoach/Release-${version}/TaskCoach-${version}.tar.gz";

• sha256 = "162z95ii7b28jibc5j06b5n25v76b8bhg7ai1bhqspqncny7zx1f";

• hash = "sha256-LvR/vGUWX43hClGdBxda5uwibFkGyMJWlEisE2NJX5g=";

};

propagatedBuildInputs = with python2Packages; [

diff --git a/pkgs/misc/xfractint/default.nix b/pkgs/misc/xfractint/default.nix

index 9addc9f3b856d90eb2bae9a07f2602e9e39a81ce..8421d78839c928f4341fed819d2d1d7ce241ce33 100644

--- a/pkgs/misc/xfractint/default.nix

+++ b/pkgs/misc/xfractint/default.nix

@@ -2,11 +2,11 @@ { lib, stdenv, fetchurl, xlibsWrapper }:

stdenv.mkDerivation rec {

pname = "xfractint";

• version = "20.04p14";

• version = "20.04p16";

src = fetchurl {

 url = "https://fractint.org/ftp/current/linux/xfractint-${version}.tar.gz";

• sha256 = "0jdqr639z862qrswwk5srmv4fj5d7rl8kcscpn6mlkx4jvjmca0f";

• hash = "sha256-TlQBz+wOb/odqzjjwXfhRFdyCWy+VUIAxRLt7qI8R60=";

};

buildInputs = [ xlibsWrapper ];

diff --git a/pkgs/suckless/lel/default.nix b/pkgs/suckless/lel/default.nix

index 3bd553b651d2fdb66639beb3c2e84a7cba31d525..e0b17d43416c0f45c1de9c8bc35b843eb861bd4f 100644

--- a/pkgs/suckless/lel/default.nix

+++ b/pkgs/suckless/lel/default.nix

@@ -7,7 +7,7 @@

src = fetchgit {

 url = "git://git.codemadness.org/lel";

 rev = version;

• sha256 = "1c9gka3ka8j453z8ry50852hnvv5s0b5xjwg6807bj8d536n0jd7";

• sha256 = "sha256-p0lgzSgNyXUAMo/LXhbQZW8LRUGg+Iz+KEQiNYeaL7E=";

};

postPatch = ''

diff --git a/pkgs/suckless/quark/default.nix b/pkgs/suckless/quark/default.nix

index 19842d6748bc6d18a4e5786603ebafa2ed489c7c..23310a8088f4828872964fae3733d3b6e76071f4 100644

--- a/pkgs/suckless/quark/default.nix

+++ b/pkgs/suckless/quark/default.nix

@@ -7,7 +7,7 @@

src = fetchgit {

 url = "git://git.suckless.org/quark";

 rev = "68b4f733b2755762e43df90f73db5a6ec8d14104";

• sha256 = "141v7x7p54443z6s0xm34c60qsz6lrbrvxlymf7fwxy7jz6bknr6";

• sha256 = "sha256-Jtu5zJfHd+6Oq572nVem5msMDCOjdqDNH4SQck8/O5A=";

};

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

diff --git a/pkgs/suckless/saait/default.nix b/pkgs/suckless/saait/default.nix

index bb26fd4c66024c4da82d6ac5e19682043b2a8f79..c725af151f0ccefd3e90070fbf2a1f2aac69f04c 100644

--- a/pkgs/suckless/saait/default.nix

+++ b/pkgs/suckless/saait/default.nix

@@ -7,7 +7,7 @@

src = fetchgit {

 url = "git://git.codemadness.org/saait";

 rev = "134ff98c58a8cca78caf918cc6dddc3a24155490";

• sha256 = "0a7i0lsi40551krwxm0maqpnacm1imx8vdx4j3rm67h0ab3ba7bg";

• sha256 = "sha256-bx21xlIAHlPzkKS3jXqNoTJlL1YV1M7zDKUAEjUF8Sg=";

};

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

diff --git a/pkgs/suckless/scroll/default.nix b/pkgs/suckless/scroll/default.nix

index 04c0fa00ee9f2dabd8aeeaf350a630986e4fe95a..5b086fdff6a797b546fa18b7b4378d7e786cb9ea 100644

--- a/pkgs/suckless/scroll/default.nix

+++ b/pkgs/suckless/scroll/default.nix

@@ -7,7 +7,7 @@

src = fetchgit {

 url = "git://git.suckless.org/scroll";

 rev = version;

• sha256 = "13qbzpw68140zzdmfdqww23b4brviqdpqvr134gjh1kpmpa6rgbn";

• sha256 = "sha256-dr1s1K13BigfGSFvfBuOOy+yhuAcN1fb/4AEZPj9C48=";

};

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

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

index 8c936bd90092e08b88e694f42d4544c0ad05ff98..88bb57d9a24aa6f82055a6fbf650c503c81d702e 100644

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

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

@@ -8,7 +8,7 @@ src = fetchFromGitHub {

 owner = "e-n-f";

 repo = pname;

 rev = "76e620adabbedabd6866b23b30c145b53bae751e";

• sha256 = "1rdqbyfmgidiv4aqy1s6llls304dxbg5226c7k622smd2rnda2jk";

• hash = "sha256-UwrVbBataiHMPMwIUd7qjYChKaVGB48V2bHFV51fuOU=";

};

nativeBuildInputs = [ pkg-config ];