From 995853d13c53c182781b14e00b91ea20ce98257f Mon Sep 17 00:00:00 2001
From: sohalt <sohalt@sohalt.net>
Date: Mon, 29 Aug 2022 11:56:16 +0200
Subject: [PATCH 01/35] nixos/oci-containers: wait for network before starting
 container
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without `ìmageFile` set, the service needs to download the image from
the registry. If the network is not up in time, the service tries to
restart rapidly until it fails.
---
 nixos/modules/virtualisation/oci-containers.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix
index 81cdf1dd72b4..ed04e6a56a2b 100644
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@@ -229,7 +229,10 @@ let
     dependsOn = map (x: "${cfg.backend}-${x}.service") container.dependsOn;
   in {
     wantedBy = [] ++ optional (container.autoStart) "multi-user.target";
-    after = lib.optionals (cfg.backend == "docker") [ "docker.service" "docker.socket" ] ++ dependsOn;
+    after = lib.optionals (cfg.backend == "docker") [ "docker.service" "docker.socket" ]
+            # if imageFile is not set, the service needs the network to download the image from the registry
+            ++ lib.optionals (container.imageFile == null) [ "network-online.target" ]
+            ++ dependsOn;
     requires = dependsOn;
     environment = proxy_env;
 

From fe205fd152be1e367c95cf648bfa4716142b171c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Nov 2022 21:38:41 +0000
Subject: [PATCH 02/35] python310Packages.dropbox: 11.35.0 -> 11.36.0

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

diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index f38b504cbb8c..4736adf4a1bc 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "dropbox";
-  version = "11.35.0";
+  version = "11.36.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "dropbox";
     repo = "dropbox-sdk-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vrOqsRe2sBsL5CIfGCmoO3geE9G0FJl88HRcP6FzZe0=";
+    hash = "sha256-J2AaGkD4TMDcVzTtdcNH0bgy6de+BRjYdtTaRL3lYrs=";
   };
 
   propagatedBuildInputs = [

From 3301ba748d95c9b371b1315efee20438fd28aae2 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 7 Jan 2023 15:28:51 -0800
Subject: [PATCH 03/35] azure-functions-core-tools: 4.0.4785 -> 4.0.4915

---
 .../azure-functions-core-tools/default.nix    | 182 ++++++++++--------
 1 file changed, 97 insertions(+), 85 deletions(-)

diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix
index d4cebd5551e9..5165c4509e50 100644
--- a/pkgs/development/tools/azure-functions-core-tools/default.nix
+++ b/pkgs/development/tools/azure-functions-core-tools/default.nix
@@ -1,86 +1,98 @@
-{ stdenv
-, lib
-, config
-, fetchurl
-, unzip
-, makeWrapper
-, icu
-, libunwind
-, curl
-, zlib
-, libuuid
-, dotnetbuildhelpers
-, dotnetCorePackages
-, openssl
-}:
-
-stdenv.mkDerivation rec {
-  pname = "azure-functions-core-tools";
-  version = "4.0.4785";
-
-  src =
-    if stdenv.isLinux then
-      fetchurl {
-        url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.linux-x64.${version}.zip";
-        sha256 = "sha256-SWvbPEslwhYNd2fTQJWy1+823o1vJR/roPstgelSfnQ=";
-      }
-    else
-      fetchurl {
-        url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.osx-x64.${version}.zip";
-        sha256 = "sha256-m06XeUHVDCxo7sfK4eF1oM6IuaVET9jr/xSO9qzpxSU=";
-      }
-    ;
-
-  nativeBuildInputs = [
-    unzip
-    makeWrapper
-    dotnetbuildhelpers
-    icu
-    libunwind
-    curl
-    zlib
-    dotnetCorePackages.sdk_3_1
-  ];
-
-  libPath = lib.makeLibraryPath [
-    libunwind
-    libuuid
-    stdenv.cc.cc
-    curl
-    zlib
-    icu
-    openssl
-  ];
-
-  unpackPhase = ''
-    unzip $src
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -prd . $out/bin/azure-functions-core-tools
-    chmod +x $out/bin/azure-functions-core-tools/{func,gozip}
-  '' + lib.optionalString stdenv.isLinux ''
-    patchelf \
-      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${libPath}" "$out/bin/azure-functions-core-tools/func"
-    find $out/bin/azure-functions-core-tools -type f -name "*.so" -exec patchelf --set-rpath "${libPath}" {} \;
-    wrapProgram "$out/bin/azure-functions-core-tools/func" --prefix LD_LIBRARY_PATH : ${libPath}
-  '' + ''
-    ln -s $out/bin/{azure-functions-core-tools,}/func
-    ln -s $out/bin/{azure-functions-core-tools,}/gozip
-  '';
-  dontStrip = true; # Causes rpath patching to break if not set
-
-  meta = with lib; {
-    homepage = "https://github.com/Azure/azure-functions-core-tools";
-    description = "Command line tools for Azure Functions";
-    sourceProvenance = with sourceTypes; [
-      binaryBytecode
-      binaryNativeCode
-    ];
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
-    platforms = platforms.unix;
+{
+  stdenv,
+  lib,
+  config,
+  fetchurl,
+  unzip,
+  makeWrapper,
+  icu,
+  libunwind,
+  curl,
+  zlib,
+  libuuid,
+  dotnetbuildhelpers,
+  dotnetCorePackages,
+  openssl,
+}: let
+  platforms = {
+    "aarch64-darwin" = {
+      platformStr = "osx-arm64";
+      hash = "sha512-MDuyFxtjlojXyrOdgJxVY3IDMLnrDvA4rO7ujOlE5KH082GXfonNOFZSpa64M8jMPJhJ4sopHKgZVvKKygzjPg==";
+    };
+    "x86_64-darwin" = {
+      platformStr = "osx-x64";
+      hash = "sha512-fD48QFYIzq3/EvZR3o3VFCxIz3VZGSDJUo/ZwfZnFu7xt/xkQSBL+2zXOh9XZaBg42Xq3x9eFZQ00V8AbqJdKA==";
+    };
+    "x86_64-linux" = {
+      platformStr = "linux-x64";
+      hash = "sha512-PhgS2ivRn8Yhlr7+gbQd+rGSMDLGsxURh8lOE30Xk7zEubukjekxDsaPqM1tOS95k7TWM9xXyVVfmsJplrl+nw==";
+    };
   };
-}
+
+  platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
+in
+  stdenv.mkDerivation rec {
+    pname = "azure-functions-core-tools";
+    version = "4.0.4915";
+
+    src = fetchurl {
+      url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.${platformInfo.platformStr}.${version}.zip";
+      inherit (platformInfo) hash;
+    };
+
+    nativeBuildInputs = [
+      unzip
+      makeWrapper
+      dotnetbuildhelpers
+      icu
+      libunwind
+      curl
+      zlib
+      dotnetCorePackages.sdk_6_0
+    ];
+
+    libPath = lib.makeLibraryPath [
+      libunwind
+      libuuid
+      stdenv.cc.cc
+      curl
+      zlib
+      icu
+      openssl
+    ];
+
+    unpackPhase = ''
+      unzip $src
+    '';
+
+    installPhase =
+      ''
+        mkdir -p $out/bin
+        cp -prd . $out/bin/azure-functions-core-tools
+        chmod +x $out/bin/azure-functions-core-tools/{func,gozip}
+      ''
+      + lib.optionalString stdenv.isLinux ''
+        patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath "${libPath}" "$out/bin/azure-functions-core-tools/func"
+        find $out/bin/azure-functions-core-tools -type f -name "*.so" -exec patchelf --set-rpath "${libPath}" {} \;
+        wrapProgram "$out/bin/azure-functions-core-tools/func" --prefix LD_LIBRARY_PATH : ${libPath}
+      ''
+      + ''
+        ln -s $out/bin/{azure-functions-core-tools,}/func
+        ln -s $out/bin/{azure-functions-core-tools,}/gozip
+      '';
+    dontStrip = true; # Causes rpath patching to break if not set
+
+    meta = with lib; {
+      homepage = "https://github.com/Azure/azure-functions-core-tools";
+      description = "Command line tools for Azure Functions";
+      sourceProvenance = with sourceTypes; [
+        binaryBytecode
+        binaryNativeCode
+      ];
+      license = licenses.mit;
+      maintainers = with maintainers; [];
+      platforms = ["x86_64-linux" "aarch64-darwin" "x86_64-darwin"];
+    };
+  }

From 06f0e49dc60bccbcce9fed65c9f6fda53ba722af Mon Sep 17 00:00:00 2001
From: Chris Hodapp <chris@hodapp.email>
Date: Sun, 15 Jan 2023 10:56:07 -0800
Subject: [PATCH 04/35] lib: make extender available on self-references

---
 lib/fixed-points.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix
index bf1567a22a66..926428293c1c 100644
--- a/lib/fixed-points.nix
+++ b/lib/fixed-points.nix
@@ -107,7 +107,7 @@ rec {
   # Same as `makeExtensible` but the name of the extending attribute is
   # customized.
   makeExtensibleWithCustomName = extenderName: rattrs:
-    fix' rattrs // {
+    fix' (self: (rattrs self) // {
       ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);
-   };
+    });
 }

From 497c7f26aaf93a2f97d8d47b30f8416ddef8473f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Jan 2023 19:15:00 +0000
Subject: [PATCH 05/35] socat: 1.7.4.3 -> 1.7.4.4

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

diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
index 06b3cbdbe80a..548d9bed76e4 100644
--- a/pkgs/tools/networking/socat/default.nix
+++ b/pkgs/tools/networking/socat/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "socat";
-  version = "1.7.4.3";
+  version = "1.7.4.4";
 
   src = fetchurl {
     url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-1HMYEEQVB3Y1EZ3+5EvPtB3jSXN0qaABsa/24vCFgAc=";
+    sha256 = "sha256-+9Qr0vDlSjr20BvfFThThKuC28Dk8aXhU7PgvhtjgKw=";
   };
 
   postPatch = ''

From 1d84dbf0824c3b8882456106550513dc5ee2087d Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Tue, 17 Jan 2023 11:25:35 -0800
Subject: [PATCH 06/35] yark: init at 1.2.3

By request, in #209237, but also it's been on my plate for about a week
to investigate.

I have tested that the main executable runs, but I haven't tried out any
subcommands yet.
---
 .../python-modules/yark/default.nix           | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/yark/default.nix

diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix
new file mode 100644
index 000000000000..3b03b89ce9bf
--- /dev/null
+++ b/pkgs/development/python-modules/yark/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi,
+  click, colorama, flask, requests, yt-dlp }:
+
+buildPythonPackage rec {
+  pname = "yark";
+  version = "1.2.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-KMnQpEH2Z19Y0jBjqx2rZjmlle2M9bcuDCjDIljQEYY=";
+  };
+
+  propagatedBuildInputs = [
+    click colorama flask requests yt-dlp
+  ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "YouTube archiving made simple";
+    homepage = "https://github.com/Owez/yark";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4dd5e12b222c..0536a6878a39 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12392,6 +12392,8 @@ self: super: with self; {
 
   yarg = callPackage ../development/python-modules/yarg { };
 
+  yark = callPackage ../development/python-modules/yark { };
+
   yarl = callPackage ../development/python-modules/yarl { };
 
   yaspin = callPackage ../development/python-modules/yaspin { };

From c2bf247bec672a0d6e2bdeced2d7d1b5643281c1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 Jan 2023 07:13:51 +0000
Subject: [PATCH 07/35] =?UTF-8?q?evolution-data-server:=203.46.2=20?=
 =?UTF-8?q?=E2=86=92=203.46.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.46.2...3.46.3
---
 .../desktops/gnome/core/evolution-data-server/default.nix | 4 ++--
 .../core/evolution-data-server/hardcode-gsettings.patch   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix
index bdde8160ca50..082483b1c247 100644
--- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix
@@ -50,13 +50,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.46.2";
+  version = "3.46.3";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "+b1SAIt+U12BaSDPzscKDlViveKK9x+ZbiA/9qhuRuA=";
+    sha256 = "CTjiJ55c+8IgR2bKnT/qVwkRaZsHwQy+AaymKn6LK+4=";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
index 1774717affe4..dfe109f57bda 100644
--- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
+++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
@@ -442,10 +442,10 @@ index 8e4ee81..cc94026 100644
  		g_object_unref (settings);
  
 diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c
-index 7783781..6a2db01 100644
+index b0c2410..ca915e0 100644
 --- a/src/libedataserver/e-oauth2-service.c
 +++ b/src/libedataserver/e-oauth2-service.c
-@@ -90,7 +90,18 @@ eos_default_guess_can_process (EOAuth2Service *service,
+@@ -94,7 +94,18 @@ eos_default_guess_can_process (EOAuth2Service *service,
  	name_len = strlen (name);
  	hostname_len = strlen (hostname);
  
@@ -466,10 +466,10 @@ index 7783781..6a2db01 100644
  	g_object_unref (settings);
  
 diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c
-index 6701a3a..f497263 100644
+index 4a9b398..e7cb404 100644
 --- a/src/libedataserver/e-source-registry.c
 +++ b/src/libedataserver/e-source-registry.c
-@@ -1764,7 +1764,19 @@ e_source_registry_init (ESourceRegistry *registry)
+@@ -1773,7 +1773,19 @@ e_source_registry_init (ESourceRegistry *registry)
  
  	g_mutex_init (&registry->priv->sources_lock);
  

From 411f2dec73de56cc9d59ea5cfdca5ee8287cfb52 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 Jan 2023 07:16:32 +0000
Subject: [PATCH 08/35] =?UTF-8?q?evolution-ews:=203.46.2=20=E2=86=92=203.4?=
 =?UTF-8?q?6.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.46.2...3.46.3
---
 .../mailreaders/evolution/evolution-ews/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
index 78a647bf0152..8033a734b981 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-ews";
-  version = "3.46.2";
+  version = "3.46.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "6spQz4oq6sFT2bCmaixVJDbTw1wM3LQFmg3E1trZ30E=";
+    sha256 = "BFnqQFY2OKWllPQt3BzHGRotOCLCEcz/+82LNtMmQCU=";
   };
 
   patches = [

From b8e8008873120935d47e5d3886a585f0afef47c8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 Jan 2023 07:18:45 +0000
Subject: [PATCH 09/35] =?UTF-8?q?evolution:=203.46.2=20=E2=86=92=203.46.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution/-/compare/3.46.2...3.46.3
---
 .../networking/mailreaders/evolution/evolution/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index 0c7f5a417536..a5ed92f519e3 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -44,11 +44,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution";
-  version = "3.46.2";
+  version = "3.46.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "cks7uFOapRxpJsPxfTO7zjWpnBbqY7gJCzRsWr9ol30=";
+    sha256 = "riIQdCXTDRejo0w1bNpfQKrXhG12vbYINEUYtdQpwfM=";
   };
 
   nativeBuildInputs = [

From 564c0bebded5e073511b7feeb9c8c66612387319 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 Jan 2023 19:06:00 +0800
Subject: [PATCH 10/35] xneur: format with nixpkgs-fmt

---
 pkgs/applications/misc/xneur/default.nix | 43 +++++++++++++++++++-----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 2d8af0465a77..2f02231536df 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -1,9 +1,23 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, xorg, pcre, gst_all_1, glib
-, xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:
+{ stdenv
+, lib
+, fetchurl
+, fetchpatch
+, intltool
+, pkg-config
+, wrapGAppsHook
+, enchant
+, gdk-pixbuf
+, glib
+, gst_all_1
+, libnotify
+, pcre
+, xorg
+, xosd
+}:
 
 stdenv.mkDerivation {
-   pname = "xneur";
-   version = "0.20.0";
+  pname = "xneur";
+  version = "0.20.0";
 
   src = fetchurl {
     url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/xneur_0.20.0.orig.tar.gz";
@@ -11,14 +25,25 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    pkg-config intltool wrapGAppsHook
+    intltool
+    pkg-config
+    wrapGAppsHook
   ];
 
   buildInputs = [
-    xorg.libX11 xorg.libXtst pcre gst_all_1.gstreamer glib
-    xosd xorg.libXext xorg.libXi libnotify
-    enchant gdk-pixbuf
-    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+    enchant
+    gdk-pixbuf
+    glib
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gstreamer
+    libnotify
+    pcre
+    xorg.libX11
+    xorg.libXext
+    xorg.libXi
+    xorg.libXtst
+    xosd
   ];
 
   patches = [

From ed0995f446c83c75a4bc1c38203d6aac6c1bee2a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 Jan 2023 19:08:33 +0800
Subject: [PATCH 11/35] xneur: build with enchant2

We are trying to remove enchant1 from Nixpkgs. Since there is no
new release we pull the patch from debian to build this with enchant2.
---
 pkgs/applications/misc/xneur/default.nix | 9 ++++++++-
 pkgs/top-level/all-packages.nix          | 4 +---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 2f02231536df..eab545cf0818 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -2,6 +2,7 @@
 , lib
 , fetchurl
 , fetchpatch
+, autoreconfHook
 , intltool
 , pkg-config
 , wrapGAppsHook
@@ -25,6 +26,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
+    autoreconfHook
     intltool
     pkg-config
     wrapGAppsHook
@@ -52,10 +54,15 @@ stdenv.mkDerivation {
       url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch";
       sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy";
     })
+    (fetchpatch {
+      name = "enchant2.patch";
+      url = "https://salsa.debian.org/debian/xneur/-/raw/695b0fea56cde4ff6cf0f3988218c5cb9d7ff5ae/debian/patches/enchant2.patch";
+      sha256 = "02a3kkfzdvs5f8dfm6j5x3jcn5j8qah9ykfymp6ffqsf4fijp65n";
+    })
   ];
 
   postPatch = ''
-    sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
+    sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure.ac
   '';
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b005def9fda..b193d7efc87a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33710,9 +33710,7 @@ with pkgs;
 
   xmind = callPackage ../applications/misc/xmind { };
 
-  xneur = callPackage ../applications/misc/xneur {
-    enchant = enchant1;
-  };
+  xneur = callPackage ../applications/misc/xneur { };
 
   gxneur = callPackage ../applications/misc/gxneur  {
     inherit (gnome2) libglade GConf;

From 6c1b113f4f08dcc5f7530fed4e41c75b8f9acaca Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 Jan 2023 12:27:45 +0800
Subject: [PATCH 12/35] enchant1: remove

Unmaintained.
---
 pkgs/development/libraries/enchant/1.x.nix | 24 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/enchant/1.x.nix

diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix
deleted file mode 100644
index 79f896bef385..000000000000
--- a/pkgs/development/libraries/enchant/1.x.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, aspell, pkg-config, glib, hunspell, hspell }:
-
-stdenv.mkDerivation rec {
-  version = "1.6.1";
-  pname = "enchant";
-
-  src = fetchurl {
-    url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${pname}-${version}.tar.gz";
-    sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ aspell glib hunspell hspell ];
-
-  meta = with lib; {
-    description = "Generic spell checking library";
-    homepage = "https://abiword.github.io/enchant";
-    platforms = platforms.unix;
-    badPlatforms = [ "x86_64-darwin" ];
-    license = licenses.lgpl21;
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5506b451ddb1..39f375fa9947 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -420,6 +420,7 @@ mapAliases ({
   emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18
 
   enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22
+  enchant1 = throw "enchant1 has been removed from nixpkgs, as it was unmaintained"; # Added 2023-01-18
   encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06
   envdir = throw "envdir has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
   envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b193d7efc87a..7d46862b27b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19251,8 +19251,6 @@ with pkgs;
 
   emanote = haskell.lib.compose.justStaticExecutables haskellPackages.emanote;
 
-  enchant1 = callPackage ../development/libraries/enchant/1.x.nix { };
-
   enchant2 = callPackage ../development/libraries/enchant/2.x.nix { };
   enchant = enchant2;
 

From 318177054ba5200ec0de78ef22f8cd267f30d320 Mon Sep 17 00:00:00 2001
From: squalus <squalus@squalus.net>
Date: Mon, 2 Jan 2023 11:55:52 -0800
Subject: [PATCH 13/35] standardnotes: 3.23.69 -> 3.129.0

- add updater script
- move source urls and hashes to separate json file
- add support for linux-aarch64
---
 .../editors/standardnotes/default.nix         | 26 +++------
 .../editors/standardnotes/src.json            | 17 ++++++
 .../editors/standardnotes/update.nix          | 55 +++++++++++++++++++
 3 files changed, 80 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/applications/editors/standardnotes/src.json
 create mode 100644 pkgs/applications/editors/standardnotes/update.nix

diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix
index d4e43b4f71de..461e8dc504dc 100644
--- a/pkgs/applications/editors/standardnotes/default.nix
+++ b/pkgs/applications/editors/standardnotes/default.nix
@@ -1,26 +1,14 @@
-{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
+{ callPackage, lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
 , fetchurl, libsecret  }:
 
 let
-  version = "3.23.69";
+  srcjson = builtins.fromJSON (builtins.readFile ./src.json);
+  version = srcjson.version;
   pname = "standardnotes";
   name = "${pname}-${version}";
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
-  plat = {
-    i686-linux = "i386";
-    x86_64-linux = "x86_64";
-  }.${stdenv.hostPlatform.system} or throwSystem;
-
-  sha256 = {
-    i686-linux = "sha256-/A2LjV8ky20bcKgs0ijwldryi5VkyROwz49vWYXYQus=";
-    x86_64-linux = "sha256-fA9WH9qUtvAHF9hTFRtxQdpz2dpK0joD0zX9VYBo10g=";
-  }.${stdenv.hostPlatform.system} or throwSystem;
-
-  src = fetchurl {
-    url = "https://github.com/standardnotes/app/releases/download/%40standardnotes%2Fdesktop%40${version}/standard-notes-${version}-linux-${plat}.AppImage";
-    inherit sha256;
-  };
+  src = fetchurl (srcjson.appimage.${stdenv.hostPlatform.system} or throwSystem);
 
   appimageContents = appimageTools.extract {
     inherit name src;
@@ -47,6 +35,8 @@ in appimageTools.wrapType2 rec {
     ln -s ${appimageContents}/usr/share/icons share
   '';
 
+  passthru.updateScript = callPackage ./update.nix {};
+
   meta = with lib; {
     description = "A simple and private notes app";
     longDescription = ''
@@ -55,8 +45,8 @@ in appimageTools.wrapType2 rec {
     '';
     homepage = "https://standardnotes.org";
     license = licenses.agpl3;
-    maintainers = with maintainers; [ mgregoire chuangzhu ];
+    maintainers = with maintainers; [ mgregoire chuangzhu squalus ];
     sourceProvenance = [ sourceTypes.binaryNativeCode ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = builtins.attrNames srcjson.appimage;
   };
 }
diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json
new file mode 100644
index 000000000000..d8fa27e34a08
--- /dev/null
+++ b/pkgs/applications/editors/standardnotes/src.json
@@ -0,0 +1,17 @@
+{
+  "version": "3.129.0",
+  "appimage": {
+    "x86_64-linux": {
+      "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.129.0/standard-notes-3.129.0-linux-x86_64.AppImage",
+      "hash": "sha512-JLO2jX9Us6BjqmTZIkVyxy2pqFM/eFGpwi6vXicMOgDB0UsgEMTK+Ww+9g+vJ1KbFRFmlt187qkdSNcevQPt7w=="
+    },
+    "aarch64-linux": {
+      "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.129.0/standard-notes-3.129.0-linux-arm64.AppImage",
+      "hash": "sha512-LGUSRqMrJ+hVHyi/bjI/NkWRVsmY0Kh/wRY9RNJXm0C3dKQSFV8ca4GeY9+VCuJEecR4LGnWp4agS5jPybPP6w=="
+    },
+    "i686-linux": {
+      "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.129.0/standard-notes-3.129.0-linux-i386.AppImage",
+      "hash": "sha512-XbQ4hn3QJ61hDC12cK95zsUowbyXPYArHZoRDx5trQ30phtQxtz6nV+pL00m4S9kYeEhsAwk1wXlRq9Ylbz2IA=="
+    }
+  }
+}
diff --git a/pkgs/applications/editors/standardnotes/update.nix b/pkgs/applications/editors/standardnotes/update.nix
new file mode 100644
index 000000000000..5b8794e9a44e
--- /dev/null
+++ b/pkgs/applications/editors/standardnotes/update.nix
@@ -0,0 +1,55 @@
+{ writeScript
+, lib, curl, runtimeShell, jq, coreutils, moreutils, nix, gnused }:
+
+writeScript "update-standardnotes" ''
+  #!${runtimeShell}
+  PATH=${lib.makeBinPath [ jq curl nix coreutils moreutils gnused ]}
+
+  set -euo pipefail
+  set -x
+
+  tmpDir=$(mktemp -d)
+  srcJson=pkgs/applications/editors/standardnotes/src.json
+  jsonPath="$tmpDir"/latest
+
+  oldVersion=$(jq -r .version < "$srcJson")
+
+  curl https://api.github.com/repos/standardnotes/app/releases/latest > "$jsonPath"
+
+  tagName=$(jq -r .tag_name < "$jsonPath")
+
+  if [[ ! "$tagName" =~ "desktop" ]]; then
+    echo "latest release '$tagName' not a desktop release"
+    exit 1
+  fi
+
+  newVersion=$(jq -r .tag_name < "$jsonPath" | sed s,@standardnotes/desktop@,,g)
+
+  if [[ "$oldVersion" == "$newVersion" ]]; then
+    echo "version did not change"
+    exit 0
+  fi
+
+  function getDownloadUrl() {
+    jq -r ".assets[] | select(.name==\"standard-notes-$newVersion-$1.AppImage\") | .browser_download_url" < "$jsonPath"
+  }
+
+  function setJsonKey() {
+    jq "$1 = \"$2\"" "$srcJson" | sponge "$srcJson"
+  }
+
+  function updatePlatform() {
+    nixPlatform="$1"
+    upstreamPlatform="$2"
+    url=$(getDownloadUrl "$upstreamPlatform")
+    hash=$(nix-prefetch-url "$url" --type sha512)
+    sriHash=$(nix hash to-sri --type sha512 $hash)
+    setJsonKey .appimage[\""$nixPlatform"\"].url "$url"
+    setJsonKey .appimage[\""$nixPlatform"\"].hash "$sriHash"
+  }
+
+  updatePlatform x86_64-linux linux-x86_64
+  updatePlatform aarch64-linux linux-arm64
+  updatePlatform i686-linux linux-i386
+  setJsonKey .version "$newVersion"
+''

From 86bc14aaac22bfd6a71a8780625f07b0a76b3e61 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 19 Jan 2023 09:52:20 +0800
Subject: [PATCH 14/35] cinnamon.nemo: 5.6.2 -> 5.6.3

https://github.com/linuxmint/nemo/compare/5.6.2...5.6.3
---
 pkgs/desktops/cinnamon/nemo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix
index 58be1f5b81cb..e25db028fa86 100644
--- a/pkgs/desktops/cinnamon/nemo/default.nix
+++ b/pkgs/desktops/cinnamon/nemo/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nemo";
-  version = "5.6.2";
+  version = "5.6.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-JwwSeY+TsbYc2ZXoxR9aja0Hb8AmrWK79cv1ApAgcpQ=";
+    sha256 = "sha256-CuG0s2gtuYwuIvti5xGiGJa5C5IcruFtNhv6s1vcuUA=";
   };
 
   patches = [

From 1f5ce9e0b09026f2d88f550bcdbbe119be71d4b5 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 19 Jan 2023 15:22:42 +0800
Subject: [PATCH 15/35] python3Packages.sure: disable test on python 3.11 or
 later

As `rednose`, the check input, does not support python 3.11
---
 pkgs/development/python-modules/sure/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix
index 84cc78e8a4a8..7e142898f624 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/pkgs/development/python-modules/sure/default.nix
@@ -5,6 +5,7 @@
 , six
 , mock
 , isPyPy
+, pythonOlder
 , fetchpatch
 }:
 
@@ -26,8 +27,9 @@ buildPythonPackage rec {
     })
   ];
 
-  buildInputs = [ rednose ];
   propagatedBuildInputs = [ six mock ];
+  checkInputs = [ rednose ];
+  doCheck = pythonOlder "3.11";
 
   meta = with lib; {
     description = "Utility belt for automated testing";

From 92355593ce58fd0f2cfcb9b88802f4db6e2772a0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 19 Jan 2023 08:37:28 +0100
Subject: [PATCH 16/35] python3Packages.sure: add changelog to meta

- add pythonImportsCheck
---
 .../python-modules/sure/default.nix           | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix
index 7e142898f624..e9fba4e4b4c0 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/pkgs/development/python-modules/sure/default.nix
@@ -12,6 +12,8 @@
 buildPythonPackage rec {
   pname = "sure";
   version = "2.0.0";
+  format = "setuptools";
+
   disabled = isPyPy;
 
   src = fetchPypi {
@@ -27,14 +29,26 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [ six mock ];
-  checkInputs = [ rednose ];
+  propagatedBuildInputs = [
+    six
+    mock
+  ];
+
+  checkInputs = [
+    rednose
+  ];
+
   doCheck = pythonOlder "3.11";
 
+  pythonImportsCheck = [
+    "sure"
+  ];
+
   meta = with lib; {
     description = "Utility belt for automated testing";
-    homepage = "https://sure.readthedocs.io/en/latest/";
+    homepage = "https://sure.readthedocs.io/";
+    changelog = "https://github.com/gabrielfalcao/sure/blob/${version}/CHANGELOG.md";
     license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ ];
   };
-
 }

From 8d45acc8367ffd105bfba7be8c6ecceb44a7bc00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jan 2023 09:04:01 +0000
Subject: [PATCH 17/35] python310Packages.azure-mgmt-compute: 29.0.0 -> 29.1.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index 00245ed3ffc7..325c38412004 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-compute";
-  version = "29.0.0";
+  version = "29.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-wkRmH/3MMxeTZr7KQMZQbjPHs2GSxAjJFZlSp75pUPI=";
+    hash = "sha256-LVobrn9dMHyh6FDX6D/tnIOdT2NbEKS40/i8YJisKIg=";
   };
 
   propagatedBuildInputs = [

From 1557cc41603d550e934016a54af0ebcb62a741fa Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Thu, 19 Jan 2023 20:21:12 +0100
Subject: [PATCH 18/35] linuxPackages.nvidia_x11_production: 525.78.01 ->
 525.85.05

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index f1f15c6eecca..02111abb4d04 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -25,11 +25,11 @@ rec {
   stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
 
   production = generic {
-    version = "525.78.01";
-    sha256_64bit = "sha256-Q9pC0r9pvDfqnHwPoC9S2w3MSDwnL1LtrK2JpctJWpM=";
-    openSha256 = "sha256-fxpyXVl735ZJ3NnK7jN95gPstu7YopYH/K7UK0iAC7k=";
-    settingsSha256 = "sha256-1d3Cn+7Gm1ORQxmTKr18GFmYHVb8t050XVLler1dCtw=";
-    persistencedSha256 = "sha256-t6dViuvA2fw28w4kh4koIoxh9pQ8f7KI1PIUFJcGlYA=";
+    version = "525.85.05";
+    sha256_64bit = "sha256-6mO0JTQDsiS7cxOol3qSDf6dID1mHdX2/CZYWnAXkUA=";
+    openSha256 = "sha256-iI41eex/pQhWdQwk9qc9AlnVYcO0HRA9ISoqNdVKN7g=";
+    settingsSha256 = "sha256-ck6ra8y8nn5kA3L9/VcRR2W2RaWvfVbgBiOh2dRJr/8=";
+    persistencedSha256 = "sha256-dt/Tqxp7ZfnbLel9BavjWDoEdLJvdJRwFjTFOBYYKLI=";
   };
 
   latest = selectHighestVersion production (generic {

From 0bf42f0b9bf6e445cff905c77efe73df00898bcf Mon Sep 17 00:00:00 2001
From: Zig Uana <git@ziguana.dev>
Date: Tue, 17 Jan 2023 17:35:02 -0700
Subject: [PATCH 19/35] python3Packages.dm-tree: Fix build

---
 .../python-modules/dm-tree/cmake.patch           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/dm-tree/cmake.patch b/pkgs/development/python-modules/dm-tree/cmake.patch
index e5698f457bc3..28f201a30f71 100644
--- a/pkgs/development/python-modules/dm-tree/cmake.patch
+++ b/pkgs/development/python-modules/dm-tree/cmake.patch
@@ -1,13 +1,13 @@
 diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt
-index 8f9946c..b9d6e9b 100644
+index 4fd1b1a..f0d072b 100644
 --- a/tree/CMakeLists.txt
 +++ b/tree/CMakeLists.txt
-@@ -50,70 +50,80 @@ if(APPLE)
+@@ -50,70 +50,79 @@ if(APPLE)
    set (CMAKE_FIND_FRAMEWORK LAST)
  endif()
  
 -# Fetch pybind to be able to use pybind11_add_module symbol.
--set(PYBIND_VER v2.6.2)
+-set(PYBIND_VER v2.10.1)
 -include(FetchContent)
 -FetchContent_Declare(
 -  pybind11
@@ -42,7 +42,7 @@ index 8f9946c..b9d6e9b 100644
 +
 +if (NOT pybind11_FOUND)
 +  # Fetch pybind to be able to use pybind11_add_module symbol.
-+  set(PYBIND_VER v2.6.2)
++  set(PYBIND_VER v2.10.1)
 +  include(FetchContent)
 +  FetchContent_Declare(
 +    pybind11
@@ -69,10 +69,7 @@ index 8f9946c..b9d6e9b 100644
  # Define pybind11 tree module.
  pybind11_add_module(_tree tree.h tree.cc)
 -add_dependencies(_tree abseil-cpp)
- 
--if (WIN32 OR MSVC)
--    set(ABSEIL_LIB_PREF "absl")
--    set(LIB_SUFF "lib")
+-
 +find_package(absl)
 +
 +if (NOT absl_FOUND)
@@ -115,6 +112,9 @@ index 8f9946c..b9d6e9b 100644
 +      set(LIB_SUFF "a")
 +  endif()
 +
+-if (WIN32 OR MSVC)
+-    set(ABSEIL_LIB_PREF "absl")
+-    set(LIB_SUFF "lib")
 +  # Link abseil static libs.
 +  # We don't use find_library here to force cmake to build abseil before linking.
 +  set(ABSEIL_LIBS int128 raw_hash_set raw_logging_internal strings throw_delegate)

From 938b7ae18411ba3d57bce6498f9c31c7d9b1a46e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 20 Jan 2023 01:01:29 +0100
Subject: [PATCH 20/35] python3Packages.dm-env: Fix tests

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

diff --git a/pkgs/development/python-modules/dm-env/default.nix b/pkgs/development/python-modules/dm-env/default.nix
index 37e645c1ec35..a26480c22600 100644
--- a/pkgs/development/python-modules/dm-env/default.nix
+++ b/pkgs/development/python-modules/dm-env/default.nix
@@ -4,15 +4,17 @@
 , dm-tree
 , numpy
 , absl-py
-, nose }:
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "dm-env";
   version = "1.6";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-pDbrHGVMOeDJhqUWzuIYvqcUC1EPzv9j+X60/P89k94=";
+    hash = "sha256-pDbrHGVMOeDJhqUWzuIYvqcUC1EPzv9j+X60/P89k94=";
   };
 
   buildInputs = [
@@ -22,7 +24,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    nose
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [

From 564ed06fb66713373ad4fcc8749fcc36e2a46371 Mon Sep 17 00:00:00 2001
From: nat-418 <93013864+nat-418@users.noreply.github.com>
Date: Fri, 20 Jan 2023 01:55:37 +0100
Subject: [PATCH 21/35] vimPlugins: update

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

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 8371092e46b4..a223137c36b2 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -4719,8 +4719,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason-lspconfig.nvim";
-      rev = "e11264c3d198aef24b019e67ac04ac0cf21465ed";
-      sha256 = "0y4aw7fhab2phcllnydy8w5aviv6bc51aq1lizw9rph48cnfwkc2";
+      rev = "5b388c0de30f1605671ebfb9a20a620cda50ffce";
+      sha256 = "1c01jacxp96s2xd8w2hvp46ai49lw8dsmv372l8jj6794dqm1bfv";
     };
     meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
   };
@@ -4743,8 +4743,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason.nvim";
-      rev = "3d9ded5a837d4c667f6332f437e431624733fbb1";
-      sha256 = "059q5sxgkhsc93wmhyblgcvaqshnmg5fd6i27l80lsa3b4fny1pm";
+      rev = "db162f3f32e54f3a4ee2f03c1ea08a5253a0500a";
+      sha256 = "0scz36d4r3iz5d5g4bvxcqs15sqcdz9ry8fhhxrfz5zcsvwlj0wx";
     };
     meta.homepage = "https://github.com/williamboman/mason.nvim/";
   };
@@ -5523,8 +5523,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "421c066ce09faefe5ed066aa22c1659b76e15239";
-      sha256 = "0ih9n5lhn8r06b9m9jsg16avqa6jrvc56zhwhiqr267r9ylwyn3w";
+      rev = "06816026ccce2e8246e952d55ea87ddd26a9d2a4";
+      sha256 = "1wmf4f7z537fhnr79ijg05bb198wrl7im56m1phb6naa5fbpr0zc";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -7117,12 +7117,12 @@ final: prev:
 
   refactoring-nvim = buildVimPluginFrom2Nix {
     pname = "refactoring.nvim";
-    version = "2023-01-05";
+    version = "2023-01-19";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "b253bcee0488209875fafceda0d0832a121fa3c7";
-      sha256 = "0fak02yivwm0vw4rq912b9ysy1qfzpq6ffvi7yj48gkxrl4gr9k5";
+      rev = "ee63338cfb9151018afb243f5af5262c1686b280";
+      sha256 = "03fgla400n5mqhpfa3lljzark76ah7n0mzzxfsn5c6m3hxfkvaim";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
   };
@@ -13753,12 +13753,12 @@ final: prev:
 
   zenbones-nvim = buildVimPluginFrom2Nix {
     pname = "zenbones.nvim";
-    version = "2022-12-31";
+    version = "2023-01-20";
     src = fetchFromGitHub {
       owner = "mcchrish";
       repo = "zenbones.nvim";
-      rev = "9d865e070ada2b81a92ba8b3bf564b3fc71efc53";
-      sha256 = "078j4d7hj5lpf19fryx8rwpyg6q6wkk9z7grkc08s8kyssigcs9w";
+      rev = "13ed6d0493a1d5140995c4456ced54d0aa984f6a";
+      sha256 = "1k894mxc7v4fp5zr80wbfk18zd5shcfik0j7mv1cs8c950xmahjl";
     };
     meta.homepage = "https://github.com/mcchrish/zenbones.nvim/";
   };

From 89820d60970716b50bd839d5f1e134fd6384b15d Mon Sep 17 00:00:00 2001
From: nat-418 <93013864+nat-418@users.noreply.github.com>
Date: Fri, 20 Jan 2023 02:04:00 +0100
Subject: [PATCH 22/35] vimPlugins.dirbuf-nvim: init at 2022-08-28

---
 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 a223137c36b2..bd0299ccdcfb 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -2683,6 +2683,18 @@ final: prev:
     meta.homepage = "https://github.com/sindrets/diffview.nvim/";
   };
 
+  dirbuf-nvim = buildVimPluginFrom2Nix {
+    pname = "dirbuf.nvim";
+    version = "2022-08-28";
+    src = fetchFromGitHub {
+      owner = "elihunter173";
+      repo = "dirbuf.nvim";
+      rev = "ac7ad3c8e61630d15af1f6266441984f54f54fd2";
+      sha256 = "09sbkgidj2fl7aj7kwzg37s5nynslbli9p3vwsh1yqxlag4lv6nz";
+    };
+    meta.homepage = "https://github.com/elihunter173/dirbuf.nvim/";
+  };
+
   direnv-vim = buildVimPluginFrom2Nix {
     pname = "direnv.vim";
     version = "2022-04-09";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 9537ee42493e..2ba8c991512e 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -224,6 +224,7 @@ https://github.com/onsails/diaglist.nvim/,,
 https://github.com/nvim-lua/diagnostic-nvim/,,
 https://github.com/monaqa/dial.nvim/,HEAD,
 https://github.com/sindrets/diffview.nvim/,,
+https://github.com/elihunter173/dirbuf.nvim/,HEAD,
 https://github.com/direnv/direnv.vim/,,
 https://github.com/doki-theme/doki-theme-vim/,,
 https://github.com/Mofiqul/dracula.nvim/,HEAD,

From 65cdb52a66c84f7f89e2e31335798b4bda6470a8 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 19 Jan 2023 16:10:07 +0000
Subject: [PATCH 23/35] valgrind-light: fix build for FreeBSD

This is very similar to what we do for Darwin directly below, but
we look up the FreeBSD version at eval time instead.

The .0 is prepended because our current FreeBSD system doubles only
include the major version.  Valgrind ignores everything after the
dot anyway (but it wants the dot to be there).
---
 pkgs/development/tools/analysis/valgrind/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index ea45813303a6..3bec558803b4 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -50,7 +50,10 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   separateDebugInfo = stdenv.isLinux;
 
-  preConfigure = lib.optionalString stdenv.isDarwin (
+  preConfigure = lib.optionalString stdenv.isFreeBSD ''
+    substituteInPlace configure --replace '`uname -r`' \
+        ${toString stdenv.hostPlatform.parsed.kernel.version}.0
+  '' + lib.optionalString stdenv.isDarwin (
     let OSRELEASE = ''
       $(awk -F '"' '/#define OSRELEASE/{ print $2 }' \
       <${xnu}/Library/Frameworks/Kernel.framework/Headers/libkern/version.h)'';
@@ -75,7 +78,7 @@ stdenv.mkDerivation rec {
     '');
 
   configureFlags =
-    lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit"
+    lib.optional stdenv.hostPlatform.isx86_64 "--enable-only64bit"
     ++ lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include";
 
   doCheck = true;

From 8955106b1ef6eb988ec1101c0ed25f29ecb9b0e1 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Thu, 19 Jan 2023 21:05:11 -0500
Subject: [PATCH 24/35] erigon: 2.34.0 -> 2.35.2

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

diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix
index 20a9efc19b17..e81dc1813e52 100644
--- a/pkgs/applications/blockchains/erigon/default.nix
+++ b/pkgs/applications/blockchains/erigon/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "erigon";
-  version = "2.34.0";
+  version = "2.35.2";
 in
 buildGoModule {
   inherit pname version;
@@ -11,11 +11,11 @@ buildGoModule {
     owner = "ledgerwatch";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-oiFPnDzvLdVkGeflqUcB00peZyVLMzsXi7QzOjPlpHo=";
+    sha256 = "sha256-hGJ9SeUYACOuypTJmPnrv4f8ujjsUt3dZbwso+94g3M=";
     fetchSubmodules = true;
   };
 
-  vendorSha256 = "sha256-x/ffvbBKzJrssOo+cuWIiwHWu9UfeBHSbgwmLE0340A=";
+  vendorSha256 = "sha256-lKzJLRCcyhQIV7y1XxqbvTINLlUwWFnflZgGQHYzBjY=";
   proxyVendor = true;
 
   # Build errors in mdbx when format hardening is enabled:

From bdf87c666798c1795b5c52b99ff5711443507074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 14 Jan 2023 13:18:11 -0800
Subject: [PATCH 25/35] python310Packages.pycaption: 1.0.1 -> 2.1.0

https://github.com/pbs/pycaption/blob/2.1.0/docs/changelog.rst
---
 .../python-modules/pycaption/default.nix      | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index a0a0ff76337b..6a13832621d0 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@@ -1,41 +1,43 @@
-{ lib, fetchpatch
-, buildPythonPackage, fetchPypi, isPy3k
-, beautifulsoup4, lxml, cssutils, future, enum34, six
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, beautifulsoup4
+, lxml
+, cssutils
+, pytest-lazy-fixture
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "pycaption";
-  version = "1.0.1";
+  version = "2.1.0";
+
+  disabled = pythonOlder "3.6";
+
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f2hx9ky65c4niws3x5yx59yi8mqqrw9b2cghd220g4hj9yl800h";
+    hash = "sha256-mV//EYdP7wKYD3Vc49z6LQVQeOuhzNKFZLf28RYdABk=";
   };
 
-  disabled = !isPy3k;
-
-  prePatch = ''
-    substituteInPlace setup.py \
-      --replace 'beautifulsoup4>=4.2.1,<4.5.0' \
-                'beautifulsoup4>=4.2.1,<5'
-  '';
-
-  # don't require enum34 on python >= 3.4
-  patches = [
-    (fetchpatch {
-        url = "https://github.com/pbs/pycaption/pull/161.patch";
-        sha256 = "0p58awpsqx1qc3x9zfl1gd85h1nk7204lzn4kglsgh1bka0j237j";
-    })
+  propagatedBuildInputs = [
+    beautifulsoup4
+    lxml
+    cssutils
   ];
 
-  propagatedBuildInputs = [ beautifulsoup4 lxml cssutils future enum34 six ];
-
-  # Tests not included in pypi (?)
-  doCheck = false;
+  checkInputs = [
+    pytest-lazy-fixture
+    pytestCheckHook
+  ];
 
   meta = with lib; {
+    changelog = "https://github.com/pbs/pycaption/blob/${version}/docs/changelog.rst";
     description = "Closed caption converter";
     homepage = "https://github.com/pbs/pycaption";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
+    maintainers = with maintainers; [ dotlambda ];
   };
 }

From 1f1d1cf5a5854bf709b8382f138e6f4af329b2c1 Mon Sep 17 00:00:00 2001
From: Corbin Simpson <cds@corbinsimpson.com>
Date: Thu, 19 Jan 2023 19:16:11 -0800
Subject: [PATCH 26/35] Explain why unit tests are disabled.

This was requested during code review.
---
 pkgs/development/python-modules/yark/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix
index 3b03b89ce9bf..c9be7901c14a 100644
--- a/pkgs/development/python-modules/yark/default.nix
+++ b/pkgs/development/python-modules/yark/default.nix
@@ -14,6 +14,8 @@ buildPythonPackage rec {
     click colorama flask requests yt-dlp
   ];
 
+  # There aren't any unit tests. If test discovery runs, it will crash, halting the build.
+  # When upstream adds unit tests, please configure them here. Thanks! ~ C.
   doCheck = false;
 
   meta = with lib; {

From d57ec2ef092bd5e3dade2923a03a5fa12c2a7a3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Dec 2022 21:49:40 +0000
Subject: [PATCH 27/35] igraph: 0.10.2 -> 0.10.3

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

diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix
index 4220922567db..9aea9e545395 100644
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/pkgs/development/libraries/igraph/default.nix
@@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 &&
 
 stdenv.mkDerivation rec {
   pname = "igraph";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "igraph";
     repo = pname;
     rev = version;
-    hash = "sha256-6zX9hyz/8H7r+wzpVwz8jDMfd3nqit3pT+wlP0C40Rg=";
+    hash = "sha256-+U8bo68Q6XX3p2sZiIChjidcRwA10gv9eWccRt4MoYM=";
   };
 
   postPatch = ''

From a462421d5088b8c5e3039cd7248b4bffd9b1791a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 9 Jan 2023 09:07:18 -0800
Subject: [PATCH 28/35] python310Packages.igraph: 0.10.2 -> 0.10.3

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

diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix
index cc995746f297..109e67fd5b1b 100644
--- a/pkgs/development/python-modules/igraph/default.nix
+++ b/pkgs/development/python-modules/igraph/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "igraph";
-  version = "0.10.2";
+  version = "0.10.3";
 
   disabled = pythonOlder "3.7";
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "igraph";
     repo = "python-igraph";
     rev = version;
-    hash = "sha256-ro2EkJQxW8aHejAvkaXI9mJC5XgFt31akhzFDAPZ4ow=";
+    hash = "sha256-j7c1CtZ796EYMsS11kd8YED7pPolskgT+611uvePTsA=";
   };
 
   postPatch = ''

From bae68672016437cdbca4beb494249daea0c1ce12 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 20 Jan 2023 14:47:37 +1000
Subject: [PATCH 29/35] nix-direnv: 2.2.0 -> 2.2.1

Diff: https://github.com/nix-community/nix-direnv/compare/2.2.0...2.2.1
---
 pkgs/tools/misc/nix-direnv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix
index d923bbe7e699..a57decd2c5a5 100644
--- a/pkgs/tools/misc/nix-direnv/default.nix
+++ b/pkgs/tools/misc/nix-direnv/default.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nix-direnv";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-direnv";
     rev = version;
-    sha256 = "sha256-htlSwXYmT+baFRhSnEGvNCtcS5qa/VgSXFm5Lavy7eM=";
+    sha256 = "sha256-k/w17jlMRFiU2ACWHpjaqIKcVJGn8lPlNkiHtZPvO4A=";
   };
 
   # Substitute instead of wrapping because the resulting file is

From 1fb820a1f41785bbdfe5e0d0766b496b7c7c37c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Jan 2023 19:59:30 +0000
Subject: [PATCH 30/35] katana: 0.0.2 -> 0.0.3

---
 pkgs/tools/security/katana/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/katana/default.nix b/pkgs/tools/security/katana/default.nix
index 54657f534fc2..bd5947b689f5 100644
--- a/pkgs/tools/security/katana/default.nix
+++ b/pkgs/tools/security/katana/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "katana";
-  version = "0.0.2";
+  version = "0.0.3";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-8OpBxv++AjKNitHqB6y8hN8LlkFBvyzooJZPWhHd28w=";
+    sha256 = "sha256-Ax99pmoxlyUGLN2OdIItTNTnO/fDquvNadNnNG6ElEk=";
   };
 
-  vendorSha256 = "sha256-jc8OcImVOmN/iYbcYQJ9Z2cYaNAVVdn9nKWBSuyh2HQ=";
+  vendorHash = "sha256-IJcMIJF2A5DfyBdcIXTbeX72Q/4SAVZ0U3UIQ2H0fEc=";
 
   CGO_ENABLED = 0;
 

From 847db1b6a9b857db3d2c2381b688344fae2b9b24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jan 2023 23:32:28 +0000
Subject: [PATCH 31/35] coder: 0.13.6 -> 0.14.3

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

diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix
index 0ef4e05409ac..6998c9b8fb1c 100644
--- a/pkgs/development/tools/coder/default.nix
+++ b/pkgs/development/tools/coder/default.nix
@@ -5,19 +5,19 @@
 }:
 buildGoModule rec {
   pname = "coder";
-  version = "0.13.6";
+  version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-F1nimZsOhm1TPFDC6oZjAE6BfPc85tWCsv6HQUXCd2c=";
+    hash = "sha256-S+s6cOO2iISW3x+JM6mkpAC6KJv/x84RgXuaiFHZs+I=";
   };
 
   # integration tests require network access
   doCheck = false;
 
-  vendorHash = "sha256-vK4QfVCyxu7KOOfCpOnkXDlVQJo6kujP203K9VXr4YA=";
+  vendorHash = "sha256-nqmwwdIOm6jTPTAuvIqPf0xgVgIbKsUIs0Mbfka0jyU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 5ace114066b68cd0f5718a3e3f7f5448774e2c40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jan 2023 17:28:05 +0000
Subject: [PATCH 32/35] carapace: 0.19.1 -> 0.20.2

---
 pkgs/shells/carapace/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix
index 68a143dc66a1..912985c1cfed 100644
--- a/pkgs/shells/carapace/default.nix
+++ b/pkgs/shells/carapace/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "carapace";
-  version = "0.19.1";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "rsteube";
     repo = "${pname}-bin";
     rev = "v${version}";
-    sha256 = "sha256-RAomMEq7m8PVbRMtQqcHUOXzxgLuwacGPP3U78jYXEg=";
+    sha256 = "sha256-UPm0B3sv2+0/tS7NdqY5fpvMbI9B7CxixWF9M74H5w0=";
   };
 
-  vendorHash = "sha256-2vs/v5G+8pkrtO2PzXkya0vRlwFmhvEu5mDNij4adqY=";
+  vendorHash = "sha256-l4DG6sZyFqu4OlxxL6mmcXTGljxY7xk5u5QlOr8dBNI=";
 
   subPackages = [ "./cmd/carapace" ];
 

From 332d83e8e36e20444ef984767de35f9c329d29ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Jan 2023 14:39:38 +0000
Subject: [PATCH 33/35] hyfetch: 1.4.4 -> 1.4.6

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

diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/tools/misc/hyfetch/default.nix
index 73e630ca2335..5cedfd0c7061 100644
--- a/pkgs/tools/misc/hyfetch/default.nix
+++ b/pkgs/tools/misc/hyfetch/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "hyfetch";
-  version = "1.4.4";
+  version = "1.4.6";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "hykilpikonna";
     repo = "hyfetch";
     rev = "refs/tags/${version}";
-    hash = "sha256-wTTvA+/iyDYcgcM1Zg0KcqAwUJgxAWqZVdylF2/+Wn0=";
+    hash = "sha256-bbAJV4G5FAY0mSfrbIEs0eNFARZD74dUvHEBQuPc0rI=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From e1202ddc56534fc93a6c3ff2dc6beaef4474546d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 Sep 2022 21:49:47 +0000
Subject: [PATCH 34/35] stern: 1.21.0 -> 1.22.0

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

diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix
index 19184ac15ae8..7459bba1697b 100644
--- a/pkgs/applications/networking/cluster/stern/default.nix
+++ b/pkgs/applications/networking/cluster/stern/default.nix
@@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform;
 in
 buildGoModule rec {
   pname = "stern";
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "stern";
     repo = "stern";
     rev = "v${version}";
-    sha256 = "sha256-+V0mRSjAwhZoiIS/OpZyqa5rvlqU9pGJwmW0QZ3H2g4=";
+    sha256 = "sha256-xO4I4fNf14ltiSnFnAhM8VYBw4JKB0RSQziSshZOFBo=";
   };
 
-  vendorSha256 = "sha256-IPHu23/2e6406FELB1Mwegp0C16cFD65mbW5Ah32D4Q=";
+  vendorSha256 = "sha256-tNx1BvZBblyLavFslhqj9DCyfcgbl6HxlZ7zceK1a0w=";
 
   subPackages = [ "." ];
 

From 4b9dbcd0b7597bca8b8eba6b687984012b624ba2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Jan 2023 07:29:20 +0000
Subject: [PATCH 35/35] aoc-cli: 0.11.0 -> 0.12.0

---
 pkgs/tools/misc/aoc-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/aoc-cli/default.nix b/pkgs/tools/misc/aoc-cli/default.nix
index 34100865381e..f33ffa073d47 100644
--- a/pkgs/tools/misc/aoc-cli/default.nix
+++ b/pkgs/tools/misc/aoc-cli/default.nix
@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "aoc-cli";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "scarvalhojr";
     repo = pname;
     rev = version;
-    hash = "sha256-oUvEZEnhYeAAZyLn2/isDZKT0+mhS5fnCvYGsR94uk0=";
+    hash = "sha256-UdeCKhEWr1BjQ6OMLP19OLWPlvvP7FGAO+mi+bQUPQA=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ]
     ++ lib.optional stdenv.isDarwin Security;
 
-  cargoHash = "sha256-/76yzWPKGp4MEmFuvFJOMCxGKEdpohfzBAhRwvdEx8w=";
+  cargoHash = "sha256-EluP4N3UBQeEKVdHTs4O0THXji+nAyE52nGKsxA3AA4=";
 
   meta = with lib; {
     description = "Advent of code command line tool";