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

index 376f8bf6307682a50cd7d0f0458dd6096bcf3d21..7d4834eb0dfa382134eb1ef2a2903e78e9c150ae 100644

--- a/nix/sources.json

+++ b/nix/sources.json

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

     "url": "https://github.com/DavyLandman/csvtools/archive/efd3ef1c94c26c673e958ecb045056bfc2c7b4f3.tar.gz",

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

 },

• "datamaps": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2014-08-19T19:28:16Z",
  

•    "description": "Indexes points and lines and generates map tiles to display them",
  

•    "homepage": "https://github.com/ericfischer/datamaps",
  

•    "owner": "ericfischer",
  

•    "repo": "datamaps",
  

•    "rev": "76e620adabbedabd6866b23b30c145b53bae751e",
  

•    "sha256": "1rdqbyfmgidiv4aqy1s6llls304dxbg5226c7k622smd2rnda2jk",
  

•    "type": "tarball",
  

•    "url": "https://github.com/ericfischer/datamaps/archive/76e620adabbedabd6866b23b30c145b53bae751e.tar.gz",
  

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

• },

 "dict2rest": {

     "branch": "master",

     "builtin": false,

@@ -343,20 +329,6 @@ "rev": "24236e45e3d8baa0662c329b735b79a17e84c1bd",

     "sha256": "0gi8xq7gsmi1a6gbp4d0a0h6ys2jpf0b1fys3ggph5gqf47h9pvc",

     "type": "tarball",

     "url": "https://github.com/remisalmon/gpx_interpolate/archive/24236e45e3d8baa0662c329b735b79a17e84c1bd.tar.gz",

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

• },

• "gpx-layer": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2013-09-19T22:24:41Z",
  

•    "description": "Tools to turn GPX files into a GPS map tracing layer",
  

•    "homepage": "https://github.com/ericfischer/gpx-layer",
  

•    "owner": "ericfischer",
  

•    "repo": "gpx-layer",
  

•    "rev": "746b4723cf1f69fb86d45cf2d4efeaae9e711d2d",
  

•    "sha256": "0v5vfjqm5flmr30mpgabjwzy4avxl620051pcw03sdf3za8xkpr3",
  

•    "type": "tarball",
  

•    "url": "https://github.com/ericfischer/gpx-layer/archive/746b4723cf1f69fb86d45cf2d4efeaae9e711d2d.tar.gz",
  

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

 },

 "gpxelevations": {

diff --git a/pkgs/applications/i18n-editor/default.nix b/pkgs/applications/i18n-editor/default.nix

index d2e58d28da56724e35223e735f3aeaec086b2446..90bf8e2a9c3718095cbc11a45d7b039a352d6a20 100644

--- a/pkgs/applications/i18n-editor/default.nix

+++ b/pkgs/applications/i18n-editor/default.nix

@@ -28,7 +28,7 @@ '';

meta = with lib; {

 description = "GUI for editing your i18n translation files";

• homepage = "https://github.com/jcbvm/i18n-editor";

• homepage = src.meta.homepage;

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

diff --git a/pkgs/applications/visualgps/default.nix b/pkgs/applications/visualgps/default.nix

index 2c3f7cc17a132a6b872f2ff81f6f9778a9c1e30b..cdde95b45e437f6faa80118e1033f1c0a25de344 100644

--- a/pkgs/applications/visualgps/default.nix

+++ b/pkgs/applications/visualgps/default.nix

@@ -6,7 +6,7 @@ , qmake

, qtserialport

}:

-mkDerivation {

+mkDerivation rec {

pname = "visualgps-unstable";

version = "2020-03-29";

@@ -34,7 +34,7 @@ '';

meta = with lib; {

 description = "A QT application (GUI) that makes use of the VisualGPS/NMEAParser project";

• homepage = "https://github.com/VisualGPS/VisualGPSqt";

• homepage = src.meta.homepage;

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

diff --git a/pkgs/applications/wireguard-statusbar/default.nix b/pkgs/applications/wireguard-statusbar/default.nix

index 9f5e1e2610dd7ab2744f9a78a6a5ee4d30190af9..8107f8eaac90ffeea7043fe6772bea7837ac7d65 100644

--- a/pkgs/applications/wireguard-statusbar/default.nix

+++ b/pkgs/applications/wireguard-statusbar/default.nix

@@ -25,7 +25,7 @@ '';

meta = with lib; {

 description = "macOS menubar icon for WireGuard/wg-quick";

• homepage = "https://github.com/aequitas/macos-menubar-wireguard";

• homepage = src.meta.homepage;

 license = licenses.gpl3;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "x86_64-darwin" ];

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

index 48ed7e3f807e32bb46a25d65253bb898657dc64b..7a624b6ad0cfa0ea07d840fc7e501166ca556553 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -122,9 +122,7 @@ };

 fx-bin = callPackage ./tools/text/fx/bin.nix { };

 go-staticmaps = callPackage ./tools/geo/go-staticmaps { };

 gpx-interpolate = callPackage ./tools/geo/gpx-interpolate { };

• gpx-layer = perlPackages.callPackage ./tools/geo/gpx-layer {

•  inherit sources;
  

• };

• gpx-layer = perlPackages.callPackage ./tools/geo/gpx-layer { };

 gpxtools = callPackage ./tools/geo/gpxtools { };

 gpxtrackposter = callPackage ./tools/geo/gpxtrackposter { };

 py-staticmaps = callPackage ./tools/geo/py-staticmaps { };

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

index fcb19554e73d3f27bf10c2b4d94043dc181ee32d..287dad57e2f2a5d43064d893c14b306cb2808d3b 100644

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

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

@@ -27,7 +27,7 @@ '';

meta = with lib; {

 description = "Translate text/gemini into HTML";

• homepage = "https://github.com/shtanton/gmi2html";

• homepage = src.meta.homepage;

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

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

index 23843f9e347fdafc0b64540e433e3c82d4f126ce..e0997af5ecaa9b6c4188bcfa6e73438527ba2508 100644

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

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

@@ -1,6 +1,6 @@

{ lib, stdenv, fetchFromGitHub, zig }:

-stdenv.mkDerivation {

+stdenv.mkDerivation rec {

pname = "gurl-unstable";

version = "2020-12-28";

@@ -20,7 +20,7 @@ installPhase = "install -Dm755 zig-cache/bin/gurl -t $out/bin";

meta = with lib; {

 description = "A curl-like cli application to interact with Gemini sites";

• homepage = "https://github.com/MasterQ32/gurl";

• homepage = src.meta.homepage;

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

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

index 3e1da598be5509cf23784aa08cfbd6c8e6c42f14..7f9a441e6896d73056310213657ceaf2874d8baf 100644

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

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

@@ -17,7 +17,7 @@ doCheck = false;

meta = with lib; {

 description = "Yet another HTTPie clone";

• homepage = "https://github.com/ducaale/ht";

• homepage = src.meta.homepage;

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

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

index 0154547d4a33e222c1590c3bcb08c53125c7568c..c2aba9ef872b76eae873eaa6a4a78e30ead6283a 100644

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

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

@@ -22,8 +22,8 @@ '';

meta = with lib; {

 description = "A tiling window manager for macOS based on binary space partitioning";

• homepage = "https://github.com/koekeishiya/yabai";

• changelog = "https://github.com/koekeishiya/yabai/blob/v${version}/CHANGELOG.md";

• homepage = src.meta.homepage;

• changelog = "${src.meta.homepage}/blob/v${version}/CHANGELOG.md";

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.darwin;

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

index 40078bf347fff9e6e66d4da63003eebee465ced2..108081b5b14b9be354e7e08222d079d6434239e1 100644

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

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

@@ -18,7 +18,7 @@ pythonImportsCheck = [ "imagequant" ];

meta = with lib; {

 description = "python bindings for libimagequant (pngquant core)";

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

• homepage = src.meta.homepage;

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

};

diff --git a/pkgs/osm/sdlmap/default.nix b/pkgs/osm/sdlmap/default.nix

index 615240586d1e52047858d114c5e44f56f2fc9b21..9e5868601b2a5b9f85e689e5894d381f52692f77 100644

--- a/pkgs/osm/sdlmap/default.nix

+++ b/pkgs/osm/sdlmap/default.nix

@@ -1,6 +1,6 @@

{ lib, stdenv, fetchFromGitHub, curl, SDL2, SDL2_image }:

-stdenv.mkDerivation {

+stdenv.mkDerivation rec {

pname = "sdlmap";

version = "2014-02-09";

@@ -19,7 +19,7 @@ installPhase = "install -Dm755 sdlmap -t $out/bin";

meta = with lib; {

 description = "A SDL + libcurl OpenStreetMap viewer";

• homepage = "https://github.com/jhawthorn/sdlmap";

• homepage = src.meta.homepage;

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

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

index bde0c8d2a539b1dccb228a814ef62a8487daed6b..2ce4fedea478111a0d13f6fd82c7c49afd59e484 100644

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

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

@@ -1,6 +1,6 @@

{ lib, stdenv, fetchFromGitHub }:

-stdenv.mkDerivation {

+stdenv.mkDerivation rec {

pname = "lacc";

version = "2021-01-31";

@@ -15,7 +15,7 @@ installFlags = [ "PREFIX=$(out)" ];

meta = with lib; {

 description = "A simple, self-hosting C compiler";

• homepage = "https://github.com/larmel/lacc";

• homepage = src.meta.homepage;

 license = licenses.mit;

 platforms = platforms.unix;

 maintainers = [ maintainers.sikmir ];

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

index 0b3921db5252122667c913e93cc98ed8cf65045d..f43bef9911b95787ded848a9c3b8e3597112a1eb 100644

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

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

@@ -1,6 +1,6 @@

{ lib, stdenv, fetchFromGitHub }:

-stdenv.mkDerivation {

+stdenv.mkDerivation rec {

pname = "sfm";

version = "2021-02-18";

@@ -15,7 +15,7 @@ installFlags = [ "PREFIX=$(out)" ];

meta = with lib; {

 description = "Simple file manager";

• homepage = "https://github.com/afify/sfm";

• homepage = src.meta.homepage;

 license = licenses.isc;

 platforms = platforms.linux;

 maintainers = [ maintainers.sikmir ];

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

index 8f51645b6e60e65730a6fccb00e11744b6fa5abe..5b275d484562dfb83b505da678b2299e9471c531 100644

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

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

@@ -17,7 +17,7 @@ makeFlags = [ "PREFIX=$(out)" ];

meta = with lib; {

 description = "A dmenu rip-off with contextual completion";

• homepage = "https://github.com/phillbush/xprompt";

• homepage = src.meta.homepage;

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.linux;

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

index 7f3752f5e1a27bf7040a0d29393a729a773eebf2..abcaad3117f90d675600b4b424955daf4960309b 100644

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

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

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

-{ lib, stdenv, libpng, pkg-config, sources }:

+{ lib, stdenv, fetchFromGitHub, libpng, pkg-config }:

-stdenv.mkDerivation {

+stdenv.mkDerivation rec {

pname = "datamaps";

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

• version = "2014-08-19";

• src = sources.datamaps;

• src = fetchFromGitHub {

• owner = "ericfischer";

• repo = pname;

• rev = "76e620adabbedabd6866b23b30c145b53bae751e";

• sha256 = "1rdqbyfmgidiv4aqy1s6llls304dxbg5226c7k622smd2rnda2jk";

• };

nativeBuildInputs = [ pkg-config ];

buildInputs = [ libpng ];

@@ -19,7 +24,8 @@ done

'';

meta = with lib; {

• inherit (sources.datamaps) description homepage;

• description = "Indexes points and lines and generates map tiles to display them";

• homepage = src.meta.homepage;

 license = licenses.bsd2;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

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

index 8e914ee9373b30c79f6533b6c651fe0d86088e9a..9c8ceb93a486999947eef28c4927d080f64cdc64 100644

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

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

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

-{ lib, stdenv, buildPerlPackage, shortenPerlShebang, XMLParser, sources }:

+{ lib, stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, XMLParser }:

-buildPerlPackage {

+buildPerlPackage rec {

pname = "gpx-layer";

• version = lib.substring 0 10 sources.gpx-layer.date;

• version = "2013-09-19";

• src = sources.gpx-layer;

• src = fetchFromGitHub {

• owner = "ericfischer";

• repo = pname;

• rev = "746b4723cf1f69fb86d45cf2d4efeaae9e711d2d";

• sha256 = "0v5vfjqm5flmr30mpgabjwzy4avxl620051pcw03sdf3za8xkpr3";

• };

outputs = [ "out" ];

@@ -23,7 +28,8 @@ shortenPerlShebang $out/bin/datamaps-parse-gpx

'';

meta = with lib; {

• inherit (sources.gpx-layer) description homepage;

• description = "Tools to turn GPX files into a GPS map tracing layer";

• homepage = src.meta.homepage;

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

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

index c75b193abc2d7512864bf836135739227b5fb8cc..1da962db630a6454bc607595e4e871a7f5f54fba 100644

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

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

@@ -1,6 +1,6 @@

{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30-gtk3 }:

-stdenv.mkDerivation {

+stdenv.mkDerivation rec {

pname = "render_geojson";

version = "2018-07-11";

@@ -17,7 +17,7 @@ buildInputs = [ wxGTK30-gtk3 ];

meta = with lib; {

 description = "C++ geoJSON and topoJSON parser and rendering using the WxWidgets GUI library";

• homepage = "https://github.com/pedro-vicente/render_geojson";

• homepage = src.meta.homepage;

 license = licenses.asl20;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;