From e251ece266c5d59ef8c5df98feb629a26a35a14d Mon Sep 17 00:00:00 2001
From: Nathan Henrie <nate@n8henrie.com>
Date: Thu, 23 Mar 2023 16:07:12 -0600
Subject: [PATCH 01/40] espeak-ng: Add alsa-plugins path to ALSA_PLUGIN_DIR

Fixes https://github.com/NixOS/nixpkgs/issues/222722

On non-NixOS systems, `nixpkgs#espeak-ng` currently fails to find
`libasound_module_pcm_pulse.so`, as it seems to look in `alsa-lib-1.2.8`
but the file in question exists in alsa-plugins-1.2.7.1.

This change points it to the correct location allows `espeak-ng` to
work without error.
---
 pkgs/applications/audio/espeak-ng/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 28b60fa60074..5b558a419d1f 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -14,6 +14,8 @@
 , pcaudiolib
 , sonicSupport ? true
 , sonic
+, alsa-plugins
+, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn ];
+  nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn makeWrapper ];
 
   buildInputs = lib.optional mbrolaSupport mbrola
     ++ lib.optional pcaudiolibSupport pcaudiolib
@@ -49,6 +51,8 @@ stdenv.mkDerivation rec {
 
   postInstall = lib.optionalString stdenv.isLinux ''
     patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng
+    wrapProgram $out/bin/espeak-ng \
+      --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib
   '';
 
   passthru = {

From 3bc6ed6e70901fa548fcbec72656fc0cd605ad4c Mon Sep 17 00:00:00 2001
From: Tobias Markus <tobias@miglix.eu>
Date: Fri, 10 Feb 2023 15:10:44 +0100
Subject: [PATCH 02/40] cctag: init at 1.0.3

---
 .../cctag/cmake-install-include-dir.patch     | 11 ++++
 pkgs/development/libraries/cctag/default.nix  | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 81 insertions(+)
 create mode 100644 pkgs/development/libraries/cctag/cmake-install-include-dir.patch
 create mode 100644 pkgs/development/libraries/cctag/default.nix

diff --git a/pkgs/development/libraries/cctag/cmake-install-include-dir.patch b/pkgs/development/libraries/cctag/cmake-install-include-dir.patch
new file mode 100644
index 000000000000..ae708e55d3e7
--- /dev/null
+++ b/pkgs/development/libraries/cctag/cmake-install-include-dir.patch
@@ -0,0 +1,11 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -209,7 +209,7 @@
+   target_include_directories(CCTag
+                            PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>"
+                                   "$<BUILD_INTERFACE:${generated_dir}>"
+-                                  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>"
++                                  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+                            PUBLIC ${Boost_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})
+ 
+   # just for testing
diff --git a/pkgs/development/libraries/cctag/default.nix b/pkgs/development/libraries/cctag/default.nix
new file mode 100644
index 000000000000..706d2becbef5
--- /dev/null
+++ b/pkgs/development/libraries/cctag/default.nix
@@ -0,0 +1,66 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+
+, cmake
+, boost
+, eigen
+, opencv
+, tbb
+
+, avx2Support ? stdenv.hostPlatform.avx2Support
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cctag";
+  version = "1.0.3";
+
+  outputs = [ "lib" "dev" "out" ];
+
+  src = fetchFromGitHub {
+    owner = "alicevision";
+    repo = "CCTag";
+    rev = "v${version}";
+    hash = "sha256-foB+e7BCuUucyhN8FsI6BIT3/fsNLTjY6QmjkMWZu6A=";
+  };
+
+  cmakeFlags = [
+    # Feel free to create a PR to add CUDA support
+    "-DCCTAG_WITH_CUDA=OFF"
+
+    "-DCCTAG_ENABLE_SIMD_AVX2=${if avx2Support then "ON" else "OFF"}"
+
+    "-DCCTAG_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
+    "-DCCTAG_BUILD_APPS=OFF"
+  ];
+
+  patches = [
+    ./cmake-install-include-dir.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  propagatedBuildInputs = [
+    tbb
+  ];
+
+  buildInputs = [
+    boost
+    eigen
+    opencv
+  ];
+
+  # Tests are broken on Darwin (linking issue)
+  doCheck = !stdenv.isDarwin;
+
+  meta = with lib; {
+    description = "Detection of CCTag markers made up of concentric circles";
+    homepage = "https://cctag.readthedocs.io";
+    downloadPage = "https://github.com/alicevision/CCTag";
+    license = licenses.mpl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ tmarkus ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22049bd8762b..e5da01e43dbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19447,6 +19447,10 @@ with pkgs;
 
   ccrtp = callPackage ../development/libraries/ccrtp { };
 
+  cctag = callPackage ../development/libraries/cctag {
+    tbb = tbb_2021_8;
+  };
+
   cctz = callPackage ../development/libraries/cctz {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };

From d645bba8c80a377271e0d0d53617738fa4a00aed Mon Sep 17 00:00:00 2001
From: Ionut Nechita <ionut_n2001@yahoo.com>
Date: Wed, 29 Mar 2023 08:21:45 +0300
Subject: [PATCH 03/40] android: with new kernel versions this option is no
 longer necessary

Description:
 - ANDROID = { optional = true; tristate = whenBetween "5.0" "5.19" "y";};
 - starting from 5.20 and 6.0, this parameter no longer exists.

Change-Id: I34d6638e01eb539de34afe2152ff5927a317b68a
Signed-off-by: Ionut Nechita <ionut_n2001@yahoo.com>
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index faa98ee8fe32..bee04112ad60 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -966,7 +966,7 @@ let
       FSL_MC_UAPI_SUPPORT = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "5.12" yes);
 
       ASHMEM =                 { optional = true; tristate = whenBetween "5.0" "5.18" "y";};
-      ANDROID =                { optional = true; tristate = whenAtLeast "5.0" "y";};
+      ANDROID =                { optional = true; tristate = whenBetween "5.0" "5.19" "y";};
       ANDROID_BINDER_IPC =     { optional = true; tristate = whenAtLeast "5.0" "y";};
       ANDROID_BINDERFS =       { optional = true; tristate = whenAtLeast "5.0" "y";};
       ANDROID_BINDER_DEVICES = { optional = true; freeform = whenAtLeast "5.0" "binder,hwbinder,vndbinder";};

From 25fb775699a81739b444d6b9a526107da8b4c998 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Mar 2023 08:47:05 +0000
Subject: [PATCH 04/40] csvq: 1.17.11 -> 1.18.1

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

diff --git a/pkgs/development/tools/csvq/default.nix b/pkgs/development/tools/csvq/default.nix
index badc9aba08b3..d8438b85b815 100644
--- a/pkgs/development/tools/csvq/default.nix
+++ b/pkgs/development/tools/csvq/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "csvq";
-  version = "1.17.11";
+  version = "1.18.1";
 
   src = fetchFromGitHub {
     owner = "mithrandie";
     repo = "csvq";
     rev = "v${version}";
-    sha256 = "sha256-jhj03xpWBcLVCCk1S9nsi8O6x1/IVwNT3voGfWBg2iw=";
+    sha256 = "sha256-1UK+LSMKryoUf2UWbGt8MU3zs5hH2WdpA2v/jBaIHYE=";
   };
 
-  vendorSha256 = "sha256-C+KQHSp4aho+DPlkaYegjYSaoSHaLiQOa1WJXIn9FdQ=";
+  vendorHash = "sha256-byBYp+iNnnsAXR+T3XmdwaeeBG8oB1EgNkDabzgUC98=";
 
   meta = with lib; {
     description = "SQL-like query language for CSV";

From 6a8b5e03f3a73b9cc03fd8a7bd1dd1582061adc1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 29 Mar 2023 11:09:16 +0200
Subject: [PATCH 05/40] vscode-extensions.nvarner.typst-lsp: init at 0.3.0

---
 .../editors/vscode/extensions/default.nix       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 40ff07c7d4fc..c7e6bfd92a69 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2122,6 +2122,23 @@ let
         };
       };
 
+      nvarner.typst-lsp = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "typst-lsp";
+          publisher = "nvarner";
+          version = "0.3.0";
+          sha256 = "sha256-ek5zXK4ecXwSPMJ4Ihy2l3PMxCdHwJN7dbwZfQVjNG8=";
+        };
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog";
+          description = "A VSCode extension for providing a language server for Typst";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp";
+          homepage = "https://github.com/nvarner/typst-lsp";
+          license = lib.licenses.mit;
+          maintainers = [ lib.maintainers.drupol ];
+        };
+      };
+
       ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension {
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/ocamllabs.ocaml-platform/changelog";

From 47e7025ad08fa930ffce653b172e96e7afbb04eb Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 6 Feb 2023 01:28:01 +0100
Subject: [PATCH 06/40] buildDotNet: don't pin openssl_1_1

---
 pkgs/development/compilers/dotnet/build-dotnet.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix
index 27b0fcbb40df..036d72a65358 100644
--- a/pkgs/development/compilers/dotnet/build-dotnet.nix
+++ b/pkgs/development/compilers/dotnet/build-dotnet.nix
@@ -14,7 +14,6 @@ assert if type == "sdk" then packages != null else true;
 , autoPatchelfHook
 , makeWrapper
 , libunwind
-, openssl_1_1
 , icu
 , libuuid
 , zlib
@@ -61,9 +60,6 @@ stdenv.mkDerivation (finalAttrs: rec {
     zlib
     icu
     libkrb5
-    # this must be before curl for autoPatchElf to find it
-    # curl brings in its own openssl
-    openssl_1_1
     curl
   ] ++ lib.optional stdenv.isLinux lttng-ust_2_12;
 

From 84a2307bb071efdd284e0a8c7c7e40fca3d363a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Mar 2023 19:07:25 +0000
Subject: [PATCH 07/40] rocsolver: 5.4.2 -> 5.4.4

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

diff --git a/pkgs/development/libraries/rocsolver/default.nix b/pkgs/development/libraries/rocsolver/default.nix
index d753779be0c5..f53727e38130 100644
--- a/pkgs/development/libraries/rocsolver/default.nix
+++ b/pkgs/development/libraries/rocsolver/default.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocsolver";
-  version = "5.4.2";
+  version = "5.4.4";
 
   outputs = [
     "out"

From 716892066a140e8ebcfd4041e89900e8d0d91763 Mon Sep 17 00:00:00 2001
From: Joshua Trees <me@jtrees.io>
Date: Tue, 28 Mar 2023 20:23:41 +0200
Subject: [PATCH 08/40] cypress: add aarch64-linux support

---
 pkgs/development/web/cypress/default.nix | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index 04284e9c082f..9983b206ef92 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -14,13 +14,27 @@
 , xorg
 }:
 
-stdenv.mkDerivation rec {
+let
+  availableBinaries = {
+    x86_64-linux = {
+      platform = "linux-x64";
+      checksum = "sha256-26mkizwkF0qPX2+0rkjep28ZuNlLGPljCvVO73t34Lk=";
+    };
+    aarch64-linux = {
+      platform = "linux-arm64";
+      checksum = "sha256-gcf/MJ5aNUPoH6qz0n9vjviTec1rcxB0UzF+++6bUTs=";
+    };
+  };
+  inherit (stdenv.hostPlatform) system;
+  binary = availableBinaries.${system} or (throw "cypress: No binaries available for system ${system}");
+  inherit (binary) platform checksum;
+in stdenv.mkDerivation rec {
   pname = "cypress";
   version = "10.10.0";
 
   src = fetchzip {
-    url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-    sha256 = "sha256-26mkizwkF0qPX2+0rkjep28ZuNlLGPljCvVO73t34Lk=";
+    url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip";
+    sha256 = checksum;
   };
 
   # don't remove runtime deps
@@ -73,7 +87,7 @@ stdenv.mkDerivation rec {
     mainProgram = "Cypress";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.mit;
-    platforms = [ "x86_64-linux" ];
+    platforms = lib.attrNames availableBinaries;
     maintainers = with maintainers; [ tweber mmahut Crafter ];
   };
 }

From 09d0248a64536030c254144c49344dff9b5509ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Mar 2023 21:21:36 +0000
Subject: [PATCH 09/40] unciv: 4.5.10 -> 4.5.13

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

diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix
index f0ec6ab30f01..0e5cf615a78d 100644
--- a/pkgs/games/unciv/default.nix
+++ b/pkgs/games/unciv/default.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "unciv";
-  version = "4.5.10";
+  version = "4.5.13";
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-vV0Ux1TWwDlgDzQyIalMRcktP3SYP2RPacTIY9VV0W8=";
+    hash = "sha256-wagguIz4g4DT5aCw6DzFHpHcDznGnkeyG588cSiTtds=";
   };
 
   dontUnpack = true;

From 73f8689c601b2b2905c2ec080f68841ef7896bfc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Mar 2023 23:27:40 +0200
Subject: [PATCH 10/40] wapiti: 3.1.6 -> 3.1.7

Diff: https://github.com/wapiti-scanner/wapiti/compare/refs/tags/3.1.6...3.1.7

Changelog: https://github.com/wapiti-scanner/wapiti/blob/3.1.7/doc/ChangeLog_Wapiti
---
 pkgs/tools/security/wapiti/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix
index 367123fad252..35c69b8efd6c 100644
--- a/pkgs/tools/security/wapiti/default.nix
+++ b/pkgs/tools/security/wapiti/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "wapiti";
-  version = "3.1.6";
+  version = "3.1.7";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "wapiti-scanner";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-b377nPXvpxg+WDNgjxm2RoJ5jNt7MTES2Bspxsvo/wc=";
+    hash = "sha256-muAugc0BgVSER2LSRv7ATbCqpXID8/WH+hfhmtoS36o=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 281d7c21c8f64285a9bbd0d4d8d06197fcad23e3 Mon Sep 17 00:00:00 2001
From: StepBroBD <Hi@StepBroBD.com>
Date: Mon, 27 Mar 2023 22:29:01 -0600
Subject: [PATCH 11/40] raycast: init at 1.48.9

* raycast: init at 1.48.9, change github release url to internet archive url

* raycast: adding documentation explaining the reason we are using Internet Archive URL

* raycast: add lovesegfault to maintainers

Co-authored-by: Bernardo Meurer <bernardo@meurer.org>
---
 pkgs/os-specific/darwin/raycast/default.nix | 49 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/raycast/default.nix

diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix
new file mode 100644
index 000000000000..6dd15fc92a11
--- /dev/null
+++ b/pkgs/os-specific/darwin/raycast/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, stdenvNoCC
+, fetchurl
+, undmg
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "raycast";
+  version = "1.48.9";
+
+  src = fetchurl {
+    # https://github.com/NixOS/nixpkgs/pull/223495
+    # official download API: https://api.raycast.app/v2/download
+    # this returns an AWS CloudFront signed URL with expiration timestamp and signature
+    # the returned URL will always be the latest Raycast which might result in an impure derivation
+    # the package maintainer created a repo (https://github.com/stepbrobd/raycast-overlay)
+    # to host GitHub Actions to periodically check for updates
+    # and re-release the `.dmg` file to Internet Archive (https://archive.org/details/raycast)
+    url = "https://archive.org/download/raycast/raycast-${version}.dmg";
+    sha256 = "sha256-PSK/PLIOLUrqHAvEfOVMuGojLjwrCR4Vm9okE9d/5dE=";
+  };
+
+  dontPatch = true;
+  dontConfigure = true;
+  dontBuild = true;
+  dontFixup = true;
+
+  nativeBuildInputs = [ undmg ];
+
+  sourceRoot = "Raycast.app";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications/Raycast.app
+    cp -R . $out/Applications/Raycast.app
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Control your tools with a few keystrokes";
+    homepage = "https://raycast.app/";
+    license = licenses.unfree;
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    maintainers = with maintainers; [ lovesegfault stepbrobd ];
+    platforms = platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 452fb8108891..32d61db1ac8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36080,6 +36080,8 @@ with pkgs;
 
   raylib-games = callPackage ../games/raylib-games { };
 
+  raycast = callPackage ../os-specific/darwin/raycast { };
+
   redeclipse = callPackage ../games/redeclipse { };
 
   rftg = callPackage ../games/rftg { };

From 6db14a3392f2aff688937a8ee7712a2c2aab97a7 Mon Sep 17 00:00:00 2001
From: StepBroBD <Hi@StepBroBD.com>
Date: Wed, 29 Mar 2023 11:46:57 -0600
Subject: [PATCH 12/40] raycast: 1.48.9 -> 1.49.0

---
 pkgs/os-specific/darwin/raycast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix
index 6dd15fc92a11..ea635312d1f2 100644
--- a/pkgs/os-specific/darwin/raycast/default.nix
+++ b/pkgs/os-specific/darwin/raycast/default.nix
@@ -6,7 +6,7 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "raycast";
-  version = "1.48.9";
+  version = "1.49.0";
 
   src = fetchurl {
     # https://github.com/NixOS/nixpkgs/pull/223495
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
     # to host GitHub Actions to periodically check for updates
     # and re-release the `.dmg` file to Internet Archive (https://archive.org/details/raycast)
     url = "https://archive.org/download/raycast/raycast-${version}.dmg";
-    sha256 = "sha256-PSK/PLIOLUrqHAvEfOVMuGojLjwrCR4Vm9okE9d/5dE=";
+    sha256 = "sha256-6j5PyzJ7g3p+5gE2CQHlZrLj5b3rLdpodl+By7xxcjo=";
   };
 
   dontPatch = true;

From 371e567558c65239f36c56b24a261ed0360f5a48 Mon Sep 17 00:00:00 2001
From: Matt Wittmann <mcwitt@gmail.com>
Date: Wed, 29 Mar 2023 15:14:33 -0700
Subject: [PATCH 13/40] python310Packages.gremlinpython: fix bad version string

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

diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix
index 65da72dee7bb..a16cbd3cca82 100644
--- a/pkgs/development/python-modules/gremlinpython/default.nix
+++ b/pkgs/development/python-modules/gremlinpython/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
 
     substituteInPlace setup.py \
       --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' \
-      --replace 'importlib-metadata<5.0.0' 'importlib-metadata'
+      --replace 'importlib-metadata<5.0.0' 'importlib-metadata' \
+      --replace "os.getenv('VERSION', '?').replace('-SNAPSHOT', '.dev-%d' % timestamp)" '"${version}"'
   '';
 
   # setup-requires requirements

From 63366ba77ce0906b26be2ec1f3cb97ff1735d19c Mon Sep 17 00:00:00 2001
From: Matt Wittmann <mcwitt@gmail.com>
Date: Wed, 29 Mar 2023 15:34:54 -0700
Subject: [PATCH 14/40] python310Packages.awswrangler: relax openpyxl
 dependency

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

diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix
index cfd7b7084822..ce81248609a5 100644
--- a/pkgs/development/python-modules/awswrangler/default.nix
+++ b/pkgs/development/python-modules/awswrangler/default.nix
@@ -58,6 +58,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [
     "gremlinpython"
     "numpy"
+    "openpyxl"
     "pandas"
     "pg8000"
     "pyarrow"

From 4e1693c09316d9cefda40823ecd5c01f526a6aee Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 29 Mar 2023 19:11:28 -0400
Subject: [PATCH 15/40] boxxy: 0.6.2 -> 0.6.3

Diff: https://github.com/queer/boxxy/compare/v0.6.2...v0.6.3
---
 pkgs/tools/misc/boxxy/default.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix
index a6b05ab793ef..b43685513fa8 100644
--- a/pkgs/tools/misc/boxxy/default.nix
+++ b/pkgs/tools/misc/boxxy/default.nix
@@ -2,20 +2,32 @@
 , rustPlatform
 , fetchFromGitHub
 , stdenv
+, pkg-config
+, oniguruma
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "boxxy";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "queer";
     repo = "boxxy";
     rev = "v${version}";
-    hash = "sha256-UTwaJDuIj0aZNGNbylBhIdZA6WAsqtW05IWPzh0f9cM=";
+    hash = "sha256-c1AZz5WwSie0lenH0LoPOvR4VWd7pYd59WWmjFn6HiQ=";
   };
 
-  cargoHash = "sha256-CkYm/tMDCIQbUzoF2hgxFsyAl5bpeCVHcLWR9iwq7Cw=";
+  cargoHash = "sha256-840W5wyOV+nTr9HzftOUlUwZ1JRe7+FWTG4Q2L+yCXM=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    oniguruma
+  ];
+
+  RUSTONIG_SYSTEM_LIBONIG = true;
 
   meta = with lib; {
     description = "Puts bad Linux applications in a box with only their files";

From c87d1d05f84e6432432f31471fcdcfafc5dd2747 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Wed, 29 Mar 2023 17:08:45 -0700
Subject: [PATCH 16/40] probe-run: 0.3.6 -> 0.3.7

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

diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix
index 0033a1c5f03a..ac6e9e5d8535 100644
--- a/pkgs/development/tools/rust/probe-run/default.nix
+++ b/pkgs/development/tools/rust/probe-run/default.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "probe-run";
-  version = "0.3.6";
+  version = "0.3.7";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-HYFVdj1kASu+VKnDJA35zblPsgUeYC9YVlS84Hkx1Sk=";
+    hash = "sha256-GLJrM5vIGYH5lNvwmpYKE/ISTRUwikCCj2o5h6Y9kW4=";
   };
 
-  cargoSha256 = "sha256-nhs9qNFd1GK70sL5sPPeMazuPUP67epHayXnw3aXTfk=";
+  cargoHash = "sha256-YevCel3HqwslwVmEA1vncsYYPMGQPUnwlkxLNQsnKG0=";
 
   nativeBuildInputs = [
     pkg-config

From 77b0cf97938453a5bc30370027aca1c5b55f3a77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Mar 2023 01:25:40 +0000
Subject: [PATCH 17/40] pritunl-client: 1.3.3474.95 -> 1.3.3477.58

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

diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix
index 8c4bfa69b180..80e923d854de 100644
--- a/pkgs/tools/networking/pritunl-client/default.nix
+++ b/pkgs/tools/networking/pritunl-client/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pritunl-client";
-  version = "1.3.3474.95";
+  version = "1.3.3477.58";
 
   src = fetchFromGitHub {
     owner = "pritunl";
     repo = "pritunl-client-electron";
     rev = version;
-    sha256 = "sha256-7V+hw/DfyRooef9gwZ5HjcfvabtA2HltJhwwSrQH0X4=";
+    sha256 = "sha256-XsYdmJINzeZgvofsKTG/4dXNv4r46FLkEmNGQki1tmU=";
   };
 
   modRoot = "cli";

From befbf58746aba055f42145092179c10236f0db2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Mar 2023 01:48:03 +0000
Subject: [PATCH 18/40] eks-node-viewer: 0.2.0 -> 0.2.1

---
 .../networking/cluster/eks-node-viewer/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix
index b75f850f7378..10db28179626 100644
--- a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix
+++ b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "eks-node-viewer";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-utn0OJX3NLCyAV4F01GIkvh/KFPv7vfLQMwso7x7yCw";
+    sha256 = "sha256-XRt9a//0mYKZKsMs2dlcsBt5ikC9ZBMeQ3Vas0eT8a8=";
   };
 
-  vendorSha256 = "sha256-28TKZYZM2kddXAusxmjhrKFy+ATU7kZM4Ad7zvP/F3A";
+  vendorHash = "sha256-28TKZYZM2kddXAusxmjhrKFy+ATU7kZM4Ad7zvP/F3A=";
 
   meta = with lib; {
     description = "Tool to visualize dynamic node usage within a cluster";

From 7ed832219968ed77dcbfcb43bf36c044cc76a305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 29 Mar 2023 22:54:42 -0300
Subject: [PATCH 19/40] marwaita: 16.2 -> 17

---
 pkgs/data/themes/marwaita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix
index 42be4e53027e..a16cf43cfe29 100644
--- a/pkgs/data/themes/marwaita/default.nix
+++ b/pkgs/data/themes/marwaita/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "marwaita";
-  version = "16.2";
+  version = "17";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = pname;
     rev = version;
-    sha256 = "sha256-jhcmFrTZgWChNvZofLSQzGvOj/U2UqaQ0Cq5sv4UAxE=";
+    sha256 = "sha256-9yPgcWtk8w2AyOav1sfQFuH8wnX37ho836NgUnQbFRE=";
   };
 
   buildInputs = [

From bf29f6288741a372bfcab3d35268029cc7ad488c Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Wed, 29 Mar 2023 19:04:25 -0700
Subject: [PATCH 20/40] twitter-color-emoji: update description to mention
 "Twemoji"

---
 pkgs/data/fonts/twitter-color-emoji/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix
index a01b02bdfaf0..de14c9213f88 100644
--- a/pkgs/data/fonts/twitter-color-emoji/default.nix
+++ b/pkgs/data/fonts/twitter-color-emoji/default.nix
@@ -94,9 +94,8 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Color emoji font with a flat visual style, designed and used by Twitter";
     longDescription = ''
-      A bitmap color emoji font built from the Twitter Emoji for
-      Everyone artwork with support for ZWJ, skin tone diversity and country
-      flags.
+      A bitmap color emoji font built from Twitter's Twemoji emoji set
+      with support for ZWJ, skin tone diversity and country flags.
 
       This font uses Google’s CBDT format making it work on Android and Linux graphical stack.
     '';

From 81cef56db49e30363e50929c030444d86a0591d3 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 29 Mar 2023 22:38:44 -0400
Subject: [PATCH 21/40] cargo-zigbuild: 0.16.4 -> 0.16.5

Diff: https://github.com/messense/cargo-zigbuild/compare/v0.16.4...v0.16.5

Changelog: https://github.com/messense/cargo-zigbuild/releases/tag/v0.16.5
---
 pkgs/development/tools/rust/cargo-zigbuild/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
index 5595b4dbae41..9ae762a7d733 100644
--- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix
+++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-zigbuild";
-  version = "0.16.4";
+  version = "0.16.5";
 
   src = fetchFromGitHub {
     owner = "messense";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-95cmmYHRS9BS+CtVE/sV2dwmoAk1EKJjX7NulKRuPLs=";
+    sha256 = "sha256-KyfwH2zdKUUazIZoea8XVOo+vGbPrx5x00IceUuAPXM=";
   };
 
-  cargoSha256 = "sha256-5zdakF/6pDNWcAw8IXCe4Jl246V/Jdto1FPBFkKy6gg=";
+  cargoSha256 = "sha256-z+NTfF+7zbfRt5/uvno4Z2hA6onVBWKR6Tje2KClkc0=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 5922b34a40ab81dd29532872ee81ad784687fa57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Mar 2023 03:21:28 +0000
Subject: [PATCH 22/40] xmrig: 6.19.0 -> 6.19.1

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

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 05f5b3139026..d48c7bd663e7 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -15,13 +15,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "xmrig";
-  version = "6.19.0";
+  version = "6.19.1";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    hash = "sha256-pMI5SqAa9jauwWvc3JpyWQa+pQvntbTrta1p0qjBaoM=";
+    hash = "sha256-m8ot/IbpxdzHOyJymzZ7MWt4p78GTUuTjYZ9P1oGpWI=";
   };
 
   patches = [

From f3dbd5d4f9d3629ccdd27eaa29a28bc6f1c549b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Mar 2023 03:37:07 +0000
Subject: [PATCH 23/40] cargo-chef: 0.1.51 -> 0.1.52

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

diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix
index 7ad698530ec4..a6ac5c722792 100644
--- a/pkgs/development/tools/rust/cargo-chef/default.nix
+++ b/pkgs/development/tools/rust/cargo-chef/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-chef";
-  version = "0.1.51";
+  version = "0.1.52";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-K9oryItevSABbklaX5KKvKHuebFX8B0AgnizlpDhM5o=";
+    sha256 = "sha256-eUFQT2zYABRtTqWxMi+AyU1ZHdt8+B1nMC0Sz6IK6+w=";
   };
 
-  cargoHash = "sha256-KRhgYN8YMfotjkWAYP9RITbH9hudkakpWk53YZe9+Ks=";
+  cargoHash = "sha256-uzuITRUvAOsuFaq+dkO8tRyozwUt4xB/3BP3mNCxr2g=";
 
   meta = with lib; {
     description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching";

From dbeb3f3c0790b18df355b342b3f79e5c7c8e160c Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <appleprincess@appleprincess.io>
Date: Thu, 30 Mar 2023 04:36:54 +0000
Subject: [PATCH 24/40] exploitdb: 2023-03-29 -> 2023-03-30

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

diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index 2e32de5d3c28..be2c7553b796 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2023-03-29";
+  version = "2023-03-30";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-qUBD5ZOkOHGDoST/xUfp508qOA40WZwvdONgXvQqLBY=";
+    hash = "sha256-uaVuWU56EC+UdVR5GbKeUMVuxhsg5tDsXBXxaLtdG+w=";
   };
 
   nativeBuildInputs = [

From f5d36a2ba4d311efffa9dc648c885218429a0471 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Mar 2023 04:56:09 +0000
Subject: [PATCH 25/40] automatic-timezoned: 1.0.75 -> 1.0.78

---
 pkgs/tools/system/automatic-timezoned/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix
index 88c1bc15b831..159e32e7fd35 100644
--- a/pkgs/tools/system/automatic-timezoned/default.nix
+++ b/pkgs/tools/system/automatic-timezoned/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "automatic-timezoned";
-  version = "1.0.75";
+  version = "1.0.78";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-soEVET3aVK77UJjhXq/cwK9QWAJWQu5TEjyHEKfqKeY=";
+    sha256 = "sha256-dYRg2WhPpNL20IrpWK2KuzVSBd/8Mq+CHvtp/RRAQqA=";
   };
 
-  cargoHash = "sha256-xux+8hix2FzZqxOmos1g0SAcVVajJUCO9qGl0LNtOlk=";
+  cargoHash = "sha256-5x8DXojoPN4qFxGWrtD2ieSkkwmnKdw85JsnpvmFxRM=";
 
   meta = with lib; {
     description = "Automatically update system timezone based on location";

From d391265d683ee2459d7d7da1b17c31f240ce5de3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Mar 2023 06:08:25 +0000
Subject: [PATCH 26/40] python310Packages.google-cloud-trace: 1.11.0 -> 1.11.1

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

diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix
index f21dd08b0f80..5cabd25b9af1 100644
--- a/pkgs/development/python-modules/google-cloud-trace/default.nix
+++ b/pkgs/development/python-modules/google-cloud-trace/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-trace";
-  version = "1.11.0";
+  version = "1.11.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-i3jUbzivzXG9bIM06ZKG9olZubBOuCWz5kk5yPZRv4k=";
+    hash = "sha256-twaJlx/2W1BQCWZMTQbZOp74oFecL2vwZkAxK/XwE8E=";
   };
 
   propagatedBuildInputs = [

From 0d002e556270a804bd1e62b7624772aff3b643c2 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 30 Mar 2023 09:48:18 +0300
Subject: [PATCH 27/40] psol: refactor

---
 pkgs/development/libraries/psol/default.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/development/libraries/psol/default.nix
index 6bbe426fb544..b6b9d0bac513 100644
--- a/pkgs/development/libraries/psol/default.nix
+++ b/pkgs/development/libraries/psol/default.nix
@@ -1,11 +1,22 @@
-{ fetchzip, lib }:
+{ lib, stdenvNoCC, fetchurl }:
 
-fetchzip rec {
+stdenvNoCC.mkDerivation rec {
   pname = "psol";
   version = "1.13.35.2"; # Latest stable, 2018-02-05
 
-  url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz";
-  sha256 = "0xi2srf9gx0x2sz9r45zb35k2n0iv457if1lqzvbanls3f935cmr";
+  src = fetchurl {
+    url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz";
+    hash = "sha256-3zujyPxU4ThF0KHap6bj2YMSbCORKFG7+Lo1vmRqQ08=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    mv include lib -t $out
+
+    runHook postInstall
+  '';
 
   meta = with lib; {
     description = "PageSpeed Optimization Libraries";

From 809ba2e2a6a6615de70e377973a129ec265cf7b3 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 29 Mar 2023 17:32:57 +0200
Subject: [PATCH 28/40] vscode-extensions.github.vscode-github-actions: init at
 0.25.3

---
 .../editors/vscode/extensions/default.nix        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c7e6bfd92a69..4b917a116961 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1256,6 +1256,22 @@ let
         };
       };
 
+      github.vscode-github-actions = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-github-actions";
+          publisher = "github";
+          version = "0.25.3";
+          sha256 = "sha256-0Ag+xXVt+WBfN+7VmWILYU4RsVs+CBDBpMfUTczDCkI=";
+        };
+        meta = {
+          description = "A Visual Studio Code extension for GitHub Actions workflows and runs for github.com hosted repositories";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=github.vscode-github-actions";
+          homepage = "https://github.com/github/vscode-github-actions";
+          license = lib.licenses.mit;
+          maintainers = [ lib.maintainers.drupol ];
+        };
+      };
+
       github.vscode-pull-request-github = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "vscode-pull-request-github";

From 22b9cbf0b3e3ce6d384643e379effecc500d727a Mon Sep 17 00:00:00 2001
From: ChaosAttractor <lostattractor@gmail.com>
Date: Thu, 30 Mar 2023 14:54:01 +0800
Subject: [PATCH 29/40] qq: 3.1.0-9572 -> 3.1.1-11223

---
 .../networking/instant-messengers/qq/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix
index dcfe5424a93c..32d34787d657 100644
--- a/pkgs/applications/networking/instant-messengers/qq/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qq/default.nix
@@ -20,15 +20,15 @@
 }:
 
 let
-  version = "3.1.0-9572";
+  version = "3.1.1-11223";
   srcs = {
     x86_64-linux = fetchurl {
-      url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_amd64.deb";
-      sha256 = "sha256-xqbyyU4JSlYbAkJ/tqLoVPKfQvxYnMySRx7yV1EtDhM=";
+      url = "https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_${version}_amd64.deb";
+      sha256 = "sha256-TBgQ7zV+juB3KSgIIXuvxnYmvnnM/1/wU0EkiopIqvY=";
     };
     aarch64-linux = fetchurl {
-      url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_arm64.deb";
-      sha256 = "sha256-ItZqhV9OmycdfRhlzP2llrzcIZvaiUC/LJiDJ/kNIkE=";
+      url = "https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_${version}_arm64.deb";
+      sha256 = "sha256-1ba/IA/+X/s7jUtIhh3OsBHU7MPggGrASsBPx8euBBs=";
     };
   };
   src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

From 4198fa0f02e4b8c04c6f820fa26ee9f941a5077c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Mar 2023 07:10:55 +0000
Subject: [PATCH 30/40] python310Packages.gdown: 4.6.4 -> 4.7.1

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

diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix
index 6af750b0bd00..363fe2b33397 100644
--- a/pkgs/development/python-modules/gdown/default.nix
+++ b/pkgs/development/python-modules/gdown/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "gdown";
-  version = "4.6.4";
+  version = "4.7.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0zIQsbPXsS/vBda56n8ipRNzmQnKUR1dnSNtxnZmf3k=";
+    hash = "sha256-NH8jdpZ5qvfvpz5WVScPzajKVr5l64Skoh0UOYlUEEU=";
   };
 
   propagatedBuildInputs = [

From 5f0d203e0b6ecc098dc6cdcffc7eeee8ed18647b Mon Sep 17 00:00:00 2001
From: Et7f3 <cadeaudeelie@gmail.com>
Date: Thu, 30 Mar 2023 09:18:45 +0200
Subject: [PATCH 31/40] ocamlPackages.reason-native.qcheck-rely: fix build
 (#223793)

* Revert "Merge pull request #223606 from superherointj/reason-native-qcheck-rely-remove"

This reverts commit 0ffeb65186b6561a0247bf5109f0bbfe33809e01, reversing
changes made to d6054a9d719cbb2a4739c3bd020c80641694f937.

* ocamlPackages.reason-native: bump to 2022-08-31-a0ddab6 + cleanup

* ocamlPackages.reason-native.qcheck-rely: fix build
---
 .../ocaml-modules/reason-native/default.nix   | 13 ++++----
 .../reason-native/qcheck-rely.nix             | 31 +++++++++++++++++++
 .../reason-native/tests/console/default.nix   |  2 +-
 3 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix

diff --git a/pkgs/development/ocaml-modules/reason-native/default.nix b/pkgs/development/ocaml-modules/reason-native/default.nix
index d54a1fd1322b..024783cf6184 100644
--- a/pkgs/development/ocaml-modules/reason-native/default.nix
+++ b/pkgs/development/ocaml-modules/reason-native/default.nix
@@ -1,23 +1,23 @@
-{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native }:
+{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native, fetchpatch }:
 
 let
   generic = (somePath:
     let
       prepkg = import somePath {
-        inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason;
+        inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason fetchpatch;
         inherit (reason-native) console file-context-printer fp pastel rely;
       };
     in
       buildDunePackage
         ({
-          version = "2021-16-16-aec0ac6";
+          version = "2022-08-31-a0ddab6";
           src = fetchFromGitHub {
             owner = "reasonml";
             repo = "reason-native";
-            rev = "aec0ac681be7211b4d092262281689c46deb63e1";
-            sha256 = "sha256-QoyI50MBY3RJBmM1y90n7oXrLmHe0CQxKojv+7YbegE=";
+            rev = "a0ddab6ab25237961e32d8732b0a222ec2372d4a";
+            hash = "sha256-s2N5OFTwIbKXcv05gQRaBMCHO1Mj563yhryPeo8jMh8=";
           };
-          useDune2 = true;
+          duneVersion = "3";
           meta = with lib; {
             description = "Libraries for building and testing native Reason programs";
             downloadPage = "https://github.com/reasonml/reason-native";
@@ -36,6 +36,7 @@ in
     fp = generic ./fp.nix;
     pastel = generic ./pastel.nix;
     pastel-console = generic ./pastel-console.nix;
+    qcheck-rely = generic ./qcheck-rely.nix;
     refmterr = generic ./refmterr.nix;
     rely = generic ./rely.nix;
     rely-junit-reporter = generic ./rely-junit-reporter.nix;
diff --git a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
new file mode 100644
index 000000000000..9d2770def09b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
@@ -0,0 +1,31 @@
+{ qcheck-core, reason, console, rely, fetchpatch, ... }:
+
+{
+  pname = "qcheck-rely";
+
+  nativeBuildInputs = [
+    reason
+  ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/reasonml/reason-native/pull/269/commits/b42d66f5929a11739c13f849939007bf8610888b.patch";
+      hash = "sha256-MMLl3eqF8xQZ2T+sIEuv2WpnGF6FZtatgH5fiF5hpP4=";
+      includes = [
+        "src/qcheck-rely/QCheckRely.re"
+        "src/qcheck-rely/QCheckRely.rei"
+      ];
+    })
+  ];
+
+  propagatedBuildInputs = [
+    qcheck-core
+    console
+    rely
+  ];
+
+  meta = {
+    description = "A library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'";
+    downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix
index e1a995d33c5c..fc7f1891339b 100644
--- a/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix
+++ b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix
@@ -6,7 +6,7 @@ buildDunePackage rec {
 
   src = ./.;
 
-  useDune2 = true;
+  duneVersion = "3";
 
   buildInputs = [
     reason

From 0063dc9ef41243130114f5381304b7de351b2b9a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 30 Mar 2023 09:20:13 +0200
Subject: [PATCH 32/40] =?UTF-8?q?ocamlPackages.bigarray-overlap:=200.2.0?=
 =?UTF-8?q?=20=E2=86=92=200.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigarray-overlap/default.nix              | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix
index 2674369f37e0..78a01b65f9bf 100644
--- a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix
+++ b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix
@@ -1,24 +1,22 @@
-{ lib, buildDunePackage, ocaml, fetchurl
-, bigarray-compat, alcotest, astring, fpath, bos, findlib, pkg-config
+{ lib, buildDunePackage, fetchurl
+, alcotest, pkg-config
 }:
 
 buildDunePackage rec {
   pname = "bigarray-overlap";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchurl {
-    url = "https://github.com/dinosaure/overlap/releases/download/v${version}/bigarray-overlap-v${version}.tbz";
-    sha256 = "1v86avafsbyxjccy0y9gny31s2jzb0kd42v3mhcalklx5f044lcy";
+    url = "https://github.com/dinosaure/overlap/releases/download/v${version}/bigarray-overlap-${version}.tbz";
+    hash = "sha256-L1IKxHAFTjNYg+upJUvyi2Z23bV3U8+1iyLPhK4aZuA=";
   };
 
-  minimumOCamlVersion = "4.07";
-  useDune2 = true;
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
-  propagatedBuildInputs = [ bigarray-compat ];
-
-  nativeBuildInputs = [ findlib pkg-config ];
-  checkInputs = [ alcotest astring fpath bos ];
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  nativeBuildInputs = [ pkg-config ];
+  checkInputs = [ alcotest ];
+  doCheck = true;
 
   meta = with lib; {
     homepage = "https://github.com/dinosaure/overlap";

From 0324f56ae35b9e27153fc94f79989aad0fff0553 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Thu, 30 Mar 2023 09:07:08 +0200
Subject: [PATCH 33/40] cri-o: 1.26.2 -> 1.26.3

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 pkgs/applications/virtualization/cri-o/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 073237f4214d..cd27ceef5ac8 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -15,13 +15,13 @@
 
 buildGoModule rec {
   pname = "cri-o";
-  version = "1.26.2";
+  version = "1.26.3";
 
   src = fetchFromGitHub {
     owner = "cri-o";
     repo = "cri-o";
     rev = "v${version}";
-    sha256 = "sha256-Wo6COdbqRWuGP4qXjiCehDm8FlVjz1nZRouMOxlKocw=";
+    sha256 = "sha256-mWhWL886lZggjow4xd02jbxaVl9PTEG24jiys4N19Lw=";
   };
   vendorSha256 = null;
 

From cf4684729e1e9d3a88af6ba63664f1a8afde07fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Mar 2023 08:06:46 +0000
Subject: [PATCH 34/40] python310Packages.pyswitchbot: 0.37.4 -> 0.37.5

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

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index 5fc08dbb5367..9421d332f57b 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.37.4";
+  version = "0.37.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     rev = "refs/tags/${version}";
-    hash = "sha256-2P7hj0kfKLPyuKk6ouHJtkWCUT3EC1spQTjBQarwpbU=";
+    hash = "sha256-k4uTLiSODjAbwVZjd35RckbDb2DxFCV/Ixo3ErG9FHQ=";
   };
 
   propagatedBuildInputs = [

From 942c79adc7edee72e4c13f4af6d8ee3936aa12cb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 30 Mar 2023 10:07:49 +0200
Subject: [PATCH 35/40] python310Packages.reolink-aio: 0.5.7 -> 0.5.8

Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.5.7...0.5.8

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

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 10a336905baa..1c63cb4e6366 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.5.7";
+  version = "0.5.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     rev = "refs/tags/${version}";
-    hash = "sha256-orNKPm51rOOM49+RUUjI7+gTo3GoQv5h7b/gPFFZBTE=";
+    hash = "sha256-ELAytOxi2wAqt2hbVKFs4+HvJr3V+faWw2leO5bfv9A=";
   };
 
   postPatch = ''

From f89354c12f9824c764036887d0fef905c26a81af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= <theo.zimmermann@telecom-paris.fr>
Date: Thu, 30 Mar 2023 10:03:59 +0200
Subject: [PATCH 36/40] coqPackages_8_13.VST: fix by using compatible version
 of ITree

Co-authored-by: Vincent Laporte <Vincent.Laporte@gmail.com>
---
 pkgs/top-level/coq-packages.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 0b9148d2bb62..87291ca8f3df 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -112,10 +112,12 @@ let
       trakt = callPackage ../development/coq-modules/trakt {};
       Velisarios = callPackage ../development/coq-modules/Velisarios {};
       Verdi = callPackage ../development/coq-modules/Verdi {};
-      VST = callPackage ../development/coq-modules/VST (lib.optionalAttrs
+      VST = callPackage ../development/coq-modules/VST ((lib.optionalAttrs
         (lib.versionAtLeast self.coq.version "8.14") {
           compcert = self.compcert.override { version = "3.11"; };
-        });
+        }) // (lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") {
+          ITree = self.ITree.override { version = "4.0.0"; };
+       }));
       zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {};
       filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self;
     };

From 15c944c31d629b8afb8813f97e90074f166bfe28 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 30 Mar 2023 10:49:46 +0200
Subject: [PATCH 37/40] python310Packages.aliyun-python-sdk-cdn: 3.8.3 -> 3.8.5

Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-cdn/ChangeLog.txt
---
 .../python-modules/aliyun-python-sdk-cdn/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
index aa4edc45fc27..027e41f2266f 100644
--- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
+++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "aliyun-python-sdk-cdn";
-  version = "3.8.3";
+  version = "3.8.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LsB3u35PLI/3PcuNbdgcxRoEFZ5CpyINEJa4Nw64NPA=";
+    hash = "sha256-2bFiOvwbvYy7uw7h0LTX4szSBwgafSYOOixxv+zAYDo=";
   };
 
   propagatedBuildInputs = [

From 527a8e6eede3985478f4c002f6acf049c2820e84 Mon Sep 17 00:00:00 2001
From: Pablo Ovelleiro Corral <mail@pablo.tools>
Date: Thu, 30 Mar 2023 11:08:56 +0200
Subject: [PATCH 38/40] river-luatile: 0.1.1 -> 0.1.2

---
 pkgs/applications/misc/river-luatile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/river-luatile/default.nix b/pkgs/applications/misc/river-luatile/default.nix
index 6d803490564a..86a596be9b6b 100644
--- a/pkgs/applications/misc/river-luatile/default.nix
+++ b/pkgs/applications/misc/river-luatile/default.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "river-luatile";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "MaxVerevkin";
     repo = "river-luatile";
     rev = "v${version}";
-    hash = "sha256-eZgoFbat7X/jh5udlNyIuTheBUCHpaVRbsojYLATO18=";
+    hash = "sha256-flh1zUBranb7w1fQuinHbVRGlVxfl2aKxSwShHFG6tI=";
   };
 
-  cargoHash = "sha256-Vqyt5bL1lVhy/Wxd+zF7Wugvb7dW1N9Kq2TTFSaodnE=";
+  cargoHash = "sha256-9YQxa6folwCJNoEa75InRbK1X7cD4F5QGzeGlfsr/5s=";
 
   nativeBuildInputs = [
     pkg-config

From 25c631cc0e529066726ddbfbfc5e1ccfe7218dee Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Wed, 29 Mar 2023 14:29:05 +0200
Subject: [PATCH 39/40] Add coqPackages.mathcomp-apery

---
 .../coq-modules/mathcomp-apery/default.nix    | 23 +++++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/coq-modules/mathcomp-apery/default.nix

diff --git a/pkgs/development/coq-modules/mathcomp-apery/default.nix b/pkgs/development/coq-modules/mathcomp-apery/default.nix
new file mode 100644
index 000000000000..695116938768
--- /dev/null
+++ b/pkgs/development/coq-modules/mathcomp-apery/default.nix
@@ -0,0 +1,23 @@
+{ coq, mkCoqDerivation, mathcomp, coqeal, mathcomp-real-closed,
+  mathcomp-bigenough, mathcomp-zify, mathcomp-algebra-tactics,
+  lib, version ? null }:
+
+mkCoqDerivation {
+
+  pname = "apery";
+
+  inherit version;
+  defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ]  [
+      { cases = [ (range "8.13" "8.16") (isGe "1.12.0") ]; out = "1.0.2"; }
+    ] null;
+
+  release."1.0.2".sha256 = "sha256-llxyMKYvWUA7fyroG1S/jtpioAoArmarR1edi3cikcY=";
+
+  propagatedBuildInputs = [ mathcomp.field coqeal mathcomp-real-closed
+    mathcomp-bigenough mathcomp-zify mathcomp-algebra-tactics ];
+
+  meta = {
+    description = "A formally verified proof in Coq, by computer algebra, that ζ(3) is irrational";
+    license = lib.licenses.cecill-c;
+  };
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 87291ca8f3df..3aa08807f798 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -77,6 +77,7 @@ let
       mathcomp-character = self.mathcomp.character;
       mathcomp-abel = callPackage ../development/coq-modules/mathcomp-abel {};
       mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis {};
+      mathcomp-apery = callPackage ../development/coq-modules/mathcomp-apery {};
       mathcomp-classical = self.mathcomp-analysis.classical;
       mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {};
       mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {};

From 2fb1078369e96946c4da3baff226a558c127bc78 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Thu, 30 Mar 2023 13:11:46 +0200
Subject: [PATCH 40/40] Put mathcomp packages in alphabetical order

---
 pkgs/top-level/coq-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 3aa08807f798..ca25f9beef52 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -76,16 +76,16 @@ let
       mathcomp-field     = self.mathcomp.field;
       mathcomp-character = self.mathcomp.character;
       mathcomp-abel = callPackage ../development/coq-modules/mathcomp-abel {};
+      mathcomp-algebra-tactics = callPackage ../development/coq-modules/mathcomp-algebra-tactics {};
       mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis {};
       mathcomp-apery = callPackage ../development/coq-modules/mathcomp-apery {};
+      mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {};
       mathcomp-classical = self.mathcomp-analysis.classical;
       mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {};
-      mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {};
       mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {};
+      mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {};
       mathcomp-word = callPackage ../development/coq-modules/mathcomp-word {};
       mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {};
-      mathcomp-algebra-tactics = callPackage ../development/coq-modules/mathcomp-algebra-tactics {};
-      mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {};
       metacoq = callPackage ../development/coq-modules/metacoq { };
       metacoq-template-coq = self.metacoq.template-coq;
       metacoq-pcuic        = self.metacoq.pcuic;