From efa1227dca0b69ccd71d9586a19c67b9139b9457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Sat, 13 May 2023 12:00:51 +0200
Subject: [PATCH 01/37] ldtk: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix
index ecdb9946ce26..2777c260a664 100644
--- a/pkgs/applications/editors/ldtk/default.nix
+++ b/pkgs/applications/editors/ldtk/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ldtk";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchurl {
     url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip";
-    hash = "sha256-8GiMm1Nb2jRLFWtGNsSfrW1jIi9yKCcyuUKwMEqoUZI=";
+    hash = "sha256-egvAe4nAzPDBeTaAzrqhlDsG60bGNnKXB5Vt16vIZrQ";
   };
 
   nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ];

From 450d3f71238b8bd717442f99510a8a85508b3019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Wed, 31 May 2023 14:57:11 +0200
Subject: [PATCH 02/37] filebot: 5.0.2 -> 5.0.3

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

diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix
index 09f99f400aa6..0c0d07d1eaf7 100644
--- a/pkgs/applications/video/filebot/default.nix
+++ b/pkgs/applications/video/filebot/default.nix
@@ -9,11 +9,11 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "filebot";
-  version = "5.0.2";
+  version = "5.0.3";
 
   src = fetchurl {
     url = "https://web.archive.org/web/20230418205553/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
-    hash = "sha256-XnzBXZy/gNA8qf7XairoviRmdQiXHbW19BgbHL52SP0=";
+    hash = "sha256-8FTmR+ztR2ugPcgHvfwyh9yfxPiUJdeAVvjjl5cQCy0=";
   };
 
   unpackPhase = "tar xvf $src";

From b9705cfa422cff771a067dad14d64c775d416ddb Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Fri, 2 Jun 2023 02:18:11 +0800
Subject: [PATCH 03/37] nwg-dock-hyprland: init at 0.1.2

---
 .../misc/nwg-dock-hyprland/default.nix        | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/misc/nwg-dock-hyprland/default.nix

diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/applications/misc/nwg-dock-hyprland/default.nix
new file mode 100644
index 000000000000..0d74e00774f0
--- /dev/null
+++ b/pkgs/applications/misc/nwg-dock-hyprland/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, pkg-config
+, wrapGAppsHook
+, gtk-layer-shell
+}:
+
+buildGoModule rec {
+  pname = "nwg-dock-hyprland";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "nwg-piotr";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-7vdfxE3X2J7bDLzose0dKmjxNQhS5+/ROky9wkK1gc0=";
+  };
+
+  vendorHash = "sha256-GhcrIVnZRbiGTfeUAWvslOVWDZmoL0ZRnjgTtQgxe2Q=";
+
+  ldflags = [ "-s" "-w" ];
+
+  nativeBuildInputs = [ pkg-config wrapGAppsHook ];
+  buildInputs = [ gtk-layer-shell ];
+
+  meta = with lib; {
+    description = "GTK3-based dock for Hyprland";
+    homepage = "https://github.com/nwg-piotr/nwg-dock-hyprland";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ aleksana ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b40f367bea9f..3c8f51e68a2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32789,6 +32789,8 @@ with pkgs;
 
   nwg-dock = callPackage ../applications/misc/nwg-dock { };
 
+  nwg-dock-hyprland = callPackage ../applications/misc/nwg-dock-hyprland { };
+
   nwg-drawer = callPackage ../applications/misc/nwg-drawer { };
 
   nwg-launchers = callPackage ../applications/misc/nwg-launchers { };

From 6913733c577f7cb19d1c83dcf6dfe7c6fa614d88 Mon Sep 17 00:00:00 2001
From: "Emil \"AngryAnt\" Johansen" <git@eej.dk>
Date: Wed, 7 Jun 2023 10:56:34 +0200
Subject: [PATCH 04/37] hobbes: fix build, unstable-2021-04-28 ->
 unstable-2023-06-03

---
 pkgs/development/tools/hobbes/default.nix | 25 ++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix
index 148a1ccae089..5c3eb84b2d5a 100644
--- a/pkgs/development/tools/hobbes/default.nix
+++ b/pkgs/development/tools/hobbes/default.nix
@@ -1,14 +1,24 @@
-{ lib, stdenv, fetchFromGitHub, cmake, llvm_12, ncurses, readline, zlib, libxml2 }:
-
-stdenv.mkDerivation {
+{ lib
+, stdenv
+, llvmPackages_10
+, fetchFromGitHub
+, cmake
+, llvm_12
+, ncurses
+, readline
+, zlib
+, libxml2
+, python3
+}:
+llvmPackages_10.stdenv.mkDerivation {
   pname = "hobbes";
-  version = "unstable-2021-04-28";
+  version = "unstable-2023-06-03";
 
   src = fetchFromGitHub {
-    owner = "morgan-stanley";
+    owner = "morganstanley";
     repo = "hobbes";
-    rev = "737c7ca63516f6b3dca0e659c3de75d4325472d6";
-    sha256 = "0fjsmz1sbrp6464mrb9ha7p615w2l2pdldsc2ayvcrvxfyi1r4gj";
+    rev = "88a712b85bc896a4c87e60c12321445f1cdcfd00";
+    hash = "sha256-2v0yk35/cLKTjX0Qbc8cjc7Y6bamRSa9GpPvGoxL2Cw=";
   };
 
   # TODO: re-enable Python tests once they work on Python 3
@@ -27,6 +37,7 @@ stdenv.mkDerivation {
     readline
     zlib
     libxml2
+    python3
   ];
 
   doCheck = true;

From acb5b93f265fc704b39e28c95552dd01c07135df Mon Sep 17 00:00:00 2001
From: "Emil \"AngryAnt\" Johansen" <git@eej.dk>
Date: Sat, 3 Jun 2023 17:56:44 +0200
Subject: [PATCH 05/37] pdftoipe: fix build by applying patch from PR 55 as
 well

---
 pkgs/tools/graphics/pdftoipe/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/pdftoipe/default.nix b/pkgs/tools/graphics/pdftoipe/default.nix
index 763a1366801e..fc4e0d964fdc 100644
--- a/pkgs/tools/graphics/pdftoipe/default.nix
+++ b/pkgs/tools/graphics/pdftoipe/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "otfried";
     repo = "ipe-tools";
     rev = "v${version}";
-    sha256 = "jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k=";
+    hash = "sha256-jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k=";
   };
 
   patches = [
@@ -22,9 +22,16 @@ stdenv.mkDerivation rec {
     # https://github.com/otfried/ipe-tools/pull/48
     (fetchpatch {
       url = "https://github.com/otfried/ipe-tools/commit/14335180432152ad094300d0afd00d8e390469b2.patch";
-      sha256 = "sha256-V3FmwG3bR6io/smxjasFJ5K0/u8RSFfdUX41ClGXhFc=";
+      hash = "sha256-V3FmwG3bR6io/smxjasFJ5K0/u8RSFfdUX41ClGXhFc=";
       stripLen = 1;
-      name = "poppler_fix_build.patch";
+      name = "poppler_fix_build_48.patch";
+    })
+    # https://github.com/otfried/ipe-tools/pull/55
+    (fetchpatch {
+      url = "https://github.com/otfried/ipe-tools/commit/65586fcd9cc39e482ae5a9abdb6f4932d9bb88c4.patch";
+      hash = "sha256-qr1AQyWHz1e2a65m05xSHFnP6oSP6qSmMVekNk2flRc=";
+      stripLen = 1;
+      name = "poppler_fix_build_55.patch";
     })
   ];
 
@@ -40,6 +47,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A program that tries to convert arbitrary PDF documents to Ipe files";
     homepage = "https://github.com/otfried/ipe-tools";
+    changelog = "https://github.com/otfried/ipe-tools/releases";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ yrd ];
   };

From 15473397c9b7c8e96938683ed28498a9e58d9188 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 7 Jun 2023 22:50:57 +0200
Subject: [PATCH 06/37] minecraft-server: 1.19.4 -> 1.20

---
 pkgs/games/minecraft-servers/versions.json | 26 +++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json
index 34f1ccbc4a50..8c751bf70074 100644
--- a/pkgs/games/minecraft-servers/versions.json
+++ b/pkgs/games/minecraft-servers/versions.json
@@ -1,4 +1,10 @@
 {
+  "1.20": {
+    "url": "https://piston-data.mojang.com/v1/objects/15c777e2cfe0556eef19aab534b186c0c6f277e1/server.jar",
+    "sha1": "15c777e2cfe0556eef19aab534b186c0c6f277e1",
+    "version": "1.20",
+    "javaVersion": 17
+  },
   "1.19": {
     "url": "https://piston-data.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar",
     "sha1": "8f3112a1049751cc472ec13e397eade5336ca7ae",
@@ -6,61 +12,61 @@
     "javaVersion": 17
   },
   "1.18": {
-    "url": "https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar",
     "sha1": "c8f83c5655308435b3dcf03c06d9fe8740a77469",
     "version": "1.18.2",
     "javaVersion": 17
   },
   "1.17": {
-    "url": "https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar",
     "sha1": "a16d67e5807f57fc4e550299cf20226194497dc2",
     "version": "1.17.1",
     "javaVersion": 16
   },
   "1.16": {
-    "url": "https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar",
     "sha1": "1b557e7b033b583cd9f66746b7a9ab1ec1673ced",
     "version": "1.16.5",
     "javaVersion": 8
   },
   "1.15": {
-    "url": "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar",
     "sha1": "bb2b6b1aefcd70dfd1892149ac3a215f6c636b07",
     "version": "1.15.2",
     "javaVersion": 8
   },
   "1.14": {
-    "url": "https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar",
     "sha1": "3dc3d84a581f14691199cf6831b71ed1296a9fdf",
     "version": "1.14.4",
     "javaVersion": 8
   },
   "1.13": {
-    "url": "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar",
     "sha1": "3737db93722a9e39eeada7c27e7aca28b144ffa7",
     "version": "1.13.2",
     "javaVersion": 8
   },
   "1.12": {
-    "url": "https://launcher.mojang.com/v1/objects/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar",
     "sha1": "886945bfb2b978778c3a0288fd7fab09d315b25f",
     "version": "1.12.2",
     "javaVersion": 8
   },
   "1.11": {
-    "url": "https://launcher.mojang.com/v1/objects/f00c294a1576e03fddcac777c3cf4c7d404c4ba4/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/f00c294a1576e03fddcac777c3cf4c7d404c4ba4/server.jar",
     "sha1": "f00c294a1576e03fddcac777c3cf4c7d404c4ba4",
     "version": "1.11.2",
     "javaVersion": 8
   },
   "1.10": {
-    "url": "https://launcher.mojang.com/v1/objects/3d501b23df53c548254f5e3f66492d178a48db63/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/3d501b23df53c548254f5e3f66492d178a48db63/server.jar",
     "sha1": "3d501b23df53c548254f5e3f66492d178a48db63",
     "version": "1.10.2",
     "javaVersion": 8
   },
   "1.9": {
-    "url": "https://launcher.mojang.com/v1/objects/edbb7b1758af33d365bf835eb9d13de005b1e274/server.jar",
+    "url": "https://piston-data.mojang.com/v1/objects/edbb7b1758af33d365bf835eb9d13de005b1e274/server.jar",
     "sha1": "edbb7b1758af33d365bf835eb9d13de005b1e274",
     "version": "1.9.4",
     "javaVersion": 8

From e6a26b900caddb8c2a033b7fb65c0971ab129664 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 8 Jun 2023 11:16:51 +0200
Subject: [PATCH 07/37] php80: 8.0.28 -> 8.0.29

---
 pkgs/development/interpreters/php/8.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix
index ddc4ed17acbd..7de152f25c34 100644
--- a/pkgs/development/interpreters/php/8.0.nix
+++ b/pkgs/development/interpreters/php/8.0.nix
@@ -2,8 +2,8 @@
 
 let
   base = callPackage ./generic.nix (_args // {
-    version = "8.0.28";
-    hash = "sha256-nV50k1yQDjuce2vHQFlrcZM2MOufY3F8DEkj2MeIxi4=";
+    version = "8.0.29";
+    hash = "sha256-SAGh8OFxcChnI6tUrNBFrHipZWAh1W8QSmRUPuySLhI=";
   });
 
 in

From 678084e0faeb9ccbd84e18afa45269780948fc72 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 7 Jun 2023 19:04:53 +0200
Subject: [PATCH 08/37] php81: 8.1.19 -> 8.1.20

---
 pkgs/development/interpreters/php/8.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix
index 945717e38e5d..86d76fcbd76b 100644
--- a/pkgs/development/interpreters/php/8.1.nix
+++ b/pkgs/development/interpreters/php/8.1.nix
@@ -1,9 +1,9 @@
-{ callPackage, lib, stdenv, ... }@_args:
+{ callPackage, ... }@_args:
 
 let
   base = callPackage ./generic.nix (_args // {
-    version = "8.1.19";
-    hash = "sha256-ZCByB/2jC+kmou8fZv8ma/H9x+AzObyZ+7oKEkXkJ5s=";
+    version = "8.1.20";
+    hash = "sha256-VVeFh1FKJwdQD4UxnlfA1N+biAPNsmVmWVrEv0WdxN0=";
   });
 
 in

From b422ca288c3e6a21e4c82c52936cbdde6fdaae0f Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 7 Jun 2023 19:05:11 +0200
Subject: [PATCH 09/37] php82: 8.2.6 -> 8.2.7

---
 pkgs/development/interpreters/php/8.2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix
index 56d7d28911ae..02adffa6f355 100644
--- a/pkgs/development/interpreters/php/8.2.nix
+++ b/pkgs/development/interpreters/php/8.2.nix
@@ -1,9 +1,9 @@
-{ callPackage, lib, stdenv, fetchurl, ... }@_args:
+{ callPackage, ... }@_args:
 
 let
   base = callPackage ./generic.nix (_args // {
-    version = "8.2.6";
-    hash = "sha256-RKcMUvU3ZiwQ2R7tv1H9dlyZYb5rolCO1jv3omzdMQA=";
+    version = "8.2.7";
+    hash = "sha256-W/sqNcZ5Ib3K3VyQyykK11N9JNoROl6LwtZGsC3nSI8=";
   });
 
 in

From 77f2a209e91931ecf2fe28352dcb4a0834030c6c Mon Sep 17 00:00:00 2001
From: Florian Engel <florianengel39@gmail.com>
Date: Sat, 26 Nov 2022 11:10:20 +0100
Subject: [PATCH 10/37] ical2orgpy: init at 0.4.0

---
 pkgs/tools/misc/ical2orgpy/default.nix | 32 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/misc/ical2orgpy/default.nix

diff --git a/pkgs/tools/misc/ical2orgpy/default.nix b/pkgs/tools/misc/ical2orgpy/default.nix
new file mode 100644
index 000000000000..3b1eb11594bf
--- /dev/null
+++ b/pkgs/tools/misc/ical2orgpy/default.nix
@@ -0,0 +1,32 @@
+{ lib, python3Packages, ... }:
+
+python3Packages.buildPythonPackage rec {
+  pname = "ical2orgpy";
+  version = "0.4.0";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-7/kWW1oTSJXPJtN02uIDrFdNJ9ExKRUa3tUNA0oJSoc=";
+  };
+
+  disabled = python3Packages.pythonOlder "3.9";
+
+  propagatedBuildInputs = with python3Packages; [
+    click
+    future
+    icalendar
+    pytz
+    tzlocal
+    recurring-ical-events
+  ];
+  checkInputs = with python3Packages; [ freezegun pytest pyyaml ];
+  nativeBuildInputs = [ python3Packages.pbr ];
+
+  meta = with lib; {
+    description = "Converting ICAL file into org-mode format.";
+    homepage = "https://github.com/ical2org-py/ical2org.py";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ StillerHarpo ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01aa8b59017b..5b10ffeab9e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31667,6 +31667,8 @@ with pkgs;
 
   i810switch = callPackage ../os-specific/linux/i810switch { };
 
+  ical2orgpy = callPackage ../tools/misc/ical2orgpy { };
+
   icewm = callPackage ../applications/window-managers/icewm { };
 
   icon-library = callPackage ../applications/graphics/icon-library { };

From 2a294648ca23ee0f8b5d7692114fc9c99468eefa Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@gmail.com>
Date: Thu, 8 Jun 2023 20:05:24 +0300
Subject: [PATCH 11/37] gitea: Fix substitution in wrong file after rebasing a
 patch

This command is needed to substitute @data@ which is added by
static-root-path.patch. When this patch was rebased for 1.19.0,
the file name changed, but the command was not updated.
---
 pkgs/applications/version-management/gitea/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index fabf0907b369..1d29534a976e 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -34,7 +34,7 @@ buildGoModule rec {
   ];
 
   postPatch = ''
-    substituteInPlace modules/setting/setting.go --subst-var data
+    substituteInPlace modules/setting/server.go --subst-var data
   '';
 
   subPackages = [ "." ];

From c69621b8bdc47d8baa5aaca7a0b61253d7568772 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@gmail.com>
Date: Thu, 8 Jun 2023 20:16:13 +0300
Subject: [PATCH 12/37] gitea: Add coreutils binaries to PATH

coreutils is used by hooks which are generated by gitea, e.g.:

  $ cat hooks/pre-receive
  #!/usr/bin/env bash
  # AUTO GENERATED BY GITEA, DO NOT MODIFY
  data=$(cat)
  exitcodes=""
  hookname=$(basename $0)
---
 pkgs/applications/version-management/gitea/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 1d29534a976e..17b839617ef8 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -5,6 +5,7 @@
 , makeWrapper
 , git
 , bash
+, coreutils
 , gitea
 , gzip
 , openssh
@@ -62,7 +63,7 @@ buildGoModule rec {
     cp -R ./options/locale $out/locale
 
     wrapProgram $out/bin/gitea \
-      --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]}
+      --prefix PATH : ${lib.makeBinPath [ bash coreutils git gzip openssh ]}
   '';
 
   passthru = {

From c45c1940c043465d90e9a1278e7b08294f93b7b1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 19:27:11 +0200
Subject: [PATCH 13/37] python311Packages.waterfurnace: remove pytest-runner

---
 .../python-modules/waterfurnace/default.nix    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix
index 7c57fc4d0e9e..eabd7de20ad0 100644
--- a/pkgs/development/python-modules/waterfurnace/default.nix
+++ b/pkgs/development/python-modules/waterfurnace/default.nix
@@ -3,26 +3,33 @@
 , click
 , fetchFromGitHub
 , mock
-, pytest-runner
 , pytestCheckHook
 , requests
+, pythonOlder
 , websocket-client
 }:
 
 buildPythonPackage rec {
   pname = "waterfurnace";
   version = "1.1.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "sdague";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     sha256 = "1ba247fw1fvi7zy31zj2wbjq7fajrbxhp139cl9jj67rfvxfv8xf";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'pytest-runner'," ""
+  '';
+
   propagatedBuildInputs = [
     click
-    pytest-runner
     requests
     websocket-client
   ];
@@ -32,11 +39,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "waterfurnace" ];
+  pythonImportsCheck = [
+    "waterfurnace"
+  ];
 
   meta = with lib; {
     description = "Python interface to waterfurnace geothermal systems";
     homepage = "https://github.com/sdague/waterfurnace";
+    changelog = "https://github.com/sdague/waterfurnace/blob/v${version}/HISTORY.rst";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };

From 6b0956d6617bb6bff686e9c6ec74cc3903199a5f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 19:40:50 +0200
Subject: [PATCH 14/37] python311Packages.fontmath: remove pytest-runner

- add changelog to meta
- switch to pytestCheckHook
- disable on unsupported Python releases
---
 .../python-modules/fontmath/default.nix       | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix
index bb5799cff1a9..81e70c51fee3 100644
--- a/pkgs/development/python-modules/fontmath/default.nix
+++ b/pkgs/development/python-modules/fontmath/default.nix
@@ -1,28 +1,43 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
-, fonttools, setuptools-scm
-, pytest, pytest-runner
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fonttools
+, setuptools-scm
+, pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
-  pname = "fontMath";
+  pname = "fontmath";
   version = "0.9.3";
-  disabled = isPy27;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "fontMath";
+    inherit version;
     hash = "sha256-alOHy3/rEFlY2y9c7tyHhRPMNb83FeJiCQ8FV74MGxw=";
     extension = "zip";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = [ fonttools ];
-  nativeCheckInputs = [ pytest pytest-runner ];
+  propagatedBuildInputs = [
+    fonttools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "A collection of objects that implement fast font, glyph, etc. math";
     homepage = "https://github.com/robotools/fontMath/";
+    changelog = "https://github.com/robotools/fontMath/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = [ maintainers.sternenseemann ];
+    maintainers = with maintainers; [ sternenseemann ];
   };
 }

From 1dcbf1f690b6a9da135a875bea9512ab94fb11b4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 19:53:22 +0200
Subject: [PATCH 15/37] python311Packages.py-multicodec: remove pytest-runner

---
 .../python-modules/py-multicodec/default.nix  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/py-multicodec/default.nix b/pkgs/development/python-modules/py-multicodec/default.nix
index 6619a5c3e39f..21f396d9c2a2 100644
--- a/pkgs/development/python-modules/py-multicodec/default.nix
+++ b/pkgs/development/python-modules/py-multicodec/default.nix
@@ -1,10 +1,9 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, pytest-runner
+, morphys
 , pytestCheckHook
 , pythonOlder
-, morphys
 , six
 , varint
 }:
@@ -12,36 +11,39 @@
 buildPythonPackage rec {
   pname = "py-multicodec";
   version = "0.2.1";
-  disabled = pythonOlder "3.5";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "multiformats";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4=";
   };
 
   # Error when not substituting:
   # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead.
   postPatch = ''
-    substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]"
+    substituteInPlace setup.cfg \
+      --replace "[pytest]" "[tool:pytest]"
+    substituteInPlace setup.py \
+      --replace "'pytest-runner'," ""
   '';
 
-  nativeBuildInputs = [
-    pytest-runner
-  ];
-
   propagatedBuildInputs = [
-    varint
-    six
     morphys
+    six
+    varint
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "multicodec" ];
+  pythonImportsCheck = [
+    "multicodec"
+  ];
 
   meta = with lib; {
     description = "Compact self-describing codecs";

From 8b99f7b59da2316ef6e1e2b08035549988807188 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 20:14:37 +0200
Subject: [PATCH 16/37] python311Packages.ndjson: adjust inputs

---
 .../python-modules/ndjson/default.nix         | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/ndjson/default.nix b/pkgs/development/python-modules/ndjson/default.nix
index 9f2cf3fb2b9b..4bd84a73be0a 100644
--- a/pkgs/development/python-modules/ndjson/default.nix
+++ b/pkgs/development/python-modules/ndjson/default.nix
@@ -1,21 +1,43 @@
-{ lib, buildPythonPackage, fetchPypi, watchdog, flake8
-, pytest, pytest-runner, coverage, sphinx, twine }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+, six
+, watchdog
+}:
 
 buildPythonPackage rec {
   pname = "ndjson";
   version = "0.3.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY=";
+    hash = "sha256-v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY=";
   };
 
-  nativeCheckInputs = [ pytest pytest-runner flake8 twine sphinx coverage watchdog ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'pytest-runner', " ""
+  '';
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    six
+    watchdog
+  ];
+
+  pythonImportsCheck = [
+    "ndjson"
+  ];
 
   meta = with lib; {
+    description = "Module supports ndjson";
     homepage = "https://github.com/rhgrant10/ndjson";
-    description = "JsonDecoder";
-    platforms = platforms.unix;
+    changelog = "https://github.com/rhgrant10/ndjson/blob/v${version}/HISTORY.rst";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ freezeboy ];
   };

From b90237d64ebcb9a017e9d56b2219b6101a37af00 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 8 Jun 2023 21:21:46 +0300
Subject: [PATCH 17/37] vscode: 1.78.2 -> 1.79.0

---
 pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index da716255d230..fb1dd7596ece 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -19,17 +19,17 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "0kir1grd150gb7im6yx2l16hi43wwsi8q3dlpgah4m7na064xgyd";
-    x86_64-darwin = "1fw73483ja4zav8xd0j03ygib5zbviy3kd02jzmgbbbsac5li96m";
-    aarch64-linux = "1w0dxpvrj06m1d15q45xi4sl4g3fk0nf04vh2ar956lg67dqj7i6";
-    aarch64-darwin = "0i5vj3km6wkdc2mrks2rjbqbn1isg4l4ss6zs7qfra3zcj62bkc2";
-    armv7l-linux = "1jx8cz43ac35as414mxsj9abpkr4a7v10fg1msjy2ykcrzv9v3dr";
+    x86_64-linux = "13yd42jqlzjxg5afs05ph2z4xwsfkbcddqvc4fvz1qqwr698mkjj";
+    x86_64-darwin = "1slmqrxhrwm04v0lisc200mx6jv86vf5p62as4brzz9irnv707ry";
+    aarch64-linux = "1q99y9jx3c8z0l3pda0b79c50yff8as4z9c4dxwf7b67argi5ls6";
+    aarch64-darwin = "0ykb0ifkswv3rcp3x6rkm8r88flsfmwhlrlc4f55mbgj7jbfn5k3";
+    armv7l-linux = "0gshhing3drsrmf17jykafks7z587ixk63xinrdv62xl4x4qxca8";
   }.${system} or throwSystem;
 in
   callPackage ./generic.nix rec {
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.78.2";
+    version = "1.79.0";
     pname = "vscode";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";

From 3b1e90660e185513734dc4721b1aeacafeb79b7d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 20:38:12 +0200
Subject: [PATCH 18/37] python311Packages.py-multibase: remove pytest-runner

- add changelog to meta
- add pythonImportsCheck
- add format
- disable on unsupported Python releases
---
 .../python-modules/py-multibase/default.nix   | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/py-multibase/default.nix b/pkgs/development/python-modules/py-multibase/default.nix
index eeb83df5a98b..50f1d9e9b376 100644
--- a/pkgs/development/python-modules/py-multibase/default.nix
+++ b/pkgs/development/python-modules/py-multibase/default.nix
@@ -1,45 +1,50 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchPypi
-, isPy27
-, lib
 , morphys
-, pytest
-, pytest-runner
+, pytestCheckHook
 , python-baseconv
+, pythonOlder
 , six
 }:
 buildPythonPackage rec {
   pname = "py-multibase";
   version = "1.0.3";
-  disabled = isPy27;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version ;
-    sha256 = "d28a20efcbb61eec28f55827a0bf329c7cea80fffd933aecaea6ae8431267fe4";
+    inherit pname version;
+    hash = "sha256-0oog78u2Huwo9VgnoL8ynHzqgP/9kzrsrqauhDEmf+Q=";
   };
 
   postPatch = ''
-    substituteInPlace setup.cfg --replace "[pytest]" ""
-    substituteInPlace setup.cfg --replace "python_classes = *TestCase" ""
+    substituteInPlace setup.cfg \
+      --replace "[pytest]" "" \
+      --replace "python_classes = *TestCase" ""
+    substituteInPlace setup.py \
+      --replace "'pytest-runner'," ""
   '';
 
-  nativeBuildInputs = [
-    pytest-runner
-  ];
-
   propagatedBuildInputs = [
     morphys
-    six
     python-baseconv
+    six
   ];
 
   nativeCheckInputs = [
-    pytest
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "multibase"
   ];
 
   meta = with lib; {
-    description = "Multibase is a protocol for distinguishing base encodings and other simple string encodings";
+    description = "Module for distinguishing base encodings and other simple string encodings";
     homepage = "https://github.com/multiformats/py-multibase";
+    changelog = "https://github.com/multiformats/py-multibase/blob/v${version}/HISTORY.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ rakesh4g ];
   };

From 0c2eb01d10158e25f0af15b1cd0b6ea5960a1cfe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 20:55:55 +0200
Subject: [PATCH 19/37] python311Packages.reolink-aio: 0.5.16 -> 0.6.0

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

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 3b2a6c861359..4837e89c3a74 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.5.16";
+  version = "0.6.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     rev = "refs/tags/${version}";
-    hash = "sha256-FyrTZqp4h4GOCxld+y3wDEfLOl6a6dCgs/LJetjmr8I=";
+    hash = "sha256-fDtZEcHv13f9WtNZKoT8/I+Hz145n7SmQz0t9CVqE3g=";
   };
 
   postPatch = ''

From 24114b5f834cfa732781e1cf901ab07ef995caab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Thu, 8 Jun 2023 21:05:20 +0200
Subject: [PATCH 20/37] ldtk: use finalAttrs pattern with mkDerivation instead
 of rec

---
 pkgs/applications/editors/ldtk/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix
index 2777c260a664..48d635138326 100644
--- a/pkgs/applications/editors/ldtk/default.nix
+++ b/pkgs/applications/editors/ldtk/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, unzip
 , appimage-run }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ldtk";
   version = "1.3.3";
 
   src = fetchurl {
-    url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip";
+    url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip";
     hash = "sha256-egvAe4nAzPDBeTaAzrqhlDsG60bGNnKXB5Vt16vIZrQ";
   };
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     runHook preUnpack
 
     unzip $src
-    appimage-run -x src 'LDtk ${version} installer.AppImage'
+    appimage-run -x src 'LDtk ${finalAttrs.version} installer.AppImage'
 
     runHook postUnpack
   '';
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm644 'LDtk ${version} installer.AppImage' $out/share/ldtk.AppImage
+    install -Dm644 'LDtk ${finalAttrs.version} installer.AppImage' $out/share/ldtk.AppImage
     makeWrapper ${appimage-run}/bin/appimage-run $out/bin/ldtk \
       --add-flags $out/share/ldtk.AppImage
     install -Dm644 src/ldtk.png $out/share/icons/hicolor/1024x1024/apps/ldtk.png
@@ -50,10 +50,10 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Modern, lightweight and efficient 2D level editor";
     homepage = "https://ldtk.io/";
-    changelog = "https://github.com/deepnight/ldtk/releases/tag/v${version}";
+    changelog = "https://github.com/deepnight/ldtk/releases/tag/v${finalAttrs.version}";
     license = licenses.mit;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ felschr ];
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
   };
-}
+})

From 3085e24225814cee433d975233a7db18cebad1e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Thu, 8 Jun 2023 20:52:07 +0200
Subject: [PATCH 21/37] filebot: use finalAttrs pattern with mkDerivation
 instead of rec

---
 pkgs/applications/video/filebot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix
index 0c0d07d1eaf7..f281515c602d 100644
--- a/pkgs/applications/video/filebot/default.nix
+++ b/pkgs/applications/video/filebot/default.nix
@@ -7,12 +7,12 @@ let
     url = "https://search.maven.org/remotecontent?filepath=com/googlecode/lanterna/lanterna/3.1.1/lanterna-3.1.1.jar";
     hash = "sha256-7zxCeXYW5v9ritnvkwRpPKdgSptCmkT3HJOaNgQHUmQ=";
   };
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation (finalAttrs: {
   pname = "filebot";
   version = "5.0.3";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20230418205553/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
+    url = "https://web.archive.org/web/20230418205553/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz";
     hash = "sha256-8FTmR+ztR2ugPcgHvfwyh9yfxPiUJdeAVvjjl5cQCy0=";
   };
 
@@ -60,4 +60,4 @@ in stdenv.mkDerivation rec {
     maintainers = with maintainers; [ gleber felschr ];
     platforms = platforms.linux;
   };
-}
+})

From a5ce36d0c6509fd443eb009847d8cdcb7ff52a52 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 21:25:42 +0200
Subject: [PATCH 22/37] python311Packages.dvc-data: 0.54.3 -> 0.55.0

Diff: https://github.com/iterative/dvc-data/compare/refs/tags/0.54.3...0.55.0

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

diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix
index 967a5b08fbe9..7e4cfac084a9 100644
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-data";
-  version = "0.54.3";
+  version = "0.55.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-xkLqZmAzYfmfv9l1+PR8j5S7O5gKVh63+Jb9aZiLS8s=";
+    hash = "sha256-eE1cVzhwyClVYmaotw37sG46g5W1ToUE/f3pZ2CCcE0=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 10457705d66daa35e876904fad057a2d516118cc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 21:27:25 +0200
Subject: [PATCH 23/37] python310Packages.dvclive: 2.11.0 -> 2.11.1

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

diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index 266c2b409de5..d3abd709e93c 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "dvclive";
-  version = "2.11.0";
+  version = "2.11.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-dV6ob+TXzQOuHU9bybAO8sVmrJ7yP8vwp0pXXFVNb34=";
+    hash = "sha256-zr8fLRwan1/G8RMHa6lf4Qa5fTh5DzVLO53PMW0fm4c=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 06fbea9a570d6d04f5e06c8d2abc8259816dfa8a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 21:28:12 +0200
Subject: [PATCH 24/37] python311Packages.emoji: 2.4.0 -> 2.5.0

Diff: https://github.com/carpedm20/emoji/compare/refs/tags/v2.4.0...v2.5.0

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

diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix
index a08d6696edd6..a3d7d7179606 100644
--- a/pkgs/development/python-modules/emoji/default.nix
+++ b/pkgs/development/python-modules/emoji/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "emoji";
-  version = "2.4.0";
+  version = "2.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "carpedm20";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-tbNatosXt+KV1K3bvdz8lY73Yx/ClJcxUWHiPetp5wM=";
+    hash = "sha256-S2gU16kO8QVdhgjsfIeuv0ypcYSjWOFaVFGJdQsdijg=";
   };
 
   nativeCheckInputs = [

From 6e1dfa189ff72cd3f0b146eb25ccb2a0d8f4c809 Mon Sep 17 00:00:00 2001
From: Jan Solanti <jhs@psonet.com>
Date: Thu, 8 Jun 2023 22:34:58 +0300
Subject: [PATCH 25/37] unscii: 1.1 -> 2.1

Old domain appears to be parked, update URLs to new domain that is also
linked from GitHub.
---
 pkgs/data/fonts/unscii/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix
index 5b4d2cb740fa..1b723cd313da 100644
--- a/pkgs/data/fonts/unscii/default.nix
+++ b/pkgs/data/fonts/unscii/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "unscii";
-  version = "1.1";
+  version = "2.1";
 
   src = fetchurl {
-    url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz";
-    sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
+    url = "http://viznut.fi/${pname}/${pname}-${version}-src.tar.gz";
+    sha256 = "0msvqrq7x36p76a2n5bzkadh95z954ayqa08wxd017g4jpa1a4jd";
   };
 
   nativeBuildInputs =
@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
     # version. The reduced version is public domain.
     license = "http://unifoundry.com/LICENSE.txt";
     maintainers = [ lib.maintainers.raskin ];
-    homepage = "http://pelulamu.net/unscii/";
+    homepage = "http://viznut.fi/unscii/";
   };
 }

From 0ccec0e6e7dd183a046810de6549ed6bd46b81d3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 22:36:14 +0200
Subject: [PATCH 26/37] python311Packages.mwparserfromhell: remove
 pytest-runner

- add changelog to meta
---
 .../mwparserfromhell/default.nix               | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix
index ea4019b2afeb..453ff24ef7bf 100644
--- a/pkgs/development/python-modules/mwparserfromhell/default.nix
+++ b/pkgs/development/python-modules/mwparserfromhell/default.nix
@@ -2,26 +2,38 @@
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
-, pytest-runner
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "mwparserfromhell";
   version = "0.6.4";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-kr7JUorjTScok8yvK1J9+FwxT/KM+7MFY0BGewldg0w=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace '"pytest-runner"' ""
+  '';
+
   nativeCheckInputs = [
     pytestCheckHook
-    pytest-runner
+  ];
+
+  pythonImportsCheck = [
+    "mwparserfromhell"
   ];
 
   meta = with lib; {
     description = "MWParserFromHell is a parser for MediaWiki wikicode";
-    homepage = "https://mwparserfromhell.readthedocs.io/en/latest/";
+    homepage = "https://mwparserfromhell.readthedocs.io/";
+    changelog = "https://github.com/earwig/mwparserfromhell/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ melling ];
   };

From 3d0614dda65a67adeb82b4a6293d3e253245f816 Mon Sep 17 00:00:00 2001
From: rogarb <rogarb@rgarbage.fr>
Date: Mon, 5 Jun 2023 10:53:11 +0200
Subject: [PATCH 27/37] genesys: init at 1.0.7

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

diff --git a/pkgs/applications/misc/genesys/default.nix b/pkgs/applications/misc/genesys/default.nix
new file mode 100644
index 000000000000..b7d8c3796dda
--- /dev/null
+++ b/pkgs/applications/misc/genesys/default.nix
@@ -0,0 +1,38 @@
+{ lib, stdenv, fetchurl, jre, graphviz, makeWrapper }:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "genesys";
+  version = "1.0.7";
+
+  src = fetchurl {
+    url = "https://github.com/mrlem/genesys/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    hash = "sha256-I1lEVvwRiGf1f4zUtqKhSb+it/nC8WAmw5S6edquOj8=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  # The package is distributed as a prebuilt JAVA binary
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    mv bin lib $out
+    wrapProgram $out/bin/${finalAttrs.pname} \
+      --set JAVA_HOME "${jre.home}" \
+      --prefix PATH : "${graphviz}/bin"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "A simple family tree generator that scales";
+    homepage = "https://github.com/mrlem/genesys";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ rogarb ];
+    platforms = lib.platforms.all;
+  };
+})
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9edab5482655..a0350716a628 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31117,6 +31117,8 @@ with pkgs;
 
   svox = callPackage ../applications/audio/svox { };
 
+  genesys = callPackage ../applications/misc/genesys { };
+
   giada = callPackage ../applications/audio/giada { };
 
   giara = callPackage ../applications/networking/giara { };

From be26319236597cf5538f2afe397cdaf628206d8b Mon Sep 17 00:00:00 2001
From: 0x120581f <git@0x120581f.com>
Date: Fri, 14 Apr 2023 17:36:19 +0200
Subject: [PATCH 28/37] xcodes: init at 1.3.0

---
 maintainers/maintainer-list.nix           |  6 ++++
 pkgs/development/tools/xcodes/default.nix | 40 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 3 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/tools/xcodes/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a4ce78e7ce41..b0395c42dcd9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -64,6 +64,12 @@
     githubId = 64707304;
     name = "Dmitry Kulikov";
   };
+  _0x120581f = {
+    email = "nixpkgs@0x120581f.dev";
+    name = "0x120581f";
+    github = "0x120581f";
+    githubId = 130835755;
+  };
   _0x4A6F = {
     email = "mail-maintainer@0x4A6F.dev";
     matrix = "@0x4a6f:matrix.org";
diff --git a/pkgs/development/tools/xcodes/default.nix b/pkgs/development/tools/xcodes/default.nix
new file mode 100644
index 000000000000..0309e29cae6b
--- /dev/null
+++ b/pkgs/development/tools/xcodes/default.nix
@@ -0,0 +1,40 @@
+{ lib, stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xcodes";
+  version = "1.3.0";
+
+  src = fetchurl {
+    url = "https://github.com/XcodesOrg/xcodes/releases/download/${finalAttrs.version}/xcodes.zip";
+    hash = "sha256:0cqb0gfb80xrnm4fipr46kbzqz2kicc13afhdxkbifzm4k83any5";
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  unpackPhase = ''
+    runHook preUnpack
+    unzip -q $src
+    runHook postUnpack
+  '';
+
+  dontPatch = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    install -m755 xcodes $out/bin/xcodes
+    runHook postInstall
+  '';
+
+  dontFixup = true;
+
+  meta = with lib; {
+    description = "Command-line tool to install and switch between multiple versions of Xcode";
+    homepage = "https://github.com/XcodesOrg/xcodes";
+    license = licenses.mit;
+    maintainers = with maintainers; [ _0x120581f ];
+    platforms = platforms.darwin;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f17922c71f5..b4bef7c661be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3763,6 +3763,8 @@ with pkgs;
 
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
+  xcodes = callPackage ../development/tools/xcodes { };
+
   gomobile = callPackage ../development/mobile/gomobile { };
 
   ssh-agents = callPackage ../tools/networking/ssh-agents { };

From 282edfca5bf6ed426a7333907ae139271511a04a Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Fri, 9 Jun 2023 08:15:06 +1000
Subject: [PATCH 29/37] browserpass: autopatchelf only on linux

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

diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
index ee774172f912..96eea7c1e22f 100644
--- a/pkgs/tools/security/browserpass/default.nix
+++ b/pkgs/tools/security/browserpass/default.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
     sha256 = "sha256-UZzOPRRiCUIG7uSSp9AEPMDN/+4cgyK47RhrI8oUx8U=";
   };
 
-  nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
+  nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
 
   vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0=";
 

From 61c98374255d4604fc99e124cc68b3559117b7bf Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Thu, 8 Jun 2023 06:38:43 +1000
Subject: [PATCH 30/37] browserpass: add testVersion

---
 pkgs/tools/security/browserpass/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
index 96eea7c1e22f..73c40a718c28 100644
--- a/pkgs/tools/security/browserpass/default.nix
+++ b/pkgs/tools/security/browserpass/default.nix
@@ -5,6 +5,8 @@
 , gnupg
 , makeWrapper
 , autoPatchelfHook
+, testers
+, browserpass
 }:
 
 buildGoModule rec {
@@ -56,6 +58,11 @@ buildGoModule rec {
     ln -s $out/lib/browserpass/hosts/firefox/*.json $out/lib/mozilla/native-messaging-hosts
   '';
 
+  passthru.tests.version = testers.testVersion {
+    package = browserpass;
+    command = "browserpass --version";
+  };
+
   meta = with lib; {
     description = "Browserpass native client app";
     homepage = "https://github.com/browserpass/browserpass-native";

From bd4871d9d17d79b15d4823c03951a32434d7dd3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jun 2023 02:27:00 +0000
Subject: [PATCH 31/37] tshark: 4.0.5 -> 4.0.6

---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 347e2dac66ad..092c3d88950c 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -49,7 +49,7 @@
 assert withQt -> qt6 != null;
 
 let
-  version = "4.0.5";
+  version = "4.0.6";
   variant = if withQt then "qt" else "cli";
 in
 stdenv.mkDerivation {
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
     repo = "wireshark";
     owner = "wireshark";
     rev = "v${version}";
-    hash = "sha256-9U0V2oLVyzq+3HxvOuD8Uzj1tjoMtYBws43fn5RfGhQ=";
+    hash = "sha256-hQpnD1BWOdb1YuG2BaQI+q1EkkTF1Du/HezrYr/Fl7w=";
   };
 
   cmakeFlags = [

From 87564f7c75f0860eccde59c61d579be27f186255 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 9 Jun 2023 08:58:21 +0300
Subject: [PATCH 32/37] scid-vs-pc: 4.22 -> 4.24

---
 .../scid-vs-pc/0001-put-fonts-in-out.patch    | 77 -------------------
 pkgs/games/scid-vs-pc/default.nix             | 57 ++++----------
 pkgs/top-level/all-packages.nix               |  5 +-
 3 files changed, 14 insertions(+), 125 deletions(-)
 delete mode 100644 pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch

diff --git a/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch b/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch
deleted file mode 100644
index 63f31d7ef9e0..000000000000
--- a/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 7e99cf4ae3f38406133a4abf962527cd02416f8e Mon Sep 17 00:00:00 2001
-From: Sebastian Galkin <paraseba@gmail.com>
-Date: Wed, 20 Dec 2017 18:23:03 -0200
-Subject: [PATCH] put fonts in $out
-
----
- Makefile.conf | 22 ++++------------------
- configure     | 12 ------------
- 2 files changed, 4 insertions(+), 30 deletions(-)
-
-diff --git a/Makefile.conf b/Makefile.conf
-index e7f8de9..87f3fff 100644
---- a/Makefile.conf
-+++ b/Makefile.conf
-@@ -226,19 +226,11 @@ install_scid: all_scid
- 	fi
- 	install -m 755 -d $(SHAREDIR)/bitmaps
- 	cp -r ./bitmaps/* $(SHAREDIR)/bitmaps/
--	@if [ "`id -u`" -eq 0 ]; then \
--		install -m 755 -d $(FONTDIR); \
--		install -m 644 -p fonts/*.ttf $(FONTDIR); \
--	else \
--		install -m 755 -d ~/.fonts; \
--		install -m 644 -p fonts/*.ttf ~/.fonts; \
--	fi
-+	install -m 755 -d $(FONTDIR); \
-+	install -m 644 -p fonts/*.ttf $(FONTDIR); \
-+
- 	@if [ ! -z "`which fc-cache`" ]; then \
--		if [ "`id -u`" -eq 0 ]; then \
-- 			fc-cache -fv $(FONTDIR); \
--		else \
--			fc-cache -fv ~/.fonts; \
--		fi; \
-+ 		fc-cache -fv $(FONTDIR); \
- 	else \
- 		echo "Don't know how to setup truetype fonts (fc-cache not available)."; \
- 		echo "Please contact your system administrator."; \
-@@ -292,12 +284,6 @@ uninstall:
- 		for f in `ls fonts/*.ttf`; do \
- 			rm -f ~/.$$f; \
- 		done; \
--		if [ ! -z "`which fc-cache`" ]; then \
--			fc-cache -fv ~/.fonts; \
--		fi; \
--		if [ "`find ~/.fonts -type d -empty`" = "`ls -d ~/.fonts`" ]; then \
--			rmdir ~/.fonts; \
--		fi; \
- 	fi
- 
- clean:
-diff --git a/configure b/configure
-index 4599c77..8b09678 100755
---- a/configure
-+++ b/configure
-@@ -473,18 +473,6 @@ proc writeMakefile {{type ""}} {
-        exit 1
-     }
- 
--    if {[isDarwin]} {
--        set var(FONTDIR) /Library/Fonts/
--    } else {
--        # Just install fonts in to /usr irrespective of system prefix. /usr/local may not be active
--        set prefix /usr
--        if {![file isdirectory $prefix/share/fonts]} {
--            set var(FONTDIR) "~/.fonts"
--        } else {
--            set var(FONTDIR) $prefix/share/fonts/truetype/Scid
--        }
--    }
--
-     set line [gets $from]
-     while {1} {
-         set line [gets $from]
--- 
-2.15.1
-
diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix
index 63ffa4999e05..dc76a6149c9d 100644
--- a/pkgs/games/scid-vs-pc/default.nix
+++ b/pkgs/games/scid-vs-pc/default.nix
@@ -1,59 +1,28 @@
-{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }:
+{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, which, makeDesktopItem }:
 
 tcl.mkTclDerivation rec {
   pname = "scid-vs-pc";
-  version = "4.22";
+  version = "4.24";
 
   src = fetchurl {
     url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz";
-    sha256 = "sha256-PSHDPrfhJI/DyEVQLo8Ckargqf/iUG5PgvUbO/4WNJM=";
+    hash = "sha256-x4Ljn1vaXrue16kUofWAH2sDNYC8h3NvzFjffRo0EhA=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  postPatch = ''
+    substituteInPlace configure Makefile.conf \
+      --replace "~/.fonts" "$out/share/fonts/truetype/Scid" \
+      --replace "which fc-cache" "false"
+  '';
+
+  nativeBuildInputs = [ makeWrapper which ];
   buildInputs = [ tk libX11 zlib ];
 
-  prePatch = ''
-    sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \
-           -e '/^ *set libraryPath *{/a ${tcl}/lib ${tk}/lib' \
-           -e '/^ *set x11Path *{/a ${libX11}/lib/' \
-           configure
-
-    sed -i -e '/^ *set scidShareDir/s|\[file.*|"'"$out/share"'"|' \
-      tcl/config.tcl
-  '';
-
-  # configureFlags = [
-  #   "BINDIR=$(out)/bin"
-  #   "SHAREDIR=$(out)/share"
-  #   "FONTDIR=$(out)/fonts"
-  # ];
-
-  preConfigure = ''configureFlags="
-    BINDIR=$out/bin
-    SHAREDIR=$out/share
-    FONTDIR=$out/fonts"
-  '';
-
-  patches = [
-    ./0001-put-fonts-in-out.patch
+  configureFlags = [
+    "BINDIR=${placeholder "out"}/bin"
+    "SHAREDIR=${placeholder "out"}/share"
   ];
 
-  hardeningDisable = [ "format" ];
-
-  dontPatchShebangs = true;
-
-  # TODO: can this use tclWrapperArgs?
-  postFixup = ''
-    sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/scidpgn"
-    sed -i -e '1c#!${tk}/bin/wish' "$out/bin/sc_remote"
-    sed -i -e '1c#!'"$out"'/bin/tkscid' "$out/bin/scid"
-
-    for cmd in $out/bin/* ; do
-      wrapProgram "$cmd" \
-        --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
-    done
-  '';
-
   postInstall = ''
     mkdir -p $out/share/applications
     cp $desktopItem/share/applications/* $out/share/applications/
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f17922c71f5..2a0571868e99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37098,10 +37098,7 @@ with pkgs;
 
   scid = callPackage ../games/scid { };
 
-  scid-vs-pc = callPackage ../games/scid-vs-pc {
-    tcl = tcl-8_6;
-    tk = tk-8_6;
-  };
+  scid-vs-pc = callPackage ../games/scid-vs-pc { };
 
   scummvm = callPackage ../games/scummvm {
     stdenv = if (stdenv.isDarwin && stdenv.isAarch64) then llvmPackages_14.stdenv else stdenv;

From da20893f54d05d9a4f9f582a0d4bff3a0d557900 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 9 Jun 2023 08:30:38 +0200
Subject: [PATCH 33/37] python3Packages.torch-bin: remove useless patchelf

---
 pkgs/development/python-modules/torch/bin.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix
index ec8ec52b2430..3259f1fca185 100644
--- a/pkgs/development/python-modules/torch/bin.nix
+++ b/pkgs/development/python-modules/torch/bin.nix
@@ -38,10 +38,8 @@ in buildPythonPackage {
 
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
-  nativeBuildInputs = [
+  nativeBuildInputs = lib.optionals stdenv.isLinux [
     addOpenGLRunpath
-    patchelf
-  ] ++ lib.optionals stdenv.isLinux [
     autoPatchelfHook
     cudaPackages.autoAddOpenGLRunpathHook
   ];

From e87f290b64cc7f3cbce638762324668f91bdcbda Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Fri, 9 Jun 2023 09:10:34 +0200
Subject: [PATCH 34/37] frida-tools: use fetchPypi from top-level

---
 pkgs/tools/security/frida-tools/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/frida-tools/default.nix b/pkgs/tools/security/frida-tools/default.nix
index dc25d3c23532..bc970b850d91 100644
--- a/pkgs/tools/security/frida-tools/default.nix
+++ b/pkgs/tools/security/frida-tools/default.nix
@@ -1,15 +1,15 @@
-{ lib, python3 }:
+{ lib, fetchPypi, python3Packages }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "frida-tools";
   version = "12.1.2";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-9SlDyp1fLOzLqu6sxVqY2jwEzQjrnbzfQXIRoyviPJY=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = with python3Packages; [
     pygments
     prompt_toolkit
     colorama

From 1238441581e602fb60c56414934f014aae15f119 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jun 2023 10:09:47 +0200
Subject: [PATCH 35/37] python311Packages.elkm1-lib: 2.2.2 -> 2.2.3

Diff: https://github.com/gwww/elkm1/compare/refs/tags/2.2.2...2.2.3

Changelog: https://github.com/gwww/elkm1/blob/2.2.3/CHANGELOG.md
---
 pkgs/development/python-modules/elkm1-lib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix
index 0aa754d1c64c..83a7ddc2392c 100644
--- a/pkgs/development/python-modules/elkm1-lib/default.nix
+++ b/pkgs/development/python-modules/elkm1-lib/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "elkm1-lib";
-  version = "2.2.2";
+  version = "2.2.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "gwww";
     repo = "elkm1";
     rev = "refs/tags/${version}";
-    hash = "sha256-z/ltpypCGJ3ORHOlLjicKlqIoxqGzVt588OHmNO65bg=";
+    hash = "sha256-d676gLABChQn67E4q4koxwBRmurBWuFxSo/u+W5F8CI=";
   };
 
   nativeBuildInputs = [

From 0ac648164a79f99fa9f01b83bf7168df29d18ece Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jun 2023 10:19:39 +0200
Subject: [PATCH 36/37] python311Packages.pyschlage: 2023.5.0 -> 2023.6.0

Diff: https://github.com/dknowles2/pyschlage/compare/refs/tags/2023.5.0...2023.6.0

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

diff --git a/pkgs/development/python-modules/pyschlage/default.nix b/pkgs/development/python-modules/pyschlage/default.nix
index 89ab63b1b6cd..80920c5c9148 100644
--- a/pkgs/development/python-modules/pyschlage/default.nix
+++ b/pkgs/development/python-modules/pyschlage/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyschlage";
-  version = "2023.5.0";
+  version = "2023.6.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "dknowles2";
     repo = "pyschlage";
     rev = "refs/tags/${version}";
-    hash = "sha256-l9Xi1VffvobSjluParvQjCTsCMWvhSV975j1OVclBWw=";
+    hash = "sha256-ogYVk0Kvv595IlIa/qdV1lqlnW45IG29PX5EEaMaphw=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 652c71692236f4d24a692b43d343fc9ba5ae306a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 9 Jun 2023 14:42:58 +0300
Subject: [PATCH 37/37] frida-tools: fix eval

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

diff --git a/pkgs/tools/security/frida-tools/default.nix b/pkgs/tools/security/frida-tools/default.nix
index bc970b850d91..c38d4edbb6ab 100644
--- a/pkgs/tools/security/frida-tools/default.nix
+++ b/pkgs/tools/security/frida-tools/default.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3Packages; [
     pygments
-    prompt_toolkit
+    prompt-toolkit
     colorama
     frida-python
   ];