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

index 1a7e9dd2da31c52f74b6b1c412ef11ab4ed2bff0..f9c348203a36bb6a04fedab67f91f4c9fb845dd9 100644

--- a/nix/sources.json

+++ b/nix/sources.json

@@ -170,15 +170,15 @@ },

 "embox": {

     "branch": "master",

     "builtin": false,

•    "date": "2020-12-01T16:46:09Z",
  

•    "date": "2020-12-02T15:17:42Z",
  

     "description": "Modular and configurable OS for embedded applications",

     "homepage": "http://embox.github.io",

     "owner": "embox",

     "repo": "embox",

•    "rev": "60bd189b8f7eec66a7204f30fc6dfb7b6e08fb28",
  

•    "sha256": "1xnaa1lin8zxikv55z5c4ffjrn4k95znaig6rbkaivw92qk02jqd",
  

•    "rev": "1b09f5d9d56e1d475c2153372e7a3fd21892f17b",
  

•    "sha256": "0a4a6dgw04w4a4zaz5194ip6nkjnyf3js63qa8hr7jj9i6315kw5",
  

     "type": "tarball",

•    "url": "https://github.com/embox/embox/archive/60bd189b8f7eec66a7204f30fc6dfb7b6e08fb28.tar.gz",
  

•    "url": "https://github.com/embox/embox/archive/1b09f5d9d56e1d475c2153372e7a3fd21892f17b.tar.gz",
  

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

 },

 "foma": {

@@ -377,15 +377,15 @@ "gpxsee": {

     "branch": "master",

     "builtin": false,

     "changelog": "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes",

•    "date": "2020-12-01T19:17:19Z",
  

•    "date": "2020-12-02T23:11:49Z",
  

     "description": "GPS log file viewer and analyzer",

     "homepage": "https://www.gpxsee.org",

     "owner": "tumic0",

     "repo": "GPXSee",

•    "rev": "af6082425eed6c8edec6cde8e930372acbb6f12b",
  

•    "sha256": "091syl5cr7ahgs77vq3x7g8xqmvjx715xrbvqbj45jmsnjfyksw2",
  

•    "rev": "41c8a4d935cad0d41535397cb1d2ebcf1b61c4d7",
  

•    "sha256": "0lmd4g7lvgab41f0kd76ra2nihcsyiv7lqq29pazh6ws663cgz6w",
  

     "type": "tarball",

•    "url": "https://github.com/tumic0/GPXSee/archive/af6082425eed6c8edec6cde8e930372acbb6f12b.tar.gz",
  

•    "url": "https://github.com/tumic0/GPXSee/archive/41c8a4d935cad0d41535397cb1d2ebcf1b61c4d7.tar.gz",
  

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

 },

 "gpxsee-maps": {

@@ -673,11 +673,11 @@ "builtin": false,

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

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

     "region": "szfo",

•    "sha256": "0sk6jb2nif8py01xq2spjycy2pnph6yvp33mjc1a277flzi8cs6r",
  

•    "sha256": "05wjqnxsylj039chlqp76pfniw1z79sbnls6qq16pvz35qms5q63",
  

     "type": "file",

•    "url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2020-11-18.zip",
  

•    "url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2020-12-01.zip",
  

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

•    "version": "2020-11-18"
  

•    "version": "2020-12-01"
  

 },

 "mercantile": {

     "branch": "master",

@@ -762,15 +762,15 @@ },

 "nakarte": {

     "branch": "master",

     "builtin": false,

•    "date": "2020-11-02T20:15:16Z",
  

•    "date": "2020-12-03T18:01:18Z",
  

     "description": "Source code of site http://nakarte.me",

     "homepage": "https://nakarte.me",

     "owner": "wladich",

     "repo": "nakarte",

•    "rev": "0a3410bee4c3e0a7f7a6d13cdccf92465aebf344",
  

•    "sha256": "0h6gq8ky6mcn3xxv5q2fwc2mj5v0wgagn6xh5lll8xl9x064l027",
  

•    "rev": "55016c9e71ff35f762db59e267a377c270face3d",
  

•    "sha256": "1008c4hb80jbx016pvc4cz2wygh3zswvdpan8gy833yl9diqf9qw",
  

     "type": "tarball",

•    "url": "https://github.com/wladich/nakarte/archive/0a3410bee4c3e0a7f7a6d13cdccf92465aebf344.tar.gz",
  

•    "url": "https://github.com/wladich/nakarte/archive/55016c9e71ff35f762db59e267a377c270face3d.tar.gz",
  

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

 },

 "nnn": {

diff --git a/pkgs/applications/gis/mapsoft/2.nix b/pkgs/applications/gis/mapsoft/2.nix

index 70d6a7e169dc5617d5e68ff9236822899e20ba71..60819b060b61e2a18f428e013f57e1b207343c9f 100644

--- a/pkgs/applications/gis/mapsoft/2.nix

+++ b/pkgs/applications/gis/mapsoft/2.nix

@@ -23,31 +23,27 @@ }:

stdenv.mkDerivation rec {

pname = "mapsoft2";

• version = "1.4";

• version = "1.5";

src = fetchFromGitHub {

 owner = "slazav";

 repo = pname;

 rev = "${version}-alt1";

• sha256 = "092n7hivdn4qk3bdinxszxgs2r79smxnkwgjw867yrh1h89n0bnd";

• sha256 = "18h2w8s4s7xg630bq5ixv6qxsr8i32nfnqz74cn108drrqf5l5ks";

 fetchSubmodules = true;

};

• patches = [

• (

•  substituteAll {
  

•    src = ./0002-fix-build.patch;
  

•    db = db.dev;
  

•    giflib = giflib;
  

•  }
  

• )

• ];

• patches = (substituteAll {

• src = ./0002-fix-build.patch;

• db = db.dev;

• giflib = giflib;

• });

postPatch = ''

 substituteInPlace modules/get_deps \

   --replace "/usr/bin/perl" "${perlPackages.perl}/bin/perl"

 substituteInPlace modules/mapview/mapview.cpp \

•  --replace "/usr/share" "${placeholder "out"}/share"
  

•  --replace "/usr/share" "$(out)/share"
  

 patchShebangs .

'';

@@ -57,6 +53,7 @@ pkgconfig

 unzip

 wrapGAppsHook

];

buildInputs = [

 db

 gsettings-desktop-schemas

@@ -73,11 +70,9 @@ proj

 shapelib

];

• dontConfigure = true;

preBuild = "export SKIP_IMG_DIFFS=1";

• makeFlags = [ "prefix=${placeholder "out"}" ];

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

meta = with stdenv.lib; {

 description = "A collection of tools and libraries for working with maps and geo-data";

diff --git a/pkgs/applications/gis/mapsoft/default.nix b/pkgs/applications/gis/mapsoft/default.nix

index 3bab037f1bf6c8b777c0f794a31b8ca2d248c6aa..bdec7dbdad29699e5622753cefb2abb5ad09a115 100644

--- a/pkgs/applications/gis/mapsoft/default.nix

+++ b/pkgs/applications/gis/mapsoft/default.nix

@@ -81,7 +81,7 @@ export CPPFLAGS="-I${boost.dev}/include -I${giflib}/include"

 export LINKFLAGS="-L${giflib}/lib -lgif"

'';

• sconsFlags = [ "minimal=1" "prefix=${placeholder "out"}" ];

• sconsFlags = [ "minimal=1" "prefix=$(out)" ];

postInstall = ''

 wrapPythonProgramsIn $out/lib/gimp/${stdenv.lib.versions.major gimp.version}.0/plug-ins/