diff --git a/default.nix b/default.nix

index 2f7382e929c5dd55a4a016730e4b35773e49118c..852ab21962dcdd1eb1862806c73b336c28ea0ea6 100644

--- a/default.nix

+++ b/default.nix

@@ -12,14 +12,12 @@ , system ? builtins.currentSystem

, ...

}@args:

-with (import <nixpkgs/lib>).attrsets;

{

The lib, modules, and overlay names are special

lib = import ./lib { inherit pkgs; }; # functions

modules = import ./modules; # NixOS modules

overlays = import ./overlays; # nixpkgs overlays

-} // (optionalAttrs (builtins.tryEval pkgs).success (import ./pkgs {

+} // (pkgs.lib.optionalAttrs (builtins.tryEval pkgs).success (import ./pkgs {

inherit sources pkgs;

}

)

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

index 8cf16d4096a4e521038e870629918767d0e775b8..053445651ecd08ab224d0ea3fff75b9fcaf13a48 100644

--- a/nix/sources.json

+++ b/nix/sources.json

@@ -527,48 +527,6 @@ "type": "tarball",

     "url": "https://github.com/Absolute-Tinkerer/map-stylizer/archive/6279f40408aff823a4eb1071334bd2acd10cb921.tar.gz",

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

 },

• "map-tiler": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2019-10-24T19:20:49Z",
  

•    "description": "Raster maps to map tiles",
  

•    "homepage": "https://github.com/wladich/map-tiler",
  

•    "owner": "wladich",
  

•    "repo": "map-tiler",
  

•    "rev": "1dc5be65e58638f5899cd6cdc2010e00ce5e62d4",
  

•    "sha256": "0y0ww7qsbgbc7xyh2dfp9xgvjqjah10ms44504023gqvbi9y206v",
  

•    "type": "tarball",
  

•    "url": "https://github.com/wladich/map-tiler/archive/1dc5be65e58638f5899cd6cdc2010e00ce5e62d4.tar.gz",
  

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

• },

• "maprec": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2019-10-24T18:36:24Z",
  

•    "description": null,
  

•    "homepage": "https://github.com/wladich/maprec",
  

•    "owner": "wladich",
  

•    "repo": "maprec",
  

•    "rev": "20f5177cae7454455b21cd5f7178f5639c02d385",
  

•    "sha256": "1zy49sbpxjg5dvkvxxxy2fh1vq26q0cnjdszb5zpwnxqmk7c4lpj",
  

•    "type": "tarball",
  

•    "url": "https://github.com/wladich/maprec/archive/20f5177cae7454455b21cd5f7178f5639c02d385.tar.gz",
  

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

• },

• "mapsoft": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2021-01-31T11:05:32Z",
  

•    "description": "Mapping software for linux",
  

•    "homepage": "https://github.com/ushakov/mapsoft",
  

•    "owner": "ushakov",
  

•    "repo": "mapsoft",
  

•    "rev": "45fdd650f1fb1d30ac0682550c541bc7a3d368fc",
  

•    "sha256": "1nm0nj9dya71s93f6gjbvxjmlwbswsdavr5x1ldqnybw8ygmxzxk",
  

•    "type": "tarball",
  

•    "url": "https://github.com/ushakov/mapsoft/archive/45fdd650f1fb1d30ac0682550c541bc7a3d368fc.tar.gz",
  

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

• },

 "maptourist": {

     "builtin": false,

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

@@ -748,20 +706,6 @@ "type": "tarball",

     "url": "https://github.com/osmcode/osmcoastline/archive/56371668ebb6261009f35a7411a8fbcc83aabfe0.tar.gz",

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

 },

• "ozi-map": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2019-10-24T18:44:05Z",
  

•    "description": "python module for reading OziExplorer .map files",
  

•    "homepage": "https://github.com/wladich/ozi_map",
  

•    "owner": "wladich",
  

•    "repo": "ozi_map",
  

•    "rev": "4d6bd3f234960ba90d82e6d58da9c1bf4677eb16",
  

•    "sha256": "1ap6r38n5dvvi6n8s0fps9afs7sa5rgdwsjk4fdzj44rs65hmc5i",
  

•    "type": "tarball",
  

•    "url": "https://github.com/wladich/ozi_map/archive/4d6bd3f234960ba90d82e6d58da9c1bf4677eb16.tar.gz",
  

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

• },

 "polyvectorization": {

     "branch": "master",

     "builtin": false,

@@ -844,20 +788,6 @@ "rev": "ecc9f5a36c1c8d13872df5bdcbd01621e5f3ab48",

     "sha256": "1b5kyxz8n1ysrv0kdf49ma60k5448sg5k7c9zyzrl46hw5lbar4k",

     "type": "tarball",

     "url": "https://github.com/mapbox/supermercado/archive/ecc9f5a36c1c8d13872df5bdcbd01621e5f3ab48.tar.gz",

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

• },

• "thinplatespline": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2013-01-23T09:17:04Z",
  

•    "description": "Python library for thin plate spline calculations",
  

•    "homepage": "https://github.com/wladich/thinplatespline",
  

•    "owner": "wladich",
  

•    "repo": "thinplatespline",
  

•    "rev": "55fecd22c7160577b925e03169e74bd488a41cf3",
  

•    "sha256": "0xj00z0glaz4hgijdd47ck3xj4p1hf0n46i48v7ajr6lxlxn4pmp",
  

•    "type": "tarball",
  

•    "url": "https://github.com/wladich/thinplatespline/archive/55fecd22c7160577b925e03169e74bd488a41cf3.tar.gz",
  

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

 },

 "tile-stitch": {

diff --git a/pkgs/applications/gpxsee/bin.nix b/pkgs/applications/gpxsee/bin.nix

index b80d6364273b367d7d705ad2ca0c55314cafaae0..6e808f3600ff3d1088e97a6391dfc179e2c12d52 100644

--- a/pkgs/applications/gpxsee/bin.nix

+++ b/pkgs/applications/gpxsee/bin.nix

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

stdenv.mkDerivation rec {

pname = "gpxsee-bin";

• version = "8.9";

• version = "9.0";

src = fetchurl {

 url = "mirror://sourceforge/gpxsee/GPXSee-${version}.dmg";

• sha256 = "0sm65shma9ll69y9g5zwn7pbw2qjj7ha1l3wfb2rqp3s6kf9p90n";

• sha256 = "sha256-9QZdQPPg/Cl7fjM6ucGnno6HNQnkdEtAFnVTH66KSjI=";

};

preferLocalBuild = true;

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

index f825fd9582b8b6864e08815f690da263d9f8280b..44bc074b56f24ca2f3a8da74e5ab3e24d28dfdbd 100644

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

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

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

{ lib

, stdenv

+, fetchFromGitHub

, perlPackages

, python2Packages

, gimp

-, sources

, bc

, fig2dev

, imagemagick

@@ -30,11 +30,16 @@ , zlib

, getopt

}:

-stdenv.mkDerivation {

• pname = "mapsoft-unstable";

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

+stdenv.mkDerivation rec {

• pname = "mapsoft";

• version = "2021-01-31";

• src = sources.mapsoft;

• src = fetchFromGitHub {

• owner = "ushakov";

• repo = pname;

• rev = "45fdd650f1fb1d30ac0682550c541bc7a3d368fc";

• sha256 = "sha256-s/9en0d8eYsbDb3krZrmenFaZd9LPuNG0uEo35K0oNo=";

• };

patches = [ ./0001-fix-build.patch ];

@@ -94,7 +99,8 @@ --replace "getopt " "${getopt}/bin/getopt "

'';

meta = with lib; {

• inherit (sources.mapsoft) description homepage;

• description = "Mapping software for linux";

• homepage = "https://github.com/ushakov/mapsoft";

 license = licenses.gpl3;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.linux;

diff --git a/pkgs/nakarte/map-tiler/default.nix b/pkgs/nakarte/map-tiler/default.nix

index 382592ee4d5ad56f796f89fd52484fd072986510..870329bab286e16712163b778e1a710c88bf2f36 100644

--- a/pkgs/nakarte/map-tiler/default.nix

+++ b/pkgs/nakarte/map-tiler/default.nix

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

-{ lib, python3Packages, sources

+{ lib, python3Packages, fetchFromGitHub

, gobject-introspection, pango

, maprec, ozi_map, pyimagequant }:

-python3Packages.buildPythonApplication {

+python3Packages.buildPythonApplication rec {

pname = "map-tiler";

• version = lib.substring 0 10 sources.map-tiler.date;

• version = "2019-10-24";

• src = sources.map-tiler;

• src = fetchFromGitHub {

• owner = "wladich";

• repo = pname;

• rev = "1dc5be65e58638f5899cd6cdc2010e00ce5e62d4";

• sha256 = "sha256-2wDhU1wbvyEAAYUQXUGASmK5X0/XNQF9P2y9pfHhHHg=";

• };

patches = [

 ./gobject.patch

@@ -44,7 +49,8 @@ --set GI_TYPELIB_PATH $GI_TYPELIB_PATH

'';

meta = with lib; {

• inherit (sources.map-tiler) description homepage;

• description = "Raster maps to map tiles";

• homepage = "https://github.com/wladich/map-tiler";

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

diff --git a/pkgs/nakarte/maprec/default.nix b/pkgs/nakarte/maprec/default.nix

index 95385e01cadd02bd9d07f15c3e88234165b50e5c..28ce05f209c77cee672b820f73571b329079cbb6 100644

--- a/pkgs/nakarte/maprec/default.nix

+++ b/pkgs/nakarte/maprec/default.nix

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

-{ lib, python3Packages, thinplatespline, sources }:

+{ lib, python3Packages, fetchFromGitHub, thinplatespline }:

-python3Packages.buildPythonPackage {

+python3Packages.buildPythonPackage rec {

pname = "maprec";

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

• version = "2019-10-24";

• src = sources.maprec;

• src = fetchFromGitHub {

• owner = "wladich";

• repo = pname;

• rev = "20f5177cae7454455b21cd5f7178f5639c02d385";

• sha256 = "sha256-8lLCzqy4W35/WV83aRnARuAdoBO+977nbuXJfpdOxP8=";

• };

patches = [ ./python3.patch ];

@@ -17,7 +22,7 @@

pythonImportsCheck = [ "maprec" ];

meta = with lib; {

• inherit (sources.maprec) description homepage;

• homepage = "https://github.com/wladich/maprec";

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

};

diff --git a/pkgs/nakarte/ozi_map/default.nix b/pkgs/nakarte/ozi_map/default.nix

index b525cbf291728d715fc852be9f7af1b850d8cff6..e0077a66c072236b9175b246a48ccdd820731a89 100644

--- a/pkgs/nakarte/ozi_map/default.nix

+++ b/pkgs/nakarte/ozi_map/default.nix

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

-{ lib, python3Packages, maprec, sources }:

+{ lib, python3Packages, fetchFromGitHub, maprec }:

-python3Packages.buildPythonPackage {

+python3Packages.buildPythonPackage rec {

pname = "ozi_map";

• version = lib.substring 0 10 sources.ozi-map.date;

• version = "2019-10-24";

• src = sources.ozi-map;

• src = fetchFromGitHub {

• owner = "wladich";

• repo = pname;

• rev = "4d6bd3f234960ba90d82e6d58da9c1bf4677eb16";

• sha256 = "sha256-sbAKi9GZEPmbI1Nq3l4uSh/tVNLXAY2siXu3YtHI5qo=";

• };

postPatch = "2to3 -n -w ozi_map/*.py";

@@ -15,7 +20,8 @@

pythonImportsCheck = [ "ozi_map" ];

meta = with lib; {

• inherit (sources.ozi-map) description homepage;

• description = "python module for reading OziExplorer .map files";

• homepage = "https://github.com/wladich/ozi_map";

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

};

diff --git a/pkgs/nakarte/thinplatespline/default.nix b/pkgs/nakarte/thinplatespline/default.nix

index ec901f05c6dc7b4c1d0f50ad2f5bf5aa32e47834..4732ac256eddafc1f31d645c745121ebf71eb156 100644

--- a/pkgs/nakarte/thinplatespline/default.nix

+++ b/pkgs/nakarte/thinplatespline/default.nix

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

-{ lib, python3Packages, sources }:

+{ lib, python3Packages, fetchFromGitHub }:

-python3Packages.buildPythonPackage {

+python3Packages.buildPythonPackage rec {

pname = "thinplatespline";

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

• version = "2013-01-23";

• src = sources.thinplatespline;

• src = fetchFromGitHub {

• owner = "wladich";

• repo = pname;

• rev = "55fecd22c7160577b925e03169e74bd488a41cf3";

• sha256 = "sha256-t15iO+3UZKnORiQaYoGD4RLZx2SHtCbjg+Qr+sAHQHY=";

• };

postPatch = ''

 2to3 -n -w tps/*.py

@@ -16,7 +21,8 @@

pythonImportsCheck = [ "tps" ];

meta = with lib; {

• inherit (sources.thinplatespline) description homepage;

• description = "Python library for thin plate spline calculations";

• homepage = "https://github.com/wladich/thinplatespline";

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

};

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

index 2ce4fedea478111a0d13f6fd82c7c49afd59e484..695b53d53813aff1944a67ed8acb2c27c90ecc7b 100644

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

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

@@ -2,13 +2,13 @@ { lib, stdenv, fetchFromGitHub }:

stdenv.mkDerivation rec {

pname = "lacc";

• version = "2021-01-31";

• version = "2021-04-21";

src = fetchFromGitHub {

 owner = "larmel";

 repo = "lacc";

• rev = "70436fe2e7ba21ce3a8c43decc99f2b4e8cf1c9f";

• sha256 = "0swh28xlmirbz1m3iwgqmcnhi8bvvnjkqcg9bnfzqn5x7lhjpr1v";

• rev = "f6ab3973d44ce79e469c4c3dc770a8b2e7a5543f";

• sha256 = "sha256-L9EW7Zl5PxOIGJwSwhq1gvAkN8fbpHg7gSbtTzuBHSE=";

};

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