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

index b1481a5a99f3232ffc4001c474d41484a1c45b28..3db191946bcfbb8ca163c970e3c4080707f23b69 100644

--- a/nix/sources.json

+++ b/nix/sources.json

@@ -26,30 +26,5 @@ "sha256": "0jsrjzmg23rp3ay5149llqrq6pnr66wf7siphwn7gisz5g60pgpf",

     "type": "tarball",

     "url": "https://github.com/slazav/map_podm/archive/c95a381155986f9f621e5d26b21bda041ad8c24f.tar.gz",

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

• },

• "maptourist": {

•    "builtin": false,
  

•    "description": "Ежедневная сборка карт из данных OpenStreetMap для навигационных приборов и приложений Garmin",
  

•    "homepage": "https://maptourist.org",
  

•    "region": "szfo",
  

•    "sha256": "1447yna1gqmpb5zcg61f3vyw9hfv5v7dbwjh6c05lhpjf5aw6d45",
  

•    "type": "file",
  

•    "url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2021-03-06.zip",
  

•    "url_template": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-<region>-RU_<version>.zip",
  

•    "version": "2021-03-06"
  

• },

• "odict": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2021-01-08T22:22:26Z",
  

•    "description": "A blazingly-fast replacement for Apple Dictionaries, Babylon, StarDict, etc",
  

•    "homepage": "https://odict.org",
  

•    "owner": "odict",
  

•    "repo": "odict",
  

•    "rev": "639dbab4feac15c4f69049bfb9b7bcfecaf68b47",
  

•    "sha256": "1ffkj7ry1rcljkilfnwffpqz3mb9ci9y9z9z6z6yhwakq4g5dj3j",
  

•    "type": "tarball",
  

•    "url": "https://github.com/odict/odict/archive/639dbab4feac15c4f69049bfb9b7bcfecaf68b47.tar.gz",
  

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

 }

}

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

index 9502ad0fdf88b933787420246f48706fc98cae89..44dd7b1bbaeb812446285bbdc9e10996fcc31759 100644

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

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

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

-{ lib, stdenvNoCC, sources, unzip }:

+{ lib, stdenvNoCC, fetchurl, unzip }:

-stdenvNoCC.mkDerivation {

+stdenvNoCC.mkDerivation rec {

pname = "maptourist";

• version = sources.maptourist.version;

• version = "2021-05-21";

• src = sources.maptourist;

• src = fetchurl {

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

• hash = "sha256-a9iDeUWz3dwcXBk6HrIyS2+mAjkrVG6i89wKHfW+yaQ=";

• };

sourceRoot = ".";

@@ -15,7 +18,8 @@

preferLocalBuild = true;

meta = with lib; {

• inherit (sources.maptourist) description homepage;

• description = "Ежедневная сборка карт из данных OpenStreetMap для навигационных приборов и приложений Garmin";

• homepage = "https://maptourist.org";

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.all;

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

index df745f64ef2c8499555cda1c485650ca2280f0b0..33798e033d8579c3b759cbe3d9a4c3eb17567695 100644

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

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

@@ -1,8 +1,9 @@

-{ lib, fetchFromGitHub, python3Packages, gdal }:

+{ lib, fetchFromGitHub, python3Packages, pythonOlder, gdal }:

python3Packages.buildPythonPackage rec {

pname = "rasterio";

version = "1.2.3";

• disabled = pythonOlder "3.6";

src = fetchFromGitHub {

 owner = "mapbox";

@@ -15,12 +16,12 @@ nativeBuildInputs = [ gdal python3Packages.cython ];

propagatedBuildInputs = with python3Packages; [ affine attrs boto3 click-plugins cligj matplotlib numpy snuggs setuptools ];

• checkInputs = with python3Packages; [ pytestCheckHook hypothesis ];

• checkInputs = with python3Packages; [ pytestCheckHook hypothesis shapely ];

installCheckPhase = "$out/bin/rio --version";

meta = with lib; {

• description = "Rasterio reads and writes geospatial raster datasets";

• description = "Python package to read and write geospatial raster data";

 homepage = "https://rasterio.readthedocs.io/";

 license = licenses.bsd3;

 maintainers = [ maintainers.sikmir ];

diff --git a/pkgs/dict/odict/default.nix b/pkgs/dict/odict/default.nix

index 458e88eefabee9cb1a08627f0c978ba73fb307b0..d83417c7095a1525c70021f17aac9f47df5df0eb 100644

--- a/pkgs/dict/odict/default.nix

+++ b/pkgs/dict/odict/default.nix

@@ -1,15 +1,21 @@

-{ lib, buildGoModule, sources }:

+{ lib, fetchFromGitHub, buildGoModule }:

-buildGoModule {

• pname = "odict-unstable";

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

+buildGoModule rec {

• pname = "odict";

• version = "2021-01-08";

• src = sources.odict;

• src = fetchFromGitHub {

• owner = "TheOpenDictionary";

• repo = pname;

• rev = "639dbab4feac15c4f69049bfb9b7bcfecaf68b47";

• hash = "sha256-cshWHsFTcejNNz/95FNkadXx8XWOW0fjlJTl4POR07k=";

• };

• vendorSha256 = "1n07b9dclsyc0m50lifigm90k3l6s1kbx6fln4gzp4crn0axh0gs";

• vendorSha256 = "sha256-+gHYFbCZkfsfsdSZvmbQho4JUn3RRQpKBcxrylpaB9g=";

meta = with lib; {

• inherit (sources.odict) description homepage;

• description = "A blazingly-fast portable dictionary file format";

• homepage = "https://odict.org/";

 license = licenses.gpl3;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

diff --git a/pkgs/dict/opendict/default.nix b/pkgs/dict/opendict/default.nix

index 3db84d35796c394fa355c9b4aeda60e929944d65..48cab2b343b7a169e10736bf835e53c63f043e5a 100644

--- a/pkgs/dict/opendict/default.nix

+++ b/pkgs/dict/opendict/default.nix

@@ -1,4 +1,4 @@

-{ lib, fetchFromGitHub, python2Packages, gettext, sources }:

+{ lib, fetchFromGitHub, python2Packages, gettext }:

python2Packages.buildPythonApplication rec {

pname = "opendict";

diff --git a/pkgs/osm/taginfo-tools/default.nix b/pkgs/osm/taginfo-tools/default.nix

index 3816cc8b094897de626b9ee528ad7ca125e8bf0e..56a93c8df3572afb839a653ba17318cb7a3f5111 100644

--- a/pkgs/osm/taginfo-tools/default.nix

+++ b/pkgs/osm/taginfo-tools/default.nix

@@ -1,4 +1,4 @@

-{ lib, stdenv, fetchFromGitHub, cmake, bzip2, expat, gd, icu, libosmium, protozero, sqlite, zlib, sources }:

+{ lib, stdenv, fetchFromGitHub, cmake, bzip2, expat, gd, icu, libosmium, protozero, sqlite, zlib }:

stdenv.mkDerivation rec {

pname = "taginfo-tools";