Merge master into staging-next

2025-02-22 03:53:47 +00:00 · 2023-06-03 12:01:39 +00:00 · 2023-06-03 12:01:39 +00:00 · 4e2bb74acd
commit 4e2bb74acd
parent 1f9efd43e8 39addc620d
36 changed files with 2704 additions and 3041 deletions
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@ -498,7 +498,8 @@ in

    systemd.services.gitea = {
      description = "gitea";
-      after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
+      after = [ "network.target" ] ++ optional usePostgresql "postgresql.service" ++ optional useMysql "mysql.service";
+      requires = optional usePostgresql "postgresql.service" ++ optional useMysql "mysql.service";
      wantedBy = [ "multi-user.target" ];
      path = [ cfg.package pkgs.git pkgs.gnupg ];

--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix
@ -8,17 +8,17 @@
 }:

 let
-  rev = "321e05fc0398a6159925b858f46608ea07ef269e";
+  rev = "0dbbd7f401da1bedd1a9146df6127233d601435b";
 in
 melpaBuild {
  pname = "acm-terminal";
-  version = "20230215.414"; # 4:14 UTC
+  version = "20230601.1326"; # 13:26 UTC

  src = fetchFromGitHub {
    owner = "twlz0ne";
    repo = "acm-terminal";
    inherit rev;
-    sha256 = "sha256-Flw07EwH9z0E3tqXs4mStICJmoHfp60ALrP1GmUmeuU=";
+    sha256 = "sha256-Opouy9A6z0YUT1zxZq1yHx+r/hwNE93JDwfa1fMWNgc=";
  };

  commit = rev;
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
@ -16,7 +16,7 @@
 }:

 let
-  rev = "7e1e6a4c349e720d75c892cd7230b29c35148342";
+  rev = "8de85f9967fec6a8e447e5b5f3021e5e1f95b445";
  python = python3.withPackages (ps: with ps; [
    epc
    orjson
@ -26,13 +26,13 @@ let
 in
 melpaBuild {
  pname = "lsp-bridge";
-  version = "20230424.1642"; # 16:42 UTC
+  version = "20230603.345"; # 3:45 UTC

  src = fetchFromGitHub {
    owner = "manateelazycat";
    repo = "lsp-bridge";
    inherit rev;
-    sha256 = "sha256-e0XVQpsyjy8HeZN6kLRjnoTpyEefTqstsgydEKlEQ1c=";
+    sha256 = "sha256-08DFgZaYdlz9f9eqZuG760vpmO3D4QN9V66YqVyVsV4=";
  };

  commit = rev;
--- a/pkgs/applications/science/math/mathematica/10.nix
+++ b/pkgs/applications/science/math/mathematica/10.nix
@ -74,7 +74,8 @@ stdenv.mkDerivation rec {
    + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux")
      (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs);

-  phases = "unpackPhase installPhase fixupPhase";
+  dontConfigure = true;
+  dontBuild = true;

  unpackPhase = ''
    echo "=== Extracting makeself archive ==="
--- a/pkgs/applications/science/math/mathematica/11.nix
+++ b/pkgs/applications/science/math/mathematica/11.nix
@ -75,7 +75,8 @@ stdenv.mkDerivation rec {
    + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux")
      (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs);

-  phases = "unpackPhase installPhase fixupPhase";
+  dontConfigure = true;
+  dontBuild = true;

  unpackPhase = ''
    echo "=== Extracting makeself archive ==="
--- a/pkgs/applications/science/math/mathematica/9.nix
+++ b/pkgs/applications/science/math/mathematica/9.nix
@ -64,7 +64,8 @@ stdenv.mkDerivation rec {
    + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux")
    (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs);

-  phases = "unpackPhase installPhase fixupPhase";
+  dontConfigure = true;
+  dontBuild = true;

  unpackPhase = ''
    echo "=== Extracting makeself archive ==="
--- a/pkgs/applications/version-management/josh/default.nix
+++ b/pkgs/applications/version-management/josh/default.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , rustPlatform
 , libgit2
 , openssl
@ -12,16 +13,26 @@

 rustPlatform.buildRustPackage rec {
  pname = "josh";
-  version = "22.06.22";
+  version = "23.02.14";
+  JOSH_VERSION = "r${version}";

  src = fetchFromGitHub {
    owner = "esrlabs";
    repo = "josh";
-    rev = "r" + version;
-    sha256 = "0511qv9zyjvv4zfz6zyi69ssbkrwa24n0ah5w9mb4gzd547as8pq";
+    rev = JOSH_VERSION;
+    sha256 = "1sqa8xi5d55zshky7gicac02f67vp944hclkdsmwy0bczk9hgssr";
  };

-  cargoSha256 = "0zfjjyyz4pxar1mfkkj9aij4dnwqy3asdrmay1iy6ijjn1qd97n4";
+  patches = [
+    # Unreleased patch allowing compilation from the GitHub tarball download
+    (fetchpatch {
+      name = "josh-version-without-git.patch";
+      url = "https://github.com/josh-project/josh/commit/13e7565ab029206598881391db4ddc6dface692b.patch";
+      sha256 = "1l5syqj51sn7kcqvffwl6ggn5sq8wfkpviga860agghnw5dpf7ns";
+    })
+  ];
+
+  cargoSha256 = "0f6cvz2s8qs53b2g6xja38m24hafqla61s4r5za0a1dyndgms7sl";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@ -16,6 +16,7 @@
  "@angular/cli" = "ng";
  "@antora/cli" = "antora";
  "@astrojs/language-server" = "astro-ls";
+  "@babel/cli" = "babel";
  "@bitwarden/cli" = "bw";
  "@commitlint/cli" = "commitlint";
  "@forge/cli" = "forge";
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@ -2,6 +2,7 @@
  "@angular/cli"
 , "@antfu/ni"
 , "@astrojs/language-server"
+, "@babel/cli"
 , "@bitwarden/cli"
 , "@commitlint/cli"
 , "@commitlint/config-conventional"
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@ -2,11 +2,11 @@

 mkDerivation rec {
  pname = "composer";
-  version = "2.5.5";
+  version = "2.5.7";

  src = fetchurl {
    url = "https://github.com/composer/composer/releases/download/${version}/composer.phar";
-    sha256 = "sha256-VmptHPS+HMOsiC0qKhOBf/rlTmD1qnyRN0NIEKWAn/w=";
+    sha256 = "sha256-klbEwcgDudDLemahq2xzfkjEPMbfe47J7CSXpyS/RN4=";
  };

  dontUnpack = true;
--- a/pkgs/development/python-modules/aiomisc/default.nix
+++ b/pkgs/development/python-modules/aiomisc/default.nix
@ -22,14 +22,14 @@

 buildPythonPackage rec {
  pname = "aiomisc";
-  version = "17.3.0";
+  version = "17.3.2";
  format = "pyproject";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-HX3IfTQ/zgNnYRN1qnd3vVWvm84g2pjSOBjhzrZHEUI=";
+    hash = "sha256-tJ8d02KbG4z6cUflvjSF/Y7UHH8UqWT8UY7XFqNPP+o=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/ansible-compat/default.nix
+++ b/pkgs/development/python-modules/ansible-compat/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "ansible-compat";
-  version = "4.0.5";
+  version = "4.1.2";
  format = "pyproject";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-TX4zP41PNbED6rwCfZG1hdVd1hk6FLkRh/xmsa3Wxs0=";
+    hash = "sha256-aWFi28EiPAtHQTamFmKz/kQRXUkN6NpgaxSc7lcrAe0=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "atlassian-python-api";
-  version = "3.37.0";
+  version = "3.38.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "atlassian-api";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-+lhDivbw30Oa3aB0TprRhBzv/c72IzNltFZA87LY2nM=";
+    hash = "sha256-jk5q5ymnwyQ3t6fP8E1dPM4jkaUllvZqo9RiX8+SnvI=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "coinmetrics-api-client";
-  version = "2023.5.2.20";
+  version = "2023.5.26.17";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit version;
    pname = "coinmetrics_api_client";
-    hash = "sha256-20+qoCaSNGw4DVlW3USrSkg3fckqF77TQ7wmSsuZ3ek=";
+    hash = "sha256-GCHXraeH6WWTlCnw9B1Xwtb6jwcxcvW1siy2T/8x14Q=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/dvc-azure/default.nix
+++ b/pkgs/development/python-modules/dvc-azure/default.nix
@ -10,12 +10,12 @@

 buildPythonPackage rec {
  pname = "dvc-azure";
-  version = "2.21.1";
+  version = "2.21.2";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-0PB+2lPAV2yy2hivDDz0PXmi8WqoSlUZadyfKPp9o1g=";
+    hash = "sha256-ATxVIJ6qNNuz4p/DmcbBrc8KypfYquk4y/XQK7JmlPE=";
  };

  # Prevent circular dependency
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "dvclive";
-  version = "2.10.0";
+  version = "2.11.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "iterative";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-wnaw0jzaSIPsKaNNtYRUYYqQNpdcmtiunQnhpRQV66E=";
+    hash = "sha256-dV6ob+TXzQOuHU9bybAO8sVmrJ7yP8vwp0pXXFVNb34=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/fastavro/default.nix
+++ b/pkgs/development/python-modules/fastavro/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "fastavro";
-  version = "1.7.2";
+  version = "1.7.4";
  format = "setuptools";

  disabled = pythonOlder "3.6";
--- a/pkgs/development/python-modules/hickle/default.nix
+++ b/pkgs/development/python-modules/hickle/default.nix
@ -12,8 +12,10 @@
 }:

 buildPythonPackage rec {
-  pname   = "hickle";
+  pname = "hickle";
  version = "5.0.2";
+  format = "setuptools";
+
  disabled = pythonOlder "3.5";

  src = fetchPypi {
@ -28,11 +30,23 @@ buildPythonPackage rec {
  propagatedBuildInputs = [ h5py numpy dill ];

  nativeCheckInputs = [
-    pytestCheckHook scipy pandas astropy
+    pytestCheckHook
+    scipy
+    pandas
+    astropy
  ];

  pythonImportsCheck = [ "hickle" ];

+  disabledTests = [
+    # broken in 5.0.2 with recent NumPy
+    # see https://github.com/telegraphic/hickle/issues/174
+    "test_scalar_compression"
+    # broken in 5.0.2 with python 3.11
+    # see https://github.com/telegraphic/hickle/issues/169
+    "test_H5NodeFilterProxy"
+  ];
+
  meta = {
    description = "Serialize Python data to HDF5";
    homepage = "https://github.com/telegraphic/hickle";
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@ -38,6 +38,8 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

+  doCheck = false;
+
  meta = with lib; {
    changelog = "https://github.com/pbs/pycaption/blob/${version}/docs/changelog.rst";
    description = "Closed caption converter";
--- a/pkgs/development/python-modules/pytest-relaxed/default.nix
+++ b/pkgs/development/python-modules/pytest-relaxed/default.nix
@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "pytest-relaxed";
-  version = "2.0.0";
+  version = "2.0.1";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-Szc8x1Rmb/YPVCWmnLQUZCwqEc56RsjOBmpzjkCSyjk=";
+    hash = "sha256-U6c3Lj/qpSdAm7QDU/gTxZt2Dl2L1H5vb88YfF2W3Qw=";
  };

  buildInputs = [
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@ -26,7 +26,7 @@

 buildPythonPackage rec {
  pname = "xml2rfc";
-  version = "3.17.1";
+  version = "3.17.2";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -35,7 +35,7 @@ buildPythonPackage rec {
    owner = "ietf-tools";
    repo = "xml2rfc";
    rev = "refs/tags/v${version}";
-    hash = "sha256-C5bc32XbAqJtzUbITj1U1ItaY2ZMEXM9z+B7dQadoIs=";
+    hash = "sha256-LwM0lfBJNSCMsa0AiGBRmuihc/kSLYQ4V6hgY5fM6/w=";
  };

  postPatch = ''
--- a/pkgs/development/tools/lightningcss/default.nix
+++ b/pkgs/development/tools/lightningcss/default.nix
@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "lightningcss";
-  version = "1.19.0";
+  version = "1.20.0";

  src = fetchFromGitHub {
    owner = "parcel-bundler";
    repo = "lightningcss";
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-ncZ1tof8InP+8KLTQ2YOwaD/liwU1LNZkllBm53VYNo=";
+    sha256 = "zy1kV53ZvgMbQL5skBCmqRezooyzvv90YAIAkLmuMKc=";
  };

-  cargoHash = "sha256-xxR80iizEej1vAzItaoqQnJDZ62dxPOeEdaUpgqhG7I=";
+  cargoHash = "sha256-QL7O84Y6yaHL4UEbnfL8jLXH/Q6Ba4RC1NLq40Y3XDk=";

  buildFeatures = [
    "cli"
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@ -25,13 +25,13 @@ let makeArcWrapper = toolset: ''
 in
 stdenv.mkDerivation {
  pname = "arcanist";
-  version = "20220517";
+  version = "20230401";

  src = fetchFromGitHub {
    owner = "phacility";
    repo = "arcanist";
-    rev = "85c953ebe4a6fef332158fd757d97c5a58682d3a";
-    sha256 = "0x847fw74mzrbhzpgc4iqgvs6dsf4svwfa707dsbxi78fn2lxbl7";
+    rev = "0fc22183e796fb8ac2e3a0a3f3f37aa964c6d7fa";
+    hash = "sha256-DPq0SJTOUzQFo6r/o5R0rS9FPaKebWYxaOd1Ocn7Ic8=";
  };

  patches = [
@ -80,7 +80,7 @@ stdenv.mkDerivation {

  meta = {
    description = "Command line interface to Phabricator";
-    homepage = "http://phabricator.org";
+    homepage = "https://www.phacility.com/";
    license = lib.licenses.asl20;
    platforms = lib.platforms.unix;
    maintainers = [ lib.maintainers.thoughtpolice ];
--- 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.30.0";
+  version = "0.31.0";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-bBMjHnDmgFRQ9R8BWVc6zTHDrbFxjBAelkgtHsGLC9w=";
+    hash = "sha256-TzdYmDLqFYHdp881SDc/QnRZv8QRgSHa00RGN0YPL2M=";
  };

-  cargoHash = "sha256-c8jubHQexg7k0pxUREEGpa9F3SyMBdKLw87ZInEs/fI=";
+  cargoHash = "sha256-ndRpp9+dcywPKWZ7UB/NadmZKxmdiJjaiQJ/lJj8TKA=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper }:

 buildGoModule rec {
  pname = "skaffold";
@ -22,7 +22,7 @@ buildGoModule rec {
    "-X ${t}/version.buildDate=unknown"
  ];

-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [ installShellFiles makeWrapper ];

  doInstallCheck = true;
  installCheckPhase = ''
@ -30,6 +30,8 @@ buildGoModule rec {
  '';

  postInstall = ''
+    wrapProgram $out/bin/skaffold --set SKAFFOLD_UPDATE_CHECK false
+
    installShellCompletion --cmd skaffold \
      --bash <($out/bin/skaffold completion bash) \
      --zsh <($out/bin/skaffold completion zsh)
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@ -278,8 +278,8 @@ let
        src = fetchFromGitHub {
          owner = "spry-group";
          repo = "python-vultr";
-          rev = "v${version}";
-          sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h";
+          rev = version;
+          hash = "sha256-sHCZ8Csxs5rwg1ZG++hP3MfK7ldeAdqm5ta9tEXeW+I=";
        };
      });

--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation rec {
  pname = "check_ssl_cert";
-  version = "2.69.0";
+  version = "2.70.0";

  src = fetchFromGitHub {
    owner = "matteocorti";
    repo = "check_ssl_cert";
    rev = "refs/tags/v${version}";
-    hash = "sha256-85bm/CvD5Kp9HKpf9czkqSEDYwmm8W+zd/uc88fWzPQ=";
+    hash = "sha256-mr6tCZfnAM0e8cEtyen3oiV0Vt3cR/Z80RJ4NeMUaMs=";
  };

  nativeBuildInputs = [
--- a/pkgs/servers/nosql/mongodb/4.4.nix
+++ b/pkgs/servers/nosql/mongodb/4.4.nix
@ -6,8 +6,8 @@ let
  };
 in
 buildMongoDB {
-  version = "4.4.19";
-  sha256 = "sha256-DqkEOsTGB9gDYPxdEi9Kv3xJDz6XBe3fI59pnI1Upnk=";
+  version = "4.4.22";
+  sha256 = "sha256-xJpRDfeG9zcUuyTDWw8XHRXQ38MLBespAE7knIaDxKg=";
  patches = [
    ./forget-build-dependencies-4-4.patch
    ./fix-build-with-boost-1.79-4_4.patch
--- a/pkgs/tools/X11/wpgtk/default.nix
+++ b/pkgs/tools/X11/wpgtk/default.nix
@ -3,13 +3,13 @@

 python3Packages.buildPythonApplication rec {
  pname = "wpgtk";
-  version = "6.5.5";
+  version = "6.5.7";

  src = fetchFromGitHub {
    owner = "deviantfero";
    repo = "wpgtk";
    rev = version;
-    sha256 = "sha256-g3flxQNiNta+uL4t21Lhpij8b5yB78SJLGaFpTcm9fE=";
+    sha256 = "sha256-rHNni0nDghc5kI1sWHAb5ODr4buBz65eUEB1qWpbTTs=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/archivers/quickbms/0002-disable-openssl.patch
+++ b/pkgs/tools/archivers/quickbms/0002-disable-openssl.patch
@ -0,0 +1,10 @@
+--- src/Makefile	2023-05-25 18:16:56.000296653 +0900
+++ src/Makefile	2023-05-25 18:17:00.772272861 +0900
+@@ -23,7 +23,6 @@
+ EXTRA_TARGETS  = libs/amiga/amiga.s libs/powzix/*.cpp
+ CFLAGS += -msse2
+ endif
+-USE_OPENSSL	= 1
+ endif
+ 
+ # -liconv and -fPIC are necessary on Android
--- a/pkgs/tools/archivers/quickbms/default.nix
+++ b/pkgs/tools/archivers/quickbms/default.nix
@ -1,4 +1,13 @@
-{ stdenv, lib, fetchzip, bzip2, lzo, openssl, zlib }:
+{ stdenv
+, lib
+, fetchzip
+, fetchpatch
+, bzip2
+, lzo
+, openssl_1_1
+, opensslSupport ? false
+, zlib
+}:

 stdenv.mkDerivation rec {
  version = "0.11.0";
@ -9,7 +18,18 @@ stdenv.mkDerivation rec {
    hash = "sha256-uQKTE36pLO8uhrX794utqaDGUeyqRz6zLCQFA7DYkNc=";
  };

-  buildInputs = [ bzip2 lzo openssl zlib ];
+  patches = [
+    # Fix errors on x86_64 and _rotl definition
+    (fetchpatch {
+      name = "0001-fix-compile.patch";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-compile.patch?h=quickbms&id=a2e3e4638295d7cfe39513bfef9447fb23154a6b";
+      hash = "sha256-49fT/L4BNzMYnq1SXhFMgSDLybLkz6KSbgKmUpZZu08=";
+      stripLen = 1;
+    })
+  ] ++ lib.optional (!opensslSupport) ./0002-disable-openssl.patch;
+
+  buildInputs = [ bzip2 lzo zlib ]
+    ++ lib.optional (opensslSupport) openssl_1_1;

  makeFlags = [ "PREFIX=$(out)" ];

--- a/pkgs/tools/misc/panoply/default.nix
+++ b/pkgs/tools/misc/panoply/default.nix
@ -2,11 +2,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "panoply";
-  version = "5.2.6";
+  version = "5.2.7";

  src = fetchurl {
    url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
-    sha256 = "sha256-C/FMR276qx7yo7UaZ3a794B3mDy1/mrrZiua2eaIoxg=";
+    sha256 = "sha256-9mqamvUOMaCPnQQ9dhOawjp+GVFZfc59gb/Mx2XifW4=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/tools/networking/curlie/bump-golang-x-sys.patch
+++ b/pkgs/tools/networking/curlie/bump-golang-x-sys.patch
@ -1,13 +1,37 @@
 diff --git a/go.mod b/go.mod
-index 660463a..5249458 100644
+index bebd23f..2ad575f 100644
 --- a/go.mod
 +++ b/go.mod
-@@ -2,7 +2,7 @@ module github.com/rs/curlie
- 
+@@ -1,8 +1,8 @@
+ module github.com/rs/curlie
+
 require (
- 	golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3
-	golang.org/x/sys v0.0.0-20191026070338-33540a1f6037
+-	golang.org/x/crypto v0.1.0
+-	golang.org/x/sys v0.1.0
+	golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3
 +	golang.org/x/sys v0.0.0-20211110154304-99a53858aa08
 )
- 
+
 go 1.13
+diff --git a/go.sum b/go.sum
+index 6b2e5c3..452bcf9 100644
+--- a/go.sum
+++ b/go.sum
+@@ -1,4 +1,6 @@
+ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3 h1:mPCVkWhSH1DSDQg4ZwAFYMo/+evpqK1WzBt33b9TXRE=
+golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+ golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
+@@ -10,6 +12,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
+ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20211110154304-99a53858aa08 h1:WecRHqgE09JBkh/584XIE6PMz5KKE/vER4izNUi30AQ=
+golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+--
+2.40.1
--- a/pkgs/tools/networking/curlie/default.nix
+++ b/pkgs/tools/networking/curlie/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "curlie";
-  version = "1.6.9";
+  version = "1.7.1";

  src = fetchFromGitHub {
    owner = "rs";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-3EKxuEpFm+lp2myMfymYYY9boSXGOF2iAdjtGKnjJK0=";
+    hash = "sha256-EHSFr05VXJuOjUnweEJngdnfSUZUF1HsO28ZBSLGlvE=";
  };

  patches = [
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -2900,8 +2900,7 @@ with pkgs;

  arangodb = callPackage ../servers/nosql/arangodb { };

-  # arcanist currently crashes with some workflows on php8.1, use 8.0
-  arcanist = callPackage ../development/tools/misc/arcanist { php = php80; };
+  arcanist = callPackage ../development/tools/misc/arcanist { php = php81; };

  arduino = arduino-core.override { withGui = true; };

@ -40035,7 +40034,9 @@ with pkgs;

  vivisect = with python3Packages; toPythonApplication (vivisect.override { withGui = true; });

-  vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { };
+  vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen {
+    ffmpeg = ffmpeg-full;
+  };

  vokoscreen-ng = libsForQt5.callPackage ../applications/video/vokoscreen-ng {
    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly;