From 71d6ed698f6a6228fe97f69ea761614dd602a8bd Mon Sep 17 00:00:00 2001
From: rewine <lhongxu@outlook.com>
Date: Sun, 14 May 2023 05:32:38 +0800
Subject: [PATCH 01/31] nixos/gnupg: default to qt pinentry program in deepin

---
 nixos/modules/programs/gnupg.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index cb8d0ecff4cb..764a67a160c1 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -10,7 +10,8 @@ let
 
   defaultPinentryFlavor =
     if xserverCfg.desktopManager.lxqt.enable
-    || xserverCfg.desktopManager.plasma5.enable then
+    || xserverCfg.desktopManager.plasma5.enable
+    || xserverCfg.desktopManager.deepin.enable then
       "qt"
     else if xserverCfg.desktopManager.xfce.enable then
       "gtk2"

From 333d285072d7e026f50003e69b1758130bf7a22e Mon Sep 17 00:00:00 2001
From: rewine <lhongxu@outlook.com>
Date: Sun, 14 May 2023 15:45:47 +0800
Subject: [PATCH 02/31] deepin.deepin-screensaver: init at 5.0.16

---
 .../apps/deepin-screensaver/default.nix       | 69 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/desktops/deepin/apps/deepin-screensaver/default.nix

diff --git a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
new file mode 100644
index 000000000000..27b96a23937a
--- /dev/null
+++ b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
@@ -0,0 +1,69 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, qmake
+, qttools
+, pkg-config
+, wrapQtAppsHook
+, qtbase
+, qtx11extras
+, qtdeclarative
+, dtkwidget
+, dde-qt-dbus-factory
+, xorg
+, xscreensaver
+}:
+
+stdenv.mkDerivation rec {
+  pname = "deepin-screensaver";
+  version = "5.0.16";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-d/BllaXZxRdJe8nH+hhQIEutpBvAWFnBHWbIjznUfQU=";
+  };
+
+  postPatch = ''
+    patchShebangs {src,customscreensaver/deepin-custom-screensaver}/{generate_translations.sh,update_translations.sh}
+
+    substituteInPlace src/{dbusscreensaver.cpp,com.deepin.ScreenSaver.service,src.pro} \
+      customscreensaver/deepin-custom-screensaver/deepin-custom-screensaver.pro \
+      --replace "/usr" "$out" \
+      --replace "/etc" "$out/etc"
+
+    substituteInPlace tools/preview/main.cpp \
+      --replace "/usr/lib/xscreensaver" "${xscreensaver}/libexec/xscreensaver"
+  '';
+
+  nativeBuildInputs = [
+    qmake
+    qttools
+    pkg-config
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qtbase
+    qtx11extras
+    qtdeclarative
+    dtkwidget
+    dde-qt-dbus-factory
+    xorg.libXScrnSaver
+  ];
+
+  qmakeFlags = [
+    "XSCREENSAVER_DATA_PATH=${xscreensaver}/libexec/xscreensaver"
+    "COMPILE_ON_V23=false"
+  ];
+
+  meta = with lib; {
+    description = "A screensaver service developed by deepin";
+    homepage = "https://github.com/linuxdeepin/deepin-screensaver";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = teams.deepin.members;
+  };
+}
+
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index c11114e9899f..524e4ee0f1f0 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -57,6 +57,7 @@ let
     deepin-terminal = callPackage ./apps/deepin-terminal { };
     deepin-reader = callPackage ./apps/deepin-reader { };
     deepin-voice-note = callPackage ./apps/deepin-voice-note { };
+    deepin-screensaver = callPackage ./apps/deepin-screensaver { };
 
     #### Go Packages
     go-lib = callPackage ./go-package/go-lib { };

From a1a072ee66f82eba4949688d5afd41b9c64f4ba4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 May 2023 13:56:21 +0200
Subject: [PATCH 03/31] python310Packages.clean-fid: init at 0.1.35

---
 .../python-modules/clean-fid/default.nix      | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/clean-fid/default.nix

diff --git a/pkgs/development/python-modules/clean-fid/default.nix b/pkgs/development/python-modules/clean-fid/default.nix
new file mode 100644
index 000000000000..7a2f328185e4
--- /dev/null
+++ b/pkgs/development/python-modules/clean-fid/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# dependencies
+, numpy
+, pillow
+, requests
+, scipy
+, torch
+, torchvision
+, tqdm
+}:
+
+buildPythonPackage rec {
+  pname = "clean-fid";
+  version = "0.1.35";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "GaParmar";
+    repo = "clean-fid";
+    rev = "c8ffa420a3923e8fd87c1e75170de2cf59d2644b";
+    hash = "sha256-fqBU/TmCXDTPU3KTP0+VYQoP+HsT2UMcZeLzQHKD9hw=";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    pillow
+    requests
+    scipy
+    torch
+    torchvision
+    tqdm
+  ];
+
+  pythonImportsCheck = [
+    "cleanfid"
+  ];
+
+  # no tests1
+  doCheck = false;
+
+  meta = with lib; {
+    description = "PyTorch - FID calculation with proper image resizing and quantization steps [CVPR 2022]";
+    homepage = "https://github.com/GaParmar/clean-fid";
+    license = licenses.mit;
+    maintainers = teams.tts.members;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 06f8e307c77e..fc37a0252fb2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1833,6 +1833,8 @@ self: super: with self; {
 
   cle = callPackage ../development/python-modules/cle { };
 
+  clean-fid = callPackage ../development/python-modules/clean-fid { };
+
   cleo = callPackage ../development/python-modules/cleo { };
 
   clevercsv = callPackage ../development/python-modules/clevercsv { };

From 1b28a9b9b886f008cae25783bf5fb6f005e6d99c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 May 2023 14:01:28 +0200
Subject: [PATCH 04/31] python310Packages.clip-anytorch: init at 2.5.2

---
 .../python-modules/clip-anytorch/default.nix  | 57 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/python-modules/clip-anytorch/default.nix

diff --git a/pkgs/development/python-modules/clip-anytorch/default.nix b/pkgs/development/python-modules/clip-anytorch/default.nix
new file mode 100644
index 000000000000..b689d5708d5f
--- /dev/null
+++ b/pkgs/development/python-modules/clip-anytorch/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# dependencies
+, ftfy
+, regex
+, tqdm
+, torch
+, torchvision
+
+# tests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "clip-anytorch";
+  version = "2.5.2";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "rom1504";
+    repo = "CLIP";
+    rev = version;
+    hash = "sha256-EqVkpMQHawoCFHNupf49NrvLdGCq35wnYBpdP81Ztd4=";
+  };
+
+  propagatedBuildInputs = [
+    ftfy
+    regex
+    tqdm
+    torch
+    torchvision
+  ];
+
+  pythonImportsCheck = [
+    "clip"
+  ];
+
+  # all tests require network access
+  doCheck = false;
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    export HOME=$TMPDIR
+  '';
+
+  meta = with lib; {
+    description = "Contrastive Language-Image Pretraining";
+    homepage = "https://github.com/rom1504/CLIP";
+    license = licenses.mit;
+    maintainers = teams.tts.members;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fc37a0252fb2..315383a90ed8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1843,6 +1843,8 @@ self: super: with self; {
 
   clip = callPackage ../development/python-modules/clip { };
 
+  clip-anytorch = callPackage ../development/python-modules/clip-anytorch { };
+
   cock = callPackage ../development/python-modules/cock { };
 
   click = callPackage ../development/python-modules/click { };

From 2901b67d764eb4e874e5274493289cd4d4d4d3a3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 May 2023 14:07:22 +0200
Subject: [PATCH 05/31] python310Packages.resize-right: init at 0.0.2

---
 .../python-modules/resize-right/default.nix   | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/resize-right/default.nix

diff --git a/pkgs/development/python-modules/resize-right/default.nix b/pkgs/development/python-modules/resize-right/default.nix
new file mode 100644
index 000000000000..6a0b9b5cd773
--- /dev/null
+++ b/pkgs/development/python-modules/resize-right/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+
+# dependencies
+, numpy
+, torch
+}:
+
+buildPythonPackage rec {
+  pname = "resize-right";
+  version = "0.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-fcNbcs5AErd/fMkEmDUWN5OrmKWKuIk2EPsRn+Wa9SA=";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    torch
+  ];
+
+  pythonImportsCheck = [
+    "resize_right"
+  ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "The correct way to resize images or tensors. For Numpy or Pytorch (differentiable";
+    homepage = "https://github.com/assafshocher/ResizeRight";
+    license = licenses.mit;
+    maintainers = teams.tts.members;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 315383a90ed8..abd2c52e5ed3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10463,6 +10463,8 @@ self: super: with self; {
 
   resampy = callPackage ../development/python-modules/resampy { };
 
+  resize-right = callPackage ../development/python-modules/resize-right { };
+
   resolvelib = callPackage ../development/python-modules/resolvelib { };
 
   responses = callPackage ../development/python-modules/responses { };

From 3ba5ff8416d85fb934b12fd8bac3668866ea6613 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 May 2023 14:12:53 +0200
Subject: [PATCH 06/31] python310Packages.torchdiffeq: init at 0.2.3

---
 .../python-modules/torchdiffeq/default.nix    | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/torchdiffeq/default.nix

diff --git a/pkgs/development/python-modules/torchdiffeq/default.nix b/pkgs/development/python-modules/torchdiffeq/default.nix
new file mode 100644
index 000000000000..8195d750c6f7
--- /dev/null
+++ b/pkgs/development/python-modules/torchdiffeq/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+
+# dependencies
+, torch
+, scipy
+
+# tests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "torchdiffeq";
+  version = "0.2.3";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-/nX0NLkJCsDCdwLgK+0hRysPhwNb5lgfUe3F1AE+oxo=";
+  };
+
+  propagatedBuildInputs = [
+    torch
+    scipy
+  ];
+
+  pythonImportsCheck = [ "torchdiffeq" ];
+
+  # no tests in sdist, no tags on git
+  doCheck = false;
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    description = "Differentiable ODE solvers with full GPU support and O(1)-memory backpropagation";
+    homepage = "https://github.com/rtqichen/torchdiffeq";
+    license = licenses.mit;
+    maintainers = teams.tts.members;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index abd2c52e5ed3..253818700cac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12149,6 +12149,8 @@ self: super: with self; {
 
   torchaudio-bin = callPackage ../development/python-modules/torchaudio/bin.nix { };
 
+  torchdiffeq = callPackage ../development/python-modules/torchdiffeq { };
+
   torchgpipe = callPackage ../development/python-modules/torchgpipe { };
 
   torchmetrics = callPackage ../development/python-modules/torchmetrics { };

From b1b84b722ca8046bfcfde118dae5eacaed0b3834 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 May 2023 15:03:46 +0200
Subject: [PATCH 07/31] python310Packages.trampoline: init at 0.1.2

---
 .../python-modules/trampoline/default.nix     | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/trampoline/default.nix

diff --git a/pkgs/development/python-modules/trampoline/default.nix b/pkgs/development/python-modules/trampoline/default.nix
new file mode 100644
index 000000000000..2be2ff6e819d
--- /dev/null
+++ b/pkgs/development/python-modules/trampoline/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitLab
+, pytestCheckHook
+}:
+
+buildPythonPackage {
+  pname = "trampoline";
+  version = "0.1.2";
+  format = "setuptools";
+
+  # only wheel on pypi, no tags on git
+  src = fetchFromGitLab {
+    owner = "ferreum";
+    repo = "trampoline";
+    rev = "1d98f39c3015594e2ac8ed48dccc2f393b4dd82b";
+    hash = "sha256-A/tuR+QW9sKh76Qjwn1uQxlVJgWrSFzXeBRDdnSi2o4=";
+  };
+
+  pythonImportsCheck = [
+    "trampoline"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    description = "Simple and tiny yield-based trampoline implementation for python";
+    homepage = "https://gitlab.com/ferreum/trampoline";
+    license = licenses.mit;
+    maintainers = teams.tts.members;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 253818700cac..739a70269840 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12207,6 +12207,8 @@ self: super: with self; {
 
   traittypes = callPackage ../development/python-modules/traittypes { };
 
+  trampoline = callPackage ../development/python-modules/trampoline { };
+
   transaction = callPackage ../development/python-modules/transaction { };
 
   transformers = callPackage ../development/python-modules/transformers { };

From cb493f5d128407f6d3d655e532ffdcc21e3c52c7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 May 2023 15:04:02 +0200
Subject: [PATCH 08/31] python310Packages.torchsde: init at 0.2.4

---
 .../python-modules/torchsde/default.nix       | 67 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/development/python-modules/torchsde/default.nix

diff --git a/pkgs/development/python-modules/torchsde/default.nix b/pkgs/development/python-modules/torchsde/default.nix
new file mode 100644
index 000000000000..30e5a1235ddd
--- /dev/null
+++ b/pkgs/development/python-modules/torchsde/default.nix
@@ -0,0 +1,67 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# build-system
+, setuptools
+
+# dependencies
+, boltons
+, numpy
+, scipy
+, torch
+, trampoline
+
+# tests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "torchsde";
+  version = "0.2.4";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "google-research";
+    repo = "torchsde";
+    rev = "v${version}";
+    hash = "sha256-qQ7oswm0qTdq1xpQElt5cd3K0zskH+H/lgyEnxbCqsI=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "numpy==1.19.*" "numpy" \
+      --replace "scipy==1.5.*" "scipy"
+  '';
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  propagatedBuildInputs = [
+    boltons
+    numpy
+    scipy
+    torch
+    trampoline
+  ];
+
+  pythonImportsCheck = [ "torchsde" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # RuntimeError: a view of a leaf Variable that requires grad is being used in an in-place operation.
+    "test_adjoint"
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/google-research/torchsde/releases/tag/v${version}";
+    description = "Differentiable SDE solvers with GPU support and efficient sensitivity analysis";
+    homepage = "https://github.com/google-research/torchsde";
+    license = licenses.asl20;
+    maintainers = teams.tts.members;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 739a70269840..ec38b8a1d62b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12161,6 +12161,8 @@ self: super: with self; {
 
   torchlibrosa = callPackage ../development/python-modules/torchlibrosa { };
 
+  torchsde = callPackage ../development/python-modules/torchsde { };
+
   torchvision = callPackage ../development/python-modules/torchvision { };
 
   torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { };

From abc7af781e36a8c0532c1d4e25087b2b4a8bea69 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 May 2023 15:04:14 +0200
Subject: [PATCH 09/31] python310Packages.k-diffusion: ini at 0.0.14

---
 .../python-modules/k-diffusion/default.nix    | 69 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 71 insertions(+)
 create mode 100644 pkgs/development/python-modules/k-diffusion/default.nix

diff --git a/pkgs/development/python-modules/k-diffusion/default.nix b/pkgs/development/python-modules/k-diffusion/default.nix
new file mode 100644
index 000000000000..0d1410a5ced0
--- /dev/null
+++ b/pkgs/development/python-modules/k-diffusion/default.nix
@@ -0,0 +1,69 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# dependencies
+, accelerate
+, clean-fid
+, clip-anytorch
+, einops
+, jsonmerge
+, kornia
+, pillow
+, resize-right
+, scikit-image
+, scipy
+, torch
+, torchdiffeq
+, torchsde
+, torchvision
+, tqdm
+, wandb
+
+}:
+
+buildPythonPackage rec {
+  pname = "k-diffusion";
+  version = "0.0.14";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "crowsonkb";
+    repo = "k-diffusion";
+    rev = "v${version}";
+    hash = "sha256-KKVgk+1hidDBVaRnXjoqwuSRydI10OPHK3YModAizZU=";
+  };
+
+  propagatedBuildInputs = [
+   accelerate
+    clean-fid
+    clip-anytorch
+    einops
+    jsonmerge
+    kornia
+    pillow
+    resize-right
+    scikit-image
+    scipy
+    torch
+    torchdiffeq
+    torchsde
+    torchvision
+    tqdm
+    wandb
+  ];
+
+  pythonImportsCheck = [
+    "k_diffusion"
+  ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Karras et al. (2022) diffusion models for PyTorch";
+    homepage = "https://github.com/crowsonkb/k-diffusion";
+    license = licenses.mit;
+    maintainers = teams.tts.members;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec38b8a1d62b..e4de921690df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5324,6 +5324,8 @@ self: super: with self; {
 
   jxmlease = callPackage ../development/python-modules/jxmlease { };
 
+  k-diffusion = callPackage ../development/python-modules/k-diffusion { };
+
   k5test = callPackage ../development/python-modules/k5test {
     inherit (pkgs) krb5 findutils;
   };

From f1ee4207ebff31d1f52b142423ed58506142d8a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 May 2023 15:48:42 +0200
Subject: [PATCH 10/31] tts: 0.13.3 -> 0.14.0

https://github.com/coqui-ai/TTS/releases/tag/v0.14.0
---
 pkgs/tools/audio/tts/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix
index 24dbfee17517..e0eecc958a8f 100644
--- a/pkgs/tools/audio/tts/default.nix
+++ b/pkgs/tools/audio/tts/default.nix
@@ -8,19 +8,21 @@
 let
   python = python3.override {
     packageOverrides = self: super: {
+      torch = super.torch-bin;
+      torchvision = super.torchvision-bin;
     };
   };
 in
 python.pkgs.buildPythonApplication rec {
   pname = "tts";
-  version = "0.13.3";
+  version = "0.14.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "coqui-ai";
     repo = "TTS";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cu714/XtVqqlHN2CmUObcNFG6Vdi9VqC4at/HB8euDs=";
+    hash = "sha256-AVU4ULz++t9850pYeNrG5HKNvUZcMld4O1/zu697rzk=";
   };
 
   postPatch = let
@@ -57,6 +59,7 @@ python.pkgs.buildPythonApplication rec {
     bnnumerizer
     bnunicodenormalizer
     coqpit
+    einops
     flask
     fsspec
     g2pkk
@@ -65,6 +68,7 @@ python.pkgs.buildPythonApplication rec {
     inflect
     jamo
     jieba
+    k-diffusion
     librosa
     matplotlib
     mecab-python3
@@ -81,6 +85,7 @@ python.pkgs.buildPythonApplication rec {
     torchaudio-bin
     tqdm
     trainer
+    transformers
     unidic-lite
     webrtcvad
   ];

From ded217e525f2180d7fb1dfb1647efa41062bd63b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 May 2023 17:42:03 +0200
Subject: [PATCH 11/31] python310Packages.django-hijack: rename from
 django_hijack

This normalizes the package name according to PEP503.
---
 .../python-modules/django-hijack-admin/default.nix            | 4 ++--
 pkgs/top-level/python-aliases.nix                             | 1 +
 pkgs/top-level/python-packages.nix                            | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix
index 624c5ba258b2..9d3f931cac5f 100644
--- a/pkgs/development/python-modules/django-hijack-admin/default.nix
+++ b/pkgs/development/python-modules/django-hijack-admin/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub, python,
-  django_hijack, django_nose }:
+  django-hijack, django_nose }:
 buildPythonPackage rec {
   pname = "django-hijack-admin";
   version = "2.1.10";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [ django_nose ];
-  propagatedBuildInputs = [ django_hijack ];
+  propagatedBuildInputs = [ django-hijack ];
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 882c75b9aed8..5345f6042311 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -85,6 +85,7 @@ mapAliases ({
   django_environ = django-environ; # added 2021-12-25
   django_extensions = django-extensions; # added 2022-01-09
   django_guardian = django-guardian; # added 2022-05-19
+  django_hijack = django-hijack; # added 2023-05-16
   django_modelcluster = django-modelcluster; # added 2022-04-02
   django_reversion = django-reversion; # added 2022-06-18
   django_polymorphic = django-polymorphic; # added 2022-05-24
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9f2309f864cf..67e25e52099a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2693,8 +2693,7 @@ self: super: with self; {
 
   django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { };
 
-  django_hijack = callPackage ../development/python-modules/django-hijack { };
-  # This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set.
+  django-hijack = callPackage ../development/python-modules/django-hijack { };
 
   django-i18nfield = callPackage ../development/python-modules/django-i18nfield { };
 

From 1149329a284b8e0c239087622e066df194a05d28 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 May 2023 17:43:57 +0200
Subject: [PATCH 12/31] python310Packages.django-hijack-admin: rename from
 django_hijack_admin

Normalizes the pname according to PEP503.
---
 pkgs/top-level/python-aliases.nix  | 1 +
 pkgs/top-level/python-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 5345f6042311..fe4c3b9d6f21 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -86,6 +86,7 @@ mapAliases ({
   django_extensions = django-extensions; # added 2022-01-09
   django_guardian = django-guardian; # added 2022-05-19
   django_hijack = django-hijack; # added 2023-05-16
+  django_hijack_admin = django-hijack-admin; # added 2023-05-16
   django_modelcluster = django-modelcluster; # added 2022-04-02
   django_reversion = django-reversion; # added 2022-06-18
   django_polymorphic = django-polymorphic; # added 2022-05-24
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 67e25e52099a..d0e52d8c184e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2691,7 +2691,7 @@ self: super: with self; {
 
   django-hierarkey = callPackage ../development/python-modules/django-hierarkey { };
 
-  django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { };
+  django-hijack-admin = callPackage ../development/python-modules/django-hijack-admin { };
 
   django-hijack = callPackage ../development/python-modules/django-hijack { };
 

From 31aa936b15dfb39f536e87b63bf161c2c7fd0ff5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 May 2023 17:44:33 +0200
Subject: [PATCH 13/31] python310Packages.django-hijack: 3.2.6 -> 3.3.0

https://github.com/django-hijack/django-hijack/releases/tag/3.2.7
https://github.com/django-hijack/django-hijack/releases/tag/3.3.0
---
 .../python-modules/django-hijack/default.nix  | 61 +++++++++++++------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix
index cefcf75f6b56..47719995c69a 100644
--- a/pkgs/development/python-modules/django-hijack/default.nix
+++ b/pkgs/development/python-modules/django-hijack/default.nix
@@ -1,28 +1,57 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
+, fetchNpmDeps
 , buildPythonPackage
+
+# build-system
+, gettext
+, nodejs
+, npmHooks
+, setuptools-scm
+
+# dependencies
 , django
 , django_compat
+
+# tests
 , pytest-django
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "django-hijack";
-  version = "3.2.6";
+  version = "3.3.0";
+  format = "setuptools";
 
-  # the wheel comes with pre-built assets, allowing us to avoid fighting
-  # with npm/webpack/gettext to build them ourselves.
-  format = "wheel";
-
-  src = fetchPypi {
-    inherit version format;
-    pname = "django_hijack";
-    dist = "py3";
-    python = "py3";
-    hash = "sha256-xFPZ03II1814+bZ5gx7GD/AxYMiLuH6awfSeXEraOHQ=";
+  src = fetchFromGitHub {
+    owner = "django-hijack";
+    repo = "django-hijack";
+    rev = "refs/tags/${version}";
+    hash = "sha256-ytQ4xxkBAC3amQbenD8RO5asrbfNAjOspWUY3c2hkig=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'cmd = ["npm", "ci"]' 'cmd = ["true"]' \
+      --replace 'f"{self.build_lib}/{name}.mo"' 'f"{name}.mo"'
+
+    sed -i "/addopts/d" setup.cfg
+  '';
+
+  npmDeps = fetchNpmDeps {
+    inherit src;
+    hash = "sha256-FLfMCn2jsLlTTsC+LRMX0dmVCCbNAr2pQUsSQRKgo6E=";
+  };
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    gettext
+    nodejs
+    npmHooks.npmConfigHook
+    setuptools-scm
+  ];
+
   propagatedBuildInputs = [
     django
     django_compat
@@ -33,13 +62,11 @@ buildPythonPackage rec {
     pytest-django
   ];
 
-  preCheck = ''
-    export DJANGO_SETTINGS_MODULE='hijack.tests.test_app.settings'
-  '';
+  env.DJANGO_SETTINGS_MODULE = "hijack.tests.test_app.settings";
 
   pytestFlagsArray = [
-    "--pyargs"
-    "hijack"
+    "--pyargs" "hijack"
+    "-W" "ignore::DeprecationWarning"
   ];
 
   meta = with lib; {

From 4600be9f2dffe46ddc9ddbaa4382c6f99ea85d71 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 19 May 2023 04:20:00 +0000
Subject: [PATCH 14/31] python310Packages.chat-downloader: 0.2.5 -> 0.2.6

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

diff --git a/pkgs/development/python-modules/chat-downloader/default.nix b/pkgs/development/python-modules/chat-downloader/default.nix
index 9d51cc4007fa..37768fb0d0f6 100644
--- a/pkgs/development/python-modules/chat-downloader/default.nix
+++ b/pkgs/development/python-modules/chat-downloader/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "chat-downloader";
-  version = "0.2.5";
+  version = "0.2.6";
   format = "setuptools";
 
   src = fetchPypi {
     inherit version pname;
-    hash = "sha256-nxk1VcZr5teuev4cFrtUSIeZNQ8ynpk0n0obGTxqepA=";
+    hash = "sha256-r5322xFQ2gY3Aaj/567pYen9Iw6By++xvBcmLLtFpnI=";
   };
 
   propagatedBuildInputs = [

From ebbd3bdfa871f30fd943aa58f0d54b69f6a8112b Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 18 May 2023 15:36:01 +0800
Subject: [PATCH 15/31] maintainers.ShamrockLee: renew information

Change the name to my legal name (Yueh-Shun Li).
Add email address and Matrix ID.
Sort attributes in alphabetical order.
---
 maintainers/maintainer-list.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9d5f3e608292..bec0865f28b1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14318,9 +14318,11 @@
     name = "Scott Hamilton";
   };
   ShamrockLee = {
-    name = "Shamrock Lee";
+    email = "shamrocklee@posteo.net";
     github = "ShamrockLee";
     githubId = 44064051;
+    matrix = "@shamrocklee:matrix.org";
+    name = "Yueh-Shun Li";
   };
   shanesveller = {
     email = "shane@sveller.dev";

From f5f2c185df3f22252cd4028c7334ab20dbc975fc Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Thu, 18 May 2023 12:30:00 +0200
Subject: [PATCH 16/31] emacsPackages.prolog-mode: use trivialBuild

---
 .../elisp-packages/manual-packages/prolog/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix
index 590906d6acdb..3e804551666c 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix
@@ -1,19 +1,14 @@
-{ lib, stdenv, fetchurl }:
+{ lib, trivialBuild, fetchurl }:
 
-stdenv.mkDerivation {
+trivialBuild {
   pname = "prolog-mode";
   version = "1.28";
 
   src = fetchurl {
-    url = "http://bruda.ca/_media/emacs/prolog.el";
+    url = "https://bruda.ca/_media/emacs/prolog.el";
     sha256 = "ZzIDFQWPq1vI9z3btgsHgn0axN6uRQn9Tt8TnqGybOk=";
   };
 
-  buildCommand = ''
-    mkdir -p $out/share/emacs/site-lisp/
-    cp $src $out/share/emacs/site-lisp/prolog.el
-  '';
-
   meta = {
     homepage = "https://bruda.ca/emacs/prolog_mode_for_emacs/";
     description = "Prolog mode for Emacs";

From 2b36984627d8396aa559a61a611c7a8333b463cc Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 19 May 2023 16:57:03 +0300
Subject: [PATCH 17/31] example-robot-data: 4.0.6 -> 4.0.7

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

diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix
index c9ad4a02487e..b8ec7227c612 100644
--- a/pkgs/development/libraries/example-robot-data/default.nix
+++ b/pkgs/development/libraries/example-robot-data/default.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation rec {
   pname = "example-robot-data";
-  version = "4.0.6";
+  version = "4.0.7";
 
   src = fetchFromGitHub {
     owner = "Gepetto";
     repo = pname;
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-X1BQGM7MMe753RMb/rVYv7kNnjk/q30u/VJARAXiTAI=";
+    hash = "sha256-dN23ukKPkTohqD1J/0EneLyG6Cg0zriMr1l6WLFemd8=";
   };
 
   strictDeps = true;

From 6e042512720232d8cab1f97cdd62b69df79ccc02 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 19 May 2023 13:50:33 -0400
Subject: [PATCH 18/31] orogene: 0.3.25 -> 0.3.26

Diff: https://github.com/orogene/orogene/compare/v0.3.25...v0.3.26

Changelog: https://github.com/orogene/orogene/blob/v0.3.26/CHANGELOG.md
---
 pkgs/development/tools/misc/orogene/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/orogene/default.nix b/pkgs/development/tools/misc/orogene/default.nix
index 242e00816b4b..ffd576c18f91 100644
--- a/pkgs/development/tools/misc/orogene/default.nix
+++ b/pkgs/development/tools/misc/orogene/default.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "orogene";
-  version = "0.3.25";
+  version = "0.3.26";
 
   src = fetchFromGitHub {
     owner = "orogene";
     repo = "orogene";
     rev = "v${version}";
-    hash = "sha256-QQhlkTg14nPYQvKYoZf07PjknTZZRUTzBzNFJeovny8=";
+    hash = "sha256-9Rq2/o2W0l2/JR/D95+2AjpVzdZuDVDyQFFNb5Us/hg=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-uxW196f/PEVxGHmZ7hUyvaIz1OD1XmyVEuwk8Hdvsvs=";
+  cargoHash = "sha256-X7DWJ/3Zqtjgw2s/H+dG8tu8f7/aZVIliloJe2Uz9RE=";
 
   nativeBuildInputs = [
     pkg-config

From 6d8b918da033604395a986182be4ec31a3935d55 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 19 May 2023 21:17:02 +0200
Subject: [PATCH 19/31] python311Packages.plugwise: 0.31.3 -> 0.31.4

Diff: https://github.com/plugwise/python-plugwise/compare/refs/tags/v0.31.3...v0.31.4

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

diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 7612873cfed7..4539c8464957 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "0.31.3";
+  version = "0.31.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "python-plugwise";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/J61J9r6nhY10aerhZ1+RK9hohV0NYiAve+06ubI8p8=";
+    hash = "sha256-8DcURUJgngmBE6oPquSAHCsL1J2HAqvbtBcrqfrauHk=";
   };
 
   propagatedBuildInputs = [

From 74c65ff0f7803c418851bad022f02e616b9d5776 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 19 May 2023 21:19:58 +0200
Subject: [PATCH 20/31] python311Packages.pyoverkiz: 1.7.8 -> 1.7.9

Diff: https://github.com/iMicknl/python-overkiz-api/compare/refs/tags/v1.7.8...v1.7.9

Changelog: https://github.com/iMicknl/python-overkiz-api/releases/tag/v1.7.9
---
 pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index a531d48740b0..ffaad237c185 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyoverkiz";
-  version = "1.7.8";
+  version = "1.7.9";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "iMicknl";
     repo = "python-overkiz-api";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DZ9MpwlZvq6LHbvnesk7XtGsHOhZvc1tXb/xVDQuR48=";
+    hash = "sha256-mCL1sMNQgC48XR2YlOlIY0OYHQkdQwFQXfZ7bn9K7Tw=";
   };
 
   postPatch = ''

From a1755d23a7faf1ce6484ad54f646eca5c9ae6c12 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 19 May 2023 15:24:46 -0400
Subject: [PATCH 21/31] hvm: 1.0.8 -> 1.0.9

---
 pkgs/development/compilers/hvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/hvm/default.nix b/pkgs/development/compilers/hvm/default.nix
index cf3f515a53f5..dc933572514f 100644
--- a/pkgs/development/compilers/hvm/default.nix
+++ b/pkgs/development/compilers/hvm/default.nix
@@ -8,14 +8,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hvm";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-dPO3GWDojuz7nilOr09xC6tPhBZ95wjAk0ErItzAbxw=";
+    hash = "sha256-dO0GzbMopX84AKOtJYYW6vojcs4kYcZ8LQ4tXEgUN7I=";
   };
 
-  cargoHash = "sha256-XsKVXlceg3HHGalHcXfmJPKhAQm4DqdsJ2c+NF+AOI4=";
+  cargoHash = "sha256-RQnyVRHWrqnKcI3Jy593jDTydG1nGyrScsqSNyJTDJk=";
 
   patches = [
     # see https://github.com/higherorderco/hvm/pull/220

From 0812dc17079a94af4497c1ef780769cc276f0de2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 19 May 2023 21:25:00 +0200
Subject: [PATCH 22/31] python311Packages.rns: 0.5.2 -> 0.5.3

Diff: https://github.com/markqvist/Reticulum/compare/refs/tags/0.5.2...0.5.3

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

diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index aaaf02cf4ff0..b937058f40c3 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "rns";
-  version = "0.5.2";
+  version = "0.5.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "Reticulum";
     rev = "refs/tags/${version}";
-    hash = "sha256-yyBUz+Bg05TtPTtREkylqaj2oz8kfxC5fSYpgPCF0Vs=";
+    hash = "sha256-SZx0GBpYDC7p7yLVY5WZmBgpbpcl9GbsfdqH0YBrUgQ=";
   };
 
   propagatedBuildInputs = [

From bb237b5522b0ae6f3618231d037682f38074ac12 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 19 May 2023 21:35:24 +0200
Subject: [PATCH 23/31] python310Packages.cloudflare: 2.11.1 -> 2.11.2

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

diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix
index 5e52ab7c1769..235e2640b68f 100644
--- a/pkgs/development/python-modules/cloudflare/default.nix
+++ b/pkgs/development/python-modules/cloudflare/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "cloudflare";
-  version = "2.11.1";
+  version = "2.11.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VAEgrM9F9M/HjL726RzofJT/Sc8R6WIF/D/gZH5ncBs=";
+    hash = "sha256-igOsDHqfjD1cxcHYsTNbjkhsxKR7LNJf5Zw1kkr4a2E=";
   };
 
   propagatedBuildInputs = [

From 9df8adbdb3a8ccdd1d626ccfc33023e8b8211dd0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 19 May 2023 22:10:06 +0200
Subject: [PATCH 24/31] python310Packages.cloudflare: add changelog to meta

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

diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix
index 235e2640b68f..d8ed37e7110a 100644
--- a/pkgs/development/python-modules/cloudflare/default.nix
+++ b/pkgs/development/python-modules/cloudflare/default.nix
@@ -41,6 +41,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python wrapper for the Cloudflare v4 API";
     homepage = "https://github.com/cloudflare/python-cloudflare";
+    changelog = "https://github.com/cloudflare/python-cloudflare/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ costrouc ];
   };

From ee683572054e8caea194693419c46c8d17422999 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 20 May 2023 00:31:07 +0200
Subject: [PATCH 25/31] nixos/tests/home-assistant: Don't test matter

It is affected by the OpenSSL 1.1 EOL and removing it makes hydra build
this test again.
---
 nixos/tests/home-assistant.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 22a63cc73664..cef0f97c194c 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -64,7 +64,6 @@ in {
         # include some popular integrations, that absolutely shouldn't break
         esphome = {};
         knx = {};
-        matter = {};
         shelly = {};
         zha = {};
 

From 4b939b45c6911216c441761b714e8a0d49af54e7 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 19 May 2023 19:04:08 -0400
Subject: [PATCH 26/31] shairport-sync: switch to openssl 3

---
 pkgs/servers/shairport-sync/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index 5bfe05a86dff..40a02c3ce084 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , autoreconfHook
 , pkg-config
-, openssl_1_1
+, openssl
 , avahi
 , alsa-lib
 , libplist
@@ -34,6 +34,10 @@
 , enableLibdaemon ? false
 }:
 
+let
+  inherit (lib) optional optionals;
+in
+
 stdenv.mkDerivation rec {
   version = "4.1.1";
   pname = "shairport-sync";
@@ -47,8 +51,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  buildInputs = with lib; [
-    openssl_1_1
+  buildInputs = [
+    openssl
     avahi
     popt
     libconfig
@@ -76,7 +80,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags = with lib; [
+  configureFlags = [
     "--without-configfiles"
     "--sysconfdir=/etc"
     "--with-ssl=openssl"

From fd6e60a677ce96210a4c826a8313126f332255ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 May 2023 02:05:40 +0000
Subject: [PATCH 27/31] qt6Packages.qtpbfimageplugin: 2.3 -> 2.4

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

diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix
index 40e7e1549140..9df86514edec 100644
--- a/pkgs/development/libraries/qtpbfimageplugin/default.nix
+++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtpbfimageplugin";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "QtPBFImagePlugin";
     rev = version;
-    sha256 = "063agzcrcihasqqk2yqxqxg9xknjs99y6vx3n1v7md7dqnfv4iva";
+    sha256 = "sha256-Ju22lCpwbNxiFeQoaUh3LmtI6RlTO3hOw2Z4/O8PQ6E=";
   };
 
   nativeBuildInputs = [ qmake ];

From a2b91c07c30eb583b58077e6f9bcf69168745ae7 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Fri, 19 May 2023 21:03:26 +0900
Subject: [PATCH 28/31] bpftrace: 0.17.1 -> 0.18.0

- Add patch to fix build
- While we're here uniformize style a bit, so there's lot of fluff,
but it's really just version bump + patch...
---
 pkgs/os-specific/linux/bpftrace/default.nix | 58 +++++++++++++--------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix
index 0ba6db131b81..7dca9eee7a0e 100644
--- a/pkgs/os-specific/linux/bpftrace/default.nix
+++ b/pkgs/os-specific/linux/bpftrace/default.nix
@@ -1,42 +1,56 @@
-{ lib, stdenv, fetchFromGitHub
-, cmake, pkg-config, flex, bison
-, llvmPackages, elfutils
-, libbfd, libbpf, libopcodes, bcc
+{ lib, stdenv, fetchFromGitHub, fetchpatch
+, llvmPackages, elfutils, bcc
+, libbpf, libbfd, libopcodes
 , cereal, asciidoctor
-, nixosTests
+, cmake, pkg-config, flex, bison
 , util-linux
+, nixosTests
 }:
 
 stdenv.mkDerivation rec {
   pname = "bpftrace";
-  version = "0.17.1";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
-    owner  = "iovisor";
-    repo   = "bpftrace";
-    rev    = "v${version}";
-    sha256 = "sha256-dEchHXZPWc+/Dui6P65EqxB8O/M7F47PZVsKSp80oXE=";
+    owner = "iovisor";
+    repo  = "bpftrace";
+    rev   = "v${version}";
+    hash  = "sha256-+SBLcMyOf1gZN8dG5xkNLsqIcK1eVlswjY1GRXepFVg=";
   };
 
-  buildInputs = with llvmPackages;
-    [ llvm libclang
-      elfutils bcc
-      libbpf libbfd libopcodes
-      cereal asciidoctor
-    ];
+  patches = [
+    # fails to build - https://github.com/iovisor/bpftrace/issues/2598
+    (fetchpatch {
+      name = "link-binaries-against-zlib";
+      url = "https://github.com/iovisor/bpftrace/commit/a60b171eb288250c3f1d6f065b05d8a87aff3cdd.patch";
+      hash = "sha256-b/0pKDjolo2RQ/UGjEfmWdG0tnIiFX8PJHhRCXvzyxA=";
+    })
+  ];
 
-  nativeBuildInputs = [ cmake pkg-config flex bison llvmPackages.llvm.dev util-linux ];
+  buildInputs = with llvmPackages; [
+    llvm libclang
+    elfutils bcc
+    libbpf libbfd libopcodes
+    cereal asciidoctor
+  ];
+
+  nativeBuildInputs = [
+    cmake pkg-config flex bison
+    llvmPackages.llvm.dev
+    util-linux
+  ];
 
   # tests aren't built, due to gtest shenanigans. see:
   #
   #     https://github.com/iovisor/bpftrace/issues/161#issuecomment-453606728
   #     https://github.com/iovisor/bpftrace/pull/363
   #
-  cmakeFlags =
-    [ "-DBUILD_TESTING=FALSE"
-      "-DLIBBCC_INCLUDE_DIRS=${bcc}/include"
-      "-DINSTALL_TOOL_DOCS=off"
-    ];
+  cmakeFlags = [
+    "-DBUILD_TESTING=FALSE"
+    "-DLIBBCC_INCLUDE_DIRS=${bcc}/include"
+    "-DINSTALL_TOOL_DOCS=OFF"
+    "-DUSE_SYSTEM_BPF_BCC=ON"
+  ];
 
   # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do
   # not move them to keep `${pkgs.bpftrace}/share/bpftrace/tools/...` working.

From 7a288f777a58a0a962bdf5e03b7308f7f02fa149 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 20 May 2023 03:16:47 +0000
Subject: [PATCH 29/31] terraform-providers.azurerm: 3.56.0 -> 3.57.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a4dc693684c5..e1e81b763ac2 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -128,11 +128,11 @@
     "vendorHash": null
   },
   "azurerm": {
-    "hash": "sha256-nNA2jBRMN5JV2i92dZaK5ZFzs44t9zZpusPw+Qnhby0=",
+    "hash": "sha256-4gNXamhda8EyEyOQXnxYNy+S5SyGqtYaxRk/fAG7vvA=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v3.56.0",
+    "rev": "v3.57.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From aff52a7444ae59535c44ed4dd33a038fbea9af80 Mon Sep 17 00:00:00 2001
From: Infinitive Witch <infinitivewitch@disroot.org>
Date: Mon, 1 May 2023 09:51:29 -0300
Subject: [PATCH 30/31] komikku: 1.19.0 -> 1.20.0

Diff: https://gitlab.com/valos/Komikku/-/compare/v1.19.0...v1.20.0
Signed-off-by: Infinitive Witch <infinitivewitch@disroot.org>
---
 pkgs/applications/graphics/komikku/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix
index 4f2a7bae4948..1c3b040944be 100644
--- a/pkgs/applications/graphics/komikku/default.nix
+++ b/pkgs/applications/graphics/komikku/default.nix
@@ -19,7 +19,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.19.0";
+  version = "1.20.0";
 
   format = "other";
 
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     rev = "v${version}";
-    hash = "sha256-4XhcmK9Dgk82ExzugY4SGRfWYC+IgCAxWS+cBURgT2o=";
+    hash = "sha256-gBnpps++dwcXCLSVjtK3nMJMcJ43vKeNzgCWEt1kn7g=";
   };
 
   nativeBuildInputs = [

From 68c1807f3c523788b5ce58879ec67ed9c43022d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 May 2023 02:35:08 +0000
Subject: [PATCH 31/31] eudev: 3.2.11 -> 3.2.12

---
 pkgs/os-specific/linux/eudev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index 0dd69784516a..4d3c9e785229 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "eudev";
-  version = "3.2.11";
+  version = "3.2.12";
 
   src = fetchFromGitHub {
     owner = "eudev-project";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-W5nL4hicQ4fxz5rqoP+hhkE1tVn8lJZjMq4UaiXH6jc=";
+    hash = "sha256-x9l+W8zuFYwG0m9JOIDbEf1x6yeBW36HnJws/buc7HI=";
   };
 
   nativeBuildInputs = [