diff --git a/pkgs/by-name/li/libosmium/package.nix b/pkgs/by-name/li/libosmium/package.nix
index 77a269650c59..026e0f6ae545 100644
--- a/pkgs/by-name/li/libosmium/package.nix
+++ b/pkgs/by-name/li/libosmium/package.nix
@@ -11,15 +11,15 @@
   lz4,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libosmium";
-  version = "2.20.0";
+  version = "2.21.0";
 
   src = fetchFromGitHub {
     owner = "osmcode";
     repo = "libosmium";
-    rev = "v${version}";
-    sha256 = "sha256-QM6Nj2cmrhUysR2enFKhTWXdBXNqM21/Yqdn/zXEfYE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IGZQBziXKYVG+uKLjHr6LsIF5H8klq6LGF5j1KrfHZU=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -33,18 +33,18 @@ stdenv.mkDerivation rec {
     lz4
   ];
 
-  cmakeFlags = [ "-DINSTALL_GDALCPP:BOOL=ON" ];
+  cmakeFlags = [ (lib.cmakeBool "INSTALL_GDALCPP" true) ];
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Fast and flexible C++ library for working with OpenStreetMap data";
     homepage = "https://osmcode.org/libosmium/";
-    license = licenses.boost;
+    license = lib.licenses.boost;
     changelog = [
-      "https://github.com/osmcode/libosmium/releases/tag/v${version}"
-      "https://github.com/osmcode/libosmium/blob/v${version}/CHANGELOG.md"
+      "https://github.com/osmcode/libosmium/releases/tag/v${finalAttrs.version}"
+      "https://github.com/osmcode/libosmium/blob/v${finalAttrs.version}/CHANGELOG.md"
     ];
-    maintainers = with maintainers; teams.geospatial.members ++ [ das-g ];
+    maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ das-g ]);
   };
-}
+})
diff --git a/pkgs/by-name/os/osmium-tool/package.nix b/pkgs/by-name/os/osmium-tool/package.nix
index 803b9c13ef99..bc5def65c441 100644
--- a/pkgs/by-name/os/osmium-tool/package.nix
+++ b/pkgs/by-name/os/osmium-tool/package.nix
@@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
       url = "https://github.com/Tencent/rapidjson/commit/862c39be371278a45a88d4d1d75164be57bb7e2d.patch";
       hash = "sha256-V5zbq/THUY75p1RdEPKJK2NVnxbZs07MMwJBAH7nAMg=";
     })
+    (fetchpatch {
+      url = "https://github.com/osmcode/osmium-tool/commit/1c62771a62f260b07c1b9a52338a24a978dcd967.patch";
+      hash = "sha256-/2HUu4tLRZzoCcGVEM61gE4RjiA2XGalr9OnhCUhKj8=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pr/protozero/package.nix b/pkgs/by-name/pr/protozero/package.nix
index 708a61d65c50..780c12af4352 100644
--- a/pkgs/by-name/pr/protozero/package.nix
+++ b/pkgs/by-name/pr/protozero/package.nix
@@ -5,30 +5,30 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "protozero";
-  version = "1.7.1";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "protozero";
-    rev = "v${version}";
-    sha256 = "sha256-R8lGewsEOxPNbKlkIeiM4yIwUcTzi2Dm0+xJ2WrBTBQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kqR0YLxkRu8WclxaoR/zx+2sRTEZus7dUTbqjBkv12U=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     description = "Minimalistic protocol buffer decoder and encoder in C++";
     homepage = "https://github.com/mapbox/protozero";
-    license = with licenses; [
+    license = with lib.licenses; [
       bsd2
       asl20
     ];
     changelog = [
-      "https://github.com/mapbox/protozero/releases/tag/v${version}"
-      "https://github.com/mapbox/protozero/blob/v${version}/CHANGELOG.md"
+      "https://github.com/mapbox/protozero/releases/tag/v${finalAttrs.version}"
+      "https://github.com/mapbox/protozero/blob/v${finalAttrs.version}/CHANGELOG.md"
     ];
-    maintainers = with maintainers; teams.geospatial.members ++ [ das-g ];
+    maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ das-g ]);
   };
-}
+})