diff --git a/pkgs/data/misc/osm-extracts/default.nix b/pkgs/data/misc/osm-extracts/default.nix

index e2f52651e54ac1c627ccd89fad3a6080e430fe38..3f17f7b0f1f96c8f34e1a9ae96e8d55e7143f804 100644

--- a/pkgs/data/misc/osm-extracts/default.nix

+++ b/pkgs/data/misc/osm-extracts/default.nix

@@ -17,11 +17,11 @@ in

{

admin-boundaries = stdenv.mkDerivation rec {

 pname = "osm-admin-boundaries";

• version = "210512";

• version = "210515";

 src = fetchurl {

   url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";

•  hash = "sha256-VxTUUJeqVKmFDbvf9Wd/DtNYoGuD5ZR6dhenVeDBnAg=";
  

•  hash = "sha256-+rRNt9/aZK+OyuGDueNaa5nsx4yHOlg4W149VrZIBvs=";
  

 };

 dontUnpack = true;

diff --git a/pkgs/data/misc/routinodb/default.nix b/pkgs/data/misc/routinodb/default.nix

index e9189a90881dd3c3f3eb3cc9c319004d09365d09..3ab05d4afa7db9a7fcd8bde7f4076139a5ac2d2c 100644

--- a/pkgs/data/misc/routinodb/default.nix

+++ b/pkgs/data/misc/routinodb/default.nix

@@ -2,20 +2,20 @@ { lib, stdenv, fetchurl, routino }:

stdenv.mkDerivation rec {

pname = "routinodb";

• version = "210512";

• version = "210515";

srcs = [

 (fetchurl {

   url = "https://download.geofabrik.de/europe/finland-${version}.osm.pbf";

•  hash = "sha256-Vw9rG/SgO6gjgqFEwcO1/PJhtYwkTT/QOeMQTiaDQAw=";
  

•  hash = "sha256-1EW8Gi75RFsTm/5cuiDP4nReDEfWDxYut7Iy2uK8P7s=";
  

 })

 (fetchurl {

   url = "https://download.geofabrik.de/europe/estonia-${version}.osm.pbf";

•  hash = "sha256-u7WoFIOx5OH+Sv7WuCw7PucS1Ohxz4GzHX2nmR29rMw=";
  

•  hash = "sha256-6pZQi8R1qD9jf0K94oObRkpKWnjAyxriQmnB7Y1jAHg=";
  

 })

 (fetchurl {

   url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";

•  hash = "sha256-VxTUUJeqVKmFDbvf9Wd/DtNYoGuD5ZR6dhenVeDBnAg=";
  

•  hash = "sha256-+rRNt9/aZK+OyuGDueNaa5nsx4yHOlg4W149VrZIBvs=";
  

 })

];

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

index c4001cc00cd52bf0f9a9ac6e2b044e489679bfb5..a52c9e56339fafe56494ac83b526ca71a43fe6c6 100644

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

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

@@ -2,13 +2,13 @@ { lib, buildGoModule, fetchFromSourcehut, scdoc }:

buildGoModule rec {

pname = "gmnitohtml";

• version = "2021-04-24";

• version = "2021-05-08";

src = fetchFromSourcehut {

 owner = "~adnano";

 repo = pname;

• rev = "b3379f9536a27b689e0a5bfe87c25aacf26e8b30";

• hash = "sha256-RNrAjGTdvyP+jCXnSYtnrXSPl+l1PGVk9vjHBawzRII=";

• rev = "332368e55341b8de44eecd5abe128d4a4b6a3087";

• hash = "sha256-iYN6DGYMsLSbkAWRr7KygkgxxDuoFqopxwr9gfiiC+0=";

};

nativeBuildInputs = [ scdoc ];

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

index 3e6dd0eab3d76b1588807dd128a5e2384fc4b56e..576cb0d43ec78796bbaf239e7b5cc46f12c1f115 100644

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

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

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

buildGoModule rec {

pname = "kineto";

• version = "2021-01-15";

• version = "2021-02-25";

src = fetchFromSourcehut {

 owner = "~sircmpwn";

 repo = pname;

• rev = "8f35e0a2b17b70691b8634c2bd8c99f98557105c";

• hash = "sha256-Qh9q6HWEgsXCteNoF5jAARfHPlmEGT2yPWJjW8dEAm4=";

• rev = "edd4fe31f16f9eb9565d2b6a329738ceedea8de9";

• hash = "sha256-qRBD9b4Vtb23pzsnSwbNly/EUtptCdmM+gq2HMt3jbY=";

};

• vendorSha256 = "06yjz1rsnfz2dyky53q4y5g05f2h724cjvc9z5d57rra1kjp3p1j";

• vendorSha256 = "sha256-+CLJJ4najojIE/0gMlhZxb1P7owdY9+cTnRk+UmHogk=";

meta = with lib; {

 description = "An HTTP to Gemini proxy";

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

index 5f630effc2bb60f9c969cfb51bc26a955a5feb93..89e23491b25d17b382ef0ebd2a3c6e84e9c1afc3 100644

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

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

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

-{ lib, stdenv, fetchFromGitHub }:

+{ lib, stdenv, fetchFromGitHub, conf ? null }:

stdenv.mkDerivation rec {

pname = "sfm";

• version = "2021-03-13";

• version = "2021-05-16";

src = fetchFromGitHub {

 owner = "afify";

 repo = pname;

• rev = "b6063fd0a91a0ee976a09c79cbeb097ba26bfd21";

• hash = "sha256-tRT8snpxXKwOHFT9GoK8xQnu8mQbUfbujyii2paQEaU=";

• rev = "cc1efcf914bbfe75cbd2ce2a1a90e764d5b88bfd";

• hash = "sha256-6pdxfRhvZDde332BFIYlcia5JVMS79HlgEZ/T5CniZo=";

};

• configFile = lib.optionalString (conf!=null) (lib.writeText "config.def.h" conf);

• postPatch = lib.optionalString (conf!=null) "cp ${configFile} config.def.h";

installFlags = [ "PREFIX=$(out)" ];