From b33cd46247a563547a4cfe38f624621d84dcc868 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 09:45:59 +0800
Subject: [PATCH 01/38] pantheon.elementary-capnet-assist: 2.4.3 -> 2.4.4

https://github.com/elementary/capnet-assist/releases/tag/2.4.4
---
 .../pantheon/services/elementary-capnet-assist/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index fe2649f82a60..4b88ea3e5abd 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-capnet-assist";
-  version = "2.4.3";
+  version = "2.4.4";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "capnet-assist";
     rev = version;
-    sha256 = "sha256-06DWkLkVpdSYnKOR8zqA0tvWXYrglBM9R/XEIfIkwQU=";
+    sha256 = "sha256-vnFrGHt/rtrDmXokYRoebVpNLfkZPe5IShRsXCWWsXs=";
   };
 
   nativeBuildInputs = [

From 890c7a41e619b136a5ba373f8f33d43c793e8701 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 09:46:34 +0800
Subject: [PATCH 02/38] pantheon.elementary-camera: 6.2.1 -> 6.2.2

https://github.com/elementary/camera/releases/tag/6.2.2
---
 pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index ed0c6bd91807..b1bb55f1d39b 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-camera";
-  version = "6.2.1";
+  version = "6.2.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "camera";
     rev = version;
-    sha256 = "sha256-ijzEMGXoH0gACem/3JaC/aOIaOQgP7Y7n48NgoDMKBk=";
+    sha256 = "sha256-Sj89TBat2RY2Ms02M0P7gmE9tXYk1yrnPLzDwGyAFZA=";
   };
 
   nativeBuildInputs = [

From cc12b195fc4aea9ece32519028eaef5418ad1437 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 09:49:10 +0800
Subject: [PATCH 03/38] pantheon.elementary-music: 7.0.1 -> 7.1.0

https://github.com/elementary/music/releases/tag/7.1.0
---
 pkgs/desktops/pantheon/apps/elementary-music/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index b38e315ac773..258ff8e2dadb 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-music";
-  version = "7.0.1";
+  version = "7.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "music";
     rev = version;
-    sha256 = "sha256-PttmC1Z3rX2XWCECc320HMs692hSBsxkmnh1Q8a/Mg8=";
+    sha256 = "sha256-L+E5gDtIgVkfmOIhzS7x8vtyMJYqx/UQpYMChrt2Tgo=";
   };
 
   nativeBuildInputs = [

From 6912f855c63e070963481bce00e7c640384fae69 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 09:49:30 +0800
Subject: [PATCH 04/38] pantheon.elementary-calculator: 2.0.1 -> 2.0.2

https://github.com/elementary/calculator/releases/tag/2.0.2
---
 .../apps/elementary-calculator/default.nix       | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index b8c4c2035098..c06448bdc41a 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@@ -8,6 +8,8 @@
 , python3
 , vala
 , wrapGAppsHook4
+, elementary-gtk-theme
+, elementary-icon-theme
 , granite7
 , gtk4
 , libgee
@@ -15,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-calculator";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "calculator";
     rev = version;
-    sha256 = "sha256-7aKJDlpODIysrHtqtD5wfd+dULFpD+LfWsjzg3OAxkY=";
+    sha256 = "sha256-PLdPu43ns03vhBwaGw4BWCLNvcJbhUA+5Gr5b//TqfA=";
   };
 
   nativeBuildInputs = [
@@ -34,6 +36,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    elementary-icon-theme
     granite7
     gtk4
     libgee
@@ -44,6 +47,15 @@ stdenv.mkDerivation rec {
     patchShebangs meson/post_install.py
   '';
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      # The GTK theme is hardcoded.
+      --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
+      # The icon theme is hardcoded.
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
+    )
+  '';
+
   passthru = {
     updateScript = nix-update-script { };
   };

From 0680d20720f2e92a61b1d3ff1da47b9a15157741 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 09:49:55 +0800
Subject: [PATCH 05/38] pantheon.elementary-screenshot: 6.0.3 -> 6.0.4

https://github.com/elementary/screenshot/releases/tag/6.0.4
---
 pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
index b41dbaaae88c..1ac5d6979ebb 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-screenshot";
-  version = "6.0.3";
+  version = "6.0.4";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "screenshot";
     rev = version;
-    sha256 = "sha256-7BrowiMUDcf0raeOEFen2V3nenymgE6Rg5a3RilMQaI=";
+    sha256 = "sha256-xG67a19ySuYc5IXlEkaqhnDpDa2krF2y6PnhJkd/rOg=";
   };
 
   nativeBuildInputs = [

From bac13c5bd3735381e32f9bef353bd99d021f6806 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 1 Jun 2023 08:52:46 -0400
Subject: [PATCH 06/38] sccache: 0.5.0 -> 0.5.1

Diff: https://github.com/mozilla/sccache/compare/v0.5.0...v0.5.1

Changelog: https://github.com/mozilla/sccache/releases/tag/v0.5.1
---
 pkgs/development/tools/misc/sccache/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index 922cc63716c9..0a4652c8b251 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -1,17 +1,17 @@
 { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }:
 
 rustPlatform.buildRustPackage rec {
-  version = "0.5.0";
+  version = "0.5.1";
   pname = "sccache";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "sccache";
     rev = "v${version}";
-    sha256 = "sha256-WAIF+X+kwab/my7bineBsWImnHXKne1Suw+b8VM3xUg=";
+    sha256 = "sha256-RcosHR+PD78hk7XMClUCWICrtWR/9OxIuyCFy2EK/Qs=";
   };
 
-  cargoSha256 = "sha256-3+KxoSrZzrn/H4ZWB+jlZTMPo3EkKv/Z/gvBap1sMyg=";
+  cargoSha256 = "sha256-qDFBIU/IbQjLpTulI8tolFg54+2m2mV/JHuX4bsJYWw=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;

From a0b8571d02f61750528db7ebe49606a819d207a3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 1 Jun 2023 17:53:36 +0200
Subject: [PATCH 07/38] zigbee2mqtt: 1.30.4 -> 1.31.0

https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.31.0
---
 pkgs/servers/zigbee2mqtt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix
index 882f78948e41..ab2e77ea5daa 100644
--- a/pkgs/servers/zigbee2mqtt/default.nix
+++ b/pkgs/servers/zigbee2mqtt/default.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "zigbee2mqtt";
-  version = "1.30.4";
+  version = "1.31.0";
 
   src = fetchFromGitHub {
     owner = "Koenkk";
     repo = "zigbee2mqtt";
     rev = version;
-    hash = "sha256-jS5O52frZY+OVLtMZkjZQskKuHs5T8zKTwjGKh77EAo=";
+    hash = "sha256-9GCpHd8MHpL2XF0uNHVTznsdLDnQAplnZmNCNxckd74=";
   };
 
-  npmDepsHash = "sha256-71BbMBt0vXsuL8senZ7IvT3Y3OtvewQtWk1bzKUBtjI=";
+  npmDepsHash = "sha256-iONKkA0J1LFPbCi12Q1kxLIS2GBxKY7XvHOZIYWpsd8=";
 
   nativeBuildInputs = [
     python3

From 40ac1b1ba8eb131c63f02e6a33cba4178fb5f826 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 2 Jun 2023 00:06:57 +0800
Subject: [PATCH 08/38] k0sctl: 0.15.0 -> 0.15.1

Diff: https://github.com/k0sproject/k0sctl/compare/v0.15.0...v0.15.1
---
 pkgs/applications/networking/cluster/k0sctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix
index 986832658825..8995ace0125a 100644
--- a/pkgs/applications/networking/cluster/k0sctl/default.nix
+++ b/pkgs/applications/networking/cluster/k0sctl/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "k0sctl";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "k0sproject";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-i/XgEPuYNxn10eOXfF+X33oLlkO9r6daeygZcSdcicQ=";
+    sha256 = "sha256-80AmGc3SdniKayvviVoItrj8v+3m1sAJXSjoRJzw7mE=";
   };
 
-  vendorSha256 = "sha256-RTC2AEDzSafvJT/vuPjzs25PhuzBiPb32an/a/wpY04=";
+  vendorSha256 = "sha256-K4/sIHWVe1Wj8LJgrqfoOg1hHXvH3HEgU5vq82tzMSk=";
 
   ldflags = [
     "-s"

From 2dbd1e56c11d9d0bec67c598d5f988cc335561ab Mon Sep 17 00:00:00 2001
From: Sophie Tauchert <sophie@999eagle.moe>
Date: Thu, 1 Jun 2023 19:59:48 +0200
Subject: [PATCH 09/38] nixos/nitter: fix proxy option

---
 nixos/modules/services/misc/nitter.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/nitter.nix b/nixos/modules/services/misc/nitter.nix
index d00efe3dd485..9336dbe38f34 100644
--- a/nixos/modules/services/misc/nitter.nix
+++ b/nixos/modules/services/misc/nitter.nix
@@ -165,14 +165,14 @@ in
         enableDebug = mkEnableOption (lib.mdDoc "request logs and debug endpoints");
 
         proxy = mkOption {
-          type = types.nullOr types.str;
-          default = null;
+          type = types.str;
+          default = "";
           description = lib.mdDoc "URL to a HTTP/HTTPS proxy.";
         };
 
         proxyAuth = mkOption {
-          type = types.nullOr types.str;
-          default = null;
+          type = types.str;
+          default = "";
           description = lib.mdDoc "Credentials for proxy.";
         };
 

From b94a94bb487a9a1d17901a7b02c143398578b9de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Jun 2023 20:18:08 +0000
Subject: [PATCH 10/38] oh-my-posh: 16.8.0 -> 16.9.1

---
 pkgs/development/tools/oh-my-posh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix
index f20592292bdd..f082f137e195 100644
--- a/pkgs/development/tools/oh-my-posh/default.nix
+++ b/pkgs/development/tools/oh-my-posh/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "oh-my-posh";
-  version = "16.8.0";
+  version = "16.9.1";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-9uMnRGS9sO6Ps/acbAGuef6DbS49DrgFTJ9ad/VJ70g=";
+    hash = "sha256-oOpTjo0+3nTmQXgB5eGsQnklLdZdizy4HNx5enJ8Hb8=";
   };
 
-  vendorHash = "sha256-Jd/AsajX2gOEG+UA3+FI0rpiRXvbcBElx0lVJpsBJuM=";
+  vendorHash = "sha256-nODeIR5TU7tcmoQI7ZqCDxuESmx23Mj1WsFTcCB/htQ=";
 
   sourceRoot = "source/src";
 

From 5583d8c8c7a353ef1bb64c7a0d54302a649e278e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Jun 2023 20:35:12 +0000
Subject: [PATCH 11/38] python311Packages.azure-mgmt-recoveryservices: 2.3.0 ->
 2.4.0

---
 .../python-modules/azure-mgmt-recoveryservices/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
index a9158d8b581f..0dcafd78877a 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-recoveryservices";
-  version = "2.3.0";
+  version = "2.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-4L6Tqgvqh+nJyeXMolSpQ/2knAED75RQqD/lUDOt5ek=";
+    hash = "sha256-2JeOvtNxx6Z3AY4GI9fBRKbMcYVHsbrhk8C+5t5eelk=";
   };
 
   propagatedBuildInputs = [

From 10d2bd1b0aa93b41314e22ba2d599fff65b95422 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Thu, 1 Jun 2023 21:45:54 +0200
Subject: [PATCH 12/38] dasel: 2.3.3 -> 2.3.4

---
 pkgs/applications/misc/dasel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
index 0955fa93f8cc..7dfe56f54483 100644
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "dasel";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
     owner = "TomWright";
     repo = "dasel";
     rev = "v${version}";
-    sha256 = "sha256-RP5088h+KDKENaSf/I8pzFBrHx1cxPKtQRqyNm0CjuQ=";
+    sha256 = "sha256-/1CTtRTLgMlmFeubq3ebGnA9Do1mW6TtAXsCwi1JFmk=";
   };
 
   vendorHash = "sha256-cLf0MzEAykmtnPjT2vGOSPwIXJP6BhxheUaicT7o/X4=";

From 65ab8eac8beabf7185ac41c5c6bf3b91e0f02f13 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 1 Jun 2023 17:04:41 -0400
Subject: [PATCH 13/38] pods: 1.2.1 -> 1.2.2

Diff: https://github.com/marhkb/pods/compare/v1.2.1...v1.2.2

Changelog: https://github.com/marhkb/pods/releases/tag/v1.2.2
---
 .../virtualization/pods/Cargo.lock            | 77 ++++++++++---------
 .../virtualization/pods/default.nix           |  7 +-
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/virtualization/pods/Cargo.lock b/pkgs/applications/virtualization/pods/Cargo.lock
index a900b2bafb2c..7de6c8d42d4e 100644
--- a/pkgs/applications/virtualization/pods/Cargo.lock
+++ b/pkgs/applications/virtualization/pods/Cargo.lock
@@ -29,6 +29,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -83,7 +89,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -94,7 +100,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -221,13 +227,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.24"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "js-sys",
- "num-integer",
  "num-traits",
  "serde",
  "time 0.1.45",
@@ -249,8 +255,7 @@ dependencies = [
 [[package]]
 name = "containers-api"
 version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef94b0ff8338282b35bafb408eb0a3e53ba05bdb3b36840589ab9a67a6682593"
+source = "git+https://github.com/vv9k/containers-api#00efa72b05225df04f030284cd924cd9688a37a0"
 dependencies = [
  "chrono",
  "flate2",
@@ -366,7 +371,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -517,7 +522,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -1244,12 +1249,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
 
 [[package]]
 name = "malloc_buf"
@@ -1307,14 +1309,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
- "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1483,9 +1484,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
 
 [[package]]
 name = "oo7"
@@ -1615,7 +1616,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -1639,7 +1640,7 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 [[package]]
 name = "podman-api"
 version = "0.10.0"
-source = "git+https://github.com/vv9k/podman-api-rs.git#363d945b9b9905c50dfa0bfe0f9331f9fdeef079"
+source = "git+https://github.com/vv9k/podman-api-rs.git#92dd1200bc627709a290c094c4887638077c6d50"
 dependencies = [
  "base64",
  "byteorder",
@@ -1672,7 +1673,7 @@ dependencies = [
 
 [[package]]
 name = "pods"
-version = "1.2.1"
+version = "1.2.2"
 dependencies = [
  "anyhow",
  "ashpd",
@@ -1740,18 +1741,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.58"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
  "proc-macro2",
 ]
@@ -1884,7 +1885,7 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -1906,7 +1907,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -2032,9 +2033,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.16"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2120,7 +2121,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -2180,9 +2181,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.28.1"
+version = "1.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
 dependencies = [
  "autocfg",
  "bytes 1.4.0",
@@ -2281,7 +2282,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -2461,7 +2462,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
  "wasm-bindgen-shared",
 ]
 
@@ -2483,7 +2484,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2762,7 +2763,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]
 
 [[package]]
diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix
index 4c8e0cc3961e..6a725f439502 100644
--- a/pkgs/applications/virtualization/pods/default.nix
+++ b/pkgs/applications/virtualization/pods/default.nix
@@ -19,19 +19,20 @@
 
 stdenv.mkDerivation rec {
   pname = "pods";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "marhkb";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-xi9PmgSINW64vl1skQFjkTqnC6Dfty9eVFVFmMy9K9E=";
+    sha256 = "sha256-9gSLjnBExxLhbrsD2nYPwoUCmc2gE+afblQOcnWPap0=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "podman-api-0.10.0" = "sha256-zZUQdBbzIfClS2EDSkOTlR1e0R9lYbbgsICZeo6Yalc=";
+      "containers-api-0.8.0" = "sha256-jttd4n45OcsWWBu7nAL0Ny0ILjsAKtAIQN+Vkv34gdM=";
+      "podman-api-0.10.0" = "sha256-P3a/OgH26EFWJjYkEob4Cg90U5cR/fBF0LcFlosJlcU=";
     };
   };
 

From 46baca83e30590e0dd71416ff550b62c6c79e9bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Jun 2023 22:06:59 +0000
Subject: [PATCH 14/38] python310Packages.rzpipe: 0.5.0 -> 0.5.1

---
 pkgs/development/python-modules/rzpipe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rzpipe/default.nix b/pkgs/development/python-modules/rzpipe/default.nix
index 4000aaa26753..b2f31e85f54a 100644
--- a/pkgs/development/python-modules/rzpipe/default.nix
+++ b/pkgs/development/python-modules/rzpipe/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "rzpipe";
-  version = "0.5.0";
+  version = "0.5.1";
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-kEJg619HyX7loEBUsjpVtgF5dBzJtmM9/bQnUkDUjHU=";
+    hash = "sha256-0xbkdgMDiBwSzXmlVmRwHlLBgVmfZgmM8lQ4ALgmaBk=";
   };
 
   # No native rz_core library

From 255e61e1f10fc9e31efad65217fc3247550b1e1d Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Thu, 1 Jun 2023 18:03:23 +0200
Subject: [PATCH 15/38] fossil: 2.21 -> 2.22

---
 .../applications/version-management/fossil/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 0dc2c2696046..4731355ac0f3 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -15,13 +15,13 @@
 , withJson ? true
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fossil";
-  version = "2.21";
+  version = "2.22";
 
   src = fetchurl {
-    url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz";
-    hash = "sha256-wf7sp4ISTN52mSQHxw8s7//L4beLZtwkaJDYMVnvgIQ=";
+    url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz";
+    hash = "sha256-gdgj/29dF1s4TfqE7roNBS2nOjfNZs1yt4bnFnEhDWs=";
   };
 
   # required for build time tool `./tools/translate.c`
@@ -67,4 +67,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ maggesi viric ];
     platforms = platforms.all;
   };
-}
+})

From dcf201d275c9106943b5c16af9d5ed0e2d6248b9 Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Fri, 2 Jun 2023 07:44:51 +0900
Subject: [PATCH 16/38] nixosTests.virtualbox: remove cdepillabout as
 maintainer

---
 nixos/tests/virtualbox.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 0be22bdcaea6..1ebd99f5d75d 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -386,7 +386,7 @@ let
     '';
 
     meta = with pkgs.lib.maintainers; {
-      maintainers = [ aszlig cdepillabout ];
+      maintainers = [ aszlig ];
     };
   };
 

From e67ee61803779b2a5e93bd426f2143c37b43d16a Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Fri, 2 Jun 2023 07:45:17 +0900
Subject: [PATCH 17/38] roxterm: remove cdepillabout as maintainer

---
 pkgs/applications/terminal-emulators/roxterm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix
index 7444a8627b79..72b40c8cd2de 100644
--- a/pkgs/applications/terminal-emulators/roxterm/default.nix
+++ b/pkgs/applications/terminal-emulators/roxterm/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without
       the dependencies on Gnome.
     '';
-    maintainers = with maintainers; [ cdepillabout ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }

From 1f8daadffc109270fa46d1059c1c11f3e23139ae Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Fri, 2 Jun 2023 07:45:47 +0900
Subject: [PATCH 18/38] virtualbox: remove cdepillabout as maintainer

---
 pkgs/applications/virtualization/virtualbox/extpack.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 7e27e79d5dd7..f88979fce49d 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -19,7 +19,7 @@ fetchurl rec {
     description = "Oracle Extension pack for VirtualBox";
     license = licenses.virtualbox-puel;
     homepage = "https://www.virtualbox.org/";
-    maintainers = with maintainers; [ sander cdepillabout ];
+    maintainers = with maintainers; [ sander ];
     platforms = [ "x86_64-linux" ];
   };
 }

From d7f4cd8b1d5f52e16f668c950e485ab1dd54e60e Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Fri, 2 Jun 2023 07:46:33 +0900
Subject: [PATCH 19/38] python3Packages.kaggle: remove cdepillabout as
 maintainer

---
 pkgs/development/python-modules/kaggle/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix
index a07450fab76a..42cb7f83bb85 100644
--- a/pkgs/development/python-modules/kaggle/default.nix
+++ b/pkgs/development/python-modules/kaggle/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Official API for https://www.kaggle.com, accessible using a command line tool implemented in Python 3";
     homepage = "https://github.com/Kaggle/kaggle-api";
     license = licenses.asl20;
-    maintainers = with maintainers; [ cdepillabout ];
+    maintainers = with maintainers; [ ];
   };
 }

From 0977ab058d82317561b6e82f70f938ac3bc11fef Mon Sep 17 00:00:00 2001
From: Isa Ozler <isaozler@gmail.com>
Date: Fri, 2 Jun 2023 00:47:59 +0200
Subject: [PATCH 20/38] kode-mono font added v1.017

---
 maintainers/maintainer-list.nix       |  6 ++++++
 pkgs/data/fonts/kode-mono/default.nix | 28 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/data/fonts/kode-mono/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c0c968545f5f..34d40bc7a8e9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6880,6 +6880,12 @@
     githubId = 137306;
     name = "Michele Catalano";
   };
+  isaozler = {
+    email = "isaozler@gmail.com";
+    github = "isaozler";
+    githubId = 1378630;
+    name = "Isa Ozler";
+  };
   isgy = {
     name = "isgy";
     email = "isgy@teiyg.com";
diff --git a/pkgs/data/fonts/kode-mono/default.nix b/pkgs/data/fonts/kode-mono/default.nix
new file mode 100644
index 000000000000..b68851c91dff
--- /dev/null
+++ b/pkgs/data/fonts/kode-mono/default.nix
@@ -0,0 +1,28 @@
+{ lib, stdenvNoCC, fetchzip }:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "kode-mono";
+  version = "1.017";
+
+  src = fetchzip {
+    url = "https://github.com/isaozler/kode-mono/releases/download/${finalAttrs.version}/kode-mono-fonts.zip";
+    hash = "sha256-5bTciBQhWNUokOP3YzAwrvp7jeyiF4JMdJDX+6NXvLU=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm644 kode-mono-fonts/fonts/ttf/*.ttf      -t $out/share/fonts/truetype/
+    install -Dm644 kode-mono-fonts/fonts/variable/*.ttf -t $out/share/fonts/truetype/
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A custom-designed typeface explicitly created for the developer community";
+    homepage = "https://kodemono.com/";
+    changelog = "https://github.com/isaozler/kode-mono/blob/main/CHANGELOG.md";
+    license = licenses.ofl;
+    maintainers = [ maintainers.isaozler ];
+    platforms = platforms.all;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 373e4f383ed3..9c8297740ec8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28384,6 +28384,8 @@ with pkgs;
 
   kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 { };
 
+  kode-mono = callPackage ../data/fonts/kode-mono { };
+
   kopia = callPackage ../tools/backup/kopia { };
 
   kora-icon-theme = callPackage ../data/icons/kora-icon-theme {

From dbad685f5d7a73df38a3091497d625b4edf692da Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Fri, 2 Jun 2023 07:48:05 +0900
Subject: [PATCH 21/38] python3Packages.tensorflow-bin: remove cdepillabout as
 maintainer

---
 pkgs/development/python-modules/tensorflow/bin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index a2e7b2d21e8a..a988a39c388b 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -201,7 +201,7 @@ in buildPythonPackage {
     homepage = "http://tensorflow.org";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.asl20;
-    maintainers = with maintainers; [ jyp abbradar cdepillabout ];
+    maintainers = with maintainers; [ jyp abbradar ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 }

From 99ec2ebcff5047801edb2a01cf3259964937fe50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Jun 2023 23:17:56 +0000
Subject: [PATCH 22/38] python310Packages.langchain: 0.0.184 -> 0.0.188

---
 pkgs/development/python-modules/langchain/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index f53279a6deaa..9dee63430512 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -74,7 +74,7 @@
 
 buildPythonPackage rec {
   pname = "langchain";
-  version = "0.0.184";
+  version = "0.0.188";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -83,7 +83,7 @@ buildPythonPackage rec {
     owner = "hwchase17";
     repo = "langchain";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DIPlOsV+s7KQF70stCE7M2UwfvAqp3LskR0UtuOnuCs=";
+    hash = "sha256-hf0pfWPXdutUKDzt56Uc0Q02TzScLAegQZ2gdR2IM/c=";
   };
 
   postPatch = ''

From 38cbef594328dad53f3a57be03875f8cc10acd03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Jun 2023 00:22:59 +0000
Subject: [PATCH 23/38] httplib: 0.12.4 -> 0.12.5

---
 pkgs/development/libraries/httplib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix
index c1eaab6d5046..dca86affa633 100644
--- a/pkgs/development/libraries/httplib/default.nix
+++ b/pkgs/development/libraries/httplib/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "httplib";
-  version = "0.12.4";
+  version = "0.12.5";
 
   src = fetchFromGitHub {
     owner = "yhirose";
     repo = "cpp-httplib";
     rev = "v${version}";
-    hash = "sha256-tofgBLjVOuHgQW1iwOJER3VTj4L/uG0cBbaoXaKBWE0=";
+    hash = "sha256-9qCquF6DXpgtrfXVd/hc8n1Eu1nOxf/Lm+R13QI0N9Q=";
   };
 
   nativeBuildInputs = [ cmake ];

From 6996c23b103d9b9e64c55fec5d883509e9ec4403 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Jun 2023 02:50:16 +0200
Subject: [PATCH 24/38] python310Packages.aiohomekit: 2.6.3 -> 2.6.4

Diff: https://github.com/Jc2k/aiohomekit/compare/refs/tags/2.6.3...2.6.4

Changelog: https://github.com/Jc2k/aiohomekit/releases/tag/2.6.4
---
 pkgs/development/python-modules/aiohomekit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix
index 94b12357ad39..705e47946f26 100644
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomekit";
-  version = "2.6.3";
+  version = "2.6.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "Jc2k";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-bVvz5ruc1OpRnSKso3XHAnppnN/4ySfRHodE787eLFw=";
+    hash = "sha256-98VoRo3gxS70M/R0HYEK5VItJWcwMi8Z3r2eJ5lEeMw=";
   };
 
   nativeBuildInputs = [

From 9726a7860281f369afeec59dec327e1a8e2cc424 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Jun 2023 02:52:10 +0200
Subject: [PATCH 25/38] python310Packages.pyunifiprotect: 4.9.0 -> 4.9.1

Diff: https://github.com/briis/pyunifiprotect/compare/refs/tags/v4.9.0...v4.9.1

Changelog: https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v4.9.1
---
 pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix
index 92a8690d2786..c2d92b9d789c 100644
--- a/pkgs/development/python-modules/pyunifiprotect/default.nix
+++ b/pkgs/development/python-modules/pyunifiprotect/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "pyunifiprotect";
-  version = "4.9.0";
+  version = "4.9.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     owner = "briis";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-fIkZh/fkeVzQyEa4goGnaCxOWsKLKRlw+0/nGBDmKlY=";
+    hash = "sha256-ESTJx3wyM59yzfEykYFobgInQVBEzESCIl2dhTOGUKw=";
   };
 
   postPatch = ''

From 2020419870baf80edce8133a6c04da0163ffdbe1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Jun 2023 02:52:57 +0200
Subject: [PATCH 26/38] python310Packages.onvif-zeep-async: 3.1.8 -> 3.1.9

---
 pkgs/development/python-modules/onvif-zeep-async/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix
index c396941723b0..e4befe938454 100644
--- a/pkgs/development/python-modules/onvif-zeep-async/default.nix
+++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "onvif-zeep-async";
-  version = "3.1.8";
+  version = "3.1.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UiONj4ANsB5l2/ypWWfUK5ELoLsnUuyrFeldgITwIo4=";
+    hash = "sha256-szvRN2EmBV4BEM7EuL/Db5hwBtXwbn7M21h9NzS8l3k=";
   };
 
   propagatedBuildInputs = [

From 03e26b5eeea14d95240b9a9258993a3236629bd6 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 1 Jun 2023 20:53:11 -0400
Subject: [PATCH 27/38] typos: 1.14.11 -> 1.14.12

Diff: https://github.com/crate-ci/typos/compare/v1.14.11...v1.14.12

Changelog: https://github.com/crate-ci/typos/blob/v1.14.12/CHANGELOG.md
---
 pkgs/development/tools/typos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix
index 57fc89d70874..eeb0179d2103 100644
--- a/pkgs/development/tools/typos/default.nix
+++ b/pkgs/development/tools/typos/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "typos";
-  version = "1.14.11";
+  version = "1.14.12";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-4E28pBZ+uWDaEXty4ZgbbEcO3lpluOXopgPr/6Xl/z4=";
+    hash = "sha256-mHgGNSG0mKuI3fIgbfcTI6rnsLiL41g6GZAyN8ZRXI0=";
   };
 
-  cargoHash = "sha256-BegIKd+1K1Dh1ULIiRcpkq/5JdlofRURmRTtyD0tWMg=";
+  cargoHash = "sha256-mHmnQ2hntP/FRHgKrwQHcY1+l9ukIvu8SNUSzuRbyf4=";
 
   meta = with lib; {
     description = "Source code spell checker";

From cb41a46d47b91fee0bb7243ceb2bec30a4e02377 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Jun 2023 02:54:28 +0200
Subject: [PATCH 28/38] python310Packages.twilio: 8.2.1 -> 8.2.2

Diff: https://github.com/twilio/twilio-python/compare/refs/tags/8.2.1...8.2.2

Changelog: https://github.com/twilio/twilio-python/blob/8.2.2/CHANGES.md
---
 pkgs/development/python-modules/twilio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 02cb7501cbeb..475af0b4d4aa 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "8.2.1";
+  version = "8.2.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "twilio";
     repo = "twilio-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-joL+6+LfrF2bWkw3hViA97RYqcMVWw+MlHub+OaXlgI=";
+    hash = "sha256-UXQMDP5JjxTnHpvw730Yz0U8/CwYdRz3R64TP0Zgbcw=";
   };
 
   propagatedBuildInputs = [

From 2d6ac4d3d443b5fd958f08243fdab150f0a6b0dc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Jun 2023 02:54:57 +0200
Subject: [PATCH 29/38] python310Packages.python-roborock: 0.18.9 -> 0.20.1

Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v0.18.9...v0.20.1

Changelog: https://github.com/humbertogontijo/python-roborock/blob/v0.20.1/CHANGELOG.md
---
 pkgs/development/python-modules/python-roborock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index 6526aab935b7..c3861896b1ab 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "python-roborock";
-  version = "0.18.9";
+  version = "0.20.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "humbertogontijo";
     repo = "python-roborock";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hF05lpUYaLgaUcAo2vlAu0Lk2mdHrlcUSfHHkysHqnc=";
+    hash = "sha256-JtbtAiQnAeGUoBS954xIEXHZkk3s976amodlFJOOJZY=";
   };
 
   nativeBuildInputs = [

From 28c0e38a72cc11dac8cc79741e5b0f0c424ca16b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Jun 2023 02:57:11 +0200
Subject: [PATCH 30/38] trufflehog: 3.36.0 -> 3.39.0

Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.36.0...v3.39.0

Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.39.0
---
 pkgs/tools/security/trufflehog/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index 54b03747adbb..76b27bfebbf6 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.36.0";
+  version = "3.39.0";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Vp6WsbGy5h9Vd41D07KAuXnVE13cxPIQyeHJBqkAps4=";
+    hash = "sha256-CAYUp/GoGvz/HEVR21Xro50dOefqvNMwo8wo8/MNJko=";
   };
 
-  vendorHash = "sha256-3096/8s50Xsbn5PryC7mW70Wn7uNFIn1THdOVBw9BHk=";
+  vendorHash = "sha256-eYUoWBNHoXiFvI1zaZ301KayESJWVqbD3D4NytqcDGk=";
 
   ldflags = [
     "-s"

From 08c1328fc47198d8d71615be420bc7b4089947ec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Jun 2023 02:58:00 +0200
Subject: [PATCH 31/38] python310Packages.meshtastic: 2.1.7 -> 2.1.8

Diff: https://github.com/meshtastic/Meshtastic-python/compare/refs/tags/2.1.7...2.1.8

Changelog: https://github.com/meshtastic/python/releases/tag/2.1.8
---
 pkgs/development/python-modules/meshtastic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index d2ce15940788..bbe1f86eaaff 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.1.7";
+  version = "2.1.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "Meshtastic-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-9uzXDgmUF0pHJ+AW/ao3EBsbqozGzzF1+W8YNLViNM0=";
+    hash = "sha256-ZIUR9YMoXhbpIDWXxKr6TyNkANuRiJvhkJILx7mWSrw=";
   };
 
   propagatedBuildInputs = [

From c7f0b8d0acf4b37c08eef9e4816be602e5c867db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Jun 2023 02:59:53 +0200
Subject: [PATCH 32/38] python310Packages.meilisearch: 0.26.0 -> 0.27.0

Diff: https://github.com/meilisearch/meilisearch-python/compare/refs/tags/v0.26.0...v0.27.0

Changelog: https://github.com/meilisearch/meilisearch-python/releases/tag/v0.27.0
---
 pkgs/development/python-modules/meilisearch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix
index c7167d902de5..8272ba21db9d 100644
--- a/pkgs/development/python-modules/meilisearch/default.nix
+++ b/pkgs/development/python-modules/meilisearch/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "meilisearch";
-  version = "0.26.0";
+  version = "0.27.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "meilisearch";
     repo = "meilisearch-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DhArrKIA9S/huO3QRjZNZ2xOpHybZgj6tIBKfRX6ZYg=";
+    hash = "sha256-3oIJ+kz26RljfCw7hu7loRcw9QIP4iLLHtS0OURbO3A=";
   };
 
   nativeBuildInputs = [

From d460d7684b8ed9038171a341a8ee4da672d51b86 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Jun 2023 03:01:06 +0200
Subject: [PATCH 33/38] python310Packages.dvc-data: 0.53.0 -> 0.54.2

Diff: https://github.com/iterative/dvc-data/compare/refs/tags/0.53.0...0.54.2

Changelog: https://github.com/iterative/dvc-data/releases/tag/0.54.2
---
 pkgs/development/python-modules/dvc-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix
index 648722311d43..4eb5f8cfa361 100644
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-data";
-  version = "0.53.0";
+  version = "0.54.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-RPLsn2IyegfpVtBNupUJCOaewtXGq0bmYToe2GEYBf0=";
+    hash = "sha256-wvb+GcNt9oCe3B21GHCCFLL8Zy0QzaxrVwHFK5ZmqRY=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From f6205eedda7b3829dd55a8c213289e24a16b2cf1 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 29 May 2023 23:42:17 -0300
Subject: [PATCH 34/38] tecoc: rewrite expression

---
 pkgs/applications/editors/tecoc/default.nix | 36 ++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix
index f5ad8d947c7b..df0ddf34d201 100644
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/pkgs/applications/editors/tecoc/default.nix
@@ -4,7 +4,7 @@
 , ncurses
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "tecoc";
   version = "unstable-2020-11-03";
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "blakemcbride";
     repo = "TECOC";
     rev = "79fcb6cfd6c5f9759f6ec46aeaf86d5806b13a0b";
-    sha256 = "sha256-JooLvoh9CxLHLOXXxE7zA7R9yglr9BGUwX4nrw2/vIw=";
+    hash = "sha256-JooLvoh9CxLHLOXXxE7zA7R9yglr9BGUwX4nrw2/vIw=";
   };
 
   buildInputs = [ ncurses ];
@@ -27,29 +27,30 @@ stdenv.mkDerivation rec {
              then "makefile.win"
              else "makefile.linux"; # I think Linux is a safe default...
 
-  makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ];
-
-  preInstall = ''
-    install -d $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros
-  '';
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "-C src/" ];
 
   installPhase = ''
     runHook preInstall
+
+    install -d $out/bin $out/share/doc/tecoc $out/lib/teco/macros
     install -m755 src/tecoc $out/bin
-    install -m644 src/aaout.txt doc/* $out/share/doc/${pname}-${version}
+    install -m644 src/aaout.txt doc/* $out/share/doc/tecoc
     install -m644 lib/* lib2/* $out/lib/teco/macros
+
     runHook postInstall
   '';
 
-  postInstall = ''
-    (cd $out/bin
-     ln -s tecoc Make
-     ln -s tecoc mung
-     ln -s tecoc teco
-     ln -s tecoc Inspect )
+  postFixup = ''
+    pushd $out/bin
+    ln -s tecoc Make
+    ln -s tecoc mung
+    ln -s tecoc teco
+    ln -s tecoc Inspect
+    popd
   '';
 
-  meta = with lib; {
+  meta = {
+    homepage = "https://github.com/blakemcbride/TECOC";
     description = "A clone of the good old TECO editor";
     longDescription = ''
       For those who don't know: TECO is the acronym of Tape Editor and COrrector
@@ -65,11 +66,10 @@ stdenv.mkDerivation rec {
 
       TECOC is a portable C implementation of TECO-11.
     '';
-    homepage = "https://github.com/blakemcbride/TECOC";
     license = {
       url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt";
     };
-    maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.unix;
+    maintainers = [ lib.maintainers.AndersonTorres ];
+    platforms = lib.platforms.unix;
   };
 }

From 706a5c0326f59ba561ce4b6a8b57516c4dbf6258 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Tue, 30 May 2023 21:48:06 -0300
Subject: [PATCH 35/38] tecoc: unstable-2020-11-03 -> unstable-2023-04-21

Also, an experimental updater
---
 pkgs/applications/editors/tecoc/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix
index df0ddf34d201..94889a13ef6d 100644
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/pkgs/applications/editors/tecoc/default.nix
@@ -2,17 +2,18 @@
 , lib
 , fetchFromGitHub
 , ncurses
+, unstableGitUpdater
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tecoc";
-  version = "unstable-2020-11-03";
+  version = "unstable-2023-04-21";
 
   src = fetchFromGitHub {
     owner = "blakemcbride";
     repo = "TECOC";
-    rev = "79fcb6cfd6c5f9759f6ec46aeaf86d5806b13a0b";
-    hash = "sha256-JooLvoh9CxLHLOXXxE7zA7R9yglr9BGUwX4nrw2/vIw=";
+    rev = "021d1d15242b9d6c84d70c9ffcf1871793898f0a";
+    hash = "sha256-VGIO+uiAZkdzLYmJztmnKTS4HDIVow4AimaneHj7E1M=";
   };
 
   buildInputs = [ ncurses ];
@@ -49,6 +50,10 @@ stdenv.mkDerivation {
     popd
   '';
 
+  passthru.updateScript = unstableGitUpdater {
+    url = finalAttrs.meta.homepage;
+  };
+
   meta = {
     homepage = "https://github.com/blakemcbride/TECOC";
     description = "A clone of the good old TECO editor";
@@ -72,4 +77,4 @@ stdenv.mkDerivation {
     maintainers = [ lib.maintainers.AndersonTorres ];
     platforms = lib.platforms.unix;
   };
-}
+})

From 999de7c031c25ef41c372000aa50b8ea3b40bdfc Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Tue, 30 May 2023 22:26:19 -0300
Subject: [PATCH 36/38] tecoc: refactor

Because I want to test this!
---
 pkgs/applications/editors/tecoc/default.nix | 82 ++-------------------
 pkgs/applications/editors/tecoc/generic.nix | 49 ++++++++++++
 pkgs/applications/editors/tecoc/sources.nix | 46 ++++++++++++
 3 files changed, 102 insertions(+), 75 deletions(-)
 create mode 100644 pkgs/applications/editors/tecoc/generic.nix
 create mode 100644 pkgs/applications/editors/tecoc/sources.nix

diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix
index 94889a13ef6d..fda796ad455a 100644
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/pkgs/applications/editors/tecoc/default.nix
@@ -1,80 +1,12 @@
-{ stdenv
+{ callPackage
 , lib
 , fetchFromGitHub
-, ncurses
 , unstableGitUpdater
 }:
 
-stdenv.mkDerivation (finalAttrs: {
-  pname = "tecoc";
-  version = "unstable-2023-04-21";
-
-  src = fetchFromGitHub {
-    owner = "blakemcbride";
-    repo = "TECOC";
-    rev = "021d1d15242b9d6c84d70c9ffcf1871793898f0a";
-    hash = "sha256-VGIO+uiAZkdzLYmJztmnKTS4HDIVow4AimaneHj7E1M=";
-  };
-
-  buildInputs = [ ncurses ];
-
-  makefile = if stdenv.hostPlatform.isDarwin
-             then "makefile.osx"
-             else if stdenv.hostPlatform.isFreeBSD
-             then "makefile.bsd"
-             else if stdenv.hostPlatform.isOpenBSD
-             then "makefile.bsd"
-             else if stdenv.hostPlatform.isWindows
-             then "makefile.win"
-             else "makefile.linux"; # I think Linux is a safe default...
-
-  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "-C src/" ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -d $out/bin $out/share/doc/tecoc $out/lib/teco/macros
-    install -m755 src/tecoc $out/bin
-    install -m644 src/aaout.txt doc/* $out/share/doc/tecoc
-    install -m644 lib/* lib2/* $out/lib/teco/macros
-
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    pushd $out/bin
-    ln -s tecoc Make
-    ln -s tecoc mung
-    ln -s tecoc teco
-    ln -s tecoc Inspect
-    popd
-  '';
-
-  passthru.updateScript = unstableGitUpdater {
-    url = finalAttrs.meta.homepage;
-  };
-
-  meta = {
-    homepage = "https://github.com/blakemcbride/TECOC";
-    description = "A clone of the good old TECO editor";
-    longDescription = ''
-      For those who don't know: TECO is the acronym of Tape Editor and COrrector
-      (because it was a paper tape edition tool in its debut days). Now the
-      acronym follows after Text Editor and Corrector, or Text Editor
-      Character-Oriented.
-
-      TECO is a character-oriented text editor, originally developed by Dan
-      Murphy at MIT circa 1962. It is also a Turing-complete imperative
-      interpreted programming language for text manipulation, done via
-      user-loaded sets of macros. In fact, the venerable Emacs was born as a set
-      of Editor MACroS for TECO.
-
-      TECOC is a portable C implementation of TECO-11.
-    '';
-    license = {
-      url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt";
-    };
-    maintainers = [ lib.maintainers.AndersonTorres ];
-    platforms = lib.platforms.unix;
-  };
-})
+let
+  inherit (import ./sources.nix {
+    inherit lib fetchFromGitHub unstableGitUpdater;
+  }) tecoc-unstable;
+in
+callPackage (tecoc-unstable) {}
diff --git a/pkgs/applications/editors/tecoc/generic.nix b/pkgs/applications/editors/tecoc/generic.nix
new file mode 100644
index 000000000000..0f84355021d6
--- /dev/null
+++ b/pkgs/applications/editors/tecoc/generic.nix
@@ -0,0 +1,49 @@
+{ pname
+, version
+, src
+, passthru
+, meta
+}:
+
+{ lib
+, stdenv
+, ncurses
+}:
+
+stdenv.mkDerivation {
+  inherit pname version src passthru meta;
+
+  buildInputs = [ ncurses ];
+
+  makefile = if stdenv.hostPlatform.isDarwin
+             then "makefile.osx"
+             else if stdenv.hostPlatform.isFreeBSD
+             then "makefile.bsd"
+             else if stdenv.hostPlatform.isOpenBSD
+             then "makefile.bsd"
+             else if stdenv.hostPlatform.isWindows
+             then "makefile.win"
+             else "makefile.linux"; # I think Linux is a safe default...
+
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "-C src/" ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -d $out/bin $out/share/doc/tecoc $out/lib/teco/macros
+    install -m755 src/tecoc $out/bin
+    install -m644 src/aaout.txt doc/* $out/share/doc/tecoc
+    install -m644 lib/* lib2/* $out/lib/teco/macros
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    pushd $out/bin
+    ln -s tecoc Make
+    ln -s tecoc mung
+    ln -s tecoc teco
+    ln -s tecoc Inspect
+    popd
+  '';
+}
diff --git a/pkgs/applications/editors/tecoc/sources.nix b/pkgs/applications/editors/tecoc/sources.nix
new file mode 100644
index 000000000000..656cd3a50faa
--- /dev/null
+++ b/pkgs/applications/editors/tecoc/sources.nix
@@ -0,0 +1,46 @@
+{ lib
+, fetchFromGitHub
+, unstableGitUpdater
+}:
+
+{
+  tecoc-unstable = import ./generic.nix {
+    pname = "tecoc";
+    version = "unstable-2023-04-21";
+
+    src = fetchFromGitHub {
+      owner = "blakemcbride";
+      repo = "TECOC";
+      rev = "021d1d15242b9d6c84d70c9ffcf1871793898f0a";
+      hash = "sha256-VGIO+uiAZkdzLYmJztmnKTS4HDIVow4AimaneHj7E1M=";
+    };
+
+    passthru.updateScript = unstableGitUpdater {
+      url = "https://github.com/blakemcbride/TECOC";
+    };
+
+    meta = {
+      homepage = "https://github.com/blakemcbride/TECOC";
+      description = "A clone of the good old TECO editor";
+      longDescription = ''
+        For those who don't know: TECO is the acronym of Tape Editor and COrrector
+        (because it was a paper tape edition tool in its debut days). Now the
+        acronym follows after Text Editor and Corrector, or Text Editor
+        Character-Oriented.
+
+        TECO is a character-oriented text editor, originally developed by Dan
+        Murphy at MIT circa 1962. It is also a Turing-complete imperative
+        interpreted programming language for text manipulation, done via
+        user-loaded sets of macros. In fact, the venerable Emacs was born as a set
+        of Editor MACroS for TECO.
+
+        TECOC is a portable C implementation of TECO-11.
+      '';
+      license = {
+        url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt";
+      };
+      maintainers = [ lib.maintainers.AndersonTorres ];
+      platforms = lib.platforms.unix;
+    };
+  };
+}

From b63c643631665264060c9bf31849dd6566e17e8f Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 31 May 2023 22:48:02 -0300
Subject: [PATCH 37/38] Revert "tecoc: refactor"

This reverts commit a323e083c8c71a018fda346f77881b8805145a65.

The old form is better for the present purposes.
---
 pkgs/applications/editors/tecoc/default.nix | 82 +++++++++++++++++++--
 pkgs/applications/editors/tecoc/generic.nix | 49 ------------
 pkgs/applications/editors/tecoc/sources.nix | 46 ------------
 3 files changed, 75 insertions(+), 102 deletions(-)
 delete mode 100644 pkgs/applications/editors/tecoc/generic.nix
 delete mode 100644 pkgs/applications/editors/tecoc/sources.nix

diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix
index fda796ad455a..94889a13ef6d 100644
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/pkgs/applications/editors/tecoc/default.nix
@@ -1,12 +1,80 @@
-{ callPackage
+{ stdenv
 , lib
 , fetchFromGitHub
+, ncurses
 , unstableGitUpdater
 }:
 
-let
-  inherit (import ./sources.nix {
-    inherit lib fetchFromGitHub unstableGitUpdater;
-  }) tecoc-unstable;
-in
-callPackage (tecoc-unstable) {}
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tecoc";
+  version = "unstable-2023-04-21";
+
+  src = fetchFromGitHub {
+    owner = "blakemcbride";
+    repo = "TECOC";
+    rev = "021d1d15242b9d6c84d70c9ffcf1871793898f0a";
+    hash = "sha256-VGIO+uiAZkdzLYmJztmnKTS4HDIVow4AimaneHj7E1M=";
+  };
+
+  buildInputs = [ ncurses ];
+
+  makefile = if stdenv.hostPlatform.isDarwin
+             then "makefile.osx"
+             else if stdenv.hostPlatform.isFreeBSD
+             then "makefile.bsd"
+             else if stdenv.hostPlatform.isOpenBSD
+             then "makefile.bsd"
+             else if stdenv.hostPlatform.isWindows
+             then "makefile.win"
+             else "makefile.linux"; # I think Linux is a safe default...
+
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "-C src/" ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -d $out/bin $out/share/doc/tecoc $out/lib/teco/macros
+    install -m755 src/tecoc $out/bin
+    install -m644 src/aaout.txt doc/* $out/share/doc/tecoc
+    install -m644 lib/* lib2/* $out/lib/teco/macros
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    pushd $out/bin
+    ln -s tecoc Make
+    ln -s tecoc mung
+    ln -s tecoc teco
+    ln -s tecoc Inspect
+    popd
+  '';
+
+  passthru.updateScript = unstableGitUpdater {
+    url = finalAttrs.meta.homepage;
+  };
+
+  meta = {
+    homepage = "https://github.com/blakemcbride/TECOC";
+    description = "A clone of the good old TECO editor";
+    longDescription = ''
+      For those who don't know: TECO is the acronym of Tape Editor and COrrector
+      (because it was a paper tape edition tool in its debut days). Now the
+      acronym follows after Text Editor and Corrector, or Text Editor
+      Character-Oriented.
+
+      TECO is a character-oriented text editor, originally developed by Dan
+      Murphy at MIT circa 1962. It is also a Turing-complete imperative
+      interpreted programming language for text manipulation, done via
+      user-loaded sets of macros. In fact, the venerable Emacs was born as a set
+      of Editor MACroS for TECO.
+
+      TECOC is a portable C implementation of TECO-11.
+    '';
+    license = {
+      url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt";
+    };
+    maintainers = [ lib.maintainers.AndersonTorres ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/applications/editors/tecoc/generic.nix b/pkgs/applications/editors/tecoc/generic.nix
deleted file mode 100644
index 0f84355021d6..000000000000
--- a/pkgs/applications/editors/tecoc/generic.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ pname
-, version
-, src
-, passthru
-, meta
-}:
-
-{ lib
-, stdenv
-, ncurses
-}:
-
-stdenv.mkDerivation {
-  inherit pname version src passthru meta;
-
-  buildInputs = [ ncurses ];
-
-  makefile = if stdenv.hostPlatform.isDarwin
-             then "makefile.osx"
-             else if stdenv.hostPlatform.isFreeBSD
-             then "makefile.bsd"
-             else if stdenv.hostPlatform.isOpenBSD
-             then "makefile.bsd"
-             else if stdenv.hostPlatform.isWindows
-             then "makefile.win"
-             else "makefile.linux"; # I think Linux is a safe default...
-
-  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "-C src/" ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -d $out/bin $out/share/doc/tecoc $out/lib/teco/macros
-    install -m755 src/tecoc $out/bin
-    install -m644 src/aaout.txt doc/* $out/share/doc/tecoc
-    install -m644 lib/* lib2/* $out/lib/teco/macros
-
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    pushd $out/bin
-    ln -s tecoc Make
-    ln -s tecoc mung
-    ln -s tecoc teco
-    ln -s tecoc Inspect
-    popd
-  '';
-}
diff --git a/pkgs/applications/editors/tecoc/sources.nix b/pkgs/applications/editors/tecoc/sources.nix
deleted file mode 100644
index 656cd3a50faa..000000000000
--- a/pkgs/applications/editors/tecoc/sources.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ lib
-, fetchFromGitHub
-, unstableGitUpdater
-}:
-
-{
-  tecoc-unstable = import ./generic.nix {
-    pname = "tecoc";
-    version = "unstable-2023-04-21";
-
-    src = fetchFromGitHub {
-      owner = "blakemcbride";
-      repo = "TECOC";
-      rev = "021d1d15242b9d6c84d70c9ffcf1871793898f0a";
-      hash = "sha256-VGIO+uiAZkdzLYmJztmnKTS4HDIVow4AimaneHj7E1M=";
-    };
-
-    passthru.updateScript = unstableGitUpdater {
-      url = "https://github.com/blakemcbride/TECOC";
-    };
-
-    meta = {
-      homepage = "https://github.com/blakemcbride/TECOC";
-      description = "A clone of the good old TECO editor";
-      longDescription = ''
-        For those who don't know: TECO is the acronym of Tape Editor and COrrector
-        (because it was a paper tape edition tool in its debut days). Now the
-        acronym follows after Text Editor and Corrector, or Text Editor
-        Character-Oriented.
-
-        TECO is a character-oriented text editor, originally developed by Dan
-        Murphy at MIT circa 1962. It is also a Turing-complete imperative
-        interpreted programming language for text manipulation, done via
-        user-loaded sets of macros. In fact, the venerable Emacs was born as a set
-        of Editor MACroS for TECO.
-
-        TECOC is a portable C implementation of TECO-11.
-      '';
-      license = {
-        url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt";
-      };
-      maintainers = [ lib.maintainers.AndersonTorres ];
-      platforms = lib.platforms.unix;
-    };
-  };
-}

From 41be8364beaced61a26cb4a6b627974145540315 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Jun 2023 05:00:40 +0000
Subject: [PATCH 38/38] crowdin-cli: 3.11.1 -> 3.12.0

---
 pkgs/tools/text/crowdin-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix
index a657ab6ecc11..70dfdc325c95 100644
--- a/pkgs/tools/text/crowdin-cli/default.nix
+++ b/pkgs/tools/text/crowdin-cli/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "crowdin-cli";
-  version = "3.11.1";
+  version = "3.12.0";
 
   src = fetchurl {
     url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
-    hash = "sha256-T2yQdy9HNy1Hp/iFLSlUqkssWONsg0ikHDMK1iPOIGY=";
+    hash = "sha256-Key8zmFpQibTTaxbZT6kd6re9EdJ3wgEj+WiLervJiE=";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper unzip ];