From 38fcb28228591fcf24778cf55aee24485ea11f00 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sat, 19 Aug 2023 09:51:14 -0700
Subject: [PATCH 01/39] python3.pkgs.astropy: fix build dependencies

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

diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index a222dbe92eca..2176a6ff1fc3 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -5,10 +5,11 @@
 
 # build time
 , astropy-extension-helpers
-, astropy-helpers
 , cython
 , jinja2
+, oldest-supported-numpy
 , setuptools-scm
+, wheel
 
 # runtime
 , numpy
@@ -32,14 +33,18 @@ buildPythonPackage {
     hash = "sha256-9q4noHf46oSQPvp2x5C5hWFzQaAISw0hw5H3o/MyrCM=";
   };
 
-  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'cython==' 'cython>='
+  '';
 
   nativeBuildInputs = [
     astropy-extension-helpers
-    astropy-helpers
     cython
     jinja2
+    oldest-supported-numpy
     setuptools-scm
+    wheel
   ];
 
   propagatedBuildInputs = [

From 130c8509c26e1625732684afbcc5df321d3242ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Aug 2023 00:49:12 +0000
Subject: [PATCH 02/39] minio-client: 2023-08-08T17-23-59Z ->
 2023-08-15T23-03-09Z

---
 pkgs/tools/networking/minio-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index b60fa715004a..b7c084bf776d 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "minio-client";
-  version = "2023-08-08T17-23-59Z";
+  version = "2023-08-15T23-03-09Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "sha256-rXYpAidwwd1sa+22r39VAirVCDdhzFRE5qSQNZf65sg=";
+    sha256 = "sha256-vsCbmT6uWy+VA0qx8x9hx3pDSVKiDeXjnnrFRnhm4C8=";
   };
 
-  vendorHash = "sha256-2zBwqwYyE/9R8Ns5kkvu/JxxYyjnEULBnW+ObYnZ40w=";
+  vendorHash = "sha256-xtGXYCmiT7xY9OL8x0tTBP9y8UfzlJ6ZR2DhKOwVgkM=";
 
   subPackages = [ "." ];
 

From d6855fb33a6c4455a63558c96379f5dd92ec52e8 Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Mon, 21 Aug 2023 13:20:22 +1000
Subject: [PATCH 03/39] bootstrap-studio: 6.2.1 -> 6.4.5

---
 pkgs/development/web/bootstrap-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/bootstrap-studio/default.nix b/pkgs/development/web/bootstrap-studio/default.nix
index 67b2af313a6a..e82d69a94a20 100644
--- a/pkgs/development/web/bootstrap-studio/default.nix
+++ b/pkgs/development/web/bootstrap-studio/default.nix
@@ -2,10 +2,10 @@
 
 let
   pname = "bootstrap-studio";
-  version = "6.2.1";
+  version = "6.4.5";
   src = fetchurl {
-    url = "https://bootstrapstudio.io/releases/desktop/${version}/Bootstrap%20Studio.AppImage";
-    sha256 = "sha256-1+3YCM1K2k1Gga7Y2ciMqmwzxYJQ7Ab5uDHP1iHXK7g=";
+    url = "https://releases.bootstrapstudio.io/${version}/Bootstrap%20Studio.AppImage";
+    sha256 = "sha256-kCMqDNRC3H3WBpDJCBXBxvWRuiGCrZ7gRGghXiGtGq8=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From c820e8b553fc77e4e2f05cbe99861cffc7e859e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Aug 2023 05:44:33 +0000
Subject: [PATCH 04/39] doppler: 3.65.1 -> 3.65.2

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

diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix
index ddc4b55432b3..28956edeaa37 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/tools/security/doppler/default.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "doppler";
-  version = "3.65.1";
+  version = "3.65.2";
 
   src = fetchFromGitHub {
     owner = "dopplerhq";
     repo = "cli";
     rev = version;
-    sha256 = "sha256-scFjaxUMlKGpO7UQrIS/f1Rsxu4weZ26jRCRmoUBGCs=";
+    sha256 = "sha256-rs+V19YaBvo5U9AAUks/nWl8TYveH8t+/rcQqjtG1gE=";
   };
 
   vendorHash = "sha256-FOmaK6S61fkzybpDx6qfi6m4e2IaqBpavaFhEgIvmqw=";

From b8f147876cbec06749a7be7e907e2dad31954145 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Thu, 17 Aug 2023 12:15:23 +0900
Subject: [PATCH 05/39] python310Packages.scikit-image: 0.19.3 -> 0.21.0

Diff: https://github.com/scikit-image/scikit-image/compare/v0.19.3...v0.21.0

Changelog: https://github.com/scikit-image/scikit-image/releases/tag/v0.21.0
---
 .../scikit-image/add-testing-data.patch       | 17 ----
 .../python-modules/scikit-image/default.nix   | 91 ++++++++++++++-----
 .../suppress-deprecation-warning.patch        | 30 ++++++
 3 files changed, 100 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/development/python-modules/scikit-image/add-testing-data.patch
 create mode 100644 pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch

diff --git a/pkgs/development/python-modules/scikit-image/add-testing-data.patch b/pkgs/development/python-modules/scikit-image/add-testing-data.patch
deleted file mode 100644
index 60f9287f8b1c..000000000000
--- a/pkgs/development/python-modules/scikit-image/add-testing-data.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/skimage/data/setup.py b/skimage/data/setup.py
-index 528e9c284ce..ba0e155559c 100644
---- a/skimage/data/setup.py
-+++ b/skimage/data/setup.py
-@@ -11,7 +11,11 @@ def configuration(parent_package='', top_path=None):
-     # further notice.
-     # Testing data and additional datasets should only
-     # be made available via pooch
--    config.add_data_files(*legacy_datasets)
-+    # Nix patch: add ALL images to facilitate testing of a fully-built package
-+    from pathlib import Path
-+    config.add_data_files(
-+        *(path.name for path in Path(__file__).parent.glob("*") if path.suffix != ".py")
-+    )
-     # It seems hard to create a consistent hash for README.txt since
-     # the line endings keep getting converted
-     config.add_data_files('README.txt')
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index 22c7387ff0d1..03eaf556050f 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -3,53 +3,98 @@
 , fetchFromGitHub
 , buildPythonPackage
 , python
-, cython
-, pythran
-, numpy
-, scipy
-, matplotlib
-, networkx
-, six
-, pillow
-, pywavelets
-, dask
+, pythonOlder
+, astropy
 , cloudpickle
+, cython
+, dask
 , imageio
-, tifffile
+, lazy-loader
+, matplotlib
+, meson-python
+, networkx
+, numpy
+, packaging
+, pillow
+, pooch
+, pyamg
 , pytestCheckHook
+, pythran
+, pywavelets
+, scikit-learn
+, scipy
+, setuptools
+, simpleitk
+, six
+, tifffile
+, wheel
 }:
 
 let
   installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}";
   self = buildPythonPackage rec {
     pname = "scikit-image";
-    version = "0.19.3";
+    version = "0.21.0";
+    format = "pyproject";
+
+    disabled = pythonOlder "3.8";
 
     src = fetchFromGitHub {
-      owner = pname;
-      repo = pname;
+      owner = "scikit-image";
+      repo = "scikit-image";
       rev = "v${version}";
-      hash = "sha256-zvXgZdvYycFbbMsBFSqMDzLanEtF9+JuVSQ3AM8/LQk=";
+      hash = "sha256-WJ2WNlcFCEtPr+bV/af6MoBBhbXDpOBEsJu4FmudoIo=";
     };
 
-    patches = [ ./add-testing-data.patch ];
+    patches = [
+      # https://github.com/scikit-image/scikit-image/pull/7052
+      # prepare a patch file because the commit contains additional changes
+      ./suppress-deprecation-warning.patch
+    ];
 
-    nativeBuildInputs = [ cython pythran ];
+    postPatch = ''
+      patchShebangs skimage/_build_utils/{version,cythoner}.py
+    '';
+
+    nativeBuildInputs = [
+      cython
+      meson-python
+      numpy
+      packaging
+      pythran
+      setuptools
+      wheel
+    ];
 
     propagatedBuildInputs = [
-      cloudpickle
-      dask
       imageio
+      lazy-loader
       matplotlib
       networkx
       numpy
+      packaging
       pillow
       pywavelets
       scipy
-      six
       tifffile
     ];
 
+    passthru.optional-dependencies = {
+      data = [
+        pooch
+      ];
+      optional = [
+        astropy
+        cloudpickle
+        dask
+        matplotlib
+        pooch
+        pyamg
+        scikit-learn
+        simpleitk
+      ] ++ dask.optional-dependencies.array;
+    };
+
     # test suite is very cpu intensive, move to passthru.tests
     doCheck = false;
     nativeCheckInputs = [ pytestCheckHook ];
@@ -78,6 +123,10 @@ let
       "skimage/feature/tests/test_util.py::test_plot_matches"
       "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold"
       "skimage/io/tests/test_mpl_imshow.py::"
+    ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+      # https://github.com/scikit-image/scikit-image/issues/7104
+      "skimage/measure/tests/test_fit.py"
+      "skimage/measure/tests/test_moments.py"
     ]);
 
     # Check cythonized modules
@@ -88,7 +137,6 @@ let
       "skimage.feature"
       "skimage.restoration"
       "skimage.filters"
-      "skimage.future.graph"
       "skimage.graph"
       "skimage.io"
       "skimage.measure"
@@ -105,6 +153,7 @@ let
     meta = {
       description = "Image processing routines for SciPy";
       homepage = "https://scikit-image.org";
+      changelog = "https://github.com/scikit-image/scikit-image/releases/tag/${src.rev}";
       license = lib.licenses.bsd3;
       maintainers = with lib.maintainers; [ yl3dy ];
     };
diff --git a/pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch b/pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch
new file mode 100644
index 000000000000..f51f1d9860a4
--- /dev/null
+++ b/pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch
@@ -0,0 +1,30 @@
+diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py
+index ed8dd6bc8..8ec7d13bf 100644
+--- a/skimage/exposure/tests/test_exposure.py
++++ b/skimage/exposure/tests/test_exposure.py
+@@ -368,19 +368,16 @@ def test_rescale_nan_warning(in_range, out_range):
+     )
+ 
+     # 2019/11/10 Passing NaN to np.clip raises a DeprecationWarning for
+-    # versions above 1.17
+-    # TODO: Remove once NumPy removes this DeprecationWarning
++    # versions above 1.17, "|\A\Z" marks as optional warning
++    # TODO: Remove once NumPy 1.25.0 is minimal dependency
+     numpy_warning_1_17_plus = (
+-        "Passing `np.nan` to mean no clipping in np.clip"
++        "|\\A\\ZPassing `np.nan` to mean no clipping in np.clip"
+     )
+ 
+-    if in_range == "image":
+-        exp_warn = [msg, numpy_warning_1_17_plus]
+-    else:
+-        exp_warn = [msg]
++    with expected_warnings([msg, numpy_warning_1_17_plus]):
++        result = exposure.rescale_intensity(image, in_range, out_range)
+ 
+-    with expected_warnings(exp_warn):
+-        exposure.rescale_intensity(image, in_range, out_range)
++    assert np.all(np.isnan(result))
+ 
+ 
+ @pytest.mark.parametrize(

From 19256671bef8f5a367d7b23b628c07b37a66e973 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Aug 2023 16:35:41 +0000
Subject: [PATCH 06/39] python310Packages.tubeup: 2023.8.17 -> 2023.8.19

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

diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix
index 58ae2d387b44..194c80082f14 100644
--- a/pkgs/development/python-modules/tubeup/default.nix
+++ b/pkgs/development/python-modules/tubeup/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "tubeup";
-  version = "2023.8.17";
+  version = "2023.8.19";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-nL0oXI06qH0K0LLlrT/jdJ+76ZPMUhaFfOYGi71M3PM=";
+    sha256 = "sha256-0atpOUJIfXgw/5fi5w2ciAFDMgWmVH4U8d84zwLCRXk=";
   };
 
   nativeBuildInputs = [

From 74908aaf408cd707efb96afbb9d07a172919deeb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 21 Aug 2023 16:36:00 +0000
Subject: [PATCH 07/39] python310Packages.tubeup: remove urllib3 from
 dependencies

---
 pkgs/development/python-modules/tubeup/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix
index 194c80082f14..a264c4b2f93a 100644
--- a/pkgs/development/python-modules/tubeup/default.nix
+++ b/pkgs/development/python-modules/tubeup/default.nix
@@ -5,7 +5,6 @@
 , yt-dlp
 , docopt
 , pythonOlder
-, urllib3
 , pythonRelaxDepsHook
 }:
 
@@ -28,12 +27,10 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     internetarchive
     docopt
-    urllib3
     yt-dlp
   ];
 
   pythonRelaxDeps = [
-    "urllib3"
     "docopt"
   ];
 

From 4f9e86116bc43c0657eb9770df811ba8eb17dc33 Mon Sep 17 00:00:00 2001
From: nbe <aleisa.naser@gmail.com>
Date: Mon, 21 Aug 2023 19:52:49 +0300
Subject: [PATCH 08/39] zsh-fzf-tab: 2023-05-19 -> 2023-06-11

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

diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix
index a173f8cbc506..d84dc2233562 100644
--- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix
+++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix
@@ -4,13 +4,13 @@ let
   INSTALL_PATH="${placeholder "out"}/share/fzf-tab";
 in stdenv.mkDerivation rec {
   pname = "zsh-fzf-tab";
-  version = "unstable-2023-05-19";
+  version = "unstable-2023-06-11";
 
   src = fetchFromGitHub {
     owner = "Aloxaf";
     repo = "fzf-tab";
-    rev = "5a81e13792a1eed4a03d2083771ee6e5b616b9ab";
-    sha256 = "sha256-bIlnYKjjOC6h5/Gg7xBg+i2TBk+h82wmHgAJPhzMsek=";
+    rev = "c2b4aa5ad2532cca91f23908ac7f00efb7ff09c9";
+    sha256 = "sha256-gvZp8P3quOtcy1Xtt1LAW1cfZ/zCtnAmnWqcwrKel6w=";
   };
 
   strictDeps = true;

From 7ba2b6d45567b8d983a5966b8cbaef7a330f2c0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Aug 2023 17:38:48 +0000
Subject: [PATCH 09/39] python310Packages.pycocotools: 2.0.6 -> 2.0.7

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

diff --git a/pkgs/development/python-modules/pycocotools/default.nix b/pkgs/development/python-modules/pycocotools/default.nix
index b2279b8e4ccc..6cba9e71a756 100644
--- a/pkgs/development/python-modules/pycocotools/default.nix
+++ b/pkgs/development/python-modules/pycocotools/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "pycocotools";
-  version = "2.0.6";
+  version = "2.0.7";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-f+CJsFzBjoBtzzvXZHCNhtq5IqEA83NOt3+3enCh0Yw=";
+    hash = "sha256-2ot4FRlu6/Ctq/Z/zEWRJsvGSYu8arH9FEw3FGXYaHk=";
   };
 
   propagatedBuildInputs = [

From a39526b3ef4488fdb98eabb0cef0985e671a2b5c Mon Sep 17 00:00:00 2001
From: dev-null-undefined <martinkos007@gmail.com>
Date: Thu, 27 Jul 2023 15:29:57 +0200
Subject: [PATCH 10/39] nixos/grub: Add submenu for each generation with
 specialisation

Before this commit there was no way to access (boot into) specialisation of previous generations from grub,even tho they are there.

This commit will add grub submenu for each generation if the generation has any specialisation.
Which will allow you to boot into them.

Co-authored-by: Samuel Dionne-Riel <samuel@dionne-riel.com>
---
 .../system/boot/loader/grub/install-grub.pl   | 67 ++++++++++++-------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index a84e374624d1..d1e7a0cb8178 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -516,38 +516,53 @@ sub addEntry {
     $conf .= "}\n\n";
 }
 
+sub addGeneration {
+    my ($name, $nameSuffix, $path, $options, $current) = @_;
+
+    # Do not search for grand children
+    my @links = sort (glob "$path/specialisation/*");
+
+    if ($current != 1 && scalar(@links) != 0) {
+        $conf .= "submenu \"> $name$nameSuffix\" --class submenu {\n";
+    }
+
+    addEntry("$name" . (scalar(@links) == 0 ? "" : " - Default") . $nameSuffix, $path, $options, $current);
+
+    # Find all the children of the current default configuration
+    # Do not search for grand children
+    foreach my $link (@links) {
+
+        my $entryName = "";
+
+        my $cfgName = readFile("$link/configuration-name");
+
+        my $date = strftime("%F", localtime(lstat($link)->mtime));
+        my $version =
+            -e "$link/nixos-version"
+            ? readFile("$link/nixos-version")
+            : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
+
+        if ($cfgName) {
+            $entryName = $cfgName;
+        } else {
+            my $linkname = basename($link);
+            $entryName = "($linkname - $date - $version)";
+        }
+        addEntry("$name - $entryName", $link, "", 1);
+    }
+
+    if ($current != 1 && scalar(@links) != 0) {
+        $conf .= "}\n";
+    }
+}
 
 # Add default entries.
 $conf .= "$extraEntries\n" if $extraEntriesBeforeNixOS;
 
-addEntry("@distroName@ - Default", $defaultConfig, $entryOptions, 1);
+addGeneration("@distroName@", "", $defaultConfig, $entryOptions, 1);
 
 $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS;
 
-# Find all the children of the current default configuration
-# Do not search for grand children
-my @links = sort (glob "$defaultConfig/specialisation/*");
-foreach my $link (@links) {
-
-    my $entryName = "";
-
-    my $cfgName = readFile("$link/configuration-name");
-
-    my $date = strftime("%F", localtime(lstat($link)->mtime));
-    my $version =
-        -e "$link/nixos-version"
-        ? readFile("$link/nixos-version")
-        : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
-
-    if ($cfgName) {
-        $entryName = $cfgName;
-    } else {
-        my $linkname = basename($link);
-        $entryName = "($linkname - $date - $version)";
-    }
-    addEntry("@distroName@ - $entryName", $link, "", 1);
-}
-
 my $grubBootPath = $grubBoot->path;
 # extraEntries could refer to @bootRoot@, which we have to substitute
 $conf =~ s/\@bootRoot\@/$grubBootPath/g;
@@ -577,7 +592,7 @@ sub addProfile {
             -e "$link/nixos-version"
             ? readFile("$link/nixos-version")
             : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
-        addEntry("@distroName@ - Configuration " . nrFromGen($link) . " ($date - $version)", $link, $subEntryOptions, 0);
+        addGeneration("@distroName@ - Configuration " . nrFromGen($link), " ($date - $version)", $link, $subEntryOptions, 0);
     }
 
     $conf .= "}\n";

From b2871a6ca8cfb0e40f74bf004c0f292b9057a08b Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 21 Aug 2023 21:59:55 +0200
Subject: [PATCH 11/39] ioquake3: fix `preConfigure` phase

Using `makeFlags` doesn't do anything, using the local `Makefile.local` is actually working.
---
 pkgs/games/quake3/ioquake/Makefile.local | 6 ++++++
 pkgs/games/quake3/ioquake/default.nix    | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/games/quake3/ioquake/Makefile.local

diff --git a/pkgs/games/quake3/ioquake/Makefile.local b/pkgs/games/quake3/ioquake/Makefile.local
new file mode 100644
index 000000000000..9f487970eabc
--- /dev/null
+++ b/pkgs/games/quake3/ioquake/Makefile.local
@@ -0,0 +1,6 @@
+USE_CURL = 1
+USE_CURL_DLOPEN = 0
+USE_FREETYPE = 1
+USE_INTERNAL_LIBS = 0
+USE_OPENAL = 1
+USE_OPENAL_DLOPEN = 0
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 7161b9474f24..437b99ae3439 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -16,6 +16,7 @@
 , libjpeg
 , makeDesktopItem
 , freetype
+, mumble
 }:
 
 stdenv.mkDerivation {
@@ -47,11 +48,14 @@ stdenv.mkDerivation {
     libvorbis
     libjpeg
     freetype
+    mumble
   ];
 
   enableParallelBuilding = true;
 
-  makeFlags = [ "USE_INTERNAL_LIBS=0" "USE_FREETYPE=1" "USE_OPENAL_DLOPEN=0" "USE_CURL_DLOPEN=0" ];
+  preConfigure = ''
+    cp ${./Makefile.local} ./Makefile.local
+  '';
 
   installTargets = [ "copyfiles" ];
 

From 8f508af8dce8fa5145ef6562449564a6b583da1c Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 21 Aug 2023 22:00:46 +0200
Subject: [PATCH 12/39] urbanterror: fix `configurePhase` phase

Use `preConfigure` and external file instead.
---
 pkgs/games/urbanterror/Makefile.local |  5 +++++
 pkgs/games/urbanterror/default.nix    | 11 ++---------
 2 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/games/urbanterror/Makefile.local

diff --git a/pkgs/games/urbanterror/Makefile.local b/pkgs/games/urbanterror/Makefile.local
new file mode 100644
index 000000000000..aee08a8ade79
--- /dev/null
+++ b/pkgs/games/urbanterror/Makefile.local
@@ -0,0 +1,5 @@
+USE_CURL = 1
+USE_CURL_DLOPEN = 0
+USE_FREETYPE = 1
+USE_OPENAL = 1
+USE_OPENAL_DLOPEN = 0
diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index 6c54984eccbf..a1bf80784d03 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -56,15 +56,8 @@ stdenv.mkDerivation {
     SDL
   ];
 
-  configurePhase = ''
-    runHook preConfigure
-
-    echo "USE_OPENAL = 1" > Makefile.local
-    echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local
-    echo "USE_CURL = 1" >> Makefile.local
-    echo "USE_CURL_DLOPEN = 0" >> Makefile.local
-
-    runHook postConfigure
+  preConfigure = ''
+    cp ${./Makefile.local} ./Makefile.local
   '';
 
   installTargets = [ "copyfiles" ];

From 18ad9d33321ebe5b42f21c095d593dcd33dc3f5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Aug 2023 20:11:15 +0000
Subject: [PATCH 13/39] jackett: 0.21.635 -> 0.21.674

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

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 5393188ccd6f..fa08cb20b234 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule rec {
   pname = "jackett";
-  version = "0.21.635";
+  version = "0.21.674";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha512-KhQUuRJUqnCOLbwhTJiWOHj/yGsdne9TY9qyuE6c7y0gvAdKPE9Xkolt0RV/pjQtr6Hnbw5MaXahHHDOrhkN5Q==";
+    hash = "sha512-sLgTnj1Z/zeAML8B1I40xGuEkyrxYeXVR/Two7vMGP3xmyv/KfssikVu8yFDtA4bdQq9RsLU8GxC74VQKe3txQ==";
   };
 
   projectFile = "src/Jackett.Server/Jackett.Server.csproj";

From 4aeaaae5cfa48dd7e3c6cbeff26b1275c437a041 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 21 Aug 2023 23:02:39 +0200
Subject: [PATCH 14/39] php83: 8.3.0beta2 -> 8.3.0beta3

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

diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index a12feb9c4e14..0e7d7111f245 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -2,12 +2,12 @@
 
 let
   base = (callPackage ./generic.nix (_args // {
-    version = "8.3.0beta2";
+    version = "8.3.0beta3";
     hash = null;
   })).overrideAttrs (oldAttrs: {
     src = fetchurl {
-      url = "https://downloads.php.net/~jakub/php-8.3.0beta2.tar.xz";
-      hash = "sha256-ND1OlmSMtBxTE/0qfgy3Cz/gF08eIzydU2W/eKg58wQ=";
+      url = "https://downloads.php.net/~eric/php-8.3.0beta3.tar.xz";
+      hash = "sha256-XW3t9BOsBFvThYXF66faVl8VyMLFB+Oi7h45vWUmE6Y=";
     };
   });
 in

From e0e0063decbe916d0f38f50218b66ebad1cf4674 Mon Sep 17 00:00:00 2001
From: Break Yang <breakds@gmail.com>
Date: Mon, 21 Aug 2023 15:15:13 -0700
Subject: [PATCH 15/39] USE_SYSTEM_PYBIND11 instead of USE_SYSTEM_BIND11 in
 torch

---
 pkgs/development/python-modules/torch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix
index 6e56df8b183d..1d9fd2a469f6 100644
--- a/pkgs/development/python-modules/torch/default.nix
+++ b/pkgs/development/python-modules/torch/default.nix
@@ -225,7 +225,7 @@ in buildPythonPackage rec {
 
   # Avoid using pybind11 from git submodule
   # Also avoids pytorch exporting the headers of pybind11
-  USE_SYSTEM_BIND11 = true;
+  USE_SYSTEM_PYBIND11 = true;
 
   preBuild = ''
     export MAX_JOBS=$NIX_BUILD_CORES

From 7cb58cc1532a43fd85ef680381b592ce1abd2187 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 22 Aug 2023 00:19:42 +0200
Subject: [PATCH 16/39] python311Packages.pysaml2: 7.4.1 -> 7.4.2

Diff: IdentityPython/pysaml2@v7.4.1...v7.4.2

Changelog: https://github.com/IdentityPython/pysaml2/releases/tag/v7.4.2
---
 .../python-modules/pysaml2/default.nix        | 45 ++++++++-----------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
index 3cd65c271e9a..b8ace412614c 100644
--- a/pkgs/development/python-modules/pysaml2/default.nix
+++ b/pkgs/development/python-modules/pysaml2/default.nix
@@ -3,7 +3,6 @@
 , cryptography
 , defusedxml
 , fetchFromGitHub
-, fetchPypi
 , importlib-resources
 , poetry-core
 , pyasn1
@@ -21,18 +20,9 @@
 , xmlsec
 }:
 
-let
-  pymongo3 = pymongo.overridePythonAttrs(old: rec {
-    version = "3.12.3";
-    src = fetchPypi {
-      pname = "pymongo";
-      inherit version;
-      hash = "sha256-ConK3ABipeU2ZN3gQ/bAlxcrjBxfAJRJAJUoL/mZWl8=";
-    };
-  });
-in buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "pysaml2";
-  version = "7.4.1";
+  version = "7.4.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -40,10 +30,22 @@ in buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "IdentityPython";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-QHAbm6u5oH3O7MEVFE+sW98raquv89KJ8gonk3Yyu/0=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-f8qd1Mfy32CYH9/PshfMMBviDg7OhOPlwz69bPjlYbg=";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./hardcode-xmlsec1-path.patch;
+      inherit xmlsec;
+    })
+  ];
+
+  postPatch = ''
+    # Fix failing tests on systems with 32bit time_t
+    sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml
+  '';
+
   nativeBuildInputs = [
     poetry-core
   ];
@@ -63,23 +65,11 @@ in buildPythonPackage rec {
 
   nativeCheckInputs = [
     pyasn1
-    pymongo3
+    pymongo
     pytestCheckHook
     responses
   ];
 
-  patches = [
-    (substituteAll {
-      src = ./hardcode-xmlsec1-path.patch;
-      inherit xmlsec;
-    })
-  ];
-
-  postPatch = ''
-    # fix failing tests on systems with 32bit time_t
-    sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml
-  '';
-
   disabledTests = [
     # Disabled tests try to access the network
     "test_load_extern_incommon"
@@ -95,6 +85,7 @@ in buildPythonPackage rec {
   meta = with lib; {
     description = "Python implementation of SAML Version 2 Standard";
     homepage = "https://github.com/IdentityPython/pysaml2";
+    changelog = "https://github.com/IdentityPython/pysaml2/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ ];
   };

From be4967cc4e554ec2ecfb87e06b41fe9411892664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 22 Aug 2023 00:52:11 +0200
Subject: [PATCH 17/39] colorpicker: switch to Jack12816's fork

This fork introduces the --preview option.
---
 pkgs/tools/misc/colorpicker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/colorpicker/default.nix b/pkgs/tools/misc/colorpicker/default.nix
index 475041b4f682..8b45da17626c 100644
--- a/pkgs/tools/misc/colorpicker/default.nix
+++ b/pkgs/tools/misc/colorpicker/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "colorpicker";
-  version = "unstable-2018-01-14";
+  version = "unstable-2017-09-01";
 
   src = fetchFromGitHub {
-    owner = "Ancurio";
+    owner = "Jack12816";
     repo = "colorpicker";
-    rev = "287676947e6e3b5b0cee784aeb1638cf22f0ce17";
-    sha256 = "1kj1dpb79llrfpszraaz6r7ci114zqi5rmqxwsvq2dnnpjxyi29r";
+    rev = "a4455b92fde1dfbac81e7852f171093932154a30";
+    sha256 = "z2asxTIP8WcsWcePmIg0k4bOF2JwkqOxNqSpQv4/a40=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Click on a pixel on your screen and print its color value in RGB";
-    homepage = "https://github.com/Ancurio/colorpicker";
+    homepage = "https://github.com/Jack12816/colorpicker";
     maintainers = with maintainers; [ jb55 ];
     license = licenses.mit;
     mainProgram = "colorpicker";

From 065f90d25c2265f6daf2fe2ba4c56c579eba3d48 Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Tue, 22 Aug 2023 03:14:47 +0300
Subject: [PATCH 18/39] cudaPackages.autoAddOpenGLRunpathHook: don't skip
 shared libraries

---
 .../cudatoolkit/auto-add-opengl-runpath-hook.sh        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh b/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh
index 395229ca79b7..f50a5f6c25c6 100644
--- a/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh
+++ b/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh
@@ -2,17 +2,21 @@
 # Run addOpenGLRunpath on all dynamically linked, ELF files
 echo "Sourcing auto-add-opengl-runpath-hook"
 
+elfHasDynamicSection() {
+    patchelf --print-rpath "$1" >& /dev/null
+}
+
 autoAddOpenGLRunpathPhase() (
   local outputPaths
   mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done)
   find "${outputPaths[@]}" -type f -executable -print0  | while IFS= read -rd "" f; do
     if isELF "$f"; then
       # patchelf returns an error on statically linked ELF files
-      if patchelf --print-interpreter "$f" >/dev/null 2>&1; then
+      if elfHasDynamicSection "$f" ; then
         echo "autoAddOpenGLRunpathHook: patching $f"
         addOpenGLRunpath "$f"
-      elif [ -n "${DEBUG-}" ]; then
-        echo "autoAddOpenGLRunpathHook: skipping ELF file $f"
+      elif (( "${NIX_DEBUG:-0}" >= 1 )) ; then
+        echo "autoAddOpenGLRunpathHook: skipping a statically-linked ELF file $f"
       fi
     fi
   done

From 473bf6de0148ac53587bf18a6aedd09c86313d64 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Tue, 22 Aug 2023 09:10:24 +0800
Subject: [PATCH 19/39] eartag: 0.4.2 -> 0.4.3

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

diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/applications/audio/eartag/default.nix
index 841553c85cd7..f6ae96a5ec4a 100644
--- a/pkgs/applications/audio/eartag/default.nix
+++ b/pkgs/applications/audio/eartag/default.nix
@@ -18,7 +18,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "eartag";
-  version = "0.4.2";
+  version = "0.4.3";
   format = "other";
 
   src = fetchFromGitLab {
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
     owner = "World";
     repo = pname;
     rev = version;
-    hash = "sha256-sLnZPn4pi+sRcDW0f5NHiZaxmnf9xGZnbKYWrCNQsY4=";
+    hash = "sha256-0nkaKLkUnJiNTs7/qe+c4Lkst/ItHD1RKAERCo2O2ms=";
   };
 
   postPatch = ''

From 761aa9bf9f0ff6e9600e0178ecfe6740428f71b9 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Thu, 3 Aug 2023 22:44:09 -0400
Subject: [PATCH 20/39] llvmPackages_16.compiler-rt: fix static build on Darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes two issues on Darwin to allow pkgsStatic to work with LLVM 16

* It fixes an infinite recursion where Darwin was using a regular stdenv
  to build compiler-rt instead of one without compiler-rt; and
* It disables sanitizers that won’t build statically and makes sure the
  build can find the cross-lipo.
---
 pkgs/development/compilers/llvm/16/compiler-rt/default.nix | 7 +++++--
 pkgs/development/compilers/llvm/16/default.nix             | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix
index e2b8d470f890..aa248c0e60eb 100644
--- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix
@@ -9,6 +9,7 @@ let
   useLLVM = stdenv.hostPlatform.useLLVM or false;
   bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none";
   haveLibc = stdenv.cc.libc != null;
+  isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic;
   inherit (stdenv.hostPlatform) isMusl isGnu;
 
   baseName = "compiler-rt";
@@ -41,7 +42,7 @@ stdenv.mkDerivation {
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
   ] ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [
     "-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
-  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl || isDarwinStatic) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
@@ -49,9 +50,10 @@ stdenv.mkDerivation {
     "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary
   ] ++ lib.optionals (useLLVM || bareMetal) [
      "-DCOMPILER_RT_BUILD_PROFILE=OFF"
+  ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal || isDarwinStatic ) [
+    "-DCMAKE_CXX_COMPILER_WORKS=ON"
   ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
-    "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
   ] ++ lib.optionals (useLLVM && !haveLibc) [
@@ -63,6 +65,7 @@ stdenv.mkDerivation {
   ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
   ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    "-DCMAKE_LIPO=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}lipo"
     "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON"
     "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
     "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}"
diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix
index 1e200b17b0b2..0c0ff44e155f 100644
--- a/pkgs/development/compilers/llvm/16/default.nix
+++ b/pkgs/development/compilers/llvm/16/default.nix
@@ -316,7 +316,7 @@ in let
 
     compiler-rt-libc = callPackage ./compiler-rt {
       inherit llvm_meta;
-      stdenv = if stdenv.hostPlatform.useLLVM or false
+      stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic)
                then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc
                else stdenv;
     };
@@ -329,7 +329,7 @@ in let
     };
 
     # N.B. condition is safe because without useLLVM both are the same.
-    compiler-rt = if stdenv.hostPlatform.isAndroid
+    compiler-rt = if stdenv.hostPlatform.isAndroid || stdenv.hostPlatform.isDarwin
       then libraries.compiler-rt-libc
       else libraries.compiler-rt-no-libc;
 

From b058a2fc2908aa9f7bd5abb66392a53e9e7eeeff Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 14 Aug 2023 23:56:18 -0300
Subject: [PATCH 21/39] zig: remove with lib

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

diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index a0dbea04869e..7a2ac1c7375b 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://ziglang.org/";
     changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members;
+    maintainers = [ lib.maintainers.andrewrk ] ++ lib.teams.zig.members;
     platforms = lib.platforms.unix;
   };
 } // removeAttrs args [ "hash" ])

From fd774bd82bfb9ec60f4c9a33971ce97f76028155 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 21 Aug 2023 08:38:30 -0300
Subject: [PATCH 22/39] zig.hook: reword

---
 pkgs/development/compilers/zig/hook.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/zig/hook.nix b/pkgs/development/compilers/zig/hook.nix
index 254a64597dd3..3d3e6f9ffee5 100644
--- a/pkgs/development/compilers/zig/hook.nix
+++ b/pkgs/development/compilers/zig/hook.nix
@@ -10,10 +10,13 @@ makeSetupHook {
 
   substitutions = {
     zig_default_flags =
-      if lib.versionAtLeast zig.version "0.11" then
-        "-Doptimize=ReleaseSafe -Dcpu=baseline"
-      else
-        "-Drelease-safe=true -Dcpu=baseline";
+      let
+        cpu = "-Dcpu=baseline";
+        releaseType = if lib.versionAtLeast zig.version "0.11"
+                      then "-Doptimize=ReleaseSafe"
+                      else "-Drelease-safe=true";
+      in
+        lib.concatStringsSep " " [ cpu releaseType ];
   };
 
   passthru = { inherit zig; };

From ebb4d8a13f5f73d878543ad94d1b4c557c6f7a08 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 21 Aug 2023 08:50:54 -0300
Subject: [PATCH 23/39] zig-shell-completions: refactor

- Use rec-less, overlay-style overridable recursive attributes (in effect since
https://github.com/NixOS/nixpkgs/pull/119942);
- Remove nested with (according to
https://nix.dev/anti-patterns/language#with-attrset-expression);
- Add updateScript.
---
 .../compilers/zig/shell-completions.nix           | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/zig/shell-completions.nix b/pkgs/development/compilers/zig/shell-completions.nix
index 74beb5f63d65..db76250bf802 100644
--- a/pkgs/development/compilers/zig/shell-completions.nix
+++ b/pkgs/development/compilers/zig/shell-completions.nix
@@ -2,9 +2,10 @@
 , stdenv
 , fetchFromGitHub
 , installShellFiles
+, unstableGitUpdater
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zig-shell-completions";
   version = "unstable-2023-08-17";
 
@@ -29,11 +30,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
     homepage = "https://github.com/ziglang/shell-completions";
     description = "Shell completions for the Zig compiler";
-    license = licenses.mit;
-    maintainers = with maintainers; [ aaronjheng ];
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aaronjheng ];
+    platforms = lib.platforms.all;
   };
-}
+})

From e1bc5215870ff4914018eb3dbdeeffac4b28d781 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 22 Aug 2023 10:17:22 +0800
Subject: [PATCH 24/39] deepin.deepin-editor: 6.0.10 -> 6.0.11

---
 pkgs/desktops/deepin/apps/deepin-editor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix
index 58bfb22bce29..299319a0687a 100644
--- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-editor";
-  version = "6.0.10";
+  version = "6.0.11";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-NevylvfeoT69i1AFJTypSfJKEd38uSXwGm9doRrZ2TI=";
+    hash = "sha256-OdKEskxrzFo4VOsR2+rsH3G63uqMmsBuXufayHWSQac=";
   };
 
   nativeBuildInputs = [

From b44f01382118b47c9ddb161238af7ad9fb59c313 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 22 Aug 2023 10:02:26 +0800
Subject: [PATCH 25/39] xfce.xfce4-screensaver: Unbreak
 xfce4-screensaver-configure

Adding missing python should be enough to fix the wrong shebangs.
---
 .../xfce/applications/xfce4-screensaver/default.nix   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix b/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix
index fd119592ba43..791c8ecbde52 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix
@@ -1,4 +1,5 @@
 { mkXfceDerivation
+, gobject-introspection
 , dbus-glib
 , garcon
 , glib
@@ -11,11 +12,16 @@
 , libxfce4util
 , libxklavier
 , pam
+, python3
 , systemd
 , xfconf
 , lib
 }:
 
+let
+  # For xfce4-screensaver-configure
+  pythonEnv = python3.withPackages (pp: [ pp.pygobject3 ]);
+in
 mkXfceDerivation {
   category = "apps";
   pname = "xfce4-screensaver";
@@ -23,6 +29,10 @@ mkXfceDerivation {
 
   sha256 = "sha256-j5K5i+hl/miyHste73akZL62K6YTxXmN8mmFK9BCecs=";
 
+  nativeBuildInputs = [
+    gobject-introspection
+  ];
+
   buildInputs = [
     dbus-glib
     garcon
@@ -36,6 +46,7 @@ mkXfceDerivation {
     libxfce4util
     libxklavier
     pam
+    pythonEnv
     systemd
     xfconf
   ];

From b9d877aa268209ca3f1cfec5f06adf7601381411 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sat, 19 Aug 2023 14:37:39 -0400
Subject: [PATCH 26/39] numlockx: Add meta.mainProgram and clean up

---
 pkgs/tools/X11/numlockx/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/X11/numlockx/default.nix b/pkgs/tools/X11/numlockx/default.nix
index 5cd23a81f308..32eb652d8b72 100644
--- a/pkgs/tools/X11/numlockx/default.nix
+++ b/pkgs/tools/X11/numlockx/default.nix
@@ -1,21 +1,22 @@
-{ lib, stdenv, fetchFromGitHub, libX11, libXext, autoconf }:
+{ lib, stdenv, fetchFromGitHub, autoconf, libX11, libXext }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "1.2";
   pname = "numlockx";
 
   src = fetchFromGitHub {
     owner = "rg3";
-    repo = pname;
+    repo = "numlockx";
     rev = "9159fd3c5717c595dadfcb33b380a85c88406185";
-    sha256 = "1w49fayhwzn5rx0z1q2lrvm7z8jrd34lgb89p853a024bixc3cf2";
+    hash = "sha256-wrHBelxEADUKugmtR8loWaJ/6s5U4PBBz8V+Dr1yifA=";
   };
 
   buildInputs = [ libX11 libXext autoconf ];
 
-  meta = with lib; {
+  meta = {
     description = "Allows to start X with NumLock turned on";
-    license = licenses.mit;
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    mainProgram = "numlockx";
   };
 }

From ee29c376c039e2c3c4ec1eadaa5f104b35e56132 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Tue, 22 Aug 2023 11:28:01 +0800
Subject: [PATCH 27/39] swaynag-battery: use sri hash

---
 pkgs/applications/misc/swaynag-battery/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/applications/misc/swaynag-battery/default.nix
index 71d15aa06584..b58758d8a417 100644
--- a/pkgs/applications/misc/swaynag-battery/default.nix
+++ b/pkgs/applications/misc/swaynag-battery/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
     hash = "sha256-7f9+4Fzw5B5ATuud4MJC3iyuNRTx6kwJ7/KsusGtQM8=";
   };
 
-  vendorSha256 = "h9Zj3zmQ0Xpili5Pl6CXh1L0bb2uL1//B79I4/ron08=";
+  vendorHash = "sha256-h9Zj3zmQ0Xpili5Pl6CXh1L0bb2uL1//B79I4/ron08=";
 
   meta = with lib; {
     homepage = "https://github.com/m00qek/swaynag-battery";

From 5f7deca07811395911893d07e7ed464fa0700586 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Aug 2023 04:15:03 +0000
Subject: [PATCH 28/39] python310Packages.pydeps: 1.12.13 -> 1.12.17

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

diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix
index faa85f6f4a85..f84123163ccf 100644
--- a/pkgs/development/python-modules/pydeps/default.nix
+++ b/pkgs/development/python-modules/pydeps/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pydeps";
-  version = "1.12.13";
+  version = "1.12.17";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "thebjorn";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-n4FmMqpCqxPmGJokfaxnruG9d5oodv6Yfg80Y1EIr34=";
+    hash = "sha256-DVSZeNuDz/y0jh/HimV+jFgNFevMhUKOu6EhZytMMqQ=";
   };
 
   buildInputs = [

From ddc5cbb5219312003167b97baacd7bcc813b1d6e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 03:06:57 +0000
Subject: [PATCH 29/39] terraform-providers.baiducloud: 1.19.12 -> 1.19.13

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 721c39578ccb..b0487d2a617a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -146,11 +146,11 @@
     "vendorHash": null
   },
   "baiducloud": {
-    "hash": "sha256-NW3q+1132gBlyFDsqZyHoZzhljF+T9ZmVMfy8B4BsuQ=",
+    "hash": "sha256-yV5NgymZesYE/RhXccTE2Qdf7bHO35qAI+QdPYPUPDM=",
     "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
     "owner": "baidubce",
     "repo": "terraform-provider-baiducloud",
-    "rev": "v1.19.12",
+    "rev": "v1.19.13",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 98bd3a70248cff8bbc8cf0f46e2154c6011c73b5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 03:08:37 +0000
Subject: [PATCH 30/39] terraform-providers.equinix: 1.14.6 -> 1.14.7

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index b0487d2a617a..03ecdc29530c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -363,13 +363,13 @@
     "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
   },
   "equinix": {
-    "hash": "sha256-lo3DxEXa0nSm+KXBmWwulyNNsctrFvZJLHVJ087BsoU=",
+    "hash": "sha256-MEsE1OQwKjd1Y+Ek7UmZMbLq4x84iQW40sMl78UbW2c=",
     "homepage": "https://registry.terraform.io/providers/equinix/equinix",
     "owner": "equinix",
     "repo": "terraform-provider-equinix",
-    "rev": "v1.14.6",
+    "rev": "v1.14.7",
     "spdx": "MIT",
-    "vendorHash": "sha256-7a90fzAU76QRXkSa+G/N3kMPP8jy68i72i2JSlUrvfc="
+    "vendorHash": "sha256-cfJG0DJJJX85ISz7dSZ+di1uhgJJd5xUH99PhqGMPgw="
   },
   "exoscale": {
     "hash": "sha256-93pCsHrsYLJYgg8MXHz2Gg+vaPC9gcHdLastb89/BMg=",

From fd72caf8f3ae41b9d8b4818d3bccab21fc71d1c1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 03:15:04 +0000
Subject: [PATCH 31/39] terraform-providers.google: 4.78.0 -> 4.79.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 03ecdc29530c..16941fa08614 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -454,12 +454,12 @@
     "vendorHash": "sha256-AVTWTS16d8QsPLLAJeAfgcVDzUBMp+b2oAphaCBqhS0="
   },
   "google": {
-    "hash": "sha256-11iT/zjoSScSdLGWFPxEURiIBvcz5jK8QZAHdqRwHD0=",
+    "hash": "sha256-tfjrVWj+l9mNdgZ+unu4NW15OAOzViTVmSTzO/ZiqRE=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "proxyVendor": true,
     "repo": "terraform-provider-google",
-    "rev": "v4.78.0",
+    "rev": "v4.79.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-lyOupw64LQvdTJZjJ1RvAn1JLDHAZ4qAaagASXHcEXA="
   },

From c452d891de573430cb1917e1652e1812874205b5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 03:16:34 +0000
Subject: [PATCH 32/39] terraform-providers.google-beta: 4.78.0 -> 4.79.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 16941fa08614..7d45cb28818b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -464,12 +464,12 @@
     "vendorHash": "sha256-lyOupw64LQvdTJZjJ1RvAn1JLDHAZ4qAaagASXHcEXA="
   },
   "google-beta": {
-    "hash": "sha256-dKB9rdMZP+Ln3M9bL7MC6RGlDXZ/IydD4g5Jp1jjEh4=",
+    "hash": "sha256-70Za/CGYv5HkkXMYtnIHzliW1551ZGF/L05RQtCtjHM=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "proxyVendor": true,
     "repo": "terraform-provider-google-beta",
-    "rev": "v4.78.0",
+    "rev": "v4.79.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-lyOupw64LQvdTJZjJ1RvAn1JLDHAZ4qAaagASXHcEXA="
   },

From eb83864410224a5fbbd7459c696a313186802231 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 03:18:36 +0000
Subject: [PATCH 33/39] terraform-providers.kafka: 0.5.3 -> 0.5.4

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 7d45cb28818b..c467b2222a5b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -619,13 +619,13 @@
     "vendorHash": "sha256-OMDMpL9ox6tI9tkoSU0oVuFzRObmUGgGQy6RtsNbyIg="
   },
   "kafka": {
-    "hash": "sha256-IG0xgMs0j2jRJBa52Wsx7/r4s9DRnw5b+AfYpZAewxI=",
+    "hash": "sha256-cWFPuKU7CQU8TYy125N88saBGPkrGa+7mKLi3TlnM2I=",
     "homepage": "https://registry.terraform.io/providers/Mongey/kafka",
     "owner": "Mongey",
     "repo": "terraform-provider-kafka",
-    "rev": "v0.5.3",
+    "rev": "v0.5.4",
     "spdx": "MIT",
-    "vendorHash": "sha256-Z5APR41/+MsrHAtpTZKnG0qTi1+JSBJbPTVxNpd6f84="
+    "vendorHash": "sha256-gWomOX/NaYdcqspquqpRjqGnzLRY3iIUJALACf78TV8="
   },
   "kafka-connect": {
     "hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=",

From 224c72f329b0435c077fc08219aeb6d7933ea849 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 03:22:39 +0000
Subject: [PATCH 34/39] terraform-providers.pagerduty: 2.15.3 -> 2.16.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index c467b2222a5b..f560868d902a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -899,11 +899,11 @@
     "vendorHash": null
   },
   "pagerduty": {
-    "hash": "sha256-pMim8Bjjtuysdd4LgsV4+JPjEMw+3bF8vOKIBJVSScY=",
+    "hash": "sha256-kVz63aXl03p6T22WPB9PuZm+QllGxJNt3fDZ1H64dqw=",
     "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
     "owner": "PagerDuty",
     "repo": "terraform-provider-pagerduty",
-    "rev": "v2.15.3",
+    "rev": "v2.16.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 4878ad1ec67ae54324a0ba5ef212d48572e4755a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 03:22:58 +0000
Subject: [PATCH 35/39] terraform-providers.ibm: 1.56.0 -> 1.56.1

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index f560868d902a..9f189af20281 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -583,11 +583,11 @@
     "vendorHash": null
   },
   "ibm": {
-    "hash": "sha256-FxMBZQYYSOq1Y5jm+HPIsVA1RMv8jhPWIKHd9HV/f3g=",
+    "hash": "sha256-z3k4H4eP5NMufkHaEUIQBQUybpEcfkUO0k3pEMvMPFQ=",
     "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
     "owner": "IBM-Cloud",
     "repo": "terraform-provider-ibm",
-    "rev": "v1.56.0",
+    "rev": "v1.56.1",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-djpo+9BxWUptKRephw0by4xtPABEjsnCqwcbZoRNIug="
   },

From d546a588b3745d8ecfe433f1d114e44f5a6ad7ba Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 03:25:17 +0000
Subject: [PATCH 36/39] terraform-providers.scaleway: 2.26.0 -> 2.27.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 9f189af20281..13ade50fcf08 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -980,13 +980,13 @@
     "vendorHash": null
   },
   "scaleway": {
-    "hash": "sha256-xllc6uQN0Pjak/8eFNWCn639Kpf2UQPoDUPnX9YhoOc=",
+    "hash": "sha256-YARTRjmrweBJAa5PAWZ/2yayBa9Q09vp1AgVJNxB53Q=",
     "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
     "owner": "scaleway",
     "repo": "terraform-provider-scaleway",
-    "rev": "v2.26.0",
+    "rev": "v2.27.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-39MrDm4v7UIYDK/KNt9ES0SstkxEQ73CHvnxpZq1K5g="
+    "vendorHash": "sha256-TiR7t6RaaLT+1gqgdq/Dsegft3dqv7xwFAeeT6pNRbM="
   },
   "secret": {
     "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",

From bfd4528c6173a533305964c9c9e9b8d3e399b439 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 03:26:15 +0000
Subject: [PATCH 37/39] terraform-providers.snowflake: 0.69.0 -> 0.70.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 13ade50fcf08..1cb8c0c6ee85 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1043,13 +1043,13 @@
     "vendorHash": null
   },
   "snowflake": {
-    "hash": "sha256-gz41dRmJQm4cH7VhrEznir7IRA9+hGMjYzsOyQtNuG0=",
+    "hash": "sha256-v4rpdOsEYy0coZUq7frvF+IVLhI3Vz8Q6fk4koFg9a4=",
     "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
     "owner": "Snowflake-Labs",
     "repo": "terraform-provider-snowflake",
-    "rev": "v0.69.0",
+    "rev": "v0.70.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-ZNkZ2GMSBZHz+L626VqT7pTeb8fSYkaCi84O5ggd1FM="
+    "vendorHash": "sha256-7jB1p6+EVUp03Bw7AyL8jH/n1tslkPmK7FIqFbde1n4="
   },
   "sops": {
     "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=",

From 3b2c5a111095eb55d919daa36152557d6f231b2d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 03:27:44 +0000
Subject: [PATCH 38/39] terraform-providers.vsphere: 2.4.1 -> 2.4.2

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 1cb8c0c6ee85..462240ce3cc6 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1243,13 +1243,13 @@
     "vendorHash": null
   },
   "vsphere": {
-    "hash": "sha256-lWMtsBRAirNI7dNXI7APzS1AbPmkz5fsbpCdd/0XBRc=",
+    "hash": "sha256-Tvc3+HVsrD2CgfRVqfcF7DtszI+s7HrIgP2wiImqOXo=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere",
     "owner": "hashicorp",
     "repo": "terraform-provider-vsphere",
-    "rev": "v2.4.1",
+    "rev": "v2.4.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-wKKrBSJkbdqqnDLoS+jhvI26rOzvMWjjsN8wh67Le5U="
+    "vendorHash": "sha256-MrDY1zx4aXKRGmhTPMLnIVBAJh+szdL6rH0m0amlYS8="
   },
   "vultr": {
     "hash": "sha256-h9MQv4BTv9y4A6HSDE3dIV7aKwaIWRYy5EyE2T0mpG4=",

From 0beaeb3813b7e741b53570dd4bea61ed23c16b7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Aug 2023 04:49:16 +0000
Subject: [PATCH 39/39] python310Packages.dvc-objects: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix
index 6854f827491d..fb7fed4858d4 100644
--- a/pkgs/development/python-modules/dvc-objects/default.nix
+++ b/pkgs/development/python-modules/dvc-objects/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-objects";
-  version = "1.0.0";
+  version = "1.0.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-9R1fhRwGYkwykiTnddjIJHmJxMcpwS+a9hgqBzFyJeM=";
+    hash = "sha256-mpYSlddzYIUZctF3kGWQWT+kxshIdAckVvaXWuyJnlw=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;