diff --git a/pkgs/data/dicts/libredict/default.nix b/pkgs/data/dicts/libredict/default.nix

new file mode 100644

index 0000000000000000000000000000000000000000..c51cef37712dbca31320920699378e3559ae6902

--- /dev/null

+++ b/pkgs/data/dicts/libredict/default.nix

@@ -0,0 +1,33 @@

+{ lib, stdenvNoCC, fetchurl }:

+let

• dicts = lib.mapAttrs

• (name: spec:

•  fetchurl {
  

•    url = "http://libredict.org/dictionaries/${name}/wiktionary_${name}_stardict_${spec.version}.tgz";
  

•    inherit (spec) hash;
  

•  }
  

• )

• (lib.importJSON ./dicts.json);

+in

+stdenvNoCC.mkDerivation {

• pname = "libredict";

• version = "2023-05-20";

• srcs = lib.attrValues dicts;

• sourceRoot = ".";

• installPhase = ''

• mkdir -p $out

• mv Wiktionary* $out

• '';

• meta = with lib; {

• description = "Wiktionary dictionaries for StarDict";

• homepage = "http://libredict.org";

• license = licenses.free;

• maintainers = [ maintainers.sikmir ];

• platforms = platforms.all;

• skip.ci = true;

• };

+}

diff --git a/pkgs/data/dicts/libredict/dicts.json b/pkgs/data/dicts/libredict/dicts.json

new file mode 100644

index 0000000000000000000000000000000000000000..eece63dc4e8cb45912f970b9a8653dcf3c021cc7

--- /dev/null

+++ b/pkgs/data/dicts/libredict/dicts.json

@@ -0,0 +1,42 @@

+{

• "de-ru": {

• "version": "2023-05-19",

• "hash": "sha256-TsCk3OgyQ3s1g7FTHbFnwVNsX+8s/apHsPqX7Cas+eE="

• },

• "en-ru": {

• "version": "2023-05-17",

• "hash": "sha256-uxUBfTBDtXeDKTq+Zs8GPUPHYtLuWSkiLcxW4aoRB0s="

• },

• "fi-ru": {

• "version": "2023-05-15",

• "hash": "sha256-ca/Dnp0z/uwGulbU8WX2vDae7LasPYAaOedE3VIbiLY="

• },

• "ru-be": {

• "version": "2023-05-07",

• "hash": "sha256-qSvG4ONOb2QCTPI786OVKSuFTz5GwE1FxVEDGhS9wWA="

• },

• "ru-de": {

• "version": "2023-05-07",

• "hash": "sha256-e/hVA8k+oOAlb6vZXzR+6HEduzYlSj27LHJ4oovYNCU="

• },

• "ru-en": {

• "version": "2023-05-07",

• "hash": "sha256-wdXFWLnTlfvruHLKc1pHSH7WaOPrEu7NTark7OE/S7A="

• },

• "ru-eo": {

• "version": "2023-05-07",

• "hash": "sha256-QP6eMAjZE/9YrYX+M/iaJOk8cuoHybhzmhxv++HrrNc="

• },

• "ru-fi": {

• "version": "2023-05-07",

• "hash": "sha256-Pti4bXXYq0IqD7rfPS5uN4y5xtWLppjkN7NQdHFgH3s="

• },

• "ru-sv": {

• "version": "2023-05-07",

• "hash": "sha256-5ooSgy/y3YyisU8HmgbK7th1b1h8HXan6rmssTSurQ4="

• },

• "ru-uk": {

• "version": "2023-05-07",

• "hash": "sha256-KitCizHVE/TW+NF518KF2dLLq6t9TEmBR1k5ED4INds="

• }

+}

diff --git a/pkgs/data/dicts/wiktionary/base.nix b/pkgs/data/dicts/wiktionary/base.nix

deleted file mode 100644

index 3d21e604c8707b802022e2cb4a805a4433277992..0000000000000000000000000000000000000000

--- a/pkgs/data/dicts/wiktionary/base.nix

+++ /dev/null

@@ -1,24 +0,0 @@

-{ lib, stdenvNoCC, fetchurl, lang, version, hash }:

-stdenvNoCC.mkDerivation {

• pname = "wiktionary-${lang}";

• inherit version;

• src = fetchurl {

• url = "http://libredict.org/dictionaries/${lang}/wiktionary_${lang}stardict${version}.tgz";

• inherit hash;

• };

• installPhase = "install -Dm644 *.{dict,idx,ifo} -t $out";

• preferLocalBuild = true;

• meta = with lib; {

• description = "Wiktionary dictionaries for StarDict (${lang})";

• homepage = "http://libredict.org/en/info_${lang}.html";

• license = licenses.free;

• maintainers = [ maintainers.sikmir ];

• platforms = platforms.all;

• skip.ci = true;

• };

-}

diff --git a/pkgs/data/dicts/wiktionary/default.nix b/pkgs/data/dicts/wiktionary/default.nix

deleted file mode 100644

index 1640e09db9d503b8ee5d36d3e78aa9b851bee596..0000000000000000000000000000000000000000

--- a/pkgs/data/dicts/wiktionary/default.nix

+++ /dev/null

@@ -1,63 +0,0 @@

-{ callPackage }:

-{

• de-ru = callPackage ./base.nix {

• lang = "de-ru";

• version = "2022-05-20";

• hash = "sha256-v3Uz+R/+MIr3MCyKNOrrkPuHYJDJEQggNbEMSliQbJs=";

• };

• en-ru = callPackage ./base.nix {

• lang = "en-ru";

• version = "2022-05-18";

• hash = "sha256-oLazcOnbSKHV4JbD3h9uWAGzaQD1BpY2mey27UH1nCQ=";

• };

• fi-ru = callPackage ./base.nix {

• lang = "fi-ru";

• version = "2022-05-16";

• hash = "sha256-lAB9umzqJOa/qLj37qR4GrEqfF70wQ719ddje/CWRrw=";

• };

• ru-be = callPackage ./base.nix {

• lang = "ru-be";

• version = "2022-05-07";

• hash = "sha256-RkWWO7e0hPSoSzutDfWHFm6OyZHL2yCACyfxHqqDvz0=";

• };

• ru-de = callPackage ./base.nix {

• lang = "ru-de";

• version = "2022-05-07";

• hash = "sha256-QPV6NhDipfLA2MKaVx+HQT61xjxzAPlpT1mWujMCjbE=";

• };

• ru-en = callPackage ./base.nix {

• lang = "ru-en";

• version = "2022-05-07";

• hash = "sha256-smpc3SCtZVbhC8K3fs02Gtonr2pICYMdCmljK4ymM7g=";

• };

• ru-eo = callPackage ./base.nix {

• lang = "ru-eo";

• version = "2022-05-07";

• hash = "sha256-gAyTjNGFalNlBh3N9XRseEU/kPov1nbbXXBVr6WtioY=";

• };

• ru-fi = callPackage ./base.nix {

• lang = "ru-fi";

• version = "2022-05-07";

• hash = "sha256-y1ISzpTKxtYRGF57McuAHLXZvWYCIVvtK0hjOls+NJI=";

• };

• ru-sv = callPackage ./base.nix {

• lang = "ru-sv";

• version = "2022-05-07";

• hash = "sha256-iPtV11QN5wyhKULJRxk9kPJckN2uT4vqDfrseqDbTMU=";

• };

• ru-uk = callPackage ./base.nix {

• lang = "ru-uk";

• version = "2022-05-07";

• hash = "sha256-2bNxHgLfqR7vZYUnhjMJ5FJ9mU9zHdcc4LSTqN9ANNM=";

• };

-}

diff --git a/pkgs/data/maps/mtk-suomi/default.nix b/pkgs/data/maps/mtk-suomi/default.nix

index c5b034c73da8e8bd9ffbb7eebbbdc39cae99ef34..8656117c116230003c6785737e2266bff47ee4a0 100644

--- a/pkgs/data/maps/mtk-suomi/default.nix

+++ b/pkgs/data/maps/mtk-suomi/default.nix

@@ -2,11 +2,11 @@ { lib, stdenvNoCC, fetchurl }:

stdenvNoCC.mkDerivation (finalAttrs: {

pname = "mtk-suomi";

• version = "2022-03-15";

• version = "2023-04-08";

src = fetchurl {

 url = "https://kartat-dl.hylly.org/${finalAttrs.version}/mtk_suomi.img";

• hash = "sha256-s5pk+CvbrWQfC4SGQwGtDY8gg0K5ilZbYOC2lB+c7I8=";

• hash = "sha256-Jjm8c9wiPyQYoBGgFmFFVjG8Ur2nx6CndbmhGX/nSLo=";

};

preferLocalBuild = true;

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

index 15c153ae049525b8fde5d26bde39641a131bc1fb..12add86112132993912bef2ba0f5f41139d4f929 100644

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

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

@@ -2,11 +2,11 @@ { lib, stdenv, fetchurl, osmium-tool }:

stdenv.mkDerivation rec {

pname = "osm-extracts";

• version = "230429";

• version = "230520";

src = fetchurl {

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

• hash = "sha256-nGRUzlQC8hmetmU8Dh0/MOVcpHeBX4z37Xjm5sPbrv0=";

• hash = "sha256-n1VyJNcdURWRpCHuYyeabU/FNkNJ9oe/7/TKEP8iqtA=";

};

dontUnpack = true;

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

index 457f0bae4aa8938c8e404fb7d34a961844c5c1cc..5a70563d1d6b9a4a2e03c8d2df627a1d1decee36 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -47,8 +47,8 @@ freedict = callPackage ./data/dicts/freedict { };

 huzheng = callPackage ./data/dicts/huzheng { };

 it-sanasto = callPackage ./data/dicts/it-sanasto { };

 komputeko = callPackage ./data/dicts/komputeko { };

• libredict = callPackage ./data/dicts/libredict { };

 tatoeba = callPackage ./data/dicts/tatoeba { };

• wiktionary = callPackage ./data/dicts/wiktionary { };

 gpsmap64 = callPackage ./data/firmwares/gpsmap64 { };