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

index a46de341f3610dc75afe38a453670c70cc095e82..a733d9629642df5a321c8316df15294d51fcd699 100644

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

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

@@ -5,7 +5,7 @@ pname = "gpx-layer";

version = "2013-09-19";

src = fetchFromGitHub {

• owner = "ericfischer";

• owner = "e-n-f";

 repo = pname;

 rev = "746b4723cf1f69fb86d45cf2d4efeaae9e711d2d";

 sha256 = "0v5vfjqm5flmr30mpgabjwzy4avxl620051pcw03sdf3za8xkpr3";

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

index 8f0bdd6e8612bae7f87215eca0f83e4f8015d700..edcc7fb2fce91ce256f43ec3cd2d220be779890b 100644

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

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

@@ -1,14 +1,15 @@

-{ lib, fetchFromGitHub, python3Packages, portolan }:

+{ lib, fetchFromGitHub, python3Packages, portolan, inkscape }:

python3Packages.buildPythonApplication rec {

pname = "roentgen";

• version = "2021-07-09";

• version = "2021-08-19";

• disabled = python3Packages.pythonOlder "3.9";

src = fetchFromGitHub {

 owner = "enzet";

 repo = "Roentgen";

• rev = "3d278a729b6037fe74a634f8329a5b5ff2de6fde";

• hash = "sha256-tb+twq/zOi92sm6tRnrP21TwnntoTnrl02kwAE9CS+w=";

• rev = "62d1a5e6dc4dceb4599209fe504e0c0240f13171";

• hash = "sha256-AsbRYeJxGxwI55YcrBRPpDVD+rYwNXjocRmkO4ruz/U=";

};

postPatch = ''

@@ -20,6 +21,9 @@ --replace "scheme/" "$out/share/roentgen/scheme/" \

   --replace "icons/" "$out/share/roentgen/icons/"

 substituteInPlace roentgen/tile.py \

   --replace "icons/" "$out/share/roentgen/icons/"

• substituteInPlace roentgen/workspace.py \

•  --replace "scheme" "$out/share/roentgen/scheme" \
  

•  --replace "icons/" "$out/share/roentgen/icons/"
  

'';

dontUseSetuptoolsBuild = true;

@@ -31,6 +35,7 @@ pythonEnv = python3Packages.python.withPackages (p: with p; [

     colour

     numpy

     portolan

•    pycairo
  

     pyyaml

     svgwrite

     urllib3

@@ -43,13 +48,14 @@ cp -r roentgen roentgen.py $site_packages

   cp -r icons scheme $out/share/roentgen

   makeWrapper ${pythonEnv.interpreter} $out/bin/roentgen \

•    --add-flags "$site_packages/roentgen.py"
  

•    --add-flags "$site_packages/roentgen.py" \
  

•    --set INKSCAPE_BIN ${inkscape}/bin/inkscape
  

 '';

meta = with lib; {

 description = "A simple renderer for OpenStreetMap with custom icons intended to display as many tags as possible";

 inherit (src.meta) homepage;

• license = licenses.free;

• license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

};

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

index eb492dfbfd51a220fbc881faac61dd84b82777a1..8c936bd90092e08b88e694f42d4544c0ad05ff98 100644

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

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

@@ -5,7 +5,7 @@ pname = "datamaps";

version = "2014-08-19";

src = fetchFromGitHub {

• owner = "ericfischer";

• owner = "e-n-f";

 repo = pname;

 rev = "76e620adabbedabd6866b23b30c145b53bae751e";

 sha256 = "1rdqbyfmgidiv4aqy1s6llls304dxbg5226c7k622smd2rnda2jk";

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

index 15297ddc2e752a3f7c25c099b7054925548ecc0c..9434de39685fbfb305c616505fdf9f7898a76614 100644

--- a/pkgs/tools/geo/tile-stitch/default.nix

+++ b/pkgs/tools/geo/tile-stitch/default.nix

@@ -5,7 +5,7 @@ pname = "tile-stitch";

version = "2019-07-11";

src = fetchFromGitHub {

• owner = "ericfischer";

• owner = "e-n-f";

 repo = pname;

 rev = "f14d113c54bb7dcffee05a7608a806b8557139e5";

 hash = "sha256-EEQ/8NbcB1O1rqlDWyYw7ERDQCm4j8YGv7z8WTVVCfc=";