Merge master into staging-next

2025-02-22 20:14:37 +00:00 · 2023-08-31 06:00:58 +00:00 · 2023-08-31 06:00:58 +00:00 · f57e8b5fb2
commit f57e8b5fb2
parent ce84b1371f 9b4d043ba2
57 changed files with 3278 additions and 858 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -18984,6 +18984,12 @@
    githubId = 1319905;
    name = "Uma Zalakain";
  };
+  zaldnoay = {
+    email = "zunway@outlook.com";
+    github = "zaldnoay";
+    githubId = 5986078;
+    name = "Zunway Liang";
+  };
  zanculmarktum = {
    name = "Azure Zanculmarktum";
    email = "zanculmarktum@gmail.com";
--- a/pkgs/applications/editors/teehee/default.nix
+++ b/pkgs/applications/editors/teehee/default.nix
@ -0,0 +1,27 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "teehee";
+  version = "0.2.8";
+
+  src = fetchFromGitHub {
+    owner = "Gskartwii";
+    repo = "teehee";
+    rev = "v${version}";
+    hash = "sha256-yTterXAev6eOnUe1/MJV8s8dUYJcXHDKVJ6T0G/JHzI=";
+  };
+
+  cargoHash = "sha256-hEc7MaqTXMrKiosYacPw/b1ANnfZKdlhThOp2h14fg4=";
+
+  meta = with lib; {
+    description = "A modal terminal hex editor";
+    homepage = "https://github.com/Gskartwii/teehee";
+    changelog = "https://github.com/Gskartwii/teehee/releases/tag/${src.rev}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "teehee";
+  };
+}
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -5,12 +5,12 @@
 {
  ada = buildGrammar {
    language = "ada";
-    version = "0.0.0+rev=f67bc66";
+    version = "0.0.0+rev=0f572c4";
    src = fetchFromGitHub {
      owner = "briot";
      repo = "tree-sitter-ada";
-      rev = "f67bc6622a9b9bc879b2808164abdbaf99d65d4a";
-      hash = "sha256-jgTHVUC3b0i2k/foNaEZ3UKVkfREUF4oIZ3QIVBbvy0=";
+      rev = "0f572c4dccac8cd6a149bbc88c9d8423e9c71ce9";
+      hash = "sha256-LNpzqyafrh1JKj0VXaq3Hf3IZHqM1UcUAXy2xVXeSEQ=";
    };
    meta.homepage = "https://github.com/briot/tree-sitter-ada";
  };
@ -60,12 +60,12 @@
  };
  bash = buildGrammar {
    language = "bash";
-    version = "0.0.0+rev=a7be575";
+    version = "0.0.0+rev=4798bc6";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-bash";
-      rev = "a7be575f17ff9d5340dfd0f60e466cd92a7501d5";
-      hash = "sha256-fBQs+HDite1OoHJexqMKRoRpG2fD1YMK739RbmwCgYo=";
+      rev = "4798bc61410fcb3ae725bab24f96f5c4684cea71";
+      hash = "sha256-VHzmBJc9Y3T0jRnOLDJEDVsC/ufGTryWzz/uxgHX2ck=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
  };
@ -403,12 +403,12 @@
  };
  doxygen = buildGrammar {
    language = "doxygen";
-    version = "0.0.0+rev=1928411";
+    version = "0.0.0+rev=7ac6203";
    src = fetchFromGitHub {
      owner = "amaanq";
      repo = "tree-sitter-doxygen";
-      rev = "19284113dbd42263c13b39d81b2a3b2492022c9b";
-      hash = "sha256-DzD/3c/zErauG0y8MKymeUXMuoFWkF2OzKY93Ap9Fp4=";
+      rev = "7ac6203cc018ff440b45b6d5aeba596f02eec4d5";
+      hash = "sha256-QgmbdB9byVxLpsKB+FaQyyqUO8YuTfnYSTP9hDj5OOU=";
    };
    meta.homepage = "https://github.com/amaanq/tree-sitter-doxygen";
  };
@ -680,12 +680,12 @@
  };
  gleam = buildGrammar {
    language = "gleam";
-    version = "0.0.0+rev=8302c98";
+    version = "0.0.0+rev=a59aadf";
    src = fetchFromGitHub {
      owner = "gleam-lang";
      repo = "tree-sitter-gleam";
-      rev = "8302c98ed78128b22f946fadefaf4af5ba5d5850";
-      hash = "sha256-rWNReuod+P7/Wq+zJoJNo9tWLLpo9Xu7B5MYxjWdp0I=";
+      rev = "a59aadf3d7c11702cad244e7cd6b67b34ca9c16a";
+      hash = "sha256-HZJGKJ5KGcNIW6VEKHZLi9ai2bhklCNlbYAyz232+Ek=";
    };
    meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
  };
@ -801,12 +801,12 @@
  };
  hack = buildGrammar {
    language = "hack";
-    version = "0.0.0+rev=2887d39";
+    version = "0.0.0+rev=fca1e29";
    src = fetchFromGitHub {
      owner = "slackhq";
      repo = "tree-sitter-hack";
-      rev = "2887d3927c5fadebfd71c604922d0c59748e9901";
-      hash = "sha256-rScvFdoyv0odnAcoKhS+iBaBziV/uaKJa51zPnxMBFQ=";
+      rev = "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2";
+      hash = "sha256-XTcsqCvlwbAAi7/TXrYX8wT56Ie+0OW5+eNRMH7XNyk=";
    };
    meta.homepage = "https://github.com/slackhq/tree-sitter-hack";
  };
@ -988,12 +988,12 @@
  };
  java = buildGrammar {
    language = "java";
-    version = "0.0.0+rev=38be6ec";
+    version = "0.0.0+rev=ca4afaa";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-java";
-      rev = "38be6eccc1b86d6ec5dca0976659e807fd4dc28d";
-      hash = "sha256-0kOLAVsrCUfpU8sZGRVrr+D3bGWj8bH2qce/ygrIw2w=";
+      rev = "ca4afaaa41dd7735b35edc0a77629cf932e95799";
+      hash = "sha256-b87WFvpboNcQUt3W7tbsfkxzIfc27D0djBgMiF68/EA=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
  };
@ -1798,12 +1798,12 @@
  };
  rust = buildGrammar {
    language = "rust";
-    version = "0.0.0+rev=39eaeb4";
+    version = "0.0.0+rev=17a6b15";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-rust";
-      rev = "39eaeb41e17572c17e35bb050d6bf2da17568dbf";
-      hash = "sha256-2WPL7ap2fHEi0+pNnJlHLxKBqPrHsve+DzJSCqw/gpw=";
+      rev = "17a6b15562b09db1f27b8f5f26f17edbb2aac097";
+      hash = "sha256-seWoMuA87ZWCq3mUXopVeDCcTxX/Bh+B4PFLVa0CBQA=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
  };
@ -2077,12 +2077,12 @@
  };
  tiger = buildGrammar {
    language = "tiger";
-    version = "0.0.0+rev=4a09924";
+    version = "0.0.0+rev=a7f11d9";
    src = fetchFromGitHub {
      owner = "ambroisie";
      repo = "tree-sitter-tiger";
-      rev = "4a099243ed68a4fc72fdad8ea3ce57ec411ebfe3";
-      hash = "sha256-y3bpfBPwvkFNMl1qZtlnpVhi5nnOqo0K9XGS2bCWPmY=";
+      rev = "a7f11d946b44244f71df41d2a78af0665d618dae";
+      hash = "sha256-zGrbf5cCkgKGw+dQiEqUyHqj8Fu42MfAhEEADoC8DIA=";
    };
    meta.homepage = "https://github.com/ambroisie/tree-sitter-tiger";
  };
@ -2312,12 +2312,12 @@
  };
  wing = buildGrammar {
    language = "wing";
-    version = "0.0.0+rev=2b2aa81";
+    version = "0.0.0+rev=915f263";
    src = fetchFromGitHub {
      owner = "winglang";
      repo = "wing";
-      rev = "2b2aa817bef5f56c56c8a0d02961858dd47c5860";
-      hash = "sha256-aMB6n0GfYap+Damt27Xuwom2qhX/seyuE6YHqnY211M=";
+      rev = "915f263722a6a74e5a30be82310d3843ed203058";
+      hash = "sha256-wUYw3RS0brNbdFcb3ojs6gkrxBuOdRquTEmHTwAzc8w=";
    };
    location = "libs/tree-sitter-wing";
    generate = true;
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -966,7 +966,7 @@ self: super: {
        pname = "sg-nvim-rust";
        inherit (old) version src;

-        cargoHash = "sha256-qwllMt4va9j8Sfh2+xYcfRtQgypNKZLDT3gRD7dUQ+w=";
+        cargoHash = "sha256-BXmf/eUxfsqq49K31k1+KjMHTV7KBTh0Sse/hCcFjqw=";

        nativeBuildInputs = [ pkg-config ];

--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -665,6 +665,7 @@ https://github.com/Almo7aya/openingh.nvim/,,
 https://github.com/salkin-mada/openscad.nvim/,HEAD,
 https://github.com/nvim-orgmode/orgmode/,,
 https://github.com/rgroli/other.nvim/,HEAD,
+https://github.com/jmbuhr/otter.nvim/,,
 https://github.com/stevearc/overseer.nvim/,HEAD,
 https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD,
 https://github.com/vuki656/package-info.nvim/,,
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@ -2,6 +2,7 @@
 , stdenv
 , cmake
 , fetchurl
+, fetchpatch
 , gnumake
 , makeWrapper
 , pkg-config
@ -41,9 +42,17 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2";
-    sha256 = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac=";
+    hash = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac=";
  };

+  patches = [
+    (fetchpatch {
+      name = "hugin-2022.0.0-exiv2-0.28.patch";
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch?id=d18335caa756f5e5c1478d5fe3ba17f011a78c80";
+      hash = "sha256-Y+79bFb926GW5oLOL0e5y7kLhqU/vZcry+kLL4H2fUE=";
+    })
+  ];
+
  buildInputs = [
    boost
    cairo
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@ -29,7 +29,7 @@ in buildPythonApplication rec {
    owner = "mypaint";
    repo = "mypaint";
    rev = "v${version}";
-    sha256 = "rVKcxzWZRLcuxK8xRyRgvitXAh4uOEyqHswLeTdA2Mk=";
+    hash = "sha256-rVKcxzWZRLcuxK8xRyRgvitXAh4uOEyqHswLeTdA2Mk=";
    fetchSubmodules = true;
  };

@ -38,7 +38,13 @@ in buildPythonApplication rec {
    # https://github.com/mypaint/mypaint/pull/1183
    (fetchpatch {
      url = "https://github.com/mypaint/mypaint/commit/423950bec96d6057eac70442de577364d784a847.patch";
-      sha256 = "OxJJOi20bFMRibL59zx6svtMrkgeMYyEvbdSXbZHqpc=";
+      hash = "sha256-OxJJOi20bFMRibL59zx6svtMrkgeMYyEvbdSXbZHqpc=";
+    })
+    # https://github.com/mypaint/mypaint/pull/1193
+    (fetchpatch {
+      name = "python-3.11-compatibility.patch";
+      url = "https://github.com/mypaint/mypaint/commit/032a155b72f2b021f66a994050d83f07342d04af.patch";
+      hash = "sha256-EI4WJbpZrCtFMKd6QdXlWpRpIHi37gJffDjclzTLaLc=";
    })
  ];

--- a/pkgs/applications/misc/hyprnome/default.nix
+++ b/pkgs/applications/misc/hyprnome/default.nix
@ -0,0 +1,41 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, installShellFiles
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "hyprnome";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "donovanglover";
+    repo = "hyprnome";
+    rev = version;
+    hash = "sha256-jb21hnPSzrCTuW7Yhs6jFzS2WUVQjkn6nCCi6LvoTGA=";
+  };
+
+  cargoHash = "sha256-QM5v2hKP3E9W3Aek6kFyFFNAp9s0oTFb4CEtxEHyny0=";
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  postInstall = ''
+    installManPage man/hyprnome.1
+
+    installShellCompletion --cmd hyprnome \
+      --bash <(cat completions/hyprnome.bash) \
+      --fish <(cat completions/hyprnome.fish) \
+      --zsh <(cat completions/_hyprnome)
+  '';
+
+  meta = with lib; {
+    description = "GNOME-like workspace switching in Hyprland";
+    homepage = "https://github.com/donovanglover/hyprnome";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ donovanglover ];
+    mainProgram = "hyprnome";
+  };
+}
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -146,11 +146,11 @@
    "vendorHash": null
  },
  "baiducloud": {
-    "hash": "sha256-eey651CgiJ+pDhLD/S75qQ7nMRJgVhubVeZn1xXleKw=",
+    "hash": "sha256-5tydl+IMHz1wYxNUHJY6l+yIgtjc0gy5ufa+DQHiNf0=",
    "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
    "owner": "baidubce",
    "repo": "terraform-provider-baiducloud",
-    "rev": "v1.19.14",
+    "rev": "v1.19.15",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -664,11 +664,11 @@
    "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="
  },
  "launchdarkly": {
-    "hash": "sha256-gXT/rBlucBjg+8cjpSXdlClFGNuWmq6tZuuMfsBhR2E=",
+    "hash": "sha256-sIu+3Vu99wxcA+fdYMXRMZzK7RpUlV37136wyn5H4WQ=",
    "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
    "owner": "launchdarkly",
    "repo": "terraform-provider-launchdarkly",
-    "rev": "v2.15.0",
+    "rev": "v2.15.1",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-I+9hfKWBbclXXpthQc9LAHhZ7MYr/8I89mLeIVeae+Q="
  },
@ -827,11 +827,11 @@
    "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
  },
  "oci": {
-    "hash": "sha256-S+gHfQsqnOlegd5JcuBOUKO7fynWQAWCZGrlqjY03e0=",
+    "hash": "sha256-xZHk/rkq2H4Bkr+ugTHrkb4Al2ky0zOWEQmZtiXV48s=",
    "homepage": "https://registry.terraform.io/providers/oracle/oci",
    "owner": "oracle",
    "repo": "terraform-provider-oci",
-    "rev": "v5.10.0",
+    "rev": "v5.11.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -899,11 +899,11 @@
    "vendorHash": null
  },
  "pagerduty": {
-    "hash": "sha256-EJN2kf4MghIG38kEzyzafTEwxBytm5nyMA9f+bYM7ng=",
+    "hash": "sha256-wVXGDWpKVujS5FfvDM7quCuXRFP2MBlJra7qTyFJgDM=",
    "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
    "owner": "PagerDuty",
    "repo": "terraform-provider-pagerduty",
-    "rev": "v2.16.1",
+    "rev": "v2.16.2",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -1197,12 +1197,12 @@
    "vendorHash": "sha256-D7geLjmJoelbHolyS5IhnGNNl6kD8ZGtCRWcy+j2dxA="
  },
  "vault": {
-    "hash": "sha256-lnM52d7J36wu9MYh13IFSR15rMfJpXP4tw47LzRy4o4=",
+    "hash": "sha256-IPVD4VVC6jn3BWltqfCk2+GFSkQRNK7jkJ3/QmgBxqg=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/vault",
    "owner": "hashicorp",
    "proxyVendor": true,
    "repo": "terraform-provider-vault",
-    "rev": "v3.19.0",
+    "rev": "v3.20.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-xd2tsJ5k/8PCSegHqeyJ1ePFBS0ho8SD+4m4QyFMTL0="
  },
--- a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock
+++ b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock
--- a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix
@ -7,8 +7,10 @@
 , pkg-config
 , gst_all_1
 , protobuf
+, libspelling
 , libsecret
 , libadwaita
+, gtksourceview5
 , rustPlatform
 , rustc
 , appstream-glib
@ -19,23 +21,24 @@

 stdenv.mkDerivation rec {
  pname = "flare";
-  version = "0.9.1";
+  version = "0.10.0";

  src = fetchFromGitLab {
    domain = "gitlab.com";
    owner = "schmiddi-on-mobile";
    repo = pname;
    rev = version;
-    hash = "sha256-RceCVn2OmrHyY2DWT+5XeOc+HlQGVdtOmfo3+2r9hKs=";
+    hash = "sha256-+9zpYW9xjLe78c2GRL6raFDR5g+R/JWxQzU/ZS+5JtY=";
  };

  cargoDeps = rustPlatform.importCargoLock {
    lockFile = ./Cargo.lock;
    outputHashes = {
+      "blurhash-0.1.1" = "sha256-SLpszTL2CupMAfUQK5KlnsHTIBDB8hbJs1d6DQXaUiA=";
      "curve25519-dalek-3.2.1" = "sha256-0hFRhn920tLBpo6ZNCl6DYtTMHMXY/EiDvuhOPVjvC0=";
      "libsignal-protocol-0.1.0" = "sha256-VQwrGTNZnlDK5p8ZleAZYtbzDiVTHxc93/CRlCUjWtE=";
-      "libsignal-service-0.1.0" = "sha256-azXQGC008rcqF2C8yHy5CM2NU1Hvwv2I3Kr8aI6URS8=";
-      "presage-0.6.0-dev" = "sha256-MNd4CvBv6htZQj2g2a3JcQ1r/kk4UPSBLFezEnRK+60=";
+      "libsignal-service-0.1.0" = "sha256-1ub0IPSvGhZ2tsC6IolusJ1NSWy+5SXSx8qlIdPngTE=";
+      "presage-0.6.0-dev" = "sha256-4isKBn/4yHoAYsYbBTULK/veZmaecU7t+PvE4Y0oNgk=";
    };
  };

@ -53,8 +56,10 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
+    gtksourceview5
    libadwaita
    libsecret
+    libspelling
    protobuf

    # To reproduce audio messages
--- a/pkgs/applications/networking/instant-messengers/neosay/default.nix
+++ b/pkgs/applications/networking/instant-messengers/neosay/default.nix
@ -0,0 +1,27 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "neosay";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "donuts-are-good";
+    repo = "neosay";
+    rev = "v${version}";
+    hash = "sha256-Uwz6Y26AtzWXLFgJY0WVD0HBb+vbMeeMKt8gCk6viec=";
+  };
+
+  vendorHash = "sha256-w0aZnel5Obq73UXcG9wmO9t/7qQTE8ru656u349cvzQ=";
+
+  ldflags = [ "-s" "-w" ];
+
+  meta = with lib; {
+    description = "Pipe stdin to matrix";
+    homepage = "https://github.com/donuts-are-good/neosay";
+    license = licenses.mit;
+    maintainers = with maintainers; [ janik ];
+  };
+}
--- a/pkgs/applications/version-management/blackbox/default.nix
+++ b/pkgs/applications/version-management/blackbox/default.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "blackbox";
-  version = "2.0.0";
+  version = "1.20220610";

  src = fetchFromGitHub {
    owner = "stackexchange";
    repo = pname;
    rev = "v${version}";
-    sha256 = "1plwdmzds6dq2rlp84dgiashrfg0kg4yijhnxaapz2q4d1vvx8lq";
+    hash = "sha256-g0oNV7Nj7ZMmsVQFVTDwbKtF4a/Fb3WDB+NRx9IGSWA=";
  };

  buildInputs = [ gnupg ];
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
      --replace "PREFIX?=/usr/local" "PREFIX=$out"

    substituteInPlace tools/confidence_test.sh \
-      --replace 'PATH="''${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:''${blackbox_home}"' \
+      --replace 'PATH="''${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:/usr/local/MacGPG2/bin:/opt/homebrew/bin:''${blackbox_home}"' \
        "PATH=/build/source/bin/:$PATH"
  '';

--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@ -21,14 +21,13 @@ python3.pkgs.buildPythonApplication rec {
    intltool file
    gobject-introspection # for setup hook populating GI_TYPELIB_PATH
    docutils
-  ];
+  ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;

  buildInputs = [
    wrapGAppsHook
    libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi
    gsettings-desktop-schemas libosinfo gtksourceview4
-  ] ++ lib.optional spiceSupport spice-gtk
-    ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
+  ] ++ lib.optional spiceSupport spice-gtk;

  propagatedBuildInputs = with python3.pkgs; [
    pygobject3 libvirt libxml2 requests cdrtools
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
@ -1,26 +1,44 @@
-{ lib, mkXfceDerivation, gettext, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
+{ mkXfceDerivation
+, lib
+, cmake
+, accountsservice
+, exo
+, garcon
+, gettext
+, glib
+, gtk-layer-shell
+, gtk3
+, libxfce4ui
+, libxfce4util
+, xfce4-panel
+, xfconf
+}:

 mkXfceDerivation {
  category = "panel-plugins";
  pname = "xfce4-whiskermenu-plugin";
-  version = "2.7.3";
+  version = "2.8.0";
  rev-prefix = "v";
  odd-unstable = false;
-  sha256 = "sha256-F2mp3b1HBvI2lvwGzuE9QsqotLWgsP0NRyORrTV9FJs=";
+  sha256 = "sha256-5ojcIOVIa9WKL2e6iZwRgrAINSM8750zciCwpn9vzJU=";

-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+  ];

-  buildInputs = [ gettext exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ];
-
-  postPatch = ''
-    substituteInPlace panel-plugin/xfce4-popup-whiskermenu.in \
-      --replace gettext ${gettext}/bin/gettext
-  '';
-
-  postInstall = ''
-    substituteInPlace $out/bin/xfce4-popup-whiskermenu \
-      --replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel
-  '';
+  buildInputs = [
+    accountsservice
+    exo
+    garcon
+    gettext
+    glib
+    gtk-layer-shell
+    gtk3
+    libxfce4ui
+    libxfce4util
+    xfce4-panel
+    xfconf
+  ];

  meta = with lib; {
    description = "Alternate application launcher for Xfce";
--- a/pkgs/development/coq-modules/serapi/default.nix
+++ b/pkgs/development/coq-modules/serapi/default.nix
@ -87,6 +87,10 @@ in
    then [
      ./janestreet-0.15.patch
    ]
+    else if version == "8.17.0+0.17.0"
+    then [
+      ./janestreet-0.16.patch
+    ]
    else [
    ];

--- a/pkgs/development/coq-modules/serapi/janestreet-0.16.patch
+++ b/pkgs/development/coq-modules/serapi/janestreet-0.16.patch
@ -0,0 +1,17 @@
+diff --git a/serlib/ser_stdlib.ml b/serlib/ser_stdlib.ml
+index 894d300..11c9217 100644
+--- a/serlib/ser_stdlib.ml
+++ b/serlib/ser_stdlib.ml
+@@ -28,6 +28,7 @@ let ref_to_yojson f x = f !x
+ let ref_of_yojson f x = Result.map (fun x -> ref x) (f x)
+ let hash_fold_ref = hash_fold_ref_frozen
+ let compare_ref = compare_ref
+let (==) x y = (==) x y
+ 
+ module Lazy = struct
+   type 'a t = 'a lazy_t
+@@ -35,3 +36,4 @@ module Lazy = struct
+ end
+ 
+ module Option = Stdlib.Option
+module List = Stdlib.List
--- a/pkgs/development/libraries/vkd3d/default.nix
+++ b/pkgs/development/libraries/vkd3d/default.nix
@ -3,7 +3,7 @@

 stdenv.mkDerivation rec {
  pname = "vkd3d";
-  version = "1.7.1";
+  version = "1.8";

  nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ];
  buildInputs = [ vulkan-loader vulkan-headers spirv-headers ];
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
    owner = "wine";
    repo = pname;
    rev = "${pname}-${version}";
-    sha256 = "sha256-4WUD6bRG/XwrOb5tl0ZyaaR0uy85eYXcb16eDeumOAQ=";
+    sha256 = "sha256-v2UhJvfB5Clupmgoykei3AoWYBOp5l9pQFkUEQVlajs=";
  };

  meta = with lib; {
--- a/pkgs/development/ocaml-modules/bistro/default.nix
+++ b/pkgs/development/ocaml-modules/bistro/default.nix
@ -29,6 +29,8 @@ buildDunePackage rec {
    sha256 = "0g11324j1s2631zzf7zxc8s0nqd4fwvcni0kbvfpfxg96gy2wwfm";
  };

+  patches = [ ./janestreet-0.16.patch ];
+
  propagatedBuildInputs = [
    base64
    bos
--- a/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch
+++ b/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch
@ -0,0 +1,205 @@
+diff --git a/lib/engine/scheduler.ml b/lib/engine/scheduler.ml
+index e32bd0f..93b566b 100644
+--- a/lib/engine/scheduler.ml
+++ b/lib/engine/scheduler.ml
+@@ -601,7 +601,7 @@ module Make(Backend : Backend) = struct
+               )
+         )
+       | Trywith tw -> (
+-          match Table.find sched.traces (Workflow.id tw.w) with
+          match Hashtbl.find sched.traces (Workflow.id tw.w) with
+           | Some eventual_trace -> (
+               eventual_trace >>= function
+               | Ok (Run r) ->
+@@ -667,10 +667,10 @@ module Make(Backend : Backend) = struct
+   let register_build sched ~id ~build_trace =
+     let open Eval_thread.Infix in
+     (
+-      match Table.find sched.traces id with
+      match Hashtbl.find sched.traces id with
+       | None ->
+         let trace = build_trace () in
+-        Table.set sched.traces ~key:id ~data:trace ;
+        Hashtbl.set sched.traces ~key:id ~data:trace ;
+         trace
+       | Some trace -> trace
+     ) >>= fun trace ->
+@@ -854,7 +854,7 @@ module Make(Backend : Backend) = struct
+         Eval_thread.join l.elts ~f:(build ?target sched)
+       | Trywith tw -> (
+           build sched ?target tw.w >> fun w_result ->
+-          match Table.find sched.traces (Workflow.id tw.w) with
+          match Hashtbl.find sched.traces (Workflow.id tw.w) with
+           | Some eventual_trace -> (
+               eventual_trace >> function
+               | Ok (Run r) when run_trywith_recovery r.details ->
+diff --git a/lib/multinode/bistro_multinode.ml b/lib/multinode/bistro_multinode.ml
+index 01dc5ac..3fc6b0e 100644
+--- a/lib/multinode/bistro_multinode.ml
+++ b/lib/multinode/bistro_multinode.ml
+@@ -130,7 +130,7 @@ module Server = struct
+       let search (type s) (table : s String.Table.t) ~f =
+         let module M = struct exception Found of string * s end in
+         try
+-          String.Table.fold table ~init:() ~f:(fun ~key ~data () -> if f ~key ~data then raise (M.Found (key, data))) ;
+          Hashtbl.fold table ~init:() ~f:(fun ~key ~data () -> if f ~key ~data then raise (M.Found (key, data))) ;
+           None
+         with M.Found (k, v) -> Some (k, v)
+ 
+@@ -145,7 +145,7 @@ module Server = struct
+               match allocation_attempt with
+               | None -> Some elt
+               | Some (worker_id, (Resource curr)) ->
+-                String.Table.set pool.available ~key:worker_id ~data:(Resource { np = curr.np - np ; mem = curr.mem - mem }) ;
+                Hashtbl.set pool.available ~key:worker_id ~data:(Resource { np = curr.np - np ; mem = curr.mem - mem }) ;
+                 Lwt.wakeup u (worker_id, Resource { np ; mem }) ;
+                 None
+             )
+@@ -163,12 +163,12 @@ module Server = struct
+         t
+ 
+       let add_worker pool (Worker { id ; np ; mem ; _ }) =
+-        match String.Table.add pool.available ~key:id ~data:(Allocator.Resource { np ; mem }) with
+        match Hashtbl.add pool.available ~key:id ~data:(Allocator.Resource { np ; mem }) with
+         | `Ok -> allocation_pass pool
+         | `Duplicate -> failwith "A worker has been added twice"
+ 
+       let release pool worker_id (Allocator.Resource { np ; mem }) =
+-        String.Table.update pool.available worker_id ~f:(function
+        Hashtbl.update pool.available worker_id ~f:(function
+             | None -> failwith "Tried to release resources of inexistent worker"
+             | Some (Resource r) -> Resource { np = r.np + np ; mem = r.mem + mem }
+           )
+@@ -235,13 +235,13 @@ module Server = struct
+       | Subscript { np ; mem } ->
+         let id = new_id () in
+         let w = create_worker ~np ~mem id in
+-        String.Table.set state.workers ~key:id ~data:w ;
+        Hashtbl.set state.workers ~key:id ~data:w ;
+         Worker_allocator.add_worker state.alloc w ;
+         log (Logger.Debug (sprintf "new worker %s" id)) ;
+         Lwt.return (Client_id id)
+ 
+       | Get_job { client_id } -> (
+-          match String.Table.find state.workers client_id with
+          match Hashtbl.find state.workers client_id with
+           | None -> Lwt.return None
+           | Some (Worker worker) ->
+             Lwt.choose [
+@@ -250,22 +250,22 @@ module Server = struct
+             ] >>= function
+             | `Job wp ->
+               let workflow_id = workflow_id_of_job_waiter wp in
+-              String.Table.set worker.running_jobs ~key:workflow_id ~data:wp ;
+              Hashtbl.set worker.running_jobs ~key:workflow_id ~data:wp ;
+               Lwt.return (Some (job_of_job_waiter wp))
+             | `Stop -> Lwt.return None
+         )
+ 
+       | Plugin_result r ->
+-        let Worker worker = String.Table.find_exn state.workers r.client_id in
+        let Worker worker = Hashtbl.find_exn state.workers r.client_id in
+         Lwt.return (
+-          match String.Table.find_exn worker.running_jobs r.workflow_id with
+          match Hashtbl.find_exn worker.running_jobs r.workflow_id with
+           | Waiting_plugin wp -> Lwt.wakeup wp.waiter r.result
+           | Waiting_shell_command _ -> assert false (* should never happen *)
+         )
+       | Shell_command_result r ->
+-        let Worker worker = String.Table.find_exn state.workers r.client_id in
+        let Worker worker = Hashtbl.find_exn state.workers r.client_id in
+         Lwt.return (
+-          match String.Table.find_exn worker.running_jobs r.workflow_id with
+          match Hashtbl.find_exn worker.running_jobs r.workflow_id with
+           | Waiting_plugin _ -> assert false (* should never happen *)
+           | Waiting_shell_command wp -> Lwt.wakeup wp.waiter r.result
+         )
+@@ -307,7 +307,7 @@ module Server = struct
+ 
+     let request_resource backend req =
+       Worker_allocator.request backend.state.alloc req >|= fun (worker_id, resource) ->
+-      String.Table.find_exn backend.state.workers worker_id, resource
+      Hashtbl.find_exn backend.state.workers worker_id, resource
+ 
+     let release_resource backend worker_id res =
+       Worker_allocator.release backend.state.alloc worker_id res
+@@ -334,7 +334,7 @@ module Server = struct
+          *   loop () *)
+ 
+     let eval backend { worker_id ; workflow_id } f x =
+-      let Worker worker = String.Table.find_exn backend.state.workers worker_id in
+      let Worker worker = Hashtbl.find_exn backend.state.workers worker_id in
+       let f () = f x in
+       let t, u = Lwt.wait () in
+       let job_waiter = Waiting_plugin { waiter = u ; f ; workflow_id } in
+@@ -342,7 +342,7 @@ module Server = struct
+       t
+ 
+     let run_shell_command backend { worker_id ; workflow_id } cmd =
+-      let Worker worker = String.Table.find_exn backend.state.workers worker_id in
+      let Worker worker = Hashtbl.find_exn backend.state.workers worker_id in
+       let t, u = Lwt.wait () in
+       let job = Waiting_shell_command { waiter = u ; cmd ; workflow_id } in
+       Lwt_queue.push worker.pending_jobs job ;
+diff --git a/lib/utils/dot_output.ml b/lib/utils/dot_output.ml
+index 90c299f..d13fceb 100644
+--- a/lib/utils/dot_output.ml
+++ b/lib/utils/dot_output.ml
+@@ -24,7 +24,7 @@ module G = struct
+   (* let successors   g u = fold_succ (fun h t -> h :: t) g u [] *)
+ 
+   let rec of_workflow_aux seen acc u =
+-    if S.mem seen u then (seen, acc)
+    if Set.mem seen u then (seen, acc)
+     else (
+       let deps = W.Any.deps u in
+       let seen, acc =
+@@ -34,7 +34,7 @@ module G = struct
+       in
+       let acc = add_vertex acc u in
+       let acc = List.fold deps ~init:acc ~f:(fun acc v -> add_edge acc u v) in
+-      let seen = S.add seen u in
+      let seen = Set.add seen u in
+       seen, acc
+     )
+ 
+@@ -109,7 +109,7 @@ let dot_output ?db oc g ~needed =
+     ]
+   in
+   let vertex_attributes u =
+-    let needed = (match db with None -> true | Some _ -> false) || S.mem needed u in
+    let needed = (match db with None -> true | Some _ -> false) || Set.mem needed u in
+     let color = if needed then black else light_gray in
+     let shape = `Shape (shape u) in
+     let W.Any w = u in
+@@ -141,7 +141,7 @@ let dot_output ?db oc g ~needed =
+       | _ -> []
+     in
+     let color =
+-      if (match db with None -> true | Some _ -> false) || (S.mem needed u && not (already_done u))
+      if (match db with None -> true | Some _ -> false) || (Set.mem needed u && not (already_done u))
+       then black else light_gray in
+     style @ [ `Color color ]
+   in
+diff --git a/lib/utils/repo.ml b/lib/utils/repo.ml
+index 06abcd5..206a99e 100644
+--- a/lib/utils/repo.ml
+++ b/lib/utils/repo.ml
+@@ -160,7 +160,7 @@ let protected_set repo =
+     | Select s -> fold_path_workflow acc (W.Any s.dir)
+     | Input _ -> acc
+     | Shell _
+-    | Plugin _ -> String.Set.add acc (W.id w)
+    | Plugin _ -> Set.add acc (W.id w)
+     | Trywith tw ->
+       fold_path_workflow (fold_path_workflow acc (W.Any tw.w)) (W.Any tw.failsafe)
+     | Ifelse ie ->
+@@ -187,7 +187,7 @@ let cache_clip_fold ~bistro_dir repo ~f ~init =
+   let protected = protected_set repo in
+   let db = Db.init_exn bistro_dir in
+   Db.fold_cache db ~init ~f:(fun acc id ->
+-      f db acc (if String.Set.mem protected id then `Protected id else `Unprotected id)
+      f db acc (if Set.mem protected id then `Protected id else `Unprotected id)
+     )
+ 
+ let cache_clip_dry_run ~bistro_dir repo =
--- a/pkgs/development/ocaml-modules/cfstream/default.nix
+++ b/pkgs/development/ocaml-modules/cfstream/default.nix
@ -13,7 +13,7 @@ buildDunePackage rec {
    hash = "sha256-iSg0QsTcU0MT/Cletl+hW6bKyH0jkp7Jixqu8H59UmQ=";
  };

-  patches = [ ./git_commit.patch ];
+  patches = [ ./git_commit.patch ./janestreet-0.16.patch ];

  strictDeps = true;

--- a/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch
+++ b/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch
@ -0,0 +1,36 @@
+diff --git a/lib/CFStream_stream.ml b/lib/CFStream_stream.ml
+index 25c0e5a..94da2e3 100644
+--- a/lib/CFStream_stream.ml
+++ b/lib/CFStream_stream.ml
+@@ -287,7 +287,7 @@ let group_aux xs map eq =
+ ;;
+ 
+ let group xs ~f = group_aux xs f Poly.( = )
+-let group_by xs ~eq = group_aux xs ident eq
+let group_by xs ~eq = group_aux xs Fn.id eq
+ 
+ let chunk2 xs =
+   from (fun _ ->
+@@ -615,11 +615,11 @@ let to_hashtbl xs =
+ let of_map t = of_list (Map.to_alist t)
+ 
+ let to_map xs =
+-  fold xs ~init:Map.Poly.empty ~f:(fun accu (key, data) -> Map.Poly.set accu ~key ~data)
+  fold xs ~init:Map.Poly.empty ~f:(fun accu (key, data) -> Map.set accu ~key ~data)
+ ;;
+ 
+ let of_set t = of_list (Set.to_list t)
+-let to_set xs = fold xs ~init:Set.Poly.empty ~f:(fun accu e -> Set.Poly.add accu e)
+let to_set xs = fold xs ~init:Set.Poly.empty ~f:(fun accu e -> Set.add accu e)
+ 
+ module Infix = struct
+   let ( -- ) x y = range x ~until:y
+@@ -660,7 +660,7 @@ module Result = struct
+       | M.E e -> Result.Error e
+     ;;
+ 
+-    let all xs ~f = all_gen ident xs ~f
+    let all xs ~f = all_gen Fn.id xs ~f
+     let all' xs ~f = all_gen (fun x -> Ok x) xs ~f
+     let to_exn = result_to_exn
+ 
--- a/pkgs/development/ocaml-modules/janestreet/0.16.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix
@ -0,0 +1,30 @@
+{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.16" }:
+
+{ pname
+, version ? defaultVersion
+, hash
+, minimalOCamlVersion ? "4.14"
+, doCheck ? true
+, buildInputs ? []
+, ...}@args:
+
+buildDunePackage (args // {
+  duneVersion = "3";
+  inherit version buildInputs;
+
+  inherit minimalOCamlVersion;
+
+  src = fetchFromGitHub {
+    owner = "janestreet";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = hash;
+  };
+
+  inherit doCheck;
+
+  meta = {
+    license = lib.licenses.mit;
+    homepage = "https://github.com/janestreet/${pname}";
+  } // args.meta;
+})
--- a/pkgs/development/ocaml-modules/tls/async.nix
+++ b/pkgs/development/ocaml-modules/tls/async.nix
@ -5,8 +5,12 @@ buildDunePackage rec {

  inherit (tls) src meta version;

-  minimalOCamlVersion = "4.11";
-  duneVersion = "3";
+  minimalOCamlVersion = "4.13";
+
+  patches = [
+    # Remove when TLS gets updated to v0.17.1.
+    ./janestreet-0.16.patch
+  ];

  doCheck = true;

--- a/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch
+++ b/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch
@ -0,0 +1,23 @@
+diff --git a/async/tls_async.mli b/async/tls_async.mli
+index b4894b8..101f27f 100644
+--- a/async/tls_async.mli
+++ b/async/tls_async.mli
+@@ -55,4 +55,4 @@ val connect
+       -> 'addr Tcp.Where_to_connect.t
+       -> host:[ `host ] Domain_name.t option
+       -> (Session.t * Reader.t * Writer.t) Deferred.Or_error.t)
+-       Tcp.with_connect_options
+       Tcp.Aliases.with_connect_options
+diff --git a/async/x509_async.ml b/async/x509_async.ml
+index d4fad8c..4ee466a 100644
+--- a/async/x509_async.ml
+++ b/async/x509_async.ml
+@@ -9,7 +9,7 @@ let file_contents file =
+ let load_all_in_directory ~directory ~f =
+   let open Deferred.Or_error.Let_syntax in
+   let%bind files = Deferred.Or_error.try_with (fun () -> Sys.ls_dir directory) in
+-  Deferred.Or_error.List.map files ~f:(fun file ->
+  Deferred.Or_error.List.map ~how:`Sequential files ~f:(fun file ->
+     let%bind contents = file_contents (directory ^/ file) in
+     f ~contents)
+ ;;
--- a/pkgs/development/python-modules/add-trailing-comma/default.nix
+++ b/pkgs/development/python-modules/add-trailing-comma/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "add-trailing-comma";
-  version = "3.0.1";
+  version = "3.1.0";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "asottile";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-wCqCKomnkYgvxDWtjBwyqKb09sTPqPgWbYohgosUaHA=";
+    hash = "sha256-B+wjBy42RwabVz/6qEMGpB0JmwJ9hqSskwcNj4x/B/k=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/aioredis/default.nix
+++ b/pkgs/development/python-modules/aioredis/default.nix
@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, fetchpatch
 , fetchPypi
 , async-timeout
 , typing-extensions
@ -11,14 +12,25 @@
 buildPythonPackage rec {
  pname = "aioredis";
  version = "2.0.1";
+  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e";
+    hash = "sha256-6qUar5k/LXH1S3BSfEQEN7plNAWIr+t4bNh8Vcic2Y4=";
  };

+  patches = [
+    # https://github.com/aio-libs-abandoned/aioredis-py/pull/1490
+    (fetchpatch {
+      name = "python-3.11-compatibility.patch";
+      url = "https://github.com/aio-libs-abandoned/aioredis-py/commit/1b951502dc8f149fa66beafeea40c782f1c5c1d3.patch";
+      hash = "sha256-EqkiYktxISg0Rv4ShXOksGvuUyljPxjJsfNOVaaax2o=";
+      includes = [ "aioredis/exceptions.py" ];
+    })
+  ];
+
  propagatedBuildInputs = [
    async-timeout
    typing-extensions
@ -29,7 +41,7 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Asyncio (PEP 3156) Redis client library";
-    homepage = "https://github.com/aio-libs/aioredis";
+    homepage = "https://github.com/aio-libs-abandoned/aioredis-py";
    license = licenses.mit;
    maintainers = with maintainers; [ mmai ];
  };
--- a/pkgs/development/python-modules/apischema/default.nix
+++ b/pkgs/development/python-modules/apischema/default.nix
@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, graphql-core
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "apischema";
+  version = "0.18.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "wyfo";
+    repo = "apischema";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-DBFFCLi8cpASyGPNqZvYe3OTLSbNZ8QzaxjQkOiHxFc=";
+  };
+
+  passthru.optional-dependencies = {
+    graphql = [
+      graphql-core
+    ];
+  };
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+
+  pythonImportsCheck = [
+    "apischema"
+  ];
+
+  meta = with lib; {
+    description = "JSON (de)serialization, GraphQL and JSON schema generation using typing";
+    homepage = "https://github.com/wyfo/apischema";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/cookies/default.nix
+++ b/pkgs/development/python-modules/cookies/default.nix
@ -1,15 +1,36 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchpatch
+, fetchPypi
+, pytestCheckHook
+}:

 buildPythonPackage rec {
  pname = "cookies";
  version = "2.2.1";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn";
+    hash = "sha256-1raYeIyuTPpOYu+GQ6nKMyt5vZbLMUKUuGSujX6z7o4=";
  };

-  doCheck = false;
+  patches = [
+    (fetchpatch {
+      name = "fix-deprecations.patch";
+      url = "https://gitlab.com/sashahart/cookies/-/commit/22543d970568d577effe120c5a34636a38aa397b.patch";
+      hash = "sha256-8e3haOnbSXlL/ZY4uv6P4+ABBKrsCjbEpsLHaulbIUk=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # https://gitlab.com/sashahart/cookies/-/issues/6
+    "test_encoding_assumptions"
+  ];

  meta = with lib; {
    description = "Friendlier RFC 6265-compliant cookie parser/renderer";
--- a/pkgs/development/python-modules/datadiff/default.nix
+++ b/pkgs/development/python-modules/datadiff/default.nix
@ -6,14 +6,14 @@

 buildPythonPackage rec {
  pname = "datadiff";
-  version = "2.1.0";
+  version = "2.2.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-I9QpQyW3sHyUgCYZYfJecTJDNHLaQtqnXG4WeA4p5VE=";
+    hash = "sha256-fOcN/uqMM/HYjbRrDv/ukFzDa023Ofa7BwqC3omB0ws=";
  };

  # Tests are not part of the PyPI releases
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , buildPythonPackage
 , poetry-core
 , pytest-rerunfailures
@ -13,25 +12,16 @@

 buildPythonPackage rec {
  pname = "libtmux";
-  version = "0.22.1";
+  version = "0.23.0post0";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "tmux-python";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-tz7Pynm/xHx2X3QjXkvFlX6sVlsVKqrsS1CVmqlqfj0=";
+    hash = "sha256-qk9QYfLVJVtkNgAZ19UziU7metluz10gDs9HbMoqZjo=";
  };

-  patches = [
-    # https://github.com/tmux-python/libtmux/pull/493
-    (fetchpatch {
-      name = "remove-setuptools.patch";
-      url = "https://github.com/tmux-python/libtmux/commit/aa3a1e2015ade73129191ad04146ce52765d478c.patch";
-      hash = "sha256-p3KMktd6eG9/lRK+DdBvDtSwhI+sV2RQfBAuElMk8tQ=";
-    })
-  ];
-
  postPatch = ''
    sed -i '/addopts/d' setup.cfg
  '';
--- a/pkgs/development/python-modules/molecule/default.nix
+++ b/pkgs/development/python-modules/molecule/default.nix
@ -19,12 +19,12 @@

 buildPythonPackage rec {
  pname = "molecule";
-  version = "6.0.1";
+  version = "6.0.2";
  format = "pyproject";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-ssARHVtEp3pW7364WhxhtHAWW5fRFXiioWgEczTI3yM=";
+    hash = "sha256-uRk1P3mXRt5gsWonV1YneD45wmj98vKqA3LwFix7VHg=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@ -7,14 +7,14 @@

 buildPythonPackage rec {
  pname = "pex";
-  version = "2.1.144";
-  format = "flit";
+  version = "2.1.145";
+  format = "pyproject";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-wugHG/ZfyfNgd2znDS7FXu34LsUVMcwDswFkh4lRIXo=";
+    hash = "sha256-1rrIxOjOdGz+Xxb6QrH6Zth/eF+zaBOGFf4I9P17nbI=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pydrawise/default.nix
+++ b/pkgs/development/python-modules/pydrawise/default.nix
@ -0,0 +1,65 @@
+{ lib
+, aiohttp
+, aioresponses
+, apischema
+, buildPythonPackage
+, fetchFromGitHub
+, freezegun
+, gql
+, graphql-core
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, requests
+, setuptools
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "pydrawise";
+  version = "2023.8.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "dknowles2";
+    repo = "pydrawise";
+    rev = "refs/tags/${version}";
+    hash = "sha256-cnQJ0enDgOB66rEZePmfTImFrPNMiXfggATM6hsL+ag=";
+  };
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    aiohttp
+    apischema
+    gql
+    graphql-core
+    requests
+  ];
+
+  nativeCheckInputs = [
+    aioresponses
+    freezegun
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pydrawise"
+  ];
+
+  meta = with lib; {
+    description = "Library for interacting with Hydrawise sprinkler controllers through the GraphQL API";
+    homepage = "https://github.com/dknowles2/pydrawise";
+    changelog = "https://github.com/dknowles2/pydrawise/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix
+++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix
@ -2,12 +2,16 @@
 , buildPythonPackage
 , pythonAtLeast
 , fetchPypi
+, cython_3
+, numpy
+, setuptools
+, wheel
 }:

 buildPythonPackage rec {
  pname = "pyopengl-accelerate";
  version = "3.1.7";
-  disabled = pythonAtLeast "3.10"; # fails to compile
+  format = "pyproject";

  src = fetchPypi {
    pname = "PyOpenGL-accelerate";
@ -15,6 +19,13 @@ buildPythonPackage rec {
    hash = "sha256-KxI2ISc6k59/0uwidUHjmfm11OgV1prgvbG2xwopNoA=";
  };

+  nativeBuildInputs = [
+    cython_3
+    numpy
+    setuptools
+    wheel
+  ];
+
  meta = {
    description = "This set of C (Cython) extensions provides acceleration of common operations for slow points in PyOpenGL 3.x";
    homepage = "https://pyopengl.sourceforge.net/";
--- a/pkgs/development/python-modules/quandl/default.nix
+++ b/pkgs/development/python-modules/quandl/default.nix
@ -29,9 +29,13 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit version;
    pname = "Quandl";
-    sha256 = "6e0b82fbc7861610b3577c5397277c4220e065eee0fed4e46cd6b6021655b64c";
+    hash = "sha256-bguC+8eGFhCzV3xTlyd8QiDgZe7g/tTkbNa2AhZVtkw=";
  };

+  patches = [
+    ./pandas2-datetime-removal.patch
+  ];
+
  propagatedBuildInputs = [
    pandas
    numpy
--- a/pkgs/development/python-modules/quandl/pandas2-datetime-removal.patch
+++ b/pkgs/development/python-modules/quandl/pandas2-datetime-removal.patch
@ -0,0 +1,33 @@
+diff --git a/test/test_datatable_data.py b/test/test_datatable_data.py
+index ee9ac61..0266a19 100644
+--- a/test/test_datatable_data.py
+++ b/test/test_datatable_data.py
+@@ -1,3 +1,4 @@
+import datetime
+ import re
+ import unittest
+ import httpretty
+@@ -135,7 +136,7 @@ class ListDatatableDataTest(unittest.TestCase):
+         df = results.to_pandas()
+         self.assertEqual(df.index.name, 'None')
+ 
+-    # if datatable has Date field then it should be convert to pandas datetime
+    # if datatable has Date field then it should be convert to datetime
+     @parameterized.expand(['GET', 'POST'])
+     def test_pandas_dataframe_date_field_is_datetime(self, request_method):
+         if request_method == 'POST':
+@@ -143,10 +144,10 @@ class ListDatatableDataTest(unittest.TestCase):
+         datatable = Datatable('ZACKS/FC')
+         results = Data.page(datatable, params={})
+         df = results.to_pandas()
+-        self.assertIsInstance(df['per_end_date'][0], pandas.datetime)
+-        self.assertIsInstance(df['per_end_date'][1], pandas.datetime)
+-        self.assertIsInstance(df['per_end_date'][2], pandas.datetime)
+-        self.assertIsInstance(df['per_end_date'][3], pandas.datetime)
+        self.assertIsInstance(df['per_end_date'][0], datetime.datetime)
+        self.assertIsInstance(df['per_end_date'][1], datetime.datetime)
+        self.assertIsInstance(df['per_end_date'][2], datetime.datetime)
+        self.assertIsInstance(df['per_end_date'][3], datetime.datetime)
+ 
+     @parameterized.expand(['GET', 'POST'])
+     def test_to_numpy_returns_numpy_object(self, request_method):
--- a/pkgs/development/python-modules/restrictedpython/default.nix
+++ b/pkgs/development/python-modules/restrictedpython/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "restrictedpython";
-  version = "6.1";
+  version = "6.2";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "RestrictedPython";
    inherit version;
-    hash = "sha256-fljqFcySoLkW4MjKKV6LLG1A/uTRLhorUGPYbvwnmpw=";
+    hash = "sha256-23Prfjs5ZQ8NIdEMyN2pwOKYbmIclLDF3jL7De46CK8=";
  };

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/scikit-fuzzy/default.nix
+++ b/pkgs/development/python-modules/scikit-fuzzy/default.nix
@ -2,6 +2,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
+, fetchpatch
 , matplotlib
 , networkx
 , nose
@ -24,12 +25,28 @@ buildPythonPackage rec {
    hash = "sha256-kS48aHC719wUdc2WcJa9geoMUcLHSj7ZsoRZYAhF2a0=";
  };

+  patches = [
+    # https://github.com/scikit-fuzzy/scikit-fuzzy/pull/299
+    (fetchpatch {
+      name = "numpy-1.25-test-compatibility-1.patch";
+      url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/d7d114cff002e2edf9361a55cb985615e91797b5.patch";
+      hash = "sha256-udF/z94tVGRHq7gcOko4BSkvVnqe/A/bAARfCPrc06M=";
+    })
+    (fetchpatch {
+      name = "numpy-1.25-test-compatibility-2.patch";
+      url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/f1612f6aeff34dc9329dbded7cee098fcd22ffd9.patch";
+      hash = "sha256-Le1ECR4+RjWCkfqjVrd471GD7tuVaQlZ7RZd3zvFdHU=";
+    })
+    (fetchpatch {
+      name = "numpy-1.25-test-compatibility-3.patch";
+      url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/459b9602cf182b7b42f93aad8bcf3bda6f20bfb5.patch";
+      hash = "sha256-gKrhNpGt6XoAlMwQW70OPFZj/ZC8NhQq6dEaBpGE8yY=";
+    })
+  ];
+
  propagatedBuildInputs = [ networkx numpy scipy ];
  nativeCheckInputs = [ matplotlib nose pytestCheckHook ];

-  # numpy API breakage: "AttributeError: module 'numpy' has no attribute 'float'"
-  disabledTests = [ "test_fuzzy_compare" ];
-
  pythonImportsCheck = [ "skfuzzy" ];

  meta = with lib; {
--- a/pkgs/development/python-modules/torchio/default.nix
+++ b/pkgs/development/python-modules/torchio/default.nix
@ -19,15 +19,16 @@

 buildPythonPackage rec {
  pname = "torchio";
-  version = "0.18.90";
+  version = "0.19.1";
  format = "pyproject";
-  disabled = pythonOlder "3.7";
+
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "fepegar";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-h8cvNhOkjMMbQ6Nry8FKtwnK+yhRYRGjXi/xp0i5yyY=";
+    hash = "sha256-SNX558kSRCS9Eks00Kj2kFmo7hCUgV6saYLsnx/Kus0=";
  };

  propagatedBuildInputs = [
@ -57,7 +58,7 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Medical imaging toolkit for deep learning";
-    homepage = "http://www.torchio.org/";
+    homepage = "https://torchio.readthedocs.io";
    license = licenses.asl20;
    maintainers = [ maintainers.bcdarwin ];
  };
--- a/pkgs/development/python-modules/universal-pathlib/default.nix
+++ b/pkgs/development/python-modules/universal-pathlib/default.nix
@ -1,15 +1,15 @@
 { lib
 , buildPythonPackage
+, pythonOlder
 , fetchPypi
 , setuptools
 , setuptools-scm
 , fsspec
-, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "universal-pathlib";
-  version = "0.1.2";
+  version = "0.1.3";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "universal_pathlib";
    inherit version;
-    hash = "sha256-aJ4nAf717U7RmIjQrKCzVC/iSOCbEK3EMfX3R/hoBSo=";
+    hash = "sha256-GgUqteBRcwHfZr5lF+n+Y82fwAgT5c5xpzcBRBrCtcg=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/unstructured/default.nix
+++ b/pkgs/development/python-modules/unstructured/default.nix
@ -133,6 +133,8 @@ buildPythonPackage {
    grpcio
  ];

+  passthru.optional-dependencies = optional-dependencies;
+
  meta = with lib; {
    description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines";
    homepage = "https://github.com/Unstructured-IO/unstructured";
--- a/pkgs/development/tools/comby/comby.patch
+++ b/pkgs/development/tools/comby/comby.patch
@ -1,5 +1,5 @@
 diff --git a/comby-kernel.opam b/comby-kernel.opam
-index 9db7cc5..a497bff 100644
+index 9db7cc5..83e6e7b 100644
 --- a/comby-kernel.opam
 +++ b/comby-kernel.opam
@@ -20,7 +20,7 @@ build: [
@ -7,7 +7,7 @@ index 9db7cc5..a497bff 100644
   "dune" {>= "2.8.0"}
   "ocaml" {>= "4.08.1"}
 -  "core_kernel"
-+  "core_kernel" {>= "v0.15.0"}
+  "core-kernel" {>= "v0.16.0"}
   "mparser" {>= "1.3"}
   "mparser-pcre"
   "ppx_deriving"
@ -25,7 +25,7 @@ index 88563f6..fbbc122 100644
   "lwt"
   "cohttp"
 diff --git a/comby.opam b/comby.opam
-index 9e5d96b..ecab789 100644
+index 9e5d96b..d5be316 100644
 --- a/comby.opam
 +++ b/comby.opam
@@ -31,7 +31,7 @@ depends: [
@ -33,14 +33,23 @@ index 9e5d96b..ecab789 100644
   "comby-kernel" {= "1.7.0"}
   "comby-semantic" {= "1.7.0"}
 -  "core"
-+  "core" {>= "v0.15.0"}
+  "core" {>= "v0.16.0"}
   "hack_parallel" {arch != "arm32" & arch != "arm64"}
   "lwt"
   "lwt_react"
 diff --git a/lib/app/configuration/command_configuration.ml b/lib/app/configuration/command_configuration.ml
-index 75c3107..418276e 100644
+index 75c3107..29826a9 100644
 --- a/lib/app/configuration/command_configuration.ml
 +++ b/lib/app/configuration/command_configuration.ml
+@@ -1,7 +1,7 @@
+ open Core
+ open Camlzip
+ 
+-open Polymorphic_compare
+open Poly
+ 
+ open Comby_kernel
+ 
@@ -16,21 +16,21 @@ type 'a next =
 
 let fold_directory ?(sorted=false) root ~init ~f =
@ -356,6 +365,60 @@ index 7a6353d..b79cba2 100644
 - (preprocess (pps ppx_jane)))
 + (preprocess
 +  (pps ppx_jane)))
+diff --git a/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml b/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml
+index 4e064fb..dca77b2 100644
+--- a/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml
+++ b/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml
+@@ -287,7 +287,7 @@ end = struct
+           ~running_step:(fun (car, pos) cadr ->
+             match car, cadr with
+             | Same car_lines, Same cadr_lines ->
+-              Skip (Same (Array.concat [ car_lines; cadr_lines ]), pos)
+              Skip {state = (Same (Array.concat [ car_lines; cadr_lines ]), pos)}
+             | Unified _, _ | _, Unified _ ->
+               raise_s
+                 [%message
+@@ -296,7 +296,7 @@ end = struct
+                     (cadr : string Range.t)]
+             | (Prev _ | Next _ | Replace _), (Prev _ | Next _ | Replace _)
+             | Same _, (Prev _ | Next _ | Replace _)
+-            | (Prev _ | Next _ | Replace _), Same _ -> Yield ((car, pos), (cadr, Middle)))
+            | (Prev _ | Next _ | Replace _), Same _ -> Yield {value = (car, pos); state = (cadr, Middle)})
+           ~inner_finished:(fun (last, pos) ->
+             match last, pos with
+             | Unified _, _ ->
+@@ -308,7 +308,7 @@ end = struct
+               Some (last, End))
+           ~finishing_step:(function
+             | None -> Done
+-            | Some result -> Yield (result, None))
+            | Some result -> Yield {value = result; state = None})
+     ;;
+ 
+     include struct
+@@ -448,7 +448,7 @@ end = struct
+         ~init:{ prev_start; next_start; ranges = [] }
+         ~running_step:(fun t drop_or_keep ->
+           match (drop_or_keep : Drop_or_keep.t) with
+-          | Keep range -> Skip { t with ranges = range :: t.ranges }
+          | Keep range -> Skip {state = { t with ranges = range :: t.ranges }}
+           | Drop n ->
+             let hunk = to_hunk t in
+             let t =
+@@ -457,11 +457,11 @@ end = struct
+               ; ranges = []
+               }
+             in
+-            if List.is_empty (Hunk.ranges hunk) then Skip t else Yield (hunk, t))
+            if List.is_empty (Hunk.ranges hunk) then Skip {state = t} else Yield {value = hunk; state = t})
+         ~inner_finished:(fun t -> if List.is_empty t.ranges then None else Some t)
+         ~finishing_step:(function
+           | None -> Done
+-          | Some t -> Yield (to_hunk t, None))
+          | Some t -> Yield {value = to_hunk t; state = None})
+     ;;
+   end
+ 
 diff --git a/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml b/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml
 index 4f53a0b..88ee0e3 100644
 --- a/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml
@ -501,7 +564,7 @@ index 03b120a..4d48b61 100644
 +  ppx_deriving_yojson
 +  ppx_deriving_yojson.runtime))
 diff --git a/lib/kernel/matchers/alpha.ml b/lib/kernel/matchers/alpha.ml
-index d6116f7..993aafc 100644
+index d6116f7..7d16171 100644
 --- a/lib/kernel/matchers/alpha.ml
 +++ b/lib/kernel/matchers/alpha.ml
@@ -13,20 +13,11 @@ module R = MakeRegexp(Regexp)
@ -537,6 +600,15 @@ index d6116f7..993aafc 100644
       List.fold plist ~init:(return Types.Unit) ~f:(>>)
 
     let with_debug_matcher s tag =
+@@ -745,7 +736,7 @@ module Make (Lang : Types.Language.S) (Meta : Types.Metasyntax.S) (Ext : Types.E
+     let hole_parser ?at_depth sort dimension =
+       let open Types.Hole in
+       let hole_parser =
+-        let open Polymorphic_compare in
+        let open Poly in
+         List.fold ~init:[] hole_parsers ~f:(fun acc (sort', parser) -> if sort' = sort then parser::acc else acc)
+       in
+       let skip_signal hole = skip (string "_signal_hole") |>> fun () -> Types.Hole hole in
 diff --git a/lib/kernel/matchers/dune b/lib/kernel/matchers/dune
 index 12ed326..4625458 100644
 --- a/lib/kernel/matchers/dune
@ -566,7 +638,7 @@ index 12ed326..4625458 100644
 +  yojson
 +  ppx_deriving_yojson))
 diff --git a/lib/kernel/matchers/evaluate.ml b/lib/kernel/matchers/evaluate.ml
-index 9ea71a0..288f79a 100644
+index 9ea71a0..4f63ab6 100644
 --- a/lib/kernel/matchers/evaluate.ml
 +++ b/lib/kernel/matchers/evaluate.ml
@@ -3,10 +3,7 @@ open Core_kernel
@ -581,8 +653,17 @@ index 9ea71a0..288f79a 100644
 
 type result = bool * Match.environment option
 
+@@ -102,7 +99,7 @@ let apply
+           |> Option.some
+       in
+       List.find_map cases ~f:(fun (template, case_expression) -> evaluate template case_expression)
+-      |> Option.value_map ~f:ident ~default:(false, Some env)
+      |> Option.value_map ~f:Fn.id ~default:(false, Some env)
+ 
+     (* rewrite ... { ... } *)
+     | Rewrite (Template t, (match_template, rewrite_template)) ->
 diff --git a/lib/kernel/matchers/omega.ml b/lib/kernel/matchers/omega.ml
-index 61cc69a..0bef682 100644
+index 61cc69a..3445307 100644
 --- a/lib/kernel/matchers/omega.ml
 +++ b/lib/kernel/matchers/omega.ml
@@ -32,15 +32,9 @@ let push_source_ref : string ref = ref ""
@ -593,17 +674,25 @@ index 61cc69a..0bef682 100644
 -  match Sys.getenv "DEBUG_COMBY" with
 -  | exception Not_found -> false
 -  | _ -> true
-
+let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some
+ 
 -let rewrite =
 -  match Sys.getenv "REWRITE" with
 -  | exception Not_found -> false
 -  | _ -> true
-+let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some
-+
 +let rewrite = Sys.getenv "REWRITE" |> Option.is_some
 
 let actual = Buffer.create 10
 
+@@ -540,7 +534,7 @@ module Make (Language : Types.Language.S) (Meta : Metasyntax.S) (Ext : External.
+ 
+     let hole_parser sort dimension : (production * 'a) t t =
+       let hole_parser = (* This must be fold, can't be find *)
+-        let open Polymorphic_compare in
+        let open Poly in
+         List.fold ~init:[] Template.Matching.hole_parsers ~f:(fun acc (sort', parser) ->
+             if sort' = sort then parser::acc else acc)
+       in
 diff --git a/lib/kernel/matchers/preprocess.ml b/lib/kernel/matchers/preprocess.ml
 index 84f3ed0..b6d10e7 100644
 --- a/lib/kernel/matchers/preprocess.ml
@ -633,7 +722,7 @@ index ef0bd59..906820b 100644
 module type Regexp_engine_intf = sig
   type t
 diff --git a/lib/kernel/matchers/rewrite.ml b/lib/kernel/matchers/rewrite.ml
-index 32c4740..2fc28db 100644
+index 32c4740..545cba5 100644
 --- a/lib/kernel/matchers/rewrite.ml
 +++ b/lib/kernel/matchers/rewrite.ml
@@ -4,10 +4,7 @@ open Core_kernel
@ -648,6 +737,35 @@ index 32c4740..2fc28db 100644
 
 let counter =
   let uuid_for_id_counter = ref 0 in
+@@ -46,24 +43,24 @@ let parse_first_label ?(metasyntax = Metasyntax.default_metasyntax) template =
+   in
+   parse_string ~consume:All parser template
+   |> function
+-  | Ok label -> List.find_map label ~f:ident
+  | Ok label -> List.find_map label ~f:Fn.id
+   | Error _ -> None
+ 
+ let substitute_fresh
+     ?(metasyntax = Metasyntax.default_metasyntax)
+     ?(fresh = counter)
+     template =
+-  let label_table = String.Table.create () in
+  let label_table = Hashtbl.create (module String) in
+   let template_ref = ref template in
+   let current_label_ref = ref (parse_first_label ~metasyntax !template_ref) in
+   while Option.is_some !current_label_ref do
+     let label = Option.value_exn !current_label_ref in
+     let id =
+-      match String.Table.find label_table label with
+      match Hashtbl.find label_table label with
+       | Some id -> id
+       | None ->
+         let id = fresh () in
+-        if String.(label <> "") then String.Table.add_exn label_table ~key:label ~data:id;
+        if String.(label <> "") then Hashtbl.add_exn label_table ~key:label ~data:id;
+         id
+     in
+     let left, right = replacement_sentinel metasyntax in
 diff --git a/lib/kernel/matchers/template.ml b/lib/kernel/matchers/template.ml
 index 423a07f..136236c 100644
 --- a/lib/kernel/matchers/template.ml
--- a/pkgs/development/tools/database/sqlc/default.nix
+++ b/pkgs/development/tools/database/sqlc/default.nix
@ -8,7 +8,7 @@ buildGoModule {
  inherit version;

  src = fetchFromGitHub {
-    owner = "kyleconroy";
+    owner = "sqlc-dev";
    repo = "sqlc";
    rev    = "v${version}";
    sha256 = "sha256-ITW5jIlNoiW7sl6s5jCVRELglauZzSPmAj3PXVpdIGA=";
--- a/pkgs/development/tools/vultr-cli/default.nix
+++ b/pkgs/development/tools/vultr-cli/default.nix
@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:

 buildGoModule rec {
  pname = "vultr-cli";
@ -13,13 +13,23 @@ buildGoModule rec {

  vendorHash = "sha256-61hdhkFyp4an9KtqDzB4Sd2+t40QEoLgq7MvUBxEQKs=";

+  nativeBuildInputs = [ installShellFiles ];
+
  ldflags = [ "-s" "-w" ];

+  postInstall = ''
+    installShellCompletion --cmd vultr-cli \
+      --bash <($out/bin/vultr-cli completion bash) \
+      --fish <($out/bin/vultr-cli completion fish) \
+      --zsh <($out/bin/vultr-cli completion zsh)
+  '';
+
  meta = with lib; {
    description = "Official command line tool for Vultr services";
    homepage = "https://github.com/vultr/vultr-cli";
    changelog = "https://github.com/vultr/vultr-cli/blob/v${version}/CHANGELOG.md";
    license = licenses.asl20;
    maintainers = with maintainers; [ Br1ght0ne ];
+    mainProgram = "vultr-cli";
  };
 }
--- a/pkgs/games/prismlauncher/wrapper.nix
+++ b/pkgs/games/prismlauncher/wrapper.nix
@ -16,6 +16,7 @@
 , gamemode
 , flite
 , mesa-demos
+, udev

 , msaClientID ? null
 , gamemodeSupport ? stdenv.isLinux
@ -58,11 +59,15 @@ symlinkJoin {
        libXxf86vm
      ])
      ++ [
+        # lwjgl
        libpulseaudio
        libGL
        glfw
        openal
        stdenv.cc.cc.lib
+
+        # oshi
+        udev
      ]
      ++ lib.optional gamemodeSupport gamemode.lib
      ++ lib.optional textToSpeechSupport flite
--- a/pkgs/servers/bililiverecorder/default.nix
+++ b/pkgs/servers/bililiverecorder/default.nix
@ -0,0 +1,51 @@
+{ lib
+, stdenv
+, fetchzip
+, makeWrapper
+, dotnetCorePackages
+}:
+
+let
+  pname = "bililiverecorder";
+
+  dotnet = with dotnetCorePackages; combinePackages [
+    runtime_6_0
+    aspnetcore_6_0
+  ];
+
+  version = "2.6.3";
+  hash = "sha256-h7nsbi831HB1tmo7d9vlR8fSKeTn2Ezn8NVl02Z1oQ0=";
+
+in
+stdenv.mkDerivation {
+  inherit pname version;
+
+  src = fetchzip {
+    url = "https://github.com/BililiveRecorder/BililiveRecorder/releases/download/v${version}/BililiveRecorder-CLI-any.zip";
+    stripRoot = false;
+    inherit hash;
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,share/${pname}-${version}}
+    cp -r * $out/share/${pname}-${version}/.
+
+    makeWrapper "${dotnet}/bin/dotnet" $out/bin/BililiveRecorder \
+      --add-flags "$out/share/${pname}-${version}/BililiveRecorder.Cli.dll"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A convenient free open source bilibili live recording tool";
+    homepage = "https://rec.danmuji.org/";
+    changelog = "https://github.com/BililiveRecorder/BililiveRecorder/releases/tag/${version}";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ zaldnoay ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@ -1822,7 +1822,8 @@
      pygti
    ];
    "hydrawise" = ps: with ps; [
-    ]; # missing inputs: pydrawise
+      pydrawise
+    ];
    "hyperion" = ps: with ps; [
      hyperion-py
    ];
--- a/pkgs/servers/unstructured-api/default.nix
+++ b/pkgs/servers/unstructured-api/default.nix
@ -0,0 +1,68 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  python3,
+  makeWrapper,
+  nix-update-script,
+  symlinkJoin,
+  nltk-data,
+}:
+let
+  pythonEnv = python3.withPackages (packages: with packages; [
+    unstructured-api-tools
+    unstructured
+    pydantic
+    click
+    ratelimit
+    requests
+    pypdf
+    pycryptodome
+    safetensors
+    uvicorn
+  ] ++ packages.unstructured.optional-dependencies.local-inference);
+  version = "0.0.39";
+  unstructured_api_nltk_data = symlinkJoin {
+    name = "unstructured_api_nltk_data";
+
+    paths = [ nltk-data.punkt nltk-data.averaged_perceptron_tagger ];
+  };
+in stdenvNoCC.mkDerivation {
+  pname = "unstructured-api";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "Unstructured-IO";
+    repo = "unstructured-api";
+    rev = version;
+    hash = "sha256-fk0YkGllggi0eWdp9ytHy4/9rChkcDnQvEvVAp1+RJw=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out $out/bin $out/lib
+    cp -r . $out/lib
+
+    makeWrapper ${pythonEnv}/bin/uvicorn $out/bin/unstructured-api \
+      --set NLTK_DATA ${unstructured_api_nltk_data} \
+      --prefix PYTHONPATH : $out/lib \
+      --add-flags "prepline_general.api.app:app"
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = with lib; {
+    description = "open-source toolkit designed to make it easy to prepare unstructured data like PDFs, HTML and Word Documents for downstream data science tasks";
+    homepage = "https://github.com/Unstructured-IO/unstructured-api";
+    changelog = "https://github.com/Unstructured-IO/unstructured-api/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ happysalada ];
+  };
+}
--- a/pkgs/tools/misc/gradescope-submit/default.nix
+++ b/pkgs/tools/misc/gradescope-submit/default.nix
@ -0,0 +1,35 @@
+{ lib
+, fetchFromGitHub
+, ocamlPackages
+}:
+
+ocamlPackages.buildDunePackage rec {
+  pname = "gradescope_submit";
+  version = "2.0.2";
+
+  src = fetchFromGitHub {
+    owner = "nmittu";
+    repo = "gradescope-submit";
+    rev = version;
+    hash = "sha256-BVNXipgw0wz3PRGYvur8jrXZw/6i0fZ+MOZHzXzlFOk=";
+  };
+
+  buildInputs = with ocamlPackages; [
+    core
+    core_unix
+    cohttp
+    cohttp-lwt-unix
+    lambdasoup
+    toml
+    yojson
+    lwt_ssl
+  ];
+
+  meta = with lib; {
+    description = "A small script to submit to Gradescope via GitHub";
+    homepage = "https://github.com/nmittu/gradescope-submit";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "submit";
+  };
+}
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@ -2,18 +2,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "tmuxp";
-  version = "1.28.1";
+  version = "1.29.0";
+  format = "pyproject";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-sNLqUyas6QY11eW/FhkqB6+u4MTqiY1ixvD3BN69Fic=";
+    hash = "sha256-MiXG4MVzomyc4LjovPsvhmPngtJv85s6Ypo/Cm2Whho=";
  };

-  # No tests in archive
-  doCheck = false;
-
-  format = "pyproject";
-
  nativeBuildInputs = [
    python3Packages.poetry-core
    python3Packages.shtab
@ -27,6 +23,9 @@ python3Packages.buildPythonApplication rec {
    libtmux
  ];

+  # No tests in archive
+  doCheck = false;
+
  postInstall = ''
    installShellCompletion --cmd tmuxp \
      --bash <(shtab --shell=bash -u tmuxp.cli.create_parser) \
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "trufflehog";
-  version = "3.54.0";
+  version = "3.54.1";

  src = fetchFromGitHub {
    owner = "trufflesecurity";
    repo = "trufflehog";
    rev = "refs/tags/v${version}";
-    hash = "sha256-JPXzo6f1meLIoRdbKN58Hhl502UjgxPrC8MDoizzUvs=";
+    hash = "sha256-wHgteAxFCnGY31Yda1qIxy4TLM51Lk+yy2BIHgfIzik=";
  };

  vendorHash = "sha256-zYvKhhwN5TtJQxkkcY5U9LtTdMb97ucfksxpTMKH/Zc=";
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -350,6 +350,8 @@ with pkgs;

  bibtex-tidy = callPackage ../tools/typesetting/bibtex-tidy { };

+  bililiverecorder = callPackage ../servers/bililiverecorder { };
+
  binbloom = callPackage ../tools/security/binbloom { };

  bingo = callPackage ../development/tools/bingo { };
@ -690,6 +692,8 @@ with pkgs;

  gpick = callPackage ../tools/misc/gpick { };

+  gradescope-submit = callPackage ../tools/misc/gradescope-submit { };
+
  gridlock = callPackage ../tools/nix/gridlock { };
  inherit (gridlock) nyarr;

@ -5658,6 +5662,8 @@ with pkgs;

  hyprland-share-picker = libsForQt5.callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix { };

+  hyprnome = callPackage ../applications/misc/hyprnome { };
+
  hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };

  hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker {
@ -9823,6 +9829,7 @@ with pkgs;

  ligo = callPackage ../development/compilers/ligo {
    coq = coq_8_14;
+    ocamlPackages = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15;
  };

  lego = callPackage ../tools/admin/lego { };
@ -13687,6 +13694,8 @@ with pkgs;

  teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };

+  teehee = callPackage ../applications/editors/teehee { };
+
  teip = callPackage ../tools/text/teip { };

  telegraf = callPackage ../servers/monitoring/telegraf { };
@ -17448,7 +17457,9 @@ with pkgs;

  stalin = callPackage ../development/compilers/stalin { };

-  stanc = callPackage ../development/compilers/stanc { };
+  stanc = callPackage ../development/compilers/stanc {
+    ocamlPackages = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15;
+  };

  metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { };

@ -27585,6 +27596,8 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;
  };

+  unstructured-api = callPackage ../servers/unstructured-api { };
+
  urserver = callPackage ../servers/urserver { };

  uxplay = callPackage ../servers/uxplay { };
@ -34185,6 +34198,8 @@ with pkgs;

  neomutt = callPackage ../applications/networking/mailreaders/neomutt { };

+  neosay = callPackage ../applications/networking/instant-messengers/neosay { };
+
  natron = libsForQt5.callPackage ../applications/video/natron { };

  natural-docs = callPackage ../applications/misc/natural-docs { };
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@ -60,9 +60,7 @@ let

    ### B ###

-    bap = callPackage ../development/ocaml-modules/bap {
-      inherit (pkgs.llvmPackages) llvm;
-    };
+    bap = janeStreet_0_15.bap;

    base64 = callPackage ../development/ocaml-modules/base64 { };

@ -86,7 +84,7 @@ let

    biniou = callPackage ../development/ocaml-modules/biniou { };

-    biocaml = callPackage ../development/ocaml-modules/biocaml { };
+    biocaml = janeStreet_0_15.biocaml;

    bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { };

@ -718,7 +716,9 @@ let

    # Jane Street
    janePackage =
-      if lib.versionOlder "4.10.2" ocaml.version
+      if lib.versionOlder "4.13.1" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/janePackage_0_16.nix {}
+      else if lib.versionOlder "4.10.2" ocaml.version
      then callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix {}
      else if lib.versionOlder "4.08" ocaml.version
      then callPackage ../development/ocaml-modules/janestreet/janePackage_0_14.nix {}
@ -727,7 +727,12 @@ let
      else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};

    janeStreet =
-      if lib.versionOlder "4.10.2" ocaml.version
+      if lib.versionOlder "4.13.1" ocaml.version
+      then import ../development/ocaml-modules/janestreet/0.16.nix {
+        inherit self;
+        inherit (pkgs) bash fetchpatch fzf lib openssl zstd;
+      }
+      else if lib.versionOlder "4.10.2" ocaml.version
      then import ../development/ocaml-modules/janestreet/0.15.nix {
        inherit self;
        inherit (pkgs) bash fetchpatch fzf lib openssl zstd;
@ -751,6 +756,75 @@ let
        inherit (pkgs) openssl;
      };

+    janeStreet_0_15 = (lib.makeScope self.newScope (self': with self'; {
+
+      # ocamlPackages that janestreet v0.15 packages depend on.
+      jsDeps = let
+        uri-sexp = self.uri-sexp.override { inherit (self') ppx_sexp_conv sexplib0; };
+        cohttp = self.cohttp.override {
+          inherit (self') ppx_sexp_conv;
+          inherit uri-sexp;
+        };
+        ipaddr-sexp = self.ipaddr-sexp.override { inherit (self') ppx_sexp_conv; };
+        conduit = self.conduit.override {
+          inherit (self') ppx_sexp_conv sexplib;
+          inherit ipaddr-sexp;
+        };
+        conduit-async = self.conduit-async.override {
+          inherit (self') async ppx_sexp_conv ppx_here core sexplib async_ssl;
+          inherit conduit ipaddr-sexp;
+        };
+      in {
+        inherit (self) dune-configurator alcotest re num octavius uutf ounit ctypes;
+        ppxlib = self.ppxlib.override { inherit (self') stdio; };
+        cohttp-async = self.cohttp-async.override {
+          inherit (self') ppx_sexp_conv base async async_kernel async_unix core_unix sexplib0 core;
+          inherit uri-sexp cohttp conduit-async;
+        };
+        janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix { };
+      };
+
+      janeStreet = import ../development/ocaml-modules/janestreet/0.15.nix {
+        self = self' // jsDeps;
+        inherit (pkgs) bash fetchpatch fzf lib openssl zstd;
+      };
+
+      # Packages that are not part of janestreet libraries, but still depend
+      # on v0.15 are kept in this scope, too.
+
+      bap = let
+        ppxlib = jsDeps.ppxlib;
+        lwt_ppx = self.lwt_ppx.override { inherit ppxlib; };
+        sedlex = self.sedlex.override { inherit ppxlib ppx_expect; };
+        in callPackage ../development/ocaml-modules/bap {
+          inherit (pkgs.llvmPackages) llvm;
+          ezjsonm = self.ezjsonm.override { inherit sexplib0; };
+          ppx_bitstring = self.ppx_bitstring.override { inherit ppxlib; };
+          ocurl = self.ocurl.override { inherit lwt_ppx; };
+          piqi = self.piqi.override { inherit sedlex; };
+          piqi-ocaml = self.piqi-ocaml.override { inherit piqi; };
+        };
+
+      biocaml = let
+        angstrom = self.angstrom.override { inherit ppx_let; };
+      in callPackage ../development/ocaml-modules/biocaml {
+        uri = self.uri.override { inherit angstrom; };
+        cfstream = self.cfstream.override { inherit core_kernel; };
+      };
+
+      magic-trace = callPackage ../development/ocaml-modules/magic-trace { };
+
+      phylogenetics = let
+        angstrom = self.angstrom.override { inherit ppx_let; };
+      in callPackage ../development/ocaml-modules/phylogenetics {
+        inherit biocaml;
+        ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; };
+        angstrom-unix = self.angstrom-unix.override { inherit angstrom; };
+      };
+
+      ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { };
+    })).overrideScope' liftJaneStreet;
+
    janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix {
      self = self.janeStreet_0_9_0;
      super = self // {
@ -930,7 +1004,7 @@ let

    magic-mime = callPackage ../development/ocaml-modules/magic-mime { };

-    magic-trace = callPackage ../development/ocaml-modules/magic-trace { };
+    magic-trace = janeStreet_0_15.magic-trace;

    mariadb = callPackage ../development/ocaml-modules/mariadb {
      inherit (pkgs) mariadb;
@ -1332,7 +1406,7 @@ let

    pgsolver = callPackage ../development/ocaml-modules/pgsolver { };

-    phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { };
+    phylogenetics = janeStreet_0_15.phylogenetics;

    piaf = callPackage ../development/ocaml-modules/piaf { };

@ -1366,7 +1440,7 @@ let

    pprint = callPackage ../development/ocaml-modules/pprint { };

-    ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { };
+    ppx_bap = janeStreet_0_15.ppx_bap;

    ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { };

@ -1857,6 +1931,13 @@ in let inherit (pkgs) callPackage; in rec

  ocamlPackages = ocamlPackages_4_14;

+  # This is a nasty way to replace toplevel janestreet attributes in the scope,
+  # so that modules outside of ocamlPackages that depend on JS OCaml libraries
+  # *and* non-JS OCaml libraries can pull in the same version of JS transitive
+  # dependencies. Remove this once ligo and stanc can be compiled against
+  # janestreet 0.16 libraries.
+  ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope' (self: super: super // super.janeStreet_0_15);
+
  # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0.
  # Below are aliases for porting them to the latest versions of the OCaml 4 series.
  ocamlPackages_4_14_unsafe_string = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix {
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -580,6 +580,8 @@ self: super: with self; {

  apipkg = callPackage ../development/python-modules/apipkg { };

+  apischema = callPackage ../development/python-modules/apischema { };
+
  apispec = callPackage ../development/python-modules/apispec { };

  apispec-webframeworks = callPackage ../development/python-modules/apispec-webframeworks { };
@ -8980,6 +8982,8 @@ self: super: with self; {
    inherit (pkgs) graphviz;
  };

+  pydrawise = callPackage ../development/python-modules/pydrawise { };
+
  pydrive2 = callPackage ../development/python-modules/pydrive2 { };

  pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam  { };