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

index ba9f8bf8ce4207d66fc3d70cf2601b376b754b08..e0da93271564c7f9a75cd6926a242b97aaeb16e6 100644

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

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

@@ -24,7 +24,7 @@ tatoeba = builtins.fromJSON (builtins.readFile ./tatoeba.json);

in

stdenvNoCC.mkDerivation rec {

pname = "tatoeba";

• version = "2021-11-13";

• version = "2021-11-20";

srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;

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

index d30f8870e48a24499d8548a3684e79680651f18d..820528a13f6d5a69adbf69edbfbdfddf8fe9020b 100644

--- a/pkgs/data/dicts/tatoeba/tatoeba.json

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

@@ -1,67 +1,67 @@

{

"deu_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",

• "hash": "sha256-WLn0/FodTkN9V+LmrCRIpT6FEOvVP/6PWu5QVs9p/uA="

• "hash": "sha256-BEwzwoZpTRs9CiOORZbMh6Q98i4phk5szTFjfq2jgqE="

},

"eng_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",

• "hash": "sha256-8nzlDtMnqNBQ0W3B8LLpd4T00hSNgS/OdKr0o+RdjQE="

• "hash": "sha256-5EUEANc3T7NQRp/ewvV1disSWuSa9fuummH/yxW6+k8="

},

"epo_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",

• "hash": "sha256-Oi4fZdTxlPXqGhyYGXL+3zge9Ok79OWMjN5Qd78egRU="

• "hash": "sha256-2HhpTJlviqQFdps+oAenDGK7FoPqrRjkageqQ54WAi4="

},

"fin_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",

• "hash": "sha256-qXj2LQotjVPjMGKij39/ff7aNg6ZmwT8AUPQ+6nZ+zQ="

• "hash": "sha256-dxmLM7S+b0Ic9Un/Ev9X6byAFMd9zjEh8QVygnfGzZo="

},

"rus_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",

• "hash": "sha256-xDLdyDmzwd9WrA1PeRddqDXr7O860IpqpbIpeqw4flk="

• "hash": "sha256-Bb1rCAFfTC54aLh2ARnVQiO90u2U/vxGW8YF6DxY1Mo="

},

"ukr_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",

• "hash": "sha256-ahwhKGa2x6Vq83S0/rpY7NBpZrDi6/0M/3eebPsbjFk="

• "hash": "sha256-eYEkxa720A+vqH+AAc6MFWd7pKz3WFjjZ7C6OA3nyuU="

},

"deu-eng_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",

• "hash": "sha256-TMrSjzT20VkygjGo+Hfme8Hi2BQ/yzT1YgXAH0EOuPk="

• "hash": "sha256-MpUF8mx4H/W62DvMsYW4SuY6z9hl+o1xdqzEHtK5GfY="

},

"deu-rus_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",

• "hash": "sha256-HPdAzb1DYUMRvHHT+ldbS4WfQz0GCKpUkDMcRtQ/sQ4="

• "hash": "sha256-FanTddza8iOs2gz0kRWZz4skj/sEu5CLxKi4B6c/CNs="

},

"eng-epo_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",

• "hash": "sha256-YuwZKKA4HLPrfGqKuFvKKESBk9ioiYT0aesDX4vbgZk="

• "hash": "sha256-ybEnFmoCVP9IS6WlkX7lStSdP5MJAvIvo4ZhvKYQGmw="

},

"eng-deu_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",

• "hash": "sha256-q4CIAiaCEfPbCpNhvN1CZInDCIiP14yW67ZK1kMa4Jw="

• "hash": "sha256-sVyatcsEBYYEve4rsE166gGK+yYHB9niZBM/lRFeSTs="

},

"eng-fin_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",

• "hash": "sha256-8CC0q+Nk3wX8aXt6171LKAnZvycAMRd4xx6kwsiPma8="

• "hash": "sha256-D/2TZ9mC9QRv7nZSFQll0yWlGnPh7Ne6EgE9BrXuDDk="

},

"eng-rus_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",

• "hash": "sha256-zHIoh+JMhl84aBfUJbk8C4LSlTUY6ZBVnVU24/P+jKo="

• "hash": "sha256-m8Xyb9hmkYnAZm1mQ5cZdFzIqXRIkJ04tAeRiiKxTKY="

},

"eng-ukr_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",

• "hash": "sha256-ePV9qU0KFixmAmZ0d1joEJjcB0iEkYp23l6HEW4hr1M="

• "hash": "sha256-fZkP3jrK4hAzEjo64xUOYOdcd3PuNRo1HZJyquVe1hU="

},

"epo-eng_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",

• "hash": "sha256-F+vhTcrhVSLJUOS2cMPHkGHbH6wLoPzj2waaxrcE5sY="

• "hash": "sha256-5aLccr9bSseSX5lTPX5DY27f3+GWCwiq6tvlAGfIRXU="

},

"epo-rus_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",

• "hash": "sha256-pYvh508X39X2DU7zcRyLcCgSJpZTZU5CGmUWDIXlKo8="

• "hash": "sha256-KtBOieDFCSoqLpNQaoddZInjBbAptqC5Pw/Mk2e6ngs="

},

"fin-eng_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",

• "hash": "sha256-tQZXx1MB+s3RdxyYqtUDoL7J/L45y+VzDCfllch53hY="

• "hash": "sha256-4CmzsMgdYiLs4rCiyIsK8y4GCwq2aZw6UlMQdh/+5OM="

},

"fin-rus_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",

@@ -69,15 +69,15 @@ "hash": "sha256-4ZV5GXV5so7W423NmQ98CDW3UfYWSvlDRBUQKw3lc1k="

},

"rus-deu_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",

• "hash": "sha256-lnZKiIypDn0DIKmFY6HojWxue+9RgN6IgmPe1ybAPow="

• "hash": "sha256-r7OY/R+yZVbt5IeCI8T2XzXvbD+0ngQNeL1f+WG3EKc="

},

"rus-eng_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",

• "hash": "sha256-+/fT6E6dMkL4Qnht3cR4atGpvkUMNzTE1Gv8meP1rHU="

• "hash": "sha256-teNQXXS3i1dnnQrJXhSQYoOpG6RtLGl/mtZl+AlDzco="

},

"rus-epo_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",

• "hash": "sha256-lZy2ODGCpAQ//sjpgOvdIp9KB5swOYIBObENE9Efi0k="

• "hash": "sha256-AJrthWuLI5aSQcrUewzmk2HgBOYyWOReOK3VSBGCtuU="

},

"rus-fin_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",

@@ -85,14 +85,14 @@ "hash": "sha256-/LeA07wRI/Prj00AdjwLikmwIomwqc2bbSRIbDIu1s4="

},

"rus-ukr_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",

• "hash": "sha256-Rs5/H0HfwhozEE/MoLjdsBVInIgKsolS/ClqbnjjCqU="

• "hash": "sha256-s5Ty1PnIzmA8uYuyn5GRft4/8PBpdQCKeQmn81LFViw="

},

"ukr-eng_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",

• "hash": "sha256-lAASo6qeqV81FlcliPjlM9wH9A+Egc/t+Utpexx/jkU="

• "hash": "sha256-r3VrDWie3BYy/niHavZI+8Oc4tA56RQHEF0HCfFOt7k="

},

"ukr-rus_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",

• "hash": "sha256-A/EHjHBPHzQLGSlLLC1D6B8SwGkaezdtc6b+cY5Zu0Q="

• "hash": "sha256-EVKAabKFXwryMN55AjoQ7KLio57wX6+RLsQ20GbkzdU="

}

}

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

index 4e491c4a447bd159581550580d57db4a97249353..3fd31f7b84723ca9dfe4102ccd144606aa0084df 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 = "211109";

• version = "211120";

srcs = [

 (fetchurl {

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

•  hash = "sha256-Hv8nYrqYiSM/Ge4gwSFW9CfpihigCw9lMlnPmWIx48E=";
  

•  hash = "sha256-wD+VZ5A8WnSl2DmO6j1E2lTiliOSQgg1SC5l5o+9/Po=";
  

 })

 (fetchurl {

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

•  hash = "sha256-IaunFpgd7lEmjOl7kjor70yqbjjRDdoHrH2kD6+PNss=";
  

•  hash = "sha256-bS3Ut/dTndH8Xm38tCe1ZgeG5wxBkxyCf3HBTE4Vrvs=";
  

 })

 (fetchurl {

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

•  hash = "sha256-aKrwH8YHzUA6sW7S7cpqr6L0lAYs7r+JGjbS05QN5Po=";
  

•  hash = "sha256-3gdhWXxRKJ3vYj3WG1TI+vClvH5IOfDKwaB2m+4pk+0=";
  

 })

];

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

index a30d65afe7b31c78a7ccf1f01656fbfdba7c5f55..bd3fba399734e052d90c5bda8773280cd4d1b295 100644

--- a/pkgs/gnss/visualgps/default.nix

+++ b/pkgs/gnss/visualgps/default.nix

@@ -1,12 +1,6 @@

-{ lib

-, stdenv

-, mkDerivation

-, fetchFromGitHub

-, qmake

-, qtserialport

-}:

+{ lib, stdenv, fetchFromGitHub, qmake, qtserialport, wrapQtAppsHook }:

-mkDerivation rec {

+stdenv.mkDerivation rec {

pname = "visualgps-unstable";

version = "2020-03-29";

@@ -18,7 +12,7 @@ sha256 = "sha256-1x9V75Y2QgMw3oTERHiFopFxFyWRJhGKaDK/raPqxjg=";

 fetchSubmodules = true;

};

• nativeBuildInputs = [ qmake ];

• nativeBuildInputs = [ qmake wrapQtAppsHook ];

buildInputs = [ qtserialport ];

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

index 22ed1ae03e7684e242c31488f0cd50dcc97888e3..3dc910cecb67e7428e0a431c412c3d21838b9aa2 100644

--- a/pkgs/linguistics/redict/default.nix

+++ b/pkgs/linguistics/redict/default.nix

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

-{ mkDerivation

-, stdenv

+{ stdenv

, lib

, fetchFromGitHub

+, wrapQtAppsHook

, pkg-config

, qmake

, qtbase

@@ -15,7 +15,7 @@ , libXtst

, withI18n ? true

}:

-mkDerivation rec {

+stdenv.mkDerivation rec {

pname = "redict";

version = "2019-06-21";

@@ -26,7 +26,7 @@ rev = "525aac01ed5fc0f74f8393dc5b5b3bb57c9b0c5f";

 hash = "sha256-VGYhcQqnK50NqF6MFcKDyaPECDnAjVRzhMR7Wldoiv4=";

};

• nativeBuildInputs = [ qmake pkg-config ]

• nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]

 ++ lib.optional withI18n qttools;

buildInputs = [ qtmultimedia qtsvg ]

 ++ lib.optionals stdenv.isLinux [ qtx11extras libX11 libXext libXtst ];

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

index 418b3de71d51782fb5e32093733bc091451e1b63..2939c96f52fccdb2e1695533e9f59598400a242a 100644

--- a/pkgs/radio/sigdigger/default.nix

+++ b/pkgs/radio/sigdigger/default.nix

@@ -1,10 +1,10 @@

-{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config

+{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, qmake, pkg-config

, fftwFloat, sigutils, suscan, suwidgets, volk

, fftw, libsndfile, soapysdr, soapyrtlsdr

, portaudio

}:

-mkDerivation rec {

+stdenv.mkDerivation rec {

pname = "sigdigger";

version = "0.2.0-rc1";

@@ -15,7 +15,7 @@ rev = "v${version}";

 hash = "sha256-OWFPf1iIDhzgV7+pANp7lxzEBhxND0tIhB0VGNOeCak=";

};

• nativeBuildInputs = [ qmake pkg-config ];

• nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];

buildInputs = [

 fftwFloat sigutils suscan suwidgets volk