From 56a07ba986de50006d24792615ee8609342c0354 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Tue, 18 Apr 2023 18:05:01 -0400
Subject: [PATCH 01/78] update-python-libraries: escape vars in regexes

---
 .../update-python-libraries/update-python-libraries.py      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
index 14b3ed4f3f1e..42ebd89143ee 100755
--- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
+++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
@@ -65,7 +65,7 @@ def _get_values(attribute, text):
 
     :returns: List of matches.
     """
-    regex = '{}\s+=\s+"(.*)";'.format(attribute)
+    regex = '{}\s+=\s+"(.*)";'.format(re.escape(attribute))
     regex = re.compile(regex)
     values = regex.findall(text)
     return values
@@ -103,9 +103,9 @@ def _get_unique_value(attribute, text):
 def _get_line_and_value(attribute, text, value=None):
     """Match attribute in text. Return the line and the value of the attribute."""
     if value is None:
-        regex = rf'({attribute}\s+=\s+\"(.*)\";)'
+        regex = rf'({re.escape(attribute)}\s+=\s+\"(.*)\";)'
     else:
-        regex = rf'({attribute}\s+=\s+\"({value})\";)'
+        regex = rf'({re.escape(attribute)}\s+=\s+\"({re.escape(value)})\";)'
     regex = re.compile(regex)
     results = regex.findall(text)
     n = len(results)

From 608908ed7a44d8c4bebdd95832b6bdb27d10ab92 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 22 Apr 2023 16:45:13 +0200
Subject: [PATCH 02/78] lit: move to python-modules

---
 pkgs/applications/science/logic/klee/default.nix     |  2 +-
 .../{tools/misc => python-modules}/lit/default.nix   | 12 ++++++++----
 pkgs/top-level/all-packages.nix                      |  2 +-
 pkgs/top-level/python-packages.nix                   |  2 ++
 4 files changed, 12 insertions(+), 6 deletions(-)
 rename pkgs/development/{tools/misc => python-modules}/lit/default.nix (85%)

diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix
index 898e344f2a45..a82d9c51e3be 100644
--- a/pkgs/applications/science/logic/klee/default.nix
+++ b/pkgs/applications/science/logic/klee/default.nix
@@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
     # Should appear BEFORE lit, since lit passes through python rather
     # than the python environment we make.
     kleePython
-    (lit.override { python3 = kleePython; })
+    (lit.override { python = kleePython; })
   ];
 
   cmakeFlags = let
diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/python-modules/lit/default.nix
similarity index 85%
rename from pkgs/development/tools/misc/lit/default.nix
rename to pkgs/development/python-modules/lit/default.nix
index 5a255df46806..b4dee1e20b55 100644
--- a/pkgs/development/tools/misc/lit/default.nix
+++ b/pkgs/development/python-modules/lit/default.nix
@@ -1,16 +1,20 @@
-{ lib, python3 }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+}:
 
-python3.pkgs.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "lit";
   version = "15.0.6";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-S06OQfDmDyutls21HxyQ016ku3FTTsDOP8Di67d9f+k=";
   };
 
   passthru = {
-    python = python3;
+    inherit python;
   };
 
   # Non-standard test suite. Needs custom checkPhase.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab2a07cf481e..84c9d382f3d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18517,7 +18517,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  lit = callPackage ../development/tools/misc/lit { };
+  lit = with python3Packages; toPythonApplication lit;
 
   litecli = callPackage ../development/tools/database/litecli { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d0b350e983bf..428ef9bf5249 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5678,6 +5678,8 @@ self: super: with self; {
     python3 = python;
   });
 
+  lit = callPackage ../development/python-modules/lit { };
+
   littleutils = callPackage ../development/python-modules/littleutils { };
 
   livelossplot = callPackage ../development/python-modules/livelossplot { };

From 8c168726c51e47303eedf7ab782e25d2874ede38 Mon Sep 17 00:00:00 2001
From: Junji Hashimoto <junji.hashimoto@gmail.com>
Date: Wed, 22 Mar 2023 08:37:01 +0900
Subject: [PATCH 03/78] python3Packages.triton-bin: init at 2.0.0

---
 .../python-modules/openai-triton/bin.nix      | 82 +++++++++++++++++++
 .../openai-triton/binary-hashes.nix           | 31 +++++++
 .../python-modules/openai-triton/prefetch.sh  | 40 +++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 155 insertions(+)
 create mode 100644 pkgs/development/python-modules/openai-triton/bin.nix
 create mode 100644 pkgs/development/python-modules/openai-triton/binary-hashes.nix
 create mode 100755 pkgs/development/python-modules/openai-triton/prefetch.sh

diff --git a/pkgs/development/python-modules/openai-triton/bin.nix b/pkgs/development/python-modules/openai-triton/bin.nix
new file mode 100644
index 000000000000..a1a04fcf944b
--- /dev/null
+++ b/pkgs/development/python-modules/openai-triton/bin.nix
@@ -0,0 +1,82 @@
+{ lib
+, stdenv
+, addOpenGLRunpath
+, cudaPackages
+, buildPythonPackage
+, fetchurl
+, isPy38
+, isPy39
+, isPy310
+, isPy311
+, python
+, autoPatchelfHook
+, filelock
+, lit
+, pythonRelaxDepsHook
+, zlib
+}:
+
+buildPythonPackage rec {
+  pname = "triton";
+  version = "2.0.0";
+  format = "wheel";
+
+  src =
+    let pyVerNoDot = lib.replaceStrings [ "." ] [ "" ] python.pythonVersion;
+        unsupported = throw "Unsupported system";
+        srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported;
+    in fetchurl srcs;
+
+  disabled = !(isPy38 || isPy39 || isPy310 || isPy311);
+
+  pythonRemoveDeps = [ "cmake" "torch" ];
+
+  buildInputs = [ zlib ];
+
+  nativeBuildInputs = [
+    pythonRelaxDepsHook # torch and triton refer to each other so this hook is included to mitigate that.
+    autoPatchelfHook
+  ];
+
+  propagatedBuildInputs = [
+    filelock
+    lit
+    zlib
+  ];
+
+  dontStrip = true;
+
+  # If this breaks, consider replacing with "${cuda_nvcc}/bin/ptxas"
+  postFixup = ''
+    chmod +x "$out/${python.sitePackages}/triton/third_party/cuda/bin/ptxas"
+  '' +
+  (let
+    # Bash was getting weird without linting,
+    # but basically upstream contains [cc, ..., "-lcuda", ...]
+    # and we replace it with [..., "-lcuda", "-L/run/opengl-driver/lib", "-L$stubs", ...]
+    old = [ "-lcuda" ];
+    new = [ "-lcuda" "-L${addOpenGLRunpath.driverLink}" "-L${cudaPackages.cuda_cudart}/lib/stubs/" ];
+
+    quote = x: ''"${x}"'';
+    oldStr = lib.concatMapStringsSep ", " quote old;
+    newStr = lib.concatMapStringsSep ", " quote new;
+  in
+    ''
+      substituteInPlace $out/${python.sitePackages}/triton/compiler.py \
+        --replace '${oldStr}' '${newStr}'
+    '');
+
+  meta = with lib; {
+    description = "A language and compiler for custom Deep Learning operations";
+    homepage = "https://github.com/openai/triton/";
+    changelog = "https://github.com/openai/triton/releases/tag/v${version}";
+    # Includes NVIDIA's ptxas, but redistributions of the binary are not limited.
+    # https://docs.nvidia.com/cuda/eula/index.html
+    # triton's license is MIT.
+    # openai-triton-bin includes ptxas binary, therefore unfreeRedistributable is set.
+    license = with licenses; [ unfreeRedistributable mit ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ junjihashimoto ];
+  };
+}
diff --git a/pkgs/development/python-modules/openai-triton/binary-hashes.nix b/pkgs/development/python-modules/openai-triton/binary-hashes.nix
new file mode 100644
index 000000000000..a6baea5942b0
--- /dev/null
+++ b/pkgs/development/python-modules/openai-triton/binary-hashes.nix
@@ -0,0 +1,31 @@
+# Warning: Need to update at the same time as torch-bin
+#
+# Precompiled wheels can be found at:
+# https://download.pytorch.org/whl/torch_stable.html
+
+# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
+
+version : builtins.getAttr version {
+  "2.0.0" = {
+    x86_64-linux-38 = {
+      name = "triton-2.0.0-1-cp38-cp38-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl";
+      hash = "sha256-nUl4KYt0/PWadf5x5TXAkrAjCIkzsvHfkz7DJhXkvu8=";
+    };
+    x86_64-linux-39 = {
+      name = "triton-2.0.0-1-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl";
+      hash = "sha256-dPEYwStDf7LKJeGgR1kXO1F1gvz0x74RkTMWx2QhNlY=";
+    };
+    x86_64-linux-310 = {
+      name = "triton-2.0.0-1-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl";
+      hash = "sha256-OIBu6WY/Sw981keQ6WxXk3QInlj0mqxKZggSGqVeJQU=";
+    };
+    x86_64-linux-311 = {
+      name = "triton-2.0.0-1-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl";
+      hash = "sha256-ImlBx7hZUhnd71mh/bgh6MdEKJoTJBXd1YT6zt60dbE=";
+    };
+  };
+}
diff --git a/pkgs/development/python-modules/openai-triton/prefetch.sh b/pkgs/development/python-modules/openai-triton/prefetch.sh
new file mode 100755
index 000000000000..07e39e176dba
--- /dev/null
+++ b/pkgs/development/python-modules/openai-triton/prefetch.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix-prefetch-scripts
+
+set -eou pipefail
+
+version=$1
+
+linux_bucket="https://download.pytorch.org/whl"
+
+url_and_key_list=(
+  "x86_64-linux-38 $linux_bucket/triton-${version}-1-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp38-cp38-linux_x86_64.whl"
+  "x86_64-linux-39 $linux_bucket/triton-${version}-1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp39-cp39-linux_x86_64.whl"
+  "x86_64-linux-310 $linux_bucket/triton-${version}-1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp310-cp310-linux_x86_64.whl"
+  "x86_64-linux-311 $linux_bucket/triton-${version}-1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp311-cp311-linux_x86_64.whl"
+)
+
+hashfile=binary-hashes-"$version".nix
+echo "  \"$version\" = {" >> $hashfile
+
+for url_and_key in "${url_and_key_list[@]}"; do
+  key=$(echo "$url_and_key" | cut -d' ' -f1)
+  url=$(echo "$url_and_key" | cut -d' ' -f2)
+  name=$(echo "$url_and_key" | cut -d' ' -f3)
+
+  echo "prefetching ${url}..."
+  hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`)
+
+  cat << EOF >> $hashfile
+    $key = {
+      name = "$name";
+      url = "$url";
+      hash = "$hash";
+    };
+EOF
+
+  echo
+done
+
+echo "  };" >> $hashfile
+echo "done."
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 428ef9bf5249..e91ed3e5ae78 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6856,6 +6856,8 @@ self: super: with self; {
 
   openai-triton = callPackage ../development/python-modules/openai-triton { llvmPackages = pkgs.llvmPackages_rocm; };
 
+  openai-triton-bin = callPackage ../development/python-modules/openai-triton/bin.nix { };
+
   openai-whisper = callPackage ../development/python-modules/openai-whisper {
     cudaSupport = pkgs.config.cudaSupport or false;
   };

From ad01be006033b2b59b76e2a7da13690fe9e2621d Mon Sep 17 00:00:00 2001
From: Junji Hashimoto <junji.hashimoto@gmail.com>
Date: Tue, 28 Mar 2023 14:24:24 +0900
Subject: [PATCH 04/78] python3Packages.torch-bin: 1.13.1 -> 2.0.0

---
 pkgs/development/python-modules/torch/bin.nix | 61 +++++++++---
 .../python-modules/torch/binary-hashes.nix    | 94 +++++++++++--------
 .../python-modules/torch/prefetch.sh          |  6 +-
 pkgs/top-level/python-packages.nix            |  4 +-
 4 files changed, 112 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix
index 6847fd7d5889..55b3601ee9bc 100644
--- a/pkgs/development/python-modules/torch/bin.nix
+++ b/pkgs/development/python-modules/torch/bin.nix
@@ -1,26 +1,31 @@
 { lib, stdenv
 , buildPythonPackage
 , fetchurl
-, isPy37
-, isPy38
-, isPy39
-, isPy310
 , python
+, pythonAtLeast
+, pythonOlder
 , addOpenGLRunpath
+, cudaPackages
 , future
 , numpy
+, autoPatchelfHook
 , patchelf
 , pyyaml
 , requests
 , setuptools
 , typing-extensions
+, sympy
+, jinja2
+, networkx
+, filelock
+, openai-triton
 }:
 
 let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "1.13.1";
+  version = "2.0.0";
 in buildPythonPackage {
   inherit version;
 
@@ -29,15 +34,31 @@ in buildPythonPackage {
 
   format = "wheel";
 
-  disabled = !(isPy38 || isPy39 || isPy310);
+  disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12");
 
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
   nativeBuildInputs = [
     addOpenGLRunpath
+    autoPatchelfHook
+    cudaPackages.autoAddOpenGLRunpathHook
     patchelf
   ];
 
+  buildInputs = with cudaPackages; [
+    # $out/${sitePackages}/nvfuser/_C*.so wants libnvToolsExt.so.1 but torch/lib only ships
+    # libnvToolsExt-$hash.so.1
+    cuda_nvtx
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    # This is the hardware-dependent userspace driver that comes from
+    # nvidia_x11 package. It must be deployed at runtime in
+    # /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather
+    # than pinned in runpath
+    "libcuda.so.1"
+  ];
+
   propagatedBuildInputs = [
     future
     numpy
@@ -45,6 +66,12 @@ in buildPythonPackage {
     requests
     setuptools
     typing-extensions
+    sympy
+    jinja2
+    networkx
+    filelock
+  ] ++ lib.optionals stdenv.isx86_64 [
+    openai-triton
   ];
 
   postInstall = ''
@@ -52,14 +79,20 @@ in buildPythonPackage {
     rm -rf $out/bin
   '';
 
-  postFixup = let
-    rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ];
-  in ''
-    find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-      echo "setting rpath for $lib..."
-      patchelf --set-rpath "${rpath}:$out/${python.sitePackages}/torch/lib" "$lib"
-      addOpenGLRunpath "$lib"
-    done
+  postFixup = ''
+    addAutoPatchelfSearchPath "$out/${python.sitePackages}/torch/lib"
+
+    patchelf $out/${python.sitePackages}/torch/lib/libcudnn.so.8 --add-needed libcudnn_cnn_infer.so.8
+
+    pushd $out/${python.sitePackages}/torch/lib || exit 1
+      for LIBNVRTC in ./libnvrtc*
+      do
+        case "$LIBNVRTC" in
+          ./libnvrtc-builtins*) true;;
+          ./libnvrtc*) patchelf "$LIBNVRTC" --add-needed libnvrtc-builtins* ;;
+        esac
+      done
+    popd || exit 1
   '';
 
   # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.
diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix
index 94d7080020be..e5daac6d44ee 100644
--- a/pkgs/development/python-modules/torch/binary-hashes.nix
+++ b/pkgs/development/python-modules/torch/binary-hashes.nix
@@ -6,66 +6,86 @@
 # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
 
 version : builtins.getAttr version {
-  "1.13.1" = {
+  "2.0.0" = {
     x86_64-linux-38 = {
-      name = "torch-1.13.1-cp38-cp38-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
-      hash = "sha256-u/lUbw0Ni1EmPKR5Y3tCaogzX8oANPQs7GPU0y3uBa8=";
+      name = "torch-2.0.0-cp38-cp38-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp38-cp38-linux_x86_64.whl";
+      hash = "sha256-H4766/y7fsOWL9jHw74CxmZu/1OhIEMAanSdZHZWFj4=";
     };
     x86_64-linux-39 = {
-      name = "torch-1.13.1-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp39-cp39-linux_x86_64.whl";
-      hash = "sha256-s6wTng1KCzA8wW9R63cUbsfRTAsecCrWOGE2KPUIavc=";
+      name = "torch-2.0.0-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp39-cp39-linux_x86_64.whl";
+      hash = "sha256-6rl6n+WefjHWVisYb0NecXsd8zMcrcd25sBzIjmp7Tk=";
     };
     x86_64-linux-310 = {
-      name = "torch-1.13.1-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl";
-      hash = "sha256-FMXJ2wnfjPGzlCo0ecd52m4pOoShYtimrHHiveMOMMU=";
+      name = "torch-2.0.0-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp310-cp310-linux_x86_64.whl";
+      hash = "sha256-S2kOK3fyEHNQDGXYu56pZWuMtOlp81c3C7yZKjsHR2Q=";
+    };
+    x86_64-linux-311 = {
+      name = "torch-2.0.0-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp311-cp311-linux_x86_64.whl";
+      hash = "sha256-I4Vz02LFZBE0UQRvZwjDuBWP5rG39sA7cnMyfZVd61Q=";
     };
     x86_64-darwin-38 = {
-      name = "torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl";
-      hash = "sha256-M+Z+6lJuC7uRUSY+ZUF6nvLY+lPL5ijocxAGDJ3PoxI=";
+      name = "torch-2.0.0-cp38-none-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp38-none-macosx_10_9_x86_64.whl";
+      hash = "sha256-zHiMu7vG60yQ5SxVDv0GdYbCaTCSzzZ8E1s0iTpkrng=";
     };
     x86_64-darwin-39 = {
-      name = "torch-1.13.1-cp39-none-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp39-none-macosx_10_9_x86_64.whl";
-      hash = "sha256-aTB5HvqHV8tpdK9z1Jlra1DFkogqMkuPsFicapui3a8=";
+      name = "torch-2.0.0-cp39-none-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp39-none-macosx_10_9_x86_64.whl";
+      hash = "sha256-bguXvrA3oWVmnDElkfJCOC6RCaJA4gBU1aV4LZI2ytA=";
     };
     x86_64-darwin-310 = {
-      name = "torch-1.13.1-cp310-none-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp310-none-macosx_10_9_x86_64.whl";
-      hash = "sha256-OTpic8gy4EdYEGP7dDNf9QtMVmIXAZzGrOMYzXnrBWY=";
+      name = "torch-2.0.0-cp310-none-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp310-none-macosx_10_9_x86_64.whl";
+      hash = "sha256-zptaSb1RPf95UKWgfW4mWU3VGYnO4FujiLA+jjZv1dU=";
+    };
+    x86_64-darwin-311 = {
+      name = "torch-2.0.0-cp311-none-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp311-none-macosx_10_9_x86_64.whl";
+      hash = "sha256-AYWGIPJfJeep7EtUf/OOXifJLTjsTMupz7+zHXBx7Zw=";
     };
     aarch64-darwin-38 = {
-      name = "torch-1.13.1-cp38-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp38-none-macosx_11_0_arm64.whl";
-      hash = "sha256-7usgTTD9QK9qLYCHm0an77489Dzb64g43U89EmzJCys=";
+      name = "torch-2.0.0-cp38-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp38-none-macosx_11_0_arm64.whl";
+      hash = "sha256-0pJkDw/XK3oxsqbjtjXrUGX8vt1EePnK0aHnqeyGHTU=";
     };
     aarch64-darwin-39 = {
-      name = "torch-1.13.1-cp39-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp39-none-macosx_11_0_arm64.whl";
-      hash = "sha256-4N+QKnx91seVaYUy7llwzomGcmJWNdiF6t6ZduWgSUk=";
+      name = "torch-2.0.0-cp39-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp39-none-macosx_11_0_arm64.whl";
+      hash = "sha256-KXpJGa/xwPmKWOvpaSAPcTUKHU1PmG2/1gwC/854Dpk=";
     };
     aarch64-darwin-310 = {
-      name = "torch-1.13.1-cp310-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp310-none-macosx_11_0_arm64.whl";
-      hash = "sha256-ASKAaxEblJ0h+hpfl2TR/S/MSkfLf4/5FCBP1Px1LtU=";
+      name = "torch-2.0.0-cp310-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp310-none-macosx_11_0_arm64.whl";
+      hash = "sha256-U+HDPGiWWDzbmlg2k+IumSZkRMSkM5Ld3FYmQNOeVCs=";
+    };
+    aarch64-darwin-311 = {
+      name = "torch-2.0.0-cp311-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp311-none-macosx_11_0_arm64.whl";
+      hash = "sha256-mi5TtXg+9YlqavM4s214LyjoPI3fwqxEtnsGbZ129Jg=";
     };
     aarch64-linux-38 = {
-      name = "torch-1.13.1-cp38-cp38-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torch-1.13.1-cp38-cp38-manylinux2014_aarch64.whl";
-      hash = "sha256-34Q0sGlenOuMxwZQr8ExDYupSebbKgUl3dnDsrGB5f4=";
+      name = "torch-2.0.0-cp38-cp38-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torch-2.0.0-cp38-cp38-manylinux2014_aarch64.whl";
+      hash = "sha256-EbA4T+PBjAG4/FmS5w/FGc3mXkTFHMh74YOMGAPa9C8=";
     };
     aarch64-linux-39 = {
-      name = "torch-1.13.1-cp39-cp39-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torch-1.13.1-cp39-cp39-manylinux2014_aarch64.whl";
-      hash = "sha256-LDWBo/2B6x8PIpl83f/qVp/qU7r6NyssBHHbNzsmqvw=";
+      name = "torch-2.0.0-cp39-cp39-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torch-2.0.0-cp39-cp39-manylinux2014_aarch64.whl";
+      hash = "sha256-qDsmvWrjb79f7j1Wlz2YFuIALoo7fZIFUxFnwoqqOKc=";
     };
     aarch64-linux-310 = {
-      name = "torch-1.13.1-cp310-cp310-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torch-1.13.1-cp310-cp310-manylinux2014_aarch64.whl";
-      hash = "sha256-2f54XTdfLial1eul3pH4nmo75dEe+0l+dnBf35P6PC4=";
+      name = "torch-2.0.0-cp310-cp310-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torch-2.0.0-cp310-cp310-manylinux2014_aarch64.whl";
+      hash = "sha256-nwH+H2Jj8xvQThdXlG/WOtUxrjfyi7Lb9m9cgm7gifQ=";
+    };
+    aarch64-linux-311 = {
+      name = "torch-2.0.0-cp311-cp311-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torch-2.0.0-cp311-cp311-manylinux2014_aarch64.whl";
+      hash = "sha256-1Dmuw0nJjxKBnoVkuMVACORhPdRChYKvDm4UwkyoWHA=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torch/prefetch.sh b/pkgs/development/python-modules/torch/prefetch.sh
index 4963bd8012c0..be3e4ec755bd 100755
--- a/pkgs/development/python-modules/torch/prefetch.sh
+++ b/pkgs/development/python-modules/torch/prefetch.sh
@@ -5,7 +5,7 @@ set -eou pipefail
 
 version=$1
 
-linux_cuda_version="cu117"
+linux_cuda_version="cu118"
 linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
 linux_cpu_bucket="https://download.pytorch.org/whl"
 darwin_bucket="https://download.pytorch.org/whl/cpu"
@@ -14,15 +14,19 @@ url_and_key_list=(
   "x86_64-linux-38 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl"
   "x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"
   "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl"
+  "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl"
   "x86_64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_10_9_x86_64.whl torch-${version}-cp38-none-macosx_10_9_x86_64.whl"
   "x86_64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_10_9_x86_64.whl torch-${version}-cp39-none-macosx_10_9_x86_64.whl"
   "x86_64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_10_9_x86_64.whl torch-${version}-cp310-none-macosx_10_9_x86_64.whl"
+  "x86_64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_10_9_x86_64.whl torch-${version}-cp311-none-macosx_10_9_x86_64.whl"
   "aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl"
   "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl"
   "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl"
+  "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl"
   "aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux2014_aarch64.whl"
   "aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux2014_aarch64.whl"
   "aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux2014_aarch64.whl"
+  "aarch64-linux-311 $linux_cpu_bucket/torch-${version}-cp311-cp311-manylinux2014_aarch64.whl torch-${version}-cp311-cp311-manylinux2014_aarch64.whl"
 )
 
 hashfile="binary-hashes-$version.nix"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e91ed3e5ae78..db47b5470b12 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11936,7 +11936,9 @@ self: super: with self; {
     inherit (pkgs.llvmPackages_rocm) openmp;
   };
 
-  torch-bin = callPackage ../development/python-modules/torch/bin.nix { };
+  torch-bin = callPackage ../development/python-modules/torch/bin.nix {
+    openai-triton = self.openai-triton-bin;
+  };
 
   torchWithCuda = self.torch.override {
     magma = pkgs.magma-cuda;

From b5a3a12884b548b7d1e037c3e7440842292fefd3 Mon Sep 17 00:00:00 2001
From: Junji Hashimoto <junji.hashimoto@gmail.com>
Date: Tue, 28 Mar 2023 14:25:20 +0900
Subject: [PATCH 05/78] python3Packages.torch-bin: update license

---
 pkgs/development/python-modules/torch/bin.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix
index 55b3601ee9bc..bac2169332f8 100644
--- a/pkgs/development/python-modules/torch/bin.nix
+++ b/pkgs/development/python-modules/torch/bin.nix
@@ -107,7 +107,9 @@ in buildPythonPackage {
     # Includes CUDA and Intel MKL, but redistributions of the binary are not limited.
     # https://docs.nvidia.com/cuda/eula/index.html
     # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
-    license = licenses.bsd3;
+    # torch's license is BSD3.
+    # torch-bin includes CUDA and MKL binaries, therefore unfreeRedistributable is set.
+    license = with licenses; [ bsd3 issl unfreeRedistributable ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
     hydraPlatforms = []; # output size 3.2G on 1.11.0

From 64fb4575df7cee802f62c08a26709574cb991ca1 Mon Sep 17 00:00:00 2001
From: Junji Hashimoto <junji.hashimoto@gmail.com>
Date: Fri, 17 Mar 2023 21:44:43 +0900
Subject: [PATCH 06/78] python3Packages.torchaudio-bin: 0.13.1 -> 2.0.1

---
 .../python-modules/torchaudio/bin.nix         | 48 ++++++----
 .../torchaudio/binary-hashes.nix              | 94 +++++++++++--------
 .../python-modules/torchaudio/prefetch.sh     | 14 ++-
 3 files changed, 97 insertions(+), 59 deletions(-)

diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index f74ac8082388..13c58c2326bb 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -1,47 +1,61 @@
 { lib
 , stdenv
+, addOpenGLRunpath
+, autoPatchelfHook
 , buildPythonPackage
+, cudaPackages
 , fetchurl
-, isPy37
-, isPy38
-, isPy39
-, isPy310
+, ffmpeg_4
+, pythonAtLeast
+, pythonOlder
 , python
 , torch-bin
-, pythonOlder
-, pythonAtLeast
 }:
 
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "0.13.1";
+  version = "2.0.1";
   format = "wheel";
 
   src =
     let pyVerNoDot = lib.replaceStrings [ "." ] [ "" ] python.pythonVersion;
         unsupported = throw "Unsupported system";
         srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported;
-    in fetchurl srcs;
+    in
+    fetchurl srcs;
 
-  disabled = !(isPy38 || isPy39 || isPy310);
+  disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12");
+
+  buildInputs = with cudaPackages; [
+    # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libcudart.so.11.0 but torch/lib only ships
+    # libcudart.$hash.so.11.0
+    cuda_cudart
+
+    # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libnvToolsExt.so.2 but torch/lib only ships
+    # libnvToolsExt-$hash.so.1
+    cuda_nvtx
+
+    ffmpeg_4.lib
+  ];
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    addOpenGLRunpath
+  ];
 
   propagatedBuildInputs = [
     torch-bin
   ];
 
+  preInstall = ''
+    addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch"
+  '';
+
   # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.
   dontStrip = true;
 
   pythonImportsCheck = [ "torchaudio" ];
 
-  postFixup = ''
-    # Note: after patchelf'ing, libcudart can still not be found. However, this should
-    #       not be an issue, because PyTorch is loaded before torchvision and brings
-    #       in the necessary symbols.
-    patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:${torch-bin}/${python.sitePackages}/torch/lib:" \
-      "$out/${python.sitePackages}/torchaudio/_torchaudio.so"
-  '';
-
   meta = with lib; {
     description = "PyTorch audio library";
     homepage = "https://pytorch.org/";
diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
index c6a903457c01..7578dc23b4cb 100644
--- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
@@ -6,66 +6,86 @@
 # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
 
 version : builtins.getAttr version {
-  "0.13.1" = {
+  "2.0.1" = {
     x86_64-linux-38 = {
-      name = "torchaudio-0.13.1-cp38-cp38-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
-      hash = "sha256-QCY7LUVyj7/x2zOBJyvkKXD/blj5KZSqWHKlvUx+cmQ=";
+      name = "torchaudio-2.0.1-cp38-cp38-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.1%2Bcu118-cp38-cp38-linux_x86_64.whl";
+      hash = "sha256-lLDpx2ypHR4CiYlZIPv+jBF0ZNdXtktd+tsTCM+ZBPk=";
     };
     x86_64-linux-39 = {
-      name = "torchaudio-0.13.1-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp39-cp39-linux_x86_64.whl";
-      hash = "sha256-Zbs2FdQz1bkwrNwQNu+xJAR9VxfbpN63D0GSkNlC+DY=";
+      name = "torchaudio-2.0.1-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.1%2Bcu118-cp39-cp39-linux_x86_64.whl";
+      hash = "sha256-Bws4SWlhQr49keCycHbaHz+MtDKrzONc2VbRkfwNgYc=";
     };
     x86_64-linux-310 = {
-      name = "torchaudio-0.13.1-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl";
-      hash = "sha256-k/RVSktT+WmNAiJJA8kjwSpsIrPJQtz8IXm1gdjzcUY=";
+      name = "torchaudio-2.0.1-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.1%2Bcu118-cp310-cp310-linux_x86_64.whl";
+      hash = "sha256-GcTvkBIyTE+4DqZpNFUbeAfZcUjChTji6rr+FqtQ6Rw=";
+    };
+    x86_64-linux-311 = {
+      name = "torchaudio-2.0.1-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.1%2Bcu118-cp311-cp311-linux_x86_64.whl";
+      hash = "sha256-GicitvZleO3FY+d7TMB6ItZjorte5cneJTlmGpihTbk=";
     };
     x86_64-darwin-38 = {
-      name = "torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl";
-      hash = "sha256-Qs5cZtMEvCzWgziRa4Ij4yLgmoTcvZIogU7za8R3o3s=";
+      name = "torchaudio-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl";
+      hash = "sha256-AiyhuqS7gZt4NDvUe1f/bcb5/Bn6TvJplGqt9+Yts8A=";
     };
     x86_64-darwin-39 = {
-      name = "torchaudio-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl";
-      hash = "sha256-nSFwVA3jKuAxqrOTYSmGjoluoEFhe21mkt3mqi37CiM=";
+      name = "torchaudio-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl";
+      hash = "sha256-48bI+eqfDi33oLk3Ww3PlVkG44/BL6tUK3KoYVZK+Oc=";
     };
     x86_64-darwin-310 = {
-      name = "torchaudio-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl";
-      hash = "sha256-Xg89xmmVBlITZCZnBOa/idDQV5/UNdEsXC9YWNUt5Po=";
+      name = "torchaudio-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl";
+      hash = "sha256-tdIeu7VecEDUGNUGKw6IL5Zg1otHezj9Q2+mySzLtSo=";
+    };
+    x86_64-darwin-311 = {
+      name = "torchaudio-2.0.1-cp311-cp311-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp311-cp311-macosx_10_9_x86_64.whl";
+      hash = "sha256-4qBHZ1STwKolj+xiHvQOiwGr49jbyHIVLktZmEGKo8U=";
     };
     aarch64-darwin-38 = {
-      name = "torchaudio-0.13.1-cp38-cp38-macosx_12_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp38-cp38-macosx_12_0_arm64.whl";
-      hash = "sha256-sJOz52YchRaOyd3iz5c0WWXqCTHT0qfni9QJIh5taZg=";
+      name = "torchaudio-2.0.1-cp38-cp38-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp38-cp38-macosx_11_0_arm64.whl";
+      hash = "sha256-oVOtXNti3o7J/RNgoNCAu6851XiuBOeI2yEVceZ1t+A=";
     };
     aarch64-darwin-39 = {
-      name = "torchaudio-0.13.1-cp39-cp39-macosx_12_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp39-cp39-macosx_12_0_arm64.whl";
-      hash = "sha256-kfz79HAAQC0Sv/JiTmIgoP07jKjub/Ue31lF7DmrCn8=";
+      name = "torchaudio-2.0.1-cp39-cp39-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp39-cp39-macosx_11_0_arm64.whl";
+      hash = "sha256-HQzwd5ozTsGGHp+ii862amM8Quj2szIuLjf/nyDQroE=";
     };
     aarch64-darwin-310 = {
-      name = "torchaudio-0.13.1-cp310-cp310-macosx_12_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp310-cp310-macosx_12_0_arm64.whl";
-      hash = "sha256-7HKhfU0heIKed4BoKZm1Nc9X/hYNDCCw1r3BrRqHxN0=";
+      name = "torchaudio-2.0.1-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-bbzZOynXGi9QDzajTqXkZ/UQ93PahTIgmOa92MncmUg=";
+    };
+    aarch64-darwin-311 = {
+      name = "torchaudio-2.0.1-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-kaKOWH9wigMyDt28xKfdGtcVCz1IRrbBVX2FzImo0Gw=";
     };
     aarch64-linux-38 = {
-      name = "torchaudio-0.13.1-cp38-cp38-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp38-cp38-manylinux2014_aarch64.whl";
-      hash = "sha256-PEi8/wDq6BgPh/WNHJ5+n9jEy36z6ogXk1+2BI0VK8c=";
+      name = "torchaudio-2.0.1-cp38-cp38-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torchaudio-2.0.1-cp38-cp38-manylinux2014_aarch64.whl";
+      hash = "sha256-qlsjzsMVcWRKpn1s1QGzl/QmVX3F8y6NtuzbJ7GUClg=";
     };
     aarch64-linux-39 = {
-      name = "torchaudio-0.13.1-cp39-cp39-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp39-cp39-manylinux2014_aarch64.whl";
-      hash = "sha256-MCOutcGRBHvvFoGjdBv/1KIWS1imTK0k3TfaXhrC0fE=";
+      name = "torchaudio-2.0.1-cp39-cp39-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torchaudio-2.0.1-cp39-cp39-manylinux2014_aarch64.whl";
+      hash = "sha256-ry16SysebkDnnA7d0Qezu0MVkdBJTX+X7ffBhkN7XBo=";
     };
     aarch64-linux-310 = {
-      name = "torchaudio-0.13.1-cp310-cp310-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp310-cp310-manylinux2014_aarch64.whl";
-      hash = "sha256-LkdWLNzdR8uO2Go88FO3BnzJ6INA9FUK5z15DdvBLyE=";
+      name = "torchaudio-2.0.1-cp310-cp310-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torchaudio-2.0.1-cp310-cp310-manylinux2014_aarch64.whl";
+      hash = "sha256-6f/6Y0Gbxl7Pg5Vo3QS+O6VibF9bJsmlZsA4KtKXcck=";
+    };
+    aarch64-linux-311 = {
+      name = "torchaudio-2.0.1-cp311-cp311-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torchaudio-2.0.1-cp311-cp311-manylinux2014_aarch64.whl";
+      hash = "sha256-MkQuKxHfwJxMW2zEuSTT84wslGPuKOSGUi+fSLCbf7c=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh
index dad401d0d136..0777d3f2b56a 100755
--- a/pkgs/development/python-modules/torchaudio/prefetch.sh
+++ b/pkgs/development/python-modules/torchaudio/prefetch.sh
@@ -5,24 +5,28 @@ set -eou pipefail
 
 version=$1
 
-linux_cuda_version="cu117"
+linux_cuda_version="cu118"
 linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
 linux_cpu_bucket="https://download.pytorch.org/whl"
-darwin_bucket="https://download.pytorch.org/whl"
+darwin_bucket="https://download.pytorch.org/whl/cpu"
 
 url_and_key_list=(
   "x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl"
   "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl"
   "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl"
+  "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl"
   "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl"
   "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl"
   "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl"
-  "aarch64-darwin-38 $darwin_bucket/cpu/torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl"
-  "aarch64-darwin-39 $darwin_bucket/cpu/torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl"
-  "aarch64-darwin-310 $darwin_bucket/cpu/torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl"
+  "x86_64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl"
+  "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl"
+  "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl"
+  "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl"
+  "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl"
   "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl"
   "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl"
   "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl"
+  "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl"
 )
 
 hashfile=binary-hashes-"$version".nix

From dc71f104174b94927e723bcb93544fb4dc5dc0d3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 22 Apr 2023 13:43:52 +0200
Subject: [PATCH 07/78] python3Packages.torchvision-bin: 0.14.1 -> 0.15.1

---
 .../python-modules/torchvision/bin.nix        | 33 ++++----
 .../torchvision/binary-hashes.nix             | 79 ++++++++++---------
 .../python-modules/torchvision/prefetch.sh    | 15 ++--
 3 files changed, 67 insertions(+), 60 deletions(-)

diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix
index 3c7aa4bb6248..1c3ea77c1df4 100644
--- a/pkgs/development/python-modules/torchvision/bin.nix
+++ b/pkgs/development/python-modules/torchvision/bin.nix
@@ -1,12 +1,12 @@
 { lib
 , stdenv
+, addOpenGLRunpath
+, autoPatchelfHook
 , buildPythonPackage
+, cudaPackages
 , fetchurl
-, isPy37
-, isPy38
-, isPy39
-, isPy310
-, patchelf
+, pythonAtLeast
+, pythonOlder
 , pillow
 , python
 , torch-bin
@@ -16,7 +16,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "0.14.1";
+  version = "0.15.1";
 in buildPythonPackage {
   inherit version;
 
@@ -26,10 +26,17 @@ in buildPythonPackage {
 
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
-  disabled = !(isPy37 || isPy38 || isPy39 || isPy310);
+  disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12");
+
+  buildInputs = with cudaPackages; [
+    # $out/${sitePackages}/torchvision/_C.so wants libcudart.so.11.0 but torchvision.libs only ships
+    # libcudart.$hash.so.11.0
+    cuda_cudart
+  ];
 
   nativeBuildInputs = [
-    patchelf
+    autoPatchelfHook
+    addOpenGLRunpath
   ];
 
   propagatedBuildInputs = [
@@ -42,14 +49,8 @@ in buildPythonPackage {
 
   pythonImportsCheck = [ "torchvision" ];
 
-  postFixup = let
-    rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ];
-  in ''
-    # Note: after patchelf'ing, libcudart can still not be found. However, this should
-    #       not be an issue, because PyTorch is loaded before torchvision and brings
-    #       in the necessary symbols.
-    patchelf --set-rpath "${rpath}:${torch-bin}/${python.sitePackages}/torch/lib:" \
-      "$out/${python.sitePackages}/torchvision/_C.so"
+  preInstall = ''
+    addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix
index 282154f89d33..0ad76d21ecc0 100644
--- a/pkgs/development/python-modules/torchvision/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix
@@ -6,61 +6,66 @@
 # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
 
 version : builtins.getAttr version {
-  "0.14.1" = {
-    x86_64-linux-37 = {
-      name = "torchvision-0.14.1-cp37-cp37m-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp37-cp37m-linux_x86_64.whl";
-      hash = "sha256-vOOhWqGuclcvjNKOSdHsGtjwhm+7ZhxzaNnBKF9psi4=";
-    };
+  "0.15.1" = {
     x86_64-linux-38 = {
-      name = "torchvision-0.14.1-cp38-cp38-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
-      hash = "sha256-dAk4UTnOiGTOssgv/OM46+FaVRk/S4DEKm0PnP14Fik=";
+      name = "torchvision-0.15.1-cp38-cp38-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.1%2Bcu118-cp38-cp38-linux_x86_64.whl";
+      hash = "sha256-kQRzDWVavygsKEXUzUcrsIk288hQg6KK79dq2e6v8mE=";
     };
     x86_64-linux-39 = {
-      name = "torchvision-0.14.1-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp39-cp39-linux_x86_64.whl";
-      hash = "sha256-iomg7gB9fNulO9VkJth5UGCgZLiRm2GsOeAOOZ3ta+I=";
+      name = "torchvision-0.15.1-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.1%2Bcu118-cp39-cp39-linux_x86_64.whl";
+      hash = "sha256-Xs4nnI9SH49jc7+XHyrcY6lh1pTErO1TjfgSlCEO5Lo=";
     };
     x86_64-linux-310 = {
-      name = "torchvision-0.14.1-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp310-cp310-linux_x86_64.whl";
-      hash = "sha256-g9JxpTA5KBS4x/aTgihcrHx9p5uPXcxrz1bGKFR7zlM=";
+      name = "torchvision-0.15.1-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.1%2Bcu118-cp310-cp310-linux_x86_64.whl";
+      hash = "sha256-mmefo3p0EBjIBCNGk7usPUh/s91V7nP2szZ3sXfIwHo=";
     };
-    x86_64-darwin-37 = {
-      name = "torchvision-0.14.1-cp37-cp37m-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp37-cp37m-macosx_10_9_x86_64.whl";
-      hash = "sha256-+3p5P9M84avsJLQneEGaP7HjFZ19/LJ0o8qPuMvECNw=";
+    x86_64-linux-311 = {
+      name = "torchvision-0.15.1-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.1%2Bcu118-cp311-cp311-linux_x86_64.whl";
+      hash = "sha256-nO0skO54K7tBWw3mW8wQ1P6BETGGRnm3B0QsnZ6Kqv0=";
     };
     x86_64-darwin-38 = {
-      name = "torchvision-0.14.1-cp38-cp38-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp38-cp38-macosx_10_9_x86_64.whl";
-      hash = "sha256-aO0DNZ3NPanNIbirlNohFY34pqDFutC/SkLw5EjSjLM=";
+      name = "torchvision-0.15.1-cp38-cp38-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp38-cp38-macosx_10_9_x86_64.whl";
+      hash = "sha256-5YYbqu6ofRm2/X0THhGkpr0XvhQjTEkKJZuzYHdelSA=";
     };
     x86_64-darwin-39 = {
-      name = "torchvision-0.14.1-cp39-cp39-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp39-cp39-macosx_10_9_x86_64.whl";
-      hash = "sha256-xedE9W5fW0Ut61/A8/K6TS8AYS0U2NoNvv6o8JrHaQs=";
+      name = "torchvision-0.15.1-cp39-cp39-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp39-cp39-macosx_10_9_x86_64.whl";
+      hash = "sha256-Hf3sfH35ZzMLujNBp4HgwEfU4BY+ZxZKmRhQA2K/fZE=";
     };
     x86_64-darwin-310 = {
-      name = "torchvision-0.14.1-cp310-cp310-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp310-cp310-macosx_10_9_x86_64.whl";
-      hash = "sha256-7rBd2d069UKP7lJUAHWdr42o5MrsRd3WkIz7NlcfZDM=";
+      name = "torchvision-0.15.1-cp310-cp310-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp310-cp310-macosx_10_9_x86_64.whl";
+      hash = "sha256-vBDUjppg0AbQwbSN6ofx7Jtj2FZzfVkvfFxEzYfz9Lc=";
+    };
+    x86_64-darwin-311 = {
+      name = "torchvision-0.15.1-cp311-cp311-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp311-cp311-macosx_10_9_x86_64.whl";
+      hash = "sha256-l7kOs7czOjHQScTM/RBkNh6EkYdJWdOPRmr2TWdBjO8=";
     };
     aarch64-darwin-38 = {
-      name = "torchvision-0.14.1-cp38-cp38-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.1-cp38-cp38-macosx_11_0_arm64.whl";
-      hash = "sha256-MPzw6f5X1KxM5kJmWaV9zhmWN8y2xwvhEoZw8XdpJiQ=";
+      name = "torchvision-0.15.1-cp38-cp38-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp38-cp38-macosx_11_0_arm64.whl";
+      hash = "sha256-5xTzYrnYIXz01oUJtnnryd3xKM/oD2wd744/ihhGbnU=";
     };
     aarch64-darwin-39 = {
-      name = "torchvision-0.14.1-cp39-cp39-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.1-cp39-cp39-macosx_11_0_arm64.whl";
-      hash = "sha256-dYsg0HnoELR0C9YNHrFuSdqDDjNg+b43nrF37iIfpdQ=";
+      name = "torchvision-0.15.1-cp39-cp39-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp39-cp39-macosx_11_0_arm64.whl";
+      hash = "sha256-wVNxAYbOwDONT/9BFFmlfdvIUEQ2EjynOz8L3Cb/kYw=";
     };
     aarch64-darwin-310 = {
-      name = "torchvision-0.14.1-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.1-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-jQdm6pKv+nrySOMn3YX3yc/fUaV1MLQyEtThhYVI6dc=";
+      name = "torchvision-0.15.1-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-NwjTQQ/cr2KA41jNqd4qSrBswLTA/ZrurFUOwlY6iH4=";
+    };
+    aarch64-darwin-311 = {
+      name = "torchvision-0.15.1-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-a2DhyDmuKgcb77ummxdGjWf+r99XbpD/lkW/vumY3hc=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh
index fcc8edd0fceb..17dd15f6742e 100755
--- a/pkgs/development/python-modules/torchvision/prefetch.sh
+++ b/pkgs/development/python-modules/torchvision/prefetch.sh
@@ -5,22 +5,23 @@ set -eou pipefail
 
 version=$1
 
-linux_cuda_version="cu117"
+linux_cuda_version="cu118"
 linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
-darwin_bucket="https://download.pytorch.org/whl"
+darwin_bucket="https://download.pytorch.org/whl/cpu"
 
 url_and_key_list=(
-  "x86_64-linux-37 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl"
   "x86_64-linux-38 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl"
   "x86_64-linux-39 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl"
   "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl"
-  "x86_64-darwin-37 $darwin_bucket/torchvision-${version}-cp37-cp37m-macosx_10_9_x86_64.whl torchvision-${version}-cp37-cp37m-macosx_10_9_x86_64.whl"
+  "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl"
   "x86_64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl"
   "x86_64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl"
   "x86_64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl"
-  "aarch64-darwin-38 $darwin_bucket/cpu/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl"
-  "aarch64-darwin-39 $darwin_bucket/cpu/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl"
-  "aarch64-darwin-310 $darwin_bucket/cpu/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl"
+  "x86_64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_10_9_x86_64.whl torchvision-${version}-cp311-cp311-macosx_10_9_x86_64.whl"
+  "aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl"
+  "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl"
+  "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl"
+  "aarch64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl"
 )
 
 hashfile="binary-hashes-$version.nix"

From 09a21ed0aca1b87c8991f7d270603057a71ff564 Mon Sep 17 00:00:00 2001
From: Laurent Canis <laurent@marigold.dev>
Date: Fri, 28 Apr 2023 10:46:38 -0400
Subject: [PATCH 08/78] ocamlPackages.ringo: 0.9 -> 1.0.0

---
 .../development/ocaml-modules/ringo/default.nix |  8 ++------
 pkgs/development/ocaml-modules/ringo/lwt.nix    | 17 -----------------
 pkgs/top-level/ocaml-packages.nix               |  1 -
 3 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/ringo/lwt.nix

diff --git a/pkgs/development/ocaml-modules/ringo/default.nix b/pkgs/development/ocaml-modules/ringo/default.nix
index 87a64beaa50d..f826b03f6aa1 100644
--- a/pkgs/development/ocaml-modules/ringo/default.nix
+++ b/pkgs/development/ocaml-modules/ringo/default.nix
@@ -2,22 +2,18 @@
 
 buildDunePackage rec {
   pname = "ringo";
-  version = "0.9";
-
+  version = "1.0.0";
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "ringo";
     rev = "v${version}";
-    sha256 = "sha256-lPb+WrRsmtOow9BX9FW4HoILlsTuuMrVlK0XPcXWZ9U=";
+    sha256 = "sha256-9HW3M27BxrEPbF8cMHwzP8FmJduUInpQQAE2672LOuU=";
   };
 
   minimalOCamlVersion = "4.05";
 
   doCheck = true;
 
-  # If we just run the test as is it will try to test ringo-lwt
-  checkPhase = "dune build @test/runtest";
-
   meta = {
     description = "Caches (bounded-size key-value stores) and other bounded-size stores";
     license = lib.licenses.mit;
diff --git a/pkgs/development/ocaml-modules/ringo/lwt.nix b/pkgs/development/ocaml-modules/ringo/lwt.nix
deleted file mode 100644
index 7fb8fb7054e1..000000000000
--- a/pkgs/development/ocaml-modules/ringo/lwt.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ lib, buildDunePackage, ringo, lwt }:
-
-buildDunePackage {
-  pname = "ringo-lwt";
-  inherit (ringo) version src doCheck;
-
-  minimalOCamlVersion = "4.08";
-
-  propagatedBuildInputs = [
-    ringo
-    lwt
-  ];
-
-  meta = ringo.meta // {
-    description = "Lwt-wrappers for Ringo caches";
-  };
-}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 06c982d7e5d7..50965dc0ebee 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1452,7 +1452,6 @@ let
     rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { };
 
     ringo = callPackage ../development/ocaml-modules/ringo { };
-    ringo-lwt = callPackage ../development/ocaml-modules/ringo/lwt.nix { };
 
     rock = callPackage ../development/ocaml-modules/rock { };
 

From 1d35a119c7a91786285adcede1e126c4aaf153b6 Mon Sep 17 00:00:00 2001
From: Laurent Canis <laurent@marigold.dev>
Date: Fri, 28 Apr 2023 10:46:52 -0400
Subject: [PATCH 09/78] ocamlPackages.aches: init at 1.0.0

---
 .../development/ocaml-modules/aches/default.nix | 16 ++++++++++++++++
 pkgs/development/ocaml-modules/aches/lwt.nix    | 17 +++++++++++++++++
 pkgs/top-level/ocaml-packages.nix               |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/aches/default.nix
 create mode 100644 pkgs/development/ocaml-modules/aches/lwt.nix

diff --git a/pkgs/development/ocaml-modules/aches/default.nix b/pkgs/development/ocaml-modules/aches/default.nix
new file mode 100644
index 000000000000..c590ecc04bdc
--- /dev/null
+++ b/pkgs/development/ocaml-modules/aches/default.nix
@@ -0,0 +1,16 @@
+{ lib, buildDunePackage, ringo }:
+
+buildDunePackage {
+  pname = "aches";
+  inherit (ringo) src version;
+
+  propagatedBuildInputs = [
+    ringo
+  ];
+
+  meta = {
+    description = "Caches (bounded-size stores) for in-memory values and for resources";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ulrikstrid ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/aches/lwt.nix b/pkgs/development/ocaml-modules/aches/lwt.nix
new file mode 100644
index 000000000000..bfb57a5a91aa
--- /dev/null
+++ b/pkgs/development/ocaml-modules/aches/lwt.nix
@@ -0,0 +1,17 @@
+{ lib, buildDunePackage, ringo, aches, lwt }:
+
+buildDunePackage {
+  pname = "aches-lwt";
+  inherit (ringo) src version;
+
+  propagatedBuildInputs = [
+    aches
+    lwt
+  ];
+
+  meta = {
+    description = "Caches (bounded-size stores) for Lwt promises";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ulrikstrid ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 50965dc0ebee..0807005d6878 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -9,6 +9,8 @@ let
     inherit ocaml;
 
     ### A ###
+    aches = callPackage ../development/ocaml-modules/aches { };
+    aches-lwt = callPackage ../development/ocaml-modules/aches/lwt.nix { };
 
     afl-persistent = callPackage ../development/ocaml-modules/afl-persistent { };
 

From 02cda04c0a157456f127ed3e924d0511be929d94 Mon Sep 17 00:00:00 2001
From: Laurent Canis <laurent@marigold.dev>
Date: Fri, 28 Apr 2023 10:52:49 -0400
Subject: [PATCH 10/78] ocamlPackages.hacl-star: 0.4.5 -> 0.7.0

---
 .../ocaml-modules/hacl-star/default.nix       | 12 +++--
 .../ocaml-modules/hacl-star/raw.nix           | 50 ++++++++++++++-----
 2 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/ocaml-modules/hacl-star/default.nix b/pkgs/development/ocaml-modules/hacl-star/default.nix
index 004aa5c9a449..e12454759a35 100644
--- a/pkgs/development/ocaml-modules/hacl-star/default.nix
+++ b/pkgs/development/ocaml-modules/hacl-star/default.nix
@@ -1,11 +1,12 @@
-{ lib, buildDunePackage, hacl-star-raw, zarith, cppo }:
+{ lib, buildDunePackage, hacl-star-raw, zarith, cppo, alcotest, secp256k1-internal, qcheck-core, cstruct }:
+
 
 buildDunePackage {
   pname = "hacl-star";
 
   inherit (hacl-star-raw) version src meta doCheck minimalOCamlVersion;
 
-  useDune2 = true;
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     hacl-star-raw
@@ -16,5 +17,10 @@ buildDunePackage {
     cppo
   ];
 
-  strictDeps = true;
+  checkInputs = [
+    alcotest
+    secp256k1-internal
+    qcheck-core
+    cstruct
+  ];
 }
diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix
index 3ec895c8e833..ce076ca779ad 100644
--- a/pkgs/development/ocaml-modules/hacl-star/raw.nix
+++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix
@@ -1,17 +1,25 @@
-{ lib, which, stdenv, fetchzip, ocaml, findlib, hacl-star, ctypes, cppo }:
-
+{ lib
+, which
+, stdenv
+, fetchzip
+, opaline
+, cmake
+, ocaml
+, findlib
+, hacl-star
+, ctypes
+, cppo
+}:
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-hacl-star-raw";
-  version = "0.4.5";
+  version = "0.7.0";
 
   src = fetchzip {
-    url = "https://github.com/project-everest/hacl-star/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz";
-    sha256 = "1330vgbf5krlkvifby96kyk13xhmihajk2w5hgf2761jrljmnnrs";
+    url = "https://github.com/cryspen/hacl-packages/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz";
+    sha256 = "sha256-jJtxVYhQgP8ItfLhQ2wcF8RKNRnYhB2j0nR7/YH1NfY=";
     stripRoot = false;
   };
 
-  sourceRoot = "./source/raw";
-
   minimalOCamlVersion = "4.08";
 
   # strictoverflow is disabled because it breaks aarch64-darwin
@@ -21,18 +29,34 @@ stdenv.mkDerivation rec {
     patchShebangs ./
   '';
 
-  preInstall = ''
-    mkdir -p $OCAMLFIND_DESTDIR/stublibs
+  buildPhase = ''
+    runHook preBuild
+
+    make -C hacl-star-raw build-c
+    make -C hacl-star-raw build-bindings
+
+    runHook postBuild
   '';
 
-  installTargets = "install-hacl-star-raw";
+  installPhase = ''
+    runHook preInstall
 
+    echo $OCAMLFIND_DESTDIR
+    mkdir $out
+    mkdir -p $OCAMLFIND_DESTDIR/stublibs
+    make -C hacl-star-raw install
+
+    runHook postInstall
+  '';
+
+  dontUseCmakeConfigure = true;
   dontAddPrefix = true;
   dontAddStaticConfigureFlags = true;
-  configurePlatforms = [];
+  createFindlibDestdir = true;
 
   nativeBuildInputs = [
     which
+    cmake
     ocaml
     findlib
   ];
@@ -41,7 +65,7 @@ stdenv.mkDerivation rec {
     ctypes
   ];
 
-  nativeCheckInputs = [
+  checkInputs = [
     cppo
   ];
 
@@ -50,9 +74,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
+    inherit (ocaml.meta) platforms;
     description = "Auto-generated low-level OCaml bindings for EverCrypt/HACL*";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.ulrikstrid ];
-    platforms = ocaml.meta.platforms;
   };
 }

From 5a6671a079546f07e88c959121d26c3f2ecc1717 Mon Sep 17 00:00:00 2001
From: Ulrik Strid <ulrik.strid@outlook.com>
Date: Wed, 26 Apr 2023 10:41:04 +0200
Subject: [PATCH 11/78] ocamlModules.linol: init at 2023-04-25

---
 .../ocaml-modules/linol/default.nix           | 27 +++++++++++++++++++
 pkgs/development/ocaml-modules/linol/lwt.nix  | 19 +++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 +++
 3 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/linol/default.nix
 create mode 100644 pkgs/development/ocaml-modules/linol/lwt.nix

diff --git a/pkgs/development/ocaml-modules/linol/default.nix b/pkgs/development/ocaml-modules/linol/default.nix
new file mode 100644
index 000000000000..64aace8851b7
--- /dev/null
+++ b/pkgs/development/ocaml-modules/linol/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchFromGitHub, buildDunePackage, yojson, logs, lsp, ppx_yojson_conv_lib }:
+
+buildDunePackage
+rec {
+  pname = "linol";
+  version = "2023-04-25";
+
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";
+
+  src = fetchFromGitHub {
+    owner = "c-cube";
+    repo = "linol";
+    # Brings support for newer LSP
+    rev = "439534e0c5b7a3fbf93ba05fae7d171426153763";
+    sha256 = "sha256-EW35T7KUc/L1Zy4+oaJOC6mlVpbvhTfnU3NNFGoZAJg=";
+  };
+
+  propagatedBuildInputs = [ yojson logs lsp ppx_yojson_conv_lib ];
+
+  meta = with lib; {
+    description = "LSP server library";
+    license = licenses.mit;
+    maintainers = [ maintainers.ulrikstrid ];
+    homepage = "https://github.com/c-cube/linol";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/linol/lwt.nix b/pkgs/development/ocaml-modules/linol/lwt.nix
new file mode 100644
index 000000000000..b40c3771b6c8
--- /dev/null
+++ b/pkgs/development/ocaml-modules/linol/lwt.nix
@@ -0,0 +1,19 @@
+{ lib, buildDunePackage, linol, jsonrpc, lwt, yojson }:
+
+buildDunePackage {
+  pname = "linol-lwt";
+  inherit (linol) version src;
+
+  duneVersion = "3";
+
+  propagatedBuildInputs = [
+    linol
+    jsonrpc
+    lwt
+    yojson
+  ];
+
+  meta = linol.meta // {
+    description = "LSP server library (with Lwt for concurrency)";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 0807005d6878..e3f1451f5882 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -847,6 +847,10 @@ let
 
     linksem = callPackage ../development/ocaml-modules/linksem { };
 
+    linol = callPackage ../development/ocaml-modules/linol { };
+
+    linol-lwt = callPackage ../development/ocaml-modules/linol/lwt.nix { };
+
     llvm = callPackage ../development/ocaml-modules/llvm {
       libllvm = pkgs.llvmPackages_10.libllvm;
     };

From 529a42037025d13c481f976472b4a78d4b8977fb Mon Sep 17 00:00:00 2001
From: Laurent Canis <laurent@marigold.dev>
Date: Fri, 28 Apr 2023 11:45:18 -0400
Subject: [PATCH 12/78] ocamlPackages.asetmap: init at 0.8.1

---
 .../ocaml-modules/asetmap/default.nix         | 26 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/asetmap/default.nix

diff --git a/pkgs/development/ocaml-modules/asetmap/default.nix b/pkgs/development/ocaml-modules/asetmap/default.nix
new file mode 100644
index 000000000000..976de44959f6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/asetmap/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, fetchurl
+, buildDunePackage
+, topkg
+, findlib
+, ocamlbuild
+, ocaml
+}:
+
+buildDunePackage rec {
+  pname = "asetmap";
+  version = "0.8.1";
+  src = fetchurl {
+    url = "https://github.com/dbuenzli/asetmap/archive/refs/tags/v${version}.tar.gz";
+    sha256 = "051ky0k62xp4inwi6isif56hx5ggazv4jrl7s5lpvn9cj8329frj";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ topkg findlib ocamlbuild ocaml ];
+  buildInputs = [ topkg ];
+
+  inherit (topkg) buildPhase installPhase;
+
+  meta = { inherit (ocaml.meta) platforms; };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e3f1451f5882..1549097e37bb 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -40,6 +40,8 @@ let
 
     arp = callPackage ../development/ocaml-modules/arp { };
 
+    asetmap = callPackage ../development/ocaml-modules/asetmap { };
+
     asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { };
 
     astring = callPackage ../development/ocaml-modules/astring { };

From 9460430127f5b432f833a859031996be43016a93 Mon Sep 17 00:00:00 2001
From: Laurent Canis <laurent@marigold.dev>
Date: Fri, 28 Apr 2023 11:00:12 -0400
Subject: [PATCH 13/78] ocamlPackages.prometheus: init at 1.2

---
 .../ocaml-modules/prometheus/default.nix      | 28 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/prometheus/default.nix

diff --git a/pkgs/development/ocaml-modules/prometheus/default.nix b/pkgs/development/ocaml-modules/prometheus/default.nix
new file mode 100644
index 000000000000..2715c50b3edd
--- /dev/null
+++ b/pkgs/development/ocaml-modules/prometheus/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchurl, buildDunePackage, astring, asetmap, fmt, re, lwt, alcotest }:
+
+buildDunePackage rec {
+  pname = "prometheus";
+  version = "1.2";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/prometheus/releases/download/v${version}/prometheus-${version}.tbz";
+    sha256 = "sha256-g2Q6ApprbecdFANO7i6U/v8dCHVcSkHVg9wVMKtVW8s=";
+  };
+
+  duneVersion = "3";
+
+  propagatedBuildInputs = [
+    astring
+    asetmap
+    fmt
+    re
+    lwt
+    alcotest
+  ];
+
+  meta = {
+    description = "Client library for Prometheus monitoring";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.ulrikstrid ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 1549097e37bb..28651652e151 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1388,6 +1388,8 @@ let
 
     process = callPackage ../development/ocaml-modules/process { };
 
+    prometheus = callPackage ../development/ocaml-modules/prometheus { };
+
     progress = callPackage ../development/ocaml-modules/progress { };
 
     promise_jsoo = callPackage ../development/ocaml-modules/promise_jsoo { };

From 56c30a6f1a6bb88c686ba849af8e3d4d285b12b3 Mon Sep 17 00:00:00 2001
From: Laurent Canis <laurent@marigold.dev>
Date: Fri, 28 Apr 2023 14:17:59 -0400
Subject: [PATCH 14/78] ocamlPackages.data-encoding: 0.6 -> 0.7.1

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

diff --git a/pkgs/development/ocaml-modules/data-encoding/default.nix b/pkgs/development/ocaml-modules/data-encoding/default.nix
index 2b4013eb46a0..db139d2b26ae 100644
--- a/pkgs/development/ocaml-modules/data-encoding/default.nix
+++ b/pkgs/development/ocaml-modules/data-encoding/default.nix
@@ -16,7 +16,7 @@
 
 buildDunePackage rec {
   pname = "data-encoding";
-  version = "0.6";
+  version = "0.7.1";
 
   duneVersion = "3";
   minimalOCamlVersion = "4.10";
@@ -25,7 +25,7 @@ buildDunePackage rec {
     owner = "nomadic-labs";
     repo = "data-encoding";
     rev = "v${version}";
-    hash = "sha256-oQEV7lTG+/q1UcPsepPM4yN4qia6tEtRPkTkTVdGXE0=";
+    hash = "sha256-V3XiCCtoU+srOI+KVSJshtaSJLBJ4m4o10GpBfdYKCU=";
   };
 
   propagatedBuildInputs = [

From 95d3a2bf8a2c36e9d2d1b31554b01fad97f223f3 Mon Sep 17 00:00:00 2001
From: Laurent Canis <laurent@marigold.dev>
Date: Fri, 28 Apr 2023 14:18:44 -0400
Subject: [PATCH 15/78] ocamlPackages.tezos-bls12-381-polynomial: 0.1.3 ->
 1.0.1

---
 .../ocaml-modules/tezos-bls12-381-polynomial/default.nix  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix
index 47f9253e4473..2d5c5c27494b 100644
--- a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix
+++ b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix
@@ -8,21 +8,21 @@
 , alcotest-lwt
 , bisect_ppx
 , qcheck-alcotest
-,
+, ppx_repr
 }:
 
 buildDunePackage rec {
   pname = "tezos-bls12-381-polynomial";
-  version = "0.1.3";
+  version = "1.0.1";
   duneVersion = "3";
   src = fetchFromGitLab {
     owner = "nomadic-labs/cryptography";
     repo = "privacy-team";
     rev = "v${version}";
-    sha256 = "sha256-H1Wog3GItTIVsawr9JkyyKq+uGqbTQPTR1dacpmxLbs=";
+    sha256 = "sha256-5qDa/fQoTypjaceQ0MBzt0rM+0hSJcpGlXMGAZKRboo=";
   };
 
-  propagatedBuildInputs = [ bls12-381 data-encoding bigstringaf ];
+  propagatedBuildInputs = [ ppx_repr bls12-381 data-encoding bigstringaf ];
 
   checkInputs = [ alcotest alcotest-lwt bisect_ppx qcheck-alcotest ];
 

From 22f88c83dd21a718a98cd372dc2eca1b1a68f8a6 Mon Sep 17 00:00:00 2001
From: Laurent Canis <laurent@marigold.dev>
Date: Fri, 28 Apr 2023 14:32:57 -0400
Subject: [PATCH 16/78] ocamlPackages.polynomial: init at 0.4.0

---
 .../ocaml-modules/polynomial/default.nix      | 29 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/polynomial/default.nix

diff --git a/pkgs/development/ocaml-modules/polynomial/default.nix b/pkgs/development/ocaml-modules/polynomial/default.nix
new file mode 100644
index 000000000000..e23ae5f25fae
--- /dev/null
+++ b/pkgs/development/ocaml-modules/polynomial/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, fetchFromGitLab
+, buildDunePackage
+, zarith
+, ff-sig
+}:
+
+buildDunePackage rec {
+  pname = "polynomial";
+  version = "0.4.0";
+  duneVersion = "3";
+  src = fetchFromGitLab {
+    owner = "nomadic-labs";
+    repo = "cryptography/ocaml-polynomial";
+    rev = version;
+    sha256 = "sha256-is/PrYLCwStHiQsNq5OVRCwHdXjO2K2Z7FrXgytRfAU=";
+  };
+
+  propagatedBuildInputs = [ zarith ff-sig ];
+
+  doCheck = false; # circular dependencies
+
+  meta = {
+    description = "Polynomials over finite field";
+    license = lib.licenses.mit;
+    homepage = "https://gitlab.com/nomadic-labs/ocaml-polynomial";
+    maintainers = [ lib.maintainers.ulrikstrid ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 28651652e151..9026345d35cf 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1311,6 +1311,8 @@ let
       inherit (pkgs) coreutils imagemagick;
     };
 
+    polynomial = callPackage ../development/ocaml-modules/polynomial { };
+
     portaudio = callPackage ../development/ocaml-modules/portaudio {
       inherit (pkgs) portaudio;
     };

From 87860969d4151c5922216adbfa77880917272ebb Mon Sep 17 00:00:00 2001
From: Laurent Canis <laurent@marigold.dev>
Date: Fri, 28 Apr 2023 14:54:31 -0400
Subject: [PATCH 17/78] ocamlPackages.bls12-381-hash: init at 1.0.0

---
 .../ocaml-modules/bls12-381-hash/default.nix  | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  3 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/bls12-381-hash/default.nix

diff --git a/pkgs/development/ocaml-modules/bls12-381-hash/default.nix b/pkgs/development/ocaml-modules/bls12-381-hash/default.nix
new file mode 100644
index 000000000000..1b39439c747a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bls12-381-hash/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, fetchFromGitLab
+, buildDunePackage
+, bls12-381
+}:
+
+buildDunePackage rec {
+  pname = "bls12-381-hash";
+  version = "1.0.0";
+  src = fetchFromGitLab {
+    owner = "nomadic-labs";
+    repo = "cryptography/ocaml-bls12-381-hash";
+    rev = "${version}";
+    sha256 = "sha256-cfsSVmN4rbKcLcPcy6NduZktJhPXiVdK75LypmaSe9I=";
+  };
+
+  duneVersion = "3";
+
+  propagatedBuildInputs = [ bls12-381 ];
+
+  meta = {
+    description = "Implementation of some cryptographic hash primitives using the scalar field of BLS12-381";
+    license = lib.licenses.mit;
+    homepage = "https://gitlab.com/nomadic-labs/privacy-team";
+    maintainers = [ lib.maintainers.ulrikstrid ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9026345d35cf..e5fb318a1de7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -104,7 +104,8 @@ let
 
     bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { };
     bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { };
-    bls12-381-legacy = callPackage ../development/ocaml-modules/bls12-381/legacy.nix { };
+
+    bls12-381-hash = callPackage ../development/ocaml-modules/bls12-381-hash { };
 
     bls12-381-signature = callPackage ../development/ocaml-modules/bls12-381-signature { };
 

From 7609622aa2432348b7db12e071438fa81a3bad63 Mon Sep 17 00:00:00 2001
From: Laurent Canis <laurent@marigold.dev>
Date: Fri, 28 Apr 2023 14:56:17 -0400
Subject: [PATCH 18/78] ocamlPackages.tezos-plompiler 0.1.3 -> 1.0.1

---
 .../ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix
index 0f618f0d1e6b..62ddb432e47f 100644
--- a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix
+++ b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix
@@ -2,7 +2,9 @@
 , buildDunePackage
 , hacl-star
 , bls12-381
+, bls12-381-hash
 , tezos-bls12-381-polynomial
+, polynomial
 , data-encoding
 , hex
 , stdint
@@ -22,12 +24,14 @@ buildDunePackage rec {
   propagatedBuildInputs = [
     hacl-star
     bls12-381
+    bls12-381-hash
     tezos-bls12-381-polynomial
     data-encoding
     hex
     stdint
     ff
     mec
+    polynomial
   ];
 
   checkInputs = [ alcotest qcheck-alcotest bisect_ppx ];

From 3584ce2fa914cd85da2b89a75d3fd4fe4ba575da Mon Sep 17 00:00:00 2001
From: Ulrik Strid <ulrik.strid@outlook.com>
Date: Tue, 2 May 2023 10:42:43 +0200
Subject: [PATCH 19/78] tezos-rust-libs: 1.0 -> 1.5

---
 .../libraries/tezos-rust-libs/default.nix     | 59 +++++++++++--------
 .../ocaml-modules/bls12-381/legacy.nix        | 40 -------------
 pkgs/top-level/ocaml-packages.nix             |  1 -
 3 files changed, 36 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/bls12-381/legacy.nix

diff --git a/pkgs/development/libraries/tezos-rust-libs/default.nix b/pkgs/development/libraries/tezos-rust-libs/default.nix
index 67826f07a433..72163acba83e 100644
--- a/pkgs/development/libraries/tezos-rust-libs/default.nix
+++ b/pkgs/development/libraries/tezos-rust-libs/default.nix
@@ -1,37 +1,50 @@
-{ lib, fetchFromGitLab, rustPlatform }:
+{ lib, fetchFromGitLab, stdenv, llvmPackages_12, cargo }:
 
-rustPlatform.buildRustPackage rec {
+stdenv.mkDerivation rec {
+  version = "1.5";
   pname = "tezos-rust-libs";
-  version = "1.0";
-
   src = fetchFromGitLab {
     owner = "tezos";
     repo = "tezos-rust-libs";
     rev = "v${version}";
-    sha256 = "1ffkzbvb0ls4wk9205g3xh2c26cmwnl68x43gh6dm9z4xsic94v5";
+    sha256 = "sha256-SuCqDZDXmWdGI/GN+3nYcUk66jnW5FQQaeTB76/rvaw=";
   };
 
-  cargoSha256 = "0dgyqfr3dvvdwdi1wvpd7v9j21740jy4zwrwiwknw7csb4bq9wfx";
+  nativeBuildInputs = [ llvmPackages_12.llvm cargo ];
+  propagatedBuildDeps = [ llvmPackages_12.libllvm ];
 
-  preBuild = ''
-    mkdir .cargo
-    mv cargo-config .cargo/config
+  buildPhase = ''
+    runHook preBuild
+
+    cargo build \
+      --target-dir target-librustzcash \
+      --package librustzcash \
+      --release
+
+    cargo build \
+      --target-dir target-wasmer \
+      --package wasmer-c-api \
+      --no-default-features \
+      --features singlepass,cranelift,wat,middlewares,universal \
+      --release
+
+    runHook postBuild
   '';
 
-  postInstall = ''
-    cp -r rustc-bls12-381/include $out/include
-    cp -r librustzcash/include $out
-    cp -r $out/lib $out/tmp
-    mkdir $out/lib/tezos-rust-libs
-    mv $out/tmp/ $out/lib/tezos-rust-libs/
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/tezos-rust-libs/rust
+    cp "librustzcash/include/librustzcash.h" \
+        "target-librustzcash/release/librustzcash.a" \
+        "wasmer-2.3.0/lib/c-api/wasm.h" \
+        "wasmer-2.3.0/lib/c-api/wasmer.h" \
+        "target-wasmer/release/libwasmer.a" \
+        "$out/lib/tezos-rust-libs"
+    cp -r "librustzcash/include/rust" "$out/lib/tezos-rust-libs"
+
+    runHook postInstall
   '';
 
-  doCheck = true;
-
-  meta = {
-    homepage = "https://gitlab.com/tezos/tezos-rust-libs";
-    description = "Tezos: all rust dependencies and their dependencies";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.ulrikstrid ];
-  };
+  cargoVendorDir = "./vendor";
 }
diff --git a/pkgs/development/ocaml-modules/bls12-381/legacy.nix b/pkgs/development/ocaml-modules/bls12-381/legacy.nix
deleted file mode 100644
index 596001da06ae..000000000000
--- a/pkgs/development/ocaml-modules/bls12-381/legacy.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib
-, buildDunePackage
-, fetchFromGitLab
-, bls12-381-gen
-, ctypes
-, ff-pbt
-, ff-sig
-, tezos-rust-libs
-, zarith
-, alcotest
-}:
-
-buildDunePackage rec {
-  pname = "bls12-381-legacy";
-
-  inherit (bls12-381-gen) version src doCheck;
-
-  duneVersion = "3";
-
-  minimalOCamlVersion = "4.08";
-
-  propagatedBuildInputs = [
-    bls12-381-gen
-    ctypes
-    ff-pbt
-    ff-sig
-    tezos-rust-libs
-    zarith
-  ];
-
-  checkInputs = [
-    alcotest
-  ];
-
-  meta = {
-    homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381";
-    description = "UNIX version of BLS12-381 primitives, not implementating the virtual package bls12-381";
-    license = lib.licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e5fb318a1de7..e17454d9dd6f 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -104,7 +104,6 @@ let
 
     bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { };
     bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { };
-
     bls12-381-hash = callPackage ../development/ocaml-modules/bls12-381-hash { };
 
     bls12-381-signature = callPackage ../development/ocaml-modules/bls12-381-signature { };

From f5a8cfa45b946cfc5518a970acd4cb4802004bbb Mon Sep 17 00:00:00 2001
From: InfraBot <infra@marigold.dev>
Date: Thu, 27 Apr 2023 14:31:24 +0000
Subject: [PATCH 20/78] ligo: 0.60.0 -> 0.64.2

---
 pkgs/development/compilers/ligo/default.nix | 36 +++++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix
index 93ef913b4a7d..7493d73787a5 100644
--- a/pkgs/development/compilers/ligo/default.nix
+++ b/pkgs/development/compilers/ligo/default.nix
@@ -6,21 +6,29 @@
 , ocamlPackages
 , cacert
 , ocaml-crunch
+, jq
+, mustache-go
+, yaml2json
+, tezos-rust-libs
 }:
 
 ocamlPackages.buildDunePackage rec {
   pname = "ligo";
-  version = "0.60.0";
+  version = "0.64.2";
   src = fetchFromGitLab {
     owner = "ligolang";
     repo = "ligo";
     rev = version;
-    sha256 = "sha256-gyMSpy+F3pF2Kv1ygUs20mrspJ6GtJ6ySyZD7zfZj2w=";
+    sha256 = "sha256-/XUJFDH1pv65VeZt57P+AiCegTwCn7OWdaa0D8sw7CI=";
     fetchSubmodules = true;
   };
 
   # The build picks this up for ligo --version
   LIGO_VERSION = version;
+  CHANGELOG_PATH = "./changelog.txt";
+
+  # This is a hack to work around the hack used in the dune files
+  OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
 
   duneVersion = "3";
 
@@ -33,6 +41,10 @@ ocamlPackages.buildDunePackage rec {
     ocamlPackages.crunch
     ocamlPackages.menhir
     ocamlPackages.ocaml-recovery-parser
+    # deps for changelog
+    jq
+    mustache-go
+    yaml2json
   ];
 
   buildInputs = with ocamlPackages; [
@@ -60,13 +72,19 @@ ocamlPackages.buildDunePackage rec {
     lambda-term
     tar-unix
     parse-argv
-
+    hacl-star
+    prometheus
+    # lsp
+    linol
+    linol-lwt
+    ocaml-lsp
     # Test helpers deps
     qcheck
     qcheck-alcotest
     alcotest-lwt
-
     # vendored tezos' deps
+    aches
+    aches-lwt
     tezos-plonk
     tezos-bls12-381-polynomial
     ctypes
@@ -78,13 +96,10 @@ ocamlPackages.buildDunePackage rec {
     lwt-canceler
     ipaddr
     bls12-381
-    bls12-381-legacy
     bls12-381-signature
     ptime
     mtime
     lwt_log
-    ringo
-    ringo-lwt
     secp256k1-internal
     resto
     resto-directory
@@ -97,6 +112,13 @@ ocamlPackages.buildDunePackage rec {
     simple-diff
   ];
 
+  preBuild = ''
+    # The scripts use `nix-shell` in the shebang which seems to fail
+    sed -i -e '1,5d' ./scripts/changelog-generation.sh
+    sed -i -e '1,5d' ./scripts/changelog-json.sh
+    ./scripts/changelog-generation.sh
+  '';
+
   nativeCheckInputs = [
     cacert
     ocamlPackages.ca-certs

From 584c58cf279517b0edfcbcae01d7ba7813b41834 Mon Sep 17 00:00:00 2001
From: Kenny MacDermid <kenny@macdermid.ca>
Date: Tue, 2 May 2023 16:51:32 -0300
Subject: [PATCH 21/78] gcc-arm-embedded: pass args to gdb

The wrapper around `arm-none-eabi-gdb` was not passing through
the command line arguments. This would cause build systems that
attempted to determine the gdb version to hang.

Match the other wrapper by adding `"$@"`, and using `exec` to
call the unwrapped process.
---
 pkgs/development/compilers/gcc-arm-embedded/11/default.nix | 2 +-
 pkgs/development/compilers/gcc-arm-embedded/12/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix
index 1fb9f611a066..ad132f5bbf6c 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     #!${runtimeShell}
     export PYTHONPATH=${python38}/lib/python3.8
     export PYTHONHOME=${python38}/bin/python3.8
-    $out/bin/arm-none-eabi-gdb-unwrapped
+    exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@"
     EOF
     chmod +x $out/bin/arm-none-eabi-gdb
   '';
diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix
index 9e1f49219e0e..5fd186802c53 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     #!${runtimeShell}
     export PYTHONPATH=${python38}/lib/python3.8
     export PYTHONHOME=${python38}/bin/python3.8
-    $out/bin/arm-none-eabi-gdb-unwrapped
+    exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@"
     EOF
     chmod +x $out/bin/arm-none-eabi-gdb
   '';

From aec294926940dbfda856f580b34f63aa0b041bf6 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 2 May 2023 23:15:15 +0200
Subject: [PATCH 22/78] haskellPackages.hercules-ci-agent: Work around
 corrupted file on cache.nixos.org

Should this be fixed on cache.nixos.org instead?
I would like that, but it won't be a complete fix, because the corrupted
NAR has already been accepted onto a number of hosts, which would need to
take manual action, if at all possible. Furthermore, I'd have to bother
people who have presumably have more important things to do; things that
actually have a lasting effect perhaps!
---
 pkgs/development/haskell-modules/configuration-nix.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index cd9abba308f5..2681418dc3d2 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1015,6 +1015,14 @@ self: super: builtins.intersectAttrs super {
     hnix-store-core = super.hnix-store-core_0_6_1_0;
   });
 
+  hercules-ci-api-core =
+    # 2023-05-02: Work around a corrupted file on cache.nixos.org. This is a hash for x86_64-linux. Remove when it has changed.
+    if super.hercules-ci-api-core.drvPath == "/nix/store/dgy3w43zypmdswc7a7zis0njgljqvnq0-hercules-ci-api-core-0.1.5.0.drv"
+    then super.hercules-ci-api-core.overrideAttrs (_: {
+        dummyAttr = 1;
+      })
+    else super.hercules-ci-api-core;
+
   hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; };
   hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; });
   hercules-ci-cnix-store = (super.hercules-ci-cnix-store.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }).overrideAttrs (_: {

From 4783660b3514dc0456f93e4a3020e671461bf7ef Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 2 May 2023 23:25:24 +0200
Subject: [PATCH 23/78] python310Packages.onvif-zeep-async: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix
index b8d0b654dc0c..28e170429613 100644
--- a/pkgs/development/python-modules/onvif-zeep-async/default.nix
+++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "onvif-zeep-async";
-  version = "1.3.0";
+  version = "1.3.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Gd3OfFfJE//uDiaU6HTlURCqoGOG4jvuMN1TlDy7pZU=";
+    hash = "sha256-Bh7QA86oL/CeRSLHdwvBdO39+AZwTqA7ZVERw1jvJtU=";
   };
 
   propagatedBuildInputs = [

From 8c40557e1e57df0848b4ba9bfad29e7c2b972d02 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 2 May 2023 23:48:30 +0200
Subject: [PATCH 24/78] python310Packages.yalexs: 1.3.2 -> 1.3.3

Diff: https://github.com/bdraco/yalexs/compare/refs/tags/v1.3.2...v1.3.3

Changelog: https://github.com/bdraco/yalexs/releases/tag/v1.3.3
---
 pkgs/development/python-modules/yalexs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix
index 52d5be838084..cd41d312d62b 100644
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "yalexs";
-  version = "1.3.2";
+  version = "1.3.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-CqonGKcbAg0Edqw3WosK2vEJ0DxOMZNSNO5RkecECa0=";
+    hash = "sha256-dUiaz1adXsiVji1YZYkYN6NCFGzAWIBPjVTeyvUaiqU=";
   };
 
   propagatedBuildInputs = [

From 1348759e774aa76e2360dd33553532ca5c4b73d5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 2 May 2023 23:52:35 +0200
Subject: [PATCH 25/78] python310Packages.gehomesdk: 0.5.9 -> 0.5.10

Changelog: https://github.com/simbaja/gehome/blob/master/CHANGELOG.md
---
 pkgs/development/python-modules/gehomesdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix
index 060b921a38b2..6c700f3be084 100644
--- a/pkgs/development/python-modules/gehomesdk/default.nix
+++ b/pkgs/development/python-modules/gehomesdk/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "gehomesdk";
-  version = "0.5.9";
+  version = "0.5.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-V8vwsLIO44q2ms/segTZ70DUVb7BNuxYZ8vX9KPNP4c=";
+    hash = "sha256-M0G+UvFCegKEDA+0PI1voesMqIItKC0591ruZ4YvjMU=";
   };
 
   propagatedBuildInputs = [

From 1586b6058df7847e230d883751e1299c5f8f76ba Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 2 May 2023 23:54:42 +0200
Subject: [PATCH 26/78] python310Packages.bc-detect-secrets: 1.4.24 -> 1.4.26

Diff: https://github.com/bridgecrewio/detect-secrets/compare/refs/tags/1.4.24...1.4.26
---
 pkgs/development/python-modules/bc-detect-secrets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix
index ef3da35b0c06..fc4ffde10534 100644
--- a/pkgs/development/python-modules/bc-detect-secrets/default.nix
+++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "bc-detect-secrets";
-  version = "1.4.24";
+  version = "1.4.26";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "bridgecrewio";
     repo = "detect-secrets";
     rev = "refs/tags/${version}";
-    hash = "sha256-roqViqEOw5Mx+LFCdJHNDWrZ5wVCuzMxugnOCbuS7nY=";
+    hash = "sha256-rkyeG0xZZVO7SkfFyxq07c373YElblIUqJpwWc1nF58=";
   };
 
   propagatedBuildInputs = [

From 72d71dd641b01ffe20b8dec2f4e595e2b08c095f Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 2 May 2023 22:24:57 +0100
Subject: [PATCH 27/78] stdenv: do not pass `__contentAddressed = false` as
 environment variable

`nix-2.4+` automatically filters `__contentAddressed` out of the
environment. But not `nix-2.3`. This make `.drv` to differ between
unset and `__contentAddressed = false` derivations.

This change makes them equal by filtering out `__contentAddressed`
unless it's set to `true`.
---
 pkgs/stdenv/generic/make-derivation.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index d34785dca945..0515494ec982 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -294,6 +294,7 @@ else let
       (["meta" "passthru" "pos"
        "checkInputs" "installCheckInputs"
        "nativeCheckInputs" "nativeInstallCheckInputs"
+       "__contentAddressed"
        "__darwinAllowLocalNetworking"
        "__impureHostDeps" "__propagatedImpureHostDeps"
        "sandboxProfile" "propagatedSandboxProfile"]

From 31caa6a850398dcc253298ea840b81457aefbb72 Mon Sep 17 00:00:00 2001
From: Matt Melling <mattmelling@fastmail.com>
Date: Fri, 27 Jan 2023 21:22:27 +0000
Subject: [PATCH 28/78] python3Packages.dvc-studio-client: init at 0.3.0

---
 .../dvc-studio-client/default.nix             | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/dvc-studio-client/default.nix

diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix
new file mode 100644
index 000000000000..933f2db6bda9
--- /dev/null
+++ b/pkgs/development/python-modules/dvc-studio-client/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, gitpython
+, pythonOlder
+, requests
+, setuptools-scm
+, voluptuous
+}:
+
+buildPythonPackage rec {
+  pname = "dvc-studio-client";
+  version = "0.3.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "iterative";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-LSehY7dIi7UEZim60X0660WzaZp1VuALcxxNCP7Quuk=";
+  };
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    voluptuous
+    requests
+    gitpython
+  ];
+
+  pythonImportsCheck = [
+    "dvc_studio_client"
+  ];
+
+  # Tests try to access network
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Library to post data from DVC/DVCLive to Iterative Studio";
+    homepage = "https://github.com/iterative/dvc-studio-client";
+    changelog = "https://github.com/iterative/dvc-studio-client/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ melling ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb52dba25471..d3e701f887fb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3005,6 +3005,8 @@ self: super: with self; {
 
   dvc-render = callPackage ../development/python-modules/dvc-render {  };
 
+  dvc-studio-client = callPackage ../development/python-modules/dvc-studio-client {  };
+
   dvc-task = callPackage ../development/python-modules/dvc-task {  };
 
   dvclive = callPackage ../development/python-modules/dvclive {  };

From 4360f88a64075b9a784d8f35f5cfc9704833a3a1 Mon Sep 17 00:00:00 2001
From: Matt Melling <mattmelling@fastmail.com>
Date: Fri, 27 Jan 2023 21:23:14 +0000
Subject: [PATCH 29/78] python3Packages.iterative-telemetry: init at 0.0.7

---
 .../iterative-telemetry/default.nix           | 57 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/python-modules/iterative-telemetry/default.nix

diff --git a/pkgs/development/python-modules/iterative-telemetry/default.nix b/pkgs/development/python-modules/iterative-telemetry/default.nix
new file mode 100644
index 000000000000..c6e211539103
--- /dev/null
+++ b/pkgs/development/python-modules/iterative-telemetry/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, appdirs
+, buildPythonPackage
+, distro
+, fetchFromGitHub
+, filelock
+, pytestCheckHook
+, pytest-mock
+, pythonOlder
+, requests
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "iterative-telemtry";
+  version = "0.0.7";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "iterative";
+    repo = "telemetry-python";
+    rev = "refs/tags/${version}";
+    hash = "sha256-n67nc9a/Qrz2v1EYbHZb+pGhuMDqofUMpgfD/0BwqLM=";
+  };
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    requests
+    appdirs
+    filelock
+    distro
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-mock
+  ];
+
+  pythonImportsCheck = [
+    "iterative_telemetry"
+  ];
+
+  meta = with lib; {
+    description = "Common library to send usage telemetry";
+    homepage = "https://github.com/iterative/iterative-telemetry";
+    changelog = "https://github.com/iterative/iterative-telemetry/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ melling ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3e701f887fb..7079b2867e89 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4953,6 +4953,8 @@ self: super: with self; {
 
   iteration-utilities = callPackage ../development/python-modules/iteration-utilities { };
 
+  iterative-telemetry = callPackage ../development/python-modules/iterative-telemetry { };
+
   iterm2 = callPackage ../development/python-modules/iterm2 { };
 
   itsdangerous = callPackage ../development/python-modules/itsdangerous { };

From ea1df3b3d47ea21b007deffd98c61ae319f54b95 Mon Sep 17 00:00:00 2001
From: Matt Melling <mattmelling@fastmail.com>
Date: Sat, 28 Jan 2023 16:26:36 +0000
Subject: [PATCH 30/78] python3Packages.dvclive: fix setuptools version

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

diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index 954d2e4902bb..a13e5c092a4e 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -5,7 +5,7 @@
 , pytestCheckHook
 , pythonOlder
 , ruamel-yaml
-, setuptools
+, setuptools-scm
 , tabulate
 }:
 
@@ -23,8 +23,10 @@ buildPythonPackage rec {
     hash = "sha256-n3JjZrh2ImpjW1MUTwag716qaVjSChrYqNJuNp6K1s8=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   nativeBuildInputs = [
-    setuptools
+    setuptools-scm
   ];
 
   propagatedBuildInputs = [

From 12843529c7d79939ffad0e9073f2df92b0d86408 Mon Sep 17 00:00:00 2001
From: Matt Melling <mattmelling@fastmail.com>
Date: Sun, 29 Jan 2023 19:27:24 +0000
Subject: [PATCH 31/78] python3Packages.dvc-gs: init at 2.21.0

Co-authored-by: Ryan Swart <ryan@talosystems.com>
---
 .../python-modules/dvc-gs/default.nix         | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/dvc-gs/default.nix

diff --git a/pkgs/development/python-modules/dvc-gs/default.nix b/pkgs/development/python-modules/dvc-gs/default.nix
new file mode 100644
index 000000000000..0f29bc8a3554
--- /dev/null
+++ b/pkgs/development/python-modules/dvc-gs/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, dvc-objects
+, fetchPypi
+, gcsfs
+, pythonRelaxDepsHook
+, setuptools-scm }:
+
+buildPythonPackage rec {
+  pname = "dvc-gs";
+  version = "2.21.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-MGNDEhJJGSQIPDXGv/y4u1UHnh4HnNbKtQbGHys0dSA=";
+  };
+
+  # Prevent circular dependency
+  pythonRemoveDeps = [ "dvc" ];
+
+  nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];
+
+  propagatedBuildInputs = [ gcsfs dvc-objects ];
+
+  # Network access is needed for tests
+  doCheck = false;
+
+  pythonCheckImports = [ "dvc_gs" ];
+
+  meta = with lib; {
+    description = "gs plugin for dvc";
+    homepage = "https://pypi.org/project/dvc-gs/version";
+    changelog = "https://github.com/iterative/dvc-gs/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ melling ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7079b2867e89..eb439e926619 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2999,6 +2999,8 @@ self: super: with self; {
 
   dvc-data = callPackage ../development/python-modules/dvc-data {  };
 
+  dvc-gs = callPackage ../development/python-modules/dvc-gs { };
+
   dvc-http = callPackage ../development/python-modules/dvc-http {  };
 
   dvc-objects = callPackage ../development/python-modules/dvc-objects {  };

From 18f2c6613016bf3717e94a466aa539ffab622535 Mon Sep 17 00:00:00 2001
From: Matt Melling <mattmelling@fastmail.com>
Date: Sun, 29 Jan 2023 19:50:55 +0000
Subject: [PATCH 32/78] python3Packages.dvc-s3: init at 2.21.0

---
 .../python-modules/dvc-s3/default.nix         | 47 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/python-modules/dvc-s3/default.nix

diff --git a/pkgs/development/python-modules/dvc-s3/default.nix b/pkgs/development/python-modules/dvc-s3/default.nix
new file mode 100644
index 000000000000..546fd4e3129f
--- /dev/null
+++ b/pkgs/development/python-modules/dvc-s3/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, aiobotocore
+, boto3
+, buildPythonPackage
+, fetchPypi
+, flatten-dict
+, pythonRelaxDepsHook
+, s3fs
+, setuptools-scm }:
+
+buildPythonPackage rec {
+  pname = "dvc-s3";
+  version = "2.21.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-AEB5Nyp6j7mX0AOA0rhegd4q8xP/POx9J6yn1Ppu0nk=";
+  };
+
+  # Prevent circular dependency
+  pythonRemoveDeps = [ "dvc" ];
+
+  # dvc-s3 uses boto3 directly, we add in propagatedBuildInputs
+  postPatch = ''
+    substituteInPlace setup.cfg --replace 'aiobotocore[boto3]' 'aiobotocore'
+  '';
+
+  nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];
+
+  propagatedBuildInputs = [
+    aiobotocore boto3 flatten-dict s3fs
+  ];
+
+  # Network access is needed for tests
+  doCheck = false;
+
+  pythonCheckImports = [ "dvc_s3" ];
+
+  meta = with lib; {
+    description = "s3 plugin for dvc";
+    homepage = "https://pypi.org/project/dvc-s3/${version}";
+    changelog = "https://github.com/iterative/dvc-s3/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ melling ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb439e926619..73170d31f736 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3007,6 +3007,8 @@ self: super: with self; {
 
   dvc-render = callPackage ../development/python-modules/dvc-render {  };
 
+  dvc-s3 = callPackage ../development/python-modules/dvc-s3 { };
+
   dvc-studio-client = callPackage ../development/python-modules/dvc-studio-client {  };
 
   dvc-task = callPackage ../development/python-modules/dvc-task {  };

From 6cbbb21b6b11168754a6f73ebc35773e42cfdb10 Mon Sep 17 00:00:00 2001
From: Matt Melling <mattmelling@fastmail.com>
Date: Sun, 29 Jan 2023 20:02:34 +0000
Subject: [PATCH 33/78] python3Packages.dvc-azure: init at 2.21.0

---
 .../version-management/dvc/default.nix        |  3 +-
 .../python-modules/dvc-azure/default.nix      | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/dvc-azure/default.nix

diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix
index 47cd6eb099c6..1d77307aa9af 100644
--- a/pkgs/applications/version-management/dvc/default.nix
+++ b/pkgs/applications/version-management/dvc/default.nix
@@ -80,8 +80,7 @@ python3.pkgs.buildPythonApplication rec {
     boto3
     s3fs
   ] ++ lib.optionals enableAzure [
-    azure-identity
-    knack
+    dvc-azure
   ] ++ lib.optionals enableSSH [
     bcrypt
   ] ++ lib.optionals (pythonOlder "3.8") [
diff --git a/pkgs/development/python-modules/dvc-azure/default.nix b/pkgs/development/python-modules/dvc-azure/default.nix
new file mode 100644
index 000000000000..40f7a0638927
--- /dev/null
+++ b/pkgs/development/python-modules/dvc-azure/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, adlfs
+, azure-identity
+, buildPythonPackage
+, fetchPypi
+, knack
+, pythonRelaxDepsHook
+, setuptools-scm }:
+
+buildPythonPackage rec {
+  pname = "dvc-azure";
+  version = "2.21.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-VN3QSGb4cLhxX8JV1Pg4/449SJOWv9Tu3kcDGbDwAYw=";
+  };
+
+  # Prevent circular dependency
+  pythonRemoveDeps = [ "dvc" ];
+
+  nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];
+
+  propagatedBuildInputs = [
+    adlfs azure-identity knack
+  ];
+
+  # Network access is needed for tests
+  doCheck = false;
+
+  pythonCheckImports = [ "dvc_azure" ];
+
+  meta = with lib; {
+    description = "azure plugin for dvc";
+    homepage = "https://pypi.org/project/dvc-azure/${version}";
+    changelog = "https://github.com/iterative/dvc-azure/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ melling ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73170d31f736..bad81a34efbd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2997,6 +2997,8 @@ self: super: with self; {
 
   durus = callPackage ../development/python-modules/durus {  };
 
+  dvc-azure = callPackage ../development/python-modules/dvc-azure {  };
+
   dvc-data = callPackage ../development/python-modules/dvc-data {  };
 
   dvc-gs = callPackage ../development/python-modules/dvc-gs { };

From 973accd6b44c93e551801a1d049a23a9c52ef97b Mon Sep 17 00:00:00 2001
From: Matt Melling <mattmelling@fastmail.com>
Date: Sun, 29 Jan 2023 21:28:52 +0000
Subject: [PATCH 34/78] python3Packages.dvc-ssh: init at 2.21.0

---
 .../python-modules/dvc-ssh/default.nix        | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/dvc-ssh/default.nix

diff --git a/pkgs/development/python-modules/dvc-ssh/default.nix b/pkgs/development/python-modules/dvc-ssh/default.nix
new file mode 100644
index 000000000000..2e21c4e8697c
--- /dev/null
+++ b/pkgs/development/python-modules/dvc-ssh/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, bcrypt
+, buildPythonPackage
+, fetchPypi
+, pythonRelaxDepsHook
+, setuptools-scm
+, sshfs
+}:
+
+buildPythonPackage rec {
+  pname = "dvc-ssh";
+  version = "2.21.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-iew/+/Ww6Uvz6Ctvswd8l5YFa3zihYxo1jvTe0ZTW9M=";
+  };
+
+  # Prevent circular dependency
+  pythonRemoveDeps = [ "dvc" ];
+
+  nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];
+
+  propagatedBuildInputs = [ bcrypt sshfs ];
+
+  # bcrypt is enabled for sshfs in nixpkgs
+  postPatch = ''
+    substituteInPlace setup.cfg --replace "sshfs[bcrypt]" "sshfs"
+  '';
+
+  # Network access is needed for tests
+  doCheck = false;
+
+  pythonCheckImports = [ "dvc_ssh" ];
+
+  meta = with lib; {
+    description = "ssh plugin for dvc";
+    homepage = "https://pypi.org/project/dvc-ssh/${version}";
+    changelog = "https://github.com/iterative/dvc-ssh/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ melling ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bad81a34efbd..253d1f45df19 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3011,6 +3011,8 @@ self: super: with self; {
 
   dvc-s3 = callPackage ../development/python-modules/dvc-s3 { };
 
+  dvc-ssh = callPackage ../development/python-modules/dvc-ssh { };
+
   dvc-studio-client = callPackage ../development/python-modules/dvc-studio-client {  };
 
   dvc-task = callPackage ../development/python-modules/dvc-task {  };

From 4b4fa338024c29b94dfe4e8c65d45249a7c44350 Mon Sep 17 00:00:00 2001
From: Matt Melling <mattmelling@fastmail.com>
Date: Fri, 27 Jan 2023 17:37:22 +0000
Subject: [PATCH 35/78] dvc: 2.17.0 -> 2.43.1

---
 .../version-management/dvc/default.nix        | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix
index 1d77307aa9af..8ce779c66b97 100644
--- a/pkgs/applications/version-management/dvc/default.nix
+++ b/pkgs/applications/version-management/dvc/default.nix
@@ -10,21 +10,21 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "dvc";
-  version = "2.17.0";
-  format = "setuptools";
+  version = "2.43.1";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "iterative";
     repo = pname;
     rev = version;
-    hash = "sha256-P0J+3TNHGqMw3krfs1uLnf8nEiIBK6UrrB37mY+fBA0=";
+    hash = "sha256-FwJErwAVWFZ95wzBalGi9o+8BTtcGvnC9uQE1qTUaBs=";
   };
 
   postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "grandalf==0.6" "grandalf" \
-      --replace "scmrepo==0.0.25" "scmrepo" \
-      --replace "pathspec>=0.9.0,<0.10.0" "pathspec"
+    substituteInPlace pyproject.toml \
+      --replace "scmrepo==0.1.6" "scmrepo" \
+      --replace "iterative-telemetry==0.0.6" "iterative-telemetry" \
+      --replace "dvc-data==0.35.1" "dvc-data"
     substituteInPlace dvc/daemon.py \
       --subst-var-by dvc "$out/bin/dcv"
   '';
@@ -34,32 +34,29 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
-    aiohttp-retry
     appdirs
     colorama
     configobj
-    dictdiffer
-    diskcache
     distro
     dpath
     dvclive
     dvc-data
     dvc-render
+    dvc-studio-client
     dvc-task
     flatten-dict
     flufl_lock
     funcy
     grandalf
-    nanotime
+    hydra-core
+    iterative-telemetry
     networkx
     packaging
     pathspec
-    ply
     psutil
     pydot
     pygtrie
     pyparsing
-    python-benedict
     requests
     rich
     ruamel-yaml
@@ -73,16 +70,13 @@ python3.pkgs.buildPythonApplication rec {
     voluptuous
     zc_lockfile
   ] ++ lib.optionals enableGoogle [
-    gcsfs
-    google-cloud-storage
+    dvc-gs
   ] ++ lib.optionals enableAWS [
-    aiobotocore
-    boto3
-    s3fs
+    dvc-s3
   ] ++ lib.optionals enableAzure [
     dvc-azure
   ] ++ lib.optionals enableSSH [
-    bcrypt
+    dvc-ssh
   ] ++ lib.optionals (pythonOlder "3.8") [
     importlib-metadata
   ] ++ lib.optionals (pythonOlder "3.9") [

From 8501dae21614a24a165a3376d9786cde1ff87a31 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Mar 2023 11:27:41 +0100
Subject: [PATCH 36/78] python310Packages.dvc-task: 0.1.11 -> 0.2.0

Diff: https://github.com/iterative/dvc-task/compare/refs/tags/0.1.11...0.2.0

Changelog: https://github.com/iterative/dvc-task/releases/tag/0.2.0
---
 pkgs/development/python-modules/dvc-task/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix
index 21e079492fea..e79f34a6fde2 100644
--- a/pkgs/development/python-modules/dvc-task/default.nix
+++ b/pkgs/development/python-modules/dvc-task/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-task";
-  version = "0.1.11";
+  version = "0.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-0KfH0/rghq+03sFLaR8lsIi4TJuwwca/YhQgILCdHq8=";
+    hash = "sha256-lxK4bo2BYLTEvPIyvjIdFS/36Oh4x1ECagPw9DbYgEg=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 7cab652fe75f6b2b5bbc224023e5066cc66fb848 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Mar 2023 11:46:28 +0100
Subject: [PATCH 37/78] python310Packages.scmrepo: remove postPatch section

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

diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix
index e57a9dbfa12d..8cd0e5a2fcb4 100644
--- a/pkgs/development/python-modules/scmrepo/default.nix
+++ b/pkgs/development/python-modules/scmrepo/default.nix
@@ -11,6 +11,7 @@
 , pygtrie
 , pythonOlder
 , setuptools
+, setuptools-scm
 , shortuuid
 }:
 
@@ -28,14 +29,11 @@ buildPythonPackage rec {
     hash = "sha256-MREY8i6FIeRyjcCKvS8gthsVql81x4Ab7gA7yFgwNoQ=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "asyncssh>=2.7.1,<2.9" "asyncssh>=2.7.1" \
-      --replace "pathspec>=0.9.0,<0.10.0" "pathspec"
-  '';
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [
     setuptools
+    setuptools-scm
   ];
 
   propagatedBuildInputs = [

From 2be32857cb64a4dab4f9e0fc5b1b1388862a4a1b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Mar 2023 12:00:53 +0100
Subject: [PATCH 38/78] python310Packages.dvc-studio-client: 0.3.0 -> 0.6.0

Changelog: https://github.com/iterative/dvc-studio-client/releases/tag/0.6.0
---
 .../python-modules/dvc-studio-client/default.nix       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix
index 933f2db6bda9..1df4430017b9 100644
--- a/pkgs/development/python-modules/dvc-studio-client/default.nix
+++ b/pkgs/development/python-modules/dvc-studio-client/default.nix
@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, dulwich
 , fetchFromGitHub
 , gitpython
 , pythonOlder
@@ -10,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-studio-client";
-  version = "0.3.0";
+  version = "0.6.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -19,7 +20,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-LSehY7dIi7UEZim60X0660WzaZp1VuALcxxNCP7Quuk=";
+    hash = "sha256-uCB7Xz9dPJl0kmQsJt7aIWez8bKLCWO7wIU+bsZcoAg=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -29,9 +30,10 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    voluptuous
-    requests
+    dulwich
     gitpython
+    requests
+    voluptuous
   ];
 
   pythonImportsCheck = [

From 8f3b911ab257a26538868f25f3f30a9de22d9ee7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Mar 2023 12:01:13 +0100
Subject: [PATCH 39/78] dvc: 2.43.1 -> 2.49.0

Changelog: https://github.com/iterative/dvc/releases/tag/2.49.0
---
 .../version-management/dvc/default.nix        | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix
index 8ce779c66b97..902effdb722f 100644
--- a/pkgs/applications/version-management/dvc/default.nix
+++ b/pkgs/applications/version-management/dvc/default.nix
@@ -10,26 +10,28 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "dvc";
-  version = "2.43.1";
+  version = "2.49.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "iterative";
     repo = pname;
-    rev = version;
-    hash = "sha256-FwJErwAVWFZ95wzBalGi9o+8BTtcGvnC9uQE1qTUaBs=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-rDwFOqltj/iR41kQdOOPmcG5jrf4IeHJoBvzZrMFSAE=";
   };
 
+  pythonRelaxDeps = [
+    "dvc-data"
+    "platformdirs"
+  ];
+
   postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "scmrepo==0.1.6" "scmrepo" \
-      --replace "iterative-telemetry==0.0.6" "iterative-telemetry" \
-      --replace "dvc-data==0.35.1" "dvc-data"
     substituteInPlace dvc/daemon.py \
       --subst-var-by dvc "$out/bin/dcv"
   '';
 
   nativeBuildInputs = with python3.pkgs; [
+    pythonRelaxDepsHook
     setuptools-scm
   ];
 
@@ -39,11 +41,12 @@ python3.pkgs.buildPythonApplication rec {
     configobj
     distro
     dpath
-    dvclive
     dvc-data
+    dvc-http
     dvc-render
     dvc-studio-client
     dvc-task
+    dvclive
     flatten-dict
     flufl_lock
     funcy
@@ -53,6 +56,7 @@ python3.pkgs.buildPythonApplication rec {
     networkx
     packaging
     pathspec
+    platformdirs
     psutil
     pydot
     pygtrie
@@ -89,6 +93,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Version Control System for Machine Learning Projects";
     homepage = "https://dvc.org";
+    changelog = "https://github.com/iterative/dvc/releases/tag/${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ cmcdragonkai fab ];
     broken = true; # requires new python package: dvc-studio-client

From af81260184812bdf08393d754b99cb118da0c890 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 00:20:35 +0200
Subject: [PATCH 40/78] python310Packages.dvc-data: 0.41.3 -> 0.47.2

Diff: https://github.com/iterative/dvc-data/compare/refs/tags/0.41.3...0.47.2

Changelog: https://github.com/iterative/dvc-data/releases/tag/0.47.2
---
 pkgs/development/python-modules/dvc-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix
index 151154f19e40..3985fac94a1a 100644
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-data";
-  version = "0.41.3";
+  version = "0.47.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-+rK5OGbIBP7g69swhsgnaJovllxp7XdO8iT3hfYwhV4=";
+    hash = "sha256-5DbnvIScSq+bu8ki0eUwUZd9Gf3KlhD+I0/PpWfGOu0=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 9455d6a0a8e03c811ed8ddf155b97a583b5d473e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 00:20:58 +0200
Subject: [PATCH 41/78] python310Packages.dvc-objects: 0.21.1 -> 0.21.2

Diff: https://github.com/iterative/dvc-objects/compare/refs/tags/0.21.1...0.21.2

Changelog: https://github.com/iterative/dvc-objects/releases/tag/0.21.2
---
 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 652ac0e1c1ed..af3c6af339a9 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 = "0.21.1";
+  version = "0.21.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-JUpK4sAn5ZivjlpHO3XSBXZVDSWkjch/HRqHNrdC7b4=";
+    hash = "sha256-XKfhjzN69U0qiArXJHeLcdv/sMy0gF33FVrk9DuCGLk=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 8c871a7e934830e1368969e83584a0ff99aa8f0e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 00:21:19 +0200
Subject: [PATCH 42/78] python310Packages.dvc-render: 0.2.0 -> 0.4.0

Diff: https://github.com/iterative/dvc-render/compare/refs/tags/0.2.0...0.4.0

Changelog: https://github.com/iterative/dvc-render/releases/tag/0.4.0
---
 pkgs/development/python-modules/dvc-render/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix
index 58b409741f15..efbb810275fe 100644
--- a/pkgs/development/python-modules/dvc-render/default.nix
+++ b/pkgs/development/python-modules/dvc-render/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-render";
-  version = "0.2.0";
+  version = "0.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-1nXNi++vNNRxoA/ptTDN9PtePP67oWdkAtqAbZpTfDg=";
+    hash = "sha256-bt2jqjhgtGmJsyfYNSzETQZUHFKni/poyeqpQzIJX08=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 8516f1e9ab790ba9ba5fa256bbc02abf8882b5ba Mon Sep 17 00:00:00 2001
From: Alex Wied <centromere@users.noreply.github.com>
Date: Mon, 27 Mar 2023 17:01:10 -0400
Subject: [PATCH 43/78] python3Packages.coinmetrics-api-client: 2023.2.23.0 ->
 2023.5.2.20

---
 .../coinmetrics-api-client/default.nix              | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index f8f91489d4a6..0d803dd54afc 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, nix-update-script
 , orjson
 , pandas
 , poetry-core
@@ -15,14 +16,17 @@
 
 buildPythonPackage rec {
   pname = "coinmetrics-api-client";
-  version = "2023.2.23.0";
+  version = "2023.5.2.20";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
+
+  __darwinAllowLocalNetworking = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-XZNGasNYmN4ulfG18M4n8qTO06kSyLoZQj64LzXdl34=";
+    inherit version;
+    pname = "coinmetrics_api_client";
+    hash = "sha256-20+qoCaSNGw4DVlW3USrSkg3fckqF77TQ7wmSsuZ3ek=";
   };
 
   nativeBuildInputs = [
@@ -50,6 +54,7 @@ buildPythonPackage rec {
     optional-dependencies = {
       pandas = [ pandas ];
     };
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {

From 46fdd907922af4f24c773e0368725d72aba28b50 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 00:36:46 +0200
Subject: [PATCH 44/78] python310Packages.pydevd: 2.8.0 -> 2.9.6

---
 .../python-modules/pydevd/default.nix         | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix
index 247c042b6eb0..fe90cb70209f 100644
--- a/pkgs/development/python-modules/pydevd/default.nix
+++ b/pkgs/development/python-modules/pydevd/default.nix
@@ -1,22 +1,26 @@
 { lib
-, fetchFromGitHub
 , buildPythonPackage
-, pytestCheckHook
-, untangle
-, psutil
-, trio
+, fetchFromGitHub
 , numpy
+, psutil
+, pytestCheckHook
+, pythonOlder
+, trio
+, untangle
 }:
 
 buildPythonPackage rec {
   pname = "pydevd";
-  version = "2.8.0";
+  version = "2.9.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "fabioz";
     repo = "PyDev.Debugger";
     rev = "pydev_debugger_${lib.replaceStrings ["."] ["_"] version}";
-    hash = "sha256-+yRngN10654trB09ZZa8QQsTPdM7VxVj7r6jh7OcgAA=";
+    hash = "sha256-TDU/V7kY7zVxiP4OVjGqpsRVYplpkgCly2qAOqhZONo=";
   };
 
   nativeCheckInputs = [
@@ -46,13 +50,14 @@ buildPythonPackage rec {
     "test_tracing_basic"
   ];
 
-  pythonImportsCheck = [ "pydevd" ];
+  pythonImportsCheck = [
+    "pydevd"
+  ];
 
   meta = with lib; {
     description = "PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)";
     homepage = "https://github.com/fabioz/PyDev.Debugger";
     license = licenses.epl10;
     maintainers = with maintainers; [ onny ];
-    broken = true;
   };
 }

From 88b4dbe9a88e87e8617b37894f35e3146a7e4dc4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 00:54:23 +0200
Subject: [PATCH 45/78] python310Packages.omegaconf: suppress deprecation
 warning

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

diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix
index 245c60fc7e4b..d506e06d6f67 100644
--- a/pkgs/development/python-modules/omegaconf/default.nix
+++ b/pkgs/development/python-modules/omegaconf/default.nix
@@ -60,6 +60,11 @@ buildPythonPackage rec {
     "omegaconf"
   ];
 
+  pytestFlagsArray = [
+    "-W"
+    "ignore::DeprecationWarning"
+  ];
+
   meta = with lib; {
     description = "Framework for configuring complex applications";
     homepage = "https://github.com/omry/omegaconf";

From 1c041e3119d1547390c102cc01c6025d6fc38a1e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 01:11:17 +0200
Subject: [PATCH 46/78] kubescape: 2.2.6 -> 2.3.0

Diff: https://github.com/kubescape/kubescape.git/compare/refs/tags/v2.2.6...v2.3.0

Changelog: https://github.com/kubescape/kubescape/releases/tag/v2.3.0
---
 pkgs/tools/security/kubescape/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix
index 63d829caccd7..d0ef28f33cf6 100644
--- a/pkgs/tools/security/kubescape/default.nix
+++ b/pkgs/tools/security/kubescape/default.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "kubescape";
-  version = "2.2.6";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "kubescape";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-tXfjbE4C08YWgLJlZHjagAP3upqCpaOgwSegovVSFCI=";
+    hash = "sha256-xYkNwANAGWlYxGLIhIkOLKmOW/SM3Duqus4WJ6MKGZE=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-bZPM8PCn0+W7Sf/+lQ3ASeqxFSZi49r32rjvQdD7Bvc=";
+  vendorHash = "sha256-SPIMI9HJRF9r5wZfdynwcTTZiZ7SxuJjfcfPg6dMsGo=";
 
   nativeBuildInputs = [
     installShellFiles

From ae666e137f29f4806381ac1a421173b7b7686716 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 01:18:35 +0200
Subject: [PATCH 47/78] python310Packages.dvc-task: 0.2.0 -> 0.2.1

Diff: https://github.com/iterative/dvc-task/compare/refs/tags/0.2.0...0.2.1

Changelog: https://github.com/iterative/dvc-task/releases/tag/0.2.1
---
 pkgs/development/python-modules/dvc-task/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix
index e79f34a6fde2..77b5aa44d319 100644
--- a/pkgs/development/python-modules/dvc-task/default.nix
+++ b/pkgs/development/python-modules/dvc-task/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-task";
-  version = "0.2.0";
+  version = "0.2.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-lxK4bo2BYLTEvPIyvjIdFS/36Oh4x1ECagPw9DbYgEg=";
+    hash = "sha256-DIjS56QDdjH8lp8yZE8UIccOM+OoafJK3DWZ1d/q29k=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 58588886d9abd21d148cbd59e4b46dc170e11c44 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 01:19:05 +0200
Subject: [PATCH 48/78] python310Packages.dvc-studio-client: 0.6.0 -> 0.8.0

Diff: https://github.com/iterative/dvc-studio-client/compare/refs/tags/0.6.0...0.8.0

Changelog: https://github.com/iterative/dvc-studio-client/releases/tag/0.8.0
---
 pkgs/development/python-modules/dvc-studio-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix
index 1df4430017b9..aaa313a5ff37 100644
--- a/pkgs/development/python-modules/dvc-studio-client/default.nix
+++ b/pkgs/development/python-modules/dvc-studio-client/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-studio-client";
-  version = "0.6.0";
+  version = "0.8.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-uCB7Xz9dPJl0kmQsJt7aIWez8bKLCWO7wIU+bsZcoAg=";
+    hash = "sha256-Uk9P/QUlvu3XgGMGZF7d2dPJyYKe3/Ex68HVP8eZqU0=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 7792267495e7b7ee2d2eedf30c3eb5d6e41dc7ad Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 01:19:16 +0200
Subject: [PATCH 49/78] dvc: 2.49.0 -> 2.56.0

Changelog: https://github.com/iterative/dvc/releases/tag/2.56.0
---
 pkgs/applications/version-management/dvc/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix
index 902effdb722f..d491737c843a 100644
--- a/pkgs/applications/version-management/dvc/default.nix
+++ b/pkgs/applications/version-management/dvc/default.nix
@@ -10,14 +10,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "dvc";
-  version = "2.49.0";
+  version = "2.56.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-rDwFOqltj/iR41kQdOOPmcG5jrf4IeHJoBvzZrMFSAE=";
+    hash = "sha256-IpdlNwOuUNWgfphRH2UTQ/IvBHo39PafCqyioju8miI=";
   };
 
   pythonRelaxDeps = [
@@ -46,7 +46,6 @@ python3.pkgs.buildPythonApplication rec {
     dvc-render
     dvc-studio-client
     dvc-task
-    dvclive
     flatten-dict
     flufl_lock
     funcy
@@ -96,6 +95,5 @@ python3.pkgs.buildPythonApplication rec {
     changelog = "https://github.com/iterative/dvc/releases/tag/${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ cmcdragonkai fab ];
-    broken = true; # requires new python package: dvc-studio-client
   };
 }

From b4899e503675249fde87af010cc3650bf34a4a96 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 01:31:14 +0200
Subject: [PATCH 50/78] python310Packages.dvclive: 2.1.0 -> 2.8.1

Changelog: https://github.com/iterative/dvclive/releases/tag/2.8.1
---
 .../python-modules/dvclive/default.nix           | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index a13e5c092a4e..ff88e758f6ca 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -1,17 +1,20 @@
 { lib
 , buildPythonPackage
-, dvc-render
+, dvc
+, dvc-studio-client
 , fetchFromGitHub
+, funcy
 , pytestCheckHook
 , pythonOlder
 , ruamel-yaml
+, scmrepo
 , setuptools-scm
 , tabulate
 }:
 
 buildPythonPackage rec {
   pname = "dvclive";
-  version = "2.1.0";
+  version = "2.8.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -20,7 +23,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-n3JjZrh2ImpjW1MUTwag716qaVjSChrYqNJuNp6K1s8=";
+    hash = "sha256-Wb0347y+oDFOctKjJUYPtqIFdsRm2wt16ZlQWDgjr7g=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -30,9 +33,12 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    dvc-render
+    dvc
+    dvc-studio-client
+    funcy
     ruamel-yaml
-  ] ++ dvc-render.optional-dependencies.table;
+    scmrepo
+  ];
 
   # Circular dependency with dvc
   doCheck = false;

From 3c4933f0905f5a880e06aaeb902017aa334fa675 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 2 May 2023 19:52:12 -0400
Subject: [PATCH 51/78] blender: mark broken on darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Has been broken likely since edcd3849a6f4c11ac7c5fc8092a6deb0c2f7bf8f.

First failing Hydra: https://hydra.nixos.org/build/211894618

Notes from attempt to fix:

- The initial breakage may be easy to fix, but the upgrade to 3.4 added
  a lot more hurdles
- The patch fails to apply, but is trivially naïvely fixable
- At least some of the existing darwin-specific substituteInPlace no
  longer find anything
- When building with naïve fix for patch, fails with:
   > Could NOT find USD (missing: USD_LIBRARY USD_INCLUDE_DIR)
  for reasons that are not clear to me

The package has been broken for two months and no open issues, so
marking as broken as it’s not going to fix itself and if there is will
to fix it, someone can. For now, leaving the darwin conditionals in
place so not as to make a would-be-fixer’s job harder.
---
 pkgs/applications/misc/blender/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 77ba09c23816..50344fe7c4fe 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -181,6 +181,7 @@ stdenv.mkDerivation rec {
     # OptiX, enabled with cudaSupport, is non-free.
     license = with licenses; [ gpl2Plus ] ++ optional cudaSupport unfree;
     platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
+    broken = stdenv.isDarwin;
     maintainers = with maintainers; [ goibhniu veprbl ];
   };
 }

From 43857163596db95bcef9725823ff8862e10de238 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 May 2023 02:34:49 +0000
Subject: [PATCH 52/78] python310Packages.looseversion: 1.0.3 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix
index 5a71caf8c666..cc72639e9ad6 100644
--- a/pkgs/development/python-modules/looseversion/default.nix
+++ b/pkgs/development/python-modules/looseversion/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "looseversion";
-  version = "1.0.3";
+  version = "1.1.2";
   format = "flit";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "sha256-A1KIhg4a/mfWPqnHAN2dCVxyTi5XIqOQKd2RZS1DFu0";
+    sha256 = "sha256-lNgL29C21XwRuIYUe6FgH30VMVcWIbgZM7NFN8vkaa0=";
   };
 
   nativeCheckInputs = [

From fc47ab8656ac6e4f4b8723b1cdee54eb68fdf241 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 May 2023 03:04:17 +0000
Subject: [PATCH 53/78] sdcv: 0.5.4 -> 0.5.5

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

diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix
index 5e2381ccfabc..3ddef749c568 100644
--- a/pkgs/applications/misc/sdcv/default.nix
+++ b/pkgs/applications/misc/sdcv/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sdcv";
-  version = "0.5.4";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "Dushistov";
     repo = "sdcv";
     rev = "v${version}";
-    sha256 = "sha256-i6odmnkoSqDIQAor7Dn26Gu+td9aeMIkwsngF7beBtE=";
+    sha256 = "sha256-EyvljVXhOsdxIYOGTzD+T16nvW7/RNx3DuQ2OdhjXJ4=";
   };
 
   hardeningDisable = [ "format" ];

From 2c642dddb3e3627aba4d498dd551c7876aec768d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 May 2023 03:30:29 +0000
Subject: [PATCH 54/78] python310Packages.zigpy-znp: 0.10.0 -> 0.11.1

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

diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
index ddcf541fd63e..bdeaf9ac47e7 100644
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy-znp";
-  version = "0.10.0";
+  version = "0.11.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-pQ1T7MTrL789kd8cbbsjRLUaxd1yHF7sDwow2UksQ7c=";
+    hash = "sha256-gYzk3XHXlF4+lnrRHYS5RB2QD0oDHgnMov9UFmXder8=";
   };
 
   postPatch = ''

From fe29eb5d379a439d3aa99456651d931176aa894a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 May 2023 03:39:00 +0000
Subject: [PATCH 55/78] monkeysAudio: 9.20 -> 10.10

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

diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix
index 01bb8b6253e2..7142c1a29280 100644
--- a/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/pkgs/applications/audio/monkeys-audio/default.nix
@@ -5,13 +5,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "9.20";
+  version = "10.10";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${
       builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip";
-    sha256 = "sha256-8cJ88plR9jrrLdzRHzRotGBrn6qIqOWvl+oOTXxY/TE=";
+    sha256 = "sha256-fDH7F9xLfR9Q2T3HCirBWdKB7Kb1vxyo8g0PNzHzMCY=";
     stripRoot = false;
   };
   nativeBuildInputs = [

From 2826f59e66889c5503a35ca71d0220cfff261e3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 May 2023 04:17:52 +0000
Subject: [PATCH 56/78] opera: 98.0.4759.6 -> 98.0.4759.15

---
 pkgs/applications/networking/browsers/opera/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 6eb2b6f1b5aa..095790eae806 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -51,11 +51,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "opera";
-  version = "98.0.4759.6";
+  version = "98.0.4759.15";
 
   src = fetchurl {
     url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
-    hash = "sha256-bX0Z+p6DvfsBbglONuGSdVnbIOGZrM1xFtfvbY0U7SQ=";
+    hash = "sha256-nv6/RXsF8rvYoCfsUC1xR79ssroAkfBqzADi02AfYH8=";
   };
 
   unpackPhase = "dpkg-deb -x $src .";

From 74a310fd0afc947b63868097b8868a2fe585e6c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 May 2023 04:28:00 +0000
Subject: [PATCH 57/78] python310Packages.nikola: 8.2.3 -> 8.2.4

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

diff --git a/pkgs/development/python-modules/nikola/default.nix b/pkgs/development/python-modules/nikola/default.nix
index 2f39dcce7153..93bb4e92e122 100644
--- a/pkgs/development/python-modules/nikola/default.nix
+++ b/pkgs/development/python-modules/nikola/default.nix
@@ -41,13 +41,13 @@
 
 buildPythonPackage rec {
   pname = "nikola";
-  version = "8.2.3";
+  version = "8.2.4";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "Nikola";
     inherit version;
-    hash = "sha256-c8eadkmYWS88nGwi6QwPqHg7FBXlkdazKSrbWDMw/UA=";
+    hash = "sha256-LNVk2zfNwY4CC4qulqfNXwi3mWyFxzWIeMykh6gFOL8=";
   };
 
   propagatedBuildInputs = [

From 02726b2f46c7ccc978fefdca0d7963214a99aac1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 May 2023 04:35:11 +0000
Subject: [PATCH 58/78] cargo-public-api: 0.29.0 -> 0.29.1

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

diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix
index cb8d230c29f5..ea1e247edd80 100644
--- a/pkgs/development/tools/rust/cargo-public-api/default.nix
+++ b/pkgs/development/tools/rust/cargo-public-api/default.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-public-api";
-  version = "0.29.0";
+  version = "0.29.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-Tf2nAisZlKPalWa0T5XDAWy+d/ERJYtzJVb3gEdcGSo=";
+    hash = "sha256-4UaLzYwOhVK3Ca4EqQTdi/cMozAeXLWALB5yTQCNi/k=";
   };
 
-  cargoHash = "sha256-X+4C/ExKAVvAX11dBcJHhV7WW/EUI1zk3UR8mBQkSY4=";
+  cargoHash = "sha256-zDgohGKu7jbaWNkb/Nr6ZVkQFEiXzNdEReVBsVuvKDA=";
 
   nativeBuildInputs = [ pkg-config ];
 

From cbc44e6cc654a1ae8930b9928d8b12c1c5597796 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 May 2023 04:43:18 +0000
Subject: [PATCH 59/78] python311Packages.ete3: 3.1.2 -> 3.1.3

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

diff --git a/pkgs/development/python-modules/ete3/default.nix b/pkgs/development/python-modules/ete3/default.nix
index 6b27d2e073bc..b3c598ad396b 100644
--- a/pkgs/development/python-modules/ete3/default.nix
+++ b/pkgs/development/python-modules/ete3/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "ete3";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4fc987b8c529889d6608fab1101f1455cb5cbd42722788de6aea9c7d0a8e59e9";
+    sha256 = "sha256-BqO3+o7ZAYewdqjbvlsbYqzulCAdPG6CL1X0SWAe9vI=";
   };
 
 

From 544ebba97367ac0708c673326ef4e11f8459baad Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 17 Apr 2023 22:02:51 +0300
Subject: [PATCH 60/78] nixos/fail2ban: update bantime options

---
 .../manual/release-notes/rl-2305.section.md   |  2 +
 nixos/modules/services/security/fail2ban.nix  | 69 ++++++++++---------
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index d5f449afd8e8..e937f756991a 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -257,6 +257,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - To enable the HTTP3 (QUIC) protocol for a nginx virtual host, set the `quic` attribute on it to true, e.g. `services.nginx.virtualHosts.<name>.quic = true;`.
 
+- In `services.fail2ban`, `bantime-increment.<name>` options now default to `null` (except `bantime-increment.enable`) and are used to set the corresponding option in `jail.local` only if not `null`. Also, enforce that `bantime-increment.formula` and `bantime-increment.multipliers` are not both specified.
+
 - The default Asterisk package was changed to v20 from v19. Asterisk versions 16 and 19 have been dropped due to being EOL. You may need to update /var/lib/asterisk to match the template files in `${asterisk-20}/var/lib/asterisk`.
 
 - conntrack helper autodetection has been removed from kernels 6.0 and up upstream, and an assertion was added to ensure things don't silently stop working. Migrate your configuration to assign helpers explicitly or use an older LTS kernel branch as a temporary workaround.
diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 93962d40ce4b..22cceda38dd8 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -118,56 +118,56 @@ in
         default = false;
         type = types.bool;
         description = lib.mdDoc ''
-          Allows to use database for searching of previously banned ip's to increase
-          a default ban time using special formula, default it is banTime * 1, 2, 4, 8, 16, 32...
+          "bantime.increment" allows to use database for searching of previously banned ip's to increase
+          a default ban time using special formula, default it is banTime * 1, 2, 4, 8, 16, 32 ...
         '';
       };
 
       bantime-increment.rndtime = mkOption {
-        default = "4m";
-        type = types.str;
+        default = null;
+        type = types.nullOr types.str;
         example = "8m";
         description = lib.mdDoc ''
-          "bantime-increment.rndtime" is the max number of seconds using for mixing with random time
+          "bantime.rndtime" is the max number of seconds using for mixing with random time
           to prevent "clever" botnets calculate exact time IP can be unbanned again
         '';
       };
 
       bantime-increment.maxtime = mkOption {
-        default = "10h";
-        type = types.str;
+        default = null;
+        type = types.nullOr types.str;
         example = "48h";
         description = lib.mdDoc ''
-          "bantime-increment.maxtime" is the max number of seconds using the ban time can reach (don't grows further)
+          "bantime.maxtime" is the max number of seconds using the ban time can reach (don't grows further)
         '';
       };
 
       bantime-increment.factor = mkOption {
-        default = "1";
-        type = types.str;
+        default = null;
+        type = types.nullOr types.str;
         example = "4";
         description = lib.mdDoc ''
-          "bantime-increment.factor" is a coefficient to calculate exponent growing of the formula or common multiplier,
+          "bantime.factor" is a coefficient to calculate exponent growing of the formula or common multiplier,
           default value of factor is 1 and with default value of formula, the ban time grows by 1, 2, 4, 8, 16 ...
         '';
       };
 
       bantime-increment.formula = mkOption {
-        default = "ban.Time * (1<<(ban.Count if ban.Count<20 else 20)) * banFactor";
-        type = types.str;
+        default = null;
+        type = types.nullOr types.str;
         example = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)";
         description = lib.mdDoc ''
-          "bantime-increment.formula" used by default to calculate next value of ban time, default value bellow,
-          the same ban time growing will be reached by multipliers 1, 2, 4, 8, 16, 32...
+          "bantime.formula" used by default to calculate next value of ban time, default value bellow,
+          the same ban time growing will be reached by multipliers 1, 2, 4, 8, 16, 32 ...
         '';
       };
 
       bantime-increment.multipliers = mkOption {
-        default = "1 2 4 8 16 32 64";
-        type = types.str;
-        example = "2 4 16 128";
+        default = null;
+        type = types.nullOr types.str;
+        example = "1 2 4 8 16 32 64";
         description = lib.mdDoc ''
-          "bantime-increment.multipliers" used to calculate next value of ban time instead of formula, corresponding
+          "bantime.multipliers" used to calculate next value of ban time instead of formula, corresponding
           previously ban count and given "bantime.factor" (for multipliers default is 1);
           following example grows ban time by 1, 2, 4, 8, 16 ... and if last ban count greater as multipliers count,
           always used last multiplier (64 in example), for factor '1' and original ban time 600 - 10.6 hours
@@ -175,11 +175,11 @@ in
       };
 
       bantime-increment.overalljails = mkOption {
-        default = false;
-        type = types.bool;
+        default = null;
+        type = types.nullOr types.bool;
         example = true;
         description = lib.mdDoc ''
-          "bantime-increment.overalljails"  (if true) specifies the search of IP in the database will be executed
+          "bantime.overalljails" (if true) specifies the search of IP in the database will be executed
           cross over all jails, if false (default), only current jail of the ban IP will be searched
         '';
       };
@@ -276,6 +276,14 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = (cfg.bantime-increment.formula == null || cfg.bantime-increment.multipliers == null);
+        message = ''
+          Options `services.fail2ban.bantime-increment.formula` and `services.fail2ban.bantime-increment.multipliers` cannot be both specified.
+        '';
+      }
+    ];
 
     warnings = mkIf (config.networking.firewall.enable == false && config.networking.nftables.enable == false) [
       "fail2ban can not be used without a firewall"
@@ -330,15 +338,14 @@ in
     # Add some reasonable default jails.  The special "DEFAULT" jail
     # sets default values for all other jails.
     services.fail2ban.jails.DEFAULT = ''
-      ${optionalString cfg.bantime-increment.enable ''
-        # Bantime incremental
-        bantime.increment    = ${boolToString cfg.bantime-increment.enable}
-        bantime.maxtime      = ${cfg.bantime-increment.maxtime}
-        bantime.factor       = ${cfg.bantime-increment.factor}
-        bantime.formula      = ${cfg.bantime-increment.formula}
-        bantime.multipliers  = ${cfg.bantime-increment.multipliers}
-        bantime.overalljails = ${boolToString cfg.bantime-increment.overalljails}
-      ''}
+      # Bantime increment options
+      bantime.increment = ${boolToString cfg.bantime-increment.enable}
+      ${optionalString (cfg.bantime-increment.rndtime != null) "bantime.rndtime = ${cfg.bantime-increment.rndtime}"}
+      ${optionalString (cfg.bantime-increment.maxtime != null) "bantime.maxtime = ${cfg.bantime-increment.maxtime}"}
+      ${optionalString (cfg.bantime-increment.factor != null) "bantime.factor = ${cfg.bantime-increment.factor}"}
+      ${optionalString (cfg.bantime-increment.formula != null) "bantime.formula = ${cfg.bantime-increment.formula}"}
+      ${optionalString (cfg.bantime-increment.multipliers != null) "bantime.multipliers = ${cfg.bantime-increment.multipliers}"}
+      ${optionalString (cfg.bantime-increment.overalljails != null) "bantime.overalljails = ${boolToString cfg.bantime-increment.overalljails}"}
       # Miscellaneous options
       ignoreip    = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}
       ${optionalString (cfg.bantime != null) ''

From edb40b3e4f35d89a9209de191c2edcb4e56f8e50 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Wed, 26 Apr 2023 23:08:37 +0300
Subject: [PATCH 61/78] nixos/fail2ban: others small update

---
 nixos/modules/services/security/fail2ban.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 22cceda38dd8..eebf2a2f7b55 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -285,7 +285,7 @@ in
       }
     ];
 
-    warnings = mkIf (config.networking.firewall.enable == false && config.networking.nftables.enable == false) [
+    warnings = mkIf (!config.networking.firewall.enable && !config.networking.nftables.enable) [
       "fail2ban can not be used without a firewall"
     ];
 

From cc1fd3fe706f68fa9cb097101f3863edf3fe5069 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:03:13 +0200
Subject: [PATCH 62/78] exploitdb: 2023-04-29 -> 2023-05-03

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-04-29...2023-05-03
---
 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 88969b819dc0..dab8762c1e2a 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-04-29";
+  version = "2023-05-03";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-9GBGjpqsOe4FMcMg3whG/n9zF2h1M6LQp5bJHu0mu+E=";
+    hash = "sha256-6pXGSG2blINzZA34F20YjV7ertJLnjxTHHa6Hv0EN08=";
   };
 
   nativeBuildInputs = [

From d3ad631a6fc169523c93510dc1287e8fe4e4f712 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:04:44 +0200
Subject: [PATCH 63/78] ospd-openvas: 22.4.6 -> 22.5.0

Diff: https://github.com/greenbone/ospd-openvas/compare/refs/tags/v22.4.6...v22.5.0

Changelog: https://github.com/greenbone/ospd-openvas/blob/22.5.0/CHANGELOG.md
---
 pkgs/tools/security/ospd-openvas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ospd-openvas/default.nix b/pkgs/tools/security/ospd-openvas/default.nix
index 1a95f099b236..2122e8deda10 100644
--- a/pkgs/tools/security/ospd-openvas/default.nix
+++ b/pkgs/tools/security/ospd-openvas/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ospd-openvas";
-  version = "22.4.6";
+  version = "22.5.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "ospd-openvas";
     rev = "refs/tags/v${version}";
-    hash = "sha256-tgLOO4L/P6USiPf72uZse36r8HhXJnUUT8PfZH4E/jg=";
+    hash = "sha256-1dzpS5Hov+48BYOkPicVk1duaNM5ueXNr7UKg6aPoZA=";
   };
 
   pythonRelaxDeps = [

From 7962a77e8230a0da65bb1354ed82c261fd9e9ac4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:08:31 +0200
Subject: [PATCH 64/78] python310Packages.pybravia: 0.3.2 -> 0.3.3

Changelog: https://github.com/Drafteed/pybravia/releases/tag/v0.3.3
---
 pkgs/development/python-modules/pybravia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pybravia/default.nix b/pkgs/development/python-modules/pybravia/default.nix
index 07ecdb0bc7e6..b738d3adf01e 100644
--- a/pkgs/development/python-modules/pybravia/default.nix
+++ b/pkgs/development/python-modules/pybravia/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pybravia";
-  version = "0.3.2";
+  version = "0.3.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "Drafteed";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-4TeUPJlNlmZxf1Tw62m5KjoTNHGt6wCSjKixkJBeGyw=";
+    hash = "sha256-Ux9EereKKbgaVQORliW6J5FSBlytLM+m4PVFBk+OW6k=";
   };
 
   nativeBuildInputs = [

From 7fa68bdd2750bd242a5c6cb3a7fc7e34c69b4e36 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:09:34 +0200
Subject: [PATCH 65/78] python310Packages.pyoverkiz: 1.7.7 -> 1.7.8

Changelog: https://github.com/iMicknl/python-overkiz-api/releases/tag/v1.7.8
---
 pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index b454381c4706..a531d48740b0 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyoverkiz";
-  version = "1.7.7";
+  version = "1.7.8";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "iMicknl";
     repo = "python-overkiz-api";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QYvnSFt0pJL3clDxN2axJUMU8M/maj3iSeUfVRgQGFg=";
+    hash = "sha256-DZ9MpwlZvq6LHbvnesk7XtGsHOhZvc1tXb/xVDQuR48=";
   };
 
   postPatch = ''

From 72399d744eaafaf2f416f36a85340f57a85c7e5e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:10:25 +0200
Subject: [PATCH 66/78] python310Packages.python-roborock: 0.9.0 -> 0.10.0

Changelog: https://github.com/humbertogontijo/python-roborock/blob/v0.10.0/CHANGELOG.md
---
 pkgs/development/python-modules/python-roborock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index 968300ddc475..a52dd48833d7 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "python-roborock";
-  version = "0.9.0";
+  version = "0.10.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "humbertogontijo";
     repo = "python-roborock";
     rev = "refs/tags/v${version}";
-    hash = "sha256-w3UpbkBBSPcz3872HDp8MduAIgn0+8R+0C0pGU6fDJM=";
+    hash = "sha256-3t9ep6JHczvNBJdJqdwrZSS+ZEh4UYQkPCx0X4e7gNY=";
   };
 
   nativeBuildInputs = [

From ae2b5c670084d50db86eb59f6842adabc6989e82 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:13:09 +0200
Subject: [PATCH 67/78] metasploit: 6.3.13 -> 6.3.14

---
 pkgs/tools/security/metasploit/Gemfile      |  2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 32 ++++++-------
 pkgs/tools/security/metasploit/default.nix  |  4 +-
 pkgs/tools/security/metasploit/gemset.nix   | 50 ++++++++++-----------
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 7595e891610d..6ab06373d797 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.13"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.14"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 8a748567b1fe..27470a4b58f6 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: f58dd240e0c900976bc0609096b3b2e9965f70cb
-  ref: refs/tags/6.3.13
+  revision: 44a9a761be544d3435963076dcbbeb8a4fa0e47f
+  ref: refs/tags/6.3.14
   specs:
-    metasploit-framework (6.3.13)
+    metasploit-framework (6.3.14)
       actionpack (~> 7.0)
       activerecord (~> 7.0)
       activesupport (~> 7.0)
@@ -33,7 +33,7 @@ GIT
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 2.0.126)
+      metasploit-payloads (= 2.0.127)
       metasploit_data_models
       metasploit_payloads-mettle (= 1.0.20)
       mqtt
@@ -130,19 +130,19 @@ GEM
     arel-helpers (2.14.0)
       activerecord (>= 3.1.0, < 8)
     aws-eventstream (1.2.0)
-    aws-partitions (1.752.0)
+    aws-partitions (1.759.0)
     aws-sdk-core (3.171.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-ec2 (1.375.0)
+    aws-sdk-ec2 (1.377.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-iam (1.77.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.63.0)
+    aws-sdk-kms (1.64.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.121.0)
@@ -205,7 +205,7 @@ GEM
       domain_name (~> 0.5)
     http_parser.rb (0.8.0)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     io-console (0.6.0)
     irb (1.6.4)
@@ -241,7 +241,7 @@ GEM
       activemodel (~> 7.0)
       activesupport (~> 7.0)
       railties (~> 7.0)
-    metasploit-payloads (2.0.126)
+    metasploit-payloads (2.0.127)
     metasploit_data_models (6.0.2)
       activerecord (~> 7.0)
       activesupport (~> 7.0)
@@ -254,7 +254,7 @@ GEM
       webrick
     metasploit_payloads-mettle (1.0.20)
     method_source (1.0.0)
-    mini_portile2 (2.8.1)
+    mini_portile2 (2.8.2)
     minitest (5.18.0)
     mqtt (0.6.0)
     msgpack (1.7.0)
@@ -291,12 +291,12 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.5.1)
+    pg (1.5.3)
     public_suffix (5.0.1)
     puma (6.2.2)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.6.4)
+    rack (2.2.7)
     rack-protection (3.0.6)
       rack
     rack-test (2.1.0)
@@ -330,7 +330,7 @@ GEM
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.30)
+    rex-core (0.1.31)
     rex-encoder (0.1.6)
       metasm
       rex-arch
@@ -360,7 +360,7 @@ GEM
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.49)
+    rex-socket (0.1.50)
       rex-core
     rex-sslscan (0.1.9)
       rex-core
@@ -436,7 +436,7 @@ GEM
       activesupport (>= 4.2, < 8.0)
     xmlrpc (0.3.2)
       webrick
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
@@ -445,4 +445,4 @@ DEPENDENCIES
   metasploit-framework!
 
 BUNDLED WITH
-   2.4.10
+   2.4.12
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index a47cad064f10..4c1037ae2da3 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -15,13 +15,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "6.3.13";
+  version = "6.3.14";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "sha256-bmp5H7awE8ZaLrPt9UEXeK6haaLzejsIq8jk1bbnv/c=";
+    sha256 = "sha256-4gmzR3Ulz8lDwoSRUhPoOdMXtBio5iTJw4FWbs1znqs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index b3ac89b5ad66..5d1ae9fc169c 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -104,10 +104,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18ndv604p1p3gkyy0d958jx2wp74d100q6vbc6ak70a7bv93wqsg";
+      sha256 = "0rrfwdzv8xpyjg52xvyabqxvcahk77ag2cfgpxky4w1jsv8khwv9";
       type = "gem";
     };
-    version = "1.752.0";
+    version = "1.759.0";
   };
   aws-sdk-core = {
     groups = ["default"];
@@ -124,10 +124,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zj67jzg81nr3da2mwh27b22ps2waz41fhvc2f2khdfjazi7knqv";
+      sha256 = "06l027yxps5lar958qszjls9whv39wwm22v91898lpj82v2c974r";
       type = "gem";
     };
-    version = "1.375.0";
+    version = "1.377.0";
   };
   aws-sdk-iam = {
     groups = ["default"];
@@ -144,10 +144,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02";
+      sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0";
       type = "gem";
     };
-    version = "1.63.0";
+    version = "1.64.0";
   };
   aws-sdk-s3 = {
     groups = ["default"];
@@ -504,10 +504,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
+      sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x";
       type = "gem";
     };
-    version = "1.12.0";
+    version = "1.13.0";
   };
   io-console = {
     groups = ["default"];
@@ -624,12 +624,12 @@
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "f58dd240e0c900976bc0609096b3b2e9965f70cb";
-      sha256 = "1xxzwyvdbr68mc43nypkl9ls3bkq2x0zbvdk5rdcc4xhnqgpjskf";
+      rev = "44a9a761be544d3435963076dcbbeb8a4fa0e47f";
+      sha256 = "1awyfg6nwml1qg4j9rm832s1glrrx09m54c4q91wkkr5fm3v62g2";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.3.13";
+    version = "6.3.14";
   };
   metasploit-model = {
     groups = ["default"];
@@ -646,10 +646,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dncaysx2llgcy5a4vgv93hbp3cmiqa36ch229vmshfr296vfqr8";
+      sha256 = "0zb15r1m4lnqh91cw7nly800xv1b85437hszyfpxj687ldklm9j7";
       type = "gem";
     };
-    version = "2.0.126";
+    version = "2.0.127";
   };
   metasploit_data_models = {
     groups = ["default"];
@@ -686,10 +686,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp";
+      sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6";
       type = "gem";
     };
-    version = "2.8.1";
+    version = "2.8.2";
   };
   minitest = {
     groups = ["default"];
@@ -927,10 +927,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ihx7icaib5hfr51s44aw63y7g8za3gkqk3diwp75hzkbgjj9hrc";
+      sha256 = "1zcvxmfa8hxkhpp59fhxyxy1arp70f11zi1jh9c7bsdfspifb7kb";
       type = "gem";
     };
-    version = "1.5.1";
+    version = "1.5.3";
   };
   public_suffix = {
     groups = ["default"];
@@ -967,10 +967,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk";
+      sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk";
       type = "gem";
     };
-    version = "2.2.6.4";
+    version = "2.2.7";
   };
   rack-protection = {
     groups = ["default"];
@@ -1107,10 +1107,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1djg6dk804l55vhnp8wm6phir9wgvb7biv4jiyi78w95cxb1vfk6";
+      sha256 = "0s5fz1fipk2x9grd8rj7n09wfmq78kdhw9fvrmgr9z52zi640xzs";
       type = "gem";
     };
-    version = "0.1.30";
+    version = "0.1.31";
   };
   rex-encoder = {
     groups = ["default"];
@@ -1217,10 +1217,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0il5kknd85msng18m78a5gqcy918dlwjcvq4abxh3zw170n4g5iv";
+      sha256 = "0wvq9miaqncyjmdphkn87ab5pk3yciplbcgzsp5q322pwmssqb1i";
       type = "gem";
     };
-    version = "0.1.49";
+    version = "0.1.50";
   };
   rex-sslscan = {
     groups = ["default"];
@@ -1608,9 +1608,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1";
+      sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk";
       type = "gem";
     };
-    version = "2.6.7";
+    version = "2.6.8";
   };
 }

From bc0bb4dd0ddea03aefad59ef32b0343d995ba1ba Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:13:10 +0200
Subject: [PATCH 68/78] python310Packages.pywemo: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix
index d71d84627f2a..14d1f7be954c 100644
--- a/pkgs/development/python-modules/pywemo/default.nix
+++ b/pkgs/development/python-modules/pywemo/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pywemo";
-  version = "0.9.1";
+  version = "0.9.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-RgG2bKA7ifuOPX0ZDKv92S4Gpp9zaansKiEpYrYfPt4=";
+    hash = "sha256-mrLZ8W7imM/ysJhd4OcqZFzx2z/KG8k5bOPFb4ldYzE=";
   };
 
   nativeBuildInputs = [

From 4ab2c30121702cb9b1d49470526ac8061371af49 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:15:45 +0200
Subject: [PATCH 69/78] python310Packages.pywemo: add changelog to meta

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

diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix
index 14d1f7be954c..244a68de6ace 100644
--- a/pkgs/development/python-modules/pywemo/default.nix
+++ b/pkgs/development/python-modules/pywemo/default.nix
@@ -48,6 +48,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module to discover and control WeMo devices";
     homepage = "https://github.com/pywemo/pywemo";
+    changelog = "https://github.com/pywemo/pywemo/releases/tag/${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From 78005aacad583cd5d210103ecf3a6a20565140c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:22:15 +0200
Subject: [PATCH 70/78] python310Packages.nikola: add changelog to meta

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

diff --git a/pkgs/development/python-modules/nikola/default.nix b/pkgs/development/python-modules/nikola/default.nix
index 93bb4e92e122..ebde9252701e 100644
--- a/pkgs/development/python-modules/nikola/default.nix
+++ b/pkgs/development/python-modules/nikola/default.nix
@@ -42,6 +42,8 @@
 buildPythonPackage rec {
   pname = "nikola";
   version = "8.2.4";
+  format = "setuptools";
+
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
@@ -110,6 +112,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Static website and blog generator";
     homepage = "https://getnikola.com/";
+    changelog = "https://github.com/getnikola/nikola/blob/v${version}/CHANGES.txt";
     license = licenses.mit;
     maintainers = with maintainers; [ jluttine ];
     # All tests fail

From dc7bdffb6a189b97f9bef5d010b330388e9f5310 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:25:14 +0200
Subject: [PATCH 71/78] python310Packages.zigpy-znp: add changelog to meta

---
 .../python-modules/zigpy-znp/default.nix        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
index bdeaf9ac47e7..859bb451203a 100644
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -49,15 +49,15 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pytestFlagsArray = [
+  disabledTests = [
     # https://github.com/zigpy/zigpy-znp/issues/209
-    "--deselect=tests/application/test_joining.py::test_join_device"
-    "--deselect=tests/application/test_joining.py::test_permit_join"
-    "--deselect=tests/application/test_requests.py::test_request_recovery_route_rediscovery_af"
-    "--deselect=tests/application/test_requests.py::test_request_recovery_route_rediscovery_zdo"
-    "--deselect=tests/application/test_requests.py::test_zigpy_request"
-    "--deselect=tests/application/test_requests.py::test_zigpy_request_failure"
-    "--deselect=tests/application/test_zdo_requests.py::test_mgmt_nwk_update_req"
+    "test_join_device"
+    "test_permit_join"
+    "test_request_recovery_route_rediscovery_af"
+    "test_request_recovery_route_rediscovery_zdo"
+    "test_zigpy_request"
+    "test_zigpy_request_failure"
+    "test_mgmt_nwk_update_req"
   ];
 
   pythonImportsCheck = [
@@ -67,6 +67,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library for zigpy which communicates with TI ZNP radios";
     homepage = "https://github.com/zigpy/zigpy-znp";
+    changelog = "https://github.com/zigpy/zigpy-znp/releases/tag/v${version}";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ mvnetbiz ];
     platforms = platforms.linux;

From 0234a93a9445fca5783fe29dd0195a83ced825a6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:48:22 +0200
Subject: [PATCH 72/78] python310Packages.google-cloud-dataproc: 5.4.0 -> 5.4.1

Changelog: https://github.com/googleapis/python-dataproc/blob/v5.4.1/CHANGELOG.md
---
 .../python-modules/google-cloud-dataproc/default.nix        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 70f339e7038c..522d466bdad0 100644
--- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , google-api-core
+, grpc-google-iam-v1
 , mock
 , libcst
 , proto-plus
@@ -13,18 +14,19 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dataproc";
-  version = "5.4.0";
+  version = "5.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-oMX+XMglmgu2sfREVxSq/E9foEf49UzHEzkUupeFb14=";
+    hash = "sha256-GJbhT2PBIaPx4sIhKHzH/QBlDSpz+LOPggQK5tWqt78=";
   };
 
   propagatedBuildInputs = [
     google-api-core
+    grpc-google-iam-v1
     libcst
     proto-plus
     protobuf

From fd3c5095edf4a0650f6cee2195512faef4b1f8fb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:51:03 +0200
Subject: [PATCH 73/78] python310Packages.google-cloud-bigquery-datatransfer:
 3.11.0 -> 3.11.1

Changelog: https://github.com/googleapis/python-bigquery-datatransfer/blob/v3.11.1/CHANGELOG.md
---
 .../google-cloud-bigquery-datatransfer/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index dc51cb1988e7..3be14ed4ec29 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-datatransfer";
-  version = "3.11.0";
+  version = "3.11.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AXBFNLF39+H/KLrWQ/rXQAAMC6hMsGXQ5XFTDs4Y3EY=";
+    hash = "sha256-IRD02YbB3355uo/5+qCeRjQt4pU5NUuZ3tbTNZyc9lA=";
   };
 
   propagatedBuildInputs = [

From 877e059dfcd611957bd23cb1399a18805b45a4b2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 09:51:48 +0200
Subject: [PATCH 74/78] python310Packages.google-cloud-firestore: 2.11.0 ->
 2.11.1

Changelog: https://github.com/googleapis/python-firestore/blob/v2.11.1/CHANGELOG.md
---
 .../python-modules/google-cloud-firestore/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix
index a3134f96f5c8..70570bfdced9 100644
--- a/pkgs/development/python-modules/google-cloud-firestore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-firestore";
-  version = "2.11.0";
+  version = "2.11.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mA3FX3Cg7ldApxNGka21jNW9ljGKu+rF3MhfqmekDa4=";
+    hash = "sha256-f336hlZ8jWbGbI26i8XvhWd8hTK0IGBVozlBP4BxUl0=";
   };
 
   propagatedBuildInputs = [

From 9446fb54ce77eddcb944254dbf6e3898aca2daea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 10:07:12 +0200
Subject: [PATCH 75/78] python310Packages.runway-python: remove

This SDK has been deprecated. The functionality described below
has been sunset and models can no longer be ported to Runway at
this time.
---
 .../python-modules/runway-python/default.nix  | 100 ------------------
 pkgs/top-level/python-aliases.nix             |   1 +
 pkgs/top-level/python-packages.nix            |   2 -
 3 files changed, 1 insertion(+), 102 deletions(-)
 delete mode 100644 pkgs/development/python-modules/runway-python/default.nix

diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix
deleted file mode 100644
index 28c282ed6dfd..000000000000
--- a/pkgs/development/python-modules/runway-python/default.nix
+++ /dev/null
@@ -1,100 +0,0 @@
-{ lib
-, buildPythonPackage
-, pythonAtLeast
-, fetchFromGitHub
-, colorcet
-, cryptography
-, flask
-, flask-compress
-, flask-cors
-, flask-sockets
-, gevent
-, imageio
-, numpy
-, pillow
-, pyopenssl
-, scipy
-, six
-, unidecode
-, urllib3
-, wget
-, deepdiff
-, pytest-cov
-, pytestCheckHook
-, pythonOlder
-, websocket-client
-}:
-
-buildPythonPackage rec {
-  pname = "runway-python";
-  version = "0.6.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
-
-  src = fetchFromGitHub {
-    owner = "runwayml";
-    repo = "model-sdk";
-    rev = version;
-    hash = "sha256-Qn+gsvxxUJee7k060lPk53qi15xwC/JORJ5aHKLigvM=";
-  };
-
-  propagatedBuildInputs = [
-    colorcet
-    cryptography
-    flask
-    flask-compress
-    flask-cors
-    flask-sockets
-    gevent
-    imageio
-    numpy
-    pillow
-    pyopenssl
-    scipy
-    six
-    unidecode
-    urllib3
-    wget
-  ] ++ urllib3.optional-dependencies.secure;
-
-  nativeCheckInputs = [
-    deepdiff
-    pytest-cov
-    pytestCheckHook
-    websocket-client
-  ];
-
-  postPatch = ''
-    # Build fails with:
-    # ERROR: No matching distribution found for urllib3-secure-extra; extra == "secure"
-    substituteInPlace requirements.txt \
-      --replace "urllib3[secure]>=1.25.7" "urllib3"
-  '';
-
-  disabledTests = [
-    # These tests require network
-    "test_file_deserialization_remote"
-    "test_file_deserialization_absolute_directory"
-    "test_file_deserialization_remote_directory"
-    # Fails with a decoding error at the moment
-    "test_inference_async"
-  ] ++ lib.optionals (pythonAtLeast "3.9") [
-    # AttributeError: module 'base64' has no attribute 'decodestring
-    # https://github.com/runwayml/model-sdk/issues/99
-    "test_image_serialize_and_deserialize"
-    "test_segmentation_serialize_and_deserialize_colormap"
-    "test_segmentation_serialize_and_deserialize_labelmap"
-  ];
-
-  pythonImportsCheck = [
-    "runway"
-  ];
-
-  meta = {
-    description = "Helper library for creating Runway models";
-    homepage = "https://github.com/runwayml/model-sdk";
-    license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ prusnak ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index e0fb03cbca0d..53d0ad6df5b4 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -260,6 +260,7 @@ mapAliases ({
   ruamel_base = ruamel-base; # added 2021-11-01
   ruamel_yaml = ruamel-yaml; # added 2021-11-01
   ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01
+  runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03
   sapi-python-client = kbcstorage; # added 2022-04-20
   scikitlearn = scikit-learn; # added 2021-07-21
   selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bc2bb0ced484..babbc1b68f23 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10562,8 +10562,6 @@ self: super: with self; {
 
   ruffus = callPackage ../development/python-modules/ruffus { };
 
-  runway-python = callPackage ../development/python-modules/runway-python { };
-
   ruuvitag-ble = callPackage ../development/python-modules/ruuvitag-ble { };
 
   ruyaml = callPackage ../development/python-modules/ruyaml { };

From 48f46717b1890dfa54da47a2a3d6f301ae3891d2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 3 May 2023 10:43:08 +0200
Subject: [PATCH 76/78] checkov: 2.3.214 -> 2.3.216

Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.214...2.3.216

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.216
---
 pkgs/development/tools/analysis/checkov/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 10b3e5f8cf82..db35da57c663 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -22,14 +22,14 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "checkov";
-  version = "2.3.214";
+  version = "2.3.216";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-MmwMB5bb6mqZ9ZyBeOXF/rmofLLgvIRxEcj0uh+0zcA=";
+    hash = "sha256-A9X7QrqgPgVxCf1O7dbhoaRaZDDI73e1Wl5elBZDbO4=";
   };
 
   patches = [

From 86236aacd57821a65e3bb9115b47d66e5a9c0bbb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 May 2023 08:52:50 +0000
Subject: [PATCH 77/78] purescript: 0.15.8 -> 0.15.9

---
 .../development/compilers/purescript/purescript/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index 348d29634213..2e0eb9534f4f 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -18,7 +18,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "purescript";
-  version = "0.15.8";
+  version = "0.15.9";
 
   # These hashes can be updated automatically by running the ./update.sh script.
   src =
@@ -26,12 +26,12 @@ in stdenv.mkDerivation rec {
     then
     fetchurl {
       url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
-      sha256 = "0aq6b8yw2ll3qgmc21ap2pxfnr7glqhrjx3ggc21q4gwq3zxrrrp";
+      sha256 = "1xxg79rlf7li9f73wdbwif1dyy4hnzpypy6wx4zbnvap53habq9f";
     }
     else
     fetchurl {
       url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
-      sha256 = "192px9a4ja1iazhahc6ilgxk0x2bjp59qxd9zaww4pldj1b7z20y";
+      sha256 = "0rabinklsd8bs16f03zv7ij6d1lv4w2xwvzzgkwc862gpqvz9jq3";
     };
 
 

From 2d8c06b63757cb8d64d301fdcad4988d014f96b4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 1 May 2023 16:33:40 +0000
Subject: [PATCH 78/78] bozohttpd: 20210227 -> 20220517

---
 pkgs/servers/http/bozohttpd/default.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix
index 8cb7be7f719a..2087c2f591d6 100644
--- a/pkgs/servers/http/bozohttpd/default.nix
+++ b/pkgs/servers/http/bozohttpd/default.nix
@@ -22,27 +22,15 @@ let inherit (lib) optional optionals;
 in
 stdenv.mkDerivation rec {
   pname = "bozohttpd";
-  version = "20210227";
+  version = "20220517";
 
   # bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at:
   # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo
   src = fetchurl {
     url = "http://www.eterna.com.au/${pname}/${pname}-${version}.tar.bz2";
-    sha512 = "b838498626ffb7f7e84f31611e0e99aaa3af64bd9376e1a13ec16313c182eebfd9ea2c2d03904497239af723bf34a3d2202dac1f2d3e55f9fd076f6d45ccfa33";
+    sha512 = "275b8fab3cf2e6c59721682cae952db95da5bd3b1f20680240c6cf1029463693f6feca047fbef5e3a3e7528b40b7b2e87b2a56fd800b612e679a16f24890e5b6";
   };
 
-  # backport two unreleased commits to fix builds on non-netbsd platforms.
-  patches = [
-    # add missing `#include <stdint.h>`
-    # https://freshbsd.org/netbsd/src/commit/qMGNoXfgeieZBVRC
-    ./0001-include-stdint.h.patch
-
-    # BUFSIZ is not guaranteed to be large enough
-    # https://freshbsd.org/netbsd/src/commit/A4ueIHIp3JgjNVRC
-    ./0002-dont-use-host-BUFSIZ.patch
-  ];
-  patchFlags = [ "-p3" ];
-
   buildInputs = [ openssl libxcrypt ] ++ optional (luaSupport) lua;
   nativeBuildInputs = [ bmake groff ];