Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'

Conflicts:
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix
	nixpkgs/pkgs/development/node-packages/default.nix
	nixpkgs/pkgs/development/python-modules/priority/deadline.patch

3 files changed, 50 insertions, 1 deletions

diff --git a/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix b/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix
index 72384c0994a2..138e7186624a 100644
--- a/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix
+++ b/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix
@@ -23,7 +23,8 @@ in buildFHSUserEnv {
   name = "platformio";
 
   targetPkgs = pio-pkgs;
-  multiPkgs = pio-pkgs;
+  # disabled temporarily because fastdiff no longer support 32bit
+  # multiPkgs = pio-pkgs;
 
   meta = with lib; {
     description = "An open source ecosystem for IoT development";
diff --git a/nixpkgs/pkgs/development/embedded/platformio/core.nix b/nixpkgs/pkgs/development/embedded/platformio/core.nix
index a3dcbdd35fdf..169ff4cd5a86 100644
--- a/nixpkgs/pkgs/development/embedded/platformio/core.nix
+++ b/nixpkgs/pkgs/development/embedded/platformio/core.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, python3
 , fetchFromGitHub
+, fetchPypi
 , git
 , spdx-license-list-data
 , version, src
@@ -20,6 +21,15 @@ let
         doCheck = false;
       });
 
+      ajsonrpc = super.ajsonrpc.overridePythonAttrs (oldAttrs: rec {
+        pname = "ajsonrpc";
+        version = "1.1.0";
+        src = fetchPypi {
+          inherit pname version;
+          sha256 = "sha256-CgHCtW0gxZho7ZavvEaODNc+KbFW4sAsHtM2Xk5Cuaw=";
+        };
+      });
+
       click = super.click.overridePythonAttrs (oldAttrs: rec {
         version = "7.1.2";
         src = oldAttrs.src.override {
@@ -28,6 +38,18 @@ let
         };
       });
 
+      starlette = super.starlette.overridePythonAttrs (oldAttrs: rec {
+        pname = "starlette";
+        version = "0.14.2";
+        src = fetchFromGitHub {
+          owner = "encode";
+          repo = pname;
+          rev = version;
+          sha256 = "sha256-Ki5jTEr5w6CrGK6F60E9uvdUlGx8pxdHMpxHvj9D4js=";
+        };
+        doCheck = false;
+      });
+
       uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec {
         version = "0.13.2";
         src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/development/embedded/tytools/default.nix b/nixpkgs/pkgs/development/embedded/tytools/default.nix
new file mode 100644
index 000000000000..027cfde2669a
--- /dev/null
+++ b/nixpkgs/pkgs/development/embedded/tytools/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook , qtbase}:
+
+stdenv.mkDerivation rec {
+  pname = "tytools";
+  version = "0.9.3";
+
+  src = fetchFromGitHub {
+    owner = "Koromix";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ax6j17f5nm0q4sp8sg1412hd48qp7whdy7dd699kwjcm763bl5j";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
+  buildInputs = [
+    qtbase
+  ];
+
+  meta = with lib; {
+    description = "Collection of tools to manage Teensy boards";
+    homepage = "https://koromix.dev/tytools";
+    license = licenses.unlicense;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ ahuzik ];
+  };
+}