From 930b1f473b505e326843cc1e7d989661364a9921 Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Wed, 16 Nov 2022 14:14:31 +1100
Subject: [PATCH 01/83] maintainers: add hacker1024

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index aad541ad0c96..fa17859f2431 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5318,6 +5318,12 @@
       fingerprint = "F7D3 7890 228A 9074 40E1  FD48 46B9 228E 814A 2AAC";
     }];
   };
+  hacker1024 = {
+    name = "hacker1024";
+    email = "hacker1024@users.sourceforge.net";
+    github = "hacker1024";
+    githubId = 20849728;
+  };
   hagl = {
     email = "harald@glie.be";
     github = "hagl";

From 058eeda945ad8ad3e1022fd8a76cca79c74cf2cf Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 12 Feb 2023 22:18:29 +0100
Subject: [PATCH 02/83] source-and-tags: deprecate phases

---
 pkgs/misc/source-and-tags/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix
index 966a451c060c..6d0b93b2daca 100644
--- a/pkgs/misc/source-and-tags/default.nix
+++ b/pkgs/misc/source-and-tags/default.nix
@@ -12,13 +12,12 @@
   # tag command must create file named $TAG_FILE
   sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} :
     stdenv.mkDerivation {
-    phases = "unpackPhase buildPhase";
     inherit src srcDir tagSuffix;
     name = "${name}-source-with-tags";
     nativeBuildInputs = [ unzip ];
     # using separate tag directory so that you don't have to glob that much files when starting your editor
     # is this a good choice?
-    buildPhase =
+    installPhase =
       let createTags = lib.concatStringsSep "\n"
           (map (a: ''
             TAG_FILE="$SRC_DEST/${a.name}$tagSuffix"

From e7ef329b7bf9d4f8b7302a031a21572ffacd5b1d Mon Sep 17 00:00:00 2001
From: ralismark <13449732+ralismark@users.noreply.github.com>
Date: Tue, 2 May 2023 15:30:05 +1000
Subject: [PATCH 03/83] csvkit: add setuptools to propagatedBuildInputs

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

diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix
index 96383fa87f9e..31f680966c1b 100644
--- a/pkgs/tools/text/csvkit/default.nix
+++ b/pkgs/tools/text/csvkit/default.nix
@@ -38,6 +38,7 @@ python.pkgs.buildPythonApplication rec {
     agate-excel
     agate-dbf
     agate-sql
+    setuptools # csvsql imports pkg_resources
   ];
 
   nativeCheckInputs = with python.pkgs; [

From 08bbf66c31e4c138c881be2188d977dd6c543b06 Mon Sep 17 00:00:00 2001
From: leo60228 <leo@60228.dev>
Date: Fri, 2 Jun 2023 16:38:19 -0400
Subject: [PATCH 04/83] fusee-nano: init at unstable-2023-05-17

---
 pkgs/development/tools/fusee-nano/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/tools/fusee-nano/default.nix

diff --git a/pkgs/development/tools/fusee-nano/default.nix b/pkgs/development/tools/fusee-nano/default.nix
new file mode 100644
index 000000000000..e1c552002619
--- /dev/null
+++ b/pkgs/development/tools/fusee-nano/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, unixtools }:
+
+stdenv.mkDerivation {
+  pname = "fusee-nano";
+  version = "unstable-2023-05-17";
+
+  src = fetchFromGitHub {
+    owner = "DavidBuchanan314";
+    repo = "fusee-nano";
+    rev = "2979d34f470d02f34594d8d59be1f5c7bf4bf73f";
+    hash = "sha256-RUG10wvhB0qEuiLwn8wk6Uxok+gv4bFLD6tbx0P0yDc=";
+  };
+
+  nativeBuildInputs = [ unixtools.xxd ];
+
+  makeFlags = [ "PREFIX=$(out)/bin" ];
+
+  meta = {
+    description = "A minimalist re-implementation of the Fusée Gelée exploit";
+    homepage = "https://github.com/DavidBuchanan314/fusee-nano";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.leo60228 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a119d3dad7d3..b96dc2bde720 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7810,6 +7810,8 @@ with pkgs;
 
   fusee-launcher = callPackage ../development/tools/fusee-launcher { };
 
+  fusee-nano = callPackage ../development/tools/fusee-nano { };
+
   fverb = callPackage ../applications/audio/fverb { };
 
   fwknop = callPackage ../tools/security/fwknop {

From 17d3aa742213ecd3d1a6608eff7a7c01c3fd7eb2 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 9 Jun 2023 15:33:43 +0200
Subject: [PATCH 05/83] mariadb_104: 10.4.29 -> 10.4.30

https://mariadb.com/kb/en/mariadb-10-4-30-release-notes/
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index ee118b89b4ab..ee761d3cbec7 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -243,8 +243,8 @@ in
     # see https://mariadb.org/about/#maintenance-policy for EOLs
     mariadb_104 = self.callPackage generic {
       # Supported until 2024-06-18
-      version = "10.4.29";
-      hash = "sha256-Wy0zh5LnnmjWpUXisVYDu792GMc55fgg9XsdayIJITA=";
+      version = "10.4.30";
+      hash = "sha256-/LvaZxxseEwDFQJiYj8NgYlMkRUz58PCdvJW8voSEAw=";
       inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };

From 04e9ffc0bc4a87da33ec324fe8422e4dfd361e07 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 9 Jun 2023 15:34:08 +0200
Subject: [PATCH 06/83] mariadb_105: 10.5.20 -> 10.5.21

https://mariadb.com/kb/en/mariadb-10-5-21-release-notes/
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index ee761d3cbec7..eaf73a8ef85a 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -250,8 +250,8 @@ in
     };
     mariadb_105 = self.callPackage generic {
       # Supported until 2025-06-24
-      version = "10.5.20";
-      hash = "sha256-sY+Q8NAR74e71VmtBDLN4Qfs21jqKCcQg7SJvf0e79s=";
+      version = "10.5.21";
+      hash = "sha256-yn63Mo4cAunZCxPfNpW3+ni9c92ZykniPjLWzImCIkI=";
       inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };

From 2278f07723f0d30767a4b27f7afd0ac3ab46a8bf Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 9 Jun 2023 15:34:33 +0200
Subject: [PATCH 07/83] mariadb_106: 10.6.13 -> 10.6.14

https://mariadb.com/kb/en/mariadb-10-6-14-release-notes/
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index eaf73a8ef85a..419dffc6f227 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -257,8 +257,8 @@ in
     };
     mariadb_106 = self.callPackage generic {
       # Supported until 2026-07-06
-      version = "10.6.13";
-      hash = "sha256-8IXzec9Z7S02VkT8XNhVj4gqiG7JZAcNZaKFMN27dbo=";
+      version = "10.6.14";
+      hash = "sha256-RQQ3x0qORMdrPAs0O5NH65AyAVRYUVZdeNmmJGdqsgI=";
       inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };

From 78e4cc189e3ac134339d72c1b940ee3d7368c596 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 9 Jun 2023 15:34:53 +0200
Subject: [PATCH 08/83] mariadb_1010: 10.10.4 -> 10.10.5

https://mariadb.com/kb/en/mariadb-10-10-5-release-notes/
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 419dffc6f227..9b4009848eda 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -264,8 +264,8 @@ in
     };
     mariadb_1010 = self.callPackage generic {
       # Supported until 2023-11-17. TODO: remove ahead of 23.11 branchoff
-      version = "10.10.4";
-      hash = "sha256-IX2Z47Ami5MizyicGEMnqHiYs/aGvS6eS5JpXqYRixk=";
+      version = "10.10.5";
+      hash = "sha256-kc1NQm04rwmFLr2vAOdCEXdexsyQf3TBruDUXN9dmWs=";
       inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };

From ed5a9f057427eda4c393f209431017bddc62a654 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 9 Jun 2023 15:35:12 +0200
Subject: [PATCH 09/83] mariadb_1011: 10.11.3 -> 10.11.4

https://mariadb.com/kb/en/mariadb-10-11-4-release-notes/
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 9b4009848eda..5bb26a679e62 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -271,8 +271,8 @@ in
     };
     mariadb_1011 = self.callPackage generic {
       # Supported until 2028-02-16
-      version = "10.11.3";
-      hash = "sha256-sGWw8ypun9R55Wb9ZnFFA3mIbY3aLZp++TCvHlwmwMc=";
+      version = "10.11.4";
+      hash = "sha256-zo2sElVozF9A2nTBchJ2fJLY+u2BBmWAtSakhaWREn0=";
       inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };

From 2983baa4e7b742bee16b41632d65109340261550 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jun 2023 14:50:37 +0200
Subject: [PATCH 10/83] zlib-ng: 2.0.7 -> 2.1.2

---
 pkgs/development/libraries/zlib-ng/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/development/libraries/zlib-ng/default.nix
index 482aa11d0b1b..ac314b754513 100644
--- a/pkgs/development/libraries/zlib-ng/default.nix
+++ b/pkgs/development/libraries/zlib-ng/default.nix
@@ -1,22 +1,29 @@
-{ lib, stdenv, fetchFromGitHub
-, cmake, pkg-config
+{ lib, stdenv, fetchFromGitHub, fetchpatch
+, cmake, pkg-config, gtest
 , withZlibCompat ? false
 }:
 
 stdenv.mkDerivation rec {
   pname = "zlib-ng";
-  version = "2.0.7";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "zlib-ng";
     repo = "zlib-ng";
     rev = version;
-    sha256 = "sha256-Q+u71XXfHafmTL8tmk4XcgpbSdBIunveL9Q78LqiZF0=";
+    sha256 = "sha256-6IEH9IQsBiNwfAZAemmP0/p6CTOzxEKyekciuH6pLhw=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/zlib-ng/zlib-ng/pull/1519.patch";
+      hash = "sha256-itobS8kJ2Hj3RfjslVkvEVdQ4t5eeIrsA9muRZt03pE=";
+    })
+  ];
+
   outputs = [ "out" "dev" "bin" ];
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [ cmake pkg-config gtest ];
 
   cmakeFlags = [
     "-DCMAKE_INSTALL_PREFIX=/"

From 0fe7fee623de691acff1db0178de01e39a22319d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jun 2023 14:54:08 +0200
Subject: [PATCH 11/83] minizip-ng: 3.0.10 -> 4.0.0

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

diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix
index 9f76e213c56f..9be33beff60e 100644
--- a/pkgs/development/libraries/minizip-ng/default.nix
+++ b/pkgs/development/libraries/minizip-ng/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "minizip-ng";
-  version = "3.0.10";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "zlib-ng";
     repo = finalAttrs.pname;
     rev = finalAttrs.version;
-    sha256 = "sha256-ynYAWF570S6MpD1WXbUC3cu+chL3+AhsMHr15l+LYVg=";
+    sha256 = "sha256-YgBOsznV1JtnpLUJeqZ06zvdB3tNbOlFhhLd1pMJhEM=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From f58364c9f0f81e8e7d86e6dd6005bbdca15298dd Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 20 Jun 2023 09:42:07 -0400
Subject: [PATCH 12/83] go-thumbnailer: init at 0.1.0

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

diff --git a/pkgs/applications/misc/go-thumbnailer/default.nix b/pkgs/applications/misc/go-thumbnailer/default.nix
new file mode 100644
index 000000000000..99a8f5a510c0
--- /dev/null
+++ b/pkgs/applications/misc/go-thumbnailer/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, pkg-config
+, vips
+}:
+
+buildGoModule rec {
+  pname = "go-thumbnailer";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "donovanglover";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-sgd5kNnDXcSesGT+OignZ+APjNSxSP0Z60dr8cWO6sU=";
+  };
+
+  buildInputs = [
+    vips
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  vendorSha256 = "sha256-4zgsoExdhEqvycGerNVxZ6LnjeRRO+f6DhJdINR5ZyI=";
+
+  postInstall = ''
+    mkdir -p $out/share/thumbnailers
+    substituteAll ${./go.thumbnailer} $out/share/thumbnailers/go.thumbnailer
+  '';
+
+  meta = with lib; {
+    description = "A cover thumbnailer written in Go for performance and reliability";
+    homepage = "https://github.com/donovanglover/go-thumbnailer";
+    license = licenses.mit;
+    maintainers = with maintainers; [ donovanglover ];
+  };
+}
diff --git a/pkgs/applications/misc/go-thumbnailer/go.thumbnailer b/pkgs/applications/misc/go-thumbnailer/go.thumbnailer
new file mode 100644
index 000000000000..c105e0674d19
--- /dev/null
+++ b/pkgs/applications/misc/go-thumbnailer/go.thumbnailer
@@ -0,0 +1,3 @@
+[Thumbnailer Entry]
+Exec=@out@/bin/go-thumbnailer %s %i %o
+MimeType=inode/directory
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5282d4968775..e7bb42e9a858 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5163,6 +5163,8 @@ with pkgs;
 
   go-neb = callPackage ../applications/networking/instant-messengers/go-neb { };
 
+  go-thumbnailer = callPackage ../applications/misc/go-thumbnailer { };
+
   geckodriver = callPackage ../development/tools/geckodriver {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From 2123531f692387ce62ec9ec68058121b68e7e560 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 13 Jun 2023 17:55:23 +0200
Subject: [PATCH 13/83] kubo-migrator: add migration from 13 to 14

https://github.com/ipfs/fs-repo-migrations/releases/tag/fs-repo-13-to-14%2Fv1.0.0

This will be used to upgrade the Kubo repo when updating to Kubo 0.21.
---
 .../networking/kubo-migrator/all-migrations.nix             | 4 +++-
 pkgs/applications/networking/kubo-migrator/unwrapped.nix    | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix
index 08a9967de4a0..ecfddcf64915 100644
--- a/pkgs/applications/networking/kubo-migrator/all-migrations.nix
+++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix
@@ -36,8 +36,9 @@ let
   };
 
   # Concatenation of the latest repo version and the version of that migration
-  version = "13.1.0.0";
+  version = "14.1.0.0";
 
+  fs-repo-13-to-14 = fs-repo-common "fs-repo-13-to-14" "1.0.0";
   fs-repo-12-to-13 = fs-repo-common "fs-repo-12-to-13" "1.0.0";
   fs-repo-11-to-12 = fs-repo-common "fs-repo-11-to-12" "1.0.2";
   fs-repo-10-to-11 = fs-repo-common "fs-repo-10-to-11" "1.0.1";
@@ -53,6 +54,7 @@ let
   fs-repo-0-to-1   = fs-repo-common "fs-repo-0-to-1"   "1.0.1";
 
   all-migrations = [
+    fs-repo-13-to-14
     fs-repo-12-to-13
     fs-repo-11-to-12
     fs-repo-10-to-11
diff --git a/pkgs/applications/networking/kubo-migrator/unwrapped.nix b/pkgs/applications/networking/kubo-migrator/unwrapped.nix
index dcf206d5c8aa..b5531851641a 100644
--- a/pkgs/applications/networking/kubo-migrator/unwrapped.nix
+++ b/pkgs/applications/networking/kubo-migrator/unwrapped.nix
@@ -11,12 +11,12 @@ buildGoModule rec {
     owner = "ipfs";
     repo = "fs-repo-migrations";
     # Use the latest git tag here, since v2.0.2 does not
-    # contain the latest migration fs-repo-11-to-12/v1.0.2
+    # contain the latest migration fs-repo-13-to-14/v1.0.0
     # The fs-repo-migrations code itself is the same between
     # the two versions but the migration code, which is built
     # into separate binaries, is not.
-    rev = "fs-repo-12-to-13/v1.0.0";
-    hash = "sha256-QQone7E2Be+jVfnrwqQ1Ny4jo6mSDHhaY3ErkNdn2f8=";
+    rev = "fs-repo-13-to-14/v1.0.0";
+    hash = "sha256-y0IYSKKZlFbPrTUC6XqYKhS3a79rieNGBL58teWMlC4=";
   };
 
   sourceRoot = "source/fs-repo-migrations";

From 3254fd4715b4c5f8dc2c746f091bb03edcaf6486 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 27 Jun 2023 19:36:52 -0400
Subject: [PATCH 14/83] tui-journal: init at 0.2.0

https://github.com/AmmarAbouZor/tui-journal
---
 .../applications/misc/tui-journal/default.nix | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/misc/tui-journal/default.nix

diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix
new file mode 100644
index 000000000000..f1d5e059d45d
--- /dev/null
+++ b/pkgs/applications/misc/tui-journal/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, libgit2
+, openssl
+, zlib
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tui-journal";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "AmmarAbouZor";
+    repo = "tui-journal";
+    rev = "v${version}";
+    hash = "sha256-B3GxxkFT2Z7WtV9RSmtKBjvzRRqmcoukUKc6LUZ/JyM=";
+  };
+
+  cargoHash = "sha256-DCKW8eGLSTx9U7mkGruPphzFpDlpL8ULCOKhj6HJwhw=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libgit2
+    openssl
+    zlib
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  meta = with lib; {
+    description = "Your journal app if you live in a terminl";
+    homepage = "https://github.com/AmmarAbouZor/tui-journal";
+    changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5282d4968775..f07123440846 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13477,6 +13477,8 @@ with pkgs;
 
   tuhi = callPackage ../applications/misc/tuhi { };
 
+  tui-journal = callPackage ../applications/misc/tui-journal { };
+
   tuir = callPackage ../applications/misc/tuir { };
 
   tuifeed = callPackage ../applications/networking/feedreaders/tuifeed {

From 787bae5d715374e50a52950ffb5b3b4e2b03bcb1 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 27 Jun 2023 18:32:45 -0400
Subject: [PATCH 15/83] python310Packages.mplhep-data: init at 0.0.3

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

diff --git a/pkgs/development/python-modules/mplhep-data/default.nix b/pkgs/development/python-modules/mplhep-data/default.nix
new file mode 100644
index 000000000000..12ec813f12b9
--- /dev/null
+++ b/pkgs/development/python-modules/mplhep-data/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "mplhep-data";
+  version = "0.0.3";
+  format = "pyproject";
+
+  src = fetchPypi {
+    pname = "mplhep_data";
+    inherit version;
+    hash = "sha256-tU0lfz9TyTpELNp6ZoHOJnJ34JFzwLQf14gg94Mhdy8=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
+  pythonImportsCheck = [
+    "mplhep_data"
+  ];
+
+  meta = with lib; {
+    description = "Sub-package to hold data (fonts) for mplhep";
+    homepage = "https://github.com/scikit-hep/mplhep_data";
+    license = with licenses; [ mit gfl ofl ];
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 64c10db8a897..fe7d2833bd3b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6494,6 +6494,8 @@ self: super: with self; {
 
   mplfinance = callPackage ../development/python-modules/mplfinance { };
 
+  mplhep_data = callPackage ../development/python-modules/mplhep_data { };
+
   mplleaflet = callPackage ../development/python-modules/mplleaflet { };
 
   mpmath = callPackage ../development/python-modules/mpmath { };

From 0344bcbcf43eabcbcd20b8691eb5c139c79772ef Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Tue, 27 Jun 2023 19:18:50 -0700
Subject: [PATCH 16/83] gcc: deduplicate boilerplate

This commit deduplicates libgcc-related boilerplate which appears in
every version of our gcc expression, by moving it into libgcc.nix.

I will be submitting a separate PR which changes this boilerplate,
but that PR will be much easier to review if I can make the change
in just one place.

Meanwhile, *this* commit has no effect on eval:

$ for A in 10  11  12  13  4.8  4.9  6  7  8  9; do nix-instantiate . -A gcc$(echo $A | tr -d .); done 2>/dev/null | sort | tee before
/nix/store/1a37lnzpnz0dhm3lphiy2gcdrxgqa7ma-gcc-wrapper-4.8.5.drv
/nix/store/5szdivc8il0c3g94dq4wqnq5j77a9h6p-gcc-wrapper-11.4.0.drv
/nix/store/bmmc717wmnp1j2xkd3if5dfxicnflvn5-gcc-wrapper-7.5.0.drv
/nix/store/fc1ggpixv3wqcazchhl2hnn5zl5ds30l-gcc-wrapper-13.1.0.drv
/nix/store/j9c2b20w35r3ag5nxmklhagbwsgjhds2-gcc-wrapper-4.9.4.drv
/nix/store/nq7q57bxmsk2g457wr4b9449as3f216w-gcc-wrapper-12.3.0.drv
/nix/store/sqmkkfapzykapcs4azvxm83n786ga7q1-gcc-wrapper-10.4.0.drv
/nix/store/vxnz30i23mkl4ldsq485kxn7q0p2y4nf-gcc-wrapper-8.5.0.drv
/nix/store/yfhv0bv15cg5kj2xsb9fcgb6pdlw42v0-gcc-wrapper-6.5.0.drv
/nix/store/yi5gr75pb6kddnll10jg25hhndhkba7s-gcc-wrapper-9.5.0.drv

$ for A in 10  11  12  13  4.8  4.9  6  7  8  9; do nix-instantiate . -A gcc$(echo $A | tr -d .); done | sort | tee after
/nix/store/1a37lnzpnz0dhm3lphiy2gcdrxgqa7ma-gcc-wrapper-4.8.5.drv
/nix/store/5szdivc8il0c3g94dq4wqnq5j77a9h6p-gcc-wrapper-11.4.0.drv
/nix/store/bmmc717wmnp1j2xkd3if5dfxicnflvn5-gcc-wrapper-7.5.0.drv
/nix/store/fc1ggpixv3wqcazchhl2hnn5zl5ds30l-gcc-wrapper-13.1.0.drv
/nix/store/j9c2b20w35r3ag5nxmklhagbwsgjhds2-gcc-wrapper-4.9.4.drv
/nix/store/nq7q57bxmsk2g457wr4b9449as3f216w-gcc-wrapper-12.3.0.drv
/nix/store/sqmkkfapzykapcs4azvxm83n786ga7q1-gcc-wrapper-10.4.0.drv
/nix/store/vxnz30i23mkl4ldsq485kxn7q0p2y4nf-gcc-wrapper-8.5.0.drv
/nix/store/yfhv0bv15cg5kj2xsb9fcgb6pdlw42v0-gcc-wrapper-6.5.0.drv
/nix/store/yi5gr75pb6kddnll10jg25hhndhkba7s-gcc-wrapper-9.5.0.drv

$ diff -u after before
$
---
 pkgs/development/compilers/gcc/10/default.nix | 13 ++++---
 pkgs/development/compilers/gcc/11/default.nix |  7 +---
 pkgs/development/compilers/gcc/12/default.nix |  7 +---
 pkgs/development/compilers/gcc/13/default.nix |  7 +---
 .../development/compilers/gcc/4.8/default.nix | 13 ++++---
 .../development/compilers/gcc/4.9/default.nix | 13 ++++---
 pkgs/development/compilers/gcc/6/default.nix  | 13 ++++---
 pkgs/development/compilers/gcc/7/default.nix  | 13 ++++---
 pkgs/development/compilers/gcc/8/default.nix  | 13 ++++---
 pkgs/development/compilers/gcc/9/default.nix  | 10 +++---
 .../compilers/gcc/common/libgcc.nix           | 34 +++++++++++++++++--
 11 files changed, 75 insertions(+), 68 deletions(-)

diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix
index eef6ebc68331..c1f6f061f8cd 100644
--- a/pkgs/development/compilers/gcc/10/default.nix
+++ b/pkgs/development/compilers/gcc/10/default.nix
@@ -27,6 +27,7 @@
 , cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
 , buildPackages
 , libxcrypt
+, callPackage
 }:
 
 # Make sure we get GNU sed.
@@ -143,7 +144,7 @@ let majorVersion = "10";
 
 in
 
-stdenv.mkDerivation ({
+lib.pipe (stdenv.mkDerivation ({
   pname = "${crossNameAddon}${name}";
   inherit version;
 
@@ -291,10 +292,8 @@ stdenv.mkDerivation ({
 
 }
 
-// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
-  makeFlags = [ "all-gcc" "all-target-libgcc" ];
-  installTargets = "install-gcc install-target-libgcc";
-}
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
-)
+))
+[
+  (callPackage ../common/libgcc.nix   { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
+]
diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix
index f981d1ecbe79..47662d5002c4 100644
--- a/pkgs/development/compilers/gcc/11/default.nix
+++ b/pkgs/development/compilers/gcc/11/default.nix
@@ -304,14 +304,9 @@ lib.pipe (stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
-  makeFlags = [ "all-gcc" "all-target-libgcc" ];
-  installTargets = "install-gcc install-target-libgcc";
-}
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 ))
 [
-  (callPackage ../common/libgcc.nix   { inherit langC langCC langJit; })
+  (callPackage ../common/libgcc.nix   { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
   (callPackage ../common/checksum.nix { inherit langC langCC; })
 ]
diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix
index b816c554fa39..e3ad55ae90ca 100644
--- a/pkgs/development/compilers/gcc/12/default.nix
+++ b/pkgs/development/compilers/gcc/12/default.nix
@@ -350,15 +350,10 @@ lib.pipe (stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
-  makeFlags = [ "all-gcc" "all-target-libgcc" ];
-  installTargets = "install-gcc install-target-libgcc";
-}
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 ))
 [
-  (callPackage ../common/libgcc.nix   { inherit langC langCC langJit; })
+  (callPackage ../common/libgcc.nix   { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
   (callPackage ../common/checksum.nix { inherit langC langCC; })
 ]
 
diff --git a/pkgs/development/compilers/gcc/13/default.nix b/pkgs/development/compilers/gcc/13/default.nix
index 73b6fb968636..b6f83f2662bf 100644
--- a/pkgs/development/compilers/gcc/13/default.nix
+++ b/pkgs/development/compilers/gcc/13/default.nix
@@ -344,15 +344,10 @@ lib.pipe (stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
-  makeFlags = [ "all-gcc" "all-target-libgcc" ];
-  installTargets = "install-gcc install-target-libgcc";
-}
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 ))
 [
-  (callPackage ../common/libgcc.nix   { inherit langC langCC langJit; })
+  (callPackage ../common/libgcc.nix   { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
   (callPackage ../common/checksum.nix { inherit langC langCC; })
 ]
 
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 2f03b838e76e..27fa2160c129 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -29,6 +29,7 @@
 , crossStageStatic ? false
 , gnused ? null
 , buildPackages
+, callPackage
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -192,7 +193,7 @@ in
 # We need all these X libraries when building AWT with GTK.
 assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
 
-stdenv.mkDerivation ({
+lib.pipe (stdenv.mkDerivation ({
   pname = "${crossNameAddon}${name}";
   inherit version;
 
@@ -319,10 +320,8 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
-  makeFlags = [ "all-gcc" "all-target-libgcc" ];
-  installTargets = "install-gcc install-target-libgcc";
-}
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
-)
+))
+[
+  (callPackage ../common/libgcc.nix   { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
+]
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 768988e210b7..2477f53b9caa 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -29,6 +29,7 @@
 , crossStageStatic ? false
 , gnused ? null
 , buildPackages
+, callPackage
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -209,7 +210,7 @@ in
 # We need all these X libraries when building AWT with GTK.
 assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
 
-stdenv.mkDerivation ({
+lib.pipe (stdenv.mkDerivation ({
   pname = "${crossNameAddon}${name}";
   inherit version;
 
@@ -340,11 +341,6 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
-  makeFlags = [ "all-gcc" "all-target-libgcc" ];
-  installTargets = "install-gcc install-target-libgcc";
-}
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 
 // optionalAttrs (langJava) {
@@ -352,4 +348,7 @@ stdenv.mkDerivation ({
        target="$(echo "$out/libexec/gcc"/*/*/ecj*)"
        patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target"
      '';}
-)
+))
+[
+  (callPackage ../common/libgcc.nix   { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
+]
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index c5799060a1e2..61874359b2a3 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -33,6 +33,7 @@
 , gnused ? null
 , cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
 , buildPackages
+, callPackage
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -198,7 +199,7 @@ in
 # We need all these X libraries when building AWT with GTK.
 assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
 
-stdenv.mkDerivation ({
+lib.pipe (stdenv.mkDerivation ({
   pname = "${crossNameAddon}${name}";
   inherit version;
 
@@ -358,11 +359,6 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
-  makeFlags = [ "all-gcc" "all-target-libgcc" ];
-  installTargets = "install-gcc install-target-libgcc";
-}
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 
 // optionalAttrs (langJava && !stdenv.hostPlatform.isDarwin) {
@@ -370,4 +366,7 @@ stdenv.mkDerivation ({
        target="$(echo "$out/libexec/gcc"/*/*/ecj*)"
        patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target"
      '';}
-)
+))
+[
+  (callPackage ../common/libgcc.nix   { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
+]
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 3e8e52940e75..19010a578ac4 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -23,6 +23,7 @@
 , gnused ? null
 , cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
 , buildPackages
+, callPackage
 }:
 
 # Make sure we get GNU sed.
@@ -148,7 +149,7 @@ let majorVersion = "7";
 
 in
 
-stdenv.mkDerivation ({
+lib.pipe (stdenv.mkDerivation ({
   pname = "${crossNameAddon}${name}";
   inherit version;
 
@@ -298,10 +299,8 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
-  makeFlags = [ "all-gcc" "all-target-libgcc" ];
-  installTargets = "install-gcc install-target-libgcc";
-}
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
-)
+))
+[
+  (callPackage ../common/libgcc.nix   { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
+]
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 25c5475ee802..f06b60ba6df6 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -23,6 +23,7 @@
 , gnused ? null
 , cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
 , buildPackages
+, callPackage
 }:
 
 # Make sure we get GNU sed.
@@ -129,7 +130,7 @@ let majorVersion = "8";
 
 in
 
-stdenv.mkDerivation ({
+lib.pipe (stdenv.mkDerivation ({
   pname = "${crossNameAddon}${name}";
   inherit version;
 
@@ -273,10 +274,8 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
-  makeFlags = [ "all-gcc" "all-target-libgcc" ];
-  installTargets = "install-gcc install-target-libgcc";
-}
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
-)
+))
+[
+  (callPackage ../common/libgcc.nix   { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
+]
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index 53c98a0b7a88..d022349c73a1 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -26,6 +26,7 @@
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , buildPackages
+, callPackage
 }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
@@ -143,7 +144,7 @@ let majorVersion = "9";
 
 in
 
-stdenv.mkDerivation ({
+lib.pipe (stdenv.mkDerivation ({
   pname = "${crossNameAddon}${name}";
   inherit version;
 
@@ -287,10 +288,9 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
-  makeFlags = [ "all-gcc" "all-target-libgcc" ];
-  installTargets = "install-gcc install-target-libgcc";
-}
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
+) [
+  (callPackage ../common/libgcc.nix   { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
+]
diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix
index 422239262b75..2477a6811aa1 100644
--- a/pkgs/development/compilers/gcc/common/libgcc.nix
+++ b/pkgs/development/compilers/gcc/common/libgcc.nix
@@ -1,16 +1,43 @@
 { lib
 , stdenv
+, version
 , langC
 , langCC
 , langJit
+, targetPlatform
+, hostPlatform
+, crossStageStatic
 }:
 
-let
+drv: lib.pipe drv
+
+([
+
+  (pkg: pkg.overrideAttrs (previousAttrs:
+    lib.optionalAttrs (
+      targetPlatform != hostPlatform &&
+      targetPlatform.libc == "msvcrt" &&
+      crossStageStatic
+    ) {
+      makeFlags = [ "all-gcc" "all-target-libgcc" ];
+      installTargets = "install-gcc install-target-libgcc";
+    }))
+
+] ++
+
+# nixpkgs did not add the "libgcc" output until gcc11.  In theory
+# the following condition can be changed to `true`, but that has not
+# been tested.
+lib.optional (lib.versionAtLeast version "11.0")
+
+(let
   enableLibGccOutput =
     (with stdenv; targetPlatform == hostPlatform) &&
     !langJit &&
     !stdenv.hostPlatform.isDarwin &&
-    !stdenv.hostPlatform.isStatic;
+    !stdenv.hostPlatform.isStatic
+    ;
+
 in
 (pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) {
   outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];
@@ -97,4 +124,5 @@ in
     + ''
       patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.1
     '');
-}))
+}))))
+

From e4ed4bcef801b772320bf9593e5b9ab39c66e2d6 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Wed, 28 Jun 2023 06:24:39 +0000
Subject: [PATCH 17/83] lightwalletd: 0.4.10 -> 0.4.13

---
 pkgs/applications/blockchains/lightwalletd/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/blockchains/lightwalletd/default.nix b/pkgs/applications/blockchains/lightwalletd/default.nix
index 1cfd2071e867..9c86395da1d6 100644
--- a/pkgs/applications/blockchains/lightwalletd/default.nix
+++ b/pkgs/applications/blockchains/lightwalletd/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "lightwalletd";
-  version = "0.4.10";
+  version = "0.4.13";
 
   src = fetchFromGitHub {
     owner = "zcash";
     repo  = "lightwalletd";
-    rev = "68789356fb1a75f62735a529b38389ef08ea7582";
-    sha256 = "sha256-7gZhr6YMarGdgoGjg+oD4nZ/SAJ5cnhEDKmA4YMqJTo=";
+    rev = "v${version}";
+    hash = "sha256-oFP1VHDhbx95QLGcIraHjeKSnLfvagJg4bcd3Lem+s4=";
   };
 
-  vendorSha256 = null;
+  vendorHash = "sha256-RojAxNU5ggjTMPDF2BuB4NyuSRG6HMe3amYTjG2PRFc=";
 
   ldflags = [
     "-s" "-w"
@@ -38,6 +38,5 @@ buildGoModule rec {
     homepage = "https://github.com/zcash/lightwalletd";
     maintainers = with maintainers; [ centromere ];
     license = licenses.mit;
-    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 202e90dccd88601416bf6d153f5b2c69e4d8c998 Mon Sep 17 00:00:00 2001
From: Earth Engine <earthengine@skiff.com>
Date: Wed, 28 Jun 2023 08:29:58 +0000
Subject: [PATCH 18/83] sregex: init at 0.0.1

---
 pkgs/development/libraries/sregex/default.nix | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/sregex/default.nix

diff --git a/pkgs/development/libraries/sregex/default.nix b/pkgs/development/libraries/sregex/default.nix
new file mode 100644
index 000000000000..a964a8ffb296
--- /dev/null
+++ b/pkgs/development/libraries/sregex/default.nix
@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "sregex";
+  version = "0.0.1";
+
+  src = fetchFromGitHub {
+    owner = "openresty";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-HZ9O/3BQHHrTVLLlU0o1fLHxyRSesBhreT3IdGHnNsg=";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" "CC:=$(CC)" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/openresty/sregex";
+    description = "A non-backtracking NFA/DFA-based Perl-compatible regex engine matching on large data streams";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ earthengine ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9f04be006c9..9403a0ab0952 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24536,6 +24536,8 @@ with pkgs;
 
   sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { };
 
+  sregex = callPackage ../development/libraries/sregex { };
+
   dqlite = callPackage ../development/libraries/dqlite { };
 
   sqlcipher = callPackage ../development/libraries/sqlcipher { };

From 56ac4b0400319195ce31a5dbdfebd5d9013a0ea9 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Wed, 28 Jun 2023 15:18:15 +0200
Subject: [PATCH 19/83] zeroad: fix build by using fmt_9

---
 pkgs/games/0ad/default.nix      | 4 ++--
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index 860db7c6d5ae..a97d9f4cda3a 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -1,9 +1,9 @@
-{ wxGTK, stdenv, newScope }:
+{ fmt, wxGTK, stdenv, newScope }:
 let
   callPackage = newScope self;
 
   self = {
-    zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK stdenv; };
+    zeroad-unwrapped = callPackage ./game.nix { inherit fmt wxGTK stdenv; };
 
     zeroad-data = callPackage ./data.nix { inherit stdenv; };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef522b1c3c33..09b639d45e74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37763,6 +37763,7 @@ with pkgs;
 
   zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad {
     wxGTK = wxGTK32;
+    fmt = fmt_9;
   });
 
   zeroad = zeroadPackages.zeroad;

From 560a07f5070b390103fbb3eb8ae12ed1b2955bf8 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 27 Jun 2023 18:33:16 -0400
Subject: [PATCH 20/83] python310Packages.mplhep: init at 0.3.28

---
 .../python-modules/mplhep/default.nix         | 63 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/mplhep/default.nix

diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix
new file mode 100644
index 000000000000..63a81c47e303
--- /dev/null
+++ b/pkgs/development/python-modules/mplhep/default.nix
@@ -0,0 +1,63 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, hist
+, matplotlib
+, mplhep-data
+, pytestCheckHook
+, pytest-mock
+, pytest-mpl
+, scipy
+, setuptools
+, setuptools-scm
+, uhi
+, uproot
+}:
+
+buildPythonPackage rec {
+  pname = "mplhep";
+  version = "0.3.28";
+  format = "pyproject";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-/7nfjIdlYoouDOI1vXdr9BSml5gpE0gad7ONAUmOCiE=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    matplotlib
+    uhi
+    mplhep-data
+  ];
+
+  nativeCheckInputs = [
+    hist
+    pytestCheckHook
+    pytest-mock
+    pytest-mpl
+    scipy
+    uproot
+  ];
+
+  disabledTests = [
+    # requires uproot4
+    "test_inputs_uproot"
+    "test_uproot_versions"
+  ];
+
+  pythonImportsCheck = [
+    "mplhep"
+  ];
+
+  meta = with lib; {
+    description = "Extended histogram plots on top of matplotlib and HEP compatible styling similar to current collaboration requirements (ROOT)";
+    homepage = "https://github.com/scikit-hep/mplhep";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fe7d2833bd3b..1db525e13086 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6494,7 +6494,9 @@ self: super: with self; {
 
   mplfinance = callPackage ../development/python-modules/mplfinance { };
 
-  mplhep_data = callPackage ../development/python-modules/mplhep_data { };
+  mplhep = callPackage ../development/python-modules/mplhep { };
+
+  mplhep-data = callPackage ../development/python-modules/mplhep-data { };
 
   mplleaflet = callPackage ../development/python-modules/mplleaflet { };
 

From 81a21160a29ce66d33bb1398e0cdd30800959c97 Mon Sep 17 00:00:00 2001
From: Mats <mats@mats.sh>
Date: Wed, 28 Jun 2023 17:05:30 +0200
Subject: [PATCH 21/83] linux-firmware: 20230515 -> 20230625

---
 pkgs/os-specific/linux/firmware/linux-firmware/source.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix
index e1d77a03200f..01ea40a5089a 100644
--- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix
+++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix
@@ -1,6 +1,6 @@
 # This file is autogenerated! Run ./update.sh to regenerate.
 {
-  version = "20230515";
-  sourceHash = "sha256-VcA873r9jVYqDqEcvz/PVGfCAhLXr0sMXQincWNLEIs=";
-  outputHash = "sha256-h3KDK3KiD88dvTvLlLL2XczY1ZeEVnYEzh9sqbo1dZ8=";
+  version = "20230625";
+  sourceHash = "sha256-olRaUVnCri/sJU6ob+QgNxEZF8GzVxxEh8zdNJIZlYY=";
+  outputHash = "sha256-zSlMpAPbW7ewEBzDre47/7NJyy2pC0GSbkyOVVi+4gU=";
 }

From 31dc62c3afd7cef1cd623345af9e774cf5c601d9 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 28 Jun 2023 11:19:17 -0400
Subject: [PATCH 22/83] snazy: 0.50.0 -> 0.51.2

Diff: https://github.com/chmouel/snazy/compare/0.50.0...0.51.2

Changelog: https://github.com/chmouel/snazy/releases/tag/0.51.2
---
 pkgs/development/tools/snazy/default.nix | 27 ++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix
index 4dbd230d563b..d7c5f4d7ceee 100644
--- a/pkgs/development/tools/snazy/default.nix
+++ b/pkgs/development/tools/snazy/default.nix
@@ -1,17 +1,32 @@
-{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, fetchpatch
+, installShellFiles
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "snazy";
-  version = "0.50.0";
+  version = "0.51.2";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = pname;
     rev = version;
-    sha256 = "sha256-wSRIJF2XPJvzmxuGbuPYPFgn9Eap3vqHT1CM/oQy8vM=";
+    hash = "sha256-k8dcALE5+5kqNKhmiLT0Ir8SRYOIp8eV3a/xYWrKpNw=";
   };
 
-  cargoSha256 = "sha256-IGZZEyy9IGqkpsbnOzLdBSFbinZ7jhH2LWub/+gP89E=";
+  cargoHash = "sha256-mBA2BhGeYR57UrqI1qtByTkTocMymjCWlWhh4+Ko8wY=";
+
+  cargoPatches = [
+    # update Cargo.toml to fix the version
+    # https://github.com/chmouel/snazy/pull/178
+    (fetchpatch {
+      name = "update-version-in-cargo-toml.patch";
+      url = "https://github.com/chmouel/snazy/commit/4fd92c7336f51d032a0baf60fd5ab8c1056ad14f.patch";
+      hash = "sha256-WT/HHB9HB+X/L5FZdvQAG8K7PrYHQD8F5aWQVaMJuIU=";
+    })
+  ];
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -31,13 +46,13 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/chmouel/snazy/";
-    changelog = "https://github.com/chmouel/snazy/releases/tag/v${version}";
     description = "A snazzy json log viewer";
     longDescription = ''
       Snazy is a simple tool to parse json logs and output them in a nice format
       with nice colors.
     '';
+    homepage = "https://github.com/chmouel/snazy/";
+    changelog = "https://github.com/chmouel/snazy/releases/tag/${src.rev}";
     license = licenses.asl20;
     maintainers = with maintainers; [ figsoda jk ];
   };

From 7b4b3ef3de9deb4a33a016aad4bc4f39737d720c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 28 Jun 2023 17:21:51 +0000
Subject: [PATCH 23/83] gfxreconstruct: 0.9.18 -> 1.0.0

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

diff --git a/pkgs/tools/graphics/gfxreconstruct/default.nix b/pkgs/tools/graphics/gfxreconstruct/default.nix
index 4004be69ffb0..4ec2a7a58a89 100644
--- a/pkgs/tools/graphics/gfxreconstruct/default.nix
+++ b/pkgs/tools/graphics/gfxreconstruct/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gfxreconstruct";
-  version = "0.9.18";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "LunarG";
     repo = "gfxreconstruct";
     rev = "v${version}";
-    hash = "sha256-9MDmeHid/faHeBjBfPgpRMjMMXZeHKP0VZZJtEQgBhs=";
+    hash = "sha256-dOmkNKURYgphbDHOmzcWf9PsIKMkPyN7ve579BE7fR0=";
     fetchSubmodules = true;
   };
 

From 92f46ec0df6546755f198c53ac0abdcf1bba771d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 28 Jun 2023 21:51:57 +0200
Subject: [PATCH 24/83] esphome: 2023.6.2 -> 2023.6.3

https://github.com/esphome/esphome/releases/tag/2023.6.3
---
 pkgs/tools/misc/esphome/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index e8dda315d9d9..cfddf0047b61 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -16,14 +16,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2023.6.2";
+  version = "2023.6.3";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-ne9Su7Tp0p1fWQ6ivvWPkdEskTZpqIjQvh26D3Ta4Sc=";
+    hash = "sha256-QI4Vt9JXKdvfCARwvPLaecP7vd157SL7ZJJ91HargV0=";
   };
 
   postPatch = ''

From f96adcdd7d6611b9d70ff7a38e3720dc24dff6bd Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 28 Jun 2023 01:39:58 +0200
Subject: [PATCH 25/83] python3Packages.tika-client: 0.1.1 -> 0.2.0

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

diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix
index e219fe342102..971143289693 100644
--- a/pkgs/development/python-modules/tika-client/default.nix
+++ b/pkgs/development/python-modules/tika-client/default.nix
@@ -7,7 +7,7 @@
 }:
 buildPythonPackage rec {
   pname = "tika-client";
-  version = "0.1.1";
+  version = "0.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "stumpylog";
     repo = "tika-client";
     rev = version;
-    hash = "sha256-QVNUOL0BWSxIkuKPWrKnWDupqn6bQ40G4Nd+ctb41Xw=";
+    hash = "sha256-ApKj+Lo3bG6bkgyYBwfY+4uodcGB/bupoGwZdSkizQE=";
   };
 
   propagatedBuildInputs = [

From 28cb82dd98197b7db21a9f02e274141a9bd6ecab Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 28 Jun 2023 01:40:24 +0200
Subject: [PATCH 26/83] paperless-ngx: 1.16.3 -> 1.16.5

---
 pkgs/applications/office/paperless-ngx/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix
index 1993a2895e36..97109efb8363 100644
--- a/pkgs/applications/office/paperless-ngx/default.nix
+++ b/pkgs/applications/office/paperless-ngx/default.nix
@@ -17,13 +17,13 @@
 }:
 
 let
-  version = "1.16.3";
+  version = "1.16.5";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DudTg7d92/9WwaPtr2PrvojcGxZ8z3Z2oYA0LcrkxZI=";
+    hash = "sha256-suwXFqq3QSdY0KzSpr6NKPwm6xtMBR8aP5VV3XTynqI=";
   };
 
   # Use specific package versions required by paperless-ngx
@@ -130,6 +130,7 @@ python.pkgs.buildPythonApplication rec {
     h11
     hiredis
     httptools
+    httpx
     humanfriendly
     humanize
     hyperlink

From d9d47f63b06a21717a80185f36710c2bcdb063b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 Jun 2023 00:02:05 +0000
Subject: [PATCH 27/83] oneDNN: 3.1.1 -> 3.2

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

diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix
index acbc7424846a..7eb656978e5f 100644
--- a/pkgs/development/libraries/oneDNN/default.nix
+++ b/pkgs/development/libraries/oneDNN/default.nix
@@ -5,13 +5,13 @@
 # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
 stdenv.mkDerivation rec {
   pname = "oneDNN";
-  version = "3.1.1";
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneDNN";
     rev = "v${version}";
-    sha256 = "sha256-02S9eG9eAUS7S59YtyaAany07A2V/Cu7Vto2IruDCtc=";
+    sha256 = "sha256-V+0NyQMa4pY9Rhw6bLuqTom0ps/+wm4mGfn1rTi+0YM=";
   };
 
   outputs = [ "out" "dev" "doc" ];

From 36af4adf9d7dbc862cdf4fc2dbab0295ac28da07 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Jun 2023 02:11:00 +0200
Subject: [PATCH 28/83] python310Packages.encodec: init at 0.1.1

EnCodec: High Fidelity Neural Audio Compression
---
 .../python-modules/encodec/default.nix        | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/encodec/default.nix

diff --git a/pkgs/development/python-modules/encodec/default.nix b/pkgs/development/python-modules/encodec/default.nix
new file mode 100644
index 000000000000..930878782f60
--- /dev/null
+++ b/pkgs/development/python-modules/encodec/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# dependencies
+, einops
+, numpy
+, torch-bin
+, torchaudio-bin
+}:
+
+buildPythonPackage rec {
+  pname = "encodec";
+  version = "0.1.1";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "facebookresearch";
+    repo = "encodec";
+    rev = "v${version}";
+    hash = "sha256-+iJZkX1HoyuNFu9VRxMO6aAzNQybkH9lrQJ5Ao9+/CY=";
+  };
+
+  propagatedBuildInputs = [
+    einops
+    numpy
+    torch-bin
+    torchaudio-bin
+  ];
+
+  pythonImportsCheck = [ "encodec" ];
+
+  # requires model data from the internet
+  doCheck = false;
+
+  meta = with lib; {
+    description = "State-of-the-art deep learning based audio codec supporting both mono 24 kHz audio and stereo 48 kHz audio";
+    homepage = "https://github.com/facebookresearch/encodec";
+    changelog = "https://github.com/facebookresearch/encodec/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71b66cd0b074..66df6cf075e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3260,6 +3260,8 @@ self: super: with self; {
 
   enamlx = callPackage ../development/python-modules/enamlx { };
 
+  encodec = callPackage ../development/python-modules/encodec { };
+
   energyflip-client = callPackage ../development/python-modules/energyflip-client { };
 
   energyflow = callPackage ../development/python-modules/energyflow { };

From cb39db1224796fd17a8e5ca12a0349166178377c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Jun 2023 03:14:39 +0200
Subject: [PATCH 29/83] python310Packages.wandb: disable timing sensitive test

wandb> ______________________________ test_login_timeout ______________________________
wandb> [gw3] linux -- Python 3.10.12 /nix/store/1r6n7v2wam7gkr18gxccpg7p5ywgw551-python3-3.10.12/bin/python3.10
wandb>
wandb> mock_tty = <function mock_tty.<locals>.setup_fn at 0x7ffe258248b0>
wandb>
wandb>     def test_login_timeout(mock_tty):
wandb>         mock_tty("junk\nmore\n")
wandb>         start_time = time.time()
wandb>         ret = wandb.login(timeout=4)
wandb>         elapsed = time.time() - start_time
wandb> >       assert 2 < elapsed < 15
wandb> E       assert 15.33935809135437 < 15
wandb>
wandb> /build/source/tests/pytest_tests/unit_tests/test_wandb_login.py:78: AssertionError
---
 pkgs/development/python-modules/wandb/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index aeeece5151a3..9ccb68067b72 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -256,9 +256,12 @@ buildPythonPackage rec {
     "tests/pytest_tests/unit_tests/test_lib/test_filesystem.py"
   ];
 
-  # Disable test that fails on darwin due to issue with python3Packages.psutil:
-  # https://github.com/giampaolo/psutil/issues/1219
-  disabledTests = lib.optionals stdenv.isDarwin [
+  disabledTests = [
+    # Timing sensitive
+    "test_login_timeout"
+  ] ++ lib.optionals stdenv.isDarwin [
+    # Disable test that fails on darwin due to issue with python3Packages.psutil:
+    # https://github.com/giampaolo/psutil/issues/1219
     "test_tpu_system_stats"
   ];
 

From cababbbc357f38b70578dcd701bbc49a758fd833 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Jun 2023 03:26:55 +0200
Subject: [PATCH 30/83] tts: 0.14.3 -> 0.15.0

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

diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix
index d4e5a68fa094..f4c1f568bb7f 100644
--- a/pkgs/tools/audio/tts/default.nix
+++ b/pkgs/tools/audio/tts/default.nix
@@ -15,14 +15,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "tts";
-  version = "0.14.3";
+  version = "0.15.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "coqui-ai";
     repo = "TTS";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4LojjH6ft9RfftBBFNWmC2pl/YXfgZCXhkZFsELTgCE=";
+    hash = "sha256-pu0MqNXNQfvxo2VHpiEYIz1OvplydCYPKU/NsZD0mJw=";
   };
 
   postPatch = let
@@ -60,6 +60,7 @@ python.pkgs.buildPythonApplication rec {
     bnunicodenormalizer
     coqpit
     einops
+    encodec
     flask
     fsspec
     g2pkk

From d40c08d8a121eafc67ad23abe5ffe3a6e5929d92 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Thu, 29 Jun 2023 02:22:59 +0000
Subject: [PATCH 31/83] humioctl: 0.30.2 -> 0.31.1

---
 .../applications/logging/humioctl/default.nix | 55 ++++++++-----------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix
index a1959b473dd0..c48631eefe31 100644
--- a/pkgs/applications/logging/humioctl/default.nix
+++ b/pkgs/applications/logging/humioctl/default.nix
@@ -1,39 +1,32 @@
 { buildGoModule, fetchFromGitHub, installShellFiles, lib }:
 
-let
-  humioCtlVersion = "0.30.2";
-  sha256 = "sha256-FqBS6PoEKMqK590f58re4ycYmrJScyij74Ngj+PLzLs=";
-  vendorSha256 = "sha256-70QxW2nn6PS6HZWllmQ8O39fbUcbe4c/nKAygLnD4n0=";
-in buildGoModule {
-    name = "humioctl-${humioCtlVersion}";
-    pname = "humioctl";
-    version = humioCtlVersion;
+buildGoModule rec {
+  pname = "humioctl";
+  version = "0.31.1";
 
-    vendorSha256 = vendorSha256;
+  src = fetchFromGitHub {
+    owner = "humio";
+    repo = "cli";
+    rev = "v${version}";
+    hash = "sha256-L5Ttos0TL8m62Y69riwnGmB1cOVF6XIH7jMVU8NuFKI=";
+  };
 
-    doCheck = false;
+  vendorHash = "sha256-GTPEHw3QsID9K6DcYNZRyDJzTqfDV9lHP2Trvd2aC8Y=";
 
-    src = fetchFromGitHub {
-      owner = "humio";
-      repo = "cli";
-      rev = "v${humioCtlVersion}";
-      sha256 = sha256;
-    };
+  ldflags = [ "-s" "-w" "-X main.version=${version}" ];
 
-    ldflags = [ "-X main.version=${humioCtlVersion}" ];
+  nativeBuildInputs = [ installShellFiles ];
 
-    nativeBuildInputs = [ installShellFiles ];
+  postInstall = ''
+    installShellCompletion --cmd humioctl \
+      --bash <($out/bin/humioctl completion bash) \
+      --zsh <($out/bin/humioctl completion zsh)
+  '';
 
-    postInstall = ''
-      $out/bin/humioctl completion bash > humioctl.bash
-      $out/bin/humioctl completion zsh > humioctl.zsh
-      installShellCompletion humioctl.{bash,zsh}
-    '';
-
-    meta = with lib; {
-      homepage = "https://github.com/humio/cli";
-      description = "A CLI for managing and sending data to Humio";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ lucperkins ];
-    };
-  }
+  meta = with lib; {
+    homepage = "https://github.com/humio/cli";
+    description = "A CLI for managing and sending data to Humio";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lucperkins ];
+  };
+}

From 3bd4979a4e746282a604e762020a03ee730acb8e Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Thu, 29 Jun 2023 04:00:55 +0000
Subject: [PATCH 32/83] credential-detector: 1.11.0 -> 1.14.3

---
 pkgs/tools/security/credential-detector/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/credential-detector/default.nix b/pkgs/tools/security/credential-detector/default.nix
index e4ef8a6e90dc..fd3e40b6536c 100644
--- a/pkgs/tools/security/credential-detector/default.nix
+++ b/pkgs/tools/security/credential-detector/default.nix
@@ -5,16 +5,18 @@
 
 buildGoModule rec {
   pname = "credential-detector";
-  version = "1.11.0";
+  version = "1.14.3";
 
   src = fetchFromGitHub {
     owner = "ynori7";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-zUQRzlp/7gZhCm5JYu9kYxcoFjDldCYKarRorOHa3E0=";
+    hash = "sha256-20ySTLpjTc1X0iJsbzbeLmWF0xYzzREGOqEWrB2X1GQ=";
   };
 
-  vendorSha256 = "sha256-VWmfATUbfnI3eJbFTUp6MR1wGESuI15PHZWuon5M5rg=";
+  vendorHash = "sha256-VWmfATUbfnI3eJbFTUp6MR1wGESuI15PHZWuon5M5rg=";
+
+  ldflags = [ "-s" "-w" ];
 
   meta = with lib; {
     description = "Tool to detect potentially hard-coded credentials";

From d0aa543664f6ce487a24a2d8a70c26cc9976e759 Mon Sep 17 00:00:00 2001
From: Thomas Miller <git@me.tmiller.com>
Date: Wed, 28 Jun 2023 23:07:27 -0500
Subject: [PATCH 33/83] zoom-us: 5.15.0.4063 -> 5.15.2.4260

---
 .../instant-messengers/zoom-us/default.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 5201c89cbae0..c8f869531744 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -48,23 +48,23 @@ let
   # and often with different versions.  We write them on three lines
   # like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "5.14.10.19202";
-  versions.x86_64-darwin = "5.14.10.19202";
-  versions.x86_64-linux = "5.15.0.4063";
+  versions.aarch64-darwin = "5.15.2.19786";
+  versions.x86_64-darwin = "5.15.2.19786";
+  versions.x86_64-linux = "5.15.2.4260";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-MK6xUkS+nX7SjIieduMhhFNqEUVdc89aPiCvHI2pjDQ=";
+      hash = "sha256-vERhyaNVxam6ypi9nU2t6RfBZgtzD6YECkSrxkxl/4E=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-JJ6nZ8WnTF8X8R0gIlFtsTbpdHhv65J5kWts+H3QDoM=";
+      hash = "sha256-Yx5seUks6s+NEBIxgltUQiNU3tjWpmNKMJwgAj9izh4=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-DhP6LZt/G3K9YDs7iXABsJMuhpzITP4aJ0PWXrFAL3I=";
+      hash = "sha256-R6M180Gcqu4yZC+CtWnixSkjPe8CvgoTPWSz7B6ZAlE=";
     };
   };
 

From 58ccd88dbd4de7846101322e498d4445e0f00aee Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 29 Jun 2023 04:20:00 +0000
Subject: [PATCH 34/83] postgresqlPackages.timescaledb: 2.11.0 -> 2.11.1

Diff: https://github.com/timescale/timescaledb/compare/2.11.0...2.11.1

Changelog: https://github.com/timescale/timescaledb/raw/2.11.1/CHANGELOG.md
---
 pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 73d0e7bb8da5..c2c28812a401 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation rec {
   pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
-  version = "2.11.0";
+  version = "2.11.1";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ postgresql openssl libkrb5 ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "timescale";
     repo = "timescaledb";
     rev = version;
-    sha256 = "sha256-CACOd3z3nPlAevtiRsLxBjZcaqygliibBq5Y2+jiuOA=";
+    sha256 = "sha256-nThflLfHvcEqJo1dz8PVca0ux7KJOW66nZ3dV1yTOCM=";
   };
 
   cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]

From 1747f3207255f305db89f10b51df2f9c962e2f43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 Jun 2023 04:52:43 +0000
Subject: [PATCH 35/83] flannel: 0.21.5 -> 0.22.0

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

diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index 684d19cb19a5..1e297d2ece93 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "flannel";
-  version = "0.21.5";
+  version = "0.22.0";
   rev = "v${version}";
 
   vendorHash = "sha256-JtDFwkYRAxpa4OBV5Tzr70DcOsp2oA3XB0PM5kGaY6Q=";
@@ -11,7 +11,7 @@ buildGoModule rec {
     inherit rev;
     owner = "flannel-io";
     repo = "flannel";
-    sha256 = "sha256-X8NVAaKJrJF1OCfzwcydvDPFUOhwdgGy/wfMWdhUqQ0=";
+    sha256 = "sha256-LwIGY74iH/qD8XpTw3wRJC0DVsFj1qLInX0i5Zorvew=";
   };
 
   ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ];

From e0334495f78fd862cbb6985b25b41dd197bb462c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 28 Jun 2023 22:27:18 -0700
Subject: [PATCH 36/83] imagemagick: 7.1.1-11 -> 7.1.1-12

Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-11...7.1.1-12
---
 pkgs/applications/graphics/ImageMagick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index abad3927b2dc..3f8bf8428223 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -47,13 +47,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.1-11";
+  version = "7.1.1-12";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = finalAttrs.version;
-    hash = "sha256-/CZRnNy/p87sEcH94RkRYgYXexFSU0Bm809pcvDFdV4=";
+    hash = "sha256-URwSufiTcLGWRFNOJidJyEcIPxWUSdN7yHaCiFh7GEI=";
   };
 
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

From 4cf7913ef61e6b59763e1b0886044b01c0e9f3c8 Mon Sep 17 00:00:00 2001
From: Martino Fontana <tinozzo123@tutanota.com>
Date: Wed, 28 Jun 2023 13:38:58 +0200
Subject: [PATCH 37/83] pcsx2: 1.7.4554 -> 1.7.4658

Diff: https://github.com/PCSX2/pcsx2/compare/v1.7.4554...v1.7.4653
---
 pkgs/applications/emulators/pcsx2/default.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix
index a46c02304416..fea7bf17ef7b 100644
--- a/pkgs/applications/emulators/pcsx2/default.nix
+++ b/pkgs/applications/emulators/pcsx2/default.nix
@@ -1,11 +1,11 @@
 { cmake
 , fetchFromGitHub
 , lib
-, stdenv
+, llvmPackages_16
 , cubeb
 , curl
 , ffmpeg
-, fmt
+, fmt_8
 , gettext
 , harfbuzz
 , libaio
@@ -37,25 +37,26 @@ let
   pcsx2_patches = fetchFromGitHub {
     owner = "PCSX2";
     repo = "pcsx2_patches";
-    rev = "8db5ae467a35cc00dc50a65061aa78dc5115e6d1";
-    sha256 = "sha256-68kD7IAhBMASFmkGwvyQ7ppO/3B1csAKik+rU792JI4=";
+    rev = "c09d842168689aeba88b656e3e0a042128673a7c";
+    sha256 = "sha256-h1jqv3a3Ib/4C7toZpSlVB1VFNNF1MrrUxttqKJL794=";
   };
 in
-stdenv.mkDerivation rec {
+llvmPackages_16.stdenv.mkDerivation rec {
   pname = "pcsx2";
-  version = "1.7.4554";
+  version = "1.7.4658";
 
   src = fetchFromGitHub {
     owner = "PCSX2";
     repo = "pcsx2";
     fetchSubmodules = true;
     rev = "v${version}";
-    sha256 = "sha256-9MRbpm7JdVmZwv8zD4lErzVTm7A4tYM0FgXE9KpX+/8=";
+    sha256 = "sha256-5y7CYFWgNh9oCBuTITvw7Rn4sC6MbMczVMAwtWFkn9A=";
   };
 
   cmakeFlags = [
     "-DDISABLE_ADVANCE_SIMD=TRUE"
     "-DUSE_SYSTEM_LIBS=ON"
+    "-DUSE_LINKED_FFMPEG=ON"
     "-DDISABLE_BUILD_DATE=TRUE"
   ];
 
@@ -70,7 +71,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     curl
     ffmpeg
-    fmt
+    fmt_8
     gettext
     harfbuzz
     libaio
@@ -98,7 +99,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp -a bin/pcsx2-qt bin/resources $out/bin/
 
-    install -Dm644 $src/pcsx2/Resources/AppIcon64.png $out/share/pixmaps/PCSX2.png
+    install -Dm644 $src/pcsx2-qt/resources/icons/AppIcon64.png $out/share/pixmaps/PCSX2.png
     install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop
 
     zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/*
@@ -107,7 +108,6 @@ stdenv.mkDerivation rec {
 
   qtWrapperArgs = [
     "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([
-      ffmpeg # It's loaded with dlopen. They plan to change it https://github.com/PCSX2/pcsx2/issues/8624
       vulkan-loader
     ] ++ cubeb.passthru.backendLibs)}"
   ];

From 9b0e5d025177617b6cf6ce9cd05b9b50ea27e574 Mon Sep 17 00:00:00 2001
From: superwhiskers <whiskerdev@protonmail.com>
Date: Thu, 29 Jun 2023 01:29:24 -0500
Subject: [PATCH 38/83] moarvm: 2023.04 -> 2023.06

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

diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index 9e21595a7f65..002c6620680e 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "moarvm";
-  version = "2023.04";
+  version = "2023.06";
 
   src = fetchFromGitHub {
     owner = "moarvm";
     repo = "moarvm";
     rev = version;
-    hash = "sha256-QYA4nSsrouYFaw1eju/6gNWwMcE/VeL0sNJmsTvtU3I=";
+    hash = "sha256-dMh1KwKh89ZUqIUPHOH9DPgxLWq37kW3hTTwsFe1imM=";
     fetchSubmodules = true;
   };
 

From 8129dd948e3660f833257db76bd289f2798fae93 Mon Sep 17 00:00:00 2001
From: superwhiskers <whiskerdev@protonmail.com>
Date: Thu, 29 Jun 2023 01:29:35 -0500
Subject: [PATCH 39/83] nqp: 2023.04 -> 2023.06

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

diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index 0193e3371948..ab673dc77648 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nqp";
-  version = "2023.04";
+  version = "2023.06";
 
   src = fetchFromGitHub {
     owner = "raku";
     repo = "nqp";
     rev = version;
-    hash = "sha256-6V9d01aacDc+770XPSbQd4m1bg7Bbe47TTNOUxc2Fpw=";
+    hash = "sha256-VfSVNEBRW6Iz3qUeICFXu3pp92NGgAkOrThXF8a/82A=";
     fetchSubmodules = true;
   };
 

From e478be291c6dd870fd44796a00e87b9db62d5a12 Mon Sep 17 00:00:00 2001
From: superwhiskers <whiskerdev@protonmail.com>
Date: Thu, 29 Jun 2023 01:29:44 -0500
Subject: [PATCH 40/83] rakudo: 2023.04 -> 2023.06

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

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 72154ce6a657..fbef54290c15 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rakudo";
-  version = "2023.04";
+  version = "2023.06";
 
   src = fetchFromGitHub {
     owner = "rakudo";
     repo = "rakudo";
     rev = version;
-    hash = "sha256-m5rXriBKfp/i9AIcBGCYGfXIGBRsxgVmBbLJPXXc5AY=";
+    hash = "sha256-t+zZEokjcDXp8uuHaOHp1R9LuS0Q3CSDOWhbSFXlNaU=";
     fetchSubmodules = true;
   };
 

From 9a3b260bef2a8be7618ce213e97770e93ab4121a Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Thu, 29 Jun 2023 16:02:33 +0900
Subject: [PATCH 41/83] fishPlugins.fzf-fish: 9.7 -> 9.8

Diff: https://github.com/PatrickF1/fzf.fish/compare/v9.7...v9.8
---
 pkgs/shells/fish/plugins/fzf-fish.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix
index d20c2aeddc4c..558ade2b98bb 100644
--- a/pkgs/shells/fish/plugins/fzf-fish.nix
+++ b/pkgs/shells/fish/plugins/fzf-fish.nix
@@ -5,13 +5,13 @@ let
 in
 buildFishPlugin rec {
   pname = "fzf.fish";
-  version = "9.7";
+  version = "9.8";
 
   src = fetchFromGitHub {
     owner = "PatrickF1";
     repo = "fzf.fish";
     rev = "v${version}";
-    sha256 = "sha256-haNSqXJzLL3JGvD4JrASVmhLJz6i9lna6/EdojXdFOo=";
+    sha256 = "sha256-xWaMd5POCDeeFTsGtHbIvsPelIp+GZPC1X1CseCo3BA=";
   };
 
   nativeCheckInputs = [ fzf fd unixtools.script procps ];

From 1babaa8a05d9ab9a1b497a862b0fb992824e7dea Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 29 Jun 2023 10:18:26 +0300
Subject: [PATCH 42/83] gfxreconstruct: set platforms

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

diff --git a/pkgs/tools/graphics/gfxreconstruct/default.nix b/pkgs/tools/graphics/gfxreconstruct/default.nix
index 4ec2a7a58a89..fe678ba06715 100644
--- a/pkgs/tools/graphics/gfxreconstruct/default.nix
+++ b/pkgs/tools/graphics/gfxreconstruct/default.nix
@@ -63,5 +63,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/LunarG/gfxreconstruct/";
     license = licenses.mit;
     maintainers = with maintainers; [ Flakebi ];
+    platforms = platforms.linux;
   };
 }

From 152b62c726a8d77d45f5617d47ca854fadcf23d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 Jun 2023 07:31:23 +0000
Subject: [PATCH 43/83] gcompris: 3.2 -> 3.3

---
 pkgs/games/gcompris/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix
index 204f5b3d82e7..4a5670bb9c3e 100644
--- a/pkgs/games/gcompris/default.nix
+++ b/pkgs/games/gcompris/default.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gcompris";
-  version = "3.2";
+  version = "3.3";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz";
-    hash = "sha256-WopJB9p7GnfCtUoEKxtzzRXCogcx03ofRjGLhkvW0Rs=";
+    hash = "sha256-8hqiq1wYw4irbOXCrwcJqTMuLISzSmSqPuw2Rn8XzQA=";
   };
 
   cmakeFlags = [

From 65e5b3366790f90229f1a655bbdad8f7a042fb9b Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Thu, 29 Jun 2023 09:31:57 +0200
Subject: [PATCH 44/83] matrix-hookshot: 4.3.0 -> 4.4.0

https://github.com/matrix-org/matrix-hookshot/releases/tag/4.4.0
---
 pkgs/servers/matrix-synapse/matrix-hookshot/default.nix  | 5 +++++
 pkgs/servers/matrix-synapse/matrix-hookshot/package.json | 8 ++++----
 pkgs/servers/matrix-synapse/matrix-hookshot/pin.json     | 8 ++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix
index 1a7e233c6e89..d6d42472ba6b 100644
--- a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix
+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix
@@ -10,7 +10,9 @@
 , rustPlatform
 , rustc
 , napi-rs-cli
+, pkg-config
 , nodejs
+, openssl
 }:
 
 let
@@ -44,8 +46,11 @@ mkYarnPackage rec {
     "@matrix-org/matrix-sdk-crypto-nodejs" = "${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs";
   };
 
+  extraBuildInputs = [ openssl ];
+
   nativeBuildInputs = [
     rustPlatform.cargoSetupHook
+    pkg-config
     cargo
     rustc
     napi-rs-cli
diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
index 4d1acc779dff..2ae23cb09a3a 100644
--- a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-hookshot",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
   "main": "lib/app.js",
   "repository": "https://github.com/matrix-org/matrix-hookshot",
@@ -64,7 +64,7 @@
     "node-emoji": "^1.11.0",
     "nyc": "^15.1.0",
     "p-queue": "^6.6.2",
-    "prom-client": "^14.0.1",
+    "prom-client": "^14.2.0",
     "reflect-metadata": "^0.1.13",
     "source-map-support": "^0.5.21",
     "string-argv": "^0.3.1",
@@ -76,7 +76,7 @@
   },
   "devDependencies": {
     "@codemirror/lang-javascript": "^6.0.2",
-    "@napi-rs/cli": "^2.2.0",
+    "@napi-rs/cli": "^2.13.2",
     "@preact/preset-vite": "^2.2.0",
     "@tsconfig/node18": "^2.0.0",
     "@types/ajv": "^1.0.0",
@@ -105,7 +105,7 @@
     "rimraf": "^3.0.2",
     "sass": "^1.51.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4",
+    "typescript": "^5.1.3",
     "vite": "^4.1.5",
     "vite-svg-loader": "^4.0.0"
   }
diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
index 159c66645923..008bbe5ab50e 100644
--- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
@@ -1,6 +1,6 @@
 {
-  "version": "4.3.0",
-  "srcHash": "7iBQkTY1K05M3EiEP+IXziztyL0+Wrlz/ezlWwWE1iw=",
-  "yarnHash": "0p543f11wi6m0h29jmd8w3idqp9qacmxksj1njll7z51gjh52qjl",
-  "cargoHash": "eDWZSbTS9V5MzLkbnhhPEObP1QFeTZLWCymapaDc1Lo="
+  "version": "4.4.0",
+  "srcHash": "mPLDdAVIMb5d2LPGtIfm/ofRs42081S3+QTsvqkfp3s=",
+  "yarnHash": "0qd3h870mk3a2lzm0r7kyh07ykw86h9xwai9h205gnv1w0d59z6i",
+  "cargoHash": "NGcnRKasYE4dleQLq+E4cM6C04Rfu4AsenDznGyC2Nk="
 }

From 9b6f42b1e302e4c0b12cbe88d0e52ebe95c38ce4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 29 Jun 2023 10:34:26 +0300
Subject: [PATCH 45/83] flannel: fix version

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

diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index 1e297d2ece93..0a4da6711972 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
     sha256 = "sha256-LwIGY74iH/qD8XpTw3wRJC0DVsFj1qLInX0i5Zorvew=";
   };
 
-  ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ];
+  ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ];
 
   # TestRouteCache/TestV6RouteCache fail with "Failed to create newns: operation not permitted"
   doCheck = false;

From 2cf8ec7672a615a6443152a121564d88fb89b01d Mon Sep 17 00:00:00 2001
From: fortuneteller2k <lythe1107@gmail.com>
Date: Thu, 29 Jun 2023 16:53:59 +0800
Subject: [PATCH 46/83] molsketch: 0.7.3 -> 0.8.0

---
 .../editors/molsketch/default.nix             | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/applications/editors/molsketch/default.nix
index cb94cef3a328..d688a50f28d3 100644
--- a/pkgs/applications/editors/molsketch/default.nix
+++ b/pkgs/applications/editors/molsketch/default.nix
@@ -1,9 +1,9 @@
 { lib
-, stdenv
 , mkDerivation
 , fetchurl
 , cmake
 , pkg-config
+, wrapQtAppsHook
 , hicolor-icon-theme
 , openbabel
 , desktop-file-utils
@@ -12,18 +12,32 @@
 
 mkDerivation rec {
   pname = "molsketch";
-  version = "0.7.3";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/molsketch/Molsketch-${version}-src.tar.gz";
-    hash = "sha256-82iNJRiXqESwidjifKBf0+ljcqbFD1WehsXI8VUgrwQ=";
+    hash = "sha256-Mpx4fHktxqBAkmdwqg2pXvEgvvGUQPbgqxKwXKjhJuQ=";
   };
 
+  # uses C++17 APIs like std::transform_reduce
+  postPatch = ''
+    substituteInPlace molsketch/CMakeLists.txt \
+      --replace "CXX_STANDARD 14" "CXX_STANDARD 17"
+    substituteInPlace libmolsketch/CMakeLists.txt \
+      --replace "CXX_STANDARD 14" "CXX_STANDARD 17"
+    substituteInPlace obabeliface/CMakeLists.txt \
+      --replace "CXX_STANDARD 14" "CXX_STANDARD 17"
+  '';
+
   preConfigure = ''
     cmakeFlags="$cmakeFlags -DMSK_PREFIX=$out"
   '';
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  postFixup = ''
+    mv $out/lib/molsketch/* $out/lib
+  '';
+
+  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
   buildInputs = [
     hicolor-icon-theme
     openbabel

From 472ff0637e5a867e2e1da2eca1bc3042ed9461e5 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 28 Jun 2023 11:35:27 +0800
Subject: [PATCH 47/83] pantheon.appcenter: 7.2.1 -> 7.3.0

https://github.com/elementary/appcenter/releases/tag/7.3.0
---
 .../pantheon/apps/appcenter/default.nix       |  15 +-
 .../disable-packagekit-backend.patch          | 167 ------------------
 2 files changed, 5 insertions(+), 177 deletions(-)
 delete mode 100644 pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch

diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index eeea360308a6..e27460485750 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -15,7 +15,6 @@
 , libxml2
 , meson
 , ninja
-, packagekit
 , pkg-config
 , python3
 , vala
@@ -25,21 +24,15 @@
 
 stdenv.mkDerivation rec {
   pname = "appcenter";
-  version = "7.2.1";
+  version = "7.3.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-jtNPRsq33bIn3jy3F63UNrwrhaTBYbRYLDxyxgAXjIc=";
+    sha256 = "sha256-Lj3j812XaCIN+TFSDAvIgtl49n5jG4fVlAFvrWqngpM=";
   };
 
-  patches = [
-    # Having a working nix packagekit backend will supersede this.
-    # https://github.com/NixOS/nixpkgs/issues/177946
-    ./disable-packagekit-backend.patch
-  ];
-
   nativeBuildInputs = [
     dbus # for pkg-config
     meson
@@ -61,11 +54,13 @@ stdenv.mkDerivation rec {
     libhandy
     libsoup
     libxml2
-    packagekit
     polkit
   ];
 
   mesonFlags = [
+    # We don't have a working nix packagekit backend yet.
+    "-Dpackagekit_backend=false"
+    "-Dubuntu_drivers_backend=false"
     "-Dpayments=false"
     "-Dcurated=false"
   ];
diff --git a/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch b/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch
deleted file mode 100644
index 76d6245628b7..000000000000
--- a/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff --git a/src/Application.vala b/src/Application.vala
-index a1c4e0d4..35555946 100644
---- a/src/Application.vala
-+++ b/src/Application.vala
-@@ -180,9 +180,6 @@ public class AppCenter.App : Gtk.Application {
-     }
- 
-     public override void activate () {
--        if (fake_update_packages != null) {
--            AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages;
--        }
- 
-         var client = AppCenterCore.Client.get_default ();
- 
-@@ -200,12 +197,6 @@ public class AppCenter.App : Gtk.Application {
- 
-         if (local_path != null) {
-             var file = File.new_for_commandline_arg (local_path);
--
--            try {
--                local_package = AppCenterCore.PackageKitBackend.get_default ().add_local_component_file (file);
--            } catch (Error e) {
--                warning ("Failed to load local AppStream XML file: %s", e.message);
--            }
-         }
- 
-         if (active_window == null) {
-diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala
-index 1747cd3b..20077394 100644
---- a/src/Core/BackendAggregator.vala
-+++ b/src/Core/BackendAggregator.vala
-@@ -26,8 +26,6 @@ public class AppCenterCore.BackendAggregator : Backend, Object {
- 
-     construct {
-         backends = new Gee.ArrayList<unowned Backend> ();
--        backends.add (PackageKitBackend.get_default ());
--        backends.add (UbuntuDriversBackend.get_default ());
-         backends.add (FlatpakBackend.get_default ());
- 
-         unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default ();
-diff --git a/src/Core/Package.vala b/src/Core/Package.vala
-index 40fa8262..e6b90dd9 100644
---- a/src/Core/Package.vala
-+++ b/src/Core/Package.vala
-@@ -327,23 +327,13 @@ public class AppCenterCore.Package : Object {
-     public string origin_description {
-         owned get {
-             unowned string origin = component.get_origin ();
--            if (backend is PackageKitBackend) {
--                if (origin == APPCENTER_PACKAGE_ORIGIN) {
--                    return _("AppCenter");
--                } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) {
--                    return _("elementary Updates");
--                } else if (origin.has_prefix ("ubuntu-")) {
--                    return _("Ubuntu (non-curated)");
--                }
--            } else if (backend is FlatpakBackend) {
-+            if (backend is FlatpakBackend) {
-                 var fp_package = this as FlatpakPackage;
-                 if (fp_package == null) {
-                     return origin;
-                 }
- 
-                 return fp_package.remote_title;
--            } else if (backend is UbuntuDriversBackend) {
--                return _("Ubuntu Drivers");
-             }
- 
-             return _("Unknown Origin (non-curated)");
-@@ -435,9 +425,7 @@ public class AppCenterCore.Package : Object {
- 
-         // The version on a PackageKit package comes from the package not AppStream, so only reset the version
-         // on other backends
--        if (!(backend is PackageKitBackend)) {
--            _latest_version = null;
--        }
-+        _latest_version = null;
- 
-         this.component = component;
-     }
-diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala
-index 4d844abc..457137eb 100644
---- a/src/Core/UpdateManager.vala
-+++ b/src/Core/UpdateManager.vala
-@@ -71,35 +71,9 @@ public class AppCenterCore.UpdateManager : Object {
-             installed_package.update_state ();
-         }
- 
--        Pk.Results pk_updates;
--        unowned PackageKitBackend client = PackageKitBackend.get_default ();
--        try {
--            pk_updates = yield client.get_updates (cancellable);
--        } catch (Error e) {
--            warning ("Unable to get updates from PackageKit backend: %s", e.message);
--            return 0;
--        }
--
-         uint os_count = 0;
-         string os_desc = "";
- 
--        var package_array = pk_updates.get_package_array ();
--        debug ("PackageKit backend reports %d updates", package_array.length);
--
--        package_array.foreach ((pk_package) => {
--            var pkg_name = pk_package.get_name ();
--            debug ("Added %s to OS updates", pkg_name);
--            os_count++;
--            unowned string pkg_summary = pk_package.get_summary ();
--            unowned string pkg_version = pk_package.get_version ();
--            os_desc += Markup.printf_escaped (
--                " • %s\n\t%s\n\t%s\n",
--                pkg_name,
--                pkg_summary,
--                _("Version: %s").printf (pkg_version)
--            );
--        });
--
-         os_updates.component.set_pkgnames ({});
-         os_updates.change_information.clear_update_info ();
- 
-@@ -207,30 +181,13 @@ public class AppCenterCore.UpdateManager : Object {
-             count += 1;
-         }
- 
--        pk_updates.get_details_array ().foreach ((pk_detail) => {
--            var pk_package = new Pk.Package ();
--            try {
--                pk_package.set_id (pk_detail.get_package_id ());
--                var pkg_name = pk_package.get_name ();
--
--                var pkgnames = os_updates.component.pkgnames;
--                pkgnames += pkg_name;
--                os_updates.component.pkgnames = pkgnames;
--
--                os_updates.change_information.updatable_packages.@set (client, pk_package.get_id ());
--                os_updates.change_information.size += pk_detail.size;
--            } catch (Error e) {
--                critical (e.message);
--            }
--        });
--
-         os_updates.update_state ();
-         runtime_updates.update_state ();
-         return count;
-     }
- 
-     public void update_restart_state () {
--        var should_restart = restart_file.query_exists () || PackageKitBackend.get_default ().is_restart_required ();
-+        var should_restart = restart_file.query_exists ();
- 
-         if (should_restart) {
-             if (!restart_required) {
-diff --git a/src/meson.build b/src/meson.build
-index e0ef5342..14319492 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -12,10 +12,8 @@ appcenter_files = files(
-     'Core/FlatpakBackend.vala',
-     'Core/Job.vala',
-     'Core/Package.vala',
--    'Core/PackageKitBackend.vala',
-     'Core/ScreenshotCache.vala',
-     'Core/Task.vala',
--    'Core/UbuntuDriversBackend.vala',
-     'Core/UpdateManager.vala',
-     'Dialogs/InstallFailDialog.vala',
-     'Dialogs/StripeDialog.vala',

From bb7e5f589a936c9cba26e998f85ced2e345b30d1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 28 Jun 2023 11:46:57 +0800
Subject: [PATCH 48/83] pantheon.wingpanel-indicator-bluetooth: 2.1.8 -> 7.0.0

https://github.com/elementary/wingpanel-indicator-bluetooth/releases/tag/7.0.0
---
 .../desktop/wingpanel-indicators/bluetooth/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index f0c2fb0def00..c9e20879ec53 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-bluetooth";
-  version = "2.1.8";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "12rasf8wy3cqnfjlm9s2qnx4drzx0w0yviagkng3kspdzm3vzsqy";
+    sha256 = "sha256-t8Sn8NQW7WueinPkJdn8hd0oCJ3uFeRJliggSFHoaZU=";
   };
 
   nativeBuildInputs = [

From 56886a889d790236e557266a4f8e8ccde76a912a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 28 Jun 2023 11:48:21 +0800
Subject: [PATCH 49/83] pantheon.wingpanel-indicator-notifications: 6.0.7 ->
 7.0.0

https://github.com/elementary/wingpanel-indicator-notifications/releases/tag/7.0.0
---
 .../desktop/wingpanel-indicators/notifications/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index 6db8166197f6..fc69dec69a56 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-notifications";
-  version = "6.0.7";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-MIuyVGI4jSLGQMQUmj/2PIvcRHSJyPO5Pnd1f8JIuXc=";
+    sha256 = "sha256-HEkuNJgG0WEOKO6upwQgXg4huA7dNyz73U1nyOjQiTs=";
   };
 
   nativeBuildInputs = [

From a50aa29609b16183ec48d0ae9b4554016952c5fd Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 28 Jun 2023 11:51:01 +0800
Subject: [PATCH 50/83] pantheon.switchboard-plug-display: 2.3.3 -> 7.0.0

https://github.com/elementary/switchboard-plug-display/releases/tag/7.0.0
---
 .../pantheon/apps/switchboard-plugs/display/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index 0b426273b283..8f592b17f54e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-display";
-  version = "2.3.3";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-d25++3msaS9dg2Rsl7mrAezDn8Lawd3/X0XPH5Zy6Rc=";
+    sha256 = "sha256-NgTpV/hbPttAsDY8Y9AsqdpjRlZqTy2rTu3v1jQZjBo=";
   };
 
   nativeBuildInputs = [

From 7572bbce6021eaa389960e2b016ad29e2a89ba03 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 28 Jun 2023 11:56:01 +0800
Subject: [PATCH 51/83] pantheon.elementary-notifications: Backport full markup
 support patch

Needed for wingpanel-indicator-notifications 7.0.0.
---
 .../services/elementary-notifications/default.nix     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
index abff47fbd8b8..5588bd93374f 100644
--- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , nix-update-script
 , meson
 , ninja
@@ -27,6 +28,16 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-B1wo1N4heG872klFJOBKOEds0+6aqtvkTGefi97bdU8=";
   };
 
+  patches = [
+    # Backports https://github.com/elementary/notifications/pull/184
+    # Needed for https://github.com/elementary/wingpanel-indicator-notifications/pull/252
+    # Should be part of next bump
+    (fetchpatch {
+      url = "https://github.com/elementary/notifications/commit/bd159979dbe3dbe6f3f1da7acd8e0721cc20ef80.patch";
+      sha256 = "sha256-cOfeXwoMVgvbA29axyN7HtYKTgCtGxAPrB2PA/x8RKY=";
+    })
+  ];
+
   nativeBuildInputs = [
     glib # for glib-compile-schemas
     meson

From 2ea5615f89aeabdea265854d89a0fe9df68be853 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 29 Jun 2023 17:53:10 +0800
Subject: [PATCH 52/83] pantheon.wingpanel-indicator-bluetooth: Backport
 gresource path patch

To fix missing icon on wingpanel.
---
 .../desktop/wingpanel-indicators/bluetooth/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index c9e20879ec53..8f00b01ee331 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , nix-update-script
 , pkg-config
 , meson
@@ -27,6 +28,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-t8Sn8NQW7WueinPkJdn8hd0oCJ3uFeRJliggSFHoaZU=";
   };
 
+  patches = [
+    # Prevent a race that skips automatic resource loading
+    # https://github.com/elementary/wingpanel-indicator-bluetooth/issues/203
+    (fetchpatch {
+      url = "https://github.com/elementary/wingpanel-indicator-bluetooth/commit/4f9237c0cb1152a696ccdd2a2fc83fc706f54d62.patch";
+      sha256 = "sha256-fUnqw0EAWvtpoo2wI++2B5kXNqQPxnsjPbZ7O30lXBI=";
+    })
+  ];
+
   nativeBuildInputs = [
     glib # for glib-compile-schemas
     libxml2

From ee5bca381eb03f65540e5df21c90257afe27abeb Mon Sep 17 00:00:00 2001
From: Arijit Basu <sayanarijit@gmail.com>
Date: Thu, 29 Jun 2023 13:30:42 +0530
Subject: [PATCH 53/83] qrscan: init at 0.1.9

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

diff --git a/pkgs/tools/misc/qrscan/default.nix b/pkgs/tools/misc/qrscan/default.nix
new file mode 100644
index 000000000000..91b8cfc18db3
--- /dev/null
+++ b/pkgs/tools/misc/qrscan/default.nix
@@ -0,0 +1,36 @@
+{ lib, rustPlatform, fetchFromGitHub, stdenv }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "qrscan";
+  version = "0.1.9";
+
+  src = fetchFromGitHub {
+    owner = "sayanarijit";
+    repo = "qrscan";
+    rev = "v${version}";
+    hash = "sha256-nAUZUE7NppsCAV8UyR8+OkikT4nJtnamsSVeyNz21EQ=";
+  };
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+  ];
+
+  cargoHash = "sha256-P40IwFRtEQp6BGRgmt1x3UXtAKtWaMjR3kqhYq+p7wQ=";
+
+  checkFlags = [
+    # requires filesystem write access
+    "--skip=tests::test_export_files"
+    "--skip=tests::test_scan_from_stdin"
+    "--skip=tests::test_scan_jpeg_file"
+    "--skip=tests::test_scan_no_content"
+    "--skip=tests::test_scan_png_file"
+  ];
+
+  meta = with lib; {
+    description = "Scan a QR code in the terminal using the system camera or a given image";
+    homepage = "https://github.com/sayanarijit/qrscan";
+    license = licenses.mit;
+    broken = stdenv.isDarwin;
+    maintainers = [ maintainers.sayanarijit ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4876e40926bb..2cba4672547a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11917,6 +11917,8 @@ with pkgs;
 
   qrcp = callPackage ../tools/networking/qrcp { };
 
+  qrscan = callPackage ../tools/misc/qrscan { };
+
   qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
 
   qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { };

From de7d05b9f6c9fb837642431200291d8ae4367315 Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Thu, 17 Nov 2022 03:43:20 +1100
Subject: [PATCH 54/83] github-copilot-intellij-agent: init at 1.2.8.2631

---
 .../github-copilot-intellij-agent/default.nix | 82 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 84 insertions(+)
 create mode 100644 pkgs/development/tools/github-copilot-intellij-agent/default.nix

diff --git a/pkgs/development/tools/github-copilot-intellij-agent/default.nix b/pkgs/development/tools/github-copilot-intellij-agent/default.nix
new file mode 100644
index 000000000000..a1f2bc950198
--- /dev/null
+++ b/pkgs/development/tools/github-copilot-intellij-agent/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, lib, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  pname = "github-copilot-intellij-agent";
+  version = "1.2.8.2631";
+
+  src = fetchurl {
+    name = "${pname}-${version}-plugin.zip";
+    url = "https://plugins.jetbrains.com/plugin/download?updateId=341846";
+    hash = "sha256-0nnSMdx9Vb2WyNHreOJMP15K1+AII/kCEAOiFK5Mhik=";
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  dontUnpack = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    unzip -p $src github-copilot-intellij/copilot-agent/bin/copilot-agent-${
+      if stdenv.isDarwin then (if stdenv.isAarch64 then "macos-arm64" else "macos") else "linux"
+    } | install -m755 /dev/stdin $out/bin/copilot-agent
+
+    runHook postInstall
+  '';
+
+  # https://discourse.nixos.org/t/unrelatable-error-when-working-with-patchelf/12043
+  # https://github.com/NixOS/nixpkgs/blob/db0d8e10fc1dec84f1ccb111851a82645aa6a7d3/pkgs/development/web/now-cli/default.nix
+  preFixup = let
+    binaryLocation = "$out/bin/copilot-agent";
+    libPath = lib.makeLibraryPath [ stdenv.cc.cc ];
+  in ''
+    orig_size=$(stat --printf=%s ${binaryLocation})
+
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ${binaryLocation}
+    patchelf --set-rpath ${libPath} ${binaryLocation}
+    chmod +x ${binaryLocation}
+
+    new_size=$(stat --printf=%s ${binaryLocation})
+
+    var_skip=20
+    var_select=22
+    shift_by=$(expr $new_size - $orig_size)
+
+    function fix_offset {
+      location=$(grep -obUam1 "$1" ${binaryLocation} | cut -d: -f1)
+      location=$(expr $location + $var_skip)
+      value=$(dd if=${binaryLocation} iflag=count_bytes,skip_bytes skip=$location \
+                 bs=1 count=$var_select status=none)
+      value=$(expr $shift_by + $value)
+      echo -n $value | dd of=${binaryLocation} bs=1 seek=$location conv=notrunc
+    }
+
+    fix_offset PAYLOAD_POSITION
+    fix_offset PRELUDE_POSITION
+  '';
+
+  dontStrip = true;
+
+  meta = rec {
+    description = "The GitHub copilot IntelliJ plugin's native component";
+    longDescription = ''
+      The GitHub copilot IntelliJ plugin's native component.
+      bin/copilot-agent must be symlinked into the plugin directory, replacing the existing binary.
+
+      For example:
+
+      ```shell
+      ln -fs /run/current-system/sw/bin/copilot-agent ~/.local/share/JetBrains/IntelliJIdea2022.2/github-copilot-intellij/copilot-agent/bin/copilot-agent-linux
+      ```
+    '';
+    homepage = "https://plugins.jetbrains.com/plugin/17718-github-copilot";
+    downloadPage = homepage;
+    changelog = homepage;
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ hacker1024 ];
+    mainProgram = "copilot-agent";
+    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 753c5d237ff0..e240b9994ed1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2665,6 +2665,8 @@ with pkgs;
 
   github-commenter = callPackage ../development/tools/github-commenter { };
 
+  github-copilot-intellij-agent = callPackage ../development/tools/github-copilot-intellij-agent { };
+
   github-desktop = callPackage ../applications/version-management/github-desktop {
     curl = curl.override { openssl = openssl_1_1; };
   };

From 252aea2ced0a6ea37e561e9892d42e5eaa617512 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 27 Jun 2023 14:04:00 +0100
Subject: [PATCH 55/83] vimPlugins.error-marker: init at 2023-06-27

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 30b96b94b0f5..c289cb3943d0 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -256,6 +256,7 @@ https://github.com/elmcast/elm-vim/,,
 https://github.com/dmix/elvish.vim/,,
 https://github.com/mattn/emmet-vim/,,
 https://github.com/vim-scripts/emodeline/,,
+https://github.com/vim-scripts/errormarker.vim/,,
 https://github.com/sainnhe/everforest/,,
 https://github.com/google/executor.nvim/,HEAD,
 https://github.com/nvchad/extensions/,HEAD,nvchad-extensions

From 1480d8ed0c3624182a8a7c13d2206940ec5a1e81 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 27 Jun 2023 14:04:00 +0100
Subject: [PATCH 56/83] vimPlugins.SmartCase: init at 2023-06-27

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index c289cb3943d0..2b436c8a45fe 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -28,6 +28,7 @@ https://github.com/b0o/SchemaStore.nvim/,,
 https://github.com/sunjon/Shade.nvim/,,
 https://github.com/vim-scripts/ShowMultiBase/,,
 https://github.com/tmhedberg/SimpylFold/,,
+https://github.com/vim-scripts/SmartCase/,,
 https://github.com/jaredgorski/SpaceCamp/,,
 https://github.com/SpaceVim/SpaceVim/,,
 https://github.com/chrisbra/SudoEdit.vim/,,

From ef21762f4f7f7e4b50e62efa281bc4f382f1bc35 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 27 Jun 2023 14:04:00 +0100
Subject: [PATCH 57/83] vimPlugins.tinykeymap: init at 2023-06-27

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 2b436c8a45fe..59962db0ec93 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -802,6 +802,7 @@ https://github.com/ron89/thesaurus_query.vim/,,
 https://github.com/itchyny/thumbnail.vim/,,
 https://github.com/vim-scripts/timestamp.vim/,,
 https://github.com/levouh/tint.nvim/,HEAD,
+https://github.com/tomtom/tinykeymap_vim/,,tinykeymap
 https://github.com/tomtom/tlib_vim/,,
 https://github.com/wellle/tmux-complete.vim/,,
 https://github.com/aserowy/tmux.nvim/,HEAD,

From a1cb09a120ecf18b9cc8ee3a0ec84863a31ff6eb Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 27 Jun 2023 14:04:00 +0100
Subject: [PATCH 58/83] vimPlugins.vim-autosource: init at 2023-06-27

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 59962db0ec93..0af45b595803 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -885,6 +885,7 @@ https://github.com/hura/vim-asymptote/,,
 https://github.com/907th/vim-auto-save/,,
 https://github.com/vim-autoformat/vim-autoformat/,,
 https://github.com/benizi/vim-automkdir/,,
+https://github.com/jenterkin/vim-autosource/,,
 https://github.com/gioele/vim-autoswap/,,
 https://github.com/bazelbuild/vim-bazel/,,
 https://github.com/moll/vim-bbye/,,

From 08cd1884488064dcb09705aed6d1538c798be860 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 27 Jun 2023 14:04:00 +0100
Subject: [PATCH 59/83] vimPlugins.vim-cmake: init at 2023-06-27

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 0af45b595803..46a61190a690 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -910,6 +910,7 @@ https://github.com/guns/vim-clojure-highlight/,,
 https://github.com/guns/vim-clojure-static/,,
 https://github.com/rstacruz/vim-closer/,,
 https://github.com/alvan/vim-closetag/,,
+https://github.com/vhdirk/vim-cmake/,,
 https://github.com/tomasiser/vim-code-dark/,,
 https://github.com/google/vim-codefmt/,,
 https://github.com/kchmck/vim-coffee-script/,,

From b70afe3425561aeae47e452a711d60d9e23a7606 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 27 Jun 2023 14:04:00 +0100
Subject: [PATCH 60/83] vimPlugins.vim-gas: init at 2023-06-27

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 46a61190a690..967ae5793c6f 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -976,6 +976,7 @@ https://github.com/thinca/vim-ft-diff_fold/,,
 https://github.com/tommcdo/vim-fubitive/,,
 https://github.com/tpope/vim-fugitive/,,
 https://github.com/maxjacobson/vim-fzf-coauthorship/,,
+https://github.com/Shirk/vim-gas/,,
 https://github.com/ruanyl/vim-gh-line/,,
 https://github.com/raghur/vim-ghost/,,
 https://github.com/mattn/vim-gist/,,

From 8263818e66553ba07933e753eeae72d6b1e2f440 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <jholdsworth@nvidia.com>
Date: Thu, 29 Jun 2023 13:11:21 +0100
Subject: [PATCH 61/83] vimPlugins: update

---
 .../editors/vim/plugins/generated.nix         | 224 ++++++++++++------
 1 file changed, 148 insertions(+), 76 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 1a04a02021c8..cedbd2bee7c7 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -173,12 +173,12 @@ final: prev:
 
   LazyVim = buildVimPluginFrom2Nix {
     pname = "LazyVim";
-    version = "2023-06-28";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "LazyVim";
       repo = "LazyVim";
-      rev = "c03b9a3ff1fa1e6acc1db8d7db0c89c562637f7d";
-      sha256 = "03s8dx5mjdvijrs4smvhnsg3nn4r7c0gjzj1wqbzcmw0jz7cwmnc";
+      rev = "0e33010937d9f759d5f6de04c2ef6f2340ff1483";
+      sha256 = "034853449qa8shg4i98hazv7azz6q0vam6vgv2mvsh7fm1xi011x";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
   };
@@ -351,6 +351,18 @@ final: prev:
     meta.homepage = "https://github.com/tmhedberg/SimpylFold/";
   };
 
+  SmartCase = buildVimPluginFrom2Nix {
+    pname = "SmartCase";
+    version = "2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "SmartCase";
+      rev = "e8a737fae8961e45f270f255d43d16c36ac18f27";
+      sha256 = "06hf56a3gyc6zawdjfvs1arl62aq5fzncl8bpwv35v66bbkjvw3w";
+    };
+    meta.homepage = "https://github.com/vim-scripts/SmartCase/";
+  };
+
   SpaceCamp = buildVimPluginFrom2Nix {
     pname = "SpaceCamp";
     version = "2023-06-22";
@@ -1099,12 +1111,12 @@ final: prev:
 
   bufdelete-nvim = buildVimPluginFrom2Nix {
     pname = "bufdelete.nvim";
-    version = "2023-06-15";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "famiu";
       repo = "bufdelete.nvim";
-      rev = "8d15a0a3189b02ac7ad9dd6dc089cc62edf095c6";
-      sha256 = "07a2ncdwyh848d4zwp0zxhc8py11wvdzxjn3x4i4sgf0cq4pm37n";
+      rev = "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4";
+      sha256 = "10whb4jd96h41qkmwvdsnn6cvj005x9l0dz7b0yrypa0yi2xirjj";
     };
     meta.homepage = "https://github.com/famiu/bufdelete.nvim/";
   };
@@ -1963,12 +1975,12 @@ final: prev:
 
   codeium-vim = buildVimPluginFrom2Nix {
     pname = "codeium.vim";
-    version = "2023-06-28";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "Exafunction";
       repo = "codeium.vim";
-      rev = "3cd85d90c112c72ecd93763e0602b93e263f194c";
-      sha256 = "074jw9h972ngax0pm6yi9qfppq73lkadn7m94snn86qjchn4fw24";
+      rev = "f053fad7826a77860b5bc33a6076c86408f3b255";
+      sha256 = "0a43zx7pxy6z3pnl7w31b9g73brpffqwigwz20bc9pasnw3x5zaw";
     };
     meta.homepage = "https://github.com/Exafunction/codeium.vim/";
   };
@@ -2239,12 +2251,12 @@ final: prev:
 
   copilot-lua = buildVimPluginFrom2Nix {
     pname = "copilot.lua";
-    version = "2023-06-24";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "33aa9419da8f9bf9b6a992e6c9c7b7f9e36dac06";
-      sha256 = "1r9ync87w3vk9zb2l75qlp2xwibdm67v051crznmms1wzp067npd";
+      rev = "686670843e6f555b8a42fb0a269c1bbaee745421";
+      sha256 = "00nrc6ywmc51gh6pphdhxlanw03vn9r6xxlm2lx7f8yf1gpg3ajn";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
   };
@@ -2299,12 +2311,12 @@ final: prev:
 
   coq_nvim = buildVimPluginFrom2Nix {
     pname = "coq_nvim";
-    version = "2023-06-28";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "b31a6fc0ac3794780e60d3f12bffc43727ac859e";
-      sha256 = "1y3d8avbhabgw97yx21524zz9svanavlyc3rqwk26ha194k0p3b7";
+      rev = "5f51b80d08321fb0854f71b663aeca1828895835";
+      sha256 = "1q3d1gq6cj51a7va10mv8ljsrn6yy8xs9k2fwp7p4g8sgfacdv8n";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
   };
@@ -2853,12 +2865,12 @@ final: prev:
 
   diffview-nvim = buildVimPluginFrom2Nix {
     pname = "diffview.nvim";
-    version = "2023-06-26";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "sindrets";
       repo = "diffview.nvim";
-      rev = "ff8e57a966618e973f443b2df177cab02e7f325c";
-      sha256 = "08yh8amr3401xk5c86gfgbv919c58x82csqzyn1fc19scsi72vrj";
+      rev = "766a4f210e67e522659302dc6bd8a8d3b8c08c54";
+      sha256 = "1fyq8d68j4n9659s1gpm7bgkx9x0y17hf5mdgh51rhcmfqx148ah";
     };
     meta.homepage = "https://github.com/sindrets/diffview.nvim/";
   };
@@ -3069,6 +3081,18 @@ final: prev:
     meta.homepage = "https://github.com/vim-scripts/emodeline/";
   };
 
+  errormarker-vim = buildVimPluginFrom2Nix {
+    pname = "errormarker.vim";
+    version = "2015-01-26";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "errormarker.vim";
+      rev = "eab7ae1d8961d3512703aa9eadefbde5f062a970";
+      sha256 = "11fh1468fr0vrgf73hjkvvpslh2s2pmghnkq8nny38zvf6kwzhxa";
+    };
+    meta.homepage = "https://github.com/vim-scripts/errormarker.vim/";
+  };
+
   everforest = buildVimPluginFrom2Nix {
     pname = "everforest";
     version = "2023-05-19";
@@ -3252,12 +3276,12 @@ final: prev:
 
   flash-nvim = buildVimPluginFrom2Nix {
     pname = "flash.nvim";
-    version = "2023-06-28";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "flash.nvim";
-      rev = "feda1d5a98a1705e86966e62a052661a7369b3c0";
-      sha256 = "1rh9gkpaabqs98a4q57xqwqaf7ds193b4yfkhs6b2h3mbgw3p0w2";
+      rev = "cdf8f0e07527657b7cf6143f77181cac1e04419b";
+      sha256 = "03izlyq8p9y80dbxd3gja667sm7rb2lm3jmzsgvqp8nf68qa7vg9";
     };
     meta.homepage = "https://github.com/folke/flash.nvim/";
   };
@@ -3372,12 +3396,12 @@ final: prev:
 
   friendly-snippets = buildVimPluginFrom2Nix {
     pname = "friendly-snippets";
-    version = "2023-06-21";
+    version = "2023-06-28";
     src = fetchFromGitHub {
       owner = "rafamadriz";
       repo = "friendly-snippets";
-      rev = "5749f093759c29e3694053d048ceb940fe12c3d3";
-      sha256 = "1shzw4886qifn90n5kpjhz9iqckqmfgfwmfk9ahkggd6l5844rw9";
+      rev = "1723ae01d83f3b3ac1530f1ae22b7b9d5da7749b";
+      sha256 = "1vkdfzyjsjg3j34l7byxsiai9izqcijcdmxm8ynlf54gigihzzpz";
     };
     meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
   };
@@ -5171,12 +5195,12 @@ final: prev:
 
   mason-lspconfig-nvim = buildVimPluginFrom2Nix {
     pname = "mason-lspconfig.nvim";
-    version = "2023-06-28";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason-lspconfig.nvim";
-      rev = "4c3baba22189aa2a08d32bb8d08b32c7e22a2e84";
-      sha256 = "0yakim6qqjacii1q8rp4ywwmlyn4pr47325qiwvzysz1yw2angcl";
+      rev = "4f1c72767bec31397d59554f84096909b2887195";
+      sha256 = "0bw94dqidb294xy8zkqxz4xbvpf0f311wpbxpk1zvwv19vxqvba3";
     };
     meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
   };
@@ -5199,8 +5223,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason.nvim";
-      rev = "8adaf0bc58ddadd70dad563f949042fb1cb0211c";
-      sha256 = "0c4y6gjc7f2yd83hm09arqyq9bli5f7k2h80qd114n2snarvd09f";
+      rev = "b68d3be4b664671002221d43c82e74a0f1006b26";
+      sha256 = "1hmkn4r4n2qqv9g3yyngh0g4lmb8cbn7xbpk9y1lxrwl3xcg9ljs";
     };
     meta.homepage = "https://github.com/williamboman/mason.nvim/";
   };
@@ -5327,12 +5351,12 @@ final: prev:
 
   modicator-nvim = buildVimPluginFrom2Nix {
     pname = "modicator.nvim";
-    version = "2023-06-16";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "mawkler";
       repo = "modicator.nvim";
-      rev = "9e508c350d1794d1ac61d42d56106637d95bd84b";
-      sha256 = "0gcapl7yg21n6da47xz4qlrgl2s28aaahx6a0r83mm15fnb0fmv4";
+      rev = "2c19ec450532159fa4cf8f89a01d3de07d929c59";
+      sha256 = "0k40hxc8vi745rpxnsrwlv437rfydgiad7nmzi44iskarm0la257";
     };
     meta.homepage = "https://github.com/mawkler/modicator.nvim/";
   };
@@ -5627,12 +5651,12 @@ final: prev:
 
   neo-tree-nvim = buildVimPluginFrom2Nix {
     pname = "neo-tree.nvim";
-    version = "2023-06-25";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "70d3daa22bf24de9e3e284ac659506b1374e3ae2";
-      sha256 = "1w5rvkshf1hlz176dqk3jrp1msabl339lfsvmy0b9kw4gxqf0w2j";
+      rev = "f765e75e7d2444629b5ace3cd7609c12251de254";
+      sha256 = "0bybiksbxx5z9gwg9xivhi3bsqimkvlvdz4xmxh7pkqnbw5qq2am";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
   };
@@ -5651,12 +5675,12 @@ final: prev:
 
   neoconf-nvim = buildVimPluginFrom2Nix {
     pname = "neoconf.nvim";
-    version = "2023-06-27";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "3454d48dce19e0fe534e3e4849aa17c47c47d15f";
-      sha256 = "1rgxp5hhh7qavabj17m1wkxjllcs3qpn08fjnlxcyxg5z2731z7s";
+      rev = "08f146d53e075055500dca35e93281faff95716b";
+      sha256 = "1qrb9pk2m0zfdm6qsdlhp2jjqbk8sg3h2s5lmvd0q14ixb26bxbv";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
   };
@@ -5999,12 +6023,12 @@ final: prev:
 
   neotest-rust = buildVimPluginFrom2Nix {
     pname = "neotest-rust";
-    version = "2023-06-23";
+    version = "2023-06-28";
     src = fetchFromGitHub {
       owner = "rouge8";
       repo = "neotest-rust";
-      rev = "5072eeb9f9f74856cbd95486699f5c17ab174f5c";
-      sha256 = "1yij2s8h6ip75qnzqd8maknlwcbxhlbrzzl6inch6l4iam66vs2n";
+      rev = "e9015a5e343dc47dac90dc74effb3dd11ff7d2ae";
+      sha256 = "0aix8phfsyb7hsyqxg6f8nfzhhpy7vzk2if3g8n0dzq1krmm6dk3";
     };
     meta.homepage = "https://github.com/rouge8/neotest-rust/";
   };
@@ -6047,12 +6071,12 @@ final: prev:
 
   neovim-ayu = buildVimPluginFrom2Nix {
     pname = "neovim-ayu";
-    version = "2023-04-16";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "Shatur";
       repo = "neovim-ayu";
-      rev = "762ff24bd429fbb1c1e20b13043b4c8f0266bcf1";
-      sha256 = "0qwaxnk2ywdfi04c0dgx438w765vq9df7g4dicb73626jfdvy141";
+      rev = "76dbf939b38e03ac5f9bd711ab3e434999f715c8";
+      sha256 = "1rkhjz24wfc6am1r9rqk0cndw82lqjaxxpmvfqjw1rdi2vb9xpqd";
     };
     meta.homepage = "https://github.com/Shatur/neovim-ayu/";
   };
@@ -6215,12 +6239,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPluginFrom2Nix {
     pname = "nlsp-settings.nvim";
-    version = "2023-06-27";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "19738dddb55273c244b03a94ff1b912563c8295d";
-      sha256 = "152jy6si32v1qc2rlkcfl9sx4sshpd1pxfifxrfdmkznq8yj0dnj";
+      rev = "64976a5ac70a9a43f3b1b42c5b1564f7f0e4077e";
+      sha256 = "0gvhazyc9cdzd1c6a2i740h1b50h947vbk3rz195sryi3zb7l2pb";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -6335,12 +6359,12 @@ final: prev:
 
   null-ls-nvim = buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "2023-06-15";
+    version = "2023-06-28";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "bbaf5a96913aa92281f154b08732be2f57021c45";
-      sha256 = "1hhqwk2jd22bd6215ax9n865xjn3djqbfmrki2nk9wjn4jmij4ik";
+      rev = "b919452c84e461c21a79185bef90c96e1cfecff9";
+      sha256 = "1liw8w2hfgk99ix4rfg1la9yb1yr36nf77ymz2042rjr0zc8qjfk";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
   };
@@ -6359,12 +6383,12 @@ final: prev:
 
   nvchad = buildVimPluginFrom2Nix {
     pname = "nvchad";
-    version = "2023-06-24";
+    version = "2023-06-28";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "nvchad";
-      rev = "286c951d7b1f4531c8f40873a3846f40a3503e33";
-      sha256 = "0pcavy26kd84m050z5dmxx9gava0zrvggbmn5p537hwq7x9zwara";
+      rev = "10b668d98aba6bce9b494d028174207e59e5c59a";
+      sha256 = "1yn01dfix232q2hlmbki9x446qbawa3dkiczg7hn270vvpipgspn";
     };
     meta.homepage = "https://github.com/nvchad/nvchad/";
   };
@@ -6503,12 +6527,12 @@ final: prev:
 
   nvim-cokeline = buildVimPluginFrom2Nix {
     pname = "nvim-cokeline";
-    version = "2023-06-20";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "willothy";
       repo = "nvim-cokeline";
-      rev = "cb4bbdf9bb6c8a070a655f04842bb86a101e040d";
-      sha256 = "0wrjqlyhyxfrd3g1c2gh6qzysc0v6n9nfgpgx19j8r0icxribsvq";
+      rev = "469800429c6e71cd46ee226c40035c31bc6a6ba1";
+      sha256 = "1z13lfghyb9a24myb4k1jkf75ipcxs5hnhci9bcwgz2l3smz31ww";
     };
     meta.homepage = "https://github.com/willothy/nvim-cokeline/";
   };
@@ -6767,12 +6791,12 @@ final: prev:
 
   nvim-jdtls = buildVimPluginFrom2Nix {
     pname = "nvim-jdtls";
-    version = "2023-06-22";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-jdtls";
-      rev = "c6a3c47a0c57c6c0c9b5fb92d3770bb59e92d9c6";
-      sha256 = "0239v4y3hr3g8njd14ii79ndrk56i494nfp1rx4lzj3a2jmx0b4r";
+      rev = "0261cf5a76cf2ef807c4ae0ede18fc9d791ebf02";
+      sha256 = "1r49yyrl7a6x41gyw1c486wwcw6b2619d1cca4kirswmxbk3c9gy";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
   };
@@ -6863,12 +6887,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2023-06-23";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "b6b34b9acf84949f0ac1c00747765e62b81fb38d";
-      sha256 = "12p1flmk9qp71kmy9sgv8a5izdwk1n4fggdpmiz42wyg7znzjxmp";
+      rev = "a2c8ad6c7b4e35ed33d648795dcb1e08dbd4ec01";
+      sha256 = "1zqhxk33513ncc0d9ljlvfcdd0p358awdhb1n99y80l9w1qmf3n1";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -7199,12 +7223,12 @@ final: prev:
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2023-06-28";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "e7f2b1276b7aa68099acc8169ce51f7e389b1772";
-      sha256 = "0q8wgw46pxdgs41agf9ldwyzn3gjznrq66kxza74s6mn20blmpwc";
+      rev = "4c3912dfa865e3ee97c8164322847b8b487779b2";
+      sha256 = "1ma9yai44j2224migk1zjdq5dqgdj397b1ikllmhzmccwas3sdk5";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -9656,12 +9680,12 @@ final: prev:
 
   treesj = buildVimPluginFrom2Nix {
     pname = "treesj";
-    version = "2023-05-10";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "Wansmer";
       repo = "treesj";
-      rev = "b1e2976c2d7ba922371cc7f3ab08b75136c27231";
-      sha256 = "0lnilplr42d2vih4bpm3wgk4b5ir2bjr4nn11z36scswf3by4i4y";
+      rev = "3203aa553217921fd4dcb79245f9df07278910b2";
+      sha256 = "1a7ym8rdq1zb1w8pb3bvq75bid5r0sggj0xz7r2q2sk3m80dz6a5";
     };
     meta.homepage = "https://github.com/Wansmer/treesj/";
   };
@@ -9764,12 +9788,12 @@ final: prev:
 
   typescript-nvim = buildVimPluginFrom2Nix {
     pname = "typescript.nvim";
-    version = "2023-06-06";
+    version = "2023-06-28";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "typescript.nvim";
-      rev = "5b3680e5c386e8778c081173ea0c978c14a40ccb";
-      sha256 = "0ixxgbcz8y42xlbin2dv3ycrlrgjd53shi9i8iyy0kxpr57cjldz";
+      rev = "de304087e6e49981fde01af8ccc5b21e8519306f";
+      sha256 = "0l3i9fj76y3yl63fh6hprs5fja0h0jl11lidv3p76bdr041gw06g";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/";
   };
@@ -9828,8 +9852,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "bb0e539222c8169353380b4822190c08e12a0f60";
-      sha256 = "0qs40nzidvf8zhrawkfz9y1d9b594ia1gnv2cyvqm1x4s8i8vy2h";
+      rev = "f30648e1a56f4c528a01e83fafbb93b05a11d4e9";
+      sha256 = "0nnlwl8wm20m266b6a039h6ld254xgwqczphm8hqvqmdkr8vnfgw";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
   };
@@ -10434,6 +10458,18 @@ final: prev:
     meta.homepage = "https://github.com/benizi/vim-automkdir/";
   };
 
+  vim-autosource = buildVimPluginFrom2Nix {
+    pname = "vim-autosource";
+    version = "2021-12-22";
+    src = fetchFromGitHub {
+      owner = "jenterkin";
+      repo = "vim-autosource";
+      rev = "569440e157d6eb37fb098dfe95252533553a56f5";
+      sha256 = "0myg0knv0ld2jdhvdz9hx9rfngh1qh6668wbmnf4g1d25vccr2i1";
+    };
+    meta.homepage = "https://github.com/jenterkin/vim-autosource/";
+  };
+
   vim-autoswap = buildVimPluginFrom2Nix {
     pname = "vim-autoswap";
     version = "2019-01-09";
@@ -10722,6 +10758,18 @@ final: prev:
     meta.homepage = "https://github.com/alvan/vim-closetag/";
   };
 
+  vim-cmake = buildVimPluginFrom2Nix {
+    pname = "vim-cmake";
+    version = "2021-06-25";
+    src = fetchFromGitHub {
+      owner = "vhdirk";
+      repo = "vim-cmake";
+      rev = "d4a6d1836987b933b064ba8ce5f3f0040a976880";
+      sha256 = "1xhak5cdnh0mg0w1hy0y4pgwaz9gcw1x1pbxidfxz0w903d0x5zw";
+    };
+    meta.homepage = "https://github.com/vhdirk/vim-cmake/";
+  };
+
   vim-code-dark = buildVimPluginFrom2Nix {
     pname = "vim-code-dark";
     version = "2023-06-05";
@@ -11502,6 +11550,18 @@ final: prev:
     meta.homepage = "https://github.com/maxjacobson/vim-fzf-coauthorship/";
   };
 
+  vim-gas = buildVimPluginFrom2Nix {
+    pname = "vim-gas";
+    version = "2022-03-07";
+    src = fetchFromGitHub {
+      owner = "Shirk";
+      repo = "vim-gas";
+      rev = "2ca95211b465be8e2871a62ee12f16e01e64bd98";
+      sha256 = "1lc75g9spww221n64pjxwmill5rw5vix21nh0lhlaq1rl2y89vd6";
+    };
+    meta.homepage = "https://github.com/Shirk/vim-gas/";
+  };
+
   vim-gh-line = buildVimPluginFrom2Nix {
     pname = "vim-gh-line";
     version = "2022-11-25";
@@ -15338,12 +15398,12 @@ final: prev:
 
   chad = buildVimPluginFrom2Nix {
     pname = "chad";
-    version = "2023-06-28";
+    version = "2023-06-29";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "c9e066075d440a246caeb5434abd31e79e788ee6";
-      sha256 = "12dq2b7w6pkf4qbq48qz0drqzdm2fq3ndcz5czrlkq1pimh1zjr4";
+      rev = "5f19d1797ca5f05a0b7cccd69e644c690fa72899";
+      sha256 = "07a4qlypr6zqxr3m8sj9vpfd82pwpia6f7jcpkfilqzmdyrdvn5l";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -15480,6 +15540,18 @@ final: prev:
     meta.homepage = "https://github.com/rose-pine/neovim/";
   };
 
+  tinykeymap = buildVimPluginFrom2Nix {
+    pname = "tinykeymap";
+    version = "2019-03-15";
+    src = fetchFromGitHub {
+      owner = "tomtom";
+      repo = "tinykeymap_vim";
+      rev = "be48fc729244f84c2d293c3db18420e7f5d74bb8";
+      sha256 = "1w4zplg0mbiv9jp70cnzb1aw5xx3x8ibnm38vsapvspzy9h8ygqx";
+    };
+    meta.homepage = "https://github.com/tomtom/tinykeymap_vim/";
+  };
+
   vim-advanced-sorters = buildVimPluginFrom2Nix {
     pname = "vim-advanced-sorters";
     version = "2021-11-21";

From 5320d2d29f9b66c03d6c93dd050cb40a64a81710 Mon Sep 17 00:00:00 2001
From: Danil Suetin <suetin085@gmail.com>
Date: Sun, 4 Jun 2023 00:39:09 +0700
Subject: [PATCH 62/83] libimobiledevice: switch to OpenSSL

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

diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index 8ce6bc04df89..000649100313 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , autoreconfHook
 , pkg-config
-, gnutls
+, openssl
 , libgcrypt
 , libplist
 , libtasn1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    gnutls
+    openssl
     libgcrypt
     libplist
     libtasn1
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     export RELEASE_VERSION=${version}
   '';
 
-  configureFlags = [ "--with-gnutls" "--without-cython" ];
+  configureFlags = [ "--without-cython" ];
 
   meta = with lib; {
     homepage = "https://github.com/libimobiledevice/libimobiledevice";

From 63307035bbce8728d0d6f826fc91ef3c92569e37 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <jholdsworth@nvidia.com>
Date: Thu, 29 Jun 2023 13:12:10 +0100
Subject: [PATCH 63/83] vimPlugins.nvim-treesitter: update grammars

---
 .../vim/plugins/nvim-treesitter/generated.nix | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 34a85920801a..65f988e80184 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -590,12 +590,12 @@
   };
   gitcommit = buildGrammar {
     language = "gitcommit";
-    version = "0.0.0+rev=5e3263c";
+    version = "0.0.0+rev=6856a5f";
     src = fetchFromGitHub {
       owner = "gbprod";
       repo = "tree-sitter-gitcommit";
-      rev = "5e3263c856d2de7ecbcfb646352c8e29dc2b83e6";
-      hash = "sha256-Hzck3DfxzWz30ma52CbzC/Wyiqx2BlKoaqtiYgPKl/o=";
+      rev = "6856a5fd0ffeff17d83325a8ce4e57811010eff1";
+      hash = "sha256-OD+lGLsMRFRPHwnXoM78t95QvjO0OQN4ae3z3wy5DO4=";
     };
     meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
   };
@@ -821,12 +821,12 @@
   };
   html = buildGrammar {
     language = "html";
-    version = "0.0.0+rev=03e9435";
+    version = "0.0.0+rev=ab91d87";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-html";
-      rev = "03e9435d5a95e3fcb9d7e2720c2aac5fc1b9ae8f";
-      hash = "sha256-iDdWrjvj7f4COanuqcRZQNpAJypLPQc7vbwrO8bSYnE=";
+      rev = "ab91d87963c47ffd08a7967b9aa73eb53293d120";
+      hash = "sha256-OJ1RcYRU2A8y3taXe+sO+HnUt2o2G8tznwDzwPL0H7Y=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-html";
   };
@@ -997,12 +997,12 @@
   };
   kotlin = buildGrammar {
     language = "kotlin";
-    version = "0.0.0+rev=100d79f";
+    version = "0.0.0+rev=8d43d90";
     src = fetchFromGitHub {
       owner = "fwcd";
       repo = "tree-sitter-kotlin";
-      rev = "100d79fd96b56a1b99099a8d2f3c114b8687acfb";
-      hash = "sha256-+TLeB6S5MwbbxPZSvDasxAfTPV3YyjtR0pUTlFkdphc=";
+      rev = "8d43d90d568a97afee0891949d7cead3294ca94d";
+      hash = "sha256-nY+tGg8aD7ayAhE5HTBsrVMyYBl1lfjXmcTTYuYTSbY=";
     };
     meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
   };
@@ -1729,12 +1729,12 @@
   };
   sql = buildGrammar {
     language = "sql";
-    version = "0.0.0+rev=7bd15d1";
+    version = "0.0.0+rev=bd53a6c";
     src = fetchFromGitHub {
       owner = "derekstride";
       repo = "tree-sitter-sql";
-      rev = "7bd15d1ca789c5aaef5d2dbfdb14565ec8223d1b";
-      hash = "sha256-yX1Ttwl+GgmguThHpIsnM/x3O57WY+u4NcChSdokHo0=";
+      rev = "bd53a6c482d865365cbfb034168ca78364d1d136";
+      hash = "sha256-JpEi+bX2e7fo1Cgp3VZNZlsK850nBnBGBsMnt6UrQTA=";
     };
     meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
   };
@@ -2097,6 +2097,19 @@
     };
     meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy";
   };
+  wing = buildGrammar {
+    language = "wing";
+    version = "0.0.0+rev=bb54f98";
+    src = fetchFromGitHub {
+      owner = "winglang";
+      repo = "wing";
+      rev = "bb54f98e55db82d67711abadefdbd3b933c9efc3";
+      hash = "sha256-z4n4VneiCfCoEg7GHa8GAyUYAbJkoe973aPMUEheU+Y=";
+    };
+    location = "libs/tree-sitter-wing";
+    generate = true;
+    meta.homepage = "https://github.com/winglang/wing";
+  };
   yaml = buildGrammar {
     language = "yaml";
     version = "0.0.0+rev=0e36bed";

From 82970f8b1e8a9db4a6edbd28bf6a62978d72c08a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 29 Jun 2023 20:13:07 +0800
Subject: [PATCH 64/83] nixos/pantheon: Stop shipping gnome-bluetooth-contract
 by default

The functionality is now covered by wingpanel-indicator-bluetooth 7.0.0.
---
 nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 0db4cca520f3..e87ae5ae8124 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -315,7 +315,6 @@ in
       environment.systemPackages = with pkgs.pantheon; [
         contractor
         file-roller-contract
-        gnome-bluetooth-contract
       ];
 
       environment.pathsToLink = [

From 54067c54a92e7c9f038478bbd5d4b2b65cc967f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 Jun 2023 10:06:16 +0000
Subject: [PATCH 65/83] oh-my-zsh: 2023-06-26 -> 2023-06-26

---
 pkgs/shells/zsh/oh-my-zsh/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 7eb37db64d48..be67c6e14e35 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -7,13 +7,12 @@
 stdenv.mkDerivation rec {
   version = "2023-06-26";
   pname = "oh-my-zsh";
-  rev = "d5f1f50ad2d62363785464d5b6eef1a009243d7a";
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "sha256-QN4UTsug7pA0VjA18n/Yek77lwooVaYHZDSCr579iAk=";
+    rev = "8cbe98469d9862d37d43ca4229dc8e915ec377a9";
+    sha256 = "sha256-/bFD1z/icQe4OfVcudMjIbkCh7MU6pEZiKBOYOFiCXs=";
   };
 
   strictDeps = true;

From df47c2b62090ec044cef5851cdbe2dee849c7b78 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 29 Jun 2023 14:31:47 +0200
Subject: [PATCH 66/83] python311Packages.alexapy: init at 1.26.8

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

diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix
new file mode 100644
index 000000000000..559e00e3c81c
--- /dev/null
+++ b/pkgs/development/python-modules/alexapy/default.nix
@@ -0,0 +1,81 @@
+{ lib
+, aiofiles
+, aiohttp
+, authcaptureproxy
+, backoff
+, beautifulsoup4
+, buildPythonPackage
+, certifi
+, cryptography
+, fetchFromGitLab
+, fetchpatch
+, poetry-core
+, pyotp
+, pythonOlder
+, pythonRelaxDepsHook
+, requests
+, simplejson
+, yarl
+}:
+
+buildPythonPackage rec {
+  pname = "alexapy";
+  version = "1.26.8";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitLab {
+    owner = "keatontaylor";
+    repo = "alexapy";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-AjtSEqUbJ5e/TZIYMX+pwBSH35tEVrfCA6H/55yrZsk=";
+  };
+
+  patches = [
+    # Switch to poetry-core, https://gitlab.com/keatontaylor/alexapy/-/merge_requests/342
+    (fetchpatch {
+      name = "switch-poetry-core.patch";
+      url = "https://gitlab.com/keatontaylor/alexapy/-/commit/843daec4ba1fb219f1c4f4a6ca01c9af73014e53.patch";
+      hash = "sha256-wlCq0/NJx4Adh/o61FSMWMQU99PZkJ0U2yqxqOfvAa8=";
+    })
+  ];
+
+  pythonRelaxDeps = [
+    "aiofiles"
+  ];
+
+  nativeBuildInputs = [
+    poetry-core
+    pythonRelaxDepsHook
+  ];
+
+  propagatedBuildInputs = [
+    aiofiles
+    aiohttp
+    authcaptureproxy
+    backoff
+    beautifulsoup4
+    certifi
+    cryptography
+    pyotp
+    requests
+    simplejson
+    yarl
+  ];
+
+  pythonImportsCheck = [
+    "alexapy"
+  ];
+
+  # Module has no tests (only a websocket test which seems unrelated to the module)
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python Package for controlling Alexa devices (echo dot, etc) programmatically";
+    homepage = "https://gitlab.com/keatontaylor/alexapy";
+    changelog = "https://gitlab.com/keatontaylor/alexapy/-/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 64c10db8a897..2d44f594d1a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -412,6 +412,8 @@ self: super: with self; {
 
   alembic = callPackage ../development/python-modules/alembic { };
 
+  alexapy = callPackage ../development/python-modules/alexapy { };
+
   algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { };
 
   aliyun-python-sdk-cdn = callPackage ../development/python-modules/aliyun-python-sdk-cdn { };

From 81ec36bd8229cb40112e1ad7bc2ed1dc09e9d924 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Jun 2023 05:39:36 -0700
Subject: [PATCH 67/83] python310Packages.mbstrdecoder: 1.1.2 -> 1.1.3
 (#240468)

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 .../python-modules/mbstrdecoder/default.nix   | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/mbstrdecoder/default.nix b/pkgs/development/python-modules/mbstrdecoder/default.nix
index e43c4dbfce81..550c69ba006c 100644
--- a/pkgs/development/python-modules/mbstrdecoder/default.nix
+++ b/pkgs/development/python-modules/mbstrdecoder/default.nix
@@ -1,6 +1,7 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchFromGitHub
-, lib
+, setuptools
 , chardet
 , pytestCheckHook
 , faker
@@ -8,19 +9,31 @@
 
 buildPythonPackage rec {
   pname = "mbstrdecoder";
-  version = "1.1.2";
+  version = "1.1.3";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "thombashi";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-vLlCS5gnc7NgDN4cEZSxxInzbEq4HXAXmvlVfwn3cSM=";
+    hash = "sha256-GcAxXcCYC2XAE8xu/jdDxjPxkLJzbmvWZ3OgmcvQcmk=";
   };
 
-  propagatedBuildInputs = [ chardet ];
+  nativeBuildInputs = [
+    setuptools
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
-  checkInputs = [ faker ];
+  propagatedBuildInputs = [
+    chardet
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  checkInputs = [
+    faker
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/thombashi/mbstrdecoder";

From 3b8ce5ec0e8bf757df943613c320be16c26acae1 Mon Sep 17 00:00:00 2001
From: mdarocha <git@mdarocha.pl>
Date: Thu, 29 Jun 2023 17:01:48 +0200
Subject: [PATCH 68/83] spicetify-cli: 2.20.1 -> 2.20.3

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

diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix
index f505d0f0ca0b..9713be07e52f 100644
--- a/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/pkgs/applications/misc/spicetify-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "spicetify-cli";
-  version = "2.20.1";
+  version = "2.20.3";
 
   src = fetchFromGitHub {
     owner = "spicetify";
     repo = "spicetify-cli";
     rev = "v${version}";
-    hash = "sha256-VcTvtB/q4+n4DlYG8/QQ014Yqn+pmXoRyZx4Ldwu7Lc=";
+    hash = "sha256-1Auvx2KZ97iD9EDm6QQdgS5YF9smw4dTvXF1IXtYrSI=";
   };
 
   vendorHash = "sha256-61j3HVDe6AbXpdmxhQQctv4C2hNBK/rWvZeC+KtISKY=";

From 1543c5f4f4424af8c0b79c8cab8caf61ea4415d9 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 28 Jun 2023 17:07:25 +0100
Subject: [PATCH 69/83] python3Packages.pylddwrap: patch to use ldd from
 stdenv.cc.bintools.libc_bin

---
 .../python-modules/pylddwrap/default.nix      | 19 ++++++++++----
 .../replace_env_with_placeholder.patch        | 25 +++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/python-modules/pylddwrap/replace_env_with_placeholder.patch

diff --git a/pkgs/development/python-modules/pylddwrap/default.nix b/pkgs/development/python-modules/pylddwrap/default.nix
index 6c8a5159f987..3f150b69f9b8 100644
--- a/pkgs/development/python-modules/pylddwrap/default.nix
+++ b/pkgs/development/python-modules/pylddwrap/default.nix
@@ -1,10 +1,11 @@
 { lib
+, stdenv
 , buildPythonPackage
-, coreutils
 , fetchFromGitHub
 , icontract
 , pytestCheckHook
 , pythonOlder
+, substituteAll
 , typing-extensions
 }:
 
@@ -21,10 +22,12 @@ buildPythonPackage rec {
     hash = "sha256-Gm82VRu8GP52BohQzpMUJfh6q2tiUA2GJWOcG7ymGgg=";
   };
 
-  postPatch = ''
-    substituteInPlace lddwrap/__init__.py \
-      --replace '/usr/bin/env' '${coreutils}/bin/env'
-  '';
+  patches = [
+    (substituteAll {
+      src = ./replace_env_with_placeholder.patch;
+      ldd_bin = "${stdenv.cc.bintools.libc_bin}/bin/ldd";
+    })
+  ];
 
   # Upstream adds some plain text files direct to the package's root directory
   # https://github.com/Parquery/pylddwrap/blob/master/setup.py#L71
@@ -39,6 +42,12 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  # uses mocked ldd from PATH, but we are patching the source to not look at PATH
+  disabledTests = [
+    "TestAgainstMockLdd"
+    "TestMain"
+  ];
+
   pythonImportsCheck = [ "lddwrap" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/pylddwrap/replace_env_with_placeholder.patch b/pkgs/development/python-modules/pylddwrap/replace_env_with_placeholder.patch
new file mode 100644
index 000000000000..676b0c10b4a9
--- /dev/null
+++ b/pkgs/development/python-modules/pylddwrap/replace_env_with_placeholder.patch
@@ -0,0 +1,25 @@
+diff --git a/lddwrap/__init__.py b/lddwrap/__init__.py
+index 1222c97..db8a735 100644
+--- a/lddwrap/__init__.py
++++ b/lddwrap/__init__.py
+@@ -190,10 +190,8 @@ def list_dependencies(path: pathlib.Path,
+         Otherwise specified env is used.
+     :return: list of dependencies
+     """
+-    # We need to use /usr/bin/env since Popen ignores the PATH,
+-    # see https://stackoverflow.com/questions/5658622
+     proc = subprocess.Popen(
+-        ["/usr/bin/env", "ldd", path.as_posix()],
++        ["@ldd_bin@", path.as_posix()],
+         stdout=subprocess.PIPE,
+         stderr=subprocess.PIPE,
+         universal_newlines=True,
+@@ -209,7 +207,7 @@ def list_dependencies(path: pathlib.Path,
+ 
+     if unused:
+         proc_unused = subprocess.Popen(
+-            ["/usr/bin/env", "ldd", "--unused",
++            ["@ldd_bin@", "--unused",
+              path.as_posix()],
+             stdout=subprocess.PIPE,
+             stderr=subprocess.PIPE,

From ff64c0940946ec860b4f72142756dec8e1f63d3e Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 29 Jun 2023 12:54:52 +0100
Subject: [PATCH 70/83] python3Packages.pylddwrap: mark it as badPlatform in
 darwin

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

diff --git a/pkgs/development/python-modules/pylddwrap/default.nix b/pkgs/development/python-modules/pylddwrap/default.nix
index 3f150b69f9b8..d228c1a39ec9 100644
--- a/pkgs/development/python-modules/pylddwrap/default.nix
+++ b/pkgs/development/python-modules/pylddwrap/default.nix
@@ -56,5 +56,8 @@ buildPythonPackage rec {
     changelog = "https://github.com/Parquery/pylddwrap/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ thiagokokada ];
+    # should work in any Unix platform that uses glibc, except for darwin
+    # since it has its own tool (`otool`)
+    badPlatforms = platforms.darwin;
   };
 }

From 39d8b1462ed86d425368fc34e0581685109a43f4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 29 Jun 2023 17:44:56 +0300
Subject: [PATCH 71/83] gitoxide: fix build on x86_64-darwin

---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ca4cfe58485..01d55baa57fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1956,8 +1956,8 @@ with pkgs;
 
   gita = python3Packages.callPackage ../applications/version-management/gita { };
 
-  gitoxide = callPackage ../applications/version-management/gitoxide {
-    inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
+  gitoxide = darwin.apple_sdk_11_0.callPackage ../applications/version-management/gitoxide {
+    inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration;
   };
 
   gg-scm = callPackage ../applications/version-management/gg { };

From 18c734d7f2ca4e86730808b8b4900363cb705ed3 Mon Sep 17 00:00:00 2001
From: Arthur Gautier <arthur.gautier@arista.com>
Date: Sat, 3 Jun 2023 19:43:20 -0700
Subject: [PATCH 72/83] nixosTest: adds support for lib.extend

When lib overrides were used, before this commit, they would not be made
available in the configuration evaluation of nixosTest's nodes.

Sample code:
``` nix
let
  pkgs = import ./. {
    overlays = [
      (new: old: {
        lib = old.lib.extend (self: super: {
          sorry_dave = builtins.trace "There are no pod bay doors" "sorry dave";
        });
      })
    ];
  };
in
pkgs.testers.nixosTest {
  name = "demo lib overlay";

  nodes = {
    machine = { lib, ... }: {
      environment.etc."got-lib-overlay".text = lib.sorry_dave;
    };
  };

  testScript = { nodes }:
    ''
      start_all()
      machine.succeed('grep dave /etc/got-lib-overlay')
    '';
}
```
---
 nixos/lib/testing/nodes.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix
index 6e439fd814db..f58759b4cdba 100644
--- a/nixos/lib/testing/nodes.nix
+++ b/nixos/lib/testing/nodes.nix
@@ -16,6 +16,7 @@ let
 
   baseOS =
     import ../eval-config.nix {
+      inherit lib;
       system = null; # use modularly defined system
       inherit (config.node) specialArgs;
       modules = [ config.defaults ];

From 562f879cd173525076b79fc9b04de77004ad37c8 Mon Sep 17 00:00:00 2001
From: Arthur Gautier <arthur.gautier@arista.com>
Date: Wed, 14 Jun 2023 23:12:44 -0700
Subject: [PATCH 73/83] runNixOSTest: adds support for lib.extend

When lib overrides were used, before this commit, they would not be made
available in the configuration evaluation of nixosTest's nodes.

Sample code:
``` nix
let
  pkgs = import ./. {
    overlays = [
      (new: old: {
        lib = old.lib.extend (self: super: {
          sorry_dave = builtins.trace "There are no pod bay doors" "sorry dave";
        });
      })
    ];
  };
in
pkgs.testers.runNixOSTest {
  name = "demo lib overlay";

  nodes = {
    machine = { lib, ... }: {
      environment.etc."got-lib-overlay".text = lib.sorry_dave;
    };
  };

  testScript = { nodes }:
    ''
      start_all()
      machine.succeed('grep dave /etc/got-lib-overlay')
    '';
}
```
---
 pkgs/build-support/testers/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix
index 190ce72d0e63..d380dc6f30e1 100644
--- a/pkgs/build-support/testers/default.nix
+++ b/pkgs/build-support/testers/default.nix
@@ -97,7 +97,9 @@
   # See doc/builders/testers.chapter.md or
   # https://nixos.org/manual/nixpkgs/unstable/#tester-runNixOSTest
   runNixOSTest =
-    let nixos = import ../../../nixos/lib {};
+    let nixos = import ../../../nixos/lib {
+      inherit lib;
+    };
     in testModule:
         nixos.runTest {
           _file = "pkgs.runNixOSTest implementation";

From 933851135002dcc5564ac51263b5e24a5bb14ecc Mon Sep 17 00:00:00 2001
From: Arthur Gautier <arthur.gautier@arista.com>
Date: Sat, 3 Jun 2023 20:10:20 -0700
Subject: [PATCH 74/83] nixosTest: provide a test for lib.extend in nixosTests
 & runNixOSTest

---
 nixos/tests/all-tests.nix                    |  1 +
 nixos/tests/nixos-test-driver/lib-extend.nix | 31 ++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 nixos/tests/nixos-test-driver/lib-extend.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1b90b3e13807..02bef2039075 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -87,6 +87,7 @@ in {
   # Testing the test driver
   nixos-test-driver = {
     extra-python-packages = handleTest ./nixos-test-driver/extra-python-packages.nix {};
+    lib-extend = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nixos-test-driver/lib-extend.nix {};
     node-name = runTest ./nixos-test-driver/node-name.nix;
   };
 
diff --git a/nixos/tests/nixos-test-driver/lib-extend.nix b/nixos/tests/nixos-test-driver/lib-extend.nix
new file mode 100644
index 000000000000..4fb7cf494aed
--- /dev/null
+++ b/nixos/tests/nixos-test-driver/lib-extend.nix
@@ -0,0 +1,31 @@
+{ pkgs, ... }:
+
+let
+  patchedPkgs = pkgs.extend (new: old: {
+    lib = old.lib.extend (self: super: {
+      sorry_dave = "sorry dave";
+    });
+  });
+
+  testBody = {
+    name = "demo lib overlay";
+
+    nodes = {
+      machine = { lib, ... }: {
+        environment.etc."got-lib-overlay".text = lib.sorry_dave;
+      };
+    };
+
+    # We don't need to run an actual test. Instead we build the `machine` configuration
+    # and call it a day, because that already proves that `lib` is wired up correctly.
+    # See the attrset returned at the bottom of this file.
+    testScript = "";
+  };
+
+  inherit (patchedPkgs.testers) nixosTest runNixOSTest;
+  evaluationNixosTest = nixosTest testBody;
+  evaluationRunNixOSTest = runNixOSTest testBody;
+in {
+  nixosTest = evaluationNixosTest.driver.nodes.machine.system.build.toplevel;
+  runNixOSTest = evaluationRunNixOSTest.driver.nodes.machine.system.build.toplevel;
+}

From e1140d1002692e8ecf1e3d0fe1d9d04f7fd248ea Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 29 Jun 2023 12:17:53 -0400
Subject: [PATCH 75/83] typos: 1.15.7 -> 1.15.8

Diff: https://github.com/crate-ci/typos/compare/v1.15.7...v1.15.8

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

diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix
index f99257fee592..77ead21545bd 100644
--- a/pkgs/development/tools/typos/default.nix
+++ b/pkgs/development/tools/typos/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "typos";
-  version = "1.15.7";
+  version = "1.15.8";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-x4ydM6xDls/7otR8toDEZVk/dKBGHB1+3K1RdRGg9eI=";
+    hash = "sha256-yF3uvh7iM5Pqjp1VbgHAcVL4RC/GWlqc8Hc957RhAYw=";
   };
 
-  cargoHash = "sha256-tc0Bf5n4pKwAExps84kSgI0rP2BwvuMRdFEqU0qlDdg=";
+  cargoHash = "sha256-WT2pEcEst6KfHLg/9xeAA/oViDMGwzRsux1FvEHddyk=";
 
   meta = with lib; {
     description = "Source code spell checker";

From 4cb579b5369a5a0029460bf11f5e17f4ef44ba2d Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Thu, 29 Jun 2023 12:24:17 -0700
Subject: [PATCH 76/83] lib.systems: add gnuabin32 to isGnu

The `isGnu` predicate was missing `gnuabin32`.  This commit corrects
that by adding it.
---
 lib/systems/inspect.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 89e9f4231d97..022e459c3945 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -87,7 +87,7 @@ rec {
     isNone         = { kernel = kernels.none; };
 
     isAndroid      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
-    isGnu          = with abis; map (a: { abi = a; }) [ gnuabi64 gnu gnueabi gnueabihf gnuabielfv1 gnuabielfv2 ];
+    isGnu          = with abis; map (a: { abi = a; }) [ gnuabi64 gnuabin32 gnu gnueabi gnueabihf gnuabielfv1 gnuabielfv2 ];
     isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ];
     isUClibc       = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];
 

From 906102c9115bc350ee95e1d5bc3c4c171c1a3af1 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Thu, 29 Jun 2023 21:38:37 +0200
Subject: [PATCH 77/83] doc/languages-frameworks/python: don't use full `pkgs`
 in attrs

---
 doc/languages-frameworks/python.section.md | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index d9a13aef6e60..23c8526787b7 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -512,9 +512,10 @@ when building the bindings and are therefore added as `buildInputs`.
 
 ```nix
 { lib
-, pkgs
 , buildPythonPackage
 , fetchPypi
+, libxml2
+, libxslt
 }:
 
 buildPythonPackage rec {
@@ -528,8 +529,8 @@ buildPythonPackage rec {
   };
 
   buildInputs = [
-    pkgs.libxml2
-    pkgs.libxslt
+    libxml2
+    libxslt
   ];
 
   meta = with lib; {
@@ -554,11 +555,13 @@ therefore we have to set `LDFLAGS` and `CFLAGS`.
 
 ```nix
 { lib
-, pkgs
 , buildPythonPackage
 , fetchPypi
 
 # dependencies
+, fftw
+, fftwFloat
+, fftwLongDouble
 , numpy
 , scipy
 }:
@@ -574,9 +577,9 @@ buildPythonPackage rec {
   };
 
   buildInputs = [
-    pkgs.fftw
-    pkgs.fftwFloat
-    pkgs.fftwLongDouble
+    fftw
+    fftwFloat
+    fftwLongDouble
   ];
 
   propagatedBuildInputs = [
@@ -585,8 +588,8 @@ buildPythonPackage rec {
   ];
 
   preConfigure = ''
-    export LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib"
-    export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include"
+    export LDFLAGS="-L${fftw.dev}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib"
+    export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include"
   '';
 
   # Tests cannot import pyfftw. pyfftw works fine though.

From a3cdf3186fd7e2a8dde319cea656ddf0958421bf Mon Sep 17 00:00:00 2001
From: apfelkuchen6 <73002165+apfelkuchen6@users.noreply.github.com>
Date: Thu, 29 Jun 2023 22:12:05 +0200
Subject: [PATCH 78/83] texlive.bin.core-big: fix luajittex on aarch64-linux
 (#240577)

---
 pkgs/test/texlive/default.nix              |  5 +----
 pkgs/tools/typesetting/tex/texlive/bin.nix | 10 ++++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix
index cea3e621ebf7..ae0e913a7600 100644
--- a/pkgs/test/texlive/default.nix
+++ b/pkgs/test/texlive/default.nix
@@ -222,10 +222,7 @@
         "convertgls2bib" "ctan-o-mat" "ctanify" "ctanupload" "dtxgen" "ebong" "epspdftk" "exceltex" "gsx" "htcontext"
         "installfont-tl" "kanji-fontmap-creator" "ketcindy" "latex-git-log" "latex2nemeth" "ltxfileinfo" "match_parens"
         "pdfannotextractor" "purifyeps" "pythontex" "svn-multi" "texexec" "texosquery" "texosquery-jre5"
-        "texosquery-jre8" "texplate" "tlcockpit" "tlmgr" "tlshell" "ulqda" "xhlatex" ]
-        # texluajitc is seemingly outdated and broken on native Linux aarch64
-        # some info at https://github.com/NixOS/nixpkgs/pull/239804#issuecomment-1609832232
-        ++ lib.optional (with stdenv; isAarch64 && isLinux) "texluajitc";
+        "texosquery-jre8" "texplate" "tlcockpit" "tlmgr" "tlshell" "ulqda" "xhlatex" ];
       # (1) binaries requiring -v
       shortVersion = [ "devnag" "diadia" "pmxchords" "ptex2pdf" "simpdftex" "ttf2afm" ];
       # (1) binaries requiring --help or -h
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index c66a776cccc3..c62b1165bba5 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -214,6 +214,16 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
       excludes = [  "build.sh" ];
       stripLen = 1;
     })
+    # Fixes texluajitc crashes on aarch64, backport of the upstream fix
+    # https://github.com/LuaJIT/LuaJIT/commit/e9af1abec542e6f9851ff2368e7f196b6382a44c
+    # to the version vendored by texlive (2.1.0-beta3)
+    (fetchpatch {
+      name = "luajit-fix-aarch64-linux.patch";
+      url = "https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/LuaJIT/patches/e9af1abec542e6f9851ff2368e7f196b6382a44c.patch";
+      hash = "sha256-ysSZmfpfCFMukfHmIqwofAZux1e2kEq/37lfqp7HoWo=";
+      stripLen = 1;
+      extraPrefix = "libs/luajit/LuaJIT-src/";
+    })
   ];
 
   hardeningDisable = [ "format" ];

From 5a8650469a9f8a1958ff9373bd27fb8e54c4365d Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 29 Jun 2023 16:54:40 -0400
Subject: [PATCH 79/83] python310Packages.awkward: 2.2.2 -> 2.2.3 (#240266)

python310Packages.awkward-cpp: 16 -> 17
---
 pkgs/development/python-modules/awkward-cpp/default.nix | 4 ++--
 pkgs/development/python-modules/awkward/default.nix     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix
index 95386c30c8fb..c64d29d03990 100644
--- a/pkgs/development/python-modules/awkward-cpp/default.nix
+++ b/pkgs/development/python-modules/awkward-cpp/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "awkward-cpp";
-  version = "16";
+  version = "17";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yE1dWFaw4kL6g38NtggIfZWJVheb1VN36jk/E5wbm4Y=";
+    hash = "sha256-gTO7rxgkjdUgSkF6Ztq5bhti5VUpsrhocOLz7L6xllE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index 76ffbc3d91a5..85f504f49ab4 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "2.2.2";
+  version = "2.2.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Lui3ZJrEkPEGc5yz1M9R8wPDedNw6Iyf4sIZCoWR11M=";
+    hash = "sha256-yx/z8lTqVWnMTp7TlH+rtAHb3cskm1iViZedhfs0EUI=";
   };
 
   nativeBuildInputs = [

From c57bc5f8129dd25337ad155f22fed3e3809dfe67 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 29 Jun 2023 16:55:08 -0400
Subject: [PATCH 80/83] python310Packages.dask-awkward: 2023.6.1 -> 2023.6.3
 (#240267)

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

diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix
index eaff8eb01199..c255857d4c05 100644
--- a/pkgs/development/python-modules/dask-awkward/default.nix
+++ b/pkgs/development/python-modules/dask-awkward/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "dask-awkward";
-  version = "2023.6.1";
+  version = "2023.6.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "dask-contrib";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-+3+DABzHque0Iz5boxJQ7YCU52k0eHu2YCgomMTi4+4=";
+    hash = "sha256-2Ejt1fyh8Z81WI+oIFWZxr4M1vfgs6tB4jCCMxBz2Rc=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 1cdf0bddc87728e9f7e54eff693f0d62e0377096 Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@users.noreply.github.com>
Date: Fri, 30 Jun 2023 07:29:24 +0800
Subject: [PATCH 81/83] moonlight-qt: Support darwin (#239600)

---
 .../misc/moonlight-qt/darwin.diff             | 38 +++++++++++++++++++
 .../misc/moonlight-qt/default.nix             | 26 +++++++++++--
 pkgs/top-level/all-packages.nix               |  5 ++-
 3 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/misc/moonlight-qt/darwin.diff

diff --git a/pkgs/applications/misc/moonlight-qt/darwin.diff b/pkgs/applications/misc/moonlight-qt/darwin.diff
new file mode 100644
index 000000000000..f5406087ae0a
--- /dev/null
+++ b/pkgs/applications/misc/moonlight-qt/darwin.diff
@@ -0,0 +1,38 @@
+--- a/app/app.pro	2023-06-24 19:10:00.653377668 +0800
++++ b/app/app.pro	2023-06-24 19:20:06.632188299 +0800
+@@ -49,19 +49,8 @@
+     INCLUDEPATH += $$PWD/../libs/windows/include
+     LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib
+ }
+-macx {
+-    INCLUDEPATH += $$PWD/../libs/mac/include
+-    INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2.framework/Versions/A/Headers
+-    INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2_ttf.framework/Versions/A/Headers
+-    LIBS += -L$$PWD/../libs/mac/lib -F$$PWD/../libs/mac/Frameworks
+-
+-    # QMake doesn't handle framework-style includes correctly on its own
+-    QMAKE_CFLAGS += -F$$PWD/../libs/mac/Frameworks
+-    QMAKE_CXXFLAGS += -F$$PWD/../libs/mac/Frameworks
+-    QMAKE_OBJECTIVE_CFLAGS += -F$$PWD/../libs/mac/Frameworks
+-}
+ 
+-unix:!macx {
++unix {
+     CONFIG += link_pkgconfig
+     PKGCONFIG += openssl sdl2 SDL2_ttf opus
+ 
+@@ -120,13 +109,12 @@
+     CONFIG += soundio discord-rpc
+ }
+ macx {
+-    LIBS += -lssl -lcrypto -lavcodec.59 -lavutil.57 -lopus -framework SDL2 -framework SDL2_ttf
+     LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal
+ 
+     # For libsoundio
+     LIBS += -framework CoreAudio -framework AudioUnit
+ 
+-    CONFIG += ffmpeg soundio discord-rpc
++    CONFIG += ffmpeg soundio
+ }
+ 
+ SOURCES += \
diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix
index 3108d78e8ff8..cbbbdc4d7598 100644
--- a/pkgs/applications/misc/moonlight-qt/default.nix
+++ b/pkgs/applications/misc/moonlight-qt/default.nix
@@ -16,8 +16,13 @@
 , libopus
 , ffmpeg
 , wayland
+, darwin
 }:
 
+let
+  inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation AppKit AudioUnit VideoToolbox;
+in
+
 stdenv.mkDerivation rec {
   pname = "moonlight-qt";
   version = "4.3.1";
@@ -30,6 +35,8 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  patches = [ ./darwin.diff ];
+
   nativeBuildInputs = [
     wrapQtAppsHook
     pkg-config
@@ -40,17 +47,30 @@ stdenv.mkDerivation rec {
     qtquickcontrols2
     SDL2
     SDL2_ttf
+    openssl
+    libopus
+    ffmpeg
+  ] ++ lib.optionals stdenv.isLinux [
     libva
     libvdpau
     libxkbcommon
     alsa-lib
     libpulseaudio
-    openssl
-    libopus
-    ffmpeg
     wayland
+  ] ++ lib.optionals stdenv.isDarwin [
+    AVFoundation
+    AppKit
+    AudioUnit
+    VideoToolbox
   ];
 
+  postInstall = lib.optionalString stdenv.isDarwin ''
+    mkdir $out/Applications $out/bin
+    mv app/Moonlight.app $out/Applications
+    rm -r $out/Applications/Moonlight.app/Contents/Frameworks
+    ln -s $out/Applications/Moonlight.app/Contents/MacOS/Moonlight $out/bin/moonlight
+  '';
+
   meta = with lib; {
     description = "Play your PC games on almost any device";
     homepage = "https://moonlight-stream.org";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4da8fa870eb..b940d883ff73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32993,11 +32993,12 @@ with pkgs;
 
   moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { };
 
-  moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt {
+  moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt ({
+  } // lib.optionalAttrs stdenv.isLinux {
     SDL2 = buildPackages.SDL2.override {
       drmSupport = true;
     };
-  };
+  });
 
   mooSpace = callPackage ../applications/audio/mooSpace { };
 

From 1db464d40ae572a0613361aa761d7e9bbd6878e6 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 29 Jun 2023 00:03:41 +0200
Subject: [PATCH 82/83] doc/haskell: document {enable,disable}*Profiling
 functions

---
 doc/languages-frameworks/haskell.section.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index e3b4327bdb29..f3143d3b9557 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -1066,6 +1066,18 @@ benchmark component.
 `dontCoverage drv`
 : Sets the `doCoverage` argument to `false` for `drv`.
 
+`enableExecutableProfiling drv`
+: Sets the `enableExecutableProfiling` argument to `true` for `drv`.
+
+`disableExecutableProfiling drv`
+: Sets the `enableExecutableProfiling` argument to `false` for `drv`.
+
+`enableLibraryProfiling drv`
+: Sets the `enableLibraryProfiling` argument to `true` for `drv`.
+
+`disableLibraryProfiling drv`
+: Sets the `enableLibraryProfiling` argument to `false` for `drv`.
+
 #### Library functions in the Haskell package sets {#haskell-package-set-lib-functions}
 
 Some library functions depend on packages from the Haskell package sets. Thus they are

From 8088e14e12f21093cdb143c2234d34af7d331cde Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 29 Jun 2023 00:04:15 +0200
Subject: [PATCH 83/83] doc/haskell: FAQ entry on changing profiling settings
 globally

This is actually relatively complicated to achieve, since it involves
overriding GHC on e.g. aarch64-darwin, so the FAQ entry seems warranted.

It's also a good exercise to me, since it demonstrates some problems
with the overriding infrastructure, i.e. that it has a tendency to
inherit the pkgs fixpoint from prev. An example of this problem is
https://github.com/NixOS/nixpkgs/issues/235960, but it has different
manifestations as well. Awareness of this will also help writing the
other sections on overriding.

How complicated it is, seems to be further incentive to go ahead with
https://github.com/NixOS/nixpkgs/pull/239548 as well.
---
 doc/languages-frameworks/haskell.section.md | 118 ++++++++++++++++++++
 1 file changed, 118 insertions(+)

diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index f3143d3b9557..a4afbf0e456a 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -1152,6 +1152,124 @@ covered in the old [haskell4nix docs](https://haskell4nix.readthedocs.io/).
 If you feel any important topic is not documented at all, feel free to comment
 on the issue linked above.
 
+### How to enable or disable profiling builds globally? {#haskell-faq-override-profiling}
+
+By default, Nixpkgs builds a profiling version of each Haskell library. The
+exception to this rule are some platforms where it is disabled due to concerns
+over output size. You may want to…
+
+* …enable profiling globally so that you can build a project you are working on
+  with profiling ability giving you insight in the time spent across your code
+  and code you depend on using [GHC's profiling feature][profiling].
+
+* …disable profiling (globally) to reduce the time spent building the profiling
+  versions of libraries which a significant amount of build time is spent on
+  (although they are not as expensive as the “normal” build of a Haskell library).
+
+::: {.note}
+The method described below affects the build of all libraries in the
+respective Haskell package set as well as GHC. If your choices differ from
+Nixpkgs' default for your (host) platform, you will lose the ability to
+substitute from the official binary cache.
+
+If you are concerned about build times and thus want to disable profiling, it
+probably makes sense to use `haskell.lib.compose.disableLibraryProfiling` (see
+[](#haskell-trivial-helpers)) on the packages you are building locally while
+continuing to substitute their dependencies and GHC.
+:::
+
+Since we need to change the profiling settings for the desired Haskell package
+set _and_ GHC (as the core libraries like `base`, `filepath` etc. are bundled
+with GHC), it is recommended to use overlays for Nixpkgs to change them.
+Since the interrelated parts, i.e. the package set and GHC, are connected
+via the Nixpkgs fixpoint, we need to modify them both in a way that preserves
+their connection (or else we'd have to wire it up again manually). This is
+achieved by changing GHC and the package set in seperate overlays to prevent
+the package set from pulling in GHC from `prev`.
+
+The result is two overlays like the ones shown below. Adjustable parts are
+annotated with comments, as are any optional or alternative ways to achieve
+the desired profiling settings without causing too many rebuilds.
+
+<!-- TODO(@sternenseemann): buildHaskellPackages != haskellPackages with this overlay,
+affected by https://github.com/NixOS/nixpkgs/issues/235960 which needs to be fixed
+properly still.
+-->
+
+```nix
+let
+  # Name of the compiler and package set you want to change. If you are using
+  # the default package set `haskellPackages`, you need to look up what version
+  # of GHC it currently uses (note that this is subject to change).
+  ghcName = "ghc92";
+  # Desired new setting
+  enableProfiling = true;
+in
+
+[
+  # The first overlay modifies the GHC derivation so that it does or does not
+  # build profiling versions of the core libraries bundled with it. It is
+  # recommended to only use such an overlay if you are enabling profiling on a
+  # platform that doesn't by default, because compiling GHC from scratch is
+  # quite expensive.
+  (final: prev:
+  let
+    inherit (final) lib;
+  in
+
+  {
+    haskell = lib.recursiveUpdate prev.haskell {
+      compiler.${ghcName} = prev.haskell.compiler.${ghcName}.override {
+        # Unfortunately, the GHC setting is named differently for historical reasons
+        enableProfiledLibs = enableProfiling;
+      };
+    };
+  })
+
+  (final: prev:
+  let
+    inherit (final) lib;
+    haskellLib = final.haskell.lib.compose;
+  in
+
+  {
+    haskell = lib.recursiveUpdate prev.haskell {
+      packages.${ghcName} = prev.haskell.packages.${ghcName}.override {
+        overrides = hfinal: hprev: {
+          mkDerivation = args: hprev.mkDerivation (args // {
+            # Since we are forcing our ideas upon mkDerivation, this change will
+            # affect every package in the package set.
+            enableLibraryProfiling = enableProfiling;
+
+            # To actually use profiling on an executable, executable profiling
+            # needs to be enabled for the executable you want to profile. You
+            # can either do this globally or…
+            enableExecutableProfiling = enableProfiling;
+          });
+
+          # …only for the package that contains an executable you want to profile.
+          # That saves on unnecessary rebuilds for packages that you only depend
+          # on for their library, but also contain executables (e.g. pandoc).
+          my-executable = haskellLib.enableExecutableProfiling hprev.my-executable;
+
+          # If you are disabling profiling to save on build time, but want to
+          # retain the ability to substitute from the binary cache. Drop the
+          # override for mkDerivation above and instead have an override like
+          # this for the specific packages you are building locally and want
+          # to make cheaper to build.
+          my-library = haskellLib.disableLibraryProfiling hprev.my-library;
+        };
+      };
+    };
+  })
+]
+```
+
+<!-- TODO(@sternenseemann): write overriding mkDerivation, overriding GHC, and
+overriding the entire package set sections and link to them from here where
+relevant.
+-->
+
 [Stackage]: https://www.stackage.org
 [cabal-project-files]: https://cabal.readthedocs.io/en/latest/cabal-project.html
 [cabal2nix]: https://github.com/nixos/cabal2nix