Merge staging-next into staging

19 files changed, 267 insertions, 35 deletions

diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix
index dc02e65bb7b..675ebf7d349 100644
--- a/pkgs/applications/backup/vorta/default.nix
+++ b/pkgs/applications/backup/vorta/default.nix
@@ -8,13 +8,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "vorta";
-  version = "0.7.7";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "borgbase";
     repo = "vorta";
     rev = "v${version}";
-    sha256 = "sha256-AH9CvoWAaNLPLC+NL+VXtYq9CNCMt0AFtC1ZGXSlcHQ=";
+    sha256 = "sha256-qNBswy1dsCE6TEQLr/r7nnZWegDD8BD9pMkcpcuT7Q0=";
   };
 
   nativeBuildInputs = [ wrapQtAppsHook ];
diff --git a/pkgs/applications/misc/ttyper/default.nix b/pkgs/applications/misc/ttyper/default.nix
new file mode 100644
index 00000000000..664bf9ba725
--- /dev/null
+++ b/pkgs/applications/misc/ttyper/default.nix
@@ -0,0 +1,22 @@
+{ fetchFromGitHub, lib, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "ttyper";
+  version = "0.2.5";
+
+  src = fetchFromGitHub {
+    owner = "max-niederman";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1fsb77ky92fyv3ll6zrbxbd69gm85xnc6bivj7sc3sv5cxhgr7a5";
+  };
+
+  cargoSha256 = "1sqdql0kfr1vsww6hkrp7yjlzx0mnhfma51z699hkx9c492sf1wk";
+
+  meta = with lib; {
+    description = "Terminal-based typing test";
+    homepage = "https://github.com/max-niederman/ttyper";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 15fc84895fb..ca5eabd6530 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -7,13 +7,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "gdal";
-  version = "3.2.2";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "gdal";
-    rev = "a33784291d19015217ea2604988e53d448e14a07";
-    sha256 = "sha256-ynCju3chDfYtyrGmUE0n3kkaH2Mpm+/DDHHxCahjhSQ=";
+    rev = "v${version}";
+    sha256 = "0832w40a92cl8ydkv0pk7nl1ivhfhbhqbhmpqmdjpi0126jlm2y0";
   };
 
   sourceRoot = "source/gdal";
diff --git a/pkgs/development/ocaml-modules/callipyge/default.nix b/pkgs/development/ocaml-modules/callipyge/default.nix
new file mode 100644
index 00000000000..a9dfb80f2a1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/callipyge/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildDunePackage
+, fetchurl
+, ocaml
+
+, alcotest
+, eqaf
+, fmt
+}:
+
+buildDunePackage rec {
+  pname = "callipyge";
+  version = "0.2";
+
+  src = fetchurl {
+    url = "https://github.com/oklm-wsh/Callipyge/releases/download/v${version}/${pname}-${version}.tbz";
+    sha256 = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0=";
+  };
+
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.03";
+
+  propagatedBuildInputs = [ fmt eqaf ];
+
+  # alcotest isn't available for OCaml < 4.05 due to fmt
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
+  checkInputs = [ alcotest ];
+
+  meta = {
+    homepage = "https://github.com/oklm-wsh/Callipyge";
+    description = "Curve25519 in OCaml";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fufexan ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/chacha/default.nix b/pkgs/development/ocaml-modules/chacha/default.nix
new file mode 100644
index 00000000000..21bae79ab5f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/chacha/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildDunePackage
+, fetchurl
+, ocaml
+
+, alcotest
+, cstruct
+, mirage-crypto
+}:
+
+buildDunePackage rec {
+  pname = "chacha";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/abeaumont/ocaml-chacha/releases/download/${version}/${pname}-${version}.tbz";
+    sha256 = "sha256-t8dOMQQDpje0QbuOhjSIa3xnXuXcxMVTLENa/rwdgA4=";
+  };
+
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.02";
+
+  propagatedBuildInputs = [ cstruct mirage-crypto ];
+
+  # alcotest isn't available for OCaml < 4.05 due to fmt
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
+  checkInputs = [ alcotest ];
+
+  meta = {
+    homepage = "https://github.com/abeaumont/ocaml-chacha";
+    description = "ChaCha20, ChaCha12 and ChaCha8 encryption functions, in OCaml";
+    longDescription = ''
+      An OCaml implementation of ChaCha functions, both ChaCha20 and the reduced
+      ChaCha8 and ChaCha12 functions. The hot loop is implemented in C for efficiency
+      reasons.
+    '';
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fufexan ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/noise/default.nix b/pkgs/development/ocaml-modules/noise/default.nix
new file mode 100644
index 00000000000..59ca274c88d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/noise/default.nix
@@ -0,0 +1,60 @@
+{ lib
+, buildDunePackage
+, fetchurl
+
+, callipyge
+, chacha
+, digestif
+, hex
+, lwt
+, lwt_ppx
+, nocrypto
+, ounit
+, ppxlib
+, ppx_let
+, ppx_deriving
+, ppx_deriving_yojson
+}:
+
+buildDunePackage rec {
+  pname = "noise";
+  version = "0.2.0";
+
+  src = fetchurl {
+    url = "https://github.com/emillon/ocaml-noise/releases/download/v${version}/${pname}-v${version}.tbz";
+    sha256 = "sha256-fe3pT7fsuF2hCvXpInsRg6OvARs/eAh1Un454s1osDs=";
+  };
+
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.04";
+
+  nativeBuildInputs = [
+    ppxlib
+    ppx_deriving
+    ppx_let
+  ];
+
+  propagatedBuildInputs = [
+    callipyge
+    chacha
+    digestif
+    hex
+    nocrypto
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    lwt
+    lwt_ppx
+    ounit
+    ppx_deriving_yojson
+  ];
+
+  meta = {
+    homepage = "https://github.com/emillon/ocaml-noise";
+    description = "OCaml implementation of the Noise Protocol Framework";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fufexan ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
index a56621465f3..13ae64292ec 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
@@ -1,4 +1,4 @@
-{ buildDunePackage, jsonrpc, lsp, makeWrapper, dot-merlin-reader }:
+{ buildDunePackage, jsonrpc, lsp, re, makeWrapper, dot-merlin-reader }:
 
 buildDunePackage {
   pname = "ocaml-lsp-server";
@@ -7,7 +7,7 @@ buildDunePackage {
 
   inherit (lsp) preBuild;
 
-  buildInputs = lsp.buildInputs ++ [ lsp ];
+  buildInputs = lsp.buildInputs ++ [ lsp re ];
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
index 4921f579c41..a1d457f8775 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
@@ -12,8 +12,8 @@
 let params =
   if lib.versionAtLeast ocaml.version "4.12"
   then {
-    version = "1.5.0";
-    sha256 = "0g82m3jrp4s0m3fn9xmm8khrb3acccq8ns9p62bqa09pjd4vgdk2";
+    version = "1.7.0";
+    sha256 = "1va2zj41znsr94bdw485vak96zrcvqwcrqf1sy8zipb6hdhbchya";
   } else {
     version = "1.4.1";
     sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f";
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
index 6e172dee6ee..f81def4a7b4 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
@@ -1,4 +1,5 @@
 { buildDunePackage
+, lib
 , cppo
 , stdlib-shims
 , ppx_yojson_conv_lib
@@ -8,6 +9,7 @@
 , octavius
 , dune-build-info
 , uutf
+, pp
 , csexp
 , cmdliner
 }:
@@ -23,7 +25,7 @@ buildDunePackage {
   # ocaml-lsp without messing with your opam switch, but nix should prevent
   # this type of problems without resorting to vendoring.
   preBuild = ''
-    rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner}
+    rm -r ocaml-lsp-server/vendor/{octavius,uutf,omd,cmdliner}
   '';
 
   buildInputs = [
@@ -34,7 +36,7 @@ buildDunePackage {
     dune-build-info
     omd
     cmdliner
-  ];
+  ] ++ lib.optional (lib.versionAtLeast jsonrpc.version "1.7.0") pp;
 
   propagatedBuildInputs = [
     csexp
diff --git a/pkgs/development/ocaml-modules/pp/default.nix b/pkgs/development/ocaml-modules/pp/default.nix
new file mode 100644
index 00000000000..70c509ec22c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pp/default.nix
@@ -0,0 +1,28 @@
+{ buildDunePackage
+, fetchzip
+, ppx_expect
+, lib
+}:
+
+buildDunePackage rec {
+  pname = "pp";
+  version = "1.1.2";
+
+  src = fetchzip {
+    url = "https://github.com/ocaml-dune/pp/releases/download/${version}/pp-${version}.tbz";
+    sha256 = "1l1im054pxrkj7zk8m6yj4qfdpxkajpjfvy818ggf0j4nxkaihc5";
+  };
+
+  useDune2 = true;
+  minimalOCamlVersion = "4.08";
+
+  checkInputs = [ ppx_expect ];
+  doCheck = true;
+
+  meta = with lib; {
+    description = "A an alternative pretty printing library to the Format module of the OCaml standard library";
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ symphorien ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/rfc7748/default.nix b/pkgs/development/ocaml-modules/rfc7748/default.nix
new file mode 100644
index 00000000000..40356ec9aa5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/rfc7748/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildDunePackage
+, fetchFromGitHub
+, ocaml
+
+, ounit
+, zarith
+}:
+
+buildDunePackage rec {
+  pname = "rfc7748";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "burgerdev";
+    repo = "ocaml-rfc7748";
+    rev = "v${version}";
+    sha256 = "sha256-mgZooyfxrKBVQFn01B8PULmFUW9Zq5HJfgHCSJSkJo4=";
+  };
+
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.05";
+
+  propagatedBuildInputs = [ zarith ];
+
+  # the tests fail for 4.05
+  doCheck = lib.versionAtLeast ocaml.version "4.06";
+  checkInputs = [ ounit ];
+
+  meta = {
+    homepage = "https://github.com/burgerdev/ocaml-rfc7748";
+    description = "Elliptic Curve Diffie-Hellman on Edwards Curves (X25519, X448)";
+    longDescription = ''
+      This library implements the ECDH functions 'X25519' and 'X448' as specified
+      in RFC 7748, 'Elliptic curves for security'. In the spirit of the original
+      publications, the public API is kept as simple as possible to make it easy
+      to use and hard to misuse.
+    '';
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fufexan ];
+  };
+}
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index 0827e5519a7..6d3c7fffe6a 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "bleach";
-  version = "4.0.0";
+  version = "4.1.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-/6kiHGrCk5nMUPzDNHM2bt0M+NXiy7u2MpbcMn+2fMg=";
+    sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix
index 98e047836d0..6f5373b56bc 100644
--- a/pkgs/development/python-modules/databases/default.nix
+++ b/pkgs/development/python-modules/databases/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , sqlalchemy
 , aiocontextvars
 , isPy27
@@ -14,28 +13,16 @@
 
 buildPythonPackage rec {
   pname = "databases";
-  version = "0.4.3";
+  version = "0.5.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
     rev = version;
-    sha256 = "0aq88k7d9036cy6qvlfv9p2dxd6p6fic3j0az43gn6k1ardhdsgf";
+    sha256 = "sha256-HNSPLmZTXZL1e5E9VJiXnQuO2WiXLYOveNTlFqdlTG8=";
   };
 
-  patches = [
-    # sqlalchemy 1.4 compat, https://github.com/encode/databases/pull/299
-    (fetchpatch {
-      url = "https://github.com/encode/databases/commit/9d6e0c024833bd41421f0798a94ef2bbf27a31d5.patch";
-      sha256 = "0wz9dz6g88ifvvwlhy249cjvqpx72x99wklzcl7b23srpcvb5gv1";
-    })
-    (fetchpatch {
-      url = "https://github.com/encode/databases/commit/40c41c2b7b3fedae484ad94d81b27ce88a09c5ed.patch";
-      sha256 = "0z458l3vkg4faxbnf31lszfby5d10fa9kgxxy4xxcm0py6d8a2pi";
-    })
-  ];
-
   propagatedBuildInputs = [
     aiocontextvars
     sqlalchemy
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index f35b5ad8e42..7750b776575 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -2,7 +2,7 @@
 
 let
   # having the full version string here makes it easier to update
-  modDirVersion = "5.13.12-zen1";
+  modDirVersion = "5.13.13-zen1";
   parts = lib.splitString "-" modDirVersion;
   version = lib.elemAt parts 0;
   suffix = lib.elemAt parts 1;
@@ -19,7 +19,7 @@ buildLinux (args // {
     owner = "zen-kernel";
     repo = "zen-kernel";
     rev = "v${modDirVersion}";
-    sha256 = "sha256-UHcQZlQ164oVMVK/Fqggoi+aTDFrLv9Tngsy/q74+Bc=";
+    sha256 = "sha256-aTTbhXy0wsDDCSbX1k27l9g3FliqwE6TbRq2zkI3mnw=";
   };
 
   structuredExtraConfig = with lib.kernel; {
diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
index fd0da72aa92..32378e451e8 100644
--- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
+++ b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
@@ -28,6 +28,7 @@ stdenvNoCC.mkDerivation rec {
 
     cp rpi-eeprom-config rpi-eeprom-update $out/bin
     cp -r firmware/{beta,critical,old,stable} $out/share/rpi-eeprom
+    cp -P firmware/default firmware/latest $out/share/rpi-eeprom
   '';
 
   fixupPhase = ''
diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix
index f3d114ab9c9..96f2b28b5e3 100644
--- a/pkgs/tools/misc/disfetch/default.nix
+++ b/pkgs/tools/misc/disfetch/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "disfetch";
-  version = "2.14";
+  version = "2.15";
 
   src = fetchFromGitHub {
     owner = "q60";
     repo = "disfetch";
     rev = version;
-    sha256 = "sha256-T6FepZBlB1ZZMVFS7zXqSDFCsHbbVNkJNwIHpQ5Ex68=";
+    sha256 = "sha256-1BxBeZfZK/vjUgTZknQLTLyWnI4LYyc1BmQeMcbwFP8=";
   };
 
   dontBuild = true;
diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix
index 98fb8335788..64fdb40f52a 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/pkgs/tools/misc/miniserve/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "miniserve";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "miniserve";
     rev = "v${version}";
-    sha256 = "sha256-Hv1aefuiu7pOlSMUjZLGY6bxVy+6myFH1afZZ5gtmi0=";
+    sha256 = "sha256-hcGpd23CM5r8tq7Wyf4/aJwTCVJ9POmZJHZvIdcF4Qg=";
   };
 
-  cargoSha256 = "sha256-CgiHluc9+5+hKwsC7UZimy1586QBUsj+TVlb2lQRXs0=";
+  cargoSha256 = "sha256-TnafvDbCZhIDnjGJThgYnwFs6O6/RvKFsll3gUh2mjQ=";
 
   nativeBuildInputs = [ installShellFiles pkg-config zlib ];
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1cacdd7d83..570f2b45a94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27445,6 +27445,8 @@ with pkgs;
 
   trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
 
+  ttyper = callPackage ../applications/misc/ttyper { };
+
   tudu = callPackage ../applications/office/tudu { };
 
   tuna = python3Packages.callPackage ../os-specific/linux/tuna { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5ed0b29b4d5..f2f9c912ffc 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -141,6 +141,8 @@ let
 
     cairo2 = callPackage ../development/ocaml-modules/cairo2 { };
 
+    callipyge = callPackage ../development/ocaml-modules/callipyge { };
+
     caqti = callPackage ../development/ocaml-modules/caqti { };
 
     caqti-async = callPackage ../development/ocaml-modules/caqti/async.nix { };
@@ -159,6 +161,8 @@ let
 
     cfstream = callPackage ../development/ocaml-modules/cfstream { };
 
+    chacha = callPackage ../development/ocaml-modules/chacha { };
+
     charInfo_width = callPackage ../development/ocaml-modules/charInfo_width { };
 
     checkseum = callPackage ../development/ocaml-modules/checkseum { };
@@ -804,6 +808,8 @@ let
 
     nocrypto =  callPackage ../development/ocaml-modules/nocrypto { };
 
+    noise = callPackage ../development/ocaml-modules/noise { };
+
     nonstd =  callPackage ../development/ocaml-modules/nonstd { };
 
     notty = callPackage ../development/ocaml-modules/notty { };
@@ -1012,6 +1018,8 @@ let
       inherit (pkgs) postgresql;
     };
 
+    pp = callPackage ../development/ocaml-modules/pp { };
+
     ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { };
 
     ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix {
@@ -1174,6 +1182,8 @@ let
 
     reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { });
 
+    rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { };
+
     ezresto = callPackage ../development/ocaml-modules/resto/ezresto.nix { };
     ezresto-directory = callPackage ../development/ocaml-modules/resto/ezresto-directory.nix { };