Merge staging-next into staging

pkgs/applications/misc/usql/default.nix

···
 
 buildGoModule rec {
   pname = "usql";
-  version = "0.14.7";
+  version = "0.14.8";
 
   src = fetchFromGitHub {
     owner = "xo";
     repo = "usql";
     rev = "v${version}";
-    hash = "sha256-iR+gRWSSxAudDewGBVlEQunFfodYFAuShVq2Z1rZ2k4=";
+    hash = "sha256-s8wIk6M0vSRxbDLGmSZpRWEpCMcCMxyizzTpa/VsC1A=";
   };
 
   buildInputs = [ unixODBC icu ];
 
-  vendorHash = "sha256-teVsEVCaSn0/t79LIig3gTw5J8j2YTRx7CoWVDGwQNI=";
+  vendorHash = "sha256-SMizkmskNFqnyI6bZYViFqGP7GLZbWoKCbeEzRjO9VQ=";
   proxyVendor = true;
 
   # Exclude broken impala & hive driver

pkgs/applications/networking/localsend/default.nix

···
 
 let
   pname = "localsend";
-  version = "1.9.1";
+  version = "1.10.0";
 
   srcs = {
     x86_64-linux = fetchurl {
-      url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.AppImage";
-      hash = "sha256-YAhGkJwDno8GeOepyokHv068IhY8H+L88VrKP76VHjU=";
+      url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}-linux-x86-64.AppImage";
+      hash = "sha256-5MxLQG704bVfaW2tCI6BeFmd8X9Xnn1xWPeIGKZv3P8=";
     };
     x86_64-darwin = fetchurl {
       url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg";
-      hash = "sha256-GXyFSsTK3S8nhwixDgZTQEwRt3SOcsnbARzb/BhTk8w=";
+      hash = "sha256-IASoA56Vzec+O62CjSM+2Q8XJJzpEK7hsI3L7R1+Izc=";
     };
   };
-  src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system for package localsend: ${stdenv.hostPlatform.system}");
 
   appimageContents = appimageTools.extract { inherit pname version src; };
 
···
       install -m 444 -D ${appimageContents}/org.localsend.localsend_app.desktop \
         $out/share/applications/${pname}.desktop
       substituteInPlace $out/share/applications/${pname}.desktop \
-        --replace 'Icon=application-vnd.appimage' 'Icon=${pname}' \
-        --replace 'Exec=localsend_app' 'Exec=$out/bin/localsend'
+        --replace 'Exec=localsend_app' "Exec=$out/bin/localsend"
 
-      install -m 444 -D ${appimageContents}/application-vnd.appimage.svg \
-        $out/share/icons/hicolor/scalable/apps/${pname}.svg
+      install -m 444 -D ${appimageContents}/localsend.png \
+        $out/share/icons/hicolor/256x256/apps/localsend.png
     '';
   };
 

pkgs/applications/networking/sync/unison/default.nix

···
 , Cocoa
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "unison";
   version = "2.53.2";
 
   src = fetchFromGitHub {
     owner = "bcpierce00";
     repo = "unison";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-H+70NZZP0cUsxetFcsjWEx2kENsgMdo/41wBwwaX6zg=";
   };
 
···
   dontStrip = !ocamlPackages.ocaml.nativeCompilers;
 
   desktopItems = lib.optional enableX11 (makeDesktopItem {
-    name = pname;
+    name = finalAttrs.pname;
     desktopName = "Unison";
     comment = "Bidirectional file synchronizer";
     genericName = "File synchronization tool";
···
     maintainers = with maintainers; [ viric ];
     platforms = platforms.unix;
   };
-}
+})

pkgs/development/interpreters/wavm/default.nix

···
 , cmake
 }:
 
-llvmPackages.stdenv.mkDerivation rec {
+llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "wavm";
   version = "2022-05-14";
 
   src = fetchFromGitHub {
     owner = "WAVM";
     repo = "WAVM";
-    rev = "nightly/${version}";
+    rev = "nightly/${finalAttrs.version}";
     hash = "sha256-SHz+oOOkwvVZucJYFSyZc3MnOAy1VatspmZmOAXYAWA=";
   };
 
···
     license = licenses.bsd3;
     maintainers = with maintainers; [ ereslibre ];
   };
-}
+})

pkgs/development/python-modules/dynalite-devices/default.nix

···
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, asynctest
 , pytest-asyncio
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "dynalite-devices";
-  version = "0.47";
+  version = "0.1.48";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "ziv1234";
     repo = "python-dynalite-devices";
-    rev = "refs/tags/v${version}"; # https://github.com/ziv1234/python-dynalite-devices/issues/2
-    hash = "sha256-kJo4e5vhgWzijLUhQd9VBVk1URpg9SXhOA60dJYashM=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-i88aIsRNsToSceQdwfspJg+Y5MO5zC4O6EkyhrYR27g=";
   };
 
   postPatch = ''
···
   '';
 
   nativeCheckInputs = [
-    asynctest
     pytest-asyncio
     pytestCheckHook
   ];
···
     "--asyncio-mode=auto"
   ];
 
-  pythonImportsCheck = [ "dynalite_devices_lib" ];
+  pythonImportsCheck = [
+    "dynalite_devices_lib"
+  ];
 
   meta = with lib; {
     description = "An unofficial Dynalite DyNET interface creating devices";
     homepage = "https://github.com/ziv1234/python-dynalite-devices";
+    changelog = "https://github.com/ziv1234/python-dynalite-devices/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };

pkgs/development/python-modules/easyocr/default.nix

···
 , fetchFromGitHub
 , hdf5
 , numpy
+, onnx
 , opencv3
 , pillow
 , pyaml
 , pyclipper
 , python-bidi
-, torch
+, pythonOlder
 , scikit-image
 , scipy
 , shapely
+, torch
 , torchvision
-, onnx
 }:
 
 buildPythonPackage rec {
   pname = "easyocr";
-  version = "1.6.2";
+  version = "1.7.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "JaidedAI";
     repo = "EasyOCR";
-    rev = "v${version}";
-    hash = "sha256-f+JBSnFMRvVlhRRiL1rJb7a0CNjZPuh6r8r3K1meQCk=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-01Exz55eTIO/xzdq/dzV+ELkU75hpxe/EbjIqLBA8h0=";
   };
 
   postPatch = ''
     substituteInPlace requirements.txt \
-      --replace "opencv-python-headless<=4.5.4.60" "" \
+      --replace "opencv-python-headless" "" \
       --replace "ninja" ""
   '';
 
   propagatedBuildInputs = [
-    scikit-image
     hdf5
-    python-bidi
     numpy
     opencv3
-    torchvision
     pillow
     pyaml
     pyclipper
-    torch
+    python-bidi
+    scikit-image
     scipy
     shapely
+    torch
+    torchvision
   ];
 
-  nativeCheckInputs = [ onnx ];
+  nativeCheckInputs = [
+    onnx
+  ];
 
-  pythonImportsCheck = [ "easyocr" ];
+  pythonImportsCheck = [
+    "easyocr"
+  ];
 
   meta = with lib; {
     description = "Ready-to-use OCR with 80+ supported languages and all popular writing scripts";
     homepage = "https://github.com/JaidedAI/EasyOCR";
+    changelog = "https://github.com/JaidedAI/EasyOCR/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ dit7ya ];
   };

pkgs/development/python-modules/jira/default.nix

···
 
 buildPythonPackage rec {
   pname = "jira";
-  version = "3.5.0";
+  version = "3.5.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
···
     owner = "pycontribs";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-6Nx12xEEPSWZE6XORU3I5HYM7vIjbAWPu7vNrzR4W24=";
+    hash = "sha256-n0V9FZ1agzvzqCriqls8C2IKhHKOmOAWqa8iCnXHKY4=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/limnoria/default.nix

···
 
 buildPythonPackage rec {
   pname = "limnoria";
-  version = "2023.1.28";
+  version = "2023.5.27";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yIKJAW5hb7EOUiS7G+Q4QAESfG4dbfqHScaQBKLMkeM=";
+    hash = "sha256-HqNBXDmPU0vh1cA0swWK708MnCcAEeiRxf/yaW2Oh/U=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/manifest-ml/default.nix

···
 
 buildPythonPackage rec {
   pname = "manifest-ml";
-  version = "0.1.7";
+  version = "0.1.8";
   format = "setuptools";
 
   disalbed = pythonOlder "3.8";
···
     owner = "HazyResearch";
     repo = "manifest";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wrslrzMAPBVAlb4ieB+DcLfWjZdlaUBnGXbzcMhlf34=";
+    hash = "sha256-d34TIZYDB8EDEIZUH5mDzfDHzFT290DwjPLJkNneklc=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/nessclient/default.nix

···
 { lib
-, asynctest
 , buildPythonPackage
 , click
 , fetchFromGitHub
···
 
 buildPythonPackage rec {
   pname = "nessclient";
-  version = "0.10.0";
+  version = "1.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
···
     owner = "nickw444";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-zjUYdSHIMCB4cCAsOOQZ9YgmFTskzlTUs5z/xPFt01Q=";
+    hash = "sha256-UqHXKfS4zF1YhFbNKSVESmsxD0CYJKOmjMOE3blGdI8=";
   };
 
   propagatedBuildInputs = [
···
   ];
 
   nativeCheckInputs = [
-    asynctest
     pytest-asyncio
     pytestCheckHook
   ];
···
   meta = with lib; {
     description = "Python implementation/abstraction of the Ness D8x/D16x Serial Interface ASCII protocol";
     homepage = "https://github.com/nickw444/nessclient";
+    changelog = "https://github.com/nickw444/nessclient/releases/tag/${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/peaqevcore/default.nix

···
 
 buildPythonPackage rec {
   pname = "peaqevcore";
-  version = "18.1.4";
+  version = "18.1.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WjsB8NkHWejwDkZ8Aphai4BW+bbB7hSxkKwfeYCE7qk=";
+    hash = "sha256-X8I0359Wq0jojDq0e7jJjxoRlQ8ZdUzIWPnV/1A+Mwg=";
   };
 
   postPatch = ''

pkgs/development/python-modules/pyatv/default.nix

···
 
 buildPythonPackage rec {
   pname = "pyatv";
-  version = "0.12.0";
+  version = "0.12.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
···
     owner = "postlund";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-t7H4ut4atc2XDnpBzV03Q/OrCHMVmZk38r/iWcLKL7Q=";
+    hash = "sha256-HugvgJAD5R6n8XK802QR7FAaZscyzFRayg48kf3crFQ=";
   };
 
   postPatch = ''

pkgs/development/python-modules/scikit-hep-testdata/default.nix

···
 
 buildPythonPackage rec {
   pname = "scikit-hep-testdata";
-  version = "0.4.30";
+  version = "0.4.31";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
···
     owner = "scikit-hep";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-8nmzU+aCBlGZs0O3/7gcP9zDM9LyCb6hVqW4cNKxrU4=";
+    hash = "sha256-/CUBRRezm84yAqnEVAC89vKIpALnvSkoSKBCmX84S0w=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/sqltrie/default.nix

···
 
 buildPythonPackage rec {
   pname = "sqltrie";
-  version = "0.4.0";
+  version = "0.5.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
···
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-GNTp7ryll3V0nmaLIfr3E8krRLcLwFviZfLI0LK1Na0=";
+    hash = "sha256-caCzFHQG0fnSmIdesk4k1W/VheY1DWxZb2W8/Xen/ZU=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/types-pyopenssl/default.nix

···
 
 buildPythonPackage rec {
   pname = "types-pyopenssl";
-  version = "23.1.0.3";
+  version = "23.2.0.0";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "types-pyOpenSSL";
     inherit version;
-    hash = "sha256-5yEQiO/z4g01mIje3ssJlPcYHVzODyY1TdR8oEhNyKY=";
+    hash = "sha256-Q+MH6N+zp6ggihmHTKBgMF9GDFKdTqyoomaeqJSZ8kQ=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/yfinance/default.nix

···
 
 buildPythonPackage rec {
   pname = "yfinance";
-  version = "0.2.19b1";
+  version = "0.2.20";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
···
     owner = "ranaroussi";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-kqNit24Fdi6rk0WIJnTIata3o+pkGOGAVWZkzTlZdsQ=";
+    hash = "sha256-uFIfhu7Sq4yQAzEfegIo0xyok1Bo8M/esg6bZCIWO18=";
   };
 
   propagatedBuildInputs = [

pkgs/development/tools/jf/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "jf";
-  version = "0.3.3";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "sayanarijit";
     repo = "jf";
     rev = "v${version}";
-    hash = "sha256-dZX8C/nJaKfgHsUAXR1DRZS+PWDZF+QDVpOSaOlwFp4=";
+    hash = "sha256-A29OvGdG6PyeKMf5RarEOrfnNSmXhXri0AlECHWep6M=";
   };
 
-  cargoHash = "sha256-H9UZCKy+0xL6J8f/6yCiM4X5TMOrN8UEEDwxqNR7xQY=";
+  cargoHash = "sha256-jZmFUvg6R15oL13OYKkirsepoJwOKCeXdKMcqhPEhNU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/development/tools/misc/phpunit/default.nix

···
 
 let
   pname = "phpunit";
-  version = "10.1.3";
+  version = "10.2.1";
 in
 stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://phar.phpunit.de/phpunit-${version}.phar";
-    hash = "sha256-b0ruyOh/DqKJYQskZSJnBsROotQuZsIBzscjKfrZ0tY=";
+    hash = "sha256-gmxcr+WIQw/SeEvJpSFLKOuTb36qUe6WdlVWIq5tClo=";
   };
 
   dontUnpack = true;

pkgs/servers/monitoring/prometheus/bird-exporter.nix

···
 
 buildGoModule rec {
   pname = "bird-exporter";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "czerwonk";
     repo = "bird_exporter";
     rev = version;
-    sha256 = "sha256-QCnOMiAcvn0HcppGJlf3sdllApKcjHpucvk9xxD/MqE=";
+    sha256 = "sha256-XGHOEnAichQEir0k8wj/OSuj1zk8UsLYi9azg6lgpws=";
   };
 
-  vendorSha256 = "sha256-jBwaneVv1a8iIqnhDbQOnvaJdnXgO8P90Iv51IfGaM0=";
+  vendorHash = "sha256-X6zrCTGZaSdQS9bwzjbSGkmNs38JBxZMtrqajQxkzK0=";
 
   passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; };
 

pkgs/tools/misc/ksnip/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "ksnip";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "ksnip";
     repo = "ksnip";
     rev = "v${version}";
-    sha256 = "sha256-a5mS2mrbs0CyZ83hwwFdherq6kMS93ItQIDKu1AjnN4=";
+    sha256 = "sha256-n7YwDXd73hyrzb6L8utZFuHh9HnjVtkU6CC4jfWPj/I=";
   };
 
   nativeBuildInputs = [

pkgs/tools/misc/qflipper/default.nix

···
 }:
 let
   pname = "qFlipper";
-  version = "1.3.1";
-  sha256 = "sha256-ObrK21EjtdwQAq7ucUx7oUjwak2DgvbrcfvaXdzcgQo=";
+  version = "1.3.2";
+  sha256 = "sha256-n/vvLR4p7ZmQC+FuYOvarmgydfYwxRBRktzs7CfiNQg=";
   timestamp = "99999999999";
   commit = "nix-${version}";
 

pkgs/tools/networking/ooniprobe-cli/default.nix

···
 
 buildGoModule rec {
   pname = "ooniprobe-cli";
-  version = "3.17.3";
+  version = "3.17.5";
 
   src = fetchFromGitHub {
     owner = "ooni";
     repo = "probe-cli";
     rev = "v${version}";
-    hash = "sha256-kqjTYowAEfJ+um9DQQXIMLVWlEGJ9intbdTSJukSvVc=";
+    hash = "sha256-pzNcyioicAOCAWaEo30T/Dr74sJ1kXvJN0pnuA2JJ7k=";
   };
 
-  vendorHash = "sha256-kS5HWiATn2WT6E5gb0Gve83hHJ++xHmPSsgJu/5GqO4=";
+  vendorHash = "sha256-e8FI678zr6EWKd+rOvPOyq20PJyaXszzcooDFuGWfOU=";
 
   subPackages = [ "cmd/ooniprobe" ];
 

pkgs/tools/security/bitwarden/default.nix

···
 , dbus
 , electron_24
 , fetchFromGitHub
-, fetchpatch
 , glib
 , gnome
 , gtk3
···
   buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
   electron = electron_24;
 
-  version = "2023.4.0";
+  version = "2023.5.0";
   src = applyPatches {
     src = fetchFromGitHub {
       owner = "bitwarden";
       repo = "clients";
       rev = "desktop-v${version}";
-      sha256 = "sha256-TTKDl6Py3k+fAy/kcyiMbAAKQdhVnZTyRXV8D/VpKBE=";
+      sha256 = "sha256-ELKpGSY4ZbgSk4vJnTiB+IOa8RQU8Ahy3A1mYsKtthU=";
     };
 
-    patches = [
-      # Bump electron to 24 and node to 18
-      (fetchpatch {
-        url = "https://github.com/bitwarden/clients/pull/5205.patch";
-        hash = "sha256-sKSrh8RHXtxGczyZScjTeiGZgTZCQ7f45ULj/j9cp6M=";
-      })
-    ];
+    patches = [ ];
   };
 
   desktop-native = rustPlatform.buildRustPackage {
     pname = "bitwarden-desktop-native";
     inherit src version;
     sourceRoot = "source-patched/apps/desktop/desktop_native";
-    cargoSha256 = "sha256-VW9DmSh9jvqFCZjH1SAYkydSGjXSVEbv4CmtoJBiw5Y=";
+    cargoSha256 = "sha256-SeK8Nbgenof9vXI2v7tJ5oHiX60kBoR+UNOSJTRHdzk=";
 
     nativeBuildInputs = [
       pkg-config
···
   npmBuildFlags = [
     "--workspace apps/desktop"
   ];
-  npmDepsHash = "sha256-UXDn09qyM8GwfUiWLDhhyrGFZeKtTRmQArstw+tm5iE=";
+  npmDepsHash = "sha256-G8DEYPjEP3L4s0pr5n2ZTj8kkT0E7Po1BKhZ2hUdJuY=";
 
   ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 

pkgs/tools/wayland/wayland-utils/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "wayland-utils";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${version}/downloads/wayland-utils-${version}.tar.xz";
-    sha256 = "sha256-nmhYYwJbT+reNtU7vI4xtD4mSYvnQ96oTHqEkSlZQQo=";
+    sha256 = "sha256-2SeMIlVFhogYAlQHUbzEJWkmK/gM2aybD9Ev9L0JqeQ=";
   };
 
   strictDeps = true;