From 3278ce100b61226f475fb222efcd11cbda81bf1c Mon Sep 17 00:00:00 2001
From: Enno Richter <enno@nerdworks.de>
Date: Thu, 8 Sep 2022 14:06:02 +0200
Subject: [PATCH 01/44] sslscan: enable TLS compression check

---
 pkgs/development/libraries/openssl/default.nix | 5 ++++-
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 0b4050c76cce..41fd083fc9d5 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv, fetchurl, buildPackages, perl, coreutils
 , withCryptodev ? false, cryptodev
+, withZlib ? false, zlib
 , enableSSL2 ? false
 , enableSSL3 ? false
 , static ? stdenv.hostPlatform.isStatic
@@ -71,7 +72,8 @@ let
     buildInputs = lib.optional withCryptodev cryptodev
       # perl is included to allow the interpreter path fixup hook to set the
       # correct interpreter in c_rehash.
-      ++ lib.optional withPerl perl;
+      ++ lib.optional withPerl perl
+      ++ lib.optional withZlib zlib;
 
     # TODO(@Ericson2314): Improve with mass rebuild
     configurePlatforms = [];
@@ -138,6 +140,7 @@ let
       # This introduces a reference to the CTLOG_FILE which is undesired when
       # trying to build binaries statically.
       ++ lib.optional static "no-ct"
+      ++ lib.optional withZlib "zlib"
       ;
 
     makeFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f241e01fbaf4..a342e482fc36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11216,7 +11216,9 @@ with pkgs;
 
   sshpass = callPackage ../tools/networking/sshpass { };
 
-  sslscan = callPackage ../tools/security/sslscan { };
+  sslscan = callPackage ../tools/security/sslscan {
+    openssl = openssl.override { withZlib = true; };
+  };
 
   sslmate = callPackage ../development/tools/sslmate { };
 

From 2e03c5e81dd265271234695a4b09cc9ed12e8bff Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 16 Dec 2022 14:33:24 +0100
Subject: [PATCH 02/44] openrgb-plugin-hardwaresync: init at 0.8

---
 .../openrgb-plugins/hardwaresync/default.nix  | 67 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix

diff --git a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix
new file mode 100644
index 000000000000..539c203325fb
--- /dev/null
+++ b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix
@@ -0,0 +1,67 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, fetchpatch
+, qtbase
+, openrgb
+, glib
+, libgtop
+, lm_sensors
+, qmake
+, pkg-config
+, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "openrgb-plugin-hardwaresync";
+  version = "0.8";
+
+  src = fetchFromGitLab {
+    owner = "OpenRGBDevelopers";
+    repo = "OpenRGBHardwareSyncPlugin";
+    rev = "release_${version}";
+    hash = "sha256-P+IitP8pQLUkBdMfcNw4fOggqyFfg6lNlnSfUGjddzo=";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "use-pkgconfig";
+      url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/df2869d679ea43119fb9b174cd0b2cb152022685.patch";
+      hash = "sha256-oBtrHwpvB8Z3xYi4ucDSuw+5WijPEbgBW7vLGELFjfw=";
+    })
+    (fetchpatch {
+      name = "add-install-rule";
+      url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/bfbaa0a32ed05112e0cc8b6b2a8229945596e522.patch";
+      hash = "sha256-76UMMzeXnyQRCEE1tGPNR5XSHTT480rQDnJ9hWhfIqY=";
+    })
+  ];
+
+  postPatch = ''
+    # Use the source of openrgb from nixpkgs instead of the submodule
+    rmdir OpenRGB
+    ln -s ${openrgb.src} OpenRGB
+    # Remove prebuilt stuff
+    rm -r dependencies/lhwm-cpp-wrapper
+  '';
+
+  buildInputs = [
+    qtbase
+    glib
+    libgtop
+    lm_sensors
+  ];
+
+  nativeBuildInputs = [
+    qmake
+    pkg-config
+    wrapQtAppsHook
+  ];
+
+  meta = with lib; {
+    homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin";
+    description = "Sync your ARGB devices colors with hardware measures (CPU, GPU, fan speed, etc...)";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ fgaz ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff8c19b68e34..dee1e1b3b740 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10333,6 +10333,8 @@ with pkgs;
 
   openrgb = libsForQt5.callPackage ../applications/misc/openrgb { };
 
+  openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { };
+
   openrussian-cli = callPackage ../misc/openrussian-cli {
     lua = lua5_3;
   };

From 9aac134336f7596d8d2f7bb1a6f141673776a5db Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 27 Jan 2023 11:33:58 +0100
Subject: [PATCH 03/44] openrgb: add withPlugins

---
 pkgs/applications/misc/openrgb/default.nix | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix
index ea81b58a2098..bd1664e85ff5 100644
--- a/pkgs/applications/misc/openrgb/default.nix
+++ b/pkgs/applications/misc/openrgb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools }:
+{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools, symlinkJoin, openrgb }:
 
 stdenv.mkDerivation rec {
   pname = "openrgb";
@@ -25,6 +25,29 @@ stdenv.mkDerivation rec {
     HOME=$TMPDIR $out/bin/openrgb --help > /dev/null
   '';
 
+  passthru.withPlugins = plugins:
+    let pluginsDir = symlinkJoin {
+      name = "openrgb-plugins";
+      paths = plugins;
+      # Remove all library version symlinks except one,
+      # or they will result in duplicates in the UI.
+      # We leave the one pointing to the actual library, usually the most
+      # qualified one (eg. libOpenRGBHardwareSyncPlugin.so.1.0.0).
+      postBuild = ''
+        for f in $out/lib/*; do
+          if [ "$(dirname $(readlink "$f"))" == "." ]; then
+            rm "$f"
+          fi
+        done
+      '';
+    };
+    in openrgb.overrideAttrs (old: {
+      qmakeFlags = old.qmakeFlags or [] ++ [
+        # Welcome to Escape Hell, we have backslashes
+        ''DEFINES+=OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\""${lib.escape ["\\" "\"" " "] (toString pluginsDir)}/lib\\\""''
+      ];
+    });
+
   meta = with lib; {
     description = "Open source RGB lighting control";
     homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB";

From 9e01b53234f2a242a51c7fb7f598121f1092cdcf Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 27 Jan 2023 11:34:22 +0100
Subject: [PATCH 04/44] openrgb-with-all-plugins: init

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dee1e1b3b740..57aedd789b3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10333,6 +10333,8 @@ with pkgs;
 
   openrgb = libsForQt5.callPackage ../applications/misc/openrgb { };
 
+  openrgb-with-all-plugins = openrgb.withPlugins [ openrgb-plugin-hardwaresync ];
+
   openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { };
 
   openrussian-cli = callPackage ../misc/openrussian-cli {

From ac2d27b1c27eeed834652bed2b0cd30fbfe2e84e Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 6 Feb 2023 15:33:36 +0100
Subject: [PATCH 05/44] openrgb-plugin-effects: init at 0.8

---
 .../misc/openrgb-plugins/effects/default.nix  | 59 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 ++-
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/openrgb-plugins/effects/default.nix

diff --git a/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/pkgs/applications/misc/openrgb-plugins/effects/default.nix
new file mode 100644
index 000000000000..05cdd0ce5cc3
--- /dev/null
+++ b/pkgs/applications/misc/openrgb-plugins/effects/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, fetchpatch
+, qtbase
+, openrgb
+, glib
+, openal
+, qmake
+, pkg-config
+, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "openrgb-plugin-effects";
+  version = "0.8";
+
+  src = fetchFromGitLab {
+    owner = "OpenRGBDevelopers";
+    repo = "OpenRGBEffectsPlugin";
+    rev = "release_${version}";
+    hash = "sha256-2F6yeLWgR0wCwIj75+d1Vdk45osqYwRdenK21lcRoOg=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    # Add install rule
+    (fetchpatch {
+      url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/commit/75f1b3617d9cabfb3b04a7afc75ce0c1b8514bc0.patch";
+      hash = "sha256-X+zMNE3OCZNmUb68S4683r/RbE+CDrI/Jv4BMWPI47E=";
+    })
+  ];
+
+  postPatch = ''
+    # Use the source of openrgb from nixpkgs instead of the submodule
+    rm -r OpenRGB
+    ln -s ${openrgb.src} OpenRGB
+  '';
+
+  nativeBuildInputs = [
+    qmake
+    pkg-config
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qtbase
+    glib
+    openal
+  ];
+
+  meta = with lib; {
+    homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin";
+    description = "An effects plugin for OpenRGB";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ fgaz ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57aedd789b3d..006b2c454eb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10333,7 +10333,12 @@ with pkgs;
 
   openrgb = libsForQt5.callPackage ../applications/misc/openrgb { };
 
-  openrgb-with-all-plugins = openrgb.withPlugins [ openrgb-plugin-hardwaresync ];
+  openrgb-with-all-plugins = openrgb.withPlugins [
+    openrgb-plugin-effects
+    openrgb-plugin-hardwaresync
+  ];
+
+  openrgb-plugin-effects = libsForQt5.callPackage ../applications/misc/openrgb-plugins/effects { };
 
   openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { };
 

From a88d103bfcf52561b74ee8d23647ef6886664df1 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 11 Feb 2023 22:07:20 +0300
Subject: [PATCH 06/44] =?UTF-8?q?python3Packages.isort:=205.11.4=20?=
 =?UTF-8?q?=E2=86=92=205.12.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix
index d51e41448548..1b0ec627d3c7 100644
--- a/pkgs/development/python-modules/isort/default.nix
+++ b/pkgs/development/python-modules/isort/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "isort";
-  version = "5.11.4";
+  version = "5.12.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "isort";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-1x0rhQOr6pPFuHtbYSCR10tXeDTGwf47ek49wBmJP+I=";
+    sha256 = "sha256-8ija4xWWZuYkElXLdziV7ulN8dubIsChcZQ5dx9hfO0=";
   };
 
   nativeBuildInputs = [

From 49a06c00057ca9db11f0f5ab524db88f836481bf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Feb 2023 10:26:48 +0100
Subject: [PATCH 07/44] python310Packages.check-manifest: add changelog to meta

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

diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index 8a3e328313f9..c06a75f3c67f 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "check-manifest";
-  version = "0.48";
+  version = "0.49";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-O1dfHa3nvrMHjvS/M6lFGYNEV8coHbxyaxXFRmtVxlc=";
+    hash = "sha256-ZKZARFVCzyJpGWV8e3jQLZwcpbHCXX5m4OH/MlBg9BY=";
   };
 
   patches = [
@@ -57,6 +57,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Check MANIFEST.in in a Python source package for completeness";
     homepage = "https://github.com/mgedmin/check-manifest";
+    changelog = "https://github.com/mgedmin/check-manifest/blob/${version}/CHANGES.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ lewo ];
   };

From 67a00c202463acfef373b9a22d4e65a7174290ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Feb 2023 10:30:55 +0100
Subject: [PATCH 08/44] python310Packages.check-manifest: 0.48 -> 0.49

Changelog: https://github.com/mgedmin/check-manifest/blob/0.49/CHANGES.rst
---
 .../python-modules/check-manifest/default.nix | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index c06a75f3c67f..832cac1f7872 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -3,12 +3,10 @@
 , build
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
 , git
-, mock
 , pep517
 , pytestCheckHook
-, toml
+, tomli
 , pythonOlder
 }:
 
@@ -17,34 +15,29 @@ buildPythonPackage rec {
   version = "0.49";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-ZKZARFVCzyJpGWV8e3jQLZwcpbHCXX5m4OH/MlBg9BY=";
   };
 
-  patches = [
-    # Fix git submodule tests using file: protocol
-    (fetchpatch {
-      url = "https://github.com/mgedmin/check-manifest/pull/159.patch";
-      hash = "sha256-CDtuIoHgP4THLt+xF32C/OrjakwPOEVTKUh5JuQB5wM=";
-    })
-  ];
-
   propagatedBuildInputs = [
     build
     pep517
-    toml
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
   ];
 
   nativeCheckInputs = [
-    breezy
     git
-    mock
     pytestCheckHook
   ];
 
+  checkInputs = [
+    breezy
+  ];
+
   disabledTests = [
     # Test wants to setup a venv
     "test_build_sdist_pep517_isolated"

From 08b9cb9e7033e6f3aef2b4e46e0e927800b50a0e Mon Sep 17 00:00:00 2001
From: Yan <yanabuarab@gmail.com>
Date: Mon, 13 Feb 2023 23:31:50 +0200
Subject: [PATCH 09/44] mongoc: 1.23.1 -> 1.23.2

---
 pkgs/development/libraries/mongoc/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index ecb247de0ba4..abdb4e15ccf1 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -13,15 +13,21 @@
 }:
 stdenv.mkDerivation rec {
   pname = "mongoc";
-  version = "1.23.1";
+  version = "1.23.2";
 
   src = fetchzip {
     url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz";
-    sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8";
+    sha256 = "08v7xc5m86apd338swd8g83ccvd6ni75xbdhqqwkrjbznljf8fjf";
   };
 
   # https://github.com/NixOS/nixpkgs/issues/25585
   preFixup = ''rm -rf "$(pwd)" '';
+  postPatch = ''
+    substituteInPlace src/libmongoc/CMakeLists.txt \
+      --replace "\\\''${prefix}/" ""
+    substituteInPlace src/libbson/CMakeLists.txt \
+      --replace "\\\''${prefix}/" ""
+  '';
 
   nativeBuildInputs = [cmake pkg-config perl];
   buildInputs = [openssl zlib cyrus_sasl];

From b68077df875d866a239a0ba5938159c652a57422 Mon Sep 17 00:00:00 2001
From: Yan <yanabuarab@gmail.com>
Date: Tue, 14 Feb 2023 17:09:48 +0200
Subject: [PATCH 10/44] mongoc: add Security Framework Darwin build dep

---
 pkgs/development/libraries/mongoc/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index abdb4e15ccf1..80bb9633737a 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -10,7 +10,11 @@
   cyrus_sasl,
   libbson,
   snappy,
+  darwin,
 }:
+let
+  inherit (darwin.apple_sdk.frameworks) Security;
+in  
 stdenv.mkDerivation rec {
   pname = "mongoc";
   version = "1.23.2";
@@ -30,7 +34,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [cmake pkg-config perl];
-  buildInputs = [openssl zlib cyrus_sasl];
+  buildInputs = [openssl zlib cyrus_sasl] ++ lib.optionals stdenv.isDarwin [Security];
   propagatedBuildInputs = [libbson snappy];
 
   # -DMONGOC_TEST_USE_CRYPT_SHARED=OFF

From b8eadbe19ff82b4c13d6ac53569f8f5306f51447 Mon Sep 17 00:00:00 2001
From: Yan <yanabuarab@gmail.com>
Date: Tue, 14 Feb 2023 17:12:55 +0200
Subject: [PATCH 11/44] mongoc: formatting

---
 pkgs/development/libraries/mongoc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 80bb9633737a..162744776359 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -14,7 +14,7 @@
 }:
 let
   inherit (darwin.apple_sdk.frameworks) Security;
-in  
+in
 stdenv.mkDerivation rec {
   pname = "mongoc";
   version = "1.23.2";

From e410548128820439974ecfa611db8706de9ef5e6 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 12 Feb 2023 20:14:35 +0800
Subject: [PATCH 12/44] pantheon.gala: Use mesa instead of clutter

What gala needs is mutter-clutter-7, not clutter-1.0.
We just add the missing mesa for EGL/eglmesaext.h header.
---
 pkgs/desktops/pantheon/desktop/gala/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 56428a9124ae..2a6c79666b3f 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -17,8 +17,8 @@
 , bamf
 , libcanberra-gtk3
 , gnome-desktop
+, mesa
 , mutter
-, clutter
 , gnome-settings-daemon
 , wrapGAppsHook
 , gexiv2
@@ -119,7 +119,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     bamf
-    clutter
     gnome-settings-daemon
     gexiv2
     gnome-desktop
@@ -127,6 +126,7 @@ stdenv.mkDerivation rec {
     gtk3
     libcanberra-gtk3
     libgee
+    mesa # for libEGL
     mutter
   ];
 

From a99531196862423e464b5f15f1dacb98c07534f9 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 12 Feb 2023 20:17:27 +0800
Subject: [PATCH 13/44] pantheon.elementary-greeter: Use mesa instead of
 clutter-gtk

Looks like the comment no longer applies.
We just add the missing mesa for EGL/eglmesaext.h header.
---
 pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 7598ab5ed818..94a6e533dda3 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -15,6 +15,7 @@
 , libgee
 , libhandy
 , gnome-settings-daemon
+, mesa
 , mutter
 , elementary-icon-theme
 , wingpanel-with-indicators
@@ -22,7 +23,6 @@
 , nixos-artwork
 , lightdm
 , gdk-pixbuf
-, clutter-gtk
 , dbus
 , accountsservice
 , wrapGAppsHook
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     accountsservice
-    clutter-gtk # else we get could not generate cargs for mutter-clutter-2
     elementary-icon-theme
     gnome-settings-daemon
     gdk-pixbuf
@@ -68,6 +67,7 @@ stdenv.mkDerivation rec {
     libgee
     libhandy
     lightdm
+    mesa # for libEGL
     mutter
   ];
 

From c66aae629e3a0a4a55aba157ce10bddc560f2fcf Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Thu, 16 Feb 2023 20:05:17 +0100
Subject: [PATCH 14/44] awscli2: 2.9.21 -> 2.10.0

---
 pkgs/tools/admin/awscli2/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index 8009118be6b3..b64980a1b546 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -25,14 +25,14 @@ let
 in
 with py.pkgs; buildPythonApplication rec {
   pname = "awscli2";
-  version = "2.9.23"; # N.B: if you change this, check if overrides are still up-to-date
+  version = "2.10.0"; # N.B: if you change this, check if overrides are still up-to-date
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-cli";
     rev = version;
-    hash = "sha256-OaZ8Eax8XE4xGs5yHh+1P8mwEfHkFNEtY6ZGLQc8Thk=";
+    hash = "sha256-W05ZxpqamYqtFY/2mV2+XODCeuWRE9KhMdMkaAGAiTU=";
   };
 
   nativeBuildInputs = [
@@ -64,10 +64,7 @@ with py.pkgs; buildPythonApplication rec {
   ];
 
   postPatch = ''
-    sed -i pyproject.toml \
-      -e 's/colorama.*/colorama",/' \
-      -e 's/cryptography.*/cryptography",/' \
-      -e 's/distro.*/distro",/'
+    substituteInPlace pyproject.toml --replace "distro>=1.5.0,<1.6.0" "distro>=1.5.0"
   '';
 
   postInstall = ''

From d20cbeb18fde359c5d57e8e34366c2f2d226b650 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 16 Feb 2023 15:14:31 -0500
Subject: [PATCH 15/44] vimPlugins: update

---
 .../editors/vim/plugins/generated.nix         | 194 +++++++++---------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 0be4c3eb9074..d12ada943533 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -583,12 +583,12 @@ final: prev:
 
   alpha-nvim = buildVimPluginFrom2Nix {
     pname = "alpha-nvim";
-    version = "2023-02-14";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "goolord";
       repo = "alpha-nvim";
-      rev = "d35b99e36e32040ba06c48a25b5bd3e75be2a566";
-      sha256 = "0x61xqxpb9wjvzmgb685xyfqsv6dfylh1f6px53xwz6ps5m1k36g";
+      rev = "b3eef69e95674905bf26c7740dd4bbb09b355494";
+      sha256 = "04b3sik1j5y7yr17q109man97wkhdfmma0ah7arlq0yl08r8p357";
     };
     meta.homepage = "https://github.com/goolord/alpha-nvim/";
   };
@@ -727,12 +727,12 @@ final: prev:
 
   aurora = buildVimPluginFrom2Nix {
     pname = "aurora";
-    version = "2023-02-09";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "aurora";
-      rev = "624d065f1c3f88438839dba79b995bc858a4642a";
-      sha256 = "01y84kzfjnjrd34m9j9gx5d0gj7sd2vby5vmpiddh9skz8pb26f6";
+      rev = "7c1be58365428ef18c3621bacc5aaf188f8a4b9e";
+      sha256 = "196km3z2pl0zbk8sy7c8z82a7wicla15ylfdraxpxh362sry8ayq";
     };
     meta.homepage = "https://github.com/ray-x/aurora/";
   };
@@ -787,12 +787,12 @@ final: prev:
 
   autoclose-nvim = buildVimPluginFrom2Nix {
     pname = "autoclose.nvim";
-    version = "2023-02-03";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "m4xshen";
       repo = "autoclose.nvim";
-      rev = "5c63f2c28a48d556644f3650daccdf0ba03ea177";
-      sha256 = "0c8klbm0wwr1rq1kkq2lq18n3d8kbi977zac70xc8h3dcfdnzc4m";
+      rev = "08b362ba12af1053871b192614b627bcb3c5299d";
+      sha256 = "0lw5hxdn72ylyqwh1rs2ab3jknfx6j584zxwz8mcaag6zp75c44k";
     };
     meta.homepage = "https://github.com/m4xshen/autoclose.nvim/";
   };
@@ -847,24 +847,24 @@ final: prev:
 
   barbar-nvim = buildVimPluginFrom2Nix {
     pname = "barbar.nvim";
-    version = "2023-02-09";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "romgrk";
       repo = "barbar.nvim";
-      rev = "2d53f49c21327da48f0447841027848f49e1fea4";
-      sha256 = "1fm845zjw08pzcql7ikk8qz87wrffl4w2jwgqvrqx5207qlafcbn";
+      rev = "00512bab6983fb8b996f36a9688b0c8478a1f4f0";
+      sha256 = "15w2a8m1pbv265b3s3j0b4a4n3znwmg8629azqw5wdgfhy3sami7";
     };
     meta.homepage = "https://github.com/romgrk/barbar.nvim/";
   };
 
   barbecue-nvim = buildVimPluginFrom2Nix {
     pname = "barbecue.nvim";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "utilyre";
       repo = "barbecue.nvim";
-      rev = "234ab8b8afec9139819416fc6ed5637e491a067c";
-      sha256 = "1gs7hz29l0zhrrz8ylchspfd7kqyp8j95fy17v311vgbhr1wzg6w";
+      rev = "c6cb480f397d19f73cf2ff491c547d751118dbae";
+      sha256 = "0xlqmz0mg9h531a7667sxpr9q1nff525jjyw4fz07xwfs8q47wxr";
     };
     meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
   };
@@ -991,12 +991,12 @@ final: prev:
 
   bufdelete-nvim = buildVimPluginFrom2Nix {
     pname = "bufdelete.nvim";
-    version = "2022-12-04";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "famiu";
       repo = "bufdelete.nvim";
-      rev = "f79e9d186b42fba5f1b1362006e7c70240db97a4";
-      sha256 = "08avd9icr7jclljlkzg8q74c95g0knzhxkldgfg9kl298h7qc521";
+      rev = "8933abc09df6c381d47dc271b1ee5d266541448e";
+      sha256 = "1f2kv77273hgjmkwvsrxmpsdj2gpz8y72fz1nxgawd6h9w9ly7kf";
     };
     meta.homepage = "https://github.com/famiu/bufdelete.nvim/";
   };
@@ -1243,12 +1243,12 @@ final: prev:
 
   cmp-cmdline = buildVimPluginFrom2Nix {
     pname = "cmp-cmdline";
-    version = "2022-11-27";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "cmp-cmdline";
-      rev = "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063";
-      sha256 = "0vffivj94736njjhlazrs0jkc1nyvcdjpw64w38d1lhlyflf4cl7";
+      rev = "8fcc934a52af96120fe26358985c10c035984b53";
+      sha256 = "1bhhna3f1xzf6y7q6iq9v2369w0jrgnh0hngnw84wh79pknqsgb3";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/";
   };
@@ -1363,12 +1363,12 @@ final: prev:
 
   cmp-fuzzy-buffer = buildVimPluginFrom2Nix {
     pname = "cmp-fuzzy-buffer";
-    version = "2022-11-22";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "tzachar";
       repo = "cmp-fuzzy-buffer";
-      rev = "471949d19b1246f069eaf50729b39231eab3221b";
-      sha256 = "1l10acnb8rxis7hs1a333b23cfcjllwzr98cn9xh18mrh77my7w5";
+      rev = "21d281de0fda5bf4f57920f54eb60e212593ba63";
+      sha256 = "1794rhyf0sjwzw3hbzxv53vispifyxxxp1niv6zw4bmrks3jxdg8";
     };
     meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/";
   };
@@ -1891,12 +1891,12 @@ final: prev:
 
   comment-nvim = buildVimPluginFrom2Nix {
     pname = "comment.nvim";
-    version = "2023-02-13";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "numtostr";
       repo = "comment.nvim";
-      rev = "418d3117dab2f54c4340ea73e0070dd78fc81753";
-      sha256 = "0qmkj4xchl3q26pzf6x8ssm97ax72vav4jcq4410mf7xiahwcl1d";
+      rev = "6821b3ae27a57f1f3cf8ed030e4a55d70d0c4e43";
+      sha256 = "1c3qrbjzz0kl1k1gjkgil0ni944ac80ps76rdhs9jd7chbn7l0sb";
     };
     meta.homepage = "https://github.com/numtostr/comment.nvim/";
   };
@@ -2095,12 +2095,12 @@ final: prev:
 
   copilot-lua = buildVimPluginFrom2Nix {
     pname = "copilot.lua";
-    version = "2023-02-13";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "137df557486f91627b8e4708a47088f36950f12c";
-      sha256 = "1ipcmmp3df5dfxjaryxkwl2k48kkzxhn9hn428w76xhfa1z603iq";
+      rev = "f1b330351d755e905cffe1dea2f6e0a6f273c9fe";
+      sha256 = "1vhrxdd8z7y2wdjclqq6gqp2yfv9rid9hh382m70hcma3nkj19mz";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
   };
@@ -2299,12 +2299,12 @@ final: prev:
 
   dashboard-nvim = buildVimPluginFrom2Nix {
     pname = "dashboard-nvim";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "dashboard-nvim";
-      rev = "ce0dbf6e7e5d94d6c2df250fb61f722c0d05b041";
-      sha256 = "1w434kva86bynhkjg52jxhzcbbjlxbhkbb2sxi4z7gcns27bx7rx";
+      rev = "2312a5024748e869a355d91170f2e8fbf2bd5a51";
+      sha256 = "1sg2c2238m6nrmp700b2wvw9g9p1wfc7d1v4ma0lam4d1z0xhwyj";
     };
     meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
   };
@@ -3208,8 +3208,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "ibhagwan";
       repo = "fzf-lua";
-      rev = "1f9824bba0cdcae491f911d0d6d1281fb5685782";
-      sha256 = "0640dza1ipmwsgmh2bwqsyib7yn7c7y8ma5ki9842c6qdcah6sci";
+      rev = "da1881ad7a2d643283ef4eb364b67062e6235532";
+      sha256 = "0mwbhin3052h4fc5vxjzcc6c81kx9gm5g97v5d7l39x2rxa62n1r";
     };
     meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
   };
@@ -3360,12 +3360,12 @@ final: prev:
 
   gitsigns-nvim = buildNeovimPluginFrom2Nix {
     pname = "gitsigns.nvim";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "gitsigns.nvim";
-      rev = "5f1451ea7d9a9005b3f0bedeab20cef7a4c65993";
-      sha256 = "1x5ab50i69dwndkbl9b1ng29pagl2wyj8f4sg7p8w7djq3l9k5bb";
+      rev = "f388995990aba04cfdc7c3ab870c33e280601109";
+      sha256 = "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx";
     };
     meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
   };
@@ -3611,12 +3611,12 @@ final: prev:
 
   haskell-tools-nvim = buildVimPluginFrom2Nix {
     pname = "haskell-tools.nvim";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "haskell-tools.nvim";
-      rev = "819a29a463accc0981d996e704af1a892fa0d897";
-      sha256 = "14sc9c2jhda0xf4n5nbzmv7lwgs5c632i9i2g00cakwa7m8af8s8";
+      rev = "151fe7256a5c80aece6550691f705839b9b21d14";
+      sha256 = "0chl2p7b94pawz0xrkp8iszjgvjd1qpvq44kz1wcmm5146n5phgg";
     };
     meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
   };
@@ -4175,12 +4175,12 @@ final: prev:
 
   lazy-nvim = buildVimPluginFrom2Nix {
     pname = "lazy.nvim";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazy.nvim";
-      rev = "e916f41df26e33b01f1b3ebe28881090da3a7281";
-      sha256 = "0dxq6nfr51abn0g7igljsj78yk672c1r85givkfyb9z0a97gxmq5";
+      rev = "8186cc5db31bd5968b5be838a30c4cf1465cb3f9";
+      sha256 = "1z765zqj4pfy9yj0057lcxjj2zk3mp6c4hw19b231s6s6fn8kvnl";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
   };
@@ -4247,12 +4247,12 @@ final: prev:
 
   legendary-nvim = buildVimPluginFrom2Nix {
     pname = "legendary.nvim";
-    version = "2023-02-13";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "legendary.nvim";
-      rev = "3cf37f4f958e47b3c124d45a5e8b654e18380035";
-      sha256 = "13cjsbv9k2rkqs51n178cw47qhcwh1w4myafchasngbyh0y4ygww";
+      rev = "9e38951df410c6d65fa2b932832d201d7cd6ca62";
+      sha256 = "14sw0xaf7qr9896hcl9vb5ivmc6w15p1np0gqnyhjqbmcqj20yp8";
     };
     meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
   };
@@ -4787,12 +4787,12 @@ final: prev:
 
   mason-nvim = buildVimPluginFrom2Nix {
     pname = "mason.nvim";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason.nvim";
-      rev = "fecabaff94c34bf8ed9c3b2a45d42a5906ea251c";
-      sha256 = "1wsx9ky30wawyiflb613wm1bshrfbs7xdrf2ysllznn5bd1sn4xk";
+      rev = "511457c94cc47e5edbc82cf35469dcd09d56856f";
+      sha256 = "0g9xcrkrdpqclgpgrlyv992pznycs0l0nmd7adr7ms3z41ai9lr0";
     };
     meta.homepage = "https://github.com/williamboman/mason.nvim/";
   };
@@ -5219,12 +5219,12 @@ final: prev:
 
   neoconf-nvim = buildVimPluginFrom2Nix {
     pname = "neoconf.nvim";
-    version = "2023-02-14";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "45d2575527c080d6f87fd0b7741d877be88f0d26";
-      sha256 = "1i62214yc69n99xbshm5yd3nj9j7wg4wqhn2gjclmay8vw05kak0";
+      rev = "7213f7919ca67e3f3d5f95d415b0eea965886e2f";
+      sha256 = "01g2qzrwaw8xzi24k28gqy79myvqiqz9p7l9vwlbx5rhcbg2dq4y";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
   };
@@ -5579,12 +5579,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPluginFrom2Nix {
     pname = "nlsp-settings.nvim";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "d48847d0f9df136727e0e7f6626ec334c4a8fca7";
-      sha256 = "02qd9j9sxcgg0fp61nssgkhyzhn65llsprwajng27ajc0421kixy";
+      rev = "94561a5c7280416e09c33c8649cd1de638f5a93f";
+      sha256 = "0r5m34r94h4x520ibymmzb4zb0lq59j1knq34vyjq5lgbpksh2c6";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -5699,12 +5699,12 @@ final: prev:
 
   null-ls-nvim = buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "a75bba0ae5e89df03f01c17a1d913884eeebcc2e";
-      sha256 = "1gbnvh8p071f07h987q3b6k2zkhh9vf7qvvjmq2c3lgn6g3snzbl";
+      rev = "a82aa08c0063843926947f3688b0e61fd71db680";
+      sha256 = "14ijkjfbg5dm54wkp34rf6z9p5v2z7psxnfv526rqp9p4qqasghk";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
   };
@@ -5771,11 +5771,11 @@ final: prev:
 
   nvim-base16 = buildVimPluginFrom2Nix {
     pname = "nvim-base16";
-    version = "2023-02-03";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "nvim-base16";
-      rev = "a3e0146ba46a797a0118da0177cbec5e28722399";
+      rev = "36f0e1d27fb87fd5199baa32c1e2921af6061e44";
       sha256 = "079f6dvdcl6zzdl8rgyxr7g8gla066w41ndmg2qakrbj5fap3fyn";
     };
     meta.homepage = "https://github.com/RRethy/nvim-base16/";
@@ -5807,12 +5807,12 @@ final: prev:
 
   nvim-bufdel = buildVimPluginFrom2Nix {
     pname = "nvim-bufdel";
-    version = "2022-09-20";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "ojroques";
       repo = "nvim-bufdel";
-      rev = "a60b3531e5bd56f8602acb4ba7f5b2eeb782d54b";
-      sha256 = "1yyxcnnh560gilkrqadpiwx3kpql4msw0as2v9i2v8m4z5yw36bd";
+      rev = "458467859d59b43812e10ba78b4c2e14fad533bb";
+      sha256 = "0j9wqyi5wr6wsky7drp1y58kx9cv8vg2i8pzyzfcis3j3jfg1nsf";
     };
     meta.homepage = "https://github.com/ojroques/nvim-bufdel/";
   };
@@ -5831,12 +5831,12 @@ final: prev:
 
   nvim-cmp = buildNeovimPluginFrom2Nix {
     pname = "nvim-cmp";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "nvim-cmp";
-      rev = "208d69f233d65526a22c6497ed57d0c80d99fa5f";
-      sha256 = "1pv5mcs07a4cg05h23wxv4ddaxkzgd32fkr8p89k6fwl6v35s3jc";
+      rev = "ea9eaff5739856f3187d228d2c1181ea49fd4697";
+      sha256 = "052061i7dw26f47crijvpg1vwikqh1ly00vxnz5c6qb891pf2wsn";
     };
     meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
   };
@@ -6311,12 +6311,12 @@ final: prev:
 
   nvim-osc52 = buildVimPluginFrom2Nix {
     pname = "nvim-osc52";
-    version = "2023-01-10";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "ojroques";
       repo = "nvim-osc52";
-      rev = "27da4724a887dabed3768b41fa51c785cb62ef26";
-      sha256 = "1wylh055y2dyb7zcdk9sa41wnkfbknp2bgnlrhmxdq5h2bkr8hbd";
+      rev = "358a2b4804c5f35b9ab6975cf68611afcbbc9b0d";
+      sha256 = "1vr92nishv9hsnhx0k8jlnsdcbqag60dk2xqaxqc81q98ypq1h27";
     };
     meta.homepage = "https://github.com/ojroques/nvim-osc52/";
   };
@@ -6455,12 +6455,12 @@ final: prev:
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "b44871afb59e456bbff4113e416405c06c991cf5";
-      sha256 = "1i6rlz06r0bg1zk33qzwz0h3sh7vglf9m2hfvm31i6pfsyngd1ib";
+      rev = "b23856a88e04e1468e1603d6e0900f2372709e22";
+      sha256 = "02y1853nnv67cnih3z6pd7ml8k918hnh5j0fvgw4hb30lq1rsnns";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -6731,12 +6731,12 @@ final: prev:
 
   onedarkpro-nvim = buildVimPluginFrom2Nix {
     pname = "onedarkpro.nvim";
-    version = "2023-02-14";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "onedarkpro.nvim";
-      rev = "f79b875361d06a326d855393b5ed0ce4186a15c4";
-      sha256 = "1n2pnncggjn1gpgl9xjwjhdzd9xpn3iv0z4zbz56qpcm9rdsmizs";
+      rev = "5241d17dbe1784555a4f95487e9db06a4cb0e8b8";
+      sha256 = "1ac6fmghrgrn1629b6lvgcnm362mwj176q6wv6wnrkkx1wa1cj44";
     };
     meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
   };
@@ -8177,12 +8177,12 @@ final: prev:
 
   telescope-coc-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-coc.nvim";
-    version = "2022-12-08";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "fannheyward";
       repo = "telescope-coc.nvim";
-      rev = "878c8ac14f809f7a1247a090408f7c23fa075470";
-      sha256 = "0q237i5cwxqzzhfmnbvljsmc4z7gmdfapz965pp135ybid4nh5xh";
+      rev = "a1aaabdb3b546f63d24f1fd156dfb1ddc0bc03de";
+      sha256 = "1i76sjlw8irvk52g2sj90f9b3icdjvzp0zdc72fsbfjxd2kwr926";
     };
     meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/";
   };
@@ -8370,12 +8370,12 @@ final: prev:
 
   telescope-undo-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-undo.nvim";
-    version = "2023-01-29";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "debugloop";
       repo = "telescope-undo.nvim";
-      rev = "b5e31b358095074b60d87690bd1dc0a020a2afab";
-      sha256 = "1hpqd0dgb01in5dbqs2ps3wr12iqnf0pd0xdnaalvq7rmvsmvz7a";
+      rev = "03ff45fab0c4adad4d252e25b5b194e22caf5b4f";
+      sha256 = "1mik7qwz16bgbfpr5lcsrgkrjwifk1zanzmsdbj416kxhsz90fx7";
     };
     meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/";
   };
@@ -8743,12 +8743,12 @@ final: prev:
 
   trouble-nvim = buildVimPluginFrom2Nix {
     pname = "trouble.nvim";
-    version = "2023-02-10";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "trouble.nvim";
-      rev = "556ef3089709a6e253df1e500381fec5eb48e48a";
-      sha256 = "0ragk770zibpqggvz8l78is0zr839r2py6k5261wmn1qwslagz06";
+      rev = "3bd029284d368cf70cc6fb4a5cbb9ae2231c239d";
+      sha256 = "100ql4377b8qib5f3jqxighhfl7xvjdk7iijlbfs0g5yaabs76cw";
     };
     meta.homepage = "https://github.com/folke/trouble.nvim/";
   };
@@ -8851,12 +8851,12 @@ final: prev:
 
   unison = buildVimPluginFrom2Nix {
     pname = "unison";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "aeac746d73251efd6c89d555d07cffe6c8176682";
-      sha256 = "09sz5hwpci77k397xm01xf8sc37j91635ixb7lpq0da02ar7qs8l";
+      rev = "0207347cbfdd099da9a714e50c97f2acee93a5ce";
+      sha256 = "1ifb4sn8clddjc2lmz0yav0lwklskknv43h1f8l1pbqm7fsyr1ki";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
   };
@@ -10615,12 +10615,12 @@ final: prev:
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "633074c6a02866f967e0576c491f9ca0df3e9f9a";
-      sha256 = "0fmsn2pqyklpcqvivhk7hvg8zndskrz9r9znd8m2wbdaa7rlsd79";
+      rev = "231d4d165cb87e79a58b8a15742540e6af0577ed";
+      sha256 = "11849nva04cjlm0np3c592dcj4y2klw56mrsrdxfmff0x9z61iz1";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -13151,12 +13151,12 @@ final: prev:
 
   vim-tpipeline = buildVimPluginFrom2Nix {
     pname = "vim-tpipeline";
-    version = "2023-02-06";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "vimpostor";
       repo = "vim-tpipeline";
-      rev = "9d1dd5116c13b6d850a81291422a4a9818622b6c";
-      sha256 = "00n2lq23m9b050ianbr5b655c23qasspvc5kf56dzpkjxgza56am";
+      rev = "95a6ccbe9f33bc42dd4cee45731d8bc3fbcd92d1";
+      sha256 = "1nxrva8gs2fq6vi3w26ns6lrfpbyfw495knidpx9pmvcf0ypxcva";
     };
     meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
   };
@@ -14077,12 +14077,12 @@ final: prev:
 
   catppuccin-nvim = buildVimPluginFrom2Nix {
     pname = "catppuccin-nvim";
-    version = "2023-02-15";
+    version = "2023-02-16";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "b0ab85552b0f60ab7a0aa46f432e709c124f8153";
-      sha256 = "06c0cr5df3fmvqpzkxdnfr7dff0bab28ycngaq7i5bsbrd6pbjn3";
+      rev = "3626b5e2db6ec3b6ae605aab02dce5865935a61f";
+      sha256 = "1l2cqkx6pr2a9r4z20pc3rnqy377aw8c4468rlffg8h1l5vvq0b6";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
   };

From b5f27982a9a481e93633c0f3492507421569fc71 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 16 Feb 2023 15:15:53 -0500
Subject: [PATCH 16/44] vimPlugins.pest-vim: init at 2020-04-20

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index d12ada943533..c15cc2d5250e 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6897,6 +6897,18 @@ final: prev:
     meta.homepage = "https://github.com/andsild/peskcolor.vim/";
   };
 
+  pest-vim = buildVimPluginFrom2Nix {
+    pname = "pest.vim";
+    version = "2020-04-20";
+    src = fetchFromGitHub {
+      owner = "pest-parser";
+      repo = "pest.vim";
+      rev = "ebeeea5e0757adee037135cf3b8248589b22ae16";
+      sha256 = "159h9f96x127w1i0cj0cwb8cr2k0fbb9l3vsyky60h344p8amcbi";
+    };
+    meta.homepage = "https://github.com/pest-parser/pest.vim/";
+  };
+
   pgsql-vim = buildVimPluginFrom2Nix {
     pname = "pgsql.vim";
     version = "2021-12-08";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index dcfef882ef75..bd1a589c52ac 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -580,6 +580,7 @@ https://github.com/NLKNguyen/papercolor-theme/,,
 https://github.com/tmsvg/pear-tree/,,
 https://github.com/steelsojka/pears.nvim/,,
 https://github.com/andsild/peskcolor.vim/,,
+https://github.com/pest-parser/pest.vim/,HEAD,
 https://github.com/lifepillar/pgsql.vim/,,
 https://github.com/motus/pig.vim/,,
 https://github.com/aklt/plantuml-syntax/,,

From 8526c101275591e47b43ea5f8d4bac45af659197 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 16 Feb 2023 15:16:04 -0500
Subject: [PATCH 17/44] vimPlugins.nvim-treesitter: update grammars

---
 .../vim/plugins/nvim-treesitter/generated.nix  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index fcf44b0b9843..9eb747ec9643 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -115,12 +115,12 @@
   };
   c_sharp = buildGrammar {
     language = "c_sharp";
-    version = "18e4343";
+    version = "5b6c4d0";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-c-sharp";
-      rev = "18e434383a4582b4fd183a30e55022c2923764e1";
-      hash = "sha256-ggvCj2yGDINuGr8Jb+aOoRxlKa5LaXCoiQC/Y5Hrcn0=";
+      rev = "5b6c4d0d19d79b05c69ad752e11829910e3b4610";
+      hash = "sha256-Ax9AuxqQK9gSlkxM2k6E32CskudUmduWm0luC031P5U=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
   };
@@ -426,12 +426,12 @@
   };
   fortran = buildGrammar {
     language = "fortran";
-    version = "069bd7c";
+    version = "0f6ad1a";
     src = fetchFromGitHub {
       owner = "stadelmanma";
       repo = "tree-sitter-fortran";
-      rev = "069bd7c864fe2dee1115140cc2621d140b16a643";
-      hash = "sha256-edvAcXKoVHIpOpVPROA9l97B4tFfuJYbjcSy9oE/dzw=";
+      rev = "0f6ad1a0ec8bbd263b5b9af17ba31e3cb75369e8";
+      hash = "sha256-Zo+1bSj1LDl4XFIelssZtYTft1BfTydMMzC/5COOUe0=";
     };
     meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
   };
@@ -1445,12 +1445,12 @@
   };
   sql = buildGrammar {
     language = "sql";
-    version = "7be06f4";
+    version = "13d375d";
     src = fetchFromGitHub {
       owner = "derekstride";
       repo = "tree-sitter-sql";
-      rev = "7be06f4d5eabace883dd45959c13dc740f1f1b98";
-      hash = "sha256-Hi/4/Aou85MYCMMFqf5xqAyKECTzfeiaksJxdv9MVCU=";
+      rev = "13d375dea377bae5f235176fae97a50ba584db54";
+      hash = "sha256-+r/rmWD3/0ASsIX7xOieM8eFcOIRJXGCYBq1Tucf9+Y=";
     };
     generate = true;
     meta.homepage = "https://github.com/derekstride/tree-sitter-sql";

From 9aa9c5e79279b025892dcf347c329938b22bf17f Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Thu, 16 Feb 2023 22:44:44 +0200
Subject: [PATCH 18/44] trilium-{desktop,server}: 0.58.7 -> 0.58.8

---
 pkgs/applications/office/trilium/desktop.nix | 6 +++---
 pkgs/applications/office/trilium/server.nix  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix
index 03e88a7816d6..e48355660cb2 100644
--- a/pkgs/applications/office/trilium/desktop.nix
+++ b/pkgs/applications/office/trilium/desktop.nix
@@ -6,13 +6,13 @@
 
 let
   pname = "trilium-desktop";
-  version = "0.58.7";
+  version = "0.58.8";
 
   linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
-  linuxSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c";
+  linuxSource.sha256 = "03v4a135brj2z1gj2y611pi7szfhr62xxj0qhki0mychypvdfx7i";
 
   darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip";
-  darwinSource.sha256 = "1khywd77j4f745fvxln01li8qxnhlqqsirhm75kbi24bxlcpxfpa";
+  darwinSource.sha256 = "0ncf2cl62hn2ja72fw10s40rzkgcwy77ggs29zpgjjlp9hkk3v8q";
 
   meta = metaCommon // {
     mainProgram = "trilium";
diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix
index 349ae7f4c331..78bae4f4655b 100644
--- a/pkgs/applications/office/trilium/server.nix
+++ b/pkgs/applications/office/trilium/server.nix
@@ -3,8 +3,8 @@
 
 let
   serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
-  serverSource.sha256 = "0xr474z7wz0z4rqvk5rhv6xh51mdysr8zw86fs8fk7av0fdqxyka";
-  version = "0.58.7";
+  serverSource.sha256 = "0mkbmb26y99rc22bpxlc3gdgv84rj7wvsva741gw2z0cb3jh4ziv";
+  version = "0.58.8";
 in stdenv.mkDerivation rec {
   pname = "trilium-server";
   inherit version;

From 8ef4c0860c7259ccdebed57f98fe2aa8b056311a Mon Sep 17 00:00:00 2001
From: Yan <yanabuarab@gmail.com>
Date: Fri, 17 Feb 2023 00:46:55 +0200
Subject: [PATCH 19/44] mongoc: mark darwin x86_64 as broken

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

diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 162744776359..97490748540e 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with lib; {
+    broken = stdenv.isDarwin && stdenv.isx86_64;
     description = "The official C client library for MongoDB";
     homepage = "http://mongoc.org";
     license = licenses.asl20;

From 62ad474f0ff81f22f6db31e44b289b973e69b522 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 17 Feb 2023 04:20:00 +0000
Subject: [PATCH 20/44] postgresqlPackages.pg_ivm: 1.4 -> 1.5

https://github.com/sraoss/pg_ivm/releases/tag/v1.5
---
 pkgs/servers/sql/postgresql/ext/pg_ivm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
index 1def48d46d97..e8a9a6fc09c1 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pg_ivm";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "sraoss";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-pz9eHmd7GC30r0uUObOlrcdkAX4c+szjYAXS1U999CE=";
+    hash = "sha256-UhKJmYnqkxORb0eVqxbu+yaamZ7ISJTbSwArg76YY/Q=";
   };
 
   buildInputs = [ postgresql ];

From f34f324382c00d20899d5d7698d1da93144f8990 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 17 Feb 2023 13:40:24 +0100
Subject: [PATCH 21/44] nbxplorer: 2.3.60 -> 2.3.62

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

diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix
index 00df022f47b6..debf89c617c7 100644
--- a/pkgs/applications/blockchains/nbxplorer/default.nix
+++ b/pkgs/applications/blockchains/nbxplorer/default.nix
@@ -6,13 +6,13 @@
 
 buildDotnetModule rec {
   pname = "nbxplorer";
-  version = "2.3.60";
+  version = "2.3.62";
 
   src = fetchFromGitHub {
     owner = "dgarage";
     repo = "NBXplorer";
     rev = "v${version}";
-    sha256 = "sha256-YUZvTs77dGhG7dpxbQyGhrOMMx+8LotdMJflPflMDAE=";
+    sha256 = "sha256-FpAMkVgvl0SxJ59FjL4H3Fvqb1LKsET2I+A01TQlvFA=";
   };
 
   projectFile = "NBXplorer/NBXplorer.csproj";

From dd30696b67ed9908ee77ab587480bada82e8c804 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 17 Feb 2023 13:40:25 +0100
Subject: [PATCH 22/44] btcpayserver: 1.7.7 -> 1.7.12

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

diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix
index f0f5f50dfec6..9b88cf9ab4ba 100644
--- a/pkgs/applications/blockchains/btcpayserver/default.nix
+++ b/pkgs/applications/blockchains/btcpayserver/default.nix
@@ -6,13 +6,13 @@
 
 buildDotnetModule rec {
   pname = "btcpayserver";
-  version = "1.7.7";
+  version = "1.7.12";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-bflQsVaCwV5zaU5k46wFQ45dIOg3dHmYfBVQHyw+EpM=";
+    sha256 = "sha256-NRmpKr0lqe2NUlpyzkdtn7nN0rFrZakryNR1WAOzx9Q=";
   };
 
   projectFile = "BTCPayServer/BTCPayServer.csproj";

From e37ca9c317ba0eaba8573ccf1427573c8a35b2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Niemel=C3=A4?= <josh@jniemela.dk>
Date: Fri, 17 Feb 2023 14:33:13 +0100
Subject: [PATCH 23/44] julia_19: 1.9.0-beta2 -> 1.9.0-beta4

---
 pkgs/development/compilers/julia/1.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix
index 71bf442c82cd..75c7e5f40406 100644
--- a/pkgs/development/compilers/julia/1.9.nix
+++ b/pkgs/development/compilers/julia/1.9.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "julia";
-  version = "1.9.0-beta2";
+  version = "1.9.0-beta4";
 
   src = fetchurl {
     url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
-    hash = "sha256-LTQp5vBMOSlwThYpSIv/UNJ9eIU+WId/XWGFxsrQEzs=";
+    hash = "sha256-Ipfps2wxPV30nbOxDZ0K39jFB1lNz16aXgFhIKBOquM=";
   };
 
   patches = [

From dd65018d4ebbcad268e1e72b94ad5184189dcde9 Mon Sep 17 00:00:00 2001
From: R-VdP <141248+R-VdP@users.noreply.github.com>
Date: Fri, 17 Feb 2023 15:31:06 +0100
Subject: [PATCH 24/44] Via 2.0.5 -> 2.1.0

Changelog: https://github.com/the-via/releases/releases/tag/v2.1.0
---
 pkgs/tools/misc/via/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/tools/misc/via/default.nix
index 3a7d51f4c7c3..4d1783b53acc 100644
--- a/pkgs/tools/misc/via/default.nix
+++ b/pkgs/tools/misc/via/default.nix
@@ -2,15 +2,16 @@
 
 let
   pname = "via";
-  version = "2.0.5";
+  version = "2.1.0";
   name = "${pname}-${version}";
   src = fetchurl {
     url = "https://github.com/the-via/releases/releases/download/v${version}/via-${version}-linux.AppImage";
     name = "via-${version}-linux.AppImage";
-    sha256 = "sha256-APNtzfeV6z8IF20bomcgMq7mwcK1fbDdFF77Xr0UPOs=";
+    sha256 = "sha256-eVmaVD3W+ZEw3HkuZWKsd9XYhASP5+dxzVW64fOhqwk=";
   };
   appimageContents = appimageTools.extractType2 { inherit name src; };
-in appimageTools.wrapType2 {
+in
+appimageTools.wrapType2 {
   inherit name src;
 
   profile = ''

From 379bb7c2afe275ccef2c64b1ec471b73a0bace9d Mon Sep 17 00:00:00 2001
From: GenericNerdyUsername <genericnerdyusername@proton.me>
Date: Wed, 15 Feb 2023 13:01:55 +0000
Subject: [PATCH 25/44] xemu: init at 0.7.84

---
 pkgs/applications/emulators/xemu/default.nix | 131 +++++++++++++++++++
 pkgs/top-level/all-packages.nix              |   2 +
 2 files changed, 133 insertions(+)
 create mode 100644 pkgs/applications/emulators/xemu/default.nix

diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix
new file mode 100644
index 000000000000..482ea9e06fd5
--- /dev/null
+++ b/pkgs/applications/emulators/xemu/default.nix
@@ -0,0 +1,131 @@
+{ stdenv
+, fetchFromGitHub
+, lib
+, makeDesktopItem
+, copyDesktopItems
+, pkg-config
+, python3
+, ninja
+, meson
+, which
+, perl
+, wrapGAppsHook
+, glib
+, gtk3
+, libpcap
+, openssl
+, libepoxy
+, libsamplerate
+, SDL2
+, SDL2_image
+, mesa
+, libdrm
+, libGLU
+, gettext
+, vte
+}:
+
+stdenv.mkDerivation rec {
+  pname = "xemu";
+  version = "0.7.84";
+
+  src = fetchFromGitHub {
+    owner = "xemu-project";
+    repo = "xemu";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-pEXjwoQKbMmVNYCnh5nqP7k0acYOAp8SqxYZwPzVwDY=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    python3
+    python3.pkgs.pyyaml
+    ninja
+    which
+    meson
+    perl
+    wrapGAppsHook
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    openssl
+    mesa
+    libepoxy
+    libdrm
+    libpcap
+    libsamplerate
+    SDL2
+    libGLU
+    SDL2_image
+    gettext
+    vte
+  ];
+
+  separateDebugInfo = true;
+
+  dontUseMesonConfigure = true;
+
+  setOutputFlags = false;
+
+  configureFlags = [
+    "--disable-strip"
+    "--meson=meson"
+    "--target-list=i386-softmmu"
+    "--disable-werror"
+  ];
+
+  buildFlags = [ "qemu-system-i386" ];
+
+  desktopItems = [(makeDesktopItem {
+    name = "xemu";
+    desktopName = "xemu";
+    exec = "xemu";
+    icon = "xemu";
+  })] ;
+
+  preConfigure = let
+    branch = "master";
+    commit = "d8fa50e524c22f85ecb2e43108fd6a5501744351";
+  in ''
+    patchShebangs .
+    configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls")
+    substituteInPlace ./scripts/xemu-version.sh \
+      --replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'"
+    # If the versions can't be obtained through git, the build process tries
+    # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar)
+    echo '${commit}' > XEMU_COMMIT
+    echo '${branch}' > XEMU_BRANCH
+    echo '${version}' > XEMU_VERSION
+  '';
+
+  preBuild = ''
+    cd build
+    substituteInPlace ./build.ninja --replace /usr/bin/env $(which env)
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,share}
+    cp qemu-system-i386 $out/bin/xemu
+
+    for RES in 16x16 24x24 32x32 48x48 128x128 256x256 512x512
+    do
+      mkdir -p $out/share/icons/hicolor/$RES/apps/
+      cp ../ui/icons/xemu_$RES.png $out/share/icons/hicolor/$RES/apps/xemu.png
+    done
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://xemu.app/";
+    description = "Original Xbox emulator";
+    maintainers = with maintainers; [ ];
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3cfb3582c45..26e3c2217675 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2263,6 +2263,8 @@ with pkgs;
 
   xcpc = callPackage ../applications/emulators/xcpc { };
 
+  xemu = callPackage ../applications/emulators/xemu { };
+
   yapesdl = callPackage ../applications/emulators/yapesdl { };
 
   zesarux = callPackage ../applications/emulators/zesarux { };

From 13be52bef65b2b6e2ef8a7161a0cf0e20b10f21a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Thu, 16 Feb 2023 17:34:42 -0600
Subject: [PATCH 26/44] =?UTF-8?q?pgsync:=200.7.2=20=E2=86=92=200.7.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/tools/database/pgsync/Gemfile.lock |  6 +++---
 pkgs/development/tools/database/pgsync/gemset.nix   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/database/pgsync/Gemfile.lock b/pkgs/development/tools/database/pgsync/Gemfile.lock
index 4381dd83b62c..9c6927136097 100644
--- a/pkgs/development/tools/database/pgsync/Gemfile.lock
+++ b/pkgs/development/tools/database/pgsync/Gemfile.lock
@@ -2,13 +2,13 @@ GEM
   remote: https://rubygems.org/
   specs:
     parallel (1.22.1)
-    pg (1.4.4)
-    pgsync (0.7.2)
+    pg (1.4.5)
+    pgsync (0.7.3)
       parallel
       pg (>= 0.18.2)
       slop (>= 4.8.2)
       tty-spinner
-    slop (4.9.3)
+    slop (4.10.0)
     tty-cursor (0.7.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
diff --git a/pkgs/development/tools/database/pgsync/gemset.nix b/pkgs/development/tools/database/pgsync/gemset.nix
index f556be4eb99d..3224efedfc12 100644
--- a/pkgs/development/tools/database/pgsync/gemset.nix
+++ b/pkgs/development/tools/database/pgsync/gemset.nix
@@ -14,10 +14,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3";
+      sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1";
       type = "gem";
     };
-    version = "1.4.4";
+    version = "1.4.5";
   };
   pgsync = {
     dependencies = ["parallel" "pg" "slop" "tty-spinner"];
@@ -25,20 +25,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "009xrrxqwcrcackw2w86xamkb1clb70ghcr8g8n8w9h13qaa0j78";
+      sha256 = "18misp6iwjr3cd4jzhbnf2q058gnkxx27jx1b87z6p64bwkgr3x2";
       type = "gem";
     };
-    version = "0.7.2";
+    version = "0.7.3";
   };
   slop = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cz9fpr7zya6d44070ya0ik4pwv7c8dlqgw4bxgxficzakdxy9kf";
+      sha256 = "052mhd76f4dshc36f2bd5pp807lgnaj5i6ai8jg075384wcfhcpb";
       type = "gem";
     };
-    version = "4.9.3";
+    version = "4.10.0";
   };
   tty-cursor = {
     groups = ["default"];

From c1422cea7af76253968a14847c700ca72325c827 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 17 Feb 2023 17:19:44 +0100
Subject: [PATCH 27/44] python310Packages.cwl-utils: 0.22 -> 0.23

Diff: https://github.com/common-workflow-language/cwl-utils/compare/refs/tags/v0.22...v0.23

Changelog: https://github.com/common-workflow-language/cwl-utils/releases/tag/v0.23
---
 pkgs/development/python-modules/cwl-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cwl-utils/default.nix b/pkgs/development/python-modules/cwl-utils/default.nix
index 2f605950bc59..0c0618f9c3d0 100644
--- a/pkgs/development/python-modules/cwl-utils/default.nix
+++ b/pkgs/development/python-modules/cwl-utils/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "cwl-utils";
-  version = "0.22";
+  version = "0.23";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "common-workflow-language";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-vOIheOcDG8qdPtcN0kkBN3URodknDLTC7BzYGIiD2RA=";
+    hash = "sha256-tr4QQ/p0jx/e5kHx4WSYfo06/qMNFyxIGsaAA8nBBoA=";
   };
 
   propagatedBuildInputs = [

From b933aac06ee1e72c2c72bf90a6bfd9971fef5181 Mon Sep 17 00:00:00 2001
From: Jan Solanti <jhs@psonet.com>
Date: Fri, 17 Feb 2023 20:27:38 +0200
Subject: [PATCH 28/44] tauon: 7.4.7 -> 7.5.0

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

diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix
index d6e56c98125f..db7851d9e154 100644
--- a/pkgs/applications/audio/tauon/default.nix
+++ b/pkgs/applications/audio/tauon/default.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tauon";
-  version = "7.4.7";
+  version = "7.5.0";
 
   src = fetchFromGitHub {
     owner = "Taiko2k";
     repo = "TauonMusicBox";
     rev = "v${version}";
-    sha256 = "sha256-WUHMXsbnNaDlV/5bCOPMadJKWoF5i2UlFf9fcX6GCZ0=";
+    hash = "sha256-9/mzh8lRBjd7d9oEyG1XGWmOdgPEFCVjHZxDnAhYDwc=";
   };
 
   postUnpack = ''

From 2515951ed8846300d381da7f5019433da4a22bc3 Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Mon, 24 Oct 2022 07:44:16 -0400
Subject: [PATCH 29/44] platform-folders: add updateScript

---
 pkgs/development/libraries/platform-folders/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/development/libraries/platform-folders/default.nix
index 8ed0c7a744be..5479502abb23 100644
--- a/pkgs/development/libraries/platform-folders/default.nix
+++ b/pkgs/development/libraries/platform-folders/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake, gitUpdater }:
 
 stdenv.mkDerivation rec {
   pname = "platform-folders";
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
   ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = with lib; {
     description = "A C++ library to look for standard platform directories so that you do not need to write platform-specific code";
     homepage = "https://github.com/sago007/PlatformFolders";

From 5f5bdf86d7939a24469c678a4fe8cba8fcef3870 Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Mon, 24 Oct 2022 07:44:16 -0400
Subject: [PATCH 30/44] gl3w: add updateScript

---
 pkgs/development/libraries/gl3w/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix
index b79c83cbf155..617d51d85ed5 100644
--- a/pkgs/development/libraries/gl3w/default.nix
+++ b/pkgs/development/libraries/gl3w/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU }:
+{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU, unstableGitUpdater }:
 
 stdenv.mkDerivation rec {
   pname = "gl3w";
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
     cp ${libglvnd.dev}/include/KHR/khrplatform.h include/KHR/khrplatform.h
   '';
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = with lib; {
     description = "Simple OpenGL core profile loading";
     homepage = "https://github.com/skaslev/gl3w";

From f3d2bbea40260c27bfbe6ca45ce5dfcd5dc991ff Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Mon, 24 Oct 2022 07:44:16 -0400
Subject: [PATCH 31/44] crossguid: add updateScript

---
 pkgs/development/libraries/crossguid/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix
index 09d07064527a..bccba589e031 100644
--- a/pkgs/development/libraries/crossguid/default.nix
+++ b/pkgs/development/libraries/crossguid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, libuuid }:
+{ lib, stdenv, fetchFromGitHub, cmake, libuuid, unstableGitUpdater }:
 
 stdenv.mkDerivation rec {
   pname = "crossguid";
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = lib.optional stdenv.isLinux libuuid;
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = with lib; {
     description = "Lightweight cross platform C++ GUID/UUID library";
     license = licenses.mit;

From 364fd1883b76eea2b61ed9bdecd8c0dca1b09e10 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Fri, 17 Feb 2023 20:11:46 +0100
Subject: [PATCH 32/44] gh-dash: 3.6.0 -> 3.7.6

---
 pkgs/tools/misc/gh-dash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix
index c690df170b84..fa0f237d5b16 100644
--- a/pkgs/tools/misc/gh-dash/default.nix
+++ b/pkgs/tools/misc/gh-dash/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "gh-dash";
-  version = "3.6.0";
+  version = "3.7.6";
 
   src = fetchFromGitHub {
     owner = "dlvhdr";
     repo = "gh-dash";
     rev = "v${version}";
-    sha256 = "sha256-pQd41uQdfkbqIjdUIwUnKS/Qso495Ips8P2CXPd8JRU=";
+    hash = "sha256-EYDSfxFOnMuPDZaG1CYQtYLNe6afm/2YYlQPheAKXDg=";
   };
 
   vendorHash = "sha256-66GxD48fCWUWMyZ3GiivWNtz0mgI4JHMcvNwHGFTRfU=";

From abda1b2b4482fc2659c943e1f1f29eafabbbb031 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Fri, 17 Feb 2023 14:14:22 -0500
Subject: [PATCH 33/44] yt-dlp: add updateScript

---
 pkgs/tools/misc/yt-dlp/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix
index 09771083f1c4..d9331a8c28af 100644
--- a/pkgs/tools/misc/yt-dlp/default.nix
+++ b/pkgs/tools/misc/yt-dlp/default.nix
@@ -13,6 +13,7 @@
 , ffmpegSupport ? true
 , rtmpSupport ? true
 , withAlias ? false # Provides bin/youtube-dl for backcompat
+, update-python-libraries
 }:
 
 buildPythonPackage rec {
@@ -53,6 +54,8 @@ buildPythonPackage rec {
     ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl"
   '';
 
+  passthru.updateScript = [ update-python-libraries (toString ./.) ];
+
   meta = with lib; {
     homepage = "https://github.com/yt-dlp/yt-dlp/";
     description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)";

From a48a5d6359625ab89e4a62b6c578ffcd83622cea Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Fri, 17 Feb 2023 20:16:20 +0100
Subject: [PATCH 34/44] gh-dash: add version test

---
 pkgs/tools/misc/gh-dash/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix
index fa0f237d5b16..131db58c0b80 100644
--- a/pkgs/tools/misc/gh-dash/default.nix
+++ b/pkgs/tools/misc/gh-dash/default.nix
@@ -1,6 +1,8 @@
 { lib
 , fetchFromGitHub
 , buildGoModule
+, testers
+, gh-dash
 }:
 
 buildGoModule rec {
@@ -16,7 +18,15 @@ buildGoModule rec {
 
   vendorHash = "sha256-66GxD48fCWUWMyZ3GiivWNtz0mgI4JHMcvNwHGFTRfU=";
 
-  ldflags = [ "-s" "-w" ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/dlvhdr/gh-dash/cmd.Version=${version}"
+  ];
+
+  passthru.tests = {
+    version = testers.testVersion { package = gh-dash; };
+  };
 
   meta = {
     description = "gh extension to display a dashboard with pull requests and issues";

From bc18c81dbef45ca279c237a8c43dc499eaa4c4c2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 17 Feb 2023 21:20:41 +0100
Subject: [PATCH 35/44] python310Packages.xiaomi-ble: 0.16.3 -> 0.16.4

Diff: https://github.com/Bluetooth-Devices/xiaomi-ble/compare/refs/tags/v0.16.3...v0.16.4

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

diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix
index 8dfbd418157a..aa59481b8ed4 100644
--- a/pkgs/development/python-modules/xiaomi-ble/default.nix
+++ b/pkgs/development/python-modules/xiaomi-ble/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "xiaomi-ble";
-  version = "0.16.3";
+  version = "0.16.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-yk3rEOcHIEZLz3qKxeGzHuVUWWxG3GhSt9vc0pXcanQ=";
+    hash = "sha256-ye/BuVKLNSC0zJzDyuairbrmZgQ+sX0y9bHWEfb/MJE=";
   };
 
   nativeBuildInputs = [

From 069a72478dfe9a1d76038aeedf73687b50eb64a6 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <github@anymore.nl>
Date: Fri, 17 Feb 2023 21:26:23 +0100
Subject: [PATCH 36/44] python3Packages.types-pillow: init at 9.4.0.12

---
 .../python-modules/types-pillow/default.nix   | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/types-pillow/default.nix

diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix
new file mode 100644
index 000000000000..10c79c532098
--- /dev/null
+++ b/pkgs/development/python-modules/types-pillow/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "types-pillow";
+  version = "9.4.0.12";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "types-Pillow";
+    sha256 = "sha256-4AdBSdXwbTWTwRisyD41P4VCvMc1dv/vtlaOqrVnE0g=";
+  };
+
+  # Modules doesn't have tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "PIL-stubs"
+  ];
+
+  meta = with lib; {
+    description = "Typing stubs for Pillow";
+    homepage = "https://github.com/python/typeshed";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ arjan-s ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2e98fb16c57c..468ce951d29a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11830,6 +11830,8 @@ self: super: with self; {
 
   types-ipaddress = callPackage ../development/python-modules/types-ipaddress { };
 
+  types-pillow = callPackage ../development/python-modules/types-pillow { };
+
   types-protobuf = callPackage ../development/python-modules/types-protobuf { };
 
   types-psutil = callPackage ../development/python-modules/types-psutil { };

From ef9eccad572028b167c047e97b0304ab15b9a262 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 17 Feb 2023 15:27:07 -0500
Subject: [PATCH 37/44] Revert "python3Packages.catboost: 1.0.5 -> 1.1.1"

This reverts commit 72b7f21a1c9bba961954e8863f6881532ff2597a.
---
 pkgs/development/python-modules/catboost/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix
index 0dfc302a49a5..2c4d3bb23516 100644
--- a/pkgs/development/python-modules/catboost/default.nix
+++ b/pkgs/development/python-modules/catboost/default.nix
@@ -5,15 +5,15 @@
 
 buildPythonPackage rec {
   pname = "catboost";
-  version = "1.1.1";
+  version = "1.0.5";
 
   disabled = pythonOlder "3.4";
 
   src = fetchFromGitHub {
     owner = "catboost";
     repo = "catboost";
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-bqnUHTTRan/spA5y4LRt/sIUYpP3pxzdN/4wHjzgZVY=";
+    rev = "v${version}";
+    sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk=";
   };
 
   nativeBuildInputs = [ clang_12 ];

From 3dbc3b9c6502c48c71c3e9598a7f47d4d7bdcd6e Mon Sep 17 00:00:00 2001
From: Yan <yanabuarab@gmail.com>
Date: Sat, 18 Feb 2023 00:12:15 +0200
Subject: [PATCH 38/44] mongoc: add patch documentation

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

diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 97490748540e..905d8330fe4d 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
 
   # https://github.com/NixOS/nixpkgs/issues/25585
   preFixup = ''rm -rf "$(pwd)" '';
+  # https://github.com/mongodb/mongo-c-driver/pull/1157
+  # related:
+  # https://github.com/NixOS/nixpkgs/issues/144170
+  # mongoc's cmake incorrectly injects a prefix to library paths, breaking Nix. This removes the prefix from paths.
   postPatch = ''
     substituteInPlace src/libmongoc/CMakeLists.txt \
       --replace "\\\''${prefix}/" ""

From 9c29ccb37694129f14bcf9a139593bd7594b711b Mon Sep 17 00:00:00 2001
From: Daniel Albert <git@esclear.de>
Date: Sat, 18 Feb 2023 00:05:53 +0100
Subject: [PATCH 39/44] pgmodeler: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix
index 1b42cd46a6b6..ca2d75eac853 100644
--- a/pkgs/applications/misc/pgmodeler/default.nix
+++ b/pkgs/applications/misc/pgmodeler/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgmodeler";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "pgmodeler";
     repo = "pgmodeler";
     rev = "v${version}";
-    sha256 = "sha256-aDmaKf3iLBFD28n2u/QOf/GkgE64Birn0x3Kj5Qx2sg=";
+    sha256 = "sha256-SlAYl2x1qdBBwLboO59h1uifF7Q71oX3JyhWwUogdb0=";
   };
 
   nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];

From 5759ce6ce0709cb218faa79bc6091535c3af7d42 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Feb 2023 23:08:40 +0000
Subject: [PATCH 40/44] python310Packages.ha-philipsjs: 3.0.0 -> 3.0.1

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

diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix
index 3d8ff39af14b..4b8b02e91209 100644
--- a/pkgs/development/python-modules/ha-philipsjs/default.nix
+++ b/pkgs/development/python-modules/ha-philipsjs/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "ha-philipsjs";
-  version = "3.0.0";
+  version = "3.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-iJxu+TdgDHMnLuNTFj0UC8V76x3nAgGqswMLDSgmDmQ=";
+    hash = "sha256-5SneI1aZiUyLGYmtRXJYPBUtQR08fV+MWkjIQXt208s=";
   };
 
   propagatedBuildInputs = [

From be1f8ec4f599a5325216850bcae6e18a8d96cdec Mon Sep 17 00:00:00 2001
From: Ryan Rasti <ryanrasti@protonmail.com>
Date: Mon, 30 Jan 2023 02:35:12 -0800
Subject: [PATCH 41/44] fetchHex produces outputs that mix will accept

---
 pkgs/development/beam-modules/fetch-hex.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix
index 9d7e18ce24ed..2d1fa623745a 100644
--- a/pkgs/development/beam-modules/fetch-hex.nix
+++ b/pkgs/development/beam-modules/fetch-hex.nix
@@ -19,9 +19,18 @@ stdenv.mkDerivation ({
   };
 
   unpackCmd = ''
-    tar -xf $curSrc contents.tar.gz
+    tar -xf $curSrc contents.tar.gz CHECKSUM metadata.config
     mkdir contents
     tar -C contents -xzf contents.tar.gz
+    mv metadata.config contents/hex_metadata.config
+
+    # To make the extracted hex tarballs appear legitimate to mix, we need to
+    # make sure they contain not just the contents of contents.tar.gz but also
+    # a .hex file with some lock metadata.
+    # We use an old version of .hex file per hex's mix_task_test.exs since it
+    # is just plain-text instead of an encoded format.
+    # See: https://github.com/hexpm/hex/blob/main/test/hex/mix_task_test.exs#L410
+    echo -n "${pkg},${version},$(cat CHECKSUM | tr '[:upper:]' '[:lower:]'),hexpm" > contents/.hex
   '';
 
   installPhase = ''

From ebb1b60be1567e2661d8e7c7a73fabbbf68c7e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Niemel=C3=A4?= <josh@jniemela.dk>
Date: Sat, 18 Feb 2023 02:58:58 +0100
Subject: [PATCH 42/44] maintainers: add joshniemela

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 36762361d104..a799fa085539 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7299,6 +7299,12 @@
     github = "jorsn";
     githubId = 4646725;
   };
+  joshniemela = {
+    name = "Joshua Niemelä";
+    email = "josh@jniemela.dk";
+    github = "joshniemela";
+    githubId = 88747315;
+  };
   joshuafern = {
     name = "Joshua Fern";
     email = "joshuafern@protonmail.com";

From a4f7cd5fe3bc3d961ce0668890295ec542ad00fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Niemel=C3=A4?= <josh@jniemela.dk>
Date: Sat, 18 Feb 2023 02:59:03 +0100
Subject: [PATCH 43/44] julia_19: add joshniemela to maintainers

---
 pkgs/development/compilers/julia/1.9.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix
index 75c7e5f40406..d13b078494ad 100644
--- a/pkgs/development/compilers/julia/1.9.nix
+++ b/pkgs/development/compilers/julia/1.9.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "https://julialang.org/";
     license = licenses.mit;
-    maintainers = with maintainers; [ nickcao ];
+    maintainers = with maintainers; [ nickcao joshniemela ];
     platforms = [ "x86_64-linux" "aarch64-linux" ];
   };
 }

From 9e9a2124cff6edf577711df8a673df293ac974cd Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 17 Feb 2023 23:42:30 -0500
Subject: [PATCH 44/44] cargo-tally: 1.0.22 -> 1.0.23

Changelog: https://github.com/dtolnay/cargo-tally/releases/tag/1.0.23
---
 pkgs/development/tools/rust/cargo-tally/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix
index 55b63dadad97..a582ce805a91 100644
--- a/pkgs/development/tools/rust/cargo-tally/default.nix
+++ b/pkgs/development/tools/rust/cargo-tally/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tally";
-  version = "1.0.22";
+  version = "1.0.23";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-h3w9xxzExDojJw2OIPMT9lQ/lzYQNf9WJVHBP+tOnPw=";
+    sha256 = "sha256-H8odIEGtAMP1SQMdlgvFbduoLEaze89MFarN8AxBkK4=";
   };
 
-  cargoSha256 = "sha256-EPYfmRms00AE4NkmOJBnIKYOCFbjd2qwRi6/i09hQ6U=";
+  cargoSha256 = "sha256-pVHBFub5OTkL6e8ftI0nNisH+vJBOlcq4W0gwzz7vtA=";
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
     DiskArbitration
@@ -20,6 +20,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Graph the number of crates that depend on your crate over time";
     homepage = "https://github.com/dtolnay/cargo-tally";
+    changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${version}";
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ figsoda ];
   };