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

index be8825f4192e35114e7fdd297ffa8b29e4ef00e2..eef9c45259f48333525879b554adb404ca15edde 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -316,11 +316,11 @@ imposm = callPackage ./osm/imposm { };

 map-machine = callPackage ./osm/map-machine { };

 map-stylizer = callPackage ./osm/map-stylizer { };

 maperitive-bin = callPackage ./osm/maperitive/bin.nix { };

• osm-3s = callPackage ./osm/osm-3s { };

 osm-area-tools = callPackage ./osm/osm-area-tools { };

 osm-python-tools = callPackage ./osm/osm-python-tools { };

 osmcoastline = callPackage ./osm/osmcoastline { };

 osmosis = callPackage ./osm/osmosis { };

• overpass-api = callPackage ./osm/overpass-api { };

 osmwalkthrough = callPackage ./osm/osmwalkthrough { };

 phyghtmap = callPackage ./osm/phyghtmap { };

 sdlmap = callPackage ./osm/sdlmap { };

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

index 9173b9eb04f7ce79a8b7a3276f3e696af053cd3d..170d9cba7e9521ebb12d0f18c05d4f21c6f99ea0 100644

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

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

@@ -2,16 +2,16 @@ { lib, stdenv, rustPlatform, fetchFromSourcehut, pkg-config, openssl }:

rustPlatform.buildRustPackage rec {

pname = "gemserv";

• version = "0.4.5";

• version = "0.6.3";

src = fetchFromSourcehut {

 owner = "~int80h";

 repo = pname;

 rev = "v${version}";

• hash = "sha256-9O4kzNpc4alnjJ3ioCv1kKfNDxIu5IA8PX0EUb6S2RY=";

• hash = "sha256-JA+mxljfYPWP5RcsknP+5gBSczKNSa5/BuDiY7mS3TY=";

};

• cargoHash = "sha256-if9rWZffXVL9nijtdaisgaabyKkEpJkDeYKv2L4/4co=";

• cargoHash = "sha256-anPHujCUkoIybg8wltDkf3jpHEsPS6GTNJiUPLXAI9k=";

nativeBuildInputs = [ pkg-config ];

diff --git a/pkgs/osm/overpass-api/default.nix b/pkgs/osm/osm-3s/default.nix

rename from pkgs/osm/overpass-api/default.nix

rename to pkgs/osm/osm-3s/default.nix

index d93d0384e19082f4ae6712540531e5b218fd7fab..a9320752ecd76903b8aeda96ae20fe895a66c30e 100644

--- a/pkgs/osm/overpass-api/default.nix

+++ b/pkgs/osm/osm-3s/default.nix

@@ -1,7 +1,7 @@

{ lib, stdenv, fetchurl, expat, lz4, zlib }:

stdenv.mkDerivation rec {

• pname = "overpass-api";

• pname = "osm-3s";

version = "0.7.57.1";

src = fetchurl {