diff --git a/flake.lock b/flake.lock

index 0f83ec1c9d81952ffdc6deb912f0855dbed7b29a..969b67e955d2aa698fb1e7c9bc4d716e9e19f940 100644

--- a/flake.lock

+++ b/flake.lock

@@ -2,11 +2,11 @@ {

"nodes": {

 "flake-utils": {

   "locked": {

•    "lastModified": 1642700792,
  

•    "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
  

•    "lastModified": 1644229661,
  

•    "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
  

     "owner": "numtide",

     "repo": "flake-utils",

•    "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
  

•    "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
  

     "type": "github"

   },

   "original": {

@@ -17,11 +17,11 @@ }

 },

 "nixpkgs": {

   "locked": {

•    "lastModified": 1642880071,
  

•    "narHash": "sha256-NZW5BczhluZVkKblxrFqJbawUPxuC2HdKQ1t/+vKA34=",
  

•    "lastModified": 1646506091,
  

•    "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=",
  

     "owner": "NixOS",

     "repo": "nixpkgs",

•    "rev": "30daa988f107bc4c910c398a77b2b89864049932",
  

•    "rev": "3e644bd62489b516292c816f70bf0052c693b3c7",
  

     "type": "github"

   },

   "original": {

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

index 067be6fdbbb5a873284145b421294c34b11dbd6d..771743a79d793d96e92991541c3262ea5e372d92 100644

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

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

@@ -2,16 +2,16 @@ { lib, buildGoModule, fetchFromSourcehut }:

buildGoModule rec {

pname = "gmnigit";

• version = "2021-07-19";

• version = "2022-01-10";

src = fetchFromSourcehut {

 owner = "~kornellapacz";

 repo = pname;

• rev = "b97513313e1e6ce870c3243b6d6c17424878f9ed";

• hash = "sha256-HMFZUkRU97YxrO+qMCf9z6d0JfPYyFKF7dfjDdilN3E=";

• rev = "b266bf6f6d32162d83df91c35ab4f43e3da445eb";

• hash = "sha256-as8WpwJFX/sXsUueLIchcBj8/FWKCpEB5vdZBZe4xpU=";

};

• vendorSha256 = "sha256-IADs5JBIetVm4pYpl3TBUzhYmYV4xOkleXtzd0Yb7cY=";

• vendorSha256 = "sha256-/UIfgwPFZxdnSywA7ysyVIFQXTRud/nlkOdzGEESEbY=";

meta = with lib; {

 description = "Static git gemini viewer";

diff --git a/pkgs/osm/map-machine/default.nix b/pkgs/osm/map-machine/default.nix

index 5f677dbccf530e2344707c8bd80d0d4690e6492a..c5af8ae4df1e6bb8a85802992747c53b35d29d30 100644

--- a/pkgs/osm/map-machine/default.nix

+++ b/pkgs/osm/map-machine/default.nix

@@ -2,14 +2,14 @@ { lib, fetchFromGitHub, python3Packages, portolan }:

python3Packages.buildPythonApplication rec {

pname = "map-machine";

• version = "2022-02-17";

• version = "2022-02-24";

disabled = python3Packages.pythonOlder "3.9";

src = fetchFromGitHub {

 owner = "enzet";

 repo = pname;

• rev = "28ab57676e8ec9482b5bcdc3b3677a57b8918a4c";

• hash = "sha256-3ojO8xfZntgoXsspUAMZFZ6VM+A5uIkNkCkELlsNqB4=";

• rev = "1f4fb66c85720476b7a30138b0da51a10d6a48e8";

• hash = "sha256-MGBI9teUeJ8BZl47vvFFvbS/FzNyFiTIkOtKoXiA1AI=";

};

propagatedBuildInputs = with python3Packages; [

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

index 1bfe017c8d6be5451608717886fd943c8da31914..04e0f0ac3dd7f8209f71bcef010046722bfc9452 100644

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

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

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

-{ lib, stdenv, fetchFromGitHub, cmake

-, boost, lua, protobuf, shapelib, sqlite, zlib }:

+{ lib, stdenv, fetchFromGitHub, cmake, installShellFiles

+, boost, lua, protobuf, rapidjson, shapelib, sqlite, zlib }:

stdenv.mkDerivation rec {

pname = "tilemaker";

• version = "2.0.0";

• version = "2.1.0";

src = fetchFromGitHub {

 owner = "systemed";

 repo = pname;

 rev = "v${version}";

• hash = "sha256-RfWf5e7yyfoJO3S8u6DwpB5xYl4PGnlhk+E1l+ewNN8=";

• hash = "sha256-weDwDIeOI7CEyZotGWar5l6zW+l31ZvfHkIEUiXevR8=";

};

postPatch = ''

@@ -18,11 +18,12 @@ --replace "config.json" "$out/share/tilemaker/config-openmaptiles.json" \

   --replace "process.lua" "$out/share/tilemaker/process-openmaptiles.lua"

'';

• nativeBuildInputs = [ cmake ];

• nativeBuildInputs = [ cmake installShellFiles ];

• buildInputs = [ boost lua protobuf shapelib sqlite zlib ];

• buildInputs = [ boost lua protobuf rapidjson shapelib sqlite zlib ];

postInstall = ''

• installManPage $src/docs/man/tilemaker.1

 install -Dm644 $src/resources/* -t $out/share/tilemaker

'';

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

index 25f62cd7a4069f9334bf0f75d7518dbe3f2240a5..925207a0df8b4d574d903ad42398fdab898ebc96 100644

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

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

@@ -2,13 +2,13 @@ { lib, stdenv, fetchFromSourcehut, libpng, libjpeg, libtiff, libwebp, fftwFloat, libX11, gsl }:

stdenv.mkDerivation rec {

pname = "imscript";

• version = "2022-01-26";

• version = "2022-03-08";

src = fetchFromSourcehut {

 owner = "~coco";

 repo = pname;

• rev = "c55c0bbf6b048d397c23db84569dbdcbd3ccdaee";

• hash = "sha256-lX6ongR+cOkAAeRvj/Q2NJNesibiuKOSwZcGjSERJHk=";

• rev = "19e1ca47019a0eec01941e15ee9d05f437f71bf3";

• hash = "sha256-slSrQWNsQxzbL3Pznlmv1phWBknjCwHA9IPfqpU1vas=";

};

buildInputs = [ libpng libjpeg libtiff libwebp fftwFloat libX11 gsl ];

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

index c542f7d9df351cc076d322372da70f3c10e29611..4da14a3a11c54dced00cd69ea137e4b2d0f726c5 100644

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

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

@@ -2,13 +2,13 @@ { lib, stdenv, fetchFromGitHub, fontconfig, imlib2, libXft, conf ? null }:

stdenv.mkDerivation rec {

pname = "mage";

• version = "2022-01-24";

• version = "2022-02-24";

src = fetchFromGitHub {

 owner = "explosion-mental";

 repo = pname;

• rev = "ce5c6cc153aae3e6facac6d60fe24ba728ae3faa";

• hash = "sha256-IcbLKTZhRhvkm1grrrbGR8F6lAAHdj61F/sLStuiE/U=";

• rev = "c0cd7e6ad6dd9fedf200086e4f9f1521e35f8322";

• hash = "sha256-xdKm1HcHeCy+qRyti/htGcKbCDWNoFp+B0OC3Ln4nuQ=";

};

configFile = lib.optionalString (conf!=null) (builtins.toFile "config.h" conf);

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

index 1a27994c820bd9edeea5c87f17884b9d0d963547..04918049af78cd2c869d1f75e94c56efaedbfe77 100644

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

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

@@ -2,13 +2,13 @@ { lib, stdenv, fetchFromGitHub, libXft, imlib2, giflib, libexif, libwebp, conf ? null }:

stdenv.mkDerivation rec {

pname = "nsxiv";

• version = "28";

• version = "29";

src = fetchFromGitHub {

 owner = "nsxiv";

 repo = pname;

 rev = "v${version}";

• hash = "sha256-12RmEAzZdeanrRtnan96loXT7qSjIMjcWf296XmNE+A=";

• hash = "sha256-JUF2cF6QeAXk6G76uMu3reaMgxp2RcqHDbamkNufwqE=";

};

configFile = lib.optionalString (conf!=null) (builtins.toFile "config.def.h" conf);