From 1e7432b5dea5825c692ef492f0aa2e68ce66933c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 14 Jul 2023 06:38:14 -0700
Subject: [PATCH 01/58] catch2_3: 3.3.2 -> 3.4.0

Diff: https://github.com/catchorg/Catch2/compare/v3.3.2...v3.4.0

Changelog: https://github.com/catchorg/Catch2/blob/v3.4.0/docs/release-notes.md
---
 pkgs/development/libraries/catch2/3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix
index 72dd4552bf97..f064eb7a4fdb 100644
--- a/pkgs/development/libraries/catch2/3.nix
+++ b/pkgs/development/libraries/catch2/3.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "3.3.2";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     rev = "v${version}";
-    hash = "sha256-t/4iCrzPeDZNNlgibVqx5rhe+d3lXwm1GmBMDDId0VQ=";
+    hash = "sha256-DqGGfNjKPW9HFJrX9arFHyNYjB61uoL6NabZatTWrr0=";
   };
 
   nativeBuildInputs = [

From b632adedecec7c322bb614a8d3b4b017f2c74729 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Fri, 9 Sep 2022 12:23:23 +0000
Subject: [PATCH 02/58] maintainers: add YorikSar

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ef1f4a010166..0ec025d6901f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18502,6 +18502,13 @@
     githubId = 647076;
     name = "Yorick van Pelt";
   };
+  YorikSar = {
+    name = "Yuriy Taraday";
+    email = "yorik.sar@gmail.com";
+    matrix = "@yorik.sar:matrix.org";
+    github = "YorikSar";
+    githubId = 428074;
+  };
   yrashk = {
     email = "yrashk@gmail.com";
     github = "yrashk";

From c97c45612ca7f02e61355d7a5f698525cc9e632a Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Thu, 13 Jul 2023 16:13:03 +0200
Subject: [PATCH 03/58] dark-mode-notify: init at 2022-07-18

`dark-mode-notify` is a small too that calls a binary whenever dark
mode status changes in macOS.
---
 .../darwin/dark-mode-notify/default.nix       | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/dark-mode-notify/default.nix

diff --git a/pkgs/os-specific/darwin/dark-mode-notify/default.nix b/pkgs/os-specific/darwin/dark-mode-notify/default.nix
new file mode 100644
index 000000000000..31d1a2c8d8b9
--- /dev/null
+++ b/pkgs/os-specific/darwin/dark-mode-notify/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, fetchFromGitHub
+, stdenv
+, swift
+, swiftpm
+, darwin
+}:
+
+stdenv.mkDerivation (final: {
+  pname = "dark-mode-notify";
+  version = "unstable-2022-07-18";
+
+  src = fetchFromGitHub {
+    owner = "bouk";
+    repo = "dark-mode-notify";
+    rev = "4d7fe211f81c5b67402fad4bed44995344a260d1";
+    hash = "sha256-LsAQ5v5jgJw7KsJnQ3Mh6+LNj1EMHICMoD5WzF3hRmU=";
+  };
+
+  nativeBuildInputs = [
+    swift
+    swiftpm
+  ];
+
+  buildInputs = with darwin.apple_sdk.frameworks; [
+    Foundation
+    Cocoa
+  ];
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  meta = {
+    description = "Run a script whenever dark mode changes in macOS";
+    homepage = "https://github.com/bouk/dark-mode-notify";
+    # Doesn't build on x86_64 because of some CoreGraphics issue, even with SDK 11.0
+    platforms = [ "aarch64-darwin" ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ YorikSar ];
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a4653a364e3..988b31503d77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3584,6 +3584,8 @@ with pkgs;
 
   dcap = callPackage ../tools/networking/dcap { };
 
+  dark-mode-notify = callPackage ../os-specific/darwin/dark-mode-notify { };
+
   deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { };
 
   delayarchitect = callPackage ../applications/audio/delayarchitect { };

From e08497844a29538bfe1e7a5e92a585fbe2976e56 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 9 Aug 2023 08:53:34 +0800
Subject: [PATCH 04/58] qgnomeplatform: Backport cursor fix for Qt6 apps

---
 .../libraries/qgnomeplatform/default.nix      |  4 ++
 .../qgnomeplatform/qt6-cursor-fix.patch       | 53 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/libraries/qgnomeplatform/qt6-cursor-fix.patch

diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
index b32414f855d0..8136482d477b 100644
--- a/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -33,6 +33,10 @@ stdenv.mkDerivation rec {
       src = ./hardcode-gsettings.patch;
       gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas;
     })
+
+    # Backport cursor fix for Qt6 apps
+    # Ajusted from https://github.com/FedoraQt/QGnomePlatform/pull/138
+    ./qt6-cursor-fix.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/qgnomeplatform/qt6-cursor-fix.patch b/pkgs/development/libraries/qgnomeplatform/qt6-cursor-fix.patch
new file mode 100644
index 000000000000..40438aae33ed
--- /dev/null
+++ b/pkgs/development/libraries/qgnomeplatform/qt6-cursor-fix.patch
@@ -0,0 +1,53 @@
+diff --git a/src/common/gnomesettings.cpp b/src/common/gnomesettings.cpp
+index 961f75d..d947eb2 100644
+--- a/src/common/gnomesettings.cpp
++++ b/src/common/gnomesettings.cpp
+@@ -210,7 +210,7 @@ GnomeSettingsPrivate::GnomeSettingsPrivate(QObject *parent)
+                                               QStringLiteral("SettingChanged"), this, SLOT(portalSettingChanged(QString,QString,QDBusVariant)));
+     }
+ 
+-    if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
++    if (true) {
+         cursorSizeChanged();
+         cursorThemeChanged();
+     }
+@@ -347,11 +347,11 @@ void GnomeSettingsPrivate::gsettingPropertyChanged(GSettings *settings, gchar *k
+     } else if (changedProperty == QStringLiteral("monospace-font-name")) {
+         gnomeSettings->fontChanged();
+     } else if (changedProperty == QStringLiteral("cursor-size")) {
+-        if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
++        if (true) {
+             gnomeSettings->cursorSizeChanged();
+         }
+     } else if (changedProperty == QStringLiteral("cursor-theme")) {
+-        if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
++        if (true) {
+             gnomeSettings->cursorThemeChanged();
+         }
+     // Org.gnome.wm.preferences
+@@ -393,13 +393,23 @@ void GnomeSettingsPrivate::cursorBlinkTimeChanged()
+ void GnomeSettingsPrivate::cursorSizeChanged()
+ {
+     int cursorSize = getSettingsProperty<int>(QStringLiteral("cursor-size"));
+-    qputenv("XCURSOR_SIZE", QString::number(cursorSize).toUtf8());
++    if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
++        qputenv("XCURSOR_SIZE", QString::number(cursorSize).toUtf8());
++    }
++#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
++    m_hints[QPlatformTheme::MouseCursorSize] = QSize(cursorSize, cursorSize);
++#endif
+ }
+ 
+ void GnomeSettingsPrivate::cursorThemeChanged()
+ {
+     const QString cursorTheme = getSettingsProperty<QString>(QStringLiteral("cursor-theme"));
+-    qputenv("XCURSOR_THEME", cursorTheme.toUtf8());
++    if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
++        qputenv("XCURSOR_THEME", cursorTheme.toUtf8());
++    }
++#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
++    m_hints[QPlatformTheme::MouseCursorTheme] = cursorTheme;
++#endif
+ }
+ 
+ void GnomeSettingsPrivate::fontChanged()

From 0c0b3af7936d868d5346f8e2fc46814ab0dfa4be Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 9 Aug 2023 11:06:28 +0200
Subject: [PATCH 05/58] pinocchio: 2.6.19 -> 2.6.20

While here:
- add hpp-fcl dependency
- enable libpython dependency when python support is activated
- use finalAttrs instead of rec
- add check & python import check
- add myself in maintainers
---
 .../libraries/pinocchio/default.nix           | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix
index ad3e3ba1299c..6faf612c1971 100644
--- a/pkgs/development/libraries/pinocchio/default.nix
+++ b/pkgs/development/libraries/pinocchio/default.nix
@@ -4,21 +4,22 @@
 , cmake
 , boost
 , eigen
+, hpp-fcl
 , urdfdom
 , pythonSupport ? false
 , python3Packages
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pinocchio";
-  version = "2.6.19";
+  version = "2.6.20";
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
-    repo = pname;
-    rev = "v${version}";
+    repo = finalAttrs.pname;
+    rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-P7jSAQ6LYcboJHqtpneT4W8Pu5G3fd3/a8Gju9im1e8=";
+    hash = "sha256-Pu/trCpqdue7sQKDbLhyxTfgj/+xRiVcG7Luz6ZQXtM=";
   };
 
   # error: use of undeclared identifier '__sincos'
@@ -38,20 +39,31 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals (!pythonSupport) [
     boost
     eigen
+    hpp-fcl
   ] ++ lib.optionals pythonSupport [
     python3Packages.boost
     python3Packages.eigenpy
+    python3Packages.hpp-fcl
   ];
 
-  cmakeFlags = lib.optionals (!pythonSupport) [
+  cmakeFlags = [
+    "-DBUILD_WITH_COLLISION_SUPPORT=ON"
+  ] ++ lib.optionals (pythonSupport) [
+    "-DBUILD_WITH_LIBPYTHON=ON"
+  ] ++ lib.optionals (!pythonSupport) [
     "-DBUILD_PYTHON_INTERFACE=OFF"
   ];
 
+  doCheck = true;
+  pythonImportsCheck = lib.optionals (!pythonSupport) [
+    "pinocchio"
+  ];
+
   meta = with lib; {
     description = "A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives";
     homepage = "https://github.com/stack-of-tasks/pinocchio";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ wegank ];
+    maintainers = with maintainers; [ nim65s wegank ];
     platforms = platforms.unix;
   };
-}
+})

From 9bcfdfb07d6ceee27af5990343b153cb67964a9c Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 9 Aug 2023 16:34:47 +0200
Subject: [PATCH 06/58] feishin: 0.2.0 -> 0.3.0

---
 pkgs/applications/audio/feishin/darwin.nix  | 2 +-
 pkgs/applications/audio/feishin/default.nix | 2 +-
 pkgs/applications/audio/feishin/linux.nix   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/feishin/darwin.nix b/pkgs/applications/audio/feishin/darwin.nix
index b8b28f476821..fb8a27abdc41 100644
--- a/pkgs/applications/audio/feishin/darwin.nix
+++ b/pkgs/applications/audio/feishin/darwin.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip";
-    hash = "sha256-WzU/Yd3cNMIpmkKWC29mQlviYXiYV5k8+80iyzilPGc=";
+    hash = "sha256-J5LB4uR/NJ6ykiTqBY1VepcLujprgqwpxy7sGD0NtZw=";
   };
 
   nativeBuildInputs = [ makeWrapper unzip ];
diff --git a/pkgs/applications/audio/feishin/default.nix b/pkgs/applications/audio/feishin/default.nix
index f9a670dbfa3e..aff0d5681ea2 100644
--- a/pkgs/applications/audio/feishin/default.nix
+++ b/pkgs/applications/audio/feishin/default.nix
@@ -8,7 +8,7 @@ let
   extraArgs = removeAttrs args [ "callPackage" ];
 
   pname = "feishin";
-  version = "0.2.0";
+  version = "0.3.0";
   appname = "Feishin";
 
   meta = with lib; {
diff --git a/pkgs/applications/audio/feishin/linux.nix b/pkgs/applications/audio/feishin/linux.nix
index 08adc69bb7ee..eaa6b9fc043a 100644
--- a/pkgs/applications/audio/feishin/linux.nix
+++ b/pkgs/applications/audio/feishin/linux.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz";
-    hash = "sha256-o+fEjdG2iN84FEchyAKWZCpsrqDm1K1k+Q2K+cwYBZE=";
+    hash = "sha256-sl2zM24bb0yBTfCxtNGizp6Yu+L4nj/Uf669zylnPmE=";
   };
 
 

From aa38e61ec39f3ebeaa06938f6d09b01e06b31b43 Mon Sep 17 00:00:00 2001
From: Basil Keeler <basil.keeler@outlook.com>
Date: Wed, 9 Aug 2023 13:17:02 -0500
Subject: [PATCH 07/58] maintainers: add totalchaos

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ef4214842e1a..082338c0cc97 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17142,6 +17142,12 @@
     githubId = 27586264;
     name = "Tobias Schmidt";
   };
+  totalchaos = {
+    email = "basil.keeler@outlook.com";
+    github = "totalchaos05";
+    githubId = 70387628;
+    name = "Basil Keeler";
+  };
   totoroot = {
     name = "Matthias Thym";
     email = "git@thym.at";

From 76bf7dbefad6e8fd3e262636c9e1b8b3c7bca1a9 Mon Sep 17 00:00:00 2001
From: Basil Keeler <basil.keeler@outlook.com>
Date: Wed, 9 Aug 2023 15:08:28 -0500
Subject: [PATCH 08/58] waypaper: init at 1.2

---
 pkgs/applications/misc/waypaper/default.nix | 51 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/applications/misc/waypaper/default.nix

diff --git a/pkgs/applications/misc/waypaper/default.nix b/pkgs/applications/misc/waypaper/default.nix
new file mode 100644
index 000000000000..83715ae52541
--- /dev/null
+++ b/pkgs/applications/misc/waypaper/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, python3
+, fetchFromGitHub
+, gobject-introspection
+, gtk3
+, wrapGAppsHook
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "waypaper";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "anufrievroman";
+    repo = "waypaper";
+    rev = "refs/tags/${version}";
+    hash = "sha256-wD3DtxP4aUwIn+EoM3s1Y9VNEcUGhtyugNBEFHI9eqw=";
+  };
+
+  nativeBuildInputs = [
+    gobject-introspection
+    wrapGAppsHook
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    pygobject3
+  ];
+
+  # has no tests
+  doCheck = false;
+
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = with lib; {
+    changelog = "https://github.com/anufrievroman/waypaper/releases/tag/${version}";
+    description = "GUI wallpaper setter for Wayland-based window managers";
+    longDescription = ''
+      GUI wallpaper setter for Wayland-based window managers that works as a frontend for popular backends like swaybg and swww.
+
+      If wallpaper does not change, make sure that swaybg or swww is installed.
+    '';
+    homepage = "https://github.com/anufrievroman/waypaper";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ totalchaos ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b2945e8caa8..6f8008882279 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36090,6 +36090,8 @@ with pkgs;
 
   watershot = callPackage ../applications/misc/watershot { };
 
+  waypaper = callPackage ../applications/misc/waypaper { };
+
   w3m = callPackage ../applications/networking/browsers/w3m { };
 
   # Should always be the version with the most features

From 48565583c4f1e51bc28425ea7547c42b6d19f107 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Aug 2023 21:48:44 +0000
Subject: [PATCH 09/58] argocd: 2.7.10 -> 2.8.0

---
 pkgs/applications/networking/cluster/argocd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index 05635c26bce7..6c1918aa7bd8 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,17 +2,17 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "2.7.10";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    sha256 = "sha256-MHEmbZZjPxKu0PyDOjkS3pIsWJYozERPVhJfhleeqbQ=";
+    sha256 = "sha256-/BMagPR74pANVYcmvdJZmV4tB48cEyAy0FKtBlpoLDE=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-h4TKomZSG6fEUVxIDhsxNHaIO+1Xl40+pFWgJJ2VH4E=";
+  vendorHash = "sha256-xiCgQqP2XF+b2JQTBFqJ3h2klc6GjqyXoNUwatO0Ul8=";
 
   # Set target as ./cmd per cli-local
   # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

From 94924be1418c08138abb09b8bd7ac9595920ed2c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 9 Aug 2023 14:56:15 +0200
Subject: [PATCH 10/58] example-robot-data: add preCheck
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix 43 occurences of eg.:
> ValueError: Mesh package://example-robot-data/robots/ur_description/meshes/ur5/collision/base.stl could not be found.

Following 0c0b3af7936d868d5346f8e2fc46814ab0dfa4be, pinocchio has
hpp-fcl support, so example-robot-data try to load meshes.

But for `package://example-robot-data/robots/…/mesh.stl` paths to be
resolved by the mesh loader, there must be a
`example-robot-data/robots` folder.
---
 pkgs/development/libraries/example-robot-data/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix
index 201275fb02ef..d9a107bf6497 100644
--- a/pkgs/development/libraries/example-robot-data/default.nix
+++ b/pkgs/development/libraries/example-robot-data/default.nix
@@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   doCheck = true;
+  # The package expect to find an `example-robot-data/robots` folder somewhere
+  # either in install prefix or in the sources
+  # where it can find the meshes for unit tests
+  preCheck = "ln -s source ../../${finalAttrs.pname}";
   pythonImportsCheck = [
     "example_robot_data"
   ];

From a57f123ca58f6133a409a7b2eaa9e0e694caa4df Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 10 Aug 2023 15:06:43 +0200
Subject: [PATCH 11/58] python311Packages.todoist-api-python: 2.0.2 -> 2.1.1

Diff: https://github.com/Doist/todoist-api-python/compare/refs/tags/v2.0.2...v2.1.1

Changelog: https://github.com/Doist/todoist-api-python/blob/v2.1.1/CHANGELOG.md
---
 .../python-modules/todoist-api-python/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/todoist-api-python/default.nix b/pkgs/development/python-modules/todoist-api-python/default.nix
index ed7ae3ab0e71..6b336642d8e7 100644
--- a/pkgs/development/python-modules/todoist-api-python/default.nix
+++ b/pkgs/development/python-modules/todoist-api-python/default.nix
@@ -13,16 +13,16 @@
 
 buildPythonPackage rec {
   pname = "todoist-api-python";
-  version = "2.0.2";
+  version = "2.1.1";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "Doist";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-CKOsUb35+7WjSNf4Xo0SK5loIqWJbEnHdmhw9QXWFAI=";
+    hash = "sha256-mBQCC1beBAB+vDV/TrQHQB7cTjjoCDZlqpiYP8IphUA=";
   };
 
   patches = [

From 35360ba7fb3842a1f1d885de6f940ad63a7f4fb9 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 10 Aug 2023 11:05:49 +0200
Subject: [PATCH 12/58] pinocchio: disable collision support on darwin

---
 pkgs/development/libraries/pinocchio/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix
index 6faf612c1971..af7fff14e8f3 100644
--- a/pkgs/development/libraries/pinocchio/default.nix
+++ b/pkgs/development/libraries/pinocchio/default.nix
@@ -4,6 +4,7 @@
 , cmake
 , boost
 , eigen
+, collisionSupport ? !stdenv.isDarwin
 , hpp-fcl
 , urdfdom
 , pythonSupport ? false
@@ -39,22 +40,28 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals (!pythonSupport) [
     boost
     eigen
+  ] ++ lib.optionals (!pythonSupport && collisionSupport) [
     hpp-fcl
   ] ++ lib.optionals pythonSupport [
     python3Packages.boost
     python3Packages.eigenpy
+  ] ++ lib.optionals (pythonSupport && collisionSupport) [
     python3Packages.hpp-fcl
   ];
 
-  cmakeFlags = [
+  cmakeFlags = lib.optionals collisionSupport [
     "-DBUILD_WITH_COLLISION_SUPPORT=ON"
-  ] ++ lib.optionals (pythonSupport) [
+  ] ++ lib.optionals pythonSupport [
     "-DBUILD_WITH_LIBPYTHON=ON"
+  ] ++ lib.optionals (pythonSupport && stdenv.isDarwin) [
+    # AssertionError: '.' != '/tmp/nix-build-pinocchio-2.6.20.drv/sou[84 chars].dae'
+    "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;test-py-bindings_geometry_model_urdf'"
   ] ++ lib.optionals (!pythonSupport) [
     "-DBUILD_PYTHON_INTERFACE=OFF"
   ];
 
   doCheck = true;
+
   pythonImportsCheck = lib.optionals (!pythonSupport) [
     "pinocchio"
   ];

From 45f7a1babc9d9d192b5ddfeb4feb6e2bb741ea1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Aug 2023 23:24:39 +0000
Subject: [PATCH 13/58] discord-canary: 0.0.162 -> 0.0.163

---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 8bc1c7cb5984..1c8d40091098 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -3,7 +3,7 @@ let
   versions = if stdenv.isLinux then {
     stable = "0.0.28";
     ptb = "0.0.44";
-    canary = "0.0.162";
+    canary = "0.0.163";
     development = "0.0.217";
   } else {
     stable = "0.0.273";
@@ -24,7 +24,7 @@ let
       };
       canary = fetchurl {
         url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        sha256 = "sha256-eSWcwSw46hKJmDLxHtolBZgKrIS2QnTbVoYe0EI4Njs=";
+        sha256 = "sha256-QLQCv3hlCNZ8Ii/+GWHAZs4enBh+gOUEt+wlrkUP91Q=";
       };
       development = fetchurl {
         url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

From d6c4f3a4d5658f940c8799cf08d9fd81ef34c133 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Aug 2023 04:40:20 +0000
Subject: [PATCH 14/58] python310Packages.bx-python: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix
index 085fc210f1b8..91924c46353e 100644
--- a/pkgs/development/python-modules/bx-python/default.nix
+++ b/pkgs/development/python-modules/bx-python/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "bx-python";
-  version = "0.9.0";
+  version = "0.10.0";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "bxlab";
     repo = "bx-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Pi4hV3FatCXoXY3nNgqm5UfWYIrpP/v5PzzCi3gmIbE=";
+    hash = "sha256-j2GKj2IGDBk4LBnISRx6ZW/lh5VSdQBasC0gCRj0Fiw=";
   };
 
   nativeBuildInputs = [ cython ];

From 83e09135a4c5ecddc08b52d37aeb4a54ee67116a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= <cnx@loang.net>
Date: Fri, 11 Aug 2023 14:29:04 +0900
Subject: [PATCH 15/58] clipbuzz: 2.0.0 -> 2.0.1

---
 pkgs/tools/misc/clipbuzz/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/clipbuzz/default.nix b/pkgs/tools/misc/clipbuzz/default.nix
index 47dbbc6e6ff2..7bece66a786d 100644
--- a/pkgs/tools/misc/clipbuzz/default.nix
+++ b/pkgs/tools/misc/clipbuzz/default.nix
@@ -1,23 +1,21 @@
 { lib
 , stdenv
-, fetchFromSourcehut
+, fetchzip
 , libX11
 , libXfixes
-, zig_0_10
+, zig_0_11
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clipbuzz";
-  version = "2.0.0";
+  version = "2.0.1";
 
-  src = fetchFromSourcehut {
-    owner = "~cnx";
-    repo = "clipbuzz";
-    rev = finalAttrs.version;
-    hash = "sha256-V5bAZHoScTzFZBPUhPd7xc/c32SXPLAJp+vsc/lCyeI=";
+  src = fetchzip {
+    url = "https://trong.loang.net/~cnx/clipbuzz/snapshot/clipbuzz-${finalAttrs.version}.tar.gz";
+    hash = "sha256-2//IwthAjGyVSZaXjgpM1pUJGYWZVkrJ6JyrVbzOtr8=";
   };
 
-  nativeBuildInputs = [ zig_0_10.hook ];
+  nativeBuildInputs = [ zig_0_11.hook ];
 
   buildInputs = [
     libX11
@@ -26,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta =  {
     description = "Buzz on new X11 clipboard events";
-    homepage = "https://git.sr.ht/~cnx/clipbuzz";
+    homepage = "https://trong.loang.net/~cnx/clipbuzz";
     license = lib.licenses.unlicense;
     maintainers = [ lib.maintainers.McSinyx ];
   };

From 0b4c5d23cdaaf8729e3653a246860823333c35d4 Mon Sep 17 00:00:00 2001
From: Charlie Moog <moogcharlie@gmail.com>
Date: Fri, 11 Aug 2023 00:09:11 -0500
Subject: [PATCH 16/58] trivial-builders: add meta.mainProgram to
 writeShellScriptBin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Derivations built with `writeShellScriptBin`
should always be runnable with `nix run`. At present,
the derivation is missing both `meta.mainProgram`
and `pname`– this means that `nix run` falls back
to inferring the bin path from `name`. This is
unreliable and depends on faulty heuristics.

For context, reference the following snippet from
`nix run --help`:

    If installable evaluates to a derivation, it will try to execute the
    program <out>/bin/<name>, where out is the primary output store path
    of the derivation, and name is the first of the following that exists:

      · The meta.mainProgram attribute of the derivation.
      · The pname attribute of the derivation.
      · The name part of the value of the name attribute of the derivation.
---
 pkgs/build-support/trivial-builders/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 0c63cc5a9be9..7c4d204df407 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -304,6 +304,7 @@ rec {
       checkPhase = ''
         ${stdenv.shellDryRun} "$target"
       '';
+      meta.mainProgram = name;
     };
 
   /*

From 4edade9b68fc31ede2256587ffcef2e11af3614d Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Fri, 11 Aug 2023 11:28:03 +0530
Subject: [PATCH 17/58] python310Packages.rchitect: 0.3.40 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix
index 9e0b1b48d29d..187ff4320f2b 100644
--- a/pkgs/development/python-modules/rchitect/default.nix
+++ b/pkgs/development/python-modules/rchitect/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "rchitect";
-  version = "0.3.40";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = pname;
     rev = "v${version}";
-    sha256 = "yJMiPmusZ62dd6+5VkA2uSjq57a0C3arG8CgiUUHKpk=";
+    hash = "sha256-fXL2UX0n9kKAVwMUP0z8V3UtJAy4xbAjnPIggUHllN0=";
   };
 
   postPatch = ''

From 48f93c1ec314cbeea4df610d0433472d0fd78e47 Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Fri, 11 Aug 2023 11:28:55 +0530
Subject: [PATCH 18/58] python310Packages.radian: 0.6.5 -> 0.6.6

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

diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix
index de60c93f9f8a..bbe7cc36f6ea 100644
--- a/pkgs/development/python-modules/radian/default.nix
+++ b/pkgs/development/python-modules/radian/default.nix
@@ -18,17 +18,18 @@
 
 buildPythonPackage rec {
   pname = "radian";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = pname;
     rev = "v${version}";
-    sha256 = "iuD4EkGZ1GwNxR8Gpg9ANe3lMHJYZ/Q/RyuN6vZZWME=";
+    hash = "sha256-zA7R9UIB0hOWev10Y4oySIKeIxTOo0V6Q3Fxe+FeHSU=";
   };
 
   postPatch = ''
     substituteInPlace setup.py --replace '"pytest-runner"' ""
+    substituteInPlace setup.py --replace '0.3.39,<0.4.0' '0.3.39'
   '';
 
   nativeBuildInputs = [

From 2cbce91b289efb8778d506e70b6cd1af7eca43b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Aug 2023 06:15:07 +0000
Subject: [PATCH 19/58] python310Packages.sqlobject: 3.10.1 -> 3.10.2

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

diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix
index 21c48ad86ef7..90e4a50b66c4 100644
--- a/pkgs/development/python-modules/sqlobject/default.nix
+++ b/pkgs/development/python-modules/sqlobject/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "sqlobject";
-  version = "3.10.1";
+  version = "3.10.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "SQLObject";
     inherit version;
-    hash = "sha256-/PPqJ/ha8GRQpY/uQOLIF0v90p9tZKrHTCMkusiIuEQ=";
+    hash = "sha256-dW9IsIdOSnCG3thWhYwIsz0Oa5runnXD84S5ITPH3ww=";
   };
 
   propagatedBuildInputs = [

From 485bbe58365f3c44a42f87b8cec2385b88380d74 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sun, 30 Jul 2023 10:25:23 -0700
Subject: [PATCH 20/58] python3.pkgs.colour: remove d2to1 to support setuptools
 68

---
 .../python-modules/colour/default.nix         | 27 +++++++-
 .../colour/remove-unmaintained-d2to1.diff     | 65 +++++++++++++++++++
 2 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/colour/remove-unmaintained-d2to1.diff

diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix
index f7419666f535..2dd31a02bbe7 100644
--- a/pkgs/development/python-modules/colour/default.nix
+++ b/pkgs/development/python-modules/colour/default.nix
@@ -1,15 +1,36 @@
-{ lib, buildPythonPackage, fetchPypi, d2to1 }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "colour";
   version = "0.1.5";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "af20120fefd2afede8b001fbef2ea9da70ad7d49fafdb6489025dae8745c3aee";
+    hash = "sha256-ryASD+/Sr+3osAH77y6p2nCtfUn6/bZIkCXa6HRcOu4=";
   };
 
-  buildInputs = [ d2to1 ];
+  patches = [
+    # https://github.com/vaab/colour/pull/66 (but does not merge cleanly)
+    ./remove-unmaintained-d2to1.diff
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "--doctest-glob=\"*.rst\""
+    "--doctest-modules"
+  ];
+
+  pythonImportsCheck = [
+    "colour"
+  ];
 
   meta = with lib; {
     description = "Converts and manipulates common color representation (RGB, HSV, web, ...)";
diff --git a/pkgs/development/python-modules/colour/remove-unmaintained-d2to1.diff b/pkgs/development/python-modules/colour/remove-unmaintained-d2to1.diff
new file mode 100644
index 000000000000..2cac787bf501
--- /dev/null
+++ b/pkgs/development/python-modules/colour/remove-unmaintained-d2to1.diff
@@ -0,0 +1,65 @@
+diff --git a/setup.cfg b/setup.cfg
+index 41de928..1c18182 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,18 +1,14 @@
+ [metadata]
+ name = colour
+ version = 0.1.5
+-summary = converts and manipulates various color representation (HSL, RVB, web, X11, ...)
+-description-file = 
+-	README.rst
+-	CHANGELOG.rst
+-	TODO.rst
+-license_file = LICENSE
+-requires-dist = 
++description = converts and manipulates various color representation (HSL, RVB, web, X11, ...)
++long_description = file: README.rst, CHANGELOG.rst, TODO.rst
++license_files = LICENSE
+ author = Valentin LAB
+ author_email = valentin.lab@kalysto.org
+-home_page = http://github.com/vaab/colour
++url = http://github.com/vaab/colour
+ license = BSD 3-Clause License
+-classifier = 
++classifiers = 
+ 	Programming Language :: Python
+ 	Topic :: Software Development :: Libraries :: Python Modules
+ 	Development Status :: 3 - Alpha
+@@ -26,16 +22,8 @@ classifier =
+ 	Programming Language :: Python :: 3.5
+ 	Programming Language :: Python :: 3.6
+ 
+-[files]
+-modules = colour
+-extra_files = 
+-	README.rst
+-	CHANGELOG.rst
+-	TODO.rst
+-	setup.py
+-
+-[backwards_compat]
+-zip-safe = False
++[options]
++zip_safe = False
+ 
+ [bdist_wheel]
+ universal = 1
+diff --git a/setup.py b/setup.py
+index 47038f9..11a8d3a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -54,12 +54,4 @@ if "%%short-version%%".startswith("%%"):
+     sys.exit(errlvl)
+ 
+ 
+-##
+-## Normal d2to1 setup
+-##
+-
+-setup(
+-    setup_requires=['d2to1'],
+-    extras_require={'test': ['nose', ]},
+-    d2to1=True
+-)
++setup(extras_require={'test': ['nose', ]})

From afb1afc55ef92f81c1b1a2f10fc3fe6bfa1b9129 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 2 Aug 2023 10:54:28 -0700
Subject: [PATCH 21/58] python3.pkgs.d2to1: remove as it's archived and breaks
 with setuptools 68

---
 .../python-modules/d2to1/default.nix          | 25 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/development/python-modules/d2to1/default.nix

diff --git a/pkgs/development/python-modules/d2to1/default.nix b/pkgs/development/python-modules/d2to1/default.nix
deleted file mode 100644
index eaad9fc9095b..000000000000
--- a/pkgs/development/python-modules/d2to1/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ buildPythonPackage
-, lib
-, fetchFromGitHub
-, nose
-}:
-buildPythonPackage rec {
-  pname = "d2to1";
-  version = "0.2.12.post1";
-
-  nativeCheckInputs = [ nose ];
-
-  src = fetchFromGitHub {
-    owner = "embray";
-    repo = pname;
-    rev = version;
-    sha256 = "1hzq51qbzsc27yy8swp08kf42mamag7qcabbrigzj4m6ivb5chi2";
-  };
-
-  meta = with lib;{
-    description = "Support for distutils2-like setup.cfg files as package metadata";
-    homepage = "https://github.com/embray/d2to1";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ makefu ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 9a2fc3586909..70e4855f7939 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -80,6 +80,7 @@ mapAliases ({
   cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
   cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
   cx_Freeze = cx-freeze; # added 2023-08-02
+  d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30
   dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24
   dateutil = python-dateutil; # added 2021-07-03
   demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62262f520289..425082dce950 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2365,8 +2365,6 @@ self: super: with self; {
 
   cytoolz = callPackage ../development/python-modules/cytoolz { };
 
-  d2to1 = callPackage ../development/python-modules/d2to1 { };
-
   dacite = callPackage ../development/python-modules/dacite { };
 
   daemonize = callPackage ../development/python-modules/daemonize { };

From 6583a9961741d0d69e7da1a156fd8cbccdf38379 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Aug 2023 06:34:30 +0000
Subject: [PATCH 22/58] netbird: 0.22.2 -> 0.22.3

---
 pkgs/tools/networking/netbird/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix
index c2a0fe1bc4da..25c2f9a3aeb5 100644
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@@ -30,13 +30,13 @@ let
 in
 buildGoModule rec {
   pname = "netbird";
-  version = "0.22.2";
+  version = "0.22.3";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-NLi6FJoSYwe1tr3z2F9m3INTfQiltvyq/VfoMwAhxZQ=";
+    sha256 = "sha256-1LUHS3G46EnDz0FgAXXOqluGD+fTRaALypZKNgXtCf0=";
   };
 
   vendorHash = "sha256-Fj80sYoNXt/rHUC8IEevbNbSIvWHPaKd90UQQTkd/7w=";

From 128a081e0b7a776a8ae2fb4b4b5ee5a9192297ad Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Fri, 11 Aug 2023 09:06:35 +0200
Subject: [PATCH 23/58] runc: 1.1.8 -> 1.1.9

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 pkgs/applications/virtualization/runc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 6b2fae7b23a2..38a285945593 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -15,13 +15,13 @@
 
 buildGoModule rec {
   pname = "runc";
-  version = "1.1.8";
+  version = "1.1.9";
 
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "runc";
     rev = "v${version}";
-    hash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4=";
+    hash = "sha256-9vNzKoG+0Ze4+dhluNM6QtsUjV8/bpkuvEF8ASBfBRo=";
   };
 
   vendorHash = null;

From 6c400960cca25ce89ab1dc97d0bc2fa4174feedd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:16:54 +0200
Subject: [PATCH 24/58] python310Packages.flow-record: 3.10 -> 3.11

Diff: https://github.com/fox-it/flow.record/compare/refs/tags/3.10...3.11

Changelog: https://github.com/fox-it/flow.record/releases/tag/3.11
---
 pkgs/development/python-modules/flow-record/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix
index bd21e113f75b..0f4cea423e46 100644
--- a/pkgs/development/python-modules/flow-record/default.nix
+++ b/pkgs/development/python-modules/flow-record/default.nix
@@ -15,16 +15,16 @@
 
 buildPythonPackage rec {
   pname = "flow-record";
-  version = "3.10";
+  version = "3.11";
   format = "pyproject";
 
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "flow.record";
     rev = "refs/tags/${version}";
-    hash = "sha256-pOEK53+rIwzTxDEla1xoWo/xgy+eN0nxR0MeW7VQFds=";
+    hash = "sha256-/mrsm7WoqnTIaGOHuIZk1eMXAMi38eVpctgi6+RQ3WQ=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From eace553380bf6efdf59e2803dfa16e1a2f2e5d69 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:16:59 +0200
Subject: [PATCH 25/58] python310Packages.dissect-cstruct: 3.8 -> 3.9

Diff: https://github.com/fox-it/dissect.cstruct/compare/refs/tags/3.8...3.9

Changelog: https://github.com/fox-it/dissect.cstruct/releases/tag/3.9
---
 pkgs/development/python-modules/dissect-cstruct/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix
index 46093c1268bb..556927b63a08 100644
--- a/pkgs/development/python-modules/dissect-cstruct/default.nix
+++ b/pkgs/development/python-modules/dissect-cstruct/default.nix
@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "dissect-cstruct";
-  version = "3.8";
+  version = "3.9";
   format = "pyproject";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.cstruct";
     rev = "refs/tags/${version}";
-    hash = "sha256-ART7m0OR0KjkZYHXDoNGJDX0v7h+FgctAaWXNFohGV8=";
+    hash = "sha256-v0giDdH6bYCSrotd9WGSlIMzylTz7FHeCE/JkCw7frY=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 418417066df63910bc30ffb49440a27c25fb795e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:18:38 +0200
Subject: [PATCH 26/58] python310Packages.dissect-etl: 3.6 -> 3.7

Diff: https://github.com/fox-it/dissect.etl/compare/refs/tags/3.6...3.7

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

diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix
index 06e9d2f282dd..de6a49ba9e26 100644
--- a/pkgs/development/python-modules/dissect-etl/default.nix
+++ b/pkgs/development/python-modules/dissect-etl/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-etl";
-  version = "3.6";
+  version = "3.7";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.etl";
     rev = "refs/tags/${version}";
-    hash = "sha256-Z6IdSLHXwZULqV6aTZlXjRo5Xq/rRNw7b/nOhuKOth4=";
+    hash = "sha256-z6P7XpA+j9JIJJsp/Z4uewFw9OAPSZV+57eJu7rd17I=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From b14d9de30c41572f91dfc8c165b5036d81385ecf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:18:47 +0200
Subject: [PATCH 27/58] python310Packages.dissect-ntfs: 3.6 -> 3.7

Diff: https://github.com/fox-it/dissect.ntfs/compare/refs/tags/3.6...3.7

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

diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix
index e81211286003..96b3cb3a6745 100644
--- a/pkgs/development/python-modules/dissect-ntfs/default.nix
+++ b/pkgs/development/python-modules/dissect-ntfs/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-ntfs";
-  version = "3.6";
+  version = "3.7";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.ntfs";
     rev = "refs/tags/${version}";
-    hash = "sha256-kGvy1+MSjJ6IQjffmsT02toBNaSbBZXeYmC9AqwbfFk=";
+    hash = "sha256-bnFimn5ektIKiX73NZ+1Iz3Uoew138a0nFJgypffC4o=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 8363f29fa681ef8045259bca57fd698c3db3b9e4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:18:51 +0200
Subject: [PATCH 28/58] python310Packages.dissect-regf: 3.6 -> 3.7

Diff: https://github.com/fox-it/dissect.regf/compare/refs/tags/3.6...3.7

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

diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix
index 726c9aad178c..bc0d8798255f 100644
--- a/pkgs/development/python-modules/dissect-regf/default.nix
+++ b/pkgs/development/python-modules/dissect-regf/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-regf";
-  version = "3.6";
+  version = "3.7";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.regf";
     rev = "refs/tags/${version}";
-    hash = "sha256-doyyBmkRPH2wRZA44/7ldkUdNLX1lulo/XcSVFxaIfM=";
+    hash = "sha256-WUrND1RnXTeN3WosR+m+yVJLe/imBTx7nmUZrSIc1E0=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From a43125913be43819a5777ac9ac90cdc2ec4e6713 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:18:58 +0200
Subject: [PATCH 29/58] python310Packages.dissect-target: 3.10 -> 3.11

Diff: https://github.com/fox-it/dissect.target/compare/refs/tags/3.10...3.11

Changelog: https://github.com/fox-it/dissect.target/releases/tag/3.11
---
 pkgs/development/python-modules/dissect-target/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix
index 1a5bc7756f86..1f79a43759b3 100644
--- a/pkgs/development/python-modules/dissect-target/default.nix
+++ b/pkgs/development/python-modules/dissect-target/default.nix
@@ -39,16 +39,16 @@
 
 buildPythonPackage rec {
   pname = "dissect-target";
-  version = "3.10";
+  version = "3.11";
   format = "pyproject";
 
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.target";
     rev = "refs/tags/${version}";
-    hash = "sha256-zAcNkRwCnU/53h8/WsaGjCpgPovPb+5VOu/6SHXu31g=";
+    hash = "sha256-WnF0Z/1jIUKSDAToQzKpiYQgn58KvQJfxk6r8oXANvU=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From abe08c6c212152800a09db537f11a9c25a0bb38f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:19:01 +0200
Subject: [PATCH 30/58] python310Packages.dissect-util: 3.9 -> 3.10

Diff: https://github.com/fox-it/dissect.util/compare/refs/tags/3.9...3.10

Changelog: https://github.com/fox-it/dissect.util/releases/tag/3.10
---
 pkgs/development/python-modules/dissect-util/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix
index 22c1fe568279..bcd15ffbd250 100644
--- a/pkgs/development/python-modules/dissect-util/default.nix
+++ b/pkgs/development/python-modules/dissect-util/default.nix
@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "dissect-util";
-  version = "3.9";
+  version = "3.10";
   format = "pyproject";
 
-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.util";
     rev = "refs/tags/${version}";
-    hash = "sha256-u8FPGSG9bZi+bxqI5zABwHcqwmM24hURvHcHTKz8dYw=";
+    hash = "sha256-H89lPX//AlTEJLuZFzzn9wUc4lZC1TGd98t4+TYlbWs=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 9902a55b0b191142f8835293ef1b051282ac26d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:19:07 +0200
Subject: [PATCH 31/58] python310Packages.acquire: 3.7 -> 3.8

Diff: https://github.com/fox-it/acquire/compare/refs/tags/3.7...3.8

Changelog: https://github.com/fox-it/acquire/releases/tag/3.8
---
 pkgs/development/python-modules/acquire/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix
index 3b88d6bbb553..e944a1d21013 100644
--- a/pkgs/development/python-modules/acquire/default.nix
+++ b/pkgs/development/python-modules/acquire/default.nix
@@ -17,16 +17,16 @@
 
 buildPythonPackage rec {
   pname = "acquire";
-  version = "3.7";
+  version = "3.8";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "acquire";
     rev = "refs/tags/${version}";
-    hash = "sha256-wGoMah3Pj7hS5+k/l5pEaDaM25RzdWRIG9Hrf3oWkR8=";
+    hash = "sha256-JfZ0sc7hFj71XxGWTTZ50uGWuKoWKY4vYm0v+zS2YiQ=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 0b134330347caf34f5a5da3ac8d09a7eaabe90b1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:27:10 +0200
Subject: [PATCH 32/58] python310Packages.sqlobject: add changelog to meta

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

diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix
index 90e4a50b66c4..4054cfcacf98 100644
--- a/pkgs/development/python-modules/sqlobject/default.nix
+++ b/pkgs/development/python-modules/sqlobject/default.nix
@@ -45,6 +45,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Object Relational Manager for providing an object interface to your database";
     homepage = "http://www.sqlobject.org/";
+    changelog = "https://github.com/sqlobject/sqlobject/blob/${version}/docs/News.rst";
     license = licenses.lgpl21Only;
     maintainers = with maintainers; [ ];
   };

From 3f95b4a317fcc1fd761ce9a4034ac451df1a2d2a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:30:01 +0200
Subject: [PATCH 33/58] python311Packages.radian: add changelog to meta

---
 pkgs/development/python-modules/radian/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix
index bbe7cc36f6ea..1d7221d746a0 100644
--- a/pkgs/development/python-modules/radian/default.nix
+++ b/pkgs/development/python-modules/radian/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-zA7R9UIB0hOWev10Y4oySIKeIxTOo0V6Q3Fxe+FeHSU=";
   };
 
@@ -66,6 +66,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A 21 century R console";
     homepage = "https://github.com/randy3k/radian";
+    changelog = "https://github.com/randy3k/radian/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ savyajha ];
   };

From 304bb1941e6cc89fc88270f1a9dc05a459d83896 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:32:21 +0200
Subject: [PATCH 34/58] python310Packages.rchitect: add changelog to meta

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

diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix
index 187ff4320f2b..d4874f44fad3 100644
--- a/pkgs/development/python-modules/rchitect/default.nix
+++ b/pkgs/development/python-modules/rchitect/default.nix
@@ -6,7 +6,8 @@
 , pytestCheckHook
 , pytest-mock
 , R
-, rPackages }:
+, rPackages
+}:
 
 buildPythonPackage rec {
   pname = "rchitect";
@@ -15,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-fXL2UX0n9kKAVwMUP0z8V3UtJAy4xbAjnPIggUHllN0=";
   };
 
@@ -46,6 +47,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Interoperate R with Python";
     homepage = "https://github.com/randy3k/rchitect";
+    changelog = "https://github.com/randy3k/rchitect/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ savyajha ];
   };

From 9083fe415bd7f7296da127274de97ecda9c07d23 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:37:36 +0200
Subject: [PATCH 35/58] python310Packages.bx-python: add changelog to meta

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

diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix
index 91924c46353e..3d26ca5078e8 100644
--- a/pkgs/development/python-modules/bx-python/default.nix
+++ b/pkgs/development/python-modules/bx-python/default.nix
@@ -29,9 +29,9 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
+    description = "Tools for manipulating biological data, particularly multiple sequence alignments";
     homepage = "https://github.com/bxlab/bx-python";
-    description =
-      "Tools for manipulating biological data, particularly multiple sequence alignments";
+    changelog = "https://github.com/bxlab/bx-python/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = [ maintainers.jbedo ];
     platforms = [ "x86_64-linux" ];

From 00c02166f5283f705c165668bc97e0f413723e19 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:39:30 +0200
Subject: [PATCH 36/58] python310Packages.bx-python: equalize content

---
 .../python-modules/bx-python/default.nix      | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix
index 3d26ca5078e8..56a8a9a151e9 100644
--- a/pkgs/development/python-modules/bx-python/default.nix
+++ b/pkgs/development/python-modules/bx-python/default.nix
@@ -1,5 +1,14 @@
-{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, numpy, cython, zlib, six
-, python-lzo, nose }:
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, numpy
+, cython
+, zlib
+, six
+, python-lzo
+, nose
+}:
 
 buildPythonPackage rec {
   pname = "bx-python";
@@ -13,10 +22,23 @@ buildPythonPackage rec {
     hash = "sha256-j2GKj2IGDBk4LBnISRx6ZW/lh5VSdQBasC0gCRj0Fiw=";
   };
 
-  nativeBuildInputs = [ cython ];
-  buildInputs = [ zlib ];
-  propagatedBuildInputs = [ numpy six python-lzo ];
-  nativeCheckInputs = [ nose ];
+  nativeBuildInputs = [
+    cython
+  ];
+
+  buildInputs = [
+    zlib
+  ];
+
+  propagatedBuildInputs = [
+    numpy
+    six
+    python-lzo
+  ];
+
+  nativeCheckInputs = [
+    nose
+  ];
 
   postInstall = ''
     cp -r scripts/* $out/bin
@@ -33,7 +55,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/bxlab/bx-python";
     changelog = "https://github.com/bxlab/bx-python/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = [ maintainers.jbedo ];
+    maintainers = with maintainers; [ jbedo ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 8193aa415d442739a6bd022fff3b38706aadbd7b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:41:58 +0200
Subject: [PATCH 37/58] python310Packages.bx-python: update disabled

- add format
---
 pkgs/development/python-modules/bx-python/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix
index 56a8a9a151e9..5fc21676d261 100644
--- a/pkgs/development/python-modules/bx-python/default.nix
+++ b/pkgs/development/python-modules/bx-python/default.nix
@@ -5,7 +5,6 @@
 , numpy
 , cython
 , zlib
-, six
 , python-lzo
 , nose
 }:
@@ -13,7 +12,9 @@
 buildPythonPackage rec {
   pname = "bx-python";
   version = "0.10.0";
-  disabled = pythonOlder "3.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "bxlab";
@@ -32,7 +33,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     numpy
-    six
     python-lzo
   ];
 
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   postInstall = ''
     cp -r scripts/* $out/bin
 
-    # This is a small hack; the test suit uses the scripts which need to
+    # This is a small hack; the test suite uses the scripts which need to
     # be patched. Linking the patched scripts in $out back to the
     # working directory allows the tests to run
     rm -rf scripts

From 8825a20dd2e305ea85afdb16ae64bf13cdad95af Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:43:30 +0200
Subject: [PATCH 38/58] python311Packages.dissect: 3.7 -> 3.8

Diff: https://github.com/fox-it/dissect/compare/refs/tags/3.7...3.8

Changelog: https://github.com/fox-it/dissect/releases/tag/3.8
---
 pkgs/development/python-modules/dissect/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix
index aedb4dcbb7e9..236371c41b96 100644
--- a/pkgs/development/python-modules/dissect/default.nix
+++ b/pkgs/development/python-modules/dissect/default.nix
@@ -32,16 +32,16 @@
 
 buildPythonPackage rec {
   pname = "dissect";
-  version = "3.7";
+  version = "3.8";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect";
     rev = "refs/tags/${version}";
-    hash = "sha256-noo7yDRTPPSIrSt8Hewb9mZsMuPgDmL3aIxI/bknsGc=";
+    hash = "sha256-TEzIKEGAp+1QHJtnPp5JhopuVVBNo9/Cwj0z3YcBCcg=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 646abd9aac905c6d0a4d042bda26ad90eda49bf7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:49:44 +0200
Subject: [PATCH 39/58] python311Packages.radian: add format

- disable on unsupported Python releases
---
 pkgs/development/python-modules/radian/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix
index 1d7221d746a0..d8ffc2bff9ef 100644
--- a/pkgs/development/python-modules/radian/default.nix
+++ b/pkgs/development/python-modules/radian/default.nix
@@ -11,14 +11,17 @@
 , prompt-toolkit
 , pygments
 , rchitect
-, six
 , R
 , rPackages
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "radian";
   version = "0.6.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "randy3k";
@@ -28,8 +31,9 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    substituteInPlace setup.py --replace '"pytest-runner"' ""
-    substituteInPlace setup.py --replace '0.3.39,<0.4.0' '0.3.39'
+    substituteInPlace setup.py \
+      --replace '"pytest-runner"' "" \
+      --replace '0.3.39,<0.4.0' '0.3.39'
   '';
 
   nativeBuildInputs = [
@@ -41,7 +45,6 @@ buildPythonPackage rec {
     prompt-toolkit
     pygments
     rchitect
-    six
   ] ++ (with rPackages; [
     reticulate
     askpass

From 2cf03e242774cf806f82cada2d89ec5fe369813a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 09:50:29 +0200
Subject: [PATCH 40/58] python311Packages.rchitect: add format

- disable on unsupported Python releases
---
 pkgs/development/python-modules/rchitect/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix
index d4874f44fad3..ad1484dfc254 100644
--- a/pkgs/development/python-modules/rchitect/default.nix
+++ b/pkgs/development/python-modules/rchitect/default.nix
@@ -2,16 +2,20 @@
 , buildPythonPackage
 , fetchFromGitHub
 , cffi
-, six
 , pytestCheckHook
 , pytest-mock
+, pythonOlder
 , R
 , rPackages
+, six
 }:
 
 buildPythonPackage rec {
   pname = "rchitect";
   version = "0.4.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "randy3k";
@@ -21,7 +25,8 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    substituteInPlace setup.py --replace '"pytest-runner"' ""
+    substituteInPlace setup.py \
+      --replace '"pytest-runner"' ""
   '';
 
   propagatedBuildInputs = [

From c34385b52cdd48aa4aa50b95f12f61fe71fc7d0e Mon Sep 17 00:00:00 2001
From: gilice <104317939+gilice@users.noreply.github.com>
Date: Tue, 8 Aug 2023 11:52:54 +0200
Subject: [PATCH 41/58] flutter: link notices to all of the artifact
 directories.

The flutter team has also started doing this, but only for new
artifacts. This way, we also do it for older artifacts.
---
 .../flutter/engine-artifacts/default.nix      | 41 +++++++++++++++++++
 .../flutter/engine-artifacts/hashes.nix       |  4 ++
 .../development/compilers/flutter/wrapper.nix |  5 ++-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix
index 249e9217325b..41201bdb94e5 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix
@@ -6,13 +6,43 @@
 , fetchzip
 , autoPatchelfHook
 , gtk3
+, flutterVersion
 , unzip
+, stdenvNoCC
 }:
 
 let
   hashes = (import ./hashes.nix).${engineVersion} or
     (throw "There are no known artifact hashes for Flutter engine version ${engineVersion}.");
+  noticeText = stdenvNoCC.mkDerivation (finalAttrs: {
+    pname = "flutter-notice";
+    version = engineVersion;
+    dontUnpack = true;
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/flutter/engine/${engineVersion}/sky/packages/sky_engine/LICENSE";
+      sha256 = hashes.skyNotice;
+    };
+    flutterNotice = fetchurl {
+      url = "https://raw.githubusercontent.com/flutter/flutter/${flutterVersion}/LICENSE";
+      sha256 = hashes.flutterNotice;
+    };
+    installPhase =
+      ''
+        SRC_TEXT="$(cat $src)"
+        FLUTTER_NOTICE_TEXT="$(cat $flutterNotice)"
+        cat << EOF > $out
+        This artifact is from the Flutter SDK's engine.
+        This file carries third-party notices for its dependencies.
+        See also other files, that have LICENSE in the name, in the artifact directory.
 
+        Appendix 1/2: merged sky_engine LICENSE file (also found at ${finalAttrs.src.url})
+        $SRC_TEXT
+
+        Appendix 2/2: Flutter license (also found at ${finalAttrs.flutterNotice.url})
+        $FLUTTER_NOTICE_TEXT
+        EOF
+      '';
+  });
   artifacts =
     {
       common = {
@@ -165,6 +195,17 @@ let
           destination = "$out/${if subdirectory == true then archiveBasename else if subdirectory != null then subdirectory else "."}";
         in
         ''
+          # ship the notice near all artifacts. if the artifact directory is / multiple directories are nested in $src, link it there. If there isn't a directory, link it in root
+          # this *isn't the same as the subdirectory variable above*
+          DIR_CNT="$(echo */ | wc -w)"
+          if [[ "$DIR_CNT" == 0 ]]; then
+            ln -s ${noticeText} LICENSE.README
+          else
+            for dir in */
+            do
+              ln -s ${noticeText} "$dir/LICENSE.README"
+            done
+          fi
           mkdir -p "${destination}"
           cp -r . "${destination}"
         '';
diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
index fb5134739f76..f51e43b2474f 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
@@ -1,5 +1,7 @@
 {
   "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = {
+    skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo=";
+    flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
     android-arm = {
       "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM=";
     };
@@ -113,6 +115,8 @@
     };
   };
   "45f6e009110df4f34ec2cf99f63cf73b71b7a420" = {
+    skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo=";
+    flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
     android-arm = {
       "artifacts.zip" = "sha256-NOpUM+iFSPVzr99Dz0DBdDUQnMC0ad1eZnVhtqu9HnU=";
     };
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
index 5685ddebd781..a650b1853fd4 100644
--- a/pkgs/development/compilers/flutter/wrapper.nix
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -56,7 +56,10 @@
 }:
 
 let
-  engineArtifacts = callPackage ./engine-artifacts { inherit (flutter) engineVersion; };
+  engineArtifacts = callPackage ./engine-artifacts {
+    inherit (flutter) engineVersion;
+    flutterVersion = flutter.version;
+  };
   mkCommonArtifactLinkCommand = { artifact }:
     ''
       mkdir -p $out/artifacts/engine/common

From 8bf43a151f2f05860b70a7000038cda2a0dbd2ef Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 10:08:25 +0200
Subject: [PATCH 42/58] python311Packages.todoist-api-python: remove attrs

---
 pkgs/development/python-modules/todoist-api-python/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/todoist-api-python/default.nix b/pkgs/development/python-modules/todoist-api-python/default.nix
index 6b336642d8e7..d62f5b8ad2ac 100644
--- a/pkgs/development/python-modules/todoist-api-python/default.nix
+++ b/pkgs/development/python-modules/todoist-api-python/default.nix
@@ -1,5 +1,4 @@
 { lib
-, attrs
 , buildPythonPackage
 , fetchFromGitHub
 , fetchpatch
@@ -39,7 +38,6 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    attrs
     requests
   ];
 

From 5a188d863176ad749fb2d864ec097f19c090d287 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 10:10:37 +0200
Subject: [PATCH 43/58] tlsx: 1.1.1 -> 1.1.3

Diff: https://github.com/projectdiscovery/tlsx/compare/v1.1.1...v1.1.3

Changelog: https://github.com/projectdiscovery/tlsx/releases/tag/v1.1.3
---
 pkgs/tools/security/tlsx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/tools/security/tlsx/default.nix
index cd40cf1c7697..42c5a84cd3c3 100644
--- a/pkgs/tools/security/tlsx/default.nix
+++ b/pkgs/tools/security/tlsx/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "tlsx";
-  version = "1.1.1";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-sYyIZKhn2VJxNxoVb58WQj8a+sYHzuu4SjgPHyLsJK4=";
+    hash = "sha256-dCtMfrkN43zJqztCobT3RSkn4crGigqzI6NSP8wrCf0=";
   };
 
-  vendorHash = "sha256-hutHe0n3IAeCP+Lw7dZLfRLyvaOwrWFIrA6chsn+BEw=";
+  vendorHash = "sha256-33eVwWV9PnrP2MSPXTAcYe9ruJc5lauASc4uubBd9S4=";
 
   # Tests require network access
   doCheck = false;

From 8bde872c38ad9c98b71615c715f2d6951d8269ca Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 10:30:27 +0200
Subject: [PATCH 44/58] python310Packages.publicsuffixlist: 0.10.0.20230806 ->
 0.10.0.20230811

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

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 0c70cafa97c6..7ed1f25ee6b6 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "0.10.0.20230806";
+  version = "0.10.0.20230811";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jDDqegAZOG0UTKPbh1H3V+5GrMGU6m2WGesXUEFJHJY=";
+    hash = "sha256-C6IKX6e5/lxtx4fZeMa+IS5TyWKhpBeipZSMnSikxUk=";
   };
 
   passthru.optional-dependencies = {

From 498e46eb542c8eaa57e9a9e9dc24cc30e74010c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 10:31:21 +0200
Subject: [PATCH 45/58] python310Packages.pynws: 1.5.0 -> 1.5.1

Diff: https://github.com/MatthewFlamm/pynws/compare/v1.5.0...v1.5.1
---
 pkgs/development/python-modules/pynws/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix
index 145f20e4c589..4b9c70a044b6 100644
--- a/pkgs/development/python-modules/pynws/default.nix
+++ b/pkgs/development/python-modules/pynws/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pynws";
-  version = "1.5.0";
+  version = "1.5.1";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "MatthewFlamm";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-UGwK7HasDAPw3edQUdrzWOmrbbM9l5R1BVw3M+FNm1s=";
+    hash = "sha256-Mq8kYS4p53gdSGF83AkSPecVizoEBbeKvyk7nCsRYdM=";
   };
 
   propagatedBuildInputs = [

From 4a7c2a14b017a65327e04f1bbb3eaf2a5d5d2df2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 10:37:13 +0200
Subject: [PATCH 46/58] python311Packages.netutils: 1.4.1 -> 1.5.0

Diff: https://github.com/networktocode/netutils/compare/refs/tags/v1.4.1...v1.5.0

Changelog: https://github.com/networktocode/netutils/releases/tag/v1.5.0
---
 .../python-modules/netutils/default.nix        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix
index 19a5be4077d2..bee05b436cdc 100644
--- a/pkgs/development/python-modules/netutils/default.nix
+++ b/pkgs/development/python-modules/netutils/default.nix
@@ -1,8 +1,9 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , jinja2
+, napalm
 , poetry-core
 , pytestCheckHook
 , pythonOlder
@@ -12,22 +13,26 @@
 
 buildPythonPackage rec {
   pname = "netutils";
-  version = "1.4.1";
+  version = "1.5.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "networktocode";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-hSSHCWi0L/ZfFz0JQ6Al5mjhb2g0DpykLF66uMKMIN8=";
+    hash = "sha256-uUw48EBUpEUw+A8wxw3qXrnqmFWQzg/zb+8qAGRSlUw=";
   };
 
   nativeBuildInputs = [
     poetry-core
   ];
 
+  propagatedBuildInputs = [
+    napalm
+  ];
+
   nativeCheckInputs = [
     jinja2
     pytestCheckHook
@@ -49,6 +54,9 @@ buildPythonPackage rec {
     # OSError: [Errno 22] Invalid argument
     "test_compare_type5"
     "test_encrypt_type5"
+    "test_compare_cisco_type5"
+    "test_get_napalm_getters_napalm_installed_default"
+    "test_encrypt_cisco_type5"
   ];
 
   meta = with lib; {

From 882c8ffcf7e7b7d7e00edf147d7dbb2b1c66dc52 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 10:39:24 +0200
Subject: [PATCH 47/58] python311Packages.msgspec: 0.17.0 -> 0.18.0

Diff: https://github.com/jcrist/msgspec/compare/refs/tags/0.17.0...0.18.0

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

diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix
index c385661738b1..2c3a0b153e43 100644
--- a/pkgs/development/python-modules/msgspec/default.nix
+++ b/pkgs/development/python-modules/msgspec/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "msgspec";
-  version = "0.17.0";
+  version = "0.18.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "jcrist";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-IDu+Yu9BKk4/ITkNY6YLVmJ5zNR6F4LF1vj8QIEW108=";
+    hash = "sha256-FZq8SEtn/p7x43Je2d0gIGDi8S4uz4cdV0KkQecCFT4=";
   };
 
   # Requires libasan to be accessible

From 12bc3d6dc6672c9ce36aa88da891c40a2ca1dde6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 10:39:57 +0200
Subject: [PATCH 48/58] python311Packages.md-toc: 8.1.9 -> 8.2.0

Diff: https://github.com/frnmst/md-toc/compare/8.1.9...8.2.0

Changelog: https://blog.franco.net.eu.org/software/CHANGELOG-md-toc.html
---
 pkgs/development/python-modules/md-toc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix
index 193fca714ad5..800fc6227b01 100644
--- a/pkgs/development/python-modules/md-toc/default.nix
+++ b/pkgs/development/python-modules/md-toc/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "md-toc";
-  version = "8.1.9";
+  version = "8.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "frnmst";
     repo = pname;
     rev = version;
-    hash = "sha256-t3G8nQCVUUuDb+W+Gw+f2miXQ2i/hdVfT6yGxdNWKpw=";
+    hash = "sha256-7Udmon/5E741+v2vBHHL7h31r91RR33hN1WhL3FiDQc=";
   };
 
   propagatedBuildInputs = [

From 314528034950137f797c6532a8a171b73451814b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 10:41:59 +0200
Subject: [PATCH 49/58] python311Pacakges.mkdocs-autorefs: add changelog to
 meta

---
 .../development/python-modules/mkdocs-autorefs/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix
index 3b98ff015cca..15f846ad4745 100644
--- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix
+++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-autorefs";
-  version = "0.4.1";
+  version = "0.5.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "autorefs";
-    rev = version;
-    hash = "sha256-kiHb/XSFw6yaUbLJHBvHaQAOVUM6UfyFeomgniDZqgU=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-GZKQlOXhQIQhS/z4cbmS6fhAKYgnVhSXh5a8Od7+TWc=";
   };
 
   nativeBuildInputs = [
@@ -47,6 +47,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Automatically link across pages in MkDocs";
     homepage = "https://github.com/mkdocstrings/autorefs/";
+    changelog = "https://github.com/mkdocstrings/autorefs/blob/${version}/CHANGELOG.md";
     license = licenses.isc;
     maintainers = with maintainers; [ fab ];
   };

From fb2c8d29b6c0953bfd701f3921a5f31ab087db19 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 10:43:05 +0200
Subject: [PATCH 50/58] python311Packages.mkdocs-autorefs: 0.4.1 -> 0.5.0

Diff: https://github.com/mkdocstrings/autorefs/compare/refs/tags/0.4.1...0.5.0

Changelog: https://github.com/mkdocstrings/autorefs/blob/0.5.0/CHANGELOG.md
---
 .../python-modules/mkdocs-autorefs/default.nix   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix
index 15f846ad4745..1a0b64efe1e1 100644
--- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix
+++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix
@@ -4,7 +4,7 @@
 , markdown
 , mkdocs
 , pytestCheckHook
-, pdm-pep517
+, pdm-backend
 , pythonOlder
 }:
 
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   version = "0.5.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "mkdocstrings";
@@ -22,8 +22,13 @@ buildPythonPackage rec {
     hash = "sha256-GZKQlOXhQIQhS/z4cbmS6fhAKYgnVhSXh5a8Od7+TWc=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'dynamic = ["version"]' 'version = "${version}"'
+  '';
+
   nativeBuildInputs = [
-    pdm-pep517
+    pdm-backend
   ];
 
   propagatedBuildInputs = [
@@ -35,11 +40,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'dynamic = ["version"]' 'version = "${version}"'
-  '';
-
   pythonImportsCheck = [
     "mkdocs_autorefs"
   ];

From 0079d812fb671782d9ba7c2f45151b4bdf6d08f3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 10:46:42 +0200
Subject: [PATCH 51/58] python311Packages.aioesphomeapi: 15.1.15 -> 16.0.0

Diff: https://github.com/esphome/aioesphomeapi/compare/refs/tags/v15.1.15...v16.0.0

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

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index b126a756b2e5..205409520618 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "15.1.15";
+  version = "16.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-qNljw3V0rfMb6GDtTd+jy/hHBaM3kc9y+RCEoNTKHFM=";
+    hash = "sha256-ATfAI8srh5G1ejkp/2wl2Soowatjprq9e8h8tSAAXGs=";
   };
 
   propagatedBuildInputs = [

From f83e842b8b98fc2d78fef33b42b60ea47f744042 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 10:48:48 +0200
Subject: [PATCH 52/58] exploitdb: 2023-08-09 -> 2023-08-11

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-08-09...2023-08-11
---
 pkgs/tools/security/exploitdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index e01cb9626e1b..bb322ce4f32c 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2023-08-09";
+  version = "2023-08-11";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-o6rLIp6bOJK+JB0zd+aHbcWUBlEj9Y8FUdTYdnBp8wg=";
+    hash = "sha256-Fv5vGPo9KZCNTllQhVHlGh496vdwpdTx1V0StaS9Flk=";
   };
 
   nativeBuildInputs = [

From db0fdf973219ee5ed505cb0d773fb0418b588124 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 10:51:36 +0200
Subject: [PATCH 53/58] checkov: 2.3.360 -> 2.3.361

Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.360...2.3.361

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.361
---
 pkgs/development/tools/analysis/checkov/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 1df7e59abc8e..c8ee0e1b657d 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -22,14 +22,14 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "checkov";
-  version = "2.3.360";
+  version = "2.3.361";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-3EyaJiApKm2Kaj1nAfadMyn/qnrx3on2rYQAXc6jG8E=";
+    hash = "sha256-k357VjGB+mKsKsd+l0S2lMh1f5za5Htlm4AWEVisQss=";
   };
 
   patches = [

From 5cf6feecdd96cc747955f68364c85e6489aee228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 11 Aug 2023 10:46:21 +0100
Subject: [PATCH 54/58] init ceedling at 0.31.1

---
 pkgs/development/tools/ceedling/Gemfile      |  2 +
 pkgs/development/tools/ceedling/Gemfile.lock | 21 ++++++++
 pkgs/development/tools/ceedling/default.nix  | 16 ++++++
 pkgs/development/tools/ceedling/gemset.nix   | 53 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 5 files changed, 94 insertions(+)
 create mode 100644 pkgs/development/tools/ceedling/Gemfile
 create mode 100644 pkgs/development/tools/ceedling/Gemfile.lock
 create mode 100644 pkgs/development/tools/ceedling/default.nix
 create mode 100644 pkgs/development/tools/ceedling/gemset.nix

diff --git a/pkgs/development/tools/ceedling/Gemfile b/pkgs/development/tools/ceedling/Gemfile
new file mode 100644
index 000000000000..01d6e98e76aa
--- /dev/null
+++ b/pkgs/development/tools/ceedling/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'ceedling'
diff --git a/pkgs/development/tools/ceedling/Gemfile.lock b/pkgs/development/tools/ceedling/Gemfile.lock
new file mode 100644
index 000000000000..2709a0edab5f
--- /dev/null
+++ b/pkgs/development/tools/ceedling/Gemfile.lock
@@ -0,0 +1,21 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ceedling (0.31.1)
+      constructor (~> 2)
+      deep_merge (~> 1.2)
+      rake (>= 12, < 14)
+      thor (~> 0.14)
+    constructor (2.0.0)
+    deep_merge (1.2.2)
+    rake (13.0.6)
+    thor (0.20.3)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  ceedling
+
+BUNDLED WITH
+   2.4.17
diff --git a/pkgs/development/tools/ceedling/default.nix b/pkgs/development/tools/ceedling/default.nix
new file mode 100644
index 000000000000..5910b47b7424
--- /dev/null
+++ b/pkgs/development/tools/ceedling/default.nix
@@ -0,0 +1,16 @@
+{ lib
+, bundlerApp
+}:
+
+bundlerApp {
+  pname = "ceedling";
+  gemdir = ./.;
+  exes = [ "ceedling" ];
+
+  meta = with lib; {
+    description = "A build system for C projects that is something of an extension around Ruby's Rake";
+    homepage    = "http://www.throwtheswitch.org/ceedling";
+    license     = licenses.mit;
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/ceedling/gemset.nix b/pkgs/development/tools/ceedling/gemset.nix
new file mode 100644
index 000000000000..e094c7dd4d67
--- /dev/null
+++ b/pkgs/development/tools/ceedling/gemset.nix
@@ -0,0 +1,53 @@
+{
+  ceedling = {
+    dependencies = ["constructor" "deep_merge" "rake" "thor"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jjvz14dg85v8c4raxvk618rq7f6kyna5148901xciz2zjpm3bri";
+      type = "gem";
+    };
+    version = "0.31.1";
+  };
+  constructor = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02qmp08kcvi5dkz3lxm5yck9msfwfx1msvrrz9d6z4klc14q889y";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  deep_merge = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fjn4civid68a3zxnbgyjj6krs3l30dy8b4djpg6fpzrsyix7kl3";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
+  rake = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
+      type = "gem";
+    };
+    version = "13.0.6";
+  };
+  thor = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+      type = "gem";
+    };
+    version = "0.20.3";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37421f215d21..f90499555a07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20632,6 +20632,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
+  ceedling = callPackage ../development/tools/ceedling { };
+
   celt = callPackage ../development/libraries/celt { };
   celt_0_7 = callPackage ../development/libraries/celt/0.7.nix { };
   celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix { };

From 2877d702dcf3d11ccb86da00757875536fe42d08 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 11 Aug 2023 18:05:58 +0300
Subject: [PATCH 55/58] linux: 5.15.125 -> 5.15.126

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix
index ec49d21fab7f..020b8f64da37 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.15.125";
+  version = "5.15.126";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1izyv1ibiy4dapwb8745dshfbb9b6xqyz77l6mhkmlkcnx33h3qm";
+    sha256 = "0vzdncrvwqxzjkpgf3gjxvl8iwz92szfyzc33cayx28ghjwsmx5d";
   };
 } // (args.argsOverride or { }))

From 7e5ada58a9c737e6ef95e1cf5ac1aaf6e11a1dd8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 4 Aug 2023 18:25:03 +0200
Subject: [PATCH 56/58] ledit: use OCaml 4.11

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3438afb51bce..c42eb575bce7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10148,7 +10148,7 @@ with pkgs;
   lact = callPackage ../tools/system/lact { };
 
   ledit = callPackage ../tools/misc/ledit {
-    inherit (ocaml-ng.ocamlPackages_4_12) ocaml camlp5;
+    inherit (ocaml-ng.ocamlPackages_4_11) ocaml camlp5;
   };
 
   ledmon = callPackage ../tools/system/ledmon { };

From 032f6c6f936589f3020ffc303dea4c566bfd281f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 4 Aug 2023 18:25:08 +0200
Subject: [PATCH 57/58] =?UTF-8?q?ocamlPackages.camlp5:=207.14=20=E2=86=92?=
 =?UTF-8?q?=208.00.05?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/ocaml/camlp5/default.nix            | 56 ++++++++++++++-----
 1 file changed, 41 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 9d81c46e20c9..a09f226b3f13 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -1,31 +1,57 @@
-{ lib, stdenv, fetchFromGitHub, ocaml, perl }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, perl, makeWrapper
+, rresult, bos, ocaml_pcre, re, camlp-streams
+}:
 
 if lib.versionOlder ocaml.version "4.02"
-|| lib.versionOlder "4.13" ocaml.version
 then throw "camlp5 is not available for OCaml ${ocaml.version}"
 else
 
-stdenv.mkDerivation rec {
+let params =
+  if lib.versionAtLeast ocaml.version "4.12"
+  then rec {
+    version = "8.00.05";
 
-  pname = "camlp5";
-  version = "7.14";
+    src = fetchFromGitHub {
+      owner = "camlp5";
+      repo = "camlp5";
+      rev = version;
+      hash = "sha256-Havr3RB6iUP7QzV+LUGwMHtGzmRdS5RqYsqJ0N5w6gE=";
+    };
 
-  src = fetchFromGitHub {
-    owner = "camlp5";
-    repo = "camlp5";
-    rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}";
-    sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w";
-  };
+    nativeBuildInputs = [ makeWrapper ocaml findlib perl ];
+    buildInputs = [ bos ocaml_pcre re rresult ];
+    propagatedBuildInputs = [ camlp-streams ];
+
+    postFixup = ''
+      for p in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5
+      do
+        wrapProgram $out/bin/$p \
+        --suffix CAML_LD_LIBRARY_PATH : ${ocaml_pcre}/lib/ocaml/${ocaml.version}/site-lib/stublibs
+      done
+    '';
+  } else rec {
+    version = "7.14";
+    src = fetchFromGitHub {
+      owner = "camlp5";
+      repo = "camlp5";
+      rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}";
+      sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w";
+    };
+    nativeBuildInputs = [ ocaml perl ];
+  }
+; in
+
+stdenv.mkDerivation (params // {
+
+  pname = "ocaml${ocaml.version}-camlp5";
 
   strictDeps = true;
 
-  nativeBuildInputs = [ ocaml perl ];
-
   prefixKey = "-prefix ";
 
   preConfigure = ''
     configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib)
-    patchShebangs ./config/find_stuffversion.pl
+    patchShebangs ./config/find_stuffversion.pl etc/META.pl
   '';
 
   buildFlags = [ "world.opt" ];
@@ -45,4 +71,4 @@ stdenv.mkDerivation rec {
       maggesi vbgl
     ];
   };
-}
+})

From fb5e53615b4734ca6eaeeb54b84b8000cdae0389 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 4 Aug 2023 18:25:12 +0200
Subject: [PATCH 58/58] hol_light: use default version of OCaml

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c42eb575bce7..72db50ab50f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -39263,7 +39263,7 @@ with pkgs;
 
   hol = callPackage ../applications/science/logic/hol { };
 
-  inherit (ocaml-ng.ocamlPackages_4_12) hol_light;
+  inherit (ocamlPackages) hol_light;
 
   hologram = callPackage ../tools/security/hologram { };