From b6901e6c16cdd184e4dab0afb68a1c0c4850ed1c Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Fri, 4 Aug 2023 20:53:01 +1000
Subject: [PATCH 01/34] staruml: 4.1.6 -> 5.1.0

---
 pkgs/tools/misc/staruml/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index 72d3e64214d9..a3dfbbd65505 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -6,7 +6,8 @@
 , atk, at-spi2-atk, dbus
 , gdk-pixbuf, pango, cairo
 , expat, libdrm, mesa
-, alsa-lib, at-spi2-core, cups }:
+, alsa-lib, at-spi2-core, cups
+, libxkbcommon }:
 
 let
   LD_LIBRARY_PATH = lib.makeLibraryPath [
@@ -14,25 +15,26 @@ let
     xorg.libX11 xorg.libxcb xorg.libXcomposite
     xorg.libXcursor xorg.libXext xorg.libXfixes
     xorg.libXi xorg.libXrender xorg.libXtst
-    nss nspr atk at-spi2-atk dbus
-    gdk-pixbuf pango cairo
+    xorg.libxshmfence libxkbcommon nss
+    nspr atk at-spi2-atk
+    dbus gdk-pixbuf pango cairo
     xorg.libXrandr expat libdrm
     mesa alsa-lib at-spi2-core
     cups
   ];
 in
 stdenv.mkDerivation rec {
-  version = "4.1.6";
+  version = "5.1.0";
   pname = "staruml";
 
   src =
     fetchurl {
-      url = "https://staruml.io/download/releases-v4/StarUML_${version}_amd64.deb";
-      sha256 = "sha256-CUOdpR8RExMLeOX8469egENotMNuPU4z8S1IGqA21z0=";
+      url = "https://staruml-7a0.kxcdn.com/releases-v5/StarUML_${version}_amd64.deb";
+      sha256 = "sha256-da1mY3OW24g6Ix0L57CBPbaMeSLzhOOjoBsyZszmNOc=";
     };
 
   nativeBuildInputs = [ wrapGAppsHook dpkg ];
-  buildInputs = [ glib hicolor-icon-theme ];
+  buildInputs = [ glib hicolor-icon-theme xorg.libxshmfence ];
 
   unpackPhase = ''
     mkdir pkg

From a0374195704e4ab5306e3a54993bcf585b06fcb8 Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Fri, 4 Aug 2023 21:00:49 +1000
Subject: [PATCH 02/34] removed `xorg.libxshmfence` build input

---
 pkgs/tools/misc/staruml/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index a3dfbbd65505..e3ce07089413 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     };
 
   nativeBuildInputs = [ wrapGAppsHook dpkg ];
-  buildInputs = [ glib hicolor-icon-theme xorg.libxshmfence ];
+  buildInputs = [ glib hicolor-icon-theme ];
 
   unpackPhase = ''
     mkdir pkg

From 4a49e797081d4505018f0500367b51e3dc407ee2 Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Mon, 14 Aug 2023 10:29:43 -0700
Subject: [PATCH 03/34] rxvt-unicode: patch to support perl 5.38

This fixes character encoding and rendering issues with non-ascii
characters after the recent perl update. The urxvt patch notes state:

> perl 5.38 does not handle empty locale names, use "C" instead
---
 .../terminal-emulators/rxvt-unicode/default.nix            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
index 47cd84d94825..e932fcdea05f 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
@@ -73,7 +73,12 @@ stdenv.mkDerivation {
     ./patches/9.06-font-width.patch
   ]) ++ [
     ./patches/256-color-resources.patch
-  ]++ optional stdenv.isDarwin ./patches/makefile-phony.patch;
+  ] ++ optional (perlSupport && versionAtLeast perl.version "5.38") (fetchpatch {
+    name = "perl538-locale-c.patch";
+    url = "https://github.com/exg/rxvt-unicode/commit/16634bc8dd5fc4af62faf899687dfa8f27768d15.patch";
+    excludes = [ "Changes" ];
+    sha256 = "sha256-JVqzYi3tcWIN2j5JByZSztImKqbbbB3lnfAwUXrumHM=";
+  }) ++ optional stdenv.isDarwin ./patches/makefile-phony.patch;
 
   configureFlags = [
     "--with-terminfo=${placeholder "terminfo"}/share/terminfo"

From dd2ba7159ee19843346bcee5172f279359cbd2dc Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 14 Aug 2023 19:44:04 -0400
Subject: [PATCH 04/34] dufs: 0.34.2 -> 0.35.0

Diff: https://github.com/sigoden/dufs/compare/v0.34.2...v0.35.0

Changelog: https://github.com/sigoden/dufs/blob/v0.35.0/CHANGELOG.md
---
 pkgs/servers/http/dufs/default.nix | 20 ++++++++++++++------
 pkgs/top-level/all-packages.nix    |  4 +---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix
index b139577a8664..65582acd9cab 100644
--- a/pkgs/servers/http/dufs/default.nix
+++ b/pkgs/servers/http/dufs/default.nix
@@ -1,17 +1,24 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config }:
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, stdenv
+, pkg-config
+, openssl
+, darwin
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "dufs";
-  version = "0.34.2";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "sigoden";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-NkH7w5HEQFhnovUmjN/qW5QZwO8mVQZMbhpNFkKtLTI=";
+    sha256 = "sha256-FrLvwXEnNEKi8FvPIs6A52WpSUT+pUCc61JBi9M/PPw=";
   };
 
-  cargoHash = "sha256-bUznaVyhZswLaXUgC+GUh5ZpJQW7Vkcoui6CO9ds22g=";
+  cargoHash = "sha256-YHFEjs8a1QJHWYVjAQxmpMIQ2aDbu6mxeuNqcvReYR0=";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [
     pkg-config
@@ -20,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = lib.optionals stdenv.isLinux [
     openssl
   ] ++ lib.optionals stdenv.isDarwin [
-    Security
+    darwin.apple_sdk.frameworks.Security
   ];
 
   # FIXME: checkPhase on darwin will leave some zombie spawn processes
@@ -34,7 +41,8 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "A file server that supports static serving, uploading, searching, accessing control, webdav";
     homepage = "https://github.com/sigoden/dufs";
+    changelog = "https://github.com/sigoden/dufs/blob/${src.rev}/CHANGELOG.md";
     license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = [ maintainers.holymonson ];
+    maintainers = with maintainers; [ figsoda holymonson ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ce71f677689..55488973116e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -595,9 +595,7 @@ with pkgs;
 
   dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { };
 
-  dufs = callPackage ../servers/http/dufs {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  dufs = callPackage ../servers/http/dufs { };
 
   dynein = callPackage ../development/tools/database/dynein {
     inherit (darwin.apple_sdk.frameworks) Security;

From 49132eac82398bca0fc1670767912c64b7eb7bab Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 14 Aug 2023 12:14:07 -0400
Subject: [PATCH 05/34] ulid: init at 2.1.0

https://github.com/oklog/ulid
---
 pkgs/tools/misc/ulid/default.nix | 34 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/misc/ulid/default.nix

diff --git a/pkgs/tools/misc/ulid/default.nix b/pkgs/tools/misc/ulid/default.nix
new file mode 100644
index 000000000000..f2ff23addfe7
--- /dev/null
+++ b/pkgs/tools/misc/ulid/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "ulid";
+  version = "2.1.0";
+
+  src = fetchFromGitHub {
+    owner = "oklog";
+    repo = "ulid";
+    rev = "v${version}";
+    hash = "sha256-/oQPgcO1xKbHXutxz0WPfIduShPrfH1l+7/mj8jLst8=";
+  };
+
+  vendorHash = "sha256-s1YkEwFxE1zpUUCgwOAl8i6/9HB2rcGG+4kqnixTit0=";
+
+  ldflags = [ "-s" "-w" ];
+
+  checkFlags = [
+    # skip flaky test
+    "-skip=TestMonotonicSafe"
+  ];
+
+  meta = with lib; {
+    description = "Universally Unique Lexicographically Sortable Identifier (ULID) in Go";
+    homepage = "https://github.com/oklog/ulid";
+    changelog = "https://github.com/oklog/ulid/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "ulid";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9942cd0dc795..887280888818 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14036,6 +14036,8 @@ with pkgs;
 
   uivonim = callPackage ../applications/editors/uivonim { };
 
+  ulid = callPackage ../tools/misc/ulid { };
+
   umlet = callPackage ../tools/misc/umlet { };
 
   unetbootin = libsForQt5.callPackage ../tools/cd-dvd/unetbootin { };

From 86c67a1f112454d3906efd34f5249f3f23dd08fc Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Tue, 15 Aug 2023 07:58:42 -0400
Subject: [PATCH 06/34] nixos.photoprism: Relax sandbox to allow running
 exiftool

exiftool is written in Perl which appears to call `chown` as part of startup. This is blocked by the `@privileged` system call group. This causes a failure when changing image orientation.

Fixes: https://github.com/NixOS/nixpkgs/issues/249120
---
 nixos/modules/services/web-apps/photoprism.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/photoprism.nix b/nixos/modules/services/web-apps/photoprism.nix
index d5ca6014780a..423ad5375baa 100644
--- a/nixos/modules/services/web-apps/photoprism.nix
+++ b/nixos/modules/services/web-apps/photoprism.nix
@@ -123,7 +123,7 @@ in
         RestrictNamespaces = true;
         RestrictRealtime = true;
         SystemCallArchitectures = "native";
-        SystemCallFilter = [ "@system-service" "~@privileged @setuid @keyring" ];
+        SystemCallFilter = [ "@system-service" "~@setuid @keyring" ];
         UMask = "0066";
       } // lib.optionalAttrs (cfg.port < 1024) {
         AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];

From 8bcc8ea8fe1b0474755572d9213ece61e9edd457 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 16 Aug 2023 21:54:51 +0300
Subject: [PATCH 07/34] glow: add add meta.mainProgram

---
 pkgs/applications/editors/glow/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix
index 5472b28b62b9..cbd63c0ffcd0 100644
--- a/pkgs/applications/editors/glow/default.nix
+++ b/pkgs/applications/editors/glow/default.nix
@@ -1,5 +1,7 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
 buildGoModule rec {
   pname = "glow";
   version = "1.5.0";
@@ -23,5 +25,6 @@ buildGoModule rec {
     changelog = "https://github.com/charmbracelet/glow/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ Br1ght0ne penguwin ];
+    mainProgram = "glow";
   };
 }

From 6a0d58d4376916721aed81656230f50169b283c9 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 16 Aug 2023 21:55:11 +0300
Subject: [PATCH 08/34] seatd: add meta.mainProgram

---
 pkgs/applications/misc/seatd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix
index faf4dfb8b01e..7cc2c967fe01 100644
--- a/pkgs/applications/misc/seatd/default.nix
+++ b/pkgs/applications/misc/seatd/default.nix
@@ -47,5 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emantor ];
     platforms = with lib.platforms; freebsd ++ linux ++ netbsd;
+    mainProgram = "seatd";
   };
 })

From a6f52a2c4c06e50a859ea9d4d3732c1756f9ba22 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 16 Aug 2023 21:55:37 +0300
Subject: [PATCH 09/34] tofi: add meta.mainProgram

---
 pkgs/applications/misc/tofi/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix
index 76c5b2047e30..076a5af3cf1c 100644
--- a/pkgs/applications/misc/tofi/default.nix
+++ b/pkgs/applications/misc/tofi/default.nix
@@ -38,5 +38,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ fbergroth ];
     platforms = platforms.linux;
+    mainProgram = "tofi";
   };
 }

From 628a6fb5b9bc71c62121ea6bfb515ad811bd86b4 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 16 Aug 2023 21:55:53 +0300
Subject: [PATCH 10/34] eslint_d: add meta.mainProgram

---
 pkgs/development/tools/eslint_d/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/eslint_d/default.nix b/pkgs/development/tools/eslint_d/default.nix
index abaf5857cf79..a49dbfdefc7a 100644
--- a/pkgs/development/tools/eslint_d/default.nix
+++ b/pkgs/development/tools/eslint_d/default.nix
@@ -20,5 +20,6 @@ buildNpmPackage rec {
     homepage = "github.com/mantoni/eslint_d.js";
     license = licenses.mit;
     maintainers = [ maintainers.ehllie ];
+    mainProgram = "eslint_d";
   };
 }

From a58595985e84f431e58bd9fc51a0038e9ad68679 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 16 Aug 2023 21:56:07 +0300
Subject: [PATCH 11/34] zip: add meta.mainProgram

---
 pkgs/tools/archivers/zip/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 82329537251e..ee5357f79558 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsdOriginal;
     platforms = platforms.all;
     maintainers = [ ];
+    mainProgram = "zip";
   };
 }

From bb2937dcae883a27b320304f86e867d87fe29bc3 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 16 Aug 2023 21:56:27 +0300
Subject: [PATCH 12/34] catimg: add meta.mainProgram

---
 pkgs/tools/misc/catimg/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/catimg/default.nix b/pkgs/tools/misc/catimg/default.nix
index 6230b21c3872..9edfc576837d 100644
--- a/pkgs/tools/misc/catimg/default.nix
+++ b/pkgs/tools/misc/catimg/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     description = "Insanely fast image printing in your terminal";
     maintainers = with maintainers; [ ryantm ];
     platforms = platforms.unix;
+    mainProgram = "catimg";
   };
 
 }

From a4cc379392d22b75975ff5a3b2419489ce2f6862 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 16 Aug 2023 21:57:35 +0300
Subject: [PATCH 13/34] cliphist: add meta.mainProgram

---
 pkgs/tools/wayland/cliphist/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/wayland/cliphist/default.nix b/pkgs/tools/wayland/cliphist/default.nix
index 9ca747ca46ba..163a15d2adc1 100644
--- a/pkgs/tools/wayland/cliphist/default.nix
+++ b/pkgs/tools/wayland/cliphist/default.nix
@@ -19,5 +19,6 @@ buildGoModule rec {
     license = licenses.gpl3Only;
     platforms = platforms.linux;
     maintainers = with maintainers; [ dit7ya ];
+    mainProgram = "cliphist";
   };
 }

From ae68d70536dad1a96d6ce94092f50354694b453b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 16 Aug 2023 21:33:07 +0200
Subject: [PATCH 14/34] =?UTF-8?q?cvc5:=201.0.5=20=E2=86=92=201.0.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/science/logic/cvc5/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix
index 23310163f279..5357e1df5454 100644
--- a/pkgs/applications/science/logic/cvc5/default.nix
+++ b/pkgs/applications/science/logic/cvc5/default.nix
@@ -2,19 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "cvc5";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner  = "cvc5";
     repo   = "cvc5";
     rev    = "cvc5-${version}";
-    hash  = "sha256-l+L59QLLrAEVkAZjhxICJpa+j+jr1k/7B61JlapXGRI=";
+    hash  = "sha256-pZiXAO92cwnYtaVMDFBEmk+NzDf4eKdc0eY0RltofPA=";
   };
 
   nativeBuildInputs = [ pkg-config cmake flex ];
   buildInputs = [
     cadical.dev symfpu gmp gtest libantlr3c antlr3_4 boost jdk
-    (python3.withPackages (ps: with ps; [ pyparsing toml ]))
+    (python3.withPackages (ps: with ps; [ pyparsing tomli ]))
   ];
 
   preConfigure = ''

From 4436e0b7b499343d878d6f495a2fac1332a829db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Aug 2023 23:24:46 +0200
Subject: [PATCH 15/34] python311Packages.opower: 0.0.20 -> 0.0.26

Diff: tronikos/opower@refs/tags/v0.0.20...v0.0.26

Changelog: https://github.com/tronikos/opower/releases/tag/v0.0.26
---
 pkgs/development/python-modules/opower/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index dc9b5c1d9c5f..226c506300f8 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -51,6 +51,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module for getting historical and forecasted usage/cost from utilities that use opower.com";
     homepage = "https://github.com/tronikos/opower";
+    changelog = "https://github.com/tronikos/opower/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From 4f42b1358c30b849db2fe797239551efb55e90e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Aug 2023 07:50:16 +0000
Subject: [PATCH 16/34] python310Packages.mkdocs-mermaid2-plugin: 0.6.0 ->
 1.0.1

---
 .../python-modules/mkdocs-mermaid2-plugin/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
index 8202b769415e..f74e06148cf3 100644
--- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-mermaid2-plugin";
-  version = "0.6.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "fralau";
     repo = "mkdocs-mermaid2-plugin";
-    rev = "v${version}";
-    hash = "sha256-Oe6wkVrsB0NWF+HHeifrEogjxdGPINRDJGkh9p+GoHs=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-8/5lltOT78VSMxunIfCeGSBQ7VIRVnk3cHIzd7S+c00=";
   };
 
   propagatedBuildInputs = [

From a3236cd260ac8832283f4a453cbaa8473aa65eef Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 17 Aug 2023 10:26:45 +0200
Subject: [PATCH 17/34] python310Packages.mkdocs-mermaid2-plugin: add changelog
 to meta

---
 .../python-modules/mkdocs-mermaid2-plugin/default.nix            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
index f74e06148cf3..1ab5c674a52c 100644
--- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
@@ -37,6 +37,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A MkDocs plugin for including mermaid graphs in markdown sources";
     homepage = "https://github.com/fralau/mkdocs-mermaid2-plugin";
+    changelog = "https://github.com/fralau/mkdocs-mermaid2-plugin/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ jonringer ];
   };

From e321070ea719b0fea42bb42e1cbc196d2aa4e418 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 17 Aug 2023 10:28:09 +0200
Subject: [PATCH 18/34] python310Packages.mkdocs-mermaid2-plugin: add format

- disabled on unsupported Python releases
---
 .../mkdocs-mermaid2-plugin/default.nix               | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
index 1ab5c674a52c..2058bd71db6d 100644
--- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
@@ -1,4 +1,6 @@
-{ lib, buildPythonPackage, fetchFromGitHub
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
 , beautifulsoup4
 , jsbeautifier
 , mkdocs
@@ -6,11 +8,15 @@
 , pymdown-extensions
 , pyyaml
 , requests
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "mkdocs-mermaid2-plugin";
   version = "1.0.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "fralau";
@@ -32,7 +38,9 @@ buildPythonPackage rec {
   # non-traditional python tests (e.g. nodejs based tests)
   doCheck = false;
 
-  pythonImportsCheck = [ "mermaid2" ];
+  pythonImportsCheck = [
+    "mermaid2"
+  ];
 
   meta = with lib; {
     description = "A MkDocs plugin for including mermaid graphs in markdown sources";

From dbe4fc5f79accc87046b33f6ea80e58f36ef4018 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Aug 2023 10:12:51 +0000
Subject: [PATCH 19/34] python310Packages.pex: 2.1.141 -> 2.1.142

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

diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index cafca7c29e09..ad8de4b2d138 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pex";
-  version = "2.1.141";
+  version = "2.1.142";
   format = "flit";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EsIurZNgWslUciz5Pc2hj2F4tAJ8hQydRWnVIWdryDc=";
+    hash = "sha256-+2WJEOL+rtdl9dZmXqkaRRuj7TzDZn93tyZXxPWRaBM=";
   };
 
   nativeBuildInputs = [

From ba50fb0bbb47285dba05317e9f3d95d11288814c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Aug 2023 11:35:56 +0000
Subject: [PATCH 20/34] python310Packages.ecs-logging: 2.0.2 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/ecs-logging/default.nix b/pkgs/development/python-modules/ecs-logging/default.nix
index 0b5ed781c1a9..07def603cb70 100644
--- a/pkgs/development/python-modules/ecs-logging/default.nix
+++ b/pkgs/development/python-modules/ecs-logging/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "ecs-logging";
-  version = "2.0.2";
+  version = "2.1.0";
   format = "flit";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "elastic";
     repo = "ecs-logging-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-CfPpUpzNfPuCAiuNsJrJ1nVLiUCPvclfrK7tByytoQE=";
+    hash = "sha256-Gf44bT3/gmHy+yaQ1+bhCFB33ym2G14tzNqTQyC3BJU=";
   };
 
   nativeBuildInputs = [

From e7a42f41939c0a6188a5aa9b96486ee69212b3d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Aug 2023 14:40:11 +0000
Subject: [PATCH 21/34] python310Packages.jupyterhub-tmpauthenticator: 0.6 ->
 1.0.0

---
 .../python-modules/jupyterhub-tmpauthenticator/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
index 2aef23fe4a4a..fcc1039311c8 100644
--- a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "jupyterhub-tmpauthenticator";
-  version = "0.6";
+  version = "1.0.0";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "064x1ypxwx1l270ic97p8czbzb7swl9758v40k3w2gaqf9762f0l";
+    sha256 = "sha256-7TuAYP6mRffsZL+O+AMgt5HBu6PhwLYj5A8X8DnMfl0=";
   };
 
   propagatedBuildInputs = [ jupyterhub ];

From bad4b37c7e6a1ce459dd6de6d8fb02d8050e8e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20B=C3=A4renz?= <programming@manuelbaerenz.de>
Date: Thu, 17 Aug 2023 17:20:18 +0200
Subject: [PATCH 22/34] Remove turion (myself) as maintainer from some packages

I have removed myself as maintainer from those packages that:

* Have at least one other maintainer
* Are outside of my actual expertise,
  i.e. I wouldn't really know how to fix them if they broke
---
 nixos/tests/web-apps/mastodon/remote-postgresql.nix          | 2 +-
 pkgs/applications/audio/musescore/default.nix                | 2 +-
 pkgs/applications/editors/vscode/vscodium.nix                | 2 +-
 pkgs/applications/file-managers/krusader/default.nix         | 2 +-
 pkgs/applications/kde/konsole.nix                            | 2 +-
 pkgs/applications/kde/okular.nix                             | 2 +-
 pkgs/applications/misc/keepassxc/default.nix                 | 2 +-
 pkgs/development/python-modules/cassandra-driver/default.nix | 2 +-
 pkgs/development/python-modules/gremlinpython/default.nix    | 2 +-
 pkgs/development/python-modules/progressbar2/default.nix     | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/tests/web-apps/mastodon/remote-postgresql.nix b/nixos/tests/web-apps/mastodon/remote-postgresql.nix
index 2fd3983e13ec..715477191bfb 100644
--- a/nixos/tests/web-apps/mastodon/remote-postgresql.nix
+++ b/nixos/tests/web-apps/mastodon/remote-postgresql.nix
@@ -13,7 +13,7 @@ let
 in
 {
   name = "mastodon-remote-postgresql";
-  meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin turion ];
+  meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin ];
 
   nodes = {
     database = {
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index ebfb7debfaed..6c5b77252113 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -162,7 +162,7 @@ in stdenv'.mkDerivation rec {
     description = "Music notation and composition software";
     homepage = "https://musescore.org/";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ vandenoever turion doronbehar ];
+    maintainers = with maintainers; [ vandenoever doronbehar ];
     # on aarch64-linux:
     # error: cannot convert '<brace-enclosed initializer list>' to 'float32x4_t' in assignment
     broken = (stdenv.isLinux && stdenv.isAarch64);
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index e29227d11d60..f714e709f69b 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -61,7 +61,7 @@ in
       downloadPage = "https://github.com/VSCodium/vscodium/releases";
       license = licenses.mit;
       sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-      maintainers = with maintainers; [ synthetica turion bobby285271 ];
+      maintainers = with maintainers; [ synthetica bobby285271 ];
       mainProgram = "codium";
       platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ];
     };
diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/applications/file-managers/krusader/default.nix
index a8635a416396..b2639fe84984 100644
--- a/pkgs/applications/file-managers/krusader/default.nix
+++ b/pkgs/applications/file-managers/krusader/default.nix
@@ -42,7 +42,7 @@ mkDerivation rec {
     homepage = "http://www.krusader.org";
     description = "Norton/Total Commander clone for KDE";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ sander turion ];
+    maintainers = with maintainers; [ sander ];
     mainProgram = "krusader";
   };
 }
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index 9771e269faaf..1ef8da3d385d 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -13,7 +13,7 @@ mkDerivation {
     homepage = "https://apps.kde.org/konsole/";
     description = "KDE terminal emulator";
     license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ];
-    maintainers = with lib.maintainers; [ ttuegel turion ];
+    maintainers = with lib.maintainers; [ ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 727fc673b174..8079232b926c 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -35,7 +35,7 @@ mkDerivation {
     homepage = "http://www.kde.org";
     description = "KDE document viewer";
     license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ];
-    maintainers = with maintainers; [ ttuegel turion ];
+    maintainers = with maintainers; [ ttuegel ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix
index 5b5ed2326d88..277a1b99cc1e 100644
--- a/pkgs/applications/misc/keepassxc/default.nix
+++ b/pkgs/applications/misc/keepassxc/default.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://keepassxc.org/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ jonafato turion srapenne ];
+    maintainers = with maintainers; [ jonafato srapenne ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix
index 9b8d0fcd5ff8..5d6c520ad3c1 100644
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -110,6 +110,6 @@ buildPythonPackage rec {
     homepage = "http://datastax.github.io/python-driver";
     changelog = "https://github.com/datastax/python-driver/blob/${version}/CHANGELOG.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ turion ris ];
+    maintainers = with maintainers; [ ris ];
   };
 }
diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix
index de5e03d61321..49401b44532a 100644
--- a/pkgs/development/python-modules/gremlinpython/default.nix
+++ b/pkgs/development/python-modules/gremlinpython/default.nix
@@ -79,6 +79,6 @@ buildPythonPackage rec {
     description = "Gremlin-Python implements Gremlin, the graph traversal language of Apache TinkerPop, within the Python language";
     homepage = "https://tinkerpop.apache.org/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ turion ris ];
+    maintainers = with maintainers; [ ris ];
   };
 }
diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
index 29b361344b62..349757bcffb0 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/pkgs/development/python-modules/progressbar2/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Text progressbar library";
     homepage = "https://progressbar-2.readthedocs.io/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ashgillman turion ];
+    maintainers = with maintainers; [ ashgillman ];
   };
 }

From eb2901d582733d83e326bb5f025aab1858219ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 17 Aug 2023 09:41:05 -0700
Subject: [PATCH 23/34] eask: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix    |  2 ++
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 36 -------------------
 pkgs/development/node-packages/overrides.nix  |  3 --
 pkgs/development/tools/eask/default.nix       | 29 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 6 files changed, 33 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/development/tools/eask/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index ef2f132a2f2f..9a4cea2f1ade 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -40,6 +40,7 @@ in
 mapAliases {
   "@antora/cli" = pkgs.antora; # Added 2023-05-06
   "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25
+  "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17
   "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02
   "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07
   "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
@@ -48,6 +49,7 @@ mapAliases {
   bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30
   bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
   castnow = pkgs.castnow; # added 2023-07-30
+  eask = pkgs.eask; # added 2023-08-17
   eslint_d = pkgs.eslint_d; # Added 2023-05-26
   flood = pkgs.flood; # Added 2023-07-25
   gtop = pkgs.gtop; # added 2023-07-31
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 16bde703ebba..2b5094c1bc47 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -5,7 +5,6 @@
 , "@babel/cli"
 , "@commitlint/cli"
 , "@commitlint/config-conventional"
-, "@emacs-eask/cli"
 , "@forge/cli"
 , "@maizzle/cli"
 , "@medable/mdctl-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 153b9e23f41c..50705c2eef18 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -81163,42 +81163,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@emacs-eask/cli" = nodeEnv.buildNodePackage {
-    name = "_at_emacs-eask_slash_cli";
-    packageName = "@emacs-eask/cli";
-    version = "0.8.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.8.1.tgz";
-      sha512 = "+Z54Sh/vHWOXcbb495SjH5+4h9D3c5wNPebz83yfZIUHQ4DqxSB53l//Dse5P3UVt3okQeXdwGNuRN1VBf3brg==";
-    };
-    dependencies = [
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."cliui-8.0.1"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."emoji-regex-8.0.0"
-      sources."escalade-3.1.1"
-      sources."get-caller-file-2.0.5"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."require-directory-2.1.1"
-      sources."string-width-4.2.3"
-      sources."strip-ansi-6.0.1"
-      sources."wrap-ansi-7.0.0"
-      sources."y18n-5.0.8"
-      sources."yargs-17.7.2"
-      sources."yargs-parser-21.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A set of command-line tools to build Emacs packages";
-      homepage = "https://github.com/emacs-eask/cli#readme";
-      license = "GPL-3.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   "@forge/cli" = nodeEnv.buildNodePackage {
     name = "_at_forge_slash_cli";
     packageName = "@forge/cli";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index c32ce3868047..c4ddc2a40a59 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -112,9 +112,6 @@ final: prev: {
     meta = oldAttrs.meta // { broken = since "12"; };
   });
 
-  eask = prev."@emacs-eask/cli".override {
-    name = "eask";
-  };
 
   expo-cli = prev."expo-cli".override (oldAttrs: {
     # The traveling-fastlane-darwin optional dependency aborts build on Linux.
diff --git a/pkgs/development/tools/eask/default.nix b/pkgs/development/tools/eask/default.nix
new file mode 100644
index 000000000000..799a507fee35
--- /dev/null
+++ b/pkgs/development/tools/eask/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "eask";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner = "emacs-eask";
+    repo = "cli";
+    rev = version;
+    hash = "sha256-NoYWRIkJEOUsHsjBYTtCNrCmAGG0pqaAHDOc9VcaRwk=";
+  };
+
+  npmDepsHash = "sha256-ctIVBrx9fagSX3f2/wn5wWkReOYK0nldFoxTJWVsx0g=";
+
+  dontBuild = true;
+
+  meta = {
+    changelog = "https://github.com/emacs-eask/cli/blob/${src.rev}/CHANGELOG.md";
+    description = "CLI for building, runing, testing, and managing your Emacs Lisp dependencies";
+    homepage = "https://emacs-eask.github.io/";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "eask";
+    maintainers = with lib.maintainers; [ jcs090218 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6b5a8bf8e3f..ec63a7d85f3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19047,6 +19047,8 @@ with pkgs;
 
   dwz = callPackage ../development/tools/misc/dwz { };
 
+  eask = callPackage ../development/tools/eask { };
+
   easypdkprog = callPackage ../development/embedded/easypdkprog { };
 
   eclint = callPackage ../development/tools/eclint { };

From f7b23c206a0c0869676880f7fb85bb1587a0ecbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Aug 2023 16:46:12 +0000
Subject: [PATCH 24/34] python310Packages.irc: 20.1.0 -> 20.3.0

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

diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix
index e252987e3fb0..b60ae8139192 100644
--- a/pkgs/development/python-modules/irc/default.nix
+++ b/pkgs/development/python-modules/irc/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "irc";
-  version = "20.1.0";
+  version = "20.3.0";
   format = "pyproject";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tvc3ky3UeR87GOMZ3nt9rwLSKFpr6iY9EB9NjlU4B+w=";
+    hash = "sha256-JFteqYqwAlZnYx53alXjGRfmDvcIxgEC8hmLyfURMjY=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 2a14e196d64bac3f9573932283183a65daa0a9d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Aug 2023 17:39:22 +0000
Subject: [PATCH 25/34] python310Packages.types-redis: 4.6.0.3 -> 4.6.0.4

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

diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix
index e191d56d69d5..8275ed31f944 100644
--- a/pkgs/development/python-modules/types-redis/default.nix
+++ b/pkgs/development/python-modules/types-redis/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "types-redis";
-  version = "4.6.0.3";
+  version = "4.6.0.4";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-797zfcDAS/V4YZVlH9aU+L/daT6sCexK9G2Q9yZSVY8=";
+    hash = "sha256-xHWp089z3WlsOIfTBkQyP8VvXgCvlhUQNbO1tSh1ybM=";
   };
 
   propagatedBuildInputs = [

From bd0b732befccb5dc1ecccef1df1f29bb5902479f Mon Sep 17 00:00:00 2001
From: Niki4tap <rombiklol2@gmail.com>
Date: Thu, 17 Aug 2023 21:14:35 +0300
Subject: [PATCH 26/34] dwm: use correct hash in example

---
 nixos/modules/services/x11/window-managers/dwm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix
index 1881826944aa..e114f2e26b17 100644
--- a/nixos/modules/services/x11/window-managers/dwm.nix
+++ b/nixos/modules/services/x11/window-managers/dwm.nix
@@ -24,7 +24,7 @@ in
             patches = [
               (super.fetchpatch {
                 url = "https://dwm.suckless.org/patches/steam/dwm-steam-6.2.diff";
-                sha256 = "1ld1z3fh6p5f8gr62zknx3axsinraayzxw3rz1qwg73mx2zk5y1f";
+                sha256 = "sha256-f3lffBjz7+0Khyn9c9orzReoLTqBb/9gVGshYARGdVc=";
               })
             ];
           })

From 5953a946eac43a458cd37826022ef3265379d0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 17 Aug 2023 10:16:05 -0700
Subject: [PATCH 27/34] maizzle: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 719 ------------------
 pkgs/development/tools/maizzle/default.nix    |  28 +
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 31 insertions(+), 720 deletions(-)
 create mode 100644 pkgs/development/tools/maizzle/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index ef2f132a2f2f..28b6dc35687f 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -42,6 +42,7 @@ mapAliases {
   "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25
   "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02
   "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07
+  "@maizzle/cli" = pkgs.maizzle; # added 2023-08-17
   "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
   antennas = pkgs.antennas; # added 2023-07-30
   balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 16bde703ebba..ef97387bc02e 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -7,7 +7,6 @@
 , "@commitlint/config-conventional"
 , "@emacs-eask/cli"
 , "@forge/cli"
-, "@maizzle/cli"
 , "@medable/mdctl-cli"
 , "@mermaid-js/mermaid-cli"
 , "@microsoft/rush"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 153b9e23f41c..d28483ab2272 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -82373,725 +82373,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@maizzle/cli" = nodeEnv.buildNodePackage {
-    name = "_at_maizzle_slash_cli";
-    packageName = "@maizzle/cli";
-    version = "1.5.6";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@maizzle/cli/-/cli-1.5.6.tgz";
-      sha512 = "S+NzmN4VSmIu6vHVJ6hYUQj3xsksOpE82SGP97nMimabR282BM1l/FT71jOqbf+UAgjm2Q9TyIOeGtsWDsW+CQ==";
-    };
-    dependencies = [
-      (sources."@babel/code-frame-7.22.10" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."@babel/helper-validator-identifier-7.22.5"
-      (sources."@babel/highlight-7.22.10" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      (sources."@bconnorwhite/module-2.0.2" // {
-        dependencies = [
-          sources."find-up-5.0.0"
-          sources."locate-path-6.0.0"
-          sources."p-limit-3.1.0"
-          sources."p-locate-5.0.0"
-          sources."path-exists-4.0.0"
-        ];
-      })
-      sources."@ljharb/through-2.3.9"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      sources."@pnpm/config.env-replace-1.1.0"
-      (sources."@pnpm/network.ca-file-1.0.2" // {
-        dependencies = [
-          sources."graceful-fs-4.2.10"
-        ];
-      })
-      sources."@pnpm/npm-conf-2.2.2"
-      sources."@samverschueren/stream-to-observable-0.3.1"
-      sources."@sindresorhus/is-4.6.0"
-      sources."@szmarczak/http-timer-4.0.6"
-      sources."@types/cacheable-request-6.0.3"
-      sources."@types/http-cache-semantics-4.0.1"
-      sources."@types/keyv-3.1.4"
-      sources."@types/minimist-1.2.2"
-      sources."@types/node-20.4.9"
-      sources."@types/normalize-package-data-2.4.1"
-      sources."@types/responselike-1.0.0"
-      sources."aggregate-error-4.0.1"
-      sources."all-package-names-2.0.711"
-      sources."ansi-align-3.0.1"
-      sources."ansi-escapes-4.3.2"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."any-observable-0.3.0"
-      sources."argparse-2.0.1"
-      sources."arrify-1.0.1"
-      sources."balanced-match-1.0.2"
-      sources."base64-js-1.5.1"
-      sources."big-integer-1.6.51"
-      sources."bl-4.1.0"
-      (sources."boxen-7.1.1" // {
-        dependencies = [
-          sources."ansi-regex-6.0.1"
-          sources."ansi-styles-6.2.1"
-          sources."chalk-5.3.0"
-          sources."emoji-regex-9.2.2"
-          sources."string-width-5.1.2"
-          sources."strip-ansi-7.1.0"
-          sources."type-fest-2.19.0"
-          sources."wrap-ansi-8.1.0"
-        ];
-      })
-      sources."bplist-parser-0.2.0"
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.2"
-      sources."buffer-5.7.1"
-      sources."builtins-1.0.3"
-      sources."bundle-name-3.0.0"
-      sources."cacheable-lookup-5.0.4"
-      (sources."cacheable-request-7.0.4" // {
-        dependencies = [
-          sources."get-stream-5.2.0"
-        ];
-      })
-      sources."callsites-3.1.0"
-      sources."camelcase-7.0.1"
-      (sources."camelcase-keys-8.0.2" // {
-        dependencies = [
-          sources."type-fest-2.19.0"
-        ];
-      })
-      sources."chalk-4.1.2"
-      sources."chardet-0.7.0"
-      sources."ci-info-3.8.0"
-      (sources."clean-stack-4.2.0" // {
-        dependencies = [
-          sources."escape-string-regexp-5.0.0"
-        ];
-      })
-      sources."cli-boxes-3.0.0"
-      sources."cli-cursor-3.1.0"
-      sources."cli-spinners-2.9.0"
-      (sources."cli-truncate-0.2.1" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
-      sources."cli-width-3.0.0"
-      sources."clone-1.0.4"
-      sources."clone-response-1.0.3"
-      sources."code-point-at-1.1.0"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."commander-10.0.1"
-      (sources."commander-version-1.1.0" // {
-        dependencies = [
-          sources."commander-6.2.1"
-        ];
-      })
-      sources."concat-map-0.0.1"
-      (sources."config-chain-1.1.13" // {
-        dependencies = [
-          sources."ini-1.3.8"
-        ];
-      })
-      (sources."configstore-6.0.0" // {
-        dependencies = [
-          sources."dot-prop-6.0.1"
-        ];
-      })
-      sources."cosmiconfig-8.2.0"
-      sources."cross-spawn-7.0.3"
-      (sources."crypto-random-string-4.0.0" // {
-        dependencies = [
-          sources."type-fest-1.4.0"
-        ];
-      })
-      sources."date-fns-1.30.1"
-      sources."decamelize-6.0.0"
-      (sources."decamelize-keys-2.0.1" // {
-        dependencies = [
-          sources."type-fest-3.13.1"
-        ];
-      })
-      (sources."decompress-response-6.0.0" // {
-        dependencies = [
-          sources."mimic-response-3.1.0"
-        ];
-      })
-      sources."deep-extend-0.6.0"
-      (sources."default-browser-4.0.0" // {
-        dependencies = [
-          sources."execa-7.2.0"
-          sources."human-signals-4.3.1"
-          sources."is-stream-3.0.0"
-          sources."mimic-fn-4.0.0"
-          sources."npm-run-path-5.1.0"
-          sources."onetime-6.0.0"
-          sources."path-key-4.0.0"
-          sources."strip-final-newline-3.0.0"
-        ];
-      })
-      sources."default-browser-id-3.0.0"
-      sources."defaults-1.0.4"
-      sources."defer-to-connect-2.0.1"
-      sources."define-lazy-prop-3.0.0"
-      sources."del-7.0.0"
-      sources."dir-glob-3.0.1"
-      (sources."dot-prop-7.2.0" // {
-        dependencies = [
-          sources."type-fest-2.19.0"
-        ];
-      })
-      sources."duplexer3-0.1.5"
-      sources."eastasianwidth-0.2.0"
-      sources."elegant-spinner-1.0.1"
-      sources."emoji-regex-8.0.0"
-      sources."end-of-stream-1.4.4"
-      sources."error-ex-1.3.2"
-      sources."escape-goat-4.0.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."execa-5.1.1"
-      sources."exit-hook-3.2.0"
-      sources."external-editor-3.1.0"
-      sources."fast-glob-3.3.1"
-      sources."fastq-1.15.0"
-      sources."figures-3.2.0"
-      sources."fill-range-7.0.1"
-      (sources."find-up-4.1.0" // {
-        dependencies = [
-          sources."path-exists-4.0.0"
-        ];
-      })
-      sources."form-data-encoder-2.1.4"
-      sources."fs-extra-10.1.0"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.1"
-      sources."get-stream-6.0.1"
-      sources."github-url-from-git-1.5.0"
-      sources."glob-7.2.3"
-      sources."glob-parent-5.1.2"
-      sources."global-dirs-3.0.1"
-      sources."globby-13.2.2"
-      sources."got-11.8.6"
-      sources."graceful-fs-4.2.11"
-      sources."hard-rejection-2.1.0"
-      sources."has-1.0.3"
-      (sources."has-ansi-2.0.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."has-flag-4.0.0"
-      sources."has-yarn-3.0.0"
-      sources."hosted-git-info-6.1.1"
-      sources."http-cache-semantics-4.1.1"
-      (sources."http2-wrapper-1.0.3" // {
-        dependencies = [
-          sources."quick-lru-5.1.1"
-        ];
-      })
-      sources."human-signals-2.1.0"
-      sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
-      sources."ignore-5.2.4"
-      (sources."ignore-walk-6.0.3" // {
-        dependencies = [
-          sources."brace-expansion-2.0.1"
-          sources."minimatch-9.0.3"
-        ];
-      })
-      sources."import-cwd-3.0.0"
-      (sources."import-fresh-3.3.0" // {
-        dependencies = [
-          sources."resolve-from-4.0.0"
-        ];
-      })
-      sources."import-from-3.0.0"
-      sources."import-lazy-4.0.0"
-      (sources."import-local-3.1.0" // {
-        dependencies = [
-          sources."pkg-dir-4.2.0"
-        ];
-      })
-      sources."imurmurhash-0.1.4"
-      sources."indent-string-5.0.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-2.0.0"
-      sources."inquirer-8.2.6"
-      (sources."inquirer-autosubmit-prompt-0.2.0" // {
-        dependencies = [
-          sources."ansi-escapes-3.2.0"
-          sources."ansi-regex-3.0.1"
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."cli-cursor-2.1.0"
-          sources."cli-width-2.2.1"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."figures-2.0.0"
-          sources."has-flag-3.0.0"
-          sources."inquirer-6.5.2"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."mimic-fn-1.2.0"
-          sources."mute-stream-0.0.7"
-          sources."onetime-2.0.1"
-          sources."restore-cursor-2.0.0"
-          sources."rxjs-6.6.7"
-          (sources."string-width-2.1.1" // {
-            dependencies = [
-              sources."strip-ansi-4.0.0"
-            ];
-          })
-          (sources."strip-ansi-5.2.0" // {
-            dependencies = [
-              sources."ansi-regex-4.1.1"
-            ];
-          })
-          sources."supports-color-5.5.0"
-          sources."tslib-1.14.1"
-        ];
-      })
-      sources."is-arrayish-0.2.1"
-      sources."is-ci-3.0.1"
-      sources."is-core-module-2.13.0"
-      sources."is-docker-3.0.0"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-inside-container-1.0.0"
-      (sources."is-installed-globally-0.4.0" // {
-        dependencies = [
-          sources."is-path-inside-3.0.3"
-        ];
-      })
-      sources."is-interactive-2.0.0"
-      sources."is-name-taken-2.0.0"
-      sources."is-npm-6.0.0"
-      sources."is-number-7.0.0"
-      sources."is-obj-2.0.0"
-      (sources."is-observable-1.1.0" // {
-        dependencies = [
-          sources."symbol-observable-1.2.0"
-        ];
-      })
-      sources."is-path-cwd-3.0.0"
-      sources."is-path-inside-4.0.0"
-      sources."is-plain-obj-1.1.0"
-      sources."is-promise-2.2.2"
-      sources."is-scoped-3.0.0"
-      sources."is-stream-2.0.1"
-      sources."is-typedarray-1.0.0"
-      sources."is-unicode-supported-1.3.0"
-      sources."is-url-superb-6.1.0"
-      (sources."is-wsl-2.2.0" // {
-        dependencies = [
-          sources."is-docker-2.2.1"
-        ];
-      })
-      sources."is-yarn-global-0.4.1"
-      sources."isexe-2.0.0"
-      sources."issue-regex-4.1.0"
-      sources."js-tokens-4.0.0"
-      sources."js-yaml-4.1.0"
-      sources."json-buffer-3.0.1"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."jsonfile-6.1.0"
-      sources."keyv-4.5.3"
-      sources."kind-of-6.0.3"
-      sources."latest-version-7.0.0"
-      sources."lines-and-columns-1.2.4"
-      (sources."listr-0.14.3" // {
-        dependencies = [
-          sources."is-stream-1.1.0"
-          sources."p-map-2.1.0"
-          sources."rxjs-6.6.7"
-          sources."tslib-1.14.1"
-        ];
-      })
-      (sources."listr-input-0.2.1" // {
-        dependencies = [
-          sources."inquirer-7.3.3"
-          sources."rxjs-6.6.7"
-          sources."tslib-1.14.1"
-        ];
-      })
-      sources."listr-silent-renderer-1.1.1"
-      (sources."listr-update-renderer-0.5.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."ansi-styles-2.2.1"
-          sources."chalk-1.1.3"
-          sources."figures-1.7.0"
-          sources."indent-string-3.2.0"
-          sources."log-symbols-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-        ];
-      })
-      (sources."listr-verbose-renderer-0.5.0" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."cli-cursor-2.1.0"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."figures-2.0.0"
-          sources."has-flag-3.0.0"
-          sources."mimic-fn-1.2.0"
-          sources."onetime-2.0.1"
-          sources."restore-cursor-2.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."locate-path-5.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash.isequal-4.5.0"
-      sources."lodash.zip-4.2.0"
-      (sources."log-symbols-5.1.0" // {
-        dependencies = [
-          sources."chalk-5.3.0"
-        ];
-      })
-      (sources."log-update-2.3.0" // {
-        dependencies = [
-          sources."ansi-escapes-3.2.0"
-          sources."ansi-regex-3.0.1"
-          sources."cli-cursor-2.1.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."mimic-fn-1.2.0"
-          sources."onetime-2.0.1"
-          sources."restore-cursor-2.0.0"
-          sources."string-width-2.1.1"
-          sources."strip-ansi-4.0.0"
-          sources."wrap-ansi-3.0.1"
-        ];
-      })
-      sources."lowercase-keys-2.0.0"
-      sources."lru-cache-7.18.3"
-      (sources."make-dir-3.1.0" // {
-        dependencies = [
-          sources."semver-6.3.1"
-        ];
-      })
-      sources."map-obj-4.3.0"
-      (sources."meow-12.0.1" // {
-        dependencies = [
-          sources."type-fest-3.13.1"
-        ];
-      })
-      sources."merge-stream-2.0.0"
-      sources."merge2-1.4.1"
-      sources."micromatch-4.0.5"
-      sources."mimic-fn-2.1.0"
-      sources."mimic-response-1.0.1"
-      sources."min-indent-1.0.1"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."minimist-options-4.1.0"
-      sources."mute-stream-0.0.8"
-      (sources."new-github-release-url-2.0.0" // {
-        dependencies = [
-          sources."type-fest-2.19.0"
-        ];
-      })
-      sources."normalize-package-data-5.0.0"
-      sources."normalize-url-6.1.0"
-      (sources."np-8.0.4" // {
-        dependencies = [
-          sources."chalk-5.3.0"
-          sources."cli-width-4.1.0"
-          sources."escape-string-regexp-5.0.0"
-          sources."execa-7.2.0"
-          sources."figures-5.0.0"
-          sources."human-signals-4.3.1"
-          sources."inquirer-9.2.10"
-          sources."is-stream-3.0.0"
-          sources."mimic-fn-4.0.0"
-          sources."mute-stream-1.0.0"
-          sources."npm-run-path-5.1.0"
-          sources."onetime-6.0.0"
-          sources."path-key-4.0.0"
-          sources."run-async-3.0.0"
-          sources."strip-final-newline-3.0.0"
-          sources."update-notifier-6.0.2"
-        ];
-      })
-      sources."npm-name-7.1.0"
-      sources."npm-run-path-4.0.1"
-      sources."number-is-nan-1.0.1"
-      sources."object-assign-4.1.1"
-      sources."once-1.4.0"
-      sources."onetime-5.1.2"
-      sources."open-9.1.0"
-      (sources."ora-5.4.1" // {
-        dependencies = [
-          sources."is-interactive-1.0.0"
-          sources."is-unicode-supported-0.1.0"
-          sources."log-symbols-4.1.0"
-        ];
-      })
-      sources."org-regex-1.0.0"
-      sources."os-tmpdir-1.0.2"
-      (sources."ow-1.1.1" // {
-        dependencies = [
-          sources."@sindresorhus/is-5.6.0"
-          sources."callsites-4.0.0"
-        ];
-      })
-      sources."p-cancelable-2.1.1"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-lock-2.1.0"
-      sources."p-map-5.5.0"
-      (sources."p-memoize-7.1.1" // {
-        dependencies = [
-          sources."mimic-fn-4.0.0"
-          sources."type-fest-3.13.1"
-        ];
-      })
-      sources."p-timeout-6.1.2"
-      sources."p-try-2.2.0"
-      (sources."package-json-8.1.1" // {
-        dependencies = [
-          sources."@sindresorhus/is-5.6.0"
-          sources."@szmarczak/http-timer-5.0.1"
-          sources."cacheable-lookup-7.0.0"
-          sources."cacheable-request-10.2.13"
-          sources."got-12.6.1"
-          sources."http2-wrapper-2.2.0"
-          sources."lowercase-keys-3.0.0"
-          sources."mimic-response-4.0.0"
-          sources."normalize-url-8.0.0"
-          sources."p-cancelable-3.0.0"
-          sources."quick-lru-5.1.1"
-          sources."registry-auth-token-5.0.2"
-          sources."responselike-3.0.0"
-        ];
-      })
-      sources."package-name-conflict-1.0.3"
-      sources."parent-module-1.0.1"
-      sources."parse-json-5.2.0"
-      sources."parse-json-object-2.0.1"
-      sources."path-exists-5.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
-      sources."path-type-4.0.0"
-      sources."picomatch-2.3.1"
-      (sources."pkg-dir-7.0.0" // {
-        dependencies = [
-          sources."find-up-6.3.0"
-          sources."locate-path-7.2.0"
-          sources."p-limit-4.0.0"
-          sources."p-locate-6.0.0"
-          sources."yocto-queue-1.0.0"
-        ];
-      })
-      sources."prepend-http-2.0.0"
-      sources."progress-2.0.3"
-      sources."proto-list-1.2.4"
-      sources."pump-3.0.0"
-      sources."pupa-3.1.0"
-      sources."queue-microtask-1.2.3"
-      sources."quick-lru-6.1.1"
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."ini-1.3.8"
-        ];
-      })
-      sources."read-file-safe-1.0.10"
-      (sources."read-json-safe-1.0.5" // {
-        dependencies = [
-          sources."parse-json-object-1.1.0"
-        ];
-      })
-      (sources."read-pkg-7.1.0" // {
-        dependencies = [
-          sources."hosted-git-info-4.1.0"
-          sources."lru-cache-6.0.0"
-          sources."normalize-package-data-3.0.3"
-          sources."type-fest-2.19.0"
-        ];
-      })
-      (sources."read-pkg-up-9.1.0" // {
-        dependencies = [
-          sources."find-up-6.3.0"
-          sources."locate-path-7.2.0"
-          sources."p-limit-4.0.0"
-          sources."p-locate-6.0.0"
-          sources."type-fest-2.19.0"
-          sources."yocto-queue-1.0.0"
-        ];
-      })
-      sources."readable-stream-3.6.2"
-      sources."redent-4.0.0"
-      sources."registry-auth-token-4.2.2"
-      sources."registry-url-6.0.1"
-      sources."resolve-alpn-1.2.1"
-      sources."resolve-cwd-3.0.0"
-      sources."resolve-from-5.0.0"
-      sources."responselike-2.0.1"
-      sources."restore-cursor-3.1.0"
-      sources."reusify-1.0.4"
-      sources."rimraf-3.0.2"
-      sources."run-applescript-5.0.0"
-      sources."run-async-2.4.1"
-      sources."run-parallel-1.2.0"
-      sources."rxjs-7.8.1"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."scoped-regex-3.0.0"
-      (sources."semver-7.5.4" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
-        ];
-      })
-      sources."semver-diff-4.0.0"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."signal-exit-3.0.7"
-      sources."slash-4.0.0"
-      sources."slice-ansi-0.0.4"
-      sources."spdx-correct-3.2.0"
-      sources."spdx-exceptions-2.3.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.13"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."strip-final-newline-2.0.0"
-      sources."strip-indent-4.0.0"
-      sources."strip-json-comments-2.0.1"
-      sources."supports-color-7.2.0"
-      sources."supports-hyperlinks-2.3.0"
-      sources."symbol-observable-4.0.0"
-      (sources."terminal-link-3.0.0" // {
-        dependencies = [
-          sources."ansi-escapes-5.0.0"
-          sources."type-fest-1.4.0"
-        ];
-      })
-      sources."through-2.3.8"
-      sources."titleize-3.0.0"
-      sources."tmp-0.0.33"
-      sources."to-readable-stream-1.0.0"
-      sources."to-regex-range-5.0.1"
-      sources."trim-newlines-5.0.0"
-      sources."tslib-2.6.1"
-      sources."type-fest-0.21.3"
-      sources."typedarray-to-buffer-3.1.5"
-      sources."types-eslintrc-1.0.3"
-      sources."types-json-1.2.2"
-      sources."types-pkg-json-1.2.1"
-      sources."unique-string-3.0.0"
-      sources."universalify-2.0.0"
-      sources."untildify-4.0.0"
-      (sources."update-notifier-5.1.0" // {
-        dependencies = [
-          sources."@sindresorhus/is-0.14.0"
-          sources."@szmarczak/http-timer-1.1.2"
-          sources."boxen-5.1.2"
-          (sources."cacheable-request-6.1.0" // {
-            dependencies = [
-              sources."get-stream-5.2.0"
-              sources."lowercase-keys-2.0.0"
-            ];
-          })
-          sources."camelcase-6.3.0"
-          sources."ci-info-2.0.0"
-          sources."cli-boxes-2.2.1"
-          sources."configstore-5.0.1"
-          sources."crypto-random-string-2.0.0"
-          sources."decompress-response-3.3.0"
-          sources."defer-to-connect-1.1.3"
-          sources."dot-prop-5.3.0"
-          sources."escape-goat-2.1.1"
-          sources."get-stream-4.1.0"
-          sources."got-9.6.0"
-          sources."has-yarn-2.1.0"
-          sources."import-lazy-2.1.0"
-          sources."is-ci-2.0.0"
-          sources."is-npm-5.0.0"
-          sources."is-yarn-global-0.3.0"
-          sources."json-buffer-3.0.0"
-          sources."keyv-3.1.0"
-          sources."latest-version-5.1.0"
-          sources."lowercase-keys-1.0.1"
-          sources."normalize-url-4.5.1"
-          sources."p-cancelable-1.1.0"
-          (sources."package-json-6.5.0" // {
-            dependencies = [
-              sources."semver-6.3.1"
-            ];
-          })
-          sources."pupa-2.1.1"
-          sources."registry-url-5.1.0"
-          sources."responselike-1.0.2"
-          (sources."semver-diff-3.1.1" // {
-            dependencies = [
-              sources."semver-6.3.1"
-            ];
-          })
-          sources."type-fest-0.20.2"
-          sources."unique-string-2.0.0"
-          sources."widest-line-3.1.0"
-          sources."wrap-ansi-7.0.0"
-          sources."xdg-basedir-4.0.0"
-        ];
-      })
-      sources."url-parse-lax-3.0.0"
-      sources."util-deprecate-1.0.2"
-      sources."vali-date-1.0.0"
-      sources."validate-npm-package-license-3.0.4"
-      sources."validate-npm-package-name-3.0.0"
-      sources."wcwidth-1.0.1"
-      sources."which-2.0.2"
-      (sources."widest-line-4.0.1" // {
-        dependencies = [
-          sources."ansi-regex-6.0.1"
-          sources."emoji-regex-9.2.2"
-          sources."string-width-5.1.2"
-          sources."strip-ansi-7.1.0"
-        ];
-      })
-      sources."wrap-ansi-6.2.0"
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-3.0.3"
-      sources."xdg-basedir-5.1.0"
-      sources."yallist-4.0.0"
-      sources."yargs-parser-21.1.1"
-      sources."yocto-queue-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "CLI tool for the Maizzle Email Framework";
-      homepage = "https://maizzle.com";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   "@medable/mdctl-cli" = nodeEnv.buildNodePackage {
     name = "_at_medable_slash_mdctl-cli";
     packageName = "@medable/mdctl-cli";
diff --git a/pkgs/development/tools/maizzle/default.nix b/pkgs/development/tools/maizzle/default.nix
new file mode 100644
index 000000000000..11279b98de80
--- /dev/null
+++ b/pkgs/development/tools/maizzle/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "maizzle";
+  version = "1.5.6";
+
+  src = fetchFromGitHub {
+    owner = "maizzle";
+    repo = "cli";
+    rev = "v${version}";
+    hash = "sha256-HGoqwqO50Y1oZBCVXkgM3NyZu+vPz/iniEH9mm/SQ1I=";
+  };
+
+  npmDepsHash = "sha256-vqhuoTtrZYmxameaoOfA9N5QGXzdhT1/tWx70KBk5aI=";
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "CLI tool for the Maizzle Email Framework";
+    homepage = "https://github.com/maizzle/cli";
+    license = lib.licenses.mit;
+    mainProgram = "maizzle";
+    maintainers = with lib.maintainers; [ happysalada ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e84c8e7d19d2..ec92b83999c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19532,6 +19532,8 @@ with pkgs;
 
   lurk = callPackage ../development/tools/lurk { };
 
+  maizzle = callPackage ../development/tools/maizzle { };
+
   malt = callPackage ../development/tools/profiling/malt { };
 
   marksman = callPackage ../development/tools/marksman { };

From cc4ecf1ef26df974e29439976126214055553a46 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 17 Aug 2023 21:30:37 +0200
Subject: [PATCH 28/34] python310Packages.jupyterhub-tmpauthenticator: add
 changelog to meta

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

diff --git a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
index fcc1039311c8..0306fa0837a6 100644
--- a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-7TuAYP6mRffsZL+O+AMgt5HBu6PhwLYj5A8X8DnMfl0=";
+    hash = "sha256-7TuAYP6mRffsZL+O+AMgt5HBu6PhwLYj5A8X8DnMfl0=";
   };
 
   propagatedBuildInputs = [ jupyterhub ];
@@ -23,9 +23,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "tmpauthenticator" ];
 
   meta = with lib; {
-    description = "Simple Jupyterhub authenticator that allows anyone to log in.";
-    license = with licenses; [ bsd3 ];
+    description = "Simple Jupyterhub authenticator that allows anyone to log in";
     homepage = "https://github.com/jupyterhub/tmpauthenticator";
+    changelog = "https://github.com/jupyterhub/tmpauthenticator/blob/v${version}/CHANGELOG.md";
+    license = with licenses; [ bsd3 ];
     maintainers = with maintainers; [ chiroptical ];
   };
 }

From fed40d2a10a554cd58298ebac75c929dc4ba1cae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 17 Aug 2023 21:34:40 +0200
Subject: [PATCH 29/34] python310Packages.jupyterhub-tmpauthenticator: update
 disabled

- add format
---
 .../jupyterhub-tmpauthenticator/default.nix          | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
index 0306fa0837a6..0c18569c4b5c 100644
--- a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
@@ -8,19 +8,25 @@
 buildPythonPackage rec {
   pname = "jupyterhub-tmpauthenticator";
   version = "1.0.0";
-  disabled = pythonOlder "3.5";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-7TuAYP6mRffsZL+O+AMgt5HBu6PhwLYj5A8X8DnMfl0=";
   };
 
-  propagatedBuildInputs = [ jupyterhub ];
+  propagatedBuildInputs = [
+    jupyterhub
+  ];
 
   # No tests available in the package
   doCheck = false;
 
-  pythonImportsCheck = [ "tmpauthenticator" ];
+  pythonImportsCheck = [
+    "tmpauthenticator"
+  ];
 
   meta = with lib; {
     description = "Simple Jupyterhub authenticator that allows anyone to log in";

From baf834d40d5451aae537fee946aa9adcfe0ffa2b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 17 Aug 2023 21:45:30 +0200
Subject: [PATCH 30/34] python310Packages.irc: add changelog to meta

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

diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix
index b60ae8139192..1dd5eeab379d 100644
--- a/pkgs/development/python-modules/irc/default.nix
+++ b/pkgs/development/python-modules/irc/default.nix
@@ -25,7 +25,9 @@ buildPythonPackage rec {
     hash = "sha256-JFteqYqwAlZnYx53alXjGRfmDvcIxgEC8hmLyfURMjY=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
 
   propagatedBuildInputs = [
     six
@@ -40,11 +42,14 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  pythonImportsCheck = [ "irc" ];
+  pythonImportsCheck = [
+    "irc"
+  ];
 
   meta = with lib; {
     description = "IRC (Internet Relay Chat) protocol library for Python";
     homepage = "https://github.com/jaraco/irc";
+    changelog = "https://github.com/jaraco/irc/blob/v${version}/NEWS.rst";
     license = licenses.mit;
     maintainers = with maintainers; [];
   };

From 5208e8e4997e3e4424628ef2b4977af18ba0a567 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 17 Aug 2023 21:52:47 +0200
Subject: [PATCH 31/34] python311Packages.irc: enable tests

---
 .../python-modules/irc/default.nix            | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix
index 1dd5eeab379d..a068d26695e5 100644
--- a/pkgs/development/python-modules/irc/default.nix
+++ b/pkgs/development/python-modules/irc/default.nix
@@ -1,16 +1,15 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, isPy3k
-, six
-, jaraco-logging
-, jaraco-text
-, jaraco-stream
-, pytz
-, jaraco-itertools
-, setuptools-scm
 , jaraco-collections
-, importlib-metadata
+, jaraco-itertools
+, jaraco-logging
+, jaraco-stream
+, jaraco-text
+, pytestCheckHook
+, pythonOlder
+, pytz
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
@@ -18,7 +17,7 @@ buildPythonPackage rec {
   version = "20.3.0";
   format = "pyproject";
 
-  disabled = !isPy3k;
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
@@ -30,17 +29,17 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    six
-    importlib-metadata
-    jaraco-logging
-    jaraco-text
-    jaraco-stream
-    pytz
-    jaraco-itertools
     jaraco-collections
+    jaraco-itertools
+    jaraco-logging
+    jaraco-stream
+    jaraco-text
+    pytz
   ];
 
-  doCheck = false;
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [
     "irc"
@@ -51,6 +50,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jaraco/irc";
     changelog = "https://github.com/jaraco/irc/blob/v${version}/NEWS.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [];
+    maintainers = with maintainers; [ ];
   };
 }

From cf0aa676349f9dd3745e820fc1edaf3bd9cceb4d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 17 Aug 2023 22:20:49 +0200
Subject: [PATCH 32/34] python311Packages.es-client: 8.7.0 -> 8.9.0

Diff: https://github.com/untergeek/es_client/compare/refs/tags/v8.7.0...v8.9.0

Changelog: https://github.com/untergeek/es_client/releases/tag/v8.9.0
---
 pkgs/development/python-modules/es-client/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix
index 5e43edc6da6b..ffa9d07f495d 100644
--- a/pkgs/development/python-modules/es-client/default.nix
+++ b/pkgs/development/python-modules/es-client/default.nix
@@ -10,6 +10,7 @@
 , pytest-asyncio
 , pytestCheckHook
 , pythonOlder
+, pythonRelaxDepsHook
 , pyyaml
 , requests
 , six
@@ -18,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "es-client";
-  version = "8.7.0";
+  version = "8.9.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -27,11 +28,14 @@ buildPythonPackage rec {
     owner = "untergeek";
     repo = "es_client";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DJIo0yFJGR9gw5UJnmgnBFZx0uXUEW3rWT49jhfnXkQ=";
+    hash = "sha256-pzCjVkZ/NmHSe6X8dNH1YvjTu3njQaJe4CuguqrJNs8=";
   };
 
+  pythonRelaxDeps = true;
+
   nativeBuildInputs = [
     hatchling
+    pythonRelaxDepsHook
   ];
 
   propagatedBuildInputs = [

From c22979269f89c3cc576ce1f8f28fb01aa2fd896c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 17 Aug 2023 22:43:33 +0200
Subject: [PATCH 33/34] python311Packages.elasticsearch8: 8.7.0 -> 8.9.0

Changelog: https://github.com/elastic/elasticsearch-py/releases/tag/v8.9.0
---
 pkgs/development/python-modules/elasticsearch8/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix
index ead2f6b07ee6..6893a8353dff 100644
--- a/pkgs/development/python-modules/elasticsearch8/default.nix
+++ b/pkgs/development/python-modules/elasticsearch8/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "elasticsearch8";
-  version = "8.7.0";
+  version = "8.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mRy48OYsm+0M1/D+abs83RiqN8wQr/Z6SZUY4TNg190=";
+    hash = "sha256-9j71MX3ITwfwFfIVvQIbXHu4r/3qz9SNAz8XfeAyWTc=";
   };
 
   nativeBuildInputs = [

From 4e1be9a17b5c37db671b775cf6e633aaee5313d6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 17 Aug 2023 22:49:57 +0200
Subject: [PATCH 34/34] elasticsearch-curator: 8.0.4 -> 8.0.8

Changelog: https://github.com/elastic/curator/releases/tag/v8.0.8
---
 .../admin/elasticsearch-curator/default.nix   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix
index 77acc590e1d4..f09aad4a93e3 100644
--- a/pkgs/tools/admin/elasticsearch-curator/default.nix
+++ b/pkgs/tools/admin/elasticsearch-curator/default.nix
@@ -5,27 +5,27 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "elasticsearch-curator";
-  version = "8.0.4";
+  version = "8.0.8";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "curator";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FPp2BpfYsmNwwevYQ6EH3N1q0TjyeEsBeDM9EUbLl+Q=";
+    hash = "sha256-G8wKeEr7TuUWlqz9hJmnJW7yxn+4WPoStVC0AX5jdHI=";
   };
 
-  pythonRelaxDeps = [
-    "click"
-    "ecs-logging"
-    "elasticsearch8"
-    "es_client"
-    "pyyaml"
-  ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "elasticsearch8==" "elasticsearch8>=" \
+      --replace "es_client==" "es_client>=" \
+      --replace "ecs-logging==" "ecs-logging>=" \
+      --replace "click==" "click>="\
+      --replace "pyyaml==" "pyyaml>="
+  '';
 
   nativeBuildInputs = with python3.pkgs; [
     hatchling
-    pythonRelaxDepsHook
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -77,8 +77,9 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   meta = with lib; {
-    homepage = "https://github.com/elastic/curator";
     description = "Curate, or manage, your Elasticsearch indices and snapshots";
+    homepage = "https://github.com/elastic/curator";
+    changelog = "https://github.com/elastic/curator/releases/tag/v${version}";
     license = licenses.asl20;
     longDescription = ''
       Elasticsearch Curator helps you curate, or manage, your Elasticsearch
@@ -92,7 +93,6 @@ python3.pkgs.buildPythonApplication rec {
 
       * Perform various actions on the items which remain in the actionable list.
     '';
-    changelog = "https://github.com/elastic/curator/releases/tag/v${version}";
     maintainers = with maintainers; [ basvandijk ];
   };
 }