From 6ec2b2d1be12fb291589825cbae73c5e4b8fc8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20H=C3=B6ner?= Date: Thu, 12 Oct 2023 23:04:36 +0200 Subject: [PATCH 001/262] mullvad-vpn: respect NIXOS_OZONE_WL --- pkgs/applications/networking/mullvad-vpn/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index cd4642f906d9..cfafeef576e0 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -122,6 +122,9 @@ stdenv.mkDerivation { wrapProgram $out/bin/mullvad-daemon \ --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad/resources" + wrapProgram $out/bin/mullvad-gui \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop runHook postInstall From ac43ec34d9181114a290ca734d13f16e25229d7f Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Tue, 6 Feb 2024 16:44:11 +0100 Subject: [PATCH 002/262] torch: passthru rocmSupport flag --- pkgs/development/python-modules/torch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index d6c51904bd9d..c67be4cb9233 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -492,7 +492,7 @@ in buildPythonPackage rec { requiredSystemFeatures = [ "big-parallel" ]; passthru = { - inherit cudaSupport cudaPackages; + inherit cudaSupport cudaPackages rocmSupport rocmPackages; # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. blasProvider = blas.provider; # To help debug when a package is broken due to CUDA support From 2eedfae46b0e632089aefad388cbc7093e7eea0b Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Sat, 2 Mar 2024 04:08:30 +0100 Subject: [PATCH 003/262] torchaudio: add rocm support --- .../python-modules/torchaudio/default.nix | 52 ++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index 73aec87cca61..f9d4945ef6c0 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -9,10 +9,46 @@ , pybind11 , sox , torch + , cudaSupport ? torch.cudaSupport , cudaPackages +, rocmSupport ? torch.rocmSupport +, rocmPackages + +, gpuTargets ? [] }: +let + # TODO: Reuse one defined in torch? + # Some of those dependencies are probbly not required, + # but it breaks when the store path is different between torch and torchaudio + rocmtoolkit_joined = symlinkJoin { + name = "rocm-merged"; + + paths = with rocmPackages; [ + rocm-core clr rccl miopen miopengemm rocrand rocblas + rocsparse hipsparse rocthrust rocprim hipcub roctracer + rocfft rocsolver hipfft hipsolver hipblas + rocminfo rocm-thunk rocm-comgr rocm-device-libs + rocm-runtime clr.icd hipify + ]; + + # Fix `setuptools` not being found + postBuild = '' + rm -rf $out/nix-support + ''; + }; + # Only used for ROCm + gpuTargetString = lib.strings.concatStringsSep ";" ( + if gpuTargets != [ ] then + # If gpuTargets is specified, it always takes priority. + gpuTargets + else if rocmSupport then + rocmPackages.clr.gpuTargets + else + throw "No GPU targets specified" + ); +in buildPythonPackage rec { pname = "torchaudio"; version = "2.2.1"; @@ -33,6 +69,11 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace 'print(" --- Initializing submodules")' "return" \ --replace "_fetch_archives(_parse_sources())" "pass" + '' + + lib.optionalString rocmSupport '' + # There is no .info/version-dev, only .info/version + substituteInPlace cmake/LoadHIP.cmake \ + --replace "/.info/version-dev" "/.info/version" ''; env = { @@ -55,7 +96,11 @@ buildPythonPackage rec { ninja ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc - ]; + ] ++ lib.optionals rocmSupport (with rocmPackages; [ + clr + rocblas + hipblas + ]); buildInputs = [ ffmpeg-full @@ -73,6 +118,11 @@ buildPythonPackage rec { BUILD_RNNT=0; BUILD_CTC_DECODER=0; + preConfigure = lib.optionalString rocmSupport '' + export ROCM_PATH=${rocmtoolkit_joined} + export PYTORCH_ROCM_ARCH="${gpuTargetString}" + ''; + dontUseCmakeConfigure = true; doCheck = false; # requires sox backend From 1a00458a66b604c39dd391b3145d59965e8521db Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Sun, 14 Apr 2024 22:38:35 +0200 Subject: [PATCH 004/262] python3Packages.spsdk: remove meta.broken as spsdk 2.1.1 uses cryptography 42, pynitrokey, nitrokey-app2: unpin cryptgraphy currently, using pynitrokey 0.4.46 leads to import errors in nitrokey-app2 --- pkgs/by-name/py/pynitrokey/package.nix | 29 ++----------------- .../python-modules/spsdk/default.nix | 1 - pkgs/tools/security/nitrokey-app2/default.nix | 16 ++-------- 3 files changed, 5 insertions(+), 41 deletions(-) diff --git a/pkgs/by-name/py/pynitrokey/package.nix b/pkgs/by-name/py/pynitrokey/package.nix index beafb787b63b..aadc6d4a56e8 100644 --- a/pkgs/by-name/py/pynitrokey/package.nix +++ b/pkgs/by-name/py/pynitrokey/package.nix @@ -1,28 +1,3 @@ -{ python3 -, fetchPypi -, rustPlatform -}: +{ python3 }: -let - python = python3.override { - packageOverrides = self: super: { - # https://github.com/nxp-mcuxpresso/spsdk/issues/64 - cryptography = super.cryptography.overridePythonAttrs (old: rec { - version = "41.0.7"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-E/k86b6oAWwlOzSvxr1qdZk+XEBnLtVAWpyDLw1KALw="; - }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - sourceRoot = "${old.pname}-${version}/${old.cargoRoot}"; - name = "${old.pname}-${version}"; - hash = "sha256-VeZhKisCPDRvmSjGNwCgJJeVj65BZ0Ge+yvXbZw86Rw="; - }; - patches = [ ]; - doCheck = false; # would require overriding cryptography-vectors - }); - }; - }; -in with python.pkgs; toPythonApplication pynitrokey +with python3.pkgs; toPythonApplication pynitrokey diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index b64ef4a3d910..35b10ef7c97c 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -107,7 +107,6 @@ buildPythonPackage rec { passthru.tests.version = testers.testVersion { package = spsdk; }; meta = with lib; { - broken = versionAtLeast cryptography.version "41.1"; changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.rev}/docs/release_notes.rst"; description = "NXP Secure Provisioning SDK"; homepage = "https://github.com/nxp-mcuxpresso/spsdk"; diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix index 6f392f5d7f53..563a76732dbe 100644 --- a/pkgs/tools/security/nitrokey-app2/default.nix +++ b/pkgs/tools/security/nitrokey-app2/default.nix @@ -1,29 +1,19 @@ { lib , python3 , fetchPypi -, rustPlatform , fetchFromGitHub }: let python = python3.override { packageOverrides = self: super: { - # https://github.com/nxp-mcuxpresso/spsdk/issues/64 - cryptography = super.cryptography.overridePythonAttrs (old: rec { - version = "41.0.7"; + pynitrokey = super.pynitrokey.overridePythonAttrs (old: rec { + version = "0.4.45"; src = fetchPypi { inherit (old) pname; inherit version; - hash = "sha256-E/k86b6oAWwlOzSvxr1qdZk+XEBnLtVAWpyDLw1KALw="; + hash = "sha256-iY4ThrmXP7pEjTYYU4lePVAbuJGTdHX3iKswXzuf7W8="; }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - sourceRoot = "${old.pname}-${version}/${old.cargoRoot}"; - name = "${old.pname}-${version}"; - hash = "sha256-VeZhKisCPDRvmSjGNwCgJJeVj65BZ0Ge+yvXbZw86Rw="; - }; - patches = [ ]; - doCheck = false; # would require overriding cryptography-vectors }); }; }; From c3fad51a016c59d4c9f0b5891033d0fe3f852964 Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Sun, 14 Apr 2024 22:41:06 +0200 Subject: [PATCH 005/262] nitrokey-app2: 2.1.5 -> 2.2.2, use qt6 wrap hook --- pkgs/tools/security/nitrokey-app2/default.nix | 13 +++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix index 563a76732dbe..8e97ce02af4c 100644 --- a/pkgs/tools/security/nitrokey-app2/default.nix +++ b/pkgs/tools/security/nitrokey-app2/default.nix @@ -1,7 +1,11 @@ { lib +, stdenv , python3 , fetchPypi , fetchFromGitHub +, wrapQtAppsHook +, qtbase +, qtwayland }: let @@ -19,7 +23,7 @@ let }; in python.pkgs.buildPythonApplication rec { pname = "nitrokey-app2"; - version = "2.1.5"; + version = "2.2.2"; pyproject = true; disabled = python.pythonOlder "3.9"; @@ -28,7 +32,7 @@ in python.pkgs.buildPythonApplication rec { owner = "Nitrokey"; repo = "nitrokey-app2"; rev = "v${version}"; - hash = "sha256-mR13zUgCdNS09EnpGLrnOnoIn3p6ZM/0fHKg0OUMWj4="; + hash = "sha256-MiyfmsrKZRoe7YMEjR1LHPesfJh6+dcSydoEAgrALJ8="; }; # https://github.com/Nitrokey/nitrokey-app2/issues/152 @@ -41,6 +45,11 @@ in python.pkgs.buildPythonApplication rec { nativeBuildInputs = with python.pkgs; [ poetry-core + wrapQtAppsHook + ]; + + buildInputs = [ qtbase ] ++ lib.optionals stdenv.isLinux [ + qtwayland ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88cfaafafe9d..3855d38ac7ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40935,7 +40935,7 @@ with pkgs; nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; - nitrokey-app2 = callPackage ../tools/security/nitrokey-app2 { }; + nitrokey-app2 = qt6Packages.callPackage ../tools/security/nitrokey-app2 { }; fpm2 = callPackage ../tools/security/fpm2 { }; From 5818d1b9500a98520f2e32a26618f26ed4e0d166 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:11:04 +0100 Subject: [PATCH 006/262] nixops_unstablePlugins.nixops-aws: unstable-2024-02-29 -> 1.0.0-unstable-2024-02-29 --- .../networking/cluster/nixops/plugins/nixops-aws.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix index 78b9bc879aaa..44671b0809ed 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix @@ -12,7 +12,7 @@ buildPythonPackage { pname = "nixops-aws"; - version = "unstable-2024-02-29"; + version = "1.0.0-unstable-2024-02-29"; pyproject = true; src = fetchFromGitHub { @@ -45,7 +45,9 @@ buildPythonPackage { pythonImportsCheck = [ "nixops_aws" ]; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "AWS plugin for NixOps"; From 14efba2dbabc5fd904f297b7303c6dcfbfedaf0f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:12:13 +0100 Subject: [PATCH 007/262] nixops_unstablePlugins.nixops-digitalocean: unstable-2022-08-14 -> 0.1.0-unstable-2022-08-14 --- .../networking/cluster/nixops/plugins/nixops-digitalocean.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix index f3f62e940729..094f493dbb72 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix @@ -10,7 +10,7 @@ buildPythonPackage { pname = "nixops-digitalocean"; - version = "unstable-2022-08-14"; + version = "0.1.0-unstable-2022-08-14"; pyproject = true; disabled = pythonOlder "3.7"; From d84e0f79b84dbb7fd427d56d09a76858a6a98714 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:12:50 +0100 Subject: [PATCH 008/262] nixops_unstablePlugins.nixops-encrypted-links: unstable-2021-02-16 -> 0-unstable-2021-02-16 --- .../cluster/nixops/plugins/nixops-encrypted-links.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix index 0dddf771bd51..817da055d634 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix @@ -8,7 +8,7 @@ buildPythonPackage { pname = "nixops-encrypted-links"; - version = "unstable-2021-02-16"; + version = "0-unstable-2021-02-16"; pyproject = true; src = fetchFromGitHub { From c62e583ed82ab81d560aaa72b121610312bb5b78 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:13:33 +0100 Subject: [PATCH 009/262] nixops_unstablePlugins.nixops-gce: unstable-2023-05-26 -> 0-unstable-2023-05-26 --- .../networking/cluster/nixops/plugins/nixops-gce.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix index 604e82114bad..84b785a7d566 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix @@ -11,7 +11,7 @@ buildPythonPackage { pname = "nixops-gce"; - version = "unstable-2023-05-26"; + version = "0-unstable-2023-05-26"; pyproject = true; src = fetchFromGitHub { From ae746715e1d9db430c0ac0048d4d2c14e2c6aae5 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:14:08 +0100 Subject: [PATCH 010/262] nixops_unstablePlugins.nixops-hercules-ci: unstable-2021-10-06 -> 0-unstable-2021-10-06 --- .../networking/cluster/nixops/plugins/nixops-hercules-ci.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix index 90ed88edfa0e..04044b94da0f 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix @@ -8,7 +8,7 @@ buildPythonPackage { pname = "nixops-hercules-ci"; - version = "unstable-2021-10-06"; + version = "0-unstable-2021-10-06"; pyproject = true; src = fetchFromGitHub { From b5992782bfde12b7c12b6e73bc367bc7890d3d7d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:17:03 +0100 Subject: [PATCH 011/262] nixops_unstablePlugins.nixops-hetzner: unstable-2022-04-23 -> 1.0.1-unstable-2022-04-24 --- .../networking/cluster/nixops/plugins/nixops-hetzner.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix index c4d037fe75f5..6d883f5ba45f 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix @@ -11,7 +11,7 @@ buildPythonPackage { pname = "nixops-hetzner"; - version = "unstable-2022-04-23"; + version = "1.0.1-unstable-2022-04-24"; pyproject = true; src = fetchFromGitHub { @@ -43,7 +43,9 @@ buildPythonPackage { pythonImportsCheck = [ "nixops_hetzner" ]; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "Hetzner bare metal NixOps plugin"; From fa7c4cace920761cda64e541591c715e9b1fbe6a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:17:37 +0100 Subject: [PATCH 012/262] nixops_unstablePlugins.nixops-hetznercloud: unstable-2023-02-19 -> 0-unstable-2023-02-19 --- .../networking/cluster/nixops/plugins/nixops-hetznercloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix index 17e94ab9f32b..ab9f54bcd8a3 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix @@ -10,7 +10,7 @@ buildPythonPackage { pname = "nixops-hetznercloud"; - version = "unstable-2023-02-19"; + version = "0-unstable-2023-02-19"; pyproject = true; src = fetchFromGitHub { From 4a42a2186151d7a91813128368a50aad36521839 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:18:14 +0100 Subject: [PATCH 013/262] nixops_unstablePlugins.nixops-libvirtd: unstable-2023-09-01 -> 1.0.0-unstable-2023-09-01 --- .../networking/cluster/nixops/plugins/nixops-libvirtd.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix index b3439bf4fe52..4fec552e528c 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix @@ -9,7 +9,7 @@ buildPythonPackage { pname = "nixops-libvirtd"; - version = "unstable-2023-09-01"; + version = "1.0.0-unstable-2023-09-01"; pyproject = true; src = fetchFromGitHub { @@ -39,7 +39,9 @@ buildPythonPackage { pythonImportsCheck = [ "nixops_virtd" ]; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "NixOps libvirtd backend plugin"; From b025275d1818d4926b792d9ed089c4cbfecc45a8 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:19:11 +0100 Subject: [PATCH 014/262] nixops_unstablePlugins.nixops-vbox: unstable-2023-08-10 -> 1.0.0-unstable-2023-08-10 --- .../networking/cluster/nixops/plugins/nixops-vbox.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix index 4a9f0351094c..3d712e5c2397 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix @@ -8,7 +8,7 @@ buildPythonPackage { pname = "nixops-vbox"; - version = "unstable-2023-08-10"; + version = "1.0.0-unstable-2023-08-10"; pyproject = true; src = fetchFromGitHub { @@ -34,7 +34,9 @@ buildPythonPackage { pythonImportsCheck = [ "nixopsvbox" ]; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "NixOps plugin for VirtualBox VMs"; From 225b7a425ead5d2aa60dc1325cee8396dd2c3283 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:19:40 +0100 Subject: [PATCH 015/262] nixops_unstablePlugins.nixos-modules-contrib: unstable-2021-01-20 -> 0-unstable-2021-01-20 --- .../networking/cluster/nixops/plugins/nixos-modules-contrib.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix index 5c6e9fec32cf..494208d347f0 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix @@ -8,7 +8,7 @@ buildPythonPackage { pname = "nixos-modules-contrib"; - version = "unstable-2021-01-20"; + version = "0-unstable-2021-01-20"; pyproject = true; src = fetchFromGitHub { From 02fa6f4ddb162d5fd132fb47d54f8e0d4d7c8603 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:20:20 +0100 Subject: [PATCH 016/262] nixops_unstable_minimal,nixops_unstable_full: unstable-2024-02-28 -> 1.7-unstable-2024-02-28 --- pkgs/applications/networking/cluster/nixops/unwrapped.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/unwrapped.nix b/pkgs/applications/networking/cluster/nixops/unwrapped.nix index 058f7f2d2c1c..a435c70520ef 100644 --- a/pkgs/applications/networking/cluster/nixops/unwrapped.nix +++ b/pkgs/applications/networking/cluster/nixops/unwrapped.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { pname = "nixops"; - version = "unstable-2024-02-28"; + version = "1.7-unstable-2024-02-28"; pyproject = true; src = fetchFromGitHub { @@ -51,7 +51,9 @@ buildPythonApplication rec { passthru = { tests.nixos = nixosTests.nixops.unstable; - updateScript = unstableGitUpdater {}; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; }; meta = with lib; { From e0b67e5e815de6cb89e8654e5c71724288bf2c73 Mon Sep 17 00:00:00 2001 From: Liam Murphy Date: Thu, 2 May 2024 19:37:38 +1000 Subject: [PATCH 017/262] circt: fix darwin linking issues --- .../compilers/circt/circt-llvm.nix | 35 ++++++++++++++++++- pkgs/development/compilers/circt/default.nix | 7 ++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/circt/circt-llvm.nix b/pkgs/development/compilers/circt/circt-llvm.nix index a21b82d93376..c3a72e7c89c1 100644 --- a/pkgs/development/compilers/circt/circt-llvm.nix +++ b/pkgs/development/compilers/circt/circt-llvm.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , cmake , ninja , circt @@ -31,6 +32,14 @@ outputs = [ "out" "lib" "dev" ]; + # Get rid of ${extra_libdir} (which ends up containing a path to circt-llvm.dev + # in circt) so that we only have to remove the one fixed rpath. + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace llvm/llvm/cmake/modules/AddLLVM.cmake \ + --replace-fail 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' \ + 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}")' + ''; + postInstall = '' # move llvm-config to $dev to resolve a circular dependency moveToOutput "bin/llvm-config*" "$dev" @@ -50,6 +59,30 @@ --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" # patch path for llvm-config ''; + # Replace all references to @rpath with absolute paths and remove the rpaths. + # + # This is different from what the regular LLVM package does, which is to make + # everything absolute from the start: however, that doesn't work for us because + # we have `-DBUILD_SHARED_LIBS=ON`, meaning that many more things are + # dynamically rather than statically linked. This includes TableGen, which then + # fails to run halfway through the build because it tries to reference $lib when + # it hasn't been populated yet. + # + # Inspired by fixDarwinDylibNames. + postFixup = lib.optionalString stdenv.isDarwin '' + local flags=(-delete_rpath @loader_path/../lib) + for file in "$lib"/lib/*.dylib; do + flags+=(-change @rpath/"$(basename "$file")" "$file") + done + + for file in "$out"/bin/* "$lib"/lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + echo "$file: fixing dylib references" + # note that -id does nothing on binaries + install_name_tool -id "$file" "''${flags[@]}" "$file" + done + ''; + # circt only use the mlir part of llvm, occasionally there are some unrelated failure from llvm, # disable the llvm check, but keep the circt check enabled. doCheck = false; diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 58174f3fde0a..fe0684e206b2 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -66,6 +66,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; + # Copy circt-llvm's postFixup stage so that it can make all our dylib references + # absolute as well. + # + # We don't need `postPatch` because circt seems to be automatically inheriting + # the config somehow, presumably via. `-DMLIR_DIR`. + postFixup = circt-llvm.postFixup; + postInstall = '' moveToOutput lib "$lib" ''; From 8bb698e4ca50037eb0887fd7fe2d8a3020548805 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 3 May 2024 16:01:07 +0200 Subject: [PATCH 018/262] nagios: 4.5.1 -> 4.5.2 https://github.com/NagiosEnterprises/nagioscore/releases/tag/nagios-4.5.2 https://github.com/NagiosEnterprises/nagioscore/compare/nagios-4.5.1...nagios-4.5.2 --- pkgs/servers/monitoring/nagios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 14e60891c08d..c046b5f3ef42 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nagios"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "NagiosEnterprises"; repo = "nagioscore"; rev = "refs/tags/nagios-${version}"; - hash = "sha256-+U2k3w3Yr0qZjHwjRpKZVucB3a35PSZr1Sqa8k0ssq8="; + hash = "sha256-LD572aR6g67pH3QllnLD3g0bnck+vlC/YTN83WamHRs="; }; patches = [ ./nagios.patch ]; From 6edec2311c2acf1086cb5379026acea76c821f4c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 3 May 2024 16:12:26 +0200 Subject: [PATCH 019/262] nagios: add passthru.tests.version --- pkgs/servers/monitoring/nagios/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index c046b5f3ef42..a93166083135 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -10,16 +10,17 @@ , unzip , nixosTests , nix-update-script +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nagios"; version = "4.5.2"; src = fetchFromGitHub { owner = "NagiosEnterprises"; repo = "nagioscore"; - rev = "refs/tags/nagios-${version}"; + rev = "refs/tags/nagios-${finalAttrs.version}"; hash = "sha256-LD572aR6g67pH3QllnLD3g0bnck+vlC/YTN83WamHRs="; }; @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { # Do not create /var directories preInstall = '' - substituteInPlace Makefile --replace '$(MAKE) install-basic' "" + substituteInPlace Makefile --replace-fail '$(MAKE) install-basic' "" ''; installTargets = "install install-config"; postInstall = '' @@ -59,6 +60,10 @@ stdenv.mkDerivation rec { passthru = { tests = { inherit (nixosTests) nagios; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "nagios --version"; + }; }; updateScript = nix-update-script { extraArgs = [ "--version-regex" "nagios-(.*)" ]; @@ -68,10 +73,10 @@ stdenv.mkDerivation rec { meta = { description = "A host, service and network monitoring program"; homepage = "https://www.nagios.org/"; - changelog = "https://github.com/NagiosEnterprises/nagioscore/blob/nagios-${version}/Changelog"; + changelog = "https://github.com/NagiosEnterprises/nagioscore/blob/nagios-${finalAttrs.version}/Changelog"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; mainProgram = "nagios"; maintainers = with lib.maintainers; [ immae thoughtpolice relrod anthonyroussel ]; }; -} +}) From d4d29642b03be147104e4854108ee5bbbc7b76f3 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 3 May 2024 20:40:22 +0200 Subject: [PATCH 020/262] nagios: enable darwin support --- nixos/tests/all-tests.nix | 2 +- pkgs/servers/monitoring/nagios/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d4da32c44990..e8bfaee763bc 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -585,7 +585,7 @@ in { mysql-backup = handleTest ./mysql/mysql-backup.nix {}; mysql-replication = handleTest ./mysql/mysql-replication.nix {}; n8n = handleTest ./n8n.nix {}; - nagios = handleTest ./nagios.nix {}; + nagios = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nagios.nix {}; nar-serve = handleTest ./nar-serve.nix {}; nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index a93166083135..4f39239bfe08 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.nagios.org/"; changelog = "https://github.com/NagiosEnterprises/nagioscore/blob/nagios-${finalAttrs.version}/Changelog"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; mainProgram = "nagios"; maintainers = with lib.maintainers; [ immae thoughtpolice relrod anthonyroussel ]; }; From 4871a4e0daaaedfac0b8a5685f35605a67ac07e2 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 5 May 2024 06:01:03 -0400 Subject: [PATCH 021/262] nixos/systemd-stage-1: Fix fsck.xfs needing bash's sh symlink --- nixos/modules/system/boot/systemd/initrd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index cc32b2a15e7c..6107a2594baf 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -473,8 +473,8 @@ in { "${cfg.package.util-linux}/bin/umount" "${cfg.package.util-linux}/bin/sulogin" - # required for script services - "${pkgs.runtimeShell}" + # required for script services, and some tools like xfs still want the sh symlink + "${pkgs.bash}/bin" # so NSS can look up usernames "${pkgs.glibc}/lib/libnss_files.so.2" From da635f35de3f9a471112a63f49fcb3c00e5bd334 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 5 May 2024 06:41:28 -0400 Subject: [PATCH 022/262] nixos/systemd-stage-1: Enable LVM installer test --- nixos/tests/installer-systemd-stage-1.nix | 2 +- nixos/tests/installer.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/tests/installer-systemd-stage-1.nix b/nixos/tests/installer-systemd-stage-1.nix index 1dd55dada042..00205f941771 100644 --- a/nixos/tests/installer-systemd-stage-1.nix +++ b/nixos/tests/installer-systemd-stage-1.nix @@ -19,7 +19,7 @@ luksroot luksroot-format1 luksroot-format2 - # lvm + lvm separateBoot separateBootFat separateBootZfs diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 7e835041eb39..fce2a11b5bf1 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -975,6 +975,9 @@ in { "mount LABEL=nixos /mnt", ) ''; + extraConfig = optionalString systemdStage1 '' + boot.initrd.services.lvm.enable = true; + ''; }; # Boot off an encrypted root partition with the default LUKS header format From 6879aef52dbceec629e71540131ebff9e3f2df01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 May 2024 19:45:57 +0000 Subject: [PATCH 023/262] gnome-extension-manager: 0.4.3 -> 0.5.1 --- pkgs/applications/misc/gnome-extension-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gnome-extension-manager/default.nix b/pkgs/applications/misc/gnome-extension-manager/default.nix index a0540e56ccc9..9b6167322aa5 100644 --- a/pkgs/applications/misc/gnome-extension-manager/default.nix +++ b/pkgs/applications/misc/gnome-extension-manager/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "gnome-extension-manager"; - version = "0.4.3"; + version = "0.5.1"; src = fetchFromGitHub { owner = "mjakeman"; repo = "extension-manager"; rev = "v${version}"; - hash = "sha256-e+s8iIUvW9Rw0Wq4aIn3IzBLGTQC6o0TmNXd5gz892Y="; + hash = "sha256-PWpnLtzQDF2Is63CY9bNzYSo+MiA2oxzJi7B4nQZ7v8="; }; nativeBuildInputs = [ From 576e848da0da23c551de2a3bbf052aea4fc2a4fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 06:20:13 +0000 Subject: [PATCH 024/262] qsynth: 0.9.90 -> 0.9.91 --- pkgs/applications/audio/qsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 88ec50acc6de..0895e368af0b 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "qsynth"; - version = "0.9.90"; + version = "0.9.91"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - hash = "sha256-5lqmoUku4/8oKxlQio1nJtMu1kn42iK8mi0K3s9y70M="; + hash = "sha256-CS/rCvm7IuVwDN1PURO6ADVXTZkX7OYzKJP8xfOHN4E="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; From 4414ea738e80c14c989e79574f62d737190f97f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 May 2024 01:56:52 +0000 Subject: [PATCH 025/262] pinniped: 0.29.0 -> 0.30.0 --- pkgs/applications/networking/cluster/pinniped/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix index 451360df62d0..c8152edce335 100644 --- a/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-O8P7biLlRCl/mhrhi9Tn5DSEv6/SbK4S6hcyQrN76Ds="; + sha256 = "sha256-tF4MIWHn9NvuZ94mwEujUNs34lvbnmH7oc7ur/jbd9c="; }; subPackages = "cmd/pinniped"; - vendorHash = "sha256-57Soek3iDlBPoZR3dw6Z/fY+UZTdrc3Cgc5ddAT3S0A="; + vendorHash = "sha256-vqchVDAw63QyG8ZL2n+YGcMjVt8IUxkFUPHpWt0d/Qk="; ldflags = [ "-s" "-w" ]; From a5655b3955ee4bda218a0f28754f718cefed3fb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 May 2024 02:00:45 +0000 Subject: [PATCH 026/262] flow: 0.235.1 -> 0.236.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 803b15e6a2aa..3f50cd0df3e9 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.235.1"; + version = "0.236.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-aSL6C9MBn3fmuUrtWvb+6VBd1tpoIyqDXEqThGRNx7U="; + hash = "sha256-W0JLnX+IGFMjIi6EkHRzvB3jSl/8/+3iuc9dwlXB2Po="; }; postPatch = '' From ba4748e40e1502e450cfb54df27234d1363917bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 May 2024 12:19:25 +0000 Subject: [PATCH 027/262] libsystemtap: 5.0 -> 5.1 --- pkgs/development/libraries/libsystemtap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix index 4ec9fea5a0e6..8290cee53a47 100644 --- a/pkgs/development/libraries/libsystemtap/default.nix +++ b/pkgs/development/libraries/libsystemtap/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation { pname = "libsystemtap"; - version = "5.0"; + version = "5.1"; src = fetchgit { url = "git://sourceware.org/git/systemtap.git"; - rev = "release-5.0"; - hash = "sha256-dIBpySBTFn01CNtYwbXEramUlcYHPF6O/Ffr1BxdAH0="; + rev = "release-5.1"; + hash = "sha256-3rhDllsgYGfh1gb5frUrlkzdz57A6lcvBELtgvb5Q7M="; }; dontBuild = true; From c618e3778cda9d78b3b83ba0b2f03bb1260a5783 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 May 2024 12:34:32 +0000 Subject: [PATCH 028/262] minizinc: 2.8.3 -> 2.8.4 --- pkgs/development/tools/minizinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 9859cf2c948d..2702be56dc24 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "MiniZinc"; repo = "libminizinc"; rev = finalAttrs.version; - sha256 = "sha256-/1rMrmwx8oYuiIoaS7YjDOey4jBCTJgzrPv6U0Vid8A="; + sha256 = "sha256-RpqjhjdG8u+gqO5SmKep5JpFhXh5GGX65qA15X+MNA4="; }; nativeBuildInputs = [ bison cmake flex jq ]; From 6fcc749376b257ec3875e7a964ceb78ae68cab61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 May 2024 17:40:28 +0000 Subject: [PATCH 029/262] earlyoom: 1.8.1 -> 1.8.2 --- pkgs/by-name/ea/earlyoom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ea/earlyoom/package.nix b/pkgs/by-name/ea/earlyoom/package.nix index 4efb5a52e38e..9452bbfabf79 100644 --- a/pkgs/by-name/ea/earlyoom/package.nix +++ b/pkgs/by-name/ea/earlyoom/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "earlyoom"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; rev = "v${finalAttrs.version}"; - hash = "sha256-7gVwR/D3HEMv2sRXYe/B2aluxncDkMGyiBklwAJkWjk="; + hash = "sha256-HZ7llMNdx2u1a6loIFjXt5QNkYpJp8GqLKxDf9exuzE="; }; outputs = [ "out" ] ++ lib.optionals withManpage [ "man" ]; From 55d093f0decdb9b886a67cfcf01dffd6a1619e3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 00:25:06 +0000 Subject: [PATCH 030/262] bazelisk: 1.19.0 -> 1.20.0 --- pkgs/development/tools/bazelisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 8ca8b416c702..4001ad4bbef8 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-no1+sQ+8Ead1diCYytC3MXVA68SuWWxt40OFVrGWYdQ="; + sha256 = "sha256-UNrfLuSadkP3GBlFMg2V3mK/GSNlyvIxeHnkTuPjfy4="; }; vendorHash = "sha256-hjV7Pc3DFExSCsA0jKVxb1GxoXQ7LRFGuot3V0IHG58="; From 73dec69cab599b5c3a54a6ad58b826712af45d7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 00:58:20 +0000 Subject: [PATCH 031/262] monetdb: 11.49.7 -> 11.49.9 --- pkgs/servers/sql/monetdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index f98e507ed4c4..654797c840c0 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.49.7"; + version = "11.49.9"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-Z9GHyNzwIJZd/1eXjUT4+Tb1kZveAWHe6wEMXem/0Kw="; + hash = "sha256-dN4Me9VTLHzJHIiHP2mMy84I6nCycP2nYgb/J36rJnU="; }; nativeBuildInputs = [ bison cmake python3 ]; From e1ce1caec0f3d089b6073ceea720bf1b67dcadd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 01:14:44 +0000 Subject: [PATCH 032/262] hyperrogue: 13.0d -> 13.0i --- pkgs/games/hyperrogue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 21316d967c5a..627b2349c8a5 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "13.0d"; + version = "13.0i"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-K7KKOumotBx9twgCBF4UkpsgMWb8vAclzbYZK83T66I="; + sha256 = "sha256-jXiZ/+XvDluXvNFmSp4suAFVsQvbHEx6fa4iztu+n6c="; }; CXXFLAGS = [ From c3d848e2b1b62370ba11f91a1a7e5dec060b482b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 02:43:06 +0000 Subject: [PATCH 033/262] semantic-release: 23.0.8 -> 23.1.1 --- pkgs/development/tools/semantic-release/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/semantic-release/default.nix b/pkgs/development/tools/semantic-release/default.nix index 2f8a30e653a5..b50a8337d4fa 100644 --- a/pkgs/development/tools/semantic-release/default.nix +++ b/pkgs/development/tools/semantic-release/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "semantic-release"; - version = "23.0.8"; + version = "23.1.1"; src = fetchFromGitHub { owner = "semantic-release"; repo = "semantic-release"; rev = "v${version}"; - hash = "sha256-9dnBrwvV0by2EFIpXd++I8JEzdotWSFcK7wbY/1Rpx0="; + hash = "sha256-gO/HOLzPFPI2QzVFmyHMJGOKWACiHJEtj+cxq+I0/to="; }; - npmDepsHash = "sha256-GwrrjL8egqoE2ATK5wOWuMF/xzCLYAe9wzZ0ff5H82E="; + npmDepsHash = "sha256-j64Hr3uJT2r8paoAcxkf+ijDg0rc6sIAZssZcaLNxzM="; dontNpmBuild = true; From f7c5051e94dd76472340d2a97a750b7dbddacf09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 08:02:05 +0000 Subject: [PATCH 034/262] rednotebook: 2.32 -> 2.33 --- pkgs/applications/editors/rednotebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index d4657208004a..645e719823a1 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.32"; + version = "2.33"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sYgiJ4Sc/5Ns3DSlwT03gt54UdzdcvMx1+c27amhulQ="; + sha256 = "sha256-K4uEZZZXU2mZ61t6Ak5mpiCsm/mcNhm+xJSzfJPiuwo="; }; # We have not packaged tests. From 10d0542ae767595df183e5a155e38bf1abba83fd Mon Sep 17 00:00:00 2001 From: Kris Budde Date: Sat, 11 May 2024 09:29:32 +0200 Subject: [PATCH 035/262] add kbudde to maintainers --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 29766f108106..c74aec8ba44c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10425,6 +10425,12 @@ githubId = 26346867; name = "K.B.Dharun Krishna"; }; + kbudde = { + email = "kris@budd.ee"; + github = "kbudde"; + githubId = 1072181; + name = "Kris Budde"; + }; kcalvinalvin = { email = "calvin@kcalvinalvin.info"; github = "kcalvinalvin"; From 6c0b38d8096344e66cd699a61662eb9b9d333a30 Mon Sep 17 00:00:00 2001 From: Kris Budde Date: Sat, 11 May 2024 09:15:37 +0200 Subject: [PATCH 036/262] new package myks --- pkgs/development/tools/myks/default.nix | 51 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/tools/myks/default.nix diff --git a/pkgs/development/tools/myks/default.nix b/pkgs/development/tools/myks/default.nix new file mode 100644 index 000000000000..de097e907dc8 --- /dev/null +++ b/pkgs/development/tools/myks/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + installShellFiles, +}: + +buildGoModule rec { + pname = "myks"; + version = "3.4.4"; + + src = fetchFromGitHub { + owner = "mykso"; + repo = "myks"; + rev = "v${version}"; + hash = "sha256-PaA8j4BWijhPR3DTZ0nnO54v0Uj/DpFdJpofseTA1+A="; + }; + + vendorHash = "sha256-A30SyqgAeYwgiYLZF9M3iW2u8JXPU6ozUThziCmSRgU="; + + subPackages = "."; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=nixpkg-${src.rev}" + "-X main.date=1970-01-01" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + CGO_ENABLED = 0; + + postInstall = '' + installShellCompletion --cmd myks \ + --bash <($out/bin/myks completion bash) \ + --zsh <($out/bin/myks completion zsh) \ + --fish <($out/bin/myks completion fish) + ''; + + meta = with lib; { + changelog = "https://github.com/mykso/myks/blob/main/CHANGELOG.md"; + description = "A configuration framework for Kubernetes applications"; + license = licenses.mit; + homepage = "https://github.com/mykso/myks"; + maintainers = [ maintainers.kbudde ]; + mainProgram = "myks"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbdbad05f58c..882237348c52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19193,6 +19193,8 @@ with pkgs; msitools = callPackage ../development/tools/misc/msitools { }; + myks = callPackage ../development/tools/myks { }; + haskell-ci = haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci; nailgun = callPackage ../development/tools/nailgun { }; From aa0026163f87d37fd36a081094657dbd32a3fce8 Mon Sep 17 00:00:00 2001 From: Kris Budde Date: Sat, 11 May 2024 10:56:43 +0200 Subject: [PATCH 037/262] move myks to pkgs/by-name --- .../tools/myks/default.nix => by-name/my/myks/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/myks/default.nix => by-name/my/myks/package.nix} (100%) diff --git a/pkgs/development/tools/myks/default.nix b/pkgs/by-name/my/myks/package.nix similarity index 100% rename from pkgs/development/tools/myks/default.nix rename to pkgs/by-name/my/myks/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 882237348c52..bbdbad05f58c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19193,8 +19193,6 @@ with pkgs; msitools = callPackage ../development/tools/misc/msitools { }; - myks = callPackage ../development/tools/myks { }; - haskell-ci = haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci; nailgun = callPackage ../development/tools/nailgun { }; From 17c0b6ab5943eb860f1c1c80e8700fafd37902e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 09:04:46 +0000 Subject: [PATCH 038/262] zrok: 0.4.27 -> 0.4.30 --- pkgs/tools/networking/zrok/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index ac21cd9d0fcf..5da30808d7b4 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -14,14 +14,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-cg/4BNjL0+Zl8AHJOK/vVutXrz1aLJ+4cHvzcx5iU/8="; - aarch64-linux = "sha256-W+wTOZUYMqqAOrnhrWsnGYfz7FUQ7D/ssoMsZWrhTqw="; - armv7l-linux = "sha256-Sgfrms2prm3VJECKoqb5NaTYkgGHTdfm2mcR+BIPm2U="; + x86_64-linux = "sha256-9r4a9j8d194VpCCuviQGfWCLzGhE9pnAMkgCkSXOAnE="; + aarch64-linux = "sha256-be/Yx7BatT1kJLGkCoTMrIP6TJW1FFQnHxUjnK3Hw3A="; + armv7l-linux = "sha256-xnQ1FrHkKhY9gEfhXsgbVoRIodL5PlOSNUrUKwVh510="; }.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "zrok"; - version = "0.4.27"; + version = "0.4.30"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; From cc7488ac8d5139a3c999a1f3948d3bd991c0766a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 10:22:29 +0000 Subject: [PATCH 039/262] video2midi: 0.4.7.2 -> 0.4.8 --- pkgs/tools/audio/video2midi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index ca7e2ec45abe..1e3b85858294 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -8,7 +8,7 @@ let }); in pythonPackages.buildPythonApplication rec { pname = "video2midi"; - version = "0.4.7.2"; + version = "0.4.8"; format = "other"; @@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec { owner = "svsdval"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-lM3SBgGUW5MTUtsywy57fBiHEg58a8Fcpqb+EcRaYQ4="; + sha256 = "sha256-1q4d136pvEWTOCY7Dv8Ux2HV9zqz5pWRhMrHKGLQ5ic="; }; propagatedBuildInputs = with pythonPackages; [ opencv4_ midiutil pygame pyopengl ]; From d123209adebe964827a87f67d66e98e34e49c567 Mon Sep 17 00:00:00 2001 From: Kris Budde Date: Sat, 11 May 2024 12:42:38 +0200 Subject: [PATCH 040/262] add a version test --- pkgs/by-name/my/myks/package.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index de097e907dc8..267286f3691e 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -1,10 +1,4 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - testers, - installShellFiles, -}: +{ lib, buildGoModule, fetchFromGitHub, testers, installShellFiles, myks, }: buildGoModule rec { pname = "myks"; @@ -33,6 +27,8 @@ buildGoModule rec { CGO_ENABLED = 0; + passthru.tests.version = testers.testVersion { package = myks; }; + postInstall = '' installShellCompletion --cmd myks \ --bash <($out/bin/myks completion bash) \ From d2b4b553d924adaab78876c0d1281f217cdd9b8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 13:43:23 +0000 Subject: [PATCH 041/262] calicoctl: 3.27.3 -> 3.28.0 --- pkgs/applications/networking/cluster/calico/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 91f2b105decb..7bce32ce2c0a 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.27.3"; + version = "3.28.0"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-WZcQfZ5ocuimI5gtr5I5LjKxukK07au6iP9N2+vwN1M="; + hash = "sha256-CiLapG5/J+oKDgoRyZmWkfA1NWJ9Cchp4yiE6bV4Wt4="; }; - vendorHash = "sha256-ptMec5gL6WTCG/2aHesU8fJwMzMnfuvEn9S68M5y4Eo="; + vendorHash = "sha256-3BH7FZFfH63Z8d4U7y4S5wpiVG2Vcr9wqdzkoUnwsrM="; inherit doCheck subPackages; From f8522cddbc138e75ac01671d022d10b3dab4c11e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 14:36:33 +0000 Subject: [PATCH 042/262] calico-cni-plugin: 3.27.3 -> 3.28.0 --- pkgs/applications/networking/cluster/calico/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 91f2b105decb..7bce32ce2c0a 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.27.3"; + version = "3.28.0"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-WZcQfZ5ocuimI5gtr5I5LjKxukK07au6iP9N2+vwN1M="; + hash = "sha256-CiLapG5/J+oKDgoRyZmWkfA1NWJ9Cchp4yiE6bV4Wt4="; }; - vendorHash = "sha256-ptMec5gL6WTCG/2aHesU8fJwMzMnfuvEn9S68M5y4Eo="; + vendorHash = "sha256-3BH7FZFfH63Z8d4U7y4S5wpiVG2Vcr9wqdzkoUnwsrM="; inherit doCheck subPackages; From c70fd286f02a5e1f7fe83ea86f570beb1884bef2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 14:36:52 +0000 Subject: [PATCH 043/262] calico-apiserver: 3.27.3 -> 3.28.0 --- pkgs/applications/networking/cluster/calico/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 91f2b105decb..7bce32ce2c0a 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.27.3"; + version = "3.28.0"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-WZcQfZ5ocuimI5gtr5I5LjKxukK07au6iP9N2+vwN1M="; + hash = "sha256-CiLapG5/J+oKDgoRyZmWkfA1NWJ9Cchp4yiE6bV4Wt4="; }; - vendorHash = "sha256-ptMec5gL6WTCG/2aHesU8fJwMzMnfuvEn9S68M5y4Eo="; + vendorHash = "sha256-3BH7FZFfH63Z8d4U7y4S5wpiVG2Vcr9wqdzkoUnwsrM="; inherit doCheck subPackages; From afd63ddd65b9cac19b5132986ec7845f3de27ce6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 14:37:17 +0000 Subject: [PATCH 044/262] calico-app-policy: 3.27.3 -> 3.28.0 --- pkgs/applications/networking/cluster/calico/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 91f2b105decb..7bce32ce2c0a 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.27.3"; + version = "3.28.0"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-WZcQfZ5ocuimI5gtr5I5LjKxukK07au6iP9N2+vwN1M="; + hash = "sha256-CiLapG5/J+oKDgoRyZmWkfA1NWJ9Cchp4yiE6bV4Wt4="; }; - vendorHash = "sha256-ptMec5gL6WTCG/2aHesU8fJwMzMnfuvEn9S68M5y4Eo="; + vendorHash = "sha256-3BH7FZFfH63Z8d4U7y4S5wpiVG2Vcr9wqdzkoUnwsrM="; inherit doCheck subPackages; From f56f4c9feca8c6f755186863a73afa3c0397468d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 14:58:02 +0000 Subject: [PATCH 045/262] jbrowse: 2.11.0 -> 2.11.1 --- pkgs/applications/science/biology/jbrowse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index b8c5d69482e3..c1025d0b1919 100644 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ b/pkgs/applications/science/biology/jbrowse/default.nix @@ -2,11 +2,11 @@ let pname = "jbrowse"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-MtcrkDg7OC3PTc6fdeG3O/CdyP3122+2BSzKE7rrtWI="; + sha256 = "sha256-/1QNpoJy4u2sSw6907UQpdYX9aFWp31BxsYVTQoDpi4="; }; appimageContents = appimageTools.extractType2 { From b83a7a9a7fe24b851859fd3f662b93eaee735a69 Mon Sep 17 00:00:00 2001 From: Kris Budde Date: Sat, 11 May 2024 18:54:23 +0200 Subject: [PATCH 046/262] fix: exec shellCompletion only if not crosscompiled #308283 --- pkgs/by-name/my/myks/package.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 267286f3691e..6fd19e6e8c51 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -1,4 +1,5 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, installShellFiles, myks, }: +{ lib, buildGoModule, fetchFromGitHub, testers, installShellFiles, myks, stdenv +}: buildGoModule rec { pname = "myks"; @@ -29,15 +30,16 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = myks; }; - postInstall = '' - installShellCompletion --cmd myks \ - --bash <($out/bin/myks completion bash) \ - --zsh <($out/bin/myks completion zsh) \ - --fish <($out/bin/myks completion fish) - ''; + postInstall = + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd myks \ + --bash <($out/bin/myks completion bash) \ + --zsh <($out/bin/myks completion zsh) \ + --fish <($out/bin/myks completion fish) + ''; meta = with lib; { - changelog = "https://github.com/mykso/myks/blob/main/CHANGELOG.md"; + changelog = "https://github.com/mykso/myks/blob/v${version}/CHANGELOG.md"; description = "A configuration framework for Kubernetes applications"; license = licenses.mit; homepage = "https://github.com/mykso/myks"; From 0b85c40042d88d47ee5af62628c8078cefbb7d4e Mon Sep 17 00:00:00 2001 From: Kris Budde Date: Sat, 11 May 2024 21:56:38 +0200 Subject: [PATCH 047/262] harden package definition --- pkgs/by-name/my/myks/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 6fd19e6e8c51..6de9faf4e9c3 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, installShellFiles, myks, stdenv +{ lib, + buildGoModule, + fetchFromGitHub, + testers, + installShellFiles, + myks, + stdenv, }: buildGoModule rec { @@ -8,7 +14,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "mykso"; repo = "myks"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-PaA8j4BWijhPR3DTZ0nnO54v0Uj/DpFdJpofseTA1+A="; }; @@ -19,9 +25,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" - "-X main.commit=nixpkg-${src.rev}" - "-X main.date=1970-01-01" + "-X=main.version=${version}" + "-X=main.commit=nixpkg-${version}" + "-X=main.date=1970-01-01" ]; nativeBuildInputs = [ installShellFiles ]; From 2e004c8f90cbbaa735dd1ecb5eed92b4a59e1545 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 04:04:00 +0000 Subject: [PATCH 048/262] ssdfs-utils: 4.39 -> 4.40 --- pkgs/tools/filesystems/ssdfs-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ssdfs-utils/default.nix b/pkgs/tools/filesystems/ssdfs-utils/default.nix index b4bd62b8b1b5..8a80d362c902 100644 --- a/pkgs/tools/filesystems/ssdfs-utils/default.nix +++ b/pkgs/tools/filesystems/ssdfs-utils/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.39"; + version = "4.40"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "24aafdd9ee30247745b36e55e0098fa590ffc26f"; - hash = "sha256-e6Duur7EauvzK1aStbRzClfPMGRR2a7jxGpiyJfQaUk="; + rev = "5f121f793e344cbbe98764b0a5758511da8c3d23"; + hash = "sha256-VSHs8BBp+n7jbr9KtTXykpUZbTfc999eYA5wtFsmMdY="; }; strictDeps = true; From 5fda88c5d6b925a8d8ffb7c7eb4f7b455862ef45 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sun, 12 May 2024 19:53:22 +0530 Subject: [PATCH 049/262] dosbox-staging: 0.80.1 -> 0.81.1 remove patches that are now upstream add nix-update-script --- pkgs/by-name/do/dosbox-staging/package.nix | 61 ++-------------------- 1 file changed, 5 insertions(+), 56 deletions(-) diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index 4fa16600d1d5..78764a319baf 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , SDL2 , SDL2_image , SDL2_net @@ -28,71 +27,20 @@ , opusfile , pkg-config , speexdsp +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "dosbox-staging"; - version = "0.80.1"; + version = "0.81.1"; src = fetchFromGitHub { owner = "dosbox-staging"; repo = "dosbox-staging"; rev = "v${finalAttrs.version}"; - hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc="; + hash = "sha256-XGssEyX+AVv7/ixgGTRtPFjsUSX0FT0fhP+TXsFl2fY="; }; - patches = [ - # Pull missind SDL2_net dependency: - # https://github.com/dosbox-staging/dosbox-staging/pull/2358 - (fetchpatch { - name = "sdl2-net.patch"; - url = "https://github.com/dosbox-staging/dosbox-staging/commit/1b02f187a39263f4b0285323dcfe184bccd749c2.patch"; - hash = "sha256-Ev97xApInu6r5wvI9Q7FhkSXqtMW/rwJj48fExvqnT0="; - }) - - # Pull missing SDL2_image dependency: - # https://github.com/dosbox-staging/dosbox-staging/pull/2239 - (fetchpatch { - name = "sdl2-image.patch"; - url = "https://github.com/dosbox-staging/dosbox-staging/commit/ca8b7a906d29a3f8ce956c4af7dc829a6ac3e229.patch"; - hash = "sha256-WtTVSWWSlfXrdPVsnlDe4P5K/Fnj4QsOzx3Wo/Kusmg="; - includes = [ "src/gui/meson.build" ]; - }) - ] - # Pagesize detection via syscall; remove when next stable version arrives - ++ [ - (fetchpatch { - # Added as a parent commit of 7e20f6e - # Fix ppc64le backend and 64K page size support (#2828) - name = "meson-add-ppc64.patch"; - url = "https://github.com/dosbox-staging/dosbox-staging/commit/765bcc2b1d87050a4ea366bf22e1db075ad5660b.patch"; - hash = "sha256-RtkidyF7w6RrPmCKK4Bd+3FtAn/+/38xk2cl32+yzxw="; - includes = [ "meson.build" ]; - }) - (fetchpatch { - # Added as a parent commit of 7e20f6e - # Account for debian powerpc prefix (instead of ppc) - name = "meson-powerpc64le.patch"; - url = "https://github.com/dosbox-staging/dosbox-staging/commit/d44aa7441cd871ffac08974f22af7a735a839288.patch"; - hash = "sha256-oMZtfmB1CRlDWyXwEWc3XzC+XxKazXDgo+jUiNBoJDw="; - includes = [ "meson.build" ]; - }) - (fetchpatch { - # Added as a parent commit of 7e20f6e - # Restore the PowerPC dynrec core to working order - name = "meson-option-write-or-execute.patch"; - url = "https://github.com/dosbox-staging/dosbox-staging/commit/ef86642de390839afc77b2b591a6ea9ac43909b3.patch"; - hash = "sha256-htOKEaXRRy28XNMX/t6uFTBLCkTr7YPtfmI9UyIBiz4="; - includes = [ "meson_options.txt" ]; - }) - (fetchpatch { - # Use a system call to detect the page size - name = "meson-detect-pagesize-by-syscall.patch"; - url = "https://github.com/dosbox-staging/dosbox-staging/commit/7e20f6e401956a7a308f1b3462294d7ac9fa5db8.patch"; - hash = "sha256-QW9lpHWCYSlQFgTqX/UxHAAWisz4wfPrdjLqROn/wR0="; - }) - ]; - nativeBuildInputs = [ copyDesktopItems gtest @@ -154,6 +102,8 @@ stdenv.mkDerivation (finalAttrs: { popd ''; + passthru.updateScript = nix-update-script {}; + meta = { homepage = "https://dosbox-staging.github.io/"; description = "A modernized DOS emulator"; @@ -169,4 +119,3 @@ stdenv.mkDerivation (finalAttrs: { priority = 101; }; }) -# TODO: report upstream about not finding SDL2_net From 5e304f6043bfd9ec032d25418fa339d2ee11c78e Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sun, 12 May 2024 19:59:06 +0530 Subject: [PATCH 050/262] dosbox-staging: format with nixfmt-rfc-style --- pkgs/by-name/do/dosbox-staging/package.nix | 127 +++++++++++---------- 1 file changed, 69 insertions(+), 58 deletions(-) diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index 78764a319baf..2214dca493ea 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -1,33 +1,34 @@ -{ lib -, stdenv -, fetchFromGitHub -, SDL2 -, SDL2_image -, SDL2_net -, alsa-lib -, copyDesktopItems -, darwin -, fluidsynth -, glib -, gtest -, iir1 -, libGL -, libGLU -, libjack2 -, libmt32emu -, libogg -, libpng -, libpulseaudio -, libslirp -, libsndfile -, makeDesktopItem -, makeWrapper -, meson -, ninja -, opusfile -, pkg-config -, speexdsp -, nix-update-script +{ + lib, + stdenv, + fetchFromGitHub, + SDL2, + SDL2_image, + SDL2_net, + alsa-lib, + copyDesktopItems, + darwin, + fluidsynth, + glib, + gtest, + iir1, + libGL, + libGLU, + libjack2, + libmt32emu, + libogg, + libpng, + libpulseaudio, + libslirp, + libsndfile, + makeDesktopItem, + makeWrapper, + meson, + ninja, + opusfile, + pkg-config, + speexdsp, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -50,31 +51,35 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = [ - fluidsynth - glib - iir1 - libGL - libGLU - libjack2 - libmt32emu - libogg - libpng - libpulseaudio - libslirp - libsndfile - opusfile - SDL2 - SDL2_image - SDL2_net - speexdsp - ] ++ lib.optionals stdenv.isLinux [ - alsa-lib - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - AudioUnit - Carbon - Cocoa - ]); + buildInputs = + [ + fluidsynth + glib + iir1 + libGL + libGLU + libjack2 + libmt32emu + libogg + libpng + libpulseaudio + libslirp + libsndfile + opusfile + SDL2 + SDL2_image + SDL2_net + speexdsp + ] + ++ lib.optionals stdenv.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AudioUnit + Carbon + Cocoa + ] + ); desktopItems = [ (makeDesktopItem { @@ -84,7 +89,10 @@ stdenv.mkDerivation (finalAttrs: { comment = "x86 dos emulator enhanced"; desktopName = "DosBox-Staging"; genericName = "DOS emulator"; - categories = [ "Emulator" "Game" ]; + categories = [ + "Emulator" + "Game" + ]; }) ]; @@ -102,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { popd ''; - passthru.updateScript = nix-update-script {}; + passthru.updateScript = nix-update-script { }; meta = { homepage = "https://dosbox-staging.github.io/"; @@ -114,7 +122,10 @@ stdenv.mkDerivation (finalAttrs: { practices. ''; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ joshuafern AndersonTorres ]; + maintainers = with lib.maintainers; [ + joshuafern + AndersonTorres + ]; platforms = lib.platforms.unix; priority = 101; }; From 783b0168e5e2b1a2532a69e007364d11fc67a0dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 15:22:25 +0000 Subject: [PATCH 051/262] regols: 0.2.2 -> 0.2.3 --- pkgs/by-name/re/regols/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/regols/package.nix b/pkgs/by-name/re/regols/package.nix index 64515e5ed72e..d96dda45bf71 100644 --- a/pkgs/by-name/re/regols/package.nix +++ b/pkgs/by-name/re/regols/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "regols"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "kitagry"; repo = "regols"; rev = "v${version}"; - hash = "sha256-2ZwmIlv3kJ26p15t7NvB9sX2GO+B3ypeNl50b7XA0Iw="; + hash = "sha256-nZ0zBCZXVY2AqzsBWm/HOp9wO7Cj1AsSgpi6YwmhfHY="; }; - vendorHash = "sha256-N6gtkZSNLXz3B961grM3xHzm7x4/kzcLkDOgiFLGp8U="; + vendorHash = "sha256-LQdYmsof4CRDBz65Q/YDl+Ll77fvAR/CV/P2RK8a0Lg="; meta = with lib; { description = "OPA Rego language server"; From fb17e8b1d4d1b4cc7e2701a789b52a51e77ae3be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 19:19:20 +0000 Subject: [PATCH 052/262] kokkos: 4.3.00 -> 4.3.01 --- pkgs/by-name/ko/kokkos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix index 33634ddfaca9..86e671834e0b 100644 --- a/pkgs/by-name/ko/kokkos/package.nix +++ b/pkgs/by-name/ko/kokkos/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kokkos"; - version = "4.3.00"; + version = "4.3.01"; src = fetchFromGitHub { owner = "kokkos"; repo = "kokkos"; rev = finalAttrs.version; - hash = "sha256-0MMztgw+okZM/xr2vQucwkkT04iueQSlSQJ6MN/756I="; + hash = "sha256-x496DKEBMNUUZ2rBNT2MPBV8Obi5aUKQuHwjLiNPMhk="; }; nativeBuildInputs = [ From 50dbda375ae5c49d110648f154c1f5d1514640c2 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 12 May 2024 22:08:35 +0100 Subject: [PATCH 053/262] ffmpegthumbnailer: refactor code with nixfmt --- .../libraries/ffmpegthumbnailer/default.nix | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 47e3c3ed42c7..8a4d155057c8 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,12 @@ -{ fetchFromGitHub, lib, stdenv, ffmpeg-headless, cmake, libpng, pkg-config, libjpeg +{ + fetchFromGitHub, + lib, + stdenv, + ffmpeg-headless, + cmake, + libpng, + pkg-config, + libjpeg, }: stdenv.mkDerivation rec { @@ -12,8 +20,17 @@ stdenv.mkDerivation rec { sha256 = "0606pbg391l4s8mpyyalm9zrcnm75fwqdlrxy2gif9n21i2fm3rc"; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ffmpeg-headless libpng libjpeg ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + ffmpeg-headless + libpng + libjpeg + ]; + cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; # https://github.com/dirkvdb/ffmpegthumbnailer/issues/215 @@ -22,21 +39,20 @@ stdenv.mkDerivation rec { --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ ''; - meta = with lib; { - homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; + meta = with lib; { description = "A lightweight video thumbnailer"; - mainProgram = "ffmpegthumbnailer"; longDescription = "FFmpegthumbnailer is a lightweight video thumbnailer that can be used by file managers to create thumbnails - for your video files. The thumbnailer uses ffmpeg o decode frames + for your video files. The thumbnailer uses ffmpeg to decode frames from the video files, so supported videoformats depend on the configuration flags of ffmpeg. This thumbnailer was designed to be as fast and lightweight as possible. - The only dependencies are ffmpeg and libpng. + The only dependencies are ffmpeg and libpng/libjpeg. "; - platforms = platforms.unix; + homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; license = licenses.gpl2Plus; maintainers = [ maintainers.jagajaga ]; + platforms = platforms.unix; + mainProgram = "ffmpegthumbnailer"; }; - } From f6f7014ce43ae087c01e4dc9316c3f22d485347c Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 12 May 2024 22:11:49 +0100 Subject: [PATCH 054/262] ffmpegthumbnailer: unstable-2022-02-18 -> unstable-2024-01-04 --- .../libraries/ffmpegthumbnailer/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 8a4d155057c8..c1c9fe960e7d 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,23 +1,23 @@ { - fetchFromGitHub, lib, stdenv, - ffmpeg-headless, + fetchFromGitHub, cmake, - libpng, pkg-config, + ffmpeg-headless, + libpng, libjpeg, }: stdenv.mkDerivation rec { pname = "ffmpegthumbnailer"; - version = "unstable-2022-02-18"; + version = "unstable-2024-01-04"; src = fetchFromGitHub { owner = "dirkvdb"; repo = "ffmpegthumbnailer"; - rev = "3db9fe895b2fa656bb40ddb7a62e27604a688171"; - sha256 = "0606pbg391l4s8mpyyalm9zrcnm75fwqdlrxy2gif9n21i2fm3rc"; + rev = "1b5a77983240bcf00a4ef7702c07bcd8f4e5f97c"; + hash = "sha256-7SPRQMPgdvP7J3HCf7F1eXxZjUH5vCYZ9UOwTUFMLp0="; }; nativeBuildInputs = [ From fa736d735114d7babe807639f22c1746021f71a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 22:29:44 +0000 Subject: [PATCH 055/262] jackett: 0.21.2496 -> 0.21.2586 --- pkgs/servers/jackett/default.nix | 4 ++-- pkgs/servers/jackett/deps.nix | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 8158b2e23f57..64524dd53309 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.2496"; + version = "0.21.2586"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-lzyOnf1nCB/TgrAlqbfHNuxp+tV2PLCIS8t9yvQlOoCZsCHPCgcyX4jkT+3i68zmXqj5Tfvhvje0zk6rE/3BgA=="; + hash = "sha512-W3ZBgRSNLaUoJh4twjmh04SO/wWqZg8eGFORveU8H7iBCHFUjJqwpbDf9f0Oq0q+h318PLFtrD22HuaXgX6+pg=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix index 02a599fe440d..eeee5e813442 100644 --- a/pkgs/servers/jackett/deps.nix +++ b/pkgs/servers/jackett/deps.nix @@ -24,11 +24,11 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "2.2.0"; sha256 = "1rl94r8b0zq14f3dhfnvfjj1ivr81iw9zh5kdgs3zkdv0xc9x21j"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cors"; version = "2.2.0"; sha256 = "0qskbz87i74kfbklxqfyqaccyba21kkx2lcdfa54kxj9r8daq7sc"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "2.2.0"; sha256 = "01lg2fx85b47ldgdrhs6clsivj35x54xwc9r5xk3f1v8rr3gycsv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "6.0.28"; sha256 = "156abks0g130277dj5cqi81254a0znik6d9w8c4hvwlvvkhfjn4w"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "6.0.29"; sha256 = "0rkh3i4xd30wi3qzjc4g2224hszh5a10527ycmqzycvaz9p39gd3"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection"; version = "2.2.0"; sha256 = "09lzbp084xxy1xxfbxpqdff8phv2pzd1n5v30xfm03hhl7a038gx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection"; version = "6.0.28"; sha256 = "1p9p1rp9jhwiwcs9mp55i3xlax6yskb52ccy71h1x8ad6z9yznxq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection"; version = "6.0.29"; sha256 = "1nwsrydv0fhf3clprs74n8bib66v2iqzkcx8z12mc97n631vqlb5"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection.Abstractions"; version = "2.2.0"; sha256 = "1gi4hpssmrrdf5lm6idkhvqbfy12bx14976y4gbhmx9z8lxaqcfz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection.Abstractions"; version = "6.0.28"; sha256 = "064z1b8im4hcpmpllgv12aw61m8ys2x5cny60hizybspxw8jmv2i"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection.Abstractions"; version = "6.0.29"; sha256 = "1nwi369j9866kdcyalyg35jicjmssnwz05pzlr81sid77270l6k7"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Diagnostics"; version = "2.2.0"; sha256 = "0hq5s2h0k2714352bdz2s3c3m6spkn4ckfw3pv9c4rmn6adbw9b1"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Diagnostics.Abstractions"; version = "2.2.0"; sha256 = "061cdhjh5w2f1frhimcgk68vx8p743jb9h4qik3lm1c734r0drm0"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.HostFiltering"; version = "2.2.0"; sha256 = "06wbgkbh24w9yxz6g8446l7nnjm3rdp1wklri710zqzr7zbfcx43"; }) @@ -48,7 +48,7 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; sha256 = "0xrlq8i61vzhzzy25n80m7wh2kn593rfaii3aqnxdsxsg6sfgnx1"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.HttpOverrides"; version = "2.2.0"; sha256 = "1pbmmczxilgrf4qyaql88dc3av7kaixb1r36358kil68gl3irjy6"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "2.2.0"; sha256 = "07cihb5sqkavg42nvircdwjp0b67mhrla97jgx285zdjphplg4h2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.28"; sha256 = "1d07kh3smgnphxpf4rhb1g7mbyni00gkh0lqkg6msfsm3f9mwb8w"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.29"; sha256 = "1psvkdvjn5aml1mj5zp2jw0jdkld6lgkbp8s79kijfds1mvnhpir"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Localization"; version = "2.2.0"; sha256 = "08knc70cy7ycid5sbbbzy6my4b7ddj4j760k5xf1qnfb0njxhfh7"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc"; version = "2.2.0"; sha256 = "16jrikcywkd4r4jh551p8gxxw6hj3aizdzd5i7agb06gwpgqqv9c"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Abstractions"; version = "2.2.0"; sha256 = "09p447ipd19517vy8xx9ykvspn6b4fgbm2rskpmzyw41x9wz4k0b"; }) @@ -59,7 +59,7 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.DataAnnotations"; version = "2.2.0"; sha256 = "0vdhdjarh4az7g71gkvmhq6xpvwhh8si3sbrpdwb8p60i94cdyl6"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Formatters.Json"; version = "2.2.0"; sha256 = "0421fcf2z8a6z81ql123ili32wbr3x25zpq17xjf4s9fmsr0069a"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Localization"; version = "2.2.0"; sha256 = "0d27xirwsr3j7jacsrz6g2r4py35hgzjyy6ak6gkd07cm707wgc6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.28"; sha256 = "0szissvyxcrh52j4bqvs9nbkwg4pi190ivr49vq31dxxf51mrppy"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.29"; sha256 = "05403mj7pcczlm6d72ndywgsfnbrk5qqg30k5pk1567qc195dn72"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor"; version = "2.2.0"; sha256 = "06fqg7rfyvfj3hdppkhy37ddjff2d6pg7khj6lccs9lwc732yr7q"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; version = "2.2.0"; sha256 = "04javqbzv7mkakqjl40j429giaagjj7hmwcljrgj8q1jknk0x9xc"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.RazorPages"; version = "2.2.0"; sha256 = "0zqyqfxzl3lkqfy9chd0ipani75q3109imlxrnhdfiwmxrd8xqbm"; }) @@ -92,7 +92,7 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "2.8.0"; sha256 = "0g4h41fs0r8lqh9pk9s4mc1090kdpa6sbxq4rc866s8hnq9s1h4j"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "2.8.0"; sha256 = "0p1xvw1h2fmnxywv1j4x6p3rgarpc8mfwfgn0vflk5xfnc961f6w"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Razor"; version = "2.2.0"; sha256 = "03cm9danxxnsnmrzfz2swz6zhckkgg6hrz1ycnvnjrbpk3w4v0d6"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; sha256 = "0bf68gq6mc6kzri4zi8ydc0xrazqwqg38bhbpjpj90zmqc28kari"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.9.0"; sha256 = "1gljgi69k0fz8vy8bn6xlyxabj6q4vls2zza9wz7ng6ix3irm89r"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DiaSymReader.Native"; version = "1.7.0"; sha256 = "0l2w3xpr7dpni20mqx41hqdzkrl0k6w9a0wqmjzdqv5f1jrwhfxn"; }) @@ -157,13 +157,13 @@ (fetchNuGet { pname = "Microsoft.Extensions.WebEncoders"; version = "2.2.0"; sha256 = "1mhnichccw6mjf37d38q2i1kr7qp485m7apa1b872ji0q16yy1y3"; }) (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.1.1"; sha256 = "06q4xmxj25ry7gkl51zi7vh2957k9s49vdrlgfy03w9rqk81vnld"; }) (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net462"; version = "1.0.3"; sha256 = "08bfss2p262d8zj41xqndv0qgvz9lq636k2xhl80jl23ay22lsgf"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; sha256 = "1n9ilq8n5rhyxcri06njkxb0h2818dbmzddwd2rrvav91647m2s4"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "MimeMapping"; version = "1.0.1.50"; sha256 = "12c26h21qjsprm8cxqyh6l9ak3lqk04f9pl5vfv3zaia896wcgm3"; }) @@ -183,10 +183,9 @@ (fetchNuGet { pname = "NLog"; version = "5.1.2"; sha256 = "1hgb5lqx9c10kw6rjldrkldd70lmkzij4ssgg6msybgz7vpsyhkk"; }) (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.1"; sha256 = "1z9ayqag1xncn4cs0cz27gxa5cqk6caq5fd81bczlj4sqff7ah4p"; }) (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.1"; sha256 = "10y03374lza6cjsi01xmql1v6hcjf6x2r7wfnnckzhzs70x2hhnl"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) - (fetchNuGet { pname = "NUnit.ConsoleRunner"; version = "3.16.1"; sha256 = "0bqs72fhqlmmqsvjarsx4hz8d2dj0wgbsx1gr681fcl1pqpm1cgz"; }) - (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.3.1"; sha256 = "1j80cfrg0fflgw7wxi76mxj1wllwzcg4ck957knmjpghw5cw7lvv"; }) + (fetchNuGet { pname = "NUnit"; version = "3.14.0"; sha256 = "19p8911lrfds1k9rv47jk1bbn665s0pvghkd06gzbg78j6mzzqqa"; }) + (fetchNuGet { pname = "NUnit.ConsoleRunner"; version = "3.17.0"; sha256 = "0qjnvgib96n9a9x8n7vwkypjvvgpimvl8zrkr90qbcygf3yzhrv8"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.5.0"; sha256 = "1srx1629s0k1kmf02nmz251q07vj6pv58mdafcr5dr0bbn1fh78i"; }) (fetchNuGet { pname = "Polly"; version = "8.3.1"; sha256 = "19q7s493sv90879052pxfcbsk3bmxjg5688ya7l12964ddafiwsl"; }) (fetchNuGet { pname = "Polly.Core"; version = "8.3.1"; sha256 = "15ylkqdcwpr76n0nfzpvd6s00ywjagn1ignyrcz9arwahrxpsm4b"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) From f6281ebf9a4aa4037429a6bd34f380f8d74b5b61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 00:21:15 +0000 Subject: [PATCH 056/262] acr: 2.1.2 -> 2.1.4 --- pkgs/development/tools/misc/acr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/acr/default.nix b/pkgs/development/tools/misc/acr/default.nix index 2ddc23f51c3c..10e602624870 100644 --- a/pkgs/development/tools/misc/acr/default.nix +++ b/pkgs/development/tools/misc/acr/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "acr"; - version = "2.1.2"; + version = "2.1.4"; src = fetchFromGitHub { owner = "radareorg"; repo = "acr"; rev = finalAttrs.version; - hash = "sha256-xKB9zBw9sX+z/yBzvfIzQPyOHzlCAGfGLyuLGRoyWbg="; + hash = "sha256-RPqbL21gxM66Wjov0QVuiFJNAfia+xxF53fNdksU5fQ="; }; preConfigure = '' From 170117170ade927f2388ef78c506322520c5af92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 03:33:18 +0000 Subject: [PATCH 057/262] wazero: 1.7.1 -> 1.7.2 --- pkgs/development/interpreters/wazero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/wazero/default.nix b/pkgs/development/interpreters/wazero/default.nix index 0da909441dad..50b7b05da333 100644 --- a/pkgs/development/interpreters/wazero/default.nix +++ b/pkgs/development/interpreters/wazero/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "wazero"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "tetratelabs"; repo = "wazero"; rev = "v${version}"; - hash = "sha256-xMI/6zhXxoD5rq+MZBiMzdmxlHS1gel1IChZe1iENyE="; + hash = "sha256-NhwFIN5xLHovbXko6Ki0szwg+MFJdIwJGude4GiSb8A="; }; vendorHash = null; From 95c22c71b0ec5c87361f07f0f1706cdf2bae64c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 06:53:01 +0000 Subject: [PATCH 058/262] nicotine-plus: 3.3.2 -> 3.3.4 --- pkgs/by-name/ni/nicotine-plus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nicotine-plus/package.nix b/pkgs/by-name/ni/nicotine-plus/package.nix index dad01456ba73..10919ee87c04 100644 --- a/pkgs/by-name/ni/nicotine-plus/package.nix +++ b/pkgs/by-name/ni/nicotine-plus/package.nix @@ -10,13 +10,13 @@ python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; - version = "3.3.2"; + version = "3.3.4"; src = fetchFromGitHub { owner = "nicotine-plus"; repo = "nicotine-plus"; rev = "refs/tags/${version}"; - hash = "sha256-dl4fTa+CXsycC+hhSkIzQQxrSkBDPsdrmKdrHPakGig="; + hash = "sha256-3OMcCMHx+uRid9MF2LMaqUOVQEDlvJiLIVDpCunhxw8="; }; nativeBuildInputs = [ gettext wrapGAppsHook4 gobject-introspection ]; From 31acf1f60e534f37756e538031089d8aaf60bbee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 10:22:46 +0000 Subject: [PATCH 059/262] clash-verge-rev: 1.6.1 -> 1.6.2 --- pkgs/by-name/cl/clash-verge-rev/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 8fc885c11ad9..754588c9fd7b 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -5,11 +5,11 @@ clash-verge.overrideAttrs (old: rec { pname = "clash-verge-rev"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-V6W7IJFa8UrbPWPS2tReecZ41oYvAqV4q0NBkkhUHbQ="; + hash = "sha256-7Nto/vEsatQ9cMNM+6aOw5jBvF/hUxElJ/SRm12yJFA="; }; meta = old.meta // (with lib; { From 1a0c12d45e430c48b9c7038da373e265650ece6e Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sun, 12 May 2024 20:15:09 +0530 Subject: [PATCH 060/262] dosbox-staging: use .desktop from source, add missing deps add zlib-ng dependency --- pkgs/by-name/do/dosbox-staging/package.nix | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index 2214dca493ea..1241385322b8 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -6,7 +6,6 @@ SDL2_image, SDL2_net, alsa-lib, - copyDesktopItems, darwin, fluidsynth, glib, @@ -18,10 +17,10 @@ libmt32emu, libogg, libpng, + zlib-ng, libpulseaudio, libslirp, libsndfile, - makeDesktopItem, makeWrapper, meson, ninja, @@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - copyDesktopItems gtest makeWrapper meson @@ -62,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { libmt32emu libogg libpng + zlib-ng libpulseaudio libslirp libsndfile @@ -81,20 +80,9 @@ stdenv.mkDerivation (finalAttrs: { ] ); - desktopItems = [ - (makeDesktopItem { - name = "dosbox-staging"; - exec = "dosbox-staging"; - icon = "dosbox-staging"; - comment = "x86 dos emulator enhanced"; - desktopName = "DosBox-Staging"; - genericName = "DOS emulator"; - categories = [ - "Emulator" - "Game" - ]; - }) - ]; + postInstall = '' + install -Dm644 $src/contrib/linux/dosbox-staging.desktop $out/share/applications/ + ''; postFixup = '' # Rename binary, add a wrapper, and copy manual to avoid conflict with From 8ad1089e557128d5889aaba7237cbd4277d17787 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 15:59:08 +0000 Subject: [PATCH 061/262] eid-mw: 5.1.16 -> 5.1.18 --- pkgs/tools/security/eid-mw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 851e6f578db6..1b445312353a 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.1.16"; + version = "5.1.18"; src = fetchFromGitHub { owner = "Fedict"; repo = "eid-mw"; rev = "v${version}"; - hash = "sha256-UOZVCTXiqYnatS/ZhJZZprqtwtkVt8EJRHZ9XuX5W5o="; + hash = "sha256-1cdBFpO9bvLlHJE6c7TCscV/Qgx8BHUtFe9UoKPfUOQ="; }; postPatch = '' From 8e6222a5e156adf3aabb7d046d25168be7bbfeae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 00:19:44 +0000 Subject: [PATCH 062/262] camunda-modeler: 5.22.0 -> 5.23.0 --- pkgs/applications/misc/camunda-modeler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index d0065910e906..ce2341125842 100644 --- a/pkgs/applications/misc/camunda-modeler/default.nix +++ b/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.22.0"; + version = "5.23.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-WLJMF+G7pP7OZh6xDrO/JpNV9iX/9XBmi5kRPp3TJBI="; + hash = "sha256-x63UMIl0Wsr4qSEn19Of135PHKlpEVAZzhA2+ZjxNwY="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; From 7a91dffc97023c7651b715ddb2db0a9b5c43cc7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 00:30:48 +0000 Subject: [PATCH 063/262] wgnord: 0.2.0 -> 0.2.1 --- pkgs/applications/networking/wgnord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/wgnord/default.nix b/pkgs/applications/networking/wgnord/default.nix index 0e73d07616a7..7c3596215611 100644 --- a/pkgs/applications/networking/wgnord/default.nix +++ b/pkgs/applications/networking/wgnord/default.nix @@ -13,13 +13,13 @@ resholve.mkDerivation rec { pname = "wgnord"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "phirecc"; repo = pname; rev = version; - hash = "sha256-00513jr3Sk8YahqI14pQ7pU4P7MBUlsqXXfrACu35RQ="; + hash = "sha256-26cfYXtZVQ7kIRxY6oNGCqIjdw/hjwXhVKimVgolLgk="; }; postPatch = '' From f39e882e4ccfaa7797f24c15ddc51ea9296fbf86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 02:57:28 +0000 Subject: [PATCH 064/262] aws-sam-cli: 1.115.0 -> 1.116.0 --- pkgs/development/tools/aws-sam-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 5f359f5cb16d..f12d4f44de32 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.115.0"; + version = "1.116.0"; pyproject = true; disabled = python3.pythonOlder "3.8"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "aws"; repo = "aws-sam-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-VYcgKnTNMuF4lMjoyHk0mDYTngFIouqnPZXpZ5gt9hQ="; + hash = "sha256-bQET2acu2G2tKkBYrj+37f8vnvnByiqMwkMZzrhT95Q="; }; build-system = with python3.pkgs; [ From cf1c1d8ce756bd58ad66e6a319f484474bf21ba7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 04:49:44 +0000 Subject: [PATCH 065/262] iosevka-bin: 30.0.0 -> 30.0.1 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 180 +++++++++++++-------------- 2 files changed, 91 insertions(+), 91 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 76760368605a..0f6d46546ded 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "30.0.0"; + version = "30.0.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 4d51d9acd5e9..0bf703f6955c 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "08phw6jy5zml9gs5wvizqil9m24xx3bfiq026dqxfa7b45qwhvy9"; - IosevkaAile = "0mhfq4rn6jfxyvci5dky5a72gdsw40rvgzqrzwdhdb95ydbpv0yg"; - IosevkaCurly = "0bnwg2y1nxldx8pc4qfbdxb7z6cdqlx37fhz1a4xf7qydy8bcrwl"; - IosevkaCurlySlab = "1ik3r5nbdg9x7lm508zwlvyqvnr50r0w8wmkw8qp5x57xf9bwpgn"; - IosevkaEtoile = "13gqlsycnkf4n2zsb621dzc4s8hgb04r6r9jaz6585bnr5pjm1gs"; - IosevkaSlab = "0ww4p5qlp4anb6g80dydm730357rpr4w90z845r3z12i5x6pv4xn"; - IosevkaSS01 = "0b3yrlcxm7wxzd6zy8p2zm6a3qgj3y5sa065g3qjkybmdzl8r9j4"; - IosevkaSS02 = "0jv9b2jff2v8hqmbnx734x7ncnn83z1azcfmv819saw06wsqig05"; - IosevkaSS03 = "06sy9ml1igw0p167gjb3vwm3b33jd8yh42wjlwsx0vz88220hp78"; - IosevkaSS04 = "0r3rbdcyn3ffqxl3mk0y1r9h77nr8b31fi065p0yfdciqlhas4zn"; - IosevkaSS05 = "042n54596lqir70j19kz8vqpvr6r7kqcsg9b0q679qrsny03brrw"; - IosevkaSS06 = "0wf0b842sh7z7f3x1y6bxz9a7qp207jm4vgdzjba5fq56dzzqv1s"; - IosevkaSS07 = "1qzyvp9g0j3lj05rafll1yaki818a421kl4h2vsgfqks9h4knp3b"; - IosevkaSS08 = "1ypj0vsq94qx1fhsqkpwxwhp0bv1ks1cgg40n4kyk8icjx41c2bv"; - IosevkaSS09 = "1dw6jcmnlxpq9c7429c01nw0v3lb4p3x25vzn63xznwgnxlp3zd0"; - IosevkaSS10 = "1sjzs7hn5r3n85w9rb35v93jdaq86mga2xwfmsalhmw1k5dbdp65"; - IosevkaSS11 = "00a2wkxpqfsy9m2kxp4w91iwyxdacmh2r9gmr10ycp11v0d7q9dy"; - IosevkaSS12 = "0nvx4r7w9kdlgd2js6q6fn1dfcwmfjqln6j5l7cm9kpjxalq4xz7"; - IosevkaSS13 = "1is6qgwjds28ljsc65bnqrm40233qw4w5n6wqkmc689pqh96c5zf"; - IosevkaSS14 = "1p037map2fpn0wrx3jlv6hw84p8jpvv2gm7w9sr1rwfb0sgqj422"; - IosevkaSS15 = "1dd2i5b25a1hzmnq5pan98f4fs8nd98q50jawx3m87xczl0y25ym"; - IosevkaSS16 = "0jvf1p8k8pdakcm0ygmn8c4s1fkay0yjrnnjpz764wh9kmvif2ah"; - IosevkaSS17 = "11529msxvjqgv2m0lh0ydiapwszjhy2bb1kqqvm2k0if42jaw0aq"; - IosevkaSS18 = "1rqg15imhcwfivi0q8gxvk69xszfl3vqbik2a24kkl64ngs8j6ld"; - SGr-Iosevka = "07izlilvkf688jv06myq4iayghsggk8mlqhd52cyyj14y3705hiq"; - SGr-IosevkaCurly = "010w2qczbdjh1p6my2nvq498zwlzk6as70db1m7mphqyzf0pypdq"; - SGr-IosevkaCurlySlab = "0lhav6950vxm0x66xkdqf50gzvh4sznzfd20k2ly58pr1wjnzmgg"; - SGr-IosevkaFixed = "0c6wviqhgxvcaz8lb0f3hwnwqqcjdqxywr2vj91ac7sy5fwn29k0"; - SGr-IosevkaFixedCurly = "0a0hs7lxbgfimn0vcl9yhpsdqm9zdffly9glpbrffr6j5lfzr3hk"; - SGr-IosevkaFixedCurlySlab = "0cpsiv06gpp69c9iv3v095fk181kf1vxv9rzhjs18n7f4l1mvl0f"; - SGr-IosevkaFixedSlab = "18g7bwmiqf6hl8y3c4s9hkr4a99484c470w2j5bimvby1sajj1lh"; - SGr-IosevkaFixedSS01 = "0byi5zp92s3ib18n4jjq1rqh8si58qr853977p8s8xgpwmw0dpv1"; - SGr-IosevkaFixedSS02 = "1vi4zw117id31bmj1v6srfkbmx0a12v7zvbvqww5gq2al51c2wld"; - SGr-IosevkaFixedSS03 = "0p8gaf53qlhrgpk4ycrz0499mzcqndrndhcjim41qmn37pxragdc"; - SGr-IosevkaFixedSS04 = "0y00i5s0csw9ca7r1hajqjdn7ip0ryhrai16h9f901ckxrl8icp0"; - SGr-IosevkaFixedSS05 = "0ncyjv3bap46db2l75w3q3g6gs1z6g4gd2459qs1mh66m4avw9yy"; - SGr-IosevkaFixedSS06 = "0hpkxvybzjwjzk4ran18zhli6cp44dd9dmjsi3qr7cp057sv2nxc"; - SGr-IosevkaFixedSS07 = "17rycr4bbpskzkb134ywa409ylx0hgqy76idxpnp0nzgacrdqw63"; - SGr-IosevkaFixedSS08 = "0na7j1nwwpzigaxbndw4hsgbvr020ljjnpcmp2cw0q6gaw86gzn4"; - SGr-IosevkaFixedSS09 = "06smgacjm7csnjv6105c47mwg7i3gfg4b18hghxy6vwcf7323skk"; - SGr-IosevkaFixedSS10 = "0b053yfmx0jp10cizcdcv9hq1xdbjkzpfasw9dchywj0j4l77i3f"; - SGr-IosevkaFixedSS11 = "16ycvndlmcpasdc9c2mncm6vj221iy2y40ni6kbdz6rlhi88i1cj"; - SGr-IosevkaFixedSS12 = "03sq2i6fhlmljqfk8ji6bkq7kg0iibd7yxxdmsgfrwi9bspfynmv"; - SGr-IosevkaFixedSS13 = "0s6f35px4frf3fkzmq8nrv16h9n55nmm2jwn9h9pfds01wl6y3h3"; - SGr-IosevkaFixedSS14 = "14a92rzj1w50xczpn8gjf2vsd5ms38yg82a9hl32g522b7bmg3si"; - SGr-IosevkaFixedSS15 = "11g9y220djq6nxpzqqjmj9frcxgdxsagkf4rjpi1ldwy6v3jbvqj"; - SGr-IosevkaFixedSS16 = "1ncjmg7fwsgilivpjgfjgsh4giihqzbmf60slwcjkgxhiwq6sk6w"; - SGr-IosevkaFixedSS17 = "0fzxjrdlqxl4y617lwjc8sbvh1azz6wkyfvg3894j82r1s4myn4y"; - SGr-IosevkaFixedSS18 = "111krj392zmx6m0ikmwjcg32j5wx5a4cbjj36l3ksc7cjhpv0vn6"; - SGr-IosevkaSlab = "1z6swxvq3yhslq9sjxgvay5g3bzgip2lf9pqjkbs3pm03qv77ah0"; - SGr-IosevkaSS01 = "1gp768wzc8nxz8b7b65mdiprxwabsr4h7xcz145lw8bkxdcv8c0s"; - SGr-IosevkaSS02 = "0vdvi5fk49lwyyrkyc1qc77ia0jckp64zdqksrqh8y20iyx8z3jd"; - SGr-IosevkaSS03 = "0f2m5283cr76zwzcym4mib9dyhwzyj9ca6zp0marh30fnfyl1pi4"; - SGr-IosevkaSS04 = "1z3wc4v73dc9shzsbjnb732ihkd85m5kfmy3dns6qyqbyn5grsz4"; - SGr-IosevkaSS05 = "1glwqkjg8q6rjigi30r44zlhsg8q1209h4yj0mg0pvlqai802v0l"; - SGr-IosevkaSS06 = "1ysyl05s98g97bwqq1gra8irxxryzm32gwqp5gv6w54407s4gjyr"; - SGr-IosevkaSS07 = "00lxp584ys3ngjqk578szxrgi3pga18r64gl1i72y30c1wmvp29d"; - SGr-IosevkaSS08 = "0pck7kn82g56r245zblbbnn5k7ax5x175hlbb0ib4zd59w59bw07"; - SGr-IosevkaSS09 = "0rhb2hmp7sygwhysazwldxygzmyymrazcprf42impiw87s6z46bx"; - SGr-IosevkaSS10 = "0swy1k8arjxllcx965ln8fjpwyd6h5y5w9i4kdx9x1kac4graki6"; - SGr-IosevkaSS11 = "07c0qmrca6z0vwmfli9ipzjiv84192wq8b15lbn04fn2m1xvbdlr"; - SGr-IosevkaSS12 = "072scbxs85fwv04b77zy0sk3bmy6ql358k4z38vgfhbck1920rdp"; - SGr-IosevkaSS13 = "0cbcjgl209msq1rf5kh9gi9cx49h8wlnrkvwqcabpwg3vfh2y508"; - SGr-IosevkaSS14 = "1sj0hs6wmsngkrkjfp9ki9zpnssqd2xia4n71pwjmc63zydmbpgm"; - SGr-IosevkaSS15 = "1c79zyddjjgmly3ssz75bgn6lg7jmlc1jspq59hxcwcvv2maf4h8"; - SGr-IosevkaSS16 = "1mf7zacqsf0jfr5sn36g6cpmkwkk41lfprcxrvy3xvbmd68kj0ap"; - SGr-IosevkaSS17 = "0fvwj7v338sqh02v8pb7gzz3lw83z7ahqal15ygzjl5xk7f1z51j"; - SGr-IosevkaSS18 = "180ixkl7777v43a9h4iybp8x1iw6jcdiq9p6027ayjxd81hvbd67"; - SGr-IosevkaTerm = "142pq2h18x9mr9myvyx7mdmyw7c658c1pn1z0z6w9k3jy0cmf8cm"; - SGr-IosevkaTermCurly = "1cd0wr51d7470ifzfbk1va2q1daylkd462zag9ilxb0iqha35wfp"; - SGr-IosevkaTermCurlySlab = "0jd3jj5hbq1axn2wa0x19kf059wmac953zd6f02h878lpvcj88hi"; - SGr-IosevkaTermSlab = "07aff9wdh014fnqgl88pwfbd0a7b9qakqy4c6kscplhr4sp7q122"; - SGr-IosevkaTermSS01 = "01i707n4z798y2i7flj9x1rzsdp0fqfxw7cqxyjlczr4s1ydf6a3"; - SGr-IosevkaTermSS02 = "01nq3gxajgfx55gyn302sl44ami26kw0n4fjw8va9xcz812bg472"; - SGr-IosevkaTermSS03 = "1a6v0vvf2z38bxddsaaixyswdx6fyrvmzyhz0v1p82xlzvbpmr83"; - SGr-IosevkaTermSS04 = "1kblkagawachgb70ab4jymbnw28dznh56p8k7cmbi3ixkykfbmn5"; - SGr-IosevkaTermSS05 = "0g3mnxbly3ckwi37cvwywcj4jzp1x1nm759vykk2pkqjimdjgksr"; - SGr-IosevkaTermSS06 = "1jgxp066zns4bh4amlsn4spa5z87x3zfbbwmqx998x98yblqzf16"; - SGr-IosevkaTermSS07 = "1h85lhslc0k6l06zxxc2cgcj8fnpaq31rxkdpx18gxkniy6bqmip"; - SGr-IosevkaTermSS08 = "07q9mjjpnbkfardplx9hps4xf2b08kwrv6m4ws6zqyylvn4mvhlj"; - SGr-IosevkaTermSS09 = "0i8bcqxgw0glgin22nrl80ivvcagw2810b1c23ngjfkv2sfblmnk"; - SGr-IosevkaTermSS10 = "1h031pr83dfc2xjkzfw85k4w3001a5v0gqilwbxz05gnv582k5yf"; - SGr-IosevkaTermSS11 = "04pg8ilnbyzci8jggrzx8kw5k2zj43whl30rllnb0krvfqn82g1m"; - SGr-IosevkaTermSS12 = "18vzqv8l1iyyiq9pfzlw9b02jn73qqqy1b1dhly1qliwdgnzcliy"; - SGr-IosevkaTermSS13 = "0ya3bg29nc4ja7qflfqds00yqqpb9r7dq40hkmdi7qgjj1l681wi"; - SGr-IosevkaTermSS14 = "143mfn7dh7a9vngagq1q3zz5b57rcjznwa62jjivy30rhvnnpxx8"; - SGr-IosevkaTermSS15 = "0xqw8nsjd0wsj0mk5x2b934738fj617451hkb3cymcrhrvbrd4fq"; - SGr-IosevkaTermSS16 = "0lwq7ijc0r64wx3816d97avzrayp77avkv53cqm2ad5bdkink0z5"; - SGr-IosevkaTermSS17 = "09g2r6531g1pw3dpd4s78i8x3d4l78dd25c91hy0xry06dvb0da6"; - SGr-IosevkaTermSS18 = "1lwlc9mj7q7irjx74q3q22gzm52kjk487rsrxih9ijvpw3fdnlvy"; + Iosevka = "1p805i26vf0979k9rgf31634ll6sbyj9xp5mws1gpdpb9xainrzm"; + IosevkaAile = "1qxayq5cs0rf35k3gr8vilpcnnjq41dmldxb3nib178hi1kcagv2"; + IosevkaCurly = "1gbsm9x02mjl61l1xc5jbmqkhj7wgqs5mai9czrs0cqvcxgj2cp1"; + IosevkaCurlySlab = "14fcfspcgf0y7z4bbwvs54s6k82c4bcpj9fyj87ljmsxw2h325rx"; + IosevkaEtoile = "0qkq357kg1a4clbjgr8k2miainrl594jd054wv9igxb0iwjcqj49"; + IosevkaSlab = "1ygw3dn4zz62333bxd1k2zvyh8zmv2lrqybsbnidd654ikq0y2ly"; + IosevkaSS01 = "15j85zp1jqhb07fgl90qnidz8da64nq2r3dw4a337kwqzmgfrbl1"; + IosevkaSS02 = "0snia7xjh6d72ddz6yrzzx2pfx46c7kg2163qsp2b78p046s93ww"; + IosevkaSS03 = "1qg3vwp4ybih6vvbb6qpzh8qvqhc8z985k934vkirk41hp5p9564"; + IosevkaSS04 = "098pncahmhgvfh88m3mfrw7frjslrqly50p2x7qwv9lpz76n18xq"; + IosevkaSS05 = "1grdfghfh1plbcxqfx49vm3c7vkrlafss40cjf7f7j7ykkyx540z"; + IosevkaSS06 = "02qqffsyp2bgf6p4jp1ww1d9c7nj4hzs52psgvh5nnn0kvsxbjnn"; + IosevkaSS07 = "1avb06xsv1mp6lrrdawh6xnwiykh75vhb0364203mzjjj7gir7rw"; + IosevkaSS08 = "024qrzj8rkgwp71dpx7p424kgid1mzb0sbwfrg83i5v158slh65y"; + IosevkaSS09 = "178yc58lq1j42pmyap210cjk2qnqcsvhfdry56p7nd5l8gxik1v1"; + IosevkaSS10 = "0fhz69dhn7g64zyq947m85d73kn0qr2c751aqzrq1rlnbfm4cncs"; + IosevkaSS11 = "0zvf5a9k1mv1mgybqjqx4xcnpq7fni6vgwmr0hnmzcnxzxapmgqk"; + IosevkaSS12 = "1vjx11aalwbsm2vnqn9m695h943h3gln8bdayvv687x4bxj8dnfi"; + IosevkaSS13 = "165ikcmdsjfj30cs6ggsgfl9q0rpl1m4n57c75x8qq1p103yivia"; + IosevkaSS14 = "1iy95jyh7lsvwyc48rqasm9w9wr3rp0w8xvg8jqw3abnqyj30kxs"; + IosevkaSS15 = "0kws1bsyzij6mzf8wl80257an071l6r925mxcdh327scg8hdgq54"; + IosevkaSS16 = "06akd1mgdi9psf6j8ib97k617jilzs1likb3gbx57iqfnxyjfqkj"; + IosevkaSS17 = "08jvlgia29bd5q77j664hfcdd3y29iwy6gnxnxsq6i2ipgwszpr1"; + IosevkaSS18 = "01bp1zlfxrnz4b63d0j0zvdyilwxzb8b7m75yy5a73g7ghpjhf7w"; + SGr-Iosevka = "03zpmihwj1jcvc0q97bhyw8qgccpg8vqbiqw9rf1aaav3rix7jpl"; + SGr-IosevkaCurly = "1zkvih3ifkxf4ijbf9510b55xnp5rh488vqw899aw42sagdakqi3"; + SGr-IosevkaCurlySlab = "019hsqhghyw5njqrm2h20yyrrj8md6aqkfsi2nqdq83q8bs6qvq0"; + SGr-IosevkaFixed = "04g5l10ayvwwa0dhsaccxw2qbxbfyac5gnmlyly52lx126ifnhva"; + SGr-IosevkaFixedCurly = "0cygz3kz0cbjdx1pdig9qgm9z6kclrx96d9g7wiain4xn4i7dayg"; + SGr-IosevkaFixedCurlySlab = "1vdsrkbvdsqls344knqq0carcs3vc1ghhliipr44m7bpcnndavf4"; + SGr-IosevkaFixedSlab = "0hs88kng52iqicdjga0dkvn1b5ih3jsqz6lh7gxwh6qww4crrb84"; + SGr-IosevkaFixedSS01 = "1hllm1bxrdb8l796kkvd6mhr9fnf90qvxrcb815a6q4x1bxmcb47"; + SGr-IosevkaFixedSS02 = "0322ky5cwyk95c1xvgv0ny5jmxbsxzznynmq70p827m16mzakvcv"; + SGr-IosevkaFixedSS03 = "0041lnmv6vycfh7xbi6smr1csywha0ypbyxjk9j9727l16vvy3qp"; + SGr-IosevkaFixedSS04 = "0ybby2x08zzjgnczair43p3ixbk6igi0pfryjqryz9ziyw7ijx1n"; + SGr-IosevkaFixedSS05 = "1zf7q3m7pzf8cy28s4bijipxg9f6yl9dnd18syp2gibbzpvsyi9k"; + SGr-IosevkaFixedSS06 = "0d5gcfydin1a7a4xhsjpqrxk93j5pxc7x8myg0ci36zfcvsy4dg5"; + SGr-IosevkaFixedSS07 = "0lk43klql6046i9clk14fcqr6cn04dvadg8sv2cwr1130b5iz2b3"; + SGr-IosevkaFixedSS08 = "1b10x2fzx0clyflid8sz4lcr8is7rbqlk3jyy201sw0p7bfh9bhz"; + SGr-IosevkaFixedSS09 = "18dkkc4xsnxg0f6zj7hrpp8bybhpvzd0ls7rwyx06v7hcg1nnc7l"; + SGr-IosevkaFixedSS10 = "03s66zgpn7x1y09qymw9pnridcn7gd7mz0m5b2ccdhc1wmb6vihs"; + SGr-IosevkaFixedSS11 = "1xbal92f1wbkj1p3097z1cn5vffgdm2n7aa3ljgmrm5x2612whhj"; + SGr-IosevkaFixedSS12 = "0v34py726vfnrd85bqjr2y61f5rgl4w8w98m0fq18dd9ywjxi83c"; + SGr-IosevkaFixedSS13 = "1zm815hlff4kys0rg2qi5l8ilpqwmiwvy65qfw3rip1gqv04a3pj"; + SGr-IosevkaFixedSS14 = "0bvzsyrazd5cx5gi4i590nr0swwsm26647asxmwcfv0pcafnklqw"; + SGr-IosevkaFixedSS15 = "11cycsdda0dd1vlc5aqsgcpidppgy3fk6dycqxwc7p1cgbdnna60"; + SGr-IosevkaFixedSS16 = "0asqky6by2i102sapdfw8f91k0pbhlfnr150v0vy3181lryqabay"; + SGr-IosevkaFixedSS17 = "0yd58bci0f4sarzs2dshdawq4ki3zrdxghh98l6zzi3dnfwajmnq"; + SGr-IosevkaFixedSS18 = "1r672zk7np5fh934749n86xsxi9vc65bmznqjvhjsrjav3pnzsz1"; + SGr-IosevkaSlab = "061k6bld4jlylgad19xl8fcqh0yh95yi6hd8gmg4m3kpij64rbas"; + SGr-IosevkaSS01 = "195jg3wrcqkx98fjx252r6p3xq9gwhr6pzlp3riwvjpbx3avqmvb"; + SGr-IosevkaSS02 = "0mqhvkhyj9jrx80yh2lrkzpwz15008zs5rkzsimv89jxq0gn3a22"; + SGr-IosevkaSS03 = "0p92824nrkhn64hrc71b3xwl0pfk5h8nchr2kry3h14hgyq29pkf"; + SGr-IosevkaSS04 = "1c310vzl8cjjr1367x84vvp5vf6hn3q67qdaxa0hzsdn0w73w46j"; + SGr-IosevkaSS05 = "08fpvik3pf8zbx4lp3s4dv0w85nwdxfbdh83nh0kznhkpinbmpyn"; + SGr-IosevkaSS06 = "0dzcgn861lbsxcy7z584r6vpyi4y6hm16dm18k9nwgh21z7pr8n8"; + SGr-IosevkaSS07 = "038ldpln3yv5icgk5kd2i2ydw22f18y6qzkff968v1azjkmv60n0"; + SGr-IosevkaSS08 = "0qvj3rkhmpzcfgc26zjgcb36d6c427zgnr8lhwswd10a8dy1632a"; + SGr-IosevkaSS09 = "0c8m8ly03xgwpcyb9mvrjck7xih8qil9pzcrvg6vv4ssvrvr90lw"; + SGr-IosevkaSS10 = "1i168k7qgiawnxly129n6y7idjc14dj9iblgkiq60zy99n0q1b4j"; + SGr-IosevkaSS11 = "1fjxvg3jcx5qphr2ywkly3zdf2vsdjn2macfzkngbhlml79jz9y3"; + SGr-IosevkaSS12 = "1vbwinqpj5ahxgxd5r6rbzhlvx5q3v32bxmwxzw9krd517ra22kw"; + SGr-IosevkaSS13 = "1zzj3nb8739xq4bb7i02r0zlfcyczkq9c7rgxih6hdd4nch75pvi"; + SGr-IosevkaSS14 = "1bvn26mssy61nz1n3g76hbd0amq7cifh2rmdcxzs261wkiym01lw"; + SGr-IosevkaSS15 = "0r6ggg2w1y4l23k8z2dqbv8g3pzikmyi18bfpgnc3k1mbqaaxf76"; + SGr-IosevkaSS16 = "1nn8nk5rl1khw4ximl916ai49d1pa3b3wrsfb1qa51p5swsikf60"; + SGr-IosevkaSS17 = "1vn7s3i6jsv0b8y07ay0sbna7wrwxsk1dyw2h42jswzzv28m0p4c"; + SGr-IosevkaSS18 = "12zm8s4i8fzhfw63bc9smyj38mva8a69qj69sfkac5z81zrmxa8m"; + SGr-IosevkaTerm = "0rawxyhfjdd1xhgwf9f7adm2jqdh81ycc792kfi8vhn7piq1g109"; + SGr-IosevkaTermCurly = "1vrdx9kgy22blcm1ps0lv5snhxc39p6pd70ry6sa4np8swx6h7s3"; + SGr-IosevkaTermCurlySlab = "00hnq7s9bva1kq921gy410z8ld9mzpr09bifimmpm0kf6dr7q8ll"; + SGr-IosevkaTermSlab = "1sgvybj60qvh3wyxi11f6mjvik9d7pc517s387k2vfb66j5q3vvq"; + SGr-IosevkaTermSS01 = "1fg8vslmp3kp7yfr6kwkybmgd5nbyjyhpa6c8h7d5yrl8sghh1jq"; + SGr-IosevkaTermSS02 = "1qgsyh0jh8ik715n880gkfv3k7j2id06wrqbqkwdhlnljybzzvpv"; + SGr-IosevkaTermSS03 = "03ahlzgs0sjbvc9nc53fsavdi3j3ym0pj55d3xqyi3wvn0y6g172"; + SGr-IosevkaTermSS04 = "1b9bhvda2kzwpmsc0k8w44cm18sab3drxpskvb6rc252igd3fzzm"; + SGr-IosevkaTermSS05 = "0gz35z4zvh7afcppkmdc79x534qkpb3wg60gvnsj86v01xhw1whk"; + SGr-IosevkaTermSS06 = "07kg4137y3rzsk5pn1i8qcrr9nw5aqs3xhmikbysp28mlyd93xyr"; + SGr-IosevkaTermSS07 = "047af1c93vm3g3j0nqbav11za143xb638z3sh4hzcngr5jz3avk4"; + SGr-IosevkaTermSS08 = "0qzzxfkhzykmsn6dxf2h0yl1wgfar5i0dhgvdnibp9b54szxk0pk"; + SGr-IosevkaTermSS09 = "1fc0cfrpv6mly75jfzwvdga5rb4y3w088lhiy8wac8a9dq928dpk"; + SGr-IosevkaTermSS10 = "1k3paidjv8213gql5haismbyqsjv41zbflgxp5dk3599raimv8fd"; + SGr-IosevkaTermSS11 = "06nh95dri3y080rc1pvxcli11a1xq15mnpxzlqk9zs9bgx8aw41d"; + SGr-IosevkaTermSS12 = "1wisinglhrqfhpswvyhqfzdmx64mzli7ja96cj2bq0r9ksik09bx"; + SGr-IosevkaTermSS13 = "1xcn4b3cspjqmrpckwi355xhxh2vx7vmiyzvhpjal04zkfv2lqlx"; + SGr-IosevkaTermSS14 = "13s06y17vj1fp07h83d982l684jpg58ln1airxkvf6xb7dgh57yl"; + SGr-IosevkaTermSS15 = "0qwkdsc51ssm0y8qbi9m3m3x0adrlf82h36x77xrap29qkz5liwq"; + SGr-IosevkaTermSS16 = "00py2l35w9kaggrg7xhj333rc3li2lwkl5sblrpjkq98hdwc3m53"; + SGr-IosevkaTermSS17 = "0afa65dq97mq4c2p7vyhpjzbch0ab0sy12qy0a6krrr1q4abbl1b"; + SGr-IosevkaTermSS18 = "1ixy8nxm3n7pgswg5dfsy01fmzq5vg1g4r401f30zyri9f21010k"; } From c87348b2c154df46c16f81630bd61990bb8b1885 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Tue, 14 May 2024 14:20:12 +0900 Subject: [PATCH 066/262] bcc/bpftrace: add missing platforms=linux bcc and bpftrace depend on bpf which is linux-specific --- pkgs/by-name/bc/bcc/package.nix | 1 + pkgs/by-name/bp/bpftrace/package.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index 3cf9b26f4fdd..ae8ab4fcaccb 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -118,5 +118,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://iovisor.github.io/bcc/"; license = licenses.asl20; maintainers = with maintainers; [ ragge mic92 thoughtpolice martinetd ]; + platforms = platforms.linux; }; } diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 068f4532451b..dff13ecab56a 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { mainProgram = "bpftrace"; license = licenses.asl20; maintainers = with maintainers; [ rvl thoughtpolice martinetd mfrw ]; + platforms = platforms.linux; }; } From 27e5b8e6ec24509b457a4332e60793d0e1e7e52c Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 10 May 2024 21:44:12 +0900 Subject: [PATCH 067/262] bcc/bpftrace: use default llvmPackages In practice, that is llvmPackages_16 -> llvmPackages_17. This doesn't seem to bring anything useful, but we shouldn't pull in an older llvm version for no reason as that'll increase system closure size Back when we set a specific version the default linux version was very old and having a more modern version brought in some candies, but it doesn't seem to be as true now clang supports bpf well. Conversely the latest llvm 18 isn't supported yet by the latest release of bpftrace, but it works with bcc's, and bpftrace master also has support so it won't be far behind: the nixos default version shouldn't break, so let's use it. --- pkgs/top-level/all-packages.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32ad40e71986..9298ee38b43a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18318,14 +18318,6 @@ with pkgs; bpftools = callPackage ../os-specific/linux/bpftools { }; - bcc = callPackage ../by-name/bc/bcc/package.nix { - llvmPackages = llvmPackages_16; - }; - - bpftrace = callPackage ../by-name/bp/bpftrace/package.nix { - llvmPackages = llvmPackages_16; - }; - bpm-tools = callPackage ../tools/audio/bpm-tools { }; byacc = callPackage ../development/tools/parsing/byacc { }; From 7388e36a1dfb05db7d3e4fcc0f3389c864772538 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 13:34:56 +0000 Subject: [PATCH 068/262] clickhouse-backup: 2.5.6 -> 2.5.8 --- pkgs/development/tools/database/clickhouse-backup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 1f4764920ca4..46db8d62ffe2 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.5.6"; + version = "2.5.8"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-tX/ttOud6tSsuKhvfwFP3bav+VzSdfVvAdowomQ1YcY="; + hash = "sha256-ZXL7o3rXzX+Ziun00YM7+LD4/IbMyAVYg2N8FXzVUy4="; }; vendorHash = "sha256-ybKCD8mZ8MumKsWicS09E/BW0laAPy1iqA6q8lfczHA="; From 457915bcb1de61a336e1e85d467deebd7a86114a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 15:32:45 +0000 Subject: [PATCH 069/262] spicy-parser-generator: 1.10.0 -> 1.10.1 --- pkgs/development/tools/parsing/spicy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index 7476e57bedff..b24c1abb9766 100644 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "spicy"; - version = "1.10.0"; + version = "1.10.1"; strictDeps = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zeek"; repo = "spicy"; rev = "v${version}"; - hash = "sha256-LFAeZ1UsnOKaXlnSd/cMfJQk0ZfaNAzSbvSuoKmmOoI="; + hash = "sha256-D7DWZDZH3/PFggMxsr+x5S1B6SV5E8xpJoXfGcDelKs="; fetchSubmodules = true; }; From 94bd2eaab36fdb773df7901a5ba59ac550820923 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 20:28:08 +0000 Subject: [PATCH 070/262] pdm: 2.15.1 -> 2.15.2 --- pkgs/tools/package-management/pdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 523d610a9575..f7e39900a98d 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -11,14 +11,14 @@ with python3.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.15.1"; + version = "2.15.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HJzQScEBZjOiPvkuwfx4LaiuB0MULvM/r31Ihy+HSzk="; + hash = "sha256-wI6HB4wpwA562WgdxqI0GdxWF9y+bMIFAk70tOfihHU="; }; nativeBuildInputs = [ From 28be4b7173b43e7720b7ffa677bb6f8cdbf59a18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 21:32:02 +0000 Subject: [PATCH 071/262] python311Packages.pyezviz: 0.2.2.3 -> 0.2.2.4 --- pkgs/development/python-modules/pyezviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 1f3f6662f386..1938063a671a 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.2.3"; + version = "0.2.2.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = "refs/tags/${version}"; - hash = "sha256-HZLWpoo0luAqqwLA3t7cDh0yVP6znrzMoUg7cuexd28="; + hash = "sha256-ngQu9g0qvJ3zDaTdGqJDGRoMhnGYdp5jHDoPiuXOwGs="; }; propagatedBuildInputs = [ From c30c063e22be668152382c7955fd65ae9228863f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 02:18:08 +0000 Subject: [PATCH 072/262] gittyup: 1.3.0 -> 1.4.0 --- pkgs/applications/version-management/gittyup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gittyup/default.nix b/pkgs/applications/version-management/gittyup/default.nix index 822ff838df0c..c035f59666b1 100644 --- a/pkgs/applications/version-management/gittyup/default.nix +++ b/pkgs/applications/version-management/gittyup/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "gittyup"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "Murmele"; repo = "Gittyup"; rev = "gittyup_v${version}"; - hash = "sha256-/8Uipz2R/LuA3KUcFsROOmldIKnCVLfIpIQ9YLpPA+k="; + hash = "sha256-anyjHSF0ZCBJTuqNdH49iwngt3zeJZat5XGDsKbiwPE="; fetchSubmodules = true; }; From 28d0b9899e278cae02d3d2b94603c960037464bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 May 2024 08:53:32 +0200 Subject: [PATCH 073/262] python311Packages.pyezviz: refactor --- pkgs/development/python-modules/pyezviz/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 1938063a671a..eafd6afc5320 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -6,15 +6,16 @@ , pycryptodome , pythonOlder , requests +, setuptools , xmltodict }: buildPythonPackage rec { pname = "pyezviz"; version = "0.2.2.4"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "baqs"; @@ -23,7 +24,11 @@ buildPythonPackage rec { hash = "sha256-ngQu9g0qvJ3zDaTdGqJDGRoMhnGYdp5jHDoPiuXOwGs="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ paho-mqtt pandas pycryptodome @@ -40,10 +45,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for for Ezviz cameras"; - mainProgram = "pyezviz"; homepage = "https://github.com/baqs/pyEzviz/"; changelog = "https://github.com/BaQs/pyEzviz/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "pyezviz"; }; } From ad1468bf958f8bf903dea2910bc3fe96adbf664a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 May 2024 08:54:10 +0200 Subject: [PATCH 074/262] python311Packages.pyezviz: format with nixfmt --- .../python-modules/pyezviz/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index eafd6afc5320..43fd100d7ce0 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, paho-mqtt -, pandas -, pycryptodome -, pythonOlder -, requests -, setuptools -, xmltodict +{ + lib, + buildPythonPackage, + fetchFromGitHub, + paho-mqtt, + pandas, + pycryptodome, + pythonOlder, + requests, + setuptools, + xmltodict, }: buildPythonPackage rec { @@ -24,9 +25,7 @@ buildPythonPackage rec { hash = "sha256-ngQu9g0qvJ3zDaTdGqJDGRoMhnGYdp5jHDoPiuXOwGs="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ paho-mqtt @@ -39,9 +38,7 @@ buildPythonPackage rec { # Project has no tests. test_cam_rtsp.py is more a sample for using the module doCheck = false; - pythonImportsCheck = [ - "pyezviz" - ]; + pythonImportsCheck = [ "pyezviz" ]; meta = with lib; { description = "Python interface for for Ezviz cameras"; From a1e9561f7d2e6ebb49ea0536037de2eb0a4967ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 15:01:55 +0000 Subject: [PATCH 075/262] sdrangel: 7.20.0 -> 7.20.1 --- pkgs/applications/radio/sdrangel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index dd9dda24a7da..639fee520c85 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.20.0"; + version = "7.20.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-sS/ASTMdNJpllHqtmUsG+qBQ77j8IcG6l4g53/Lmcwk="; + hash = "sha256-8v00JiPRCFqg+6wEZw5BrsHMvUYweigbroBHKQGOlHI="; }; nativeBuildInputs = [ From c0b2dd00c240deb4f4b3ac43a1379346542b3cef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 15:05:07 +0000 Subject: [PATCH 076/262] uncrustify: 0.78.1 -> 0.79.0 --- pkgs/development/tools/misc/uncrustify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index a8fef714cada..519580507a6b 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.78.1"; + version = "0.79.0"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "sha256-L+YEVZC7sIDYuCM3xpSfZLjA3B8XsW5hi+zV2NEgXTs="; + sha256 = "sha256-M9LfLWpkMoCNrvnmMhFhfJhyOwbnitjpm7LKay1M0dI="; }; nativeBuildInputs = [ cmake python3 ]; From 561ae8d44c97d4396783f95d89729c6f706cfca8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 15:55:53 +0000 Subject: [PATCH 077/262] linkerd_edge: 24.5.1 -> 24.5.2 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index a2c84cc4ae11..45a96fae6934 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.5.1"; - sha256 = "1l358gmivhpjyibcar8z4c3jlz6rwmlyzki71ar5j2k9irdjzqa3"; - vendorHash = "sha256-sLLgTZN7Zvxkf9J1omh/YGMBUgAtvQD+nbhSuR7/PZg="; + version = "24.5.2"; + sha256 = "06harh6dl90jmcwc3myqaak1dzg4wpbfyra6xvgqc8fj7k4f9w94"; + vendorHash = "sha256-ADxXIkKKhlik70DwDfQG8gNpzkx3zhas34chZ+CLZSQ="; } From 61360370c7db6d6c2d8694bd51d6ea316792b2d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 10:58:45 +0000 Subject: [PATCH 078/262] steampipe: 0.22.2 -> 0.23.1 --- pkgs/by-name/st/steampipe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/steampipe/package.nix b/pkgs/by-name/st/steampipe/package.nix index 1988b593afae..cbe64f835fc5 100644 --- a/pkgs/by-name/st/steampipe/package.nix +++ b/pkgs/by-name/st/steampipe/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "steampipe"; - version = "0.22.2"; + version = "0.23.1"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "refs/tags/v${version}"; - hash = "sha256-wHTuXSjHILlTgWSoaYKjEjQMWEih1EOJX8SIHdfVpU8="; + hash = "sha256-OpZqOEE5lIJOBaDfQFi71XmPqCjJXIYeCaWUFqbcgMc="; }; - vendorHash = "sha256-sN4EbcxZ+XKL0MRqfKwBmv1+WtPj0uKw2HpSGcHI8AE="; + vendorHash = "sha256-KY5mVs+YsyHHtV6DvfwwxcF8K9IQWxlxIJeSyFsKkpc="; proxyVendor = true; postPatch = '' From ac0ccbf8e1d5f7810f410d5fa160691f3fc67616 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 14 May 2024 22:00:17 +0200 Subject: [PATCH 079/262] python3Packages.dropbox: 11.36.2 -> 12.0.0 --- .../python-modules/dropbox/default.nix | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index b090f81da975..fd2813fe9e54 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -6,15 +6,18 @@ , requests , six , stone +, urllib3 , mock , pytest-mock , pytestCheckHook , sphinxHook +, sphinx-rtd-theme +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "dropbox"; - version = "11.36.2"; + version = "12.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +28,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-d++lxsbwPxnz1JPguWkImHXB+GQpMa9Uo3JNIxIe2ok="; + hash = "sha256-0MDm6NB+0vkN8QRSHvuDYEyYhYQWQD4jsctyd5fLdwE="; }; build-system = [ @@ -36,6 +39,7 @@ buildPythonPackage rec { requests six stone + urllib3 ]; nativeCheckInputs = [ @@ -46,7 +50,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'pytest-runner == 5.2.0'," "" + --replace "'pytest-runner==5.2.0'," "" ''; doCheck = true; @@ -55,7 +59,20 @@ buildPythonPackage rec { "dropbox" ]; - nativeBuildInputs = [ sphinxHook ]; + nativeBuildInputs = [ + sphinxHook + sphinx-rtd-theme + pythonRelaxDepsHook + ]; + + # Version 12.0.0 re-introduced Python 2 support and set some very restrictive version bounds + # https://github.com/dropbox/dropbox-sdk-python/commit/75596daf316b4a806f18057e2797a15bdf83cf6d + # This will be the last major version to support Python 2, so version bounds might be more reasonable again in the future. + pythonRelaxDeps = [ + "requests" + "stone" + "urllib3" + ]; # Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value. disabledTests = [ @@ -77,6 +94,8 @@ buildPythonPackage rec { "test_as_user" "test_as_admin" "test_clone_when_team_linked" + "test_bad_pins" + "test_bad_pins_session" ]; meta = with lib; { From 5643058ab7e8bdc0bef7222f63e2564574c4ae6b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 16 May 2024 15:15:14 +0200 Subject: [PATCH 080/262] python3Packages.maestral: relax dropbox dependency --- pkgs/development/python-modules/maestral/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 52c24504174d..b58a764ece10 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -24,6 +24,7 @@ , typing-extensions , watchdog , xattr +, fetchpatch , pytestCheckHook , nixosTests }: @@ -69,6 +70,14 @@ buildPythonPackage rec { rubicon-objc ]; + patches = [ + (fetchpatch { + name = "upgrade-dropbox-version-bounds"; + url = "https://github.com/samschott/maestral/commit/8fd581fa503391534913afbc33a61132ff2e21ce.patch"; + hash = "sha256-2Dke9iF/5Ptsf3CSRHUkjdFRrmdKY+L3sILRMyYrUH0="; + }) + ]; + makeWrapperArgs = [ # Add the installed directories to the python path so the daemon can find them "--prefix PYTHONPATH : ${makePythonPath dependencies}" From 34ced045af8f49eea6ffb5ead7dc0c198e668ddb Mon Sep 17 00:00:00 2001 From: Nydragon <6582485n@proton.me> Date: Fri, 17 May 2024 01:37:53 +0900 Subject: [PATCH 081/262] maintainers: add nydragon --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0c4c9a5a17ac..f25c5727018c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14956,6 +14956,13 @@ github = "nyawox"; githubId = 93813719; }; + nydragon = { + name = "nydragon"; + github = "nydragon"; + email = "nix@ccnlc.eu"; + githubId = 56591727; + keys = [ { fingerprint = "25FF 8464 F062 7EC0 0129 6A43 14AA 30A8 65EA 1209"; } ]; + }; nzbr = { email = "nixos@nzbr.de"; github = "nzbr"; From b8586717f5051add66a978f27a2073e3ad86d5ac Mon Sep 17 00:00:00 2001 From: Nydragon <6582485n@proton.me> Date: Fri, 17 May 2024 01:39:00 +0900 Subject: [PATCH 082/262] rofi-obsidian: init at 0.1.0 rofi-obsidian is a rofi plugin that allows opening vaults from rofi --- pkgs/by-name/ro/rofi-obsidian/package.nix | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/by-name/ro/rofi-obsidian/package.nix diff --git a/pkgs/by-name/ro/rofi-obsidian/package.nix b/pkgs/by-name/ro/rofi-obsidian/package.nix new file mode 100644 index 000000000000..5ab8d19be5f6 --- /dev/null +++ b/pkgs/by-name/ro/rofi-obsidian/package.nix @@ -0,0 +1,26 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage { + pname = "rofi-obsidian"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "Nydragon"; + repo = "rofi-obsidian"; + rev = "c8f34e424a59b8a15bc77152462d59cfff7fc20e"; + hash = "sha256-t/neFiLdrA37jknLEsHmWhCug5BS40HgQpQ5a1svtQw="; + }; + + cargoHash = "sha256-Eikzn7ZMsrujBdzmsiHGSYAJ+kGBgQAaiVJzixHknWM="; + + meta = { + description = "Launch your Obsidian vaults from the comfort of rofi"; + homepage = "https://github.com/Nydragon/rofi-obsidian"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ nydragon ]; + mainProgram = "rofi-obsidian"; + }; +} From 6b5dd4d5a4da6c23e266c671d39432cfa912d697 Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 16 May 2024 14:31:21 -0300 Subject: [PATCH 083/262] collision: add update script Signed-off-by: lucasew --- pkgs/applications/misc/collision/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix index f550e48ba954..45185a39697c 100644 --- a/pkgs/applications/misc/collision/default.nix +++ b/pkgs/applications/misc/collision/default.nix @@ -10,6 +10,11 @@ , openssl , libxml2 , pkg-config +, gitUpdater +, _experimental-update-script-combinators +, runCommand +, crystal2nix +, writeShellScript }: crystal.buildCrystalPackage rec { pname = "Collision"; @@ -40,6 +45,18 @@ crystal.buildCrystalPackage rec { installTargets = ["desktop" "install"]; + passthru = { + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { rev-prefix = "v"; }) + (_experimental-update-script-combinators.copyAttrOutputToFile "collision.shardLock" ./shard.lock) + { command = [ (writeShellScript "update-lock" "cd $1; ${lib.getExe crystal2nix}") ./. ]; supportedFeatures = [ "silent" ]; } + { command = [ "rm" ./shard.lock ]; supportedFeatures = [ "silent" ]; } + ]; + shardLock = runCommand "shard.lock" { inherit src; } '' + cp $src/shard.lock $out + ''; + }; + meta = with lib; { description = "Check hashes for your files"; homepage = "https://github.com/GeopJr/Collision"; From 5403ba0c3c249b8da4a36e284b3f5d701a09a995 Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 16 May 2024 15:05:41 -0300 Subject: [PATCH 084/262] collision: 3.6.0 -> 3.8.0 Signed-off-by: lucasew --- pkgs/applications/misc/collision/default.nix | 4 ++-- pkgs/applications/misc/collision/shards.nix | 25 ++++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix index 45185a39697c..b86053932a86 100644 --- a/pkgs/applications/misc/collision/default.nix +++ b/pkgs/applications/misc/collision/default.nix @@ -18,13 +18,13 @@ }: crystal.buildCrystalPackage rec { pname = "Collision"; - version = "3.6.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Collision"; rev = "v${version}"; - hash = "sha256-Qxe4ILDdfYfxu95EvKRTvkAOgDIZDiLymBlZouBWn0M="; + hash = "sha256-Bo/u0UYM/N7tLqdCs2OU5pdj2s9LXPooSR1PCGk9dSc="; }; patches = [ ./make.patch ]; shardsFile = ./shards.nix; diff --git a/pkgs/applications/misc/collision/shards.nix b/pkgs/applications/misc/collision/shards.nix index e7e93781eb68..e1b6032d5932 100644 --- a/pkgs/applications/misc/collision/shards.nix +++ b/pkgs/applications/misc/collision/shards.nix @@ -1,18 +1,23 @@ { + blake3 = { + url = "https://github.com/geopjr/blake3.cr.git"; + rev = "v1.3.0"; + sha256 = "0pc3h7b5gfkmxlw708qaqjfzjvv5ig3iwxxainq6pwfhpff4a5wd"; + }; gettext = { url = "https://github.com/geopjr/gettext.cr.git"; rev = "v1.0.0"; sha256 = "1y27m4170rr4532j56grzhwbz8hj6z7j3zfkd0jnfwnsxclks1kc"; }; - gio = { - url = "https://github.com/hugopl/gio.cr.git"; - rev = "v0.1.0"; - sha256 = "0vj35bi64d4hni18nrl8fmms306a0gl4zlxpf3aq08lh0sbwzhd8"; + gi-crystal = { + url = "https://github.com/hugopl/gi-crystal.git"; + rev = "v0.22.2"; + sha256 = "0bpa1f8iaf97z2kbgjc7nc8km7nd7bppiwna319lm2hvm8m5pw15"; }; gtk4 = { url = "https://github.com/hugopl/gtk4.cr.git"; - rev = "v0.15.0"; - sha256 = "100j5k4sfc2dpj3nplzjcaxw1bwy3hsy5cw93asg00kda9h8dbb1"; + rev = "v0.16.1"; + sha256 = "1cqkbh072y70l8g0p040vf50k920p32ry1larnwn9mqabd74jwaj"; }; harfbuzz = { url = "https://github.com/hugopl/harfbuzz.cr.git"; @@ -26,12 +31,12 @@ }; non-blocking-spawn = { url = "https://github.com/geopjr/non-blocking-spawn.git"; - rev = "v1.0.5"; - sha256 = "139gr87zlw0k9kf6pf9k2d88aa9x3kcnfg34qpbqrwsrck7708za"; + rev = "v1.1.0"; + sha256 = "1h43gskannylaai4dz2sjb6rds2h6slm1krg88inan12silhp66c"; }; pango = { url = "https://github.com/hugopl/pango.cr.git"; - rev = "v0.2.0"; - sha256 = "0dl3qrhi2ybylmvzx1x5gsznp2pcdkc50waxrljxwnf5avn8ixsf"; + rev = "v0.3.1"; + sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv"; }; } From b4c133a87402c57471faf31c693ba08a983077d1 Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 16 May 2024 16:23:09 -0300 Subject: [PATCH 085/262] gi-crystal: add update script Signed-off-by: lucasew --- pkgs/development/tools/gi-crystal/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/gi-crystal/default.nix b/pkgs/development/tools/gi-crystal/default.nix index 8b664ee1e00f..91e50e939555 100644 --- a/pkgs/development/tools/gi-crystal/default.nix +++ b/pkgs/development/tools/gi-crystal/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , crystal , gobject-introspection +, gitUpdater }: crystal.buildCrystalPackage rec { pname = "gi-crystal"; @@ -33,6 +34,11 @@ crystal.buildCrystalPackage rec { runHook postInstall ''; + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { description = "GI Crystal is a binding generator used to generate Crystal bindings for GObject based libraries using GObject Introspection."; homepage = "https://github.com/hugopl/gi-crystal"; From e61cccb266e35c05dbd23c0c1b2a552163f2064c Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 16 May 2024 16:37:33 -0300 Subject: [PATCH 086/262] gi-crystal: 0.21.0 -> 0.22.2 Signed-off-by: lucasew --- pkgs/development/tools/gi-crystal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gi-crystal/default.nix b/pkgs/development/tools/gi-crystal/default.nix index 91e50e939555..395efaa74241 100644 --- a/pkgs/development/tools/gi-crystal/default.nix +++ b/pkgs/development/tools/gi-crystal/default.nix @@ -6,13 +6,13 @@ }: crystal.buildCrystalPackage rec { pname = "gi-crystal"; - version = "0.21.0"; + version = "0.22.2"; src = fetchFromGitHub { owner = "hugopl"; repo = "gi-crystal"; rev = "v${version}"; - hash = "sha256-hL+4MvJn1z9UKCtyvU4zzIxOwRyYQ3Qt4qRb5F0J+sg="; + hash = "sha256-JfBbKqobikpTGMryeO86zZ46EbOHybem+Cc5FZEL6i4="; }; # Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path From bb146ade88ddccbaf64ef83c4dbace7596756940 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sat, 4 May 2024 20:16:23 +0300 Subject: [PATCH 087/262] hyprwayland-scanner: init at 0.3.7 --- .../hy/hyprwayland-scanner/package.nix | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/hy/hyprwayland-scanner/package.nix diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix new file mode 100644 index 000000000000..fc9fb5a820a0 --- /dev/null +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, pugixml +, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "hyprwayland-scanner"; + version = "0.3.7"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprwayland-scanner"; + rev = "v${finalAttrs.version}"; + hash = "sha256-BPc9FdIzQAmP1JnYGfr+3O30Yp1BywUvKUz57ZOZ39A="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + pugixml + ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/hyprwm/hyprwayland-scanner"; + description = "A Hyprland version of wayland-scanner in and for C++"; + license = licenses.bsd3; + maintainers = with maintainers; [ fufexan ]; + mainProgram = "hyprwayland-scanner"; + platforms = platforms.linux; + }; +}) From 23d1b8e4fececf2c83875812c0920c3ecd933976 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sat, 4 May 2024 20:22:03 +0300 Subject: [PATCH 088/262] hyprland: 0.39.1 -> 0.40.0-unstable-2024-05-12 --- .../hyprwm/hyprland/default.nix | 62 +++++++++++-------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index 3a2920785fcd..6a2721b8dab9 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -8,27 +8,29 @@ , ninja , binutils , cairo +, epoll-shim , git , hyprcursor , hyprland-protocols , hyprlang +, hyprwayland-scanner , jq , libGL , libdrm , libexecinfo , libinput -, libxcb +, libuuid , libxkbcommon , mesa , pango , pciutils +, pkgconf , python3 , systemd , tomlplusplus , wayland , wayland-protocols , wayland-scanner -, xcbutilwm , xwayland , hwdata , seatd @@ -51,30 +53,28 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.39.1"; + version = "0.40.0-unstable-2024-05-12"; + src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; fetchSubmodules = true; - rev = "v${finalAttrs.version}"; - hash = "sha256-7L5rqQRYH2iyyP5g3IdXJSlATfgnKhuYMf65E48MVKw="; + rev = "2ccd45a84475fab46c6fecd2fe226d3173104743"; + hash = "sha256-nBCQuRl4sS/G/OUS+txeelFShBEgSk2OrN6kBYMHuOg="; }; postPatch = '' # Fix hardcoded paths to /usr installation sed -i "s#/usr#$out#" src/render/OpenGL.cpp - # Generate version.h - cp src/version.h.in src/version.h - substituteInPlace src/version.h \ - --replace-fail "@HASH@" '${finalAttrs.src.rev}' \ - --replace-fail "@BRANCH@" "" \ - --replace-fail "@MESSAGE@" "" \ - --replace-fail "@DATE@" "2024-04-16" \ - --replace-fail "@TAG@" "" \ - --replace-fail "@DIRTY@" "" + # Remove extra @PREFIX@ to fix pkg-config paths + sed -i "s#@PREFIX@/##g" hyprland.pc.in ''; + # used by version.sh + DATE = "2024-05-12"; + HASH = finalAttrs.src.rev; + depsBuildBuild = [ # to find wayland-scanner when cross-compiling pkg-config @@ -82,14 +82,15 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ hwdata + hyprwayland-scanner jq makeWrapper - meson + cmake + meson # for wlroots ninja pkg-config wayland-scanner - cmake # for subproject udis86 - python3 + python3 # for udis86 ]; outputs = [ @@ -107,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { libGL libdrm libinput + libuuid libxkbcommon mesa wayland @@ -121,27 +123,33 @@ stdenv.mkDerivation (finalAttrs: { xorg.xcbutilerrors xorg.xcbutilrenderutil ] + ++ lib.optionals stdenv.hostPlatform.isBSD [ epoll-shim ] ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ] - ++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ] + ++ lib.optionals enableXWayland [ + xorg.libxcb + xorg.libXdmcp + xorg.xcbutil + xorg.xcbutilwm + xwayland + ] ++ lib.optionals withSystemd [ systemd ]; - mesonBuildType = + cmakeBuildType = if debug - then "debug" - else "release"; + then "Debug" + else "RelWithDebInfo"; - mesonAutoFeatures = "enabled"; - mesonFlags = [ - (lib.mesonEnable "xwayland" enableXWayland) - (lib.mesonEnable "legacy_renderer" legacyRenderer) - (lib.mesonEnable "systemd" withSystemd) + cmakeFlags = [ + (lib.cmakeBool "NO_XWAYLAND" (!enableXWayland)) + (lib.cmakeBool "LEGACY_RENDERER" legacyRenderer) + (lib.cmakeBool "NO_SYSTEMD" (!withSystemd)) ]; postInstall = '' ${lib.optionalString wrapRuntimeDeps '' wrapProgram $out/bin/Hyprland \ - --suffix PATH : ${lib.makeBinPath [binutils pciutils stdenv.cc]} + --suffix PATH : ${lib.makeBinPath [binutils pciutils pkgconf]} ''} ''; From 40e4612308fa2c2cd552833e7a6eb1f8e3075d05 Mon Sep 17 00:00:00 2001 From: Forden <24463229+Forden@users.noreply.github.com> Date: Fri, 17 May 2024 06:40:27 +0300 Subject: [PATCH 089/262] telegram-bot-api: 5.7 -> 7.3 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/servers/telegram-bot-api/default.nix | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6755910f1a8f..109b16c401cd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6839,6 +6839,12 @@ fingerprint = "B722 6464 838F 8BDB 2BEA C8C8 5B0E FDDF BA81 6105"; }]; }; + Forden = { + email = "forden@zuku.tech"; + github = "Forden"; + githubId = 24463229; + name = "Forden"; + }; forkk = { email = "forkk@forkk.net"; github = "Forkk"; diff --git a/pkgs/servers/telegram-bot-api/default.nix b/pkgs/servers/telegram-bot-api/default.nix index d8dc668fb69b..3481b853715d 100644 --- a/pkgs/servers/telegram-bot-api/default.nix +++ b/pkgs/servers/telegram-bot-api/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "telegram-bot-api"; - version = "5.7"; + version = "7.3"; src = fetchFromGitHub { repo = "telegram-bot-api"; owner = "tdlib"; - rev = "c57b04c4c8c4e8d8bb6fdd0bd3bfb5b93b9d8f05"; - sha256 = "sha256-WetzX8GBdwQAnnZjek+W4v+QN1aUFdlvs+Jv6n1B+eY="; + rev = "5951bfbab8b1274437c613c1c48d91be2a050371"; + hash = "sha256-5aNZqP4K+zP7q1+yllr6fysEcewhh/V9Vl6GXQolanI="; fetchSubmodules = true; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { description = "Telegram Bot API server"; homepage = "https://github.com/tdlib/telegram-bot-api"; license = licenses.boost; - maintainers = with maintainers; [ Anillc ]; + maintainers = with maintainers; [ Anillc Forden ]; platforms = platforms.all; mainProgram = "telegram-bot-api"; }; From 70344cbb4e5323c53307e1ed392052b503fedb42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 04:25:30 +0000 Subject: [PATCH 090/262] metabase: 0.49.9 -> 0.49.11 --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 79dd808eab29..b68625058a22 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.49.9"; + version = "0.49.11"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-1QUrXYpMvn/Gm8ljmF5MYKFRCIQ/v3vpoMJEJcSR2vI="; + hash = "sha256-sLQdIjj2bB4Kebwn2fi6mwz2zym/Sv5l42dWAz5DrAg="; }; nativeBuildInputs = [ makeWrapper ]; From 02bae3fa47b6211453ba4ea4e066ffebe3c58176 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 07:56:45 +0000 Subject: [PATCH 091/262] arti: 1.2.2 -> 1.2.3 --- pkgs/tools/security/arti/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index 0ad27f3d08ab..0dfd7c612292 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - hash = "sha256-DicOkh2yv6qbxf1x4fAZq34qtuD/T4twn8JMnI9XGCI="; + hash = "sha256-1+Wt2qhwYrkU50lGuL55UnCpFF+ROV2fzFwFDP1eHjo="; }; - cargoHash = "sha256-ICJMcFTIHFLxB5XJeMRi1M6e9p0nKwT3vbqAZT22vmU="; + cargoHash = "sha256-vuEs1mtrn4fXwBpvPsQr3z6hTAlggVsPUK3ZZ2DmhEs="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 51f8375daaaf40d3fe80d18883335b50c234d405 Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Fri, 3 May 2024 17:24:06 +0200 Subject: [PATCH 092/262] linux/hardened/update.py: fix removal of unsupported versions The update script notices when a version is no longer supported, but fails to actually remove it from the json file. This commit fixes that. --- pkgs/os-specific/linux/kernel/hardened/update.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py index cb624ebe86b9..1e34ca209aa9 100755 --- a/pkgs/os-specific/linux/kernel/hardened/update.py +++ b/pkgs/os-specific/linux/kernel/hardened/update.py @@ -211,6 +211,7 @@ with open(NIXPKGS_KERNEL_PATH / "kernels-org.json") as kernel_versions_json: # Remove patches for unpackaged kernel versions. for kernel_key in sorted(patches.keys() - kernel_versions.keys()): + del patches[kernel_key] commit_patches(kernel_key=kernel_key, message="remove") g = Github(os.environ.get("GITHUB_TOKEN")) From 20d3726e69c69788a5480d6c6ec6eb9922f348ed Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Fri, 3 May 2024 16:41:46 +0200 Subject: [PATCH 093/262] linux/hardened/patches/6.5: remove --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 21772b2e03eb..1a07e938b054 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -49,16 +49,6 @@ "sha256": "0arl96yrqplbmp2gjyqcfma1lgc30kbn95m0sflv0yyldwf8dg8f", "version": "6.1.81" }, - "6.5": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-6.5.13-hardened1.patch", - "sha256": "1fj6yaq2gdjlj2h19vkm13jrx0yiczj6pvric1kq1r6cprqrkkki", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.13-hardened1/linux-hardened-6.5.13-hardened1.patch" - }, - "sha256": "1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq", - "version": "6.5.13" - }, "6.6": { "patch": { "extra": "-hardened1", From e7ef48f1c959efb2bdd1983f40a1df7af2483c9c Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Fri, 3 May 2024 16:41:46 +0200 Subject: [PATCH 094/262] linux/hardened/patches/6.7: remove --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 1a07e938b054..450f3a987514 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -58,15 +58,5 @@ }, "sha256": "0mz420w99agr7jv1jgqfr4fjhzbv005xif086sqx556s900l62zf", "version": "6.6.21" - }, - "6.7": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-6.7.6-hardened1.patch", - "sha256": "063yrs3g0knlz37aq979jhng9k6l19873nbi1jy167xfqmpqqajr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.7.6-hardened1/linux-hardened-6.7.6-hardened1.patch" - }, - "sha256": "1lrp7pwnxnqyy8c2l4n4nz997039gbnssrfm8ss8kl3h2c7fr2g4", - "version": "6.7.6" } } From ebb4cee09a7132e8f128812e70fac00e2d34d48e Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Fri, 3 May 2024 16:49:13 +0200 Subject: [PATCH 095/262] linux/hardened/patches/4.19: 4.19.309-hardened1 -> 4.19.313-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 450f3a987514..2f54f17bde1b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.309-hardened1.patch", - "sha256": "1hww72w5anmfr9czqbl31glzl70s34492k9qz9zax141zg1sf6sp", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.309-hardened1/linux-hardened-4.19.309-hardened1.patch" + "name": "linux-hardened-4.19.313-hardened1.patch", + "sha256": "1fa30s98cbk64315y7vwz7pc2ba0rcs2msaiiib8p85kid5c80v8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.313-hardened1/linux-hardened-4.19.313-hardened1.patch" }, - "sha256": "1yc45kfiwdqsqa11sxafs82b0day6qvgjcll8rx9vipidsmagbcm", - "version": "4.19.309" + "sha256": "1j1r4mrdh1ray468jr5i8d2afiswb653bhq0ck8bcdw4rwp5w558", + "version": "4.19.313" }, "5.10": { "patch": { From fe675127b8119887ed7814e3891680b6b4e64cc1 Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Fri, 3 May 2024 16:55:08 +0200 Subject: [PATCH 096/262] linux/hardened/patches/5.10: 5.10.212-hardened1 -> 5.10.216-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 2f54f17bde1b..cdeeac93f875 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.212-hardened1.patch", - "sha256": "0h04i94vshhcli5m4qpnqg4vsi5v1ifvdhhklk7c0bvkfk35cbml", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.212-hardened1/linux-hardened-5.10.212-hardened1.patch" + "name": "linux-hardened-5.10.216-hardened1.patch", + "sha256": "1hj59x5wrh8bkgxp1f5sh8h5rirh4878gywanjmf7qjq6w2wj5rh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.216-hardened1/linux-hardened-5.10.216-hardened1.patch" }, - "sha256": "14vll2bghd52wngjxy78hgglydcxka59yziji0w56dcdpmky9wqc", - "version": "5.10.212" + "sha256": "0lg1zfb9y4ps86q85mlnyalb3s90zix003z62jb9bw139f65h473", + "version": "5.10.216" }, "5.15": { "patch": { From e6bd80ecd76e44db1df7a7a083537b19f9357285 Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Fri, 3 May 2024 16:59:47 +0200 Subject: [PATCH 097/262] linux/hardened/patches/5.15: 5.15.151-hardened1 -> 5.15.158-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cdeeac93f875..0a03529d1a06 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.151-hardened1.patch", - "sha256": "040jc5n9qsdz2wv5ksfvc28vd72nmya2i2f0ps0jiras6l2wlhjz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.151-hardened1/linux-hardened-5.15.151-hardened1.patch" + "name": "linux-hardened-5.15.158-hardened1.patch", + "sha256": "1q37hdac1mk91rrl2p3j4d69wiphzm1mfbvl6cxlsrc42pjbapz3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.158-hardened1/linux-hardened-5.15.158-hardened1.patch" }, - "sha256": "0jby224ncdardjwmf8c59s5j71inpvdlzah984ilf2b6y85pc7la", - "version": "5.15.151" + "sha256": "1inmdpif3qf1blmvjj4i7y42bylvhv0wyj3b0apq12zxlj1iq1zr", + "version": "5.15.158" }, "5.4": { "patch": { From 701f2be88ba7b5338c605e0b63ca650af78ae42b Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Fri, 3 May 2024 17:05:27 +0200 Subject: [PATCH 098/262] linux/hardened/patches/5.4: 5.4.271-hardened1 -> 5.4.275-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0a03529d1a06..24b8057bd938 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.271-hardened1.patch", - "sha256": "0rw5il7885d0d3k2hmh46541svib6rp32g00fcl5bw37ydmq3z8b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.271-hardened1/linux-hardened-5.4.271-hardened1.patch" + "name": "linux-hardened-5.4.275-hardened1.patch", + "sha256": "10fw4hkavnj6nhjqz186sqxbvjz6g62mhyjmlnlxik322nbh6jk6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.275-hardened1/linux-hardened-5.4.275-hardened1.patch" }, - "sha256": "0l2qv4xlhnry9crs90rkihsxyny6jz8kxw08bfad7nys9hrn3g6d", - "version": "5.4.271" + "sha256": "0k1hyknx854k8z27j4rq1gcp8l0xc0bspmrhc41a033gjilb1lns", + "version": "5.4.275" }, "6.1": { "patch": { From 369e4a47d54fc54bade9c7659b6fb7395813aa0f Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Fri, 3 May 2024 17:10:25 +0200 Subject: [PATCH 099/262] linux/hardened/patches/6.1: 6.1.81-hardened1 -> 6.1.90-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 24b8057bd938..0c45f4d2b94a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.81-hardened1.patch", - "sha256": "0af9dxdsa858zyqc0vsrzg098afhg5vpb2wpr6gj2ykwc13iaf07", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.81-hardened1/linux-hardened-6.1.81-hardened1.patch" + "name": "linux-hardened-6.1.90-hardened1.patch", + "sha256": "1wjckrv0p7phai6ian39kl0rpmzvrzz10bi92xgdq8hhsbp2p3fk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.90-hardened1/linux-hardened-6.1.90-hardened1.patch" }, - "sha256": "0arl96yrqplbmp2gjyqcfma1lgc30kbn95m0sflv0yyldwf8dg8f", - "version": "6.1.81" + "sha256": "07cfg0chssvpc4mqls3aln6s4lqjp6k4x2n63wndmkjgfqpdg8w3", + "version": "6.1.90" }, "6.6": { "patch": { From bfc799a97c721d73f90bddec09aefb9158f1ae7b Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Fri, 3 May 2024 17:18:09 +0200 Subject: [PATCH 100/262] linux/hardened/patches/6.6: 6.6.21-hardened1 -> 6.6.30-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0c45f4d2b94a..fc5d6f00e865 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.6.21-hardened1.patch", - "sha256": "0k35s5pj92lvfp6kw3isg78zc3gijsg0xbzcyvxdkmhzaq8j6i1i", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.21-hardened1/linux-hardened-6.6.21-hardened1.patch" + "name": "linux-hardened-6.6.30-hardened1.patch", + "sha256": "0q6x7prx1ncf3ni5zvpjav9jcq1n50fq0wcarw022bis1rmrhczy", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.30-hardened1/linux-hardened-6.6.30-hardened1.patch" }, - "sha256": "0mz420w99agr7jv1jgqfr4fjhzbv005xif086sqx556s900l62zf", - "version": "6.6.21" + "sha256": "1ilwmgpgvddwkd9nx5999cb6z18scjyq7jklid26k1hg7f35nsmn", + "version": "6.6.30" } } From 87ced8185dc2f95be511390545600f7851b102d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 09:03:37 +0000 Subject: [PATCH 101/262] opera: 109.0.5097.80 -> 110.0.5130.23 --- pkgs/applications/networking/browsers/opera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index fc80fd76c102..7c8ebe80a27a 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "109.0.5097.80"; + version = "110.0.5130.23"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-3NSinITYisulR5rNhSnwQC3D9pKWj4SdBtFt/9OgCvo="; + hash = "sha256-Y1YmTUvXHOXBB5Mei8lX0DCoEkOmgVCPtT1GnTqNTtA="; }; unpackPhase = "dpkg-deb -x $src ."; From fd070d7e5846fd03da85c7d469ad76671f229bce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 11:37:20 +0000 Subject: [PATCH 102/262] tutanota-desktop: 227.240502.0 -> 229.240514.1 --- .../networking/mailreaders/tutanota-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 44597be716a7..c9bbe06a9ea6 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -5,11 +5,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "227.240502.0"; + version = "229.240514.1"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-D7qWwIFuCJmBvfdgf4Dsd2/jvi39tbAttaHOwLND4DY="; + hash = "sha256-wUxg6Gu8jjV+EEvD9nt38BU5J3qoByvj+sUkilk4voc="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; From d66286f6880cff3c158cc3bea10f54ab2735a32e Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Tue, 14 May 2024 17:51:44 -0400 Subject: [PATCH 103/262] maintainers: add cameronraysmith Signed-off-by: Cameron Smith --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c93cfcef80e0..dd2f7c1ec3f2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3199,6 +3199,16 @@ githubId = 3212452; name = "Cameron Nemo"; }; + cameronraysmith = { + email = "cameronraysmith@gmail.com"; + matrix = "@cameronraysmith:matrix.org"; + github = "cameronraysmith"; + githubId = 420942; + name = "Cameron Smith"; + keys = [{ + fingerprint = "3F14 C258 856E 88AE E0F9 661E FF04 3B36 8811 DD1C"; + }]; + }; camillemndn = { email = "camillemondon@free.fr"; github = "camillemndn"; From 737fe266b6037023846f911f30530ea0bbd256a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 14:23:54 +0000 Subject: [PATCH 104/262] eksctl: 0.176.0 -> 0.177.0 --- pkgs/by-name/ek/eksctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index b749c561eeac..e012e298dbe0 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.176.0"; + version = "0.177.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-snxpAHxej/RySdC0k1r/4UZx+yUNVOTVb37xDrxpJKY="; + hash = "sha256-rNs7Ko+NNO2/zqPRu4j+y7KJ62lvfTEndZEnBSi8K5I="; }; - vendorHash = "sha256-aDv9ZV3v94pIpUYQaREPellHBo9sxrAKUIYqJzBSWXA="; + vendorHash = "sha256-0ZEVOsfb4FBGhNk7CoP7KDhApPTLBz4l5kwcRRBIq5g="; doCheck = false; From 33589b279ef16c1e756017c681a210ab6e8d7a6f Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Thu, 16 May 2024 22:29:45 +0200 Subject: [PATCH 105/262] material-symbols: unstable-2023-11-17 -> 4.0.0-unstable-2024-05-17 --- pkgs/data/fonts/material-symbols/default.nix | 28 ++++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/material-symbols/default.nix b/pkgs/data/fonts/material-symbols/default.nix index b40f3c37cc61..8af5fa9d0d24 100644 --- a/pkgs/data/fonts/material-symbols/default.nix +++ b/pkgs/data/fonts/material-symbols/default.nix @@ -1,18 +1,19 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, rename +{ + lib, + stdenvNoCC, + fetchFromGitHub, + rename, + unstableGitUpdater, }: - stdenvNoCC.mkDerivation { pname = "material-symbols"; - version = "unstable-2023-11-17"; + version = "4.0.0-unstable-2024-05-17"; src = fetchFromGitHub { owner = "google"; repo = "material-design-icons"; - rev = "a90037f80d7db37279a7c1d863559e247ed81b05"; - hash = "sha256-96nEvc9eBuAncPUun3JBeg+KW2GqT3mQNgdOCVdhEM0="; + rev = "ace1af08508a6562ef05055a606cf44ea583ce3b"; + hash = "sha256-d5lojgYCXCcvcSfLWfcSKFsBGKB6Si/XreRqpkEKsa0="; sparseCheckout = [ "variablefont" ]; }; @@ -28,12 +29,17 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - meta = with lib; { + passthru.updateScript = unstableGitUpdater { }; + + meta = { description = "Material Symbols icons by Google"; homepage = "https://fonts.google.com/icons"; downloadPage = "https://github.com/google/material-design-icons"; license = lib.licenses.asl20; - maintainers = with maintainers; [ fufexan ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ + fufexan + luftmensch-luftmensch + ]; + platforms = lib.platforms.all; }; } From 54c34369ab8988a1e919739c0a2d2d841580e636 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 15:18:12 +0000 Subject: [PATCH 106/262] ugs: 2.1.6 -> 2.1.7 --- pkgs/tools/misc/ugs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ugs/default.nix b/pkgs/tools/misc/ugs/default.nix index 2a3eea73c07f..cb1033123df1 100644 --- a/pkgs/tools/misc/ugs/default.nix +++ b/pkgs/tools/misc/ugs/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "ugs"; - version = "2.1.6"; + version = "2.1.7"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; - hash = "sha256-6L/4s/QmlTnYnhwLgPf7z8UVkBUYXi3Wb3doa5JCViE="; + hash = "sha256-HxaFGa7UG7dWtVKTLDRbhY7UCWeA6E50txz45bjb5uE="; }; dontUnpack = true; From 65b67768c1e321636b47bf22ee9d082a9a472d07 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Fri, 17 May 2024 17:35:08 +0200 Subject: [PATCH 107/262] cargo-features-manager: init at 0.8.0 --- .../ca/cargo-features-manager/package.nix | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/ca/cargo-features-manager/package.nix diff --git a/pkgs/by-name/ca/cargo-features-manager/package.nix b/pkgs/by-name/ca/cargo-features-manager/package.nix new file mode 100644 index 000000000000..3d8947ce3031 --- /dev/null +++ b/pkgs/by-name/ca/cargo-features-manager/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage rec { + pname = "cargo-features-manager"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "ToBinio"; + repo = "cargo-features-manager"; + rev = "v${version}"; + hash = "sha256-ez8WIDHV6/f0Kk6cvzB25LoYBPT+JTzmOWrSxXXzpBc="; + }; + + cargoHash = "sha256-G1MBH4c9b/h87QgCleTMnndjWc70KZI+6W4KWaxk28o="; + + meta = { + description = "A command-line tool for managing Architectural Decision Records"; + homepage = "https://github.com/ToBinio/cargo-features-manager"; + changelog = "https://github.com/ToBinio/cargo-features-manager/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + mainProgram = "cargo-features-manager"; + }; +} From ddbf20ac62396461016acadb9a9abb4e435f9740 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 17 May 2024 18:19:13 +0400 Subject: [PATCH 108/262] =?UTF-8?q?openjump:=201.15=20=E2=86=92=202.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/openjump/default.nix | 32 +++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index e1eceab49647..003d330cb372 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -1,40 +1,42 @@ { lib, stdenv, fetchurl, unzip, makeWrapper , coreutils, gawk, which, gnugrep, findutils -, jdk +, jre }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "openjump"; - version = "1.15"; + version = "2.2.1"; + revision = "r5222%5B94156e5%5D"; src = fetchurl { - url = "mirror://sourceforge/jump-pilot/OpenJUMP/1.15/OpenJUMP-Portable-1.15-r6241-CORE.zip"; - sha256 = "12snzkv83w6khcdqzp6xahqapwp82af6c7j2q8n0lj62hk79rfgl"; + url = "mirror://sourceforge/jump-pilot/OpenJUMP/${version}/OpenJUMP-Portable-${version}-${revision}-PLUS.zip"; + hash = "sha256-+/AMmD6NDPy+2Gq1Ji5i/QWGU7FOsU+kKsWoNXcx/VI="; }; # TODO: build from source unpackPhase = '' - mkdir -p $out/bin; - cd $out; unzip $src + mkdir -p $out/opt + unzip $src -d $out/opt ''; nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' - dir=$(echo $out/OpenJUMP-*) + dir=$(echo $out/opt/OpenJUMP-*) - chmod +x $dir/bin/oj_linux.sh - makeWrapper $dir/bin/oj_linux.sh $out/bin/OpenJump \ - --set JAVA_HOME ${jdk.home} \ - --set PATH "${coreutils}/bin:${gawk}/bin:${which}/bin:${gnugrep}/bin:${findutils}/bin" + chmod +x "$dir/bin/oj_linux.sh" + makeWrapper "$dir/bin/oj_linux.sh" $out/bin/OpenJump \ + --set JAVA_HOME ${jre} \ + --set PATH ${lib.makeBinPath [ coreutils gawk which gnugrep findutils ]} ''; meta = { description = "Open source Geographic Information System (GIS) written in the Java programming language"; - homepage = "http://www.openjump.org/index.html"; + homepage = "http://www.openjump.org/"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; license = lib.licenses.gpl2; - maintainers = [lib.maintainers.marcweber]; - platforms = lib.platforms.linux; + maintainers = lib.teams.geospatial.members ++ [ lib.maintainers.marcweber ]; + platforms = jre.meta.platforms; mainProgram = "OpenJump"; }; } From 0f353660e33e1be3851ec392d2cbb549aa99e994 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 17 May 2024 19:22:03 +0400 Subject: [PATCH 109/262] openjump: migrate to by-name --- .../openjump/default.nix => by-name/op/openjump/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/openjump/default.nix => by-name/op/openjump/package.nix} (100%) diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/by-name/op/openjump/package.nix similarity index 100% rename from pkgs/applications/misc/openjump/default.nix rename to pkgs/by-name/op/openjump/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 160b65391fea..7b3841605193 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33475,8 +33475,6 @@ with pkgs; openexr = openexr_3; }; - openjump = callPackage ../applications/misc/openjump { }; - open-music-kontrollers = lib.recurseIntoAttrs { eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { }; jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { }; From 62bfa656568e0775c2e20ad9eb96f1584cc890c9 Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Fri, 3 May 2024 17:23:41 +0200 Subject: [PATCH 110/262] linux/hardened/patches/6.8: init at 6.8.9-hardened1 --- nixos/tests/kernel-generic.nix | 1 + pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 2 ++ 4 files changed, 15 insertions(+) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 5f0e7b3e37cd..07e15a380b6d 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -31,6 +31,7 @@ let linux_5_15_hardened linux_6_1_hardened linux_6_6_hardened + linux_6_8_hardened linux_rt_5_4 linux_rt_5_10 linux_rt_5_15 diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index fc5d6f00e865..ada6932dc85f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -58,5 +58,15 @@ }, "sha256": "1ilwmgpgvddwkd9nx5999cb6z18scjyq7jklid26k1hg7f35nsmn", "version": "6.6.30" + }, + "6.8": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-6.8.9-hardened1.patch", + "sha256": "115d1fgddfcffmfg5f31w50lf2cskkwakngb343didrwfa28nrxf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.8.9-hardened1/linux-hardened-6.8.9-hardened1.patch" + }, + "sha256": "1dn9bgmf03bdfbmgq98d043702g808rjikxs2i9yia57iqiz21gr", + "version": "6.8.9" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 160b65391fea..4d8322b9f3bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27317,6 +27317,8 @@ with pkgs; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened; linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened; + linuxPackages_6_8_hardened = linuxKernel.packages.linux_6_8_hardened; + linux_6_8_hardened = linuxKernel.kernels.linux_6_8_hardened; # GNU Linux-libre kernels linuxPackages-libre = linuxKernel.packages.linux_libre; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 0335f52465ea..57ae6c5f36a9 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -269,6 +269,7 @@ in { linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { }; + linux_6_8_hardened = hardenedKernelFor kernels.linux_6_8 { }; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; @@ -657,6 +658,7 @@ in { linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened); + linux_6_8_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_8_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); From 7f039f0627ca481e73e4e588d825c519c7bb3b1b Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Tue, 14 May 2024 21:45:46 +0200 Subject: [PATCH 111/262] vscode-extensions.ms-python.debugpy: 2023.3.13121011 -> 2024.6.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c0ab7f2f8736..c540f77275e6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2878,8 +2878,8 @@ let mktplcRef = { name = "debugpy"; publisher = "ms-python"; - version = "2023.3.13121011"; - hash = "sha256-owYUEyQl2FQytApfuI97N4y9p7/dL0lu6EBk/AzSMjw="; + version = "2024.6.0"; + hash = "sha256-VlPe65ViBur5P6L7iRKdGnmbNlSCwYrdZAezStx8Bz8="; }; meta = { description = "Python debugger (debugpy) extension for VS Code"; From 5dfba7f703f0e3129cdb489c515939dfa8577d7c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 17 May 2024 19:42:41 +0200 Subject: [PATCH 112/262] plymouth-matrix-theme: Fix version & passthru.updateScript --- pkgs/by-name/pl/plymouth-matrix-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plymouth-matrix-theme/package.nix b/pkgs/by-name/pl/plymouth-matrix-theme/package.nix index 5db5be9c3f46..69437a7928c6 100644 --- a/pkgs/by-name/pl/plymouth-matrix-theme/package.nix +++ b/pkgs/by-name/pl/plymouth-matrix-theme/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation { pname = "plymouth-matrix-theme"; - version = "0.1.0-unstable-19-02-2017"; + version = "0.1.0-unstable-2017-02-19"; src = fetchFromGitHub { owner = "storax"; @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - passthru.updateScript = unstableGitUpdater; + passthru.updateScript = unstableGitUpdater { }; meta = { description = "Plymouth boot theme inspired by Matrix"; From 4826bc455d57af7cd75049ba3bf2f6a414a277bf Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 14 Mar 2024 18:40:47 +0800 Subject: [PATCH 113/262] nixos/yazi: support plugins and flavors --- nixos/modules/programs/yazi.nix | 61 ++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/nixos/modules/programs/yazi.nix b/nixos/modules/programs/yazi.nix index 5905f2afb946..cfb26c01bfab 100644 --- a/nixos/modules/programs/yazi.nix +++ b/nixos/modules/programs/yazi.nix @@ -5,7 +5,9 @@ let settingsFormat = pkgs.formats.toml { }; - names = [ "yazi" "theme" "keymap" ]; + files = [ "yazi" "theme" "keymap" ]; + + dirs = [ "plugins" "flavors" ]; in { options.programs.yazi = { @@ -15,7 +17,7 @@ in settings = lib.mkOption { type = with lib.types; submodule { - options = lib.listToAttrs (map + options = (lib.listToAttrs (map (name: lib.nameValuePair name (lib.mkOption { inherit (settingsFormat) type; default = { }; @@ -25,24 +27,73 @@ in See https://yazi-rs.github.io/docs/configuration/${name}/ for documentation. ''; })) - names); + files)); }; default = { }; description = '' Configuration included in `$YAZI_CONFIG_HOME`. ''; }; + + initLua = lib.mkOption { + type = with lib.types; nullOr path; + default = null; + description = '' + The init.lua for Yazi itself. + ''; + }; + + } // (lib.listToAttrs (map + (name: lib.nameValuePair name (lib.mkOption { + type = with lib.types; attrsOf (oneOf [ path package ]); + default = { }; + description = '' + Lua plugins. + + See https://yazi-rs.github.io/docs/${name}/overview/ for documentation. + ''; + })) + dirs) + ); + + flavors = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ path package ]); + default = { }; + description = '' + Pre-made themes. + + See https://yazi-rs.github.io/docs/flavors/overview/ for documentation. + ''; + example = lib.literalExpression '' + { + foo = ./foo; + bar = pkgs.bar; + } + ''; + }; + }; config = lib.mkIf cfg.enable { environment = { systemPackages = [ cfg.package ]; variables.YAZI_CONFIG_HOME = "/etc/yazi/"; - etc = lib.attrsets.mergeAttrsList (map + etc = (lib.attrsets.mergeAttrsList (map (name: lib.optionalAttrs (cfg.settings.${name} != { }) { "yazi/${name}.toml".source = settingsFormat.generate "${name}.toml" cfg.settings.${name}; }) - names); + files)) // (lib.attrsets.mergeAttrsList (map + (dir: + if cfg.${dir} != { } then + (lib.mapAttrs' + (name: value: lib.nameValuePair "yazi/${dir}/${name}" { source = value; }) + cfg.${dir}) else { + # Yazi checks the directories. If they don't exist it tries to create them and then crashes. + "yazi/${dir}".source = pkgs.emptyDirectory; + }) + dirs)) // lib.optionalAttrs (cfg.initLua != null) { + "yazi/init.lua".source = cfg.initLua; + }; }; }; meta = { From ced6734812dd664e3a9ef870aafc4d5159bde25d Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 7 Apr 2024 22:54:18 +0800 Subject: [PATCH 114/262] yazi: add config files to wrapper --- nixos/modules/programs/yazi.nix | 44 ++++++++------------- pkgs/by-name/ya/yazi-unwrapped/package.nix | 2 +- pkgs/by-name/ya/yazi/package.nix | 45 +++++++++++++++++++++- 3 files changed, 60 insertions(+), 31 deletions(-) diff --git a/nixos/modules/programs/yazi.nix b/nixos/modules/programs/yazi.nix index cfb26c01bfab..d9f38d8d8118 100644 --- a/nixos/modules/programs/yazi.nix +++ b/nixos/modules/programs/yazi.nix @@ -6,8 +6,6 @@ let settingsFormat = pkgs.formats.toml { }; files = [ "yazi" "theme" "keymap" ]; - - dirs = [ "plugins" "flavors" ]; in { options.programs.yazi = { @@ -41,20 +39,24 @@ in description = '' The init.lua for Yazi itself. ''; + example = lib.literalExpression "./init.lua"; }; - } // (lib.listToAttrs (map - (name: lib.nameValuePair name (lib.mkOption { + plugins = lib.mkOption { type = with lib.types; attrsOf (oneOf [ path package ]); default = { }; description = '' Lua plugins. - See https://yazi-rs.github.io/docs/${name}/overview/ for documentation. + See https://yazi-rs.github.io/docs/plugins/overview/ for documentation. ''; - })) - dirs) - ); + example = lib.literalExpression '' + { + foo = ./foo; + bar = pkgs.bar; + } + ''; + }; flavors = lib.mkOption { type = with lib.types; attrsOf (oneOf [ path package ]); @@ -75,27 +77,13 @@ in }; config = lib.mkIf cfg.enable { - environment = { - systemPackages = [ cfg.package ]; - variables.YAZI_CONFIG_HOME = "/etc/yazi/"; - etc = (lib.attrsets.mergeAttrsList (map - (name: lib.optionalAttrs (cfg.settings.${name} != { }) { - "yazi/${name}.toml".source = settingsFormat.generate "${name}.toml" cfg.settings.${name}; - }) - files)) // (lib.attrsets.mergeAttrsList (map - (dir: - if cfg.${dir} != { } then - (lib.mapAttrs' - (name: value: lib.nameValuePair "yazi/${dir}/${name}" { source = value; }) - cfg.${dir}) else { - # Yazi checks the directories. If they don't exist it tries to create them and then crashes. - "yazi/${dir}".source = pkgs.emptyDirectory; - }) - dirs)) // lib.optionalAttrs (cfg.initLua != null) { - "yazi/init.lua".source = cfg.initLua; - }; - }; + environment.systemPackages = [ + (cfg.package.override { + inherit (cfg) settings initLua plugins flavors; + }) + ]; }; + meta = { maintainers = with lib.maintainers; [ linsui ]; }; diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index d0a0d77ecfec..77a9b9ad8b5b 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { description = "Blazing fast terminal file manager written in Rust, based on async I/O"; homepage = "https://github.com/sxyazi/yazi"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ xyenon matthiasbeyer ]; + maintainers = with lib.maintainers; [ xyenon matthiasbeyer linsui ]; mainProgram = "yazi"; }; } diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix index 134db023edd9..ee807645c3fd 100644 --- a/pkgs/by-name/ya/yazi/package.nix +++ b/pkgs/by-name/ya/yazi/package.nix @@ -3,6 +3,7 @@ , makeWrapper , yazi-unwrapped +, withRuntimeDeps ? true , withFile ? true , file , withJq ? true @@ -21,10 +22,16 @@ , fzf , withZoxide ? true , zoxide +, settings ? { } +, formats +, plugins ? { } +, flavors ? { } +, initLua ? null }: let - runtimePaths = with lib; [ ] + runtimePaths = with lib; + [ ] ++ optional withFile file ++ optional withJq jq ++ optional withPoppler poppler_utils @@ -34,7 +41,40 @@ let ++ optional withRipgrep ripgrep ++ optional withFzf fzf ++ optional withZoxide zoxide; + + settingsFormat = formats.toml { }; + + files = [ "yazi" "theme" "keymap" ]; + + configHome = if (settings == { } && initLua == null && plugins == { } && flavors == { }) then null else + runCommand "YAZI_CONFIG_HOME" { } '' + mkdir -p $out + ${lib.concatMapStringsSep + "\n" + (name: lib.optionalString (settings ? ${name} && settings.${name} != { }) '' + ln -s ${settingsFormat.generate "${name}.toml" settings.${name}} $out/${name}.toml + '') + files} + + mkdir $out/plugins + ${lib.optionalString (plugins != { }) '' + ${lib.concatMapStringsSep + "\n" + (lib.mapAttrsToList (name: value: "ln -s ${value} $out/plugins/${name}") plugins)} + ''} + + mkdir $out/flavors + ${lib.optionalString (flavors != { }) '' + ${lib.concatMapStringsSep + "\n" + (lib.mapAttrsToList (name: value: "ln -s ${value} $out/flavors/${name}") flavors)} + ''} + + + ${lib.optionalString (initLua != null) "ln -s ${initLua} $out/init.lua"} + ''; in +if (!withRuntimeDeps && configHome == null) then yazi-unwrapped else runCommand yazi-unwrapped.name { inherit (yazi-unwrapped) pname version meta; @@ -44,5 +84,6 @@ runCommand yazi-unwrapped.name mkdir -p $out/bin ln -s ${yazi-unwrapped}/share $out/share makeWrapper ${yazi-unwrapped}/bin/yazi $out/bin/yazi \ - --prefix PATH : "${lib.makeBinPath runtimePaths}" + ${lib.optionalString withRuntimeDeps "--prefix PATH : \"${lib.makeBinPath runtimePaths}\""} \ + ${lib.optionalString (configHome != null) "--set YAZI_CONFIG_HOME ${configHome}"} '' From a73f6167693cdd22d538fb02b132597414d7b4e3 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Fri, 17 May 2024 14:05:06 -0300 Subject: [PATCH 115/262] typst: add passthru.updateScript --- pkgs/by-name/ty/typst/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index af61bdedb11e..b5f29d73a3de 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -7,6 +7,7 @@ , xz , stdenv , darwin +, nix-update-script }: rustPlatform.buildRustPackage rec { @@ -53,6 +54,8 @@ rustPlatform.buildRustPackage rec { --zsh crates/typst-cli/artifacts/_typst ''; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/typst/typst/releases/tag/${src.rev}"; description = "A new markup-based typesetting system that is powerful and easy to learn"; From 7bd6d9548ecf5424c825716215653d1a8177df8b Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Fri, 17 May 2024 14:23:47 -0300 Subject: [PATCH 116/262] typst: run tests --- pkgs/by-name/ty/typst/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index b5f29d73a3de..32c962e96e73 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -47,6 +47,12 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; }; + # Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context" + postPatch = '' + substituteInPlace tests/src/tests.rs --replace-fail 'ARGS.num_threads' 'ARGS.test_threads' + substituteInPlace tests/src/args.rs --replace-fail 'num_threads' 'test_threads' + ''; + postInstall = '' installManPage crates/typst-cli/artifacts/*.1 installShellCompletion \ @@ -54,6 +60,8 @@ rustPlatform.buildRustPackage rec { --zsh crates/typst-cli/artifacts/_typst ''; + cargoTestFlags = [ "--workspace" ]; + passthru.updateScript = nix-update-script { }; meta = { From 628f13c025eb8340e19ef9d915e09bc62cde97e5 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Wed, 25 Oct 2023 18:32:53 +0200 Subject: [PATCH 117/262] cpu-energy-meter: init at 1.2 Co-authored-by: h7x4 --- pkgs/by-name/cp/cpu-energy-meter/package.nix | 40 ++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/cp/cpu-energy-meter/package.nix diff --git a/pkgs/by-name/cp/cpu-energy-meter/package.nix b/pkgs/by-name/cp/cpu-energy-meter/package.nix new file mode 100644 index 000000000000..6d31da594645 --- /dev/null +++ b/pkgs/by-name/cp/cpu-energy-meter/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, libcap +}: +stdenv.mkDerivation rec { + pname = "cpu-energy-meter"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "sosy-lab"; + repo = "cpu-energy-meter"; + rev = version; + hash = "sha256-QW65Z8mRYLHcyLeOtNAHjwPNWAUP214wqIYclK+whFw="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace "DESTDIR :=" "DESTDIR := $out" \ + --replace "PREFIX := /usr/local" "PREFIX :=" + ''; + + buildInputs = [ libcap ]; + + env.NIX_CFLAGS_COMPILE = "-fcommon"; + + postInstall = '' + install -Dm444 -t $out/etc/udev/rules.d $src/debian/additional_files/59-msr.rules + ''; + + meta = with lib; { + description = "A tool for measuring energy consumption of Intel CPUs"; + homepage = "https://github.com/sosy-lab/cpu-energy-meter"; + changelog = "https://github.com/sosy-lab/cpu-energy-meter/blob/main/CHANGELOG.md"; + maintainers = with maintainers; [ lorenzleutgeb ]; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + mainProgram = "cpu-energy-meter"; + }; +} From c250e8ee9496d8577dd36204b2d997792e8fb216 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Fri, 17 May 2024 21:21:50 +0200 Subject: [PATCH 118/262] nixos/cpu-energy-meter: init --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/cpu-energy-meter.nix | 27 +++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 nixos/modules/programs/cpu-energy-meter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 76ccf5a34109..63dd79969983 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -167,6 +167,7 @@ ./programs/chromium.nix ./programs/clash-verge.nix ./programs/cnping.nix + ./programs/cpu-energy-meter.nix ./programs/command-not-found/command-not-found.nix ./programs/coolercontrol.nix ./programs/criu.nix diff --git a/nixos/modules/programs/cpu-energy-meter.nix b/nixos/modules/programs/cpu-energy-meter.nix new file mode 100644 index 000000000000..653ec067492d --- /dev/null +++ b/nixos/modules/programs/cpu-energy-meter.nix @@ -0,0 +1,27 @@ +{ config +, lib +, pkgs +, ... +}: { + options.programs.cpu-energy-meter = { + enable = lib.mkEnableOption "CPU Energy Meter"; + package = lib.mkPackageOption pkgs "cpu-energy-meter" { }; + }; + + config = + let + cfg = config.programs.cpu-energy-meter; + in + lib.mkIf cfg.enable { + hardware.cpu.x86.msr.enable = true; + + security.wrappers.${cfg.package.meta.mainProgram} = { + owner = "nobody"; + group = config.hardware.cpu.x86.msr.group; + source = lib.getExe cfg.package; + capabilities = "cap_sys_rawio=ep"; + }; + }; + + meta.maintainers = with lib.maintainers; [ lorenzleutgeb ]; +} From 3b2c8bc52e12ee600c3bd0330049ad3809878e6f Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Wed, 25 Oct 2023 18:33:27 +0200 Subject: [PATCH 119/262] pqos-wrapper: init at unstable-2022-01-31 Co-authored-by: h7x4 --- pkgs/by-name/pq/pqos-wrapper/package.nix | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/pq/pqos-wrapper/package.nix diff --git a/pkgs/by-name/pq/pqos-wrapper/package.nix b/pkgs/by-name/pq/pqos-wrapper/package.nix new file mode 100644 index 000000000000..d0235fedc3a7 --- /dev/null +++ b/pkgs/by-name/pq/pqos-wrapper/package.nix @@ -0,0 +1,28 @@ +{ lib +, intel-cmt-cat +, fetchFromGitLab +, python3 +}: +python3.pkgs.buildPythonApplication rec { + pname = "pqos-wrapper"; + version = "unstable-2022-01-31"; + + src = fetchFromGitLab { + group = "sosy-lab"; + owner = "software"; + repo = pname; + rev = "ce816497a07dcb4b931652b98359e4601a292b15"; + hash = "sha256-SaYr6lVucpJjVtGgxRbDGYbOoBwdfEDVKtvD+M1L0o4="; + }; + + makeWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ intel-cmt-cat ]}" ]; + + meta = with lib; { + description = "Wrapper for Intel PQoS for the purpose of using it in BenchExec"; + homepage = "https://gitlab.com/sosy-lab/software/pqos-wrapper"; + maintainers = with maintainers; [ lorenzleutgeb ]; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + mainProgram = "pqos_wrapper"; + }; +} From 1dd4d2283e09c6c1ce5d3b3dee732c86d03deb7e Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Fri, 17 May 2024 21:23:02 +0200 Subject: [PATCH 120/262] nixos/pqos-wrapper: init --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/pqos-wrapper.nix | 27 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 nixos/modules/programs/pqos-wrapper.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 63dd79969983..df46702f3390 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -251,6 +251,7 @@ ./programs/pantheon-tweaks.nix ./programs/partition-manager.nix ./programs/plotinus.nix + ./programs/pqos-wrapper.nix ./programs/projecteur.nix ./programs/proxychains.nix ./programs/qdmr.nix diff --git a/nixos/modules/programs/pqos-wrapper.nix b/nixos/modules/programs/pqos-wrapper.nix new file mode 100644 index 000000000000..82023e67a2ae --- /dev/null +++ b/nixos/modules/programs/pqos-wrapper.nix @@ -0,0 +1,27 @@ +{ config +, lib +, pkgs +, ... +}: +let + cfg = config.programs.pqos-wrapper; +in +{ + options.programs.pqos-wrapper = { + enable = lib.mkEnableOption "PQoS Wrapper for BenchExec"; + package = lib.mkPackageOption pkgs "pqos-wrapper" { }; + }; + + config = lib.mkIf cfg.enable { + hardware.cpu.x86.msr.enable = true; + + security.wrappers.${cfg.package.meta.mainProgram} = { + owner = "nobody"; + group = config.hardware.cpu.x86.msr.group; + source = lib.getExe cfg.package; + capabilities = "cap_sys_rawio=eip"; + }; + }; + + meta.maintainers = with lib.maintainers; [ lorenzleutgeb ]; +} From 0e2c4474860668675751fd879d7757a7d13d8b36 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Wed, 25 Oct 2023 18:34:38 +0200 Subject: [PATCH 121/262] benchexec: init at 3.21 Co-authored-by: h7x4 --- pkgs/by-name/be/benchexec/package.nix | 62 +++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/be/benchexec/package.nix diff --git a/pkgs/by-name/be/benchexec/package.nix b/pkgs/by-name/be/benchexec/package.nix new file mode 100644 index 000000000000..abc04b97cb8d --- /dev/null +++ b/pkgs/by-name/be/benchexec/package.nix @@ -0,0 +1,62 @@ +{ lib +, fetchFromGitHub +, python3 +, libseccomp +, nixosTests +, testers +, benchexec +}: +python3.pkgs.buildPythonApplication rec { + pname = "benchexec"; + version = "3.21"; + + src = fetchFromGitHub { + owner = "sosy-lab"; + repo = "benchexec"; + rev = version; + hash = "sha256-bE3brmmLHZQakDKvd47I1hm9Dcsu6DrSeJyjWWtEZWI="; + }; + + pyproject = true; + + nativeBuildInputs = with python3.pkgs; [ setuptools ]; + + # NOTE: CPU Energy Meter is not added, + # because BenchExec should call the wrapper configured + # via `security.wrappers.cpu-energy-meter` + # in `programs.cpu-energy-meter`, which will have the required + # capabilities to access MSR. + # If we add `cpu-energy-meter` here, BenchExec will instead call an executable + # without `CAP_SYS_RAWIO` and fail. + propagatedBuildInputs = with python3.pkgs; [ + coloredlogs + lxml + pystemd + pyyaml + ]; + + makeWrapperArgs = [ "--set-default LIBSECCOMP ${lib.getLib libseccomp}/lib/libseccomp.so" ]; + + passthru.tests = + let + testVersion = result: testers.testVersion { + command = "${result} --version"; + package = benchexec; + }; + in + { + nixos = nixosTests.benchexec; + benchexec-version = testVersion "benchexec"; + runexec-version = testVersion "runexec"; + table-generator-version = testVersion "table-generator"; + containerexec-version = testVersion "containerexec"; + }; + + meta = with lib; { + description = "A Framework for Reliable Benchmarking and Resource Measurement."; + homepage = "https://github.com/sosy-lab/benchexec"; + maintainers = with maintainers; [ lorenzleutgeb ]; + license = licenses.asl20; + mainProgram = "benchexec"; + }; +} From 88d736df69da5ee553928bcfc14f5da62fcac2c4 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Fri, 17 May 2024 21:19:41 +0200 Subject: [PATCH 122/262] nixos/benchexec: init --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/benchexec.nix | 98 ++++++++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/benchexec.nix | 54 +++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 nixos/modules/programs/benchexec.nix create mode 100644 nixos/tests/benchexec.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index df46702f3390..796bdd4f8603 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -158,6 +158,7 @@ ./programs/bash/ls-colors.nix ./programs/bash/undistract-me.nix ./programs/bcc.nix + ./programs/benchexec.nix ./programs/browserpass.nix ./programs/calls.nix ./programs/captive-browser.nix diff --git a/nixos/modules/programs/benchexec.nix b/nixos/modules/programs/benchexec.nix new file mode 100644 index 000000000000..652670c117ea --- /dev/null +++ b/nixos/modules/programs/benchexec.nix @@ -0,0 +1,98 @@ +{ lib +, pkgs +, config +, options +, ... +}: +let + cfg = config.programs.benchexec; + opt = options.programs.benchexec; + + filterUsers = x: + if builtins.isString x then config.users.users ? ${x} else + if builtins.isInt x then x else + throw "filterUsers expects string (username) or int (UID)"; + + uid = x: + if builtins.isString x then config.users.users.${x}.uid else + if builtins.isInt x then x else + throw "uid expects string (username) or int (UID)"; +in +{ + options.programs.benchexec = { + enable = lib.mkEnableOption "BenchExec"; + package = lib.options.mkPackageOption pkgs "benchexec" { }; + + users = lib.options.mkOption { + type = with lib.types; listOf (either str int); + description = '' + Users that intend to use BenchExec. + Provide usernames of users that are configured via {option}`${options.users.users}` as string, + and UIDs of "mutable users" as integers. + Control group delegation will be configured via systemd. + For more information, see . + ''; + default = [ ]; + example = lib.literalExpression '' + [ + "alice" # username of a user configured via ${options.users.users} + 1007 # UID of a mutable user + ] + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = (map + (user: { + assertion = config.users.users ? ${user}; + message = '' + The user '${user}' intends to use BenchExec (via `${opt.users}`), but is not configured via `${options.users.users}`. + ''; + }) + (builtins.filter builtins.isString cfg.users) + ) ++ (map + (id: { + assertion = config.users.mutableUsers; + message = '' + The user with UID '${id}' intends to use BenchExec (via `${opt.users}`), but mutable users are disabled via `${options.users.mutableUsers}`. + ''; + }) + (builtins.filter builtins.isInt cfg.users) + ) ++ [ + { + assertion = config.systemd.enableUnifiedCgroupHierarchy == true; + message = '' + The BenchExec module `${opt.enable}` only supports control groups 2 (`${options.systemd.enableUnifiedCgroupHierarchy} = true`). + ''; + } + ]; + + environment.systemPackages = [ cfg.package ]; + + # See . + systemd.services = builtins.listToAttrs (map + (user: { + name = "user@${builtins.toString (uid user)}"; + value = { + serviceConfig.Delegate = "yes"; + overrideStrategy = "asDropin"; + }; + }) + (builtins.filter filterUsers cfg.users)); + + # See . + virtualisation.lxc.lxcfs.enable = lib.mkDefault true; + + # See . + programs = { + cpu-energy-meter.enable = lib.mkDefault true; + pqos-wrapper.enable = lib.mkDefault true; + }; + + # See . + security.unprivilegedUsernsClone = true; + }; + + meta.maintainers = with lib.maintainers; [ lorenzleutgeb ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9af07688c03c..2ebe5fa7ed23 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -144,6 +144,7 @@ in { bcachefs = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bcachefs.nix {}; beanstalkd = handleTest ./beanstalkd.nix {}; bees = handleTest ./bees.nix {}; + benchexec = handleTest ./benchexec.nix {}; binary-cache = handleTest ./binary-cache.nix {}; bind = handleTest ./bind.nix {}; bird = handleTest ./bird.nix {}; diff --git a/nixos/tests/benchexec.nix b/nixos/tests/benchexec.nix new file mode 100644 index 000000000000..3fc9ebc2c35f --- /dev/null +++ b/nixos/tests/benchexec.nix @@ -0,0 +1,54 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let + user = "alice"; +in +{ + name = "benchexec"; + + nodes.benchexec = { + imports = [ ./common/user-account.nix ]; + + programs.benchexec = { + enable = true; + users = [ user ]; + }; + }; + + testScript = { ... }: + let + runexec = lib.getExe' pkgs.benchexec "runexec"; + echo = builtins.toString pkgs.benchexec; + test = lib.getExe (pkgs.writeShellApplication rec { + name = "test"; + meta.mainProgram = name; + text = "echo '${echo}'"; + }); + wd = "/tmp"; + stdout = "${wd}/runexec.out"; + stderr = "${wd}/runexec.err"; + in + '' + start_all() + machine.wait_for_unit("multi-user.target") + benchexec.succeed(''''\ + systemd-run \ + --property='StandardOutput=file:${stdout}' \ + --property='StandardError=file:${stderr}' \ + --unit=runexec --wait --user --machine='${user}@' \ + --working-directory ${wd} \ + '${runexec}' \ + --debug \ + --read-only-dir / \ + --hidden-dir /home \ + '${test}' \ + '''') + benchexec.succeed("grep -s '${echo}' ${wd}/output.log") + benchexec.succeed("test \"$(grep -Ec '((start|wall|cpu)time|memory)=' ${stdout})\" = 4") + benchexec.succeed("! grep -E '(WARNING|ERROR)' ${stderr}") + ''; + + interactive.nodes.benchexec.services.kmscon = { + enable = true; + fonts = [{ name = "Fira Code"; package = pkgs.fira-code; }]; + }; +}) From 9f2f6359bb22bddf828ccd6cd4f5abcceffad39e Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Wed, 25 Oct 2023 18:34:49 +0200 Subject: [PATCH 123/262] nixos/doc/rl-2405: mention BenchExec and friends --- nixos/doc/manual/release-notes/rl-2405.section.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 351a49f18119..55d6c08ea273 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -92,6 +92,11 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - [Handheld Daemon](https://github.com/hhd-dev/hhd), support for gaming handhelds like the Legion Go, ROG Ally, and GPD Win. Available as [services.handheld-daemon](#opt-services.handheld-daemon.enable). +- [BenchExec](https://github.com/sosy-lab/benchexec), a framework for reliable benchmarking and resource measurement, available as [programs.benchexec](#opt-programs.benchexec.enable), + As well as related programs + [CPU Energy Meter](https://github.com/sosy-lab/cpu-energy-meter), available as [programs.cpu-energy-meter](#opt-programs.cpu-energy-meter.enable), and + [PQoS Wrapper](https://gitlab.com/sosy-lab/software/pqos-wrapper), available as [programs.pqos-wrapper](#opt-programs.pqos-wrapper.enable). + - [Guix](https://guix.gnu.org), a functional package manager inspired by Nix. Available as [services.guix](#opt-services.guix.enable). - [PhotonVision](https://photonvision.org/), a free, fast, and easy-to-use computer vision solution for the FIRST® Robotics Competition. From 23074d5de8c46e0b66e805e853e905656d9d2b7f Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Wed, 10 Apr 2024 13:47:38 +0200 Subject: [PATCH 124/262] vectorscan: improve FAT_RUNTIME and run checks --- .../libraries/vectorscan/default.nix | 36 ++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/vectorscan/default.nix b/pkgs/development/libraries/vectorscan/default.nix index 12fa0735b27f..57445d452670 100644 --- a/pkgs/development/libraries/vectorscan/default.nix +++ b/pkgs/development/libraries/vectorscan/default.nix @@ -30,11 +30,37 @@ stdenv.mkDerivation rec { boost ]; - cmakeFlags = lib.optional enableShared "-DBUILD_STATIC_AND_SHARED=ON" - ++ [ "-DFAT_RUNTIME=${if stdenv.hostPlatform.isLinux then "ON" else "OFF"}" ] - ++ lib.optional stdenv.hostPlatform.avx2Support "-DBUILD_AVX2=ON" - ++ lib.optional stdenv.hostPlatform.avx512Support "-DBUILD_AVX512=ON" - ; + # FAT_RUNTIME bundles optimized implementations for different CPU extensions and uses CPUID to + # transparently select the fastest for the current hardware. + # This feature is only available on linux for x86, x86_64, and aarch64. + # + # If FAT_RUNTIME is not available, we fall back to building for a single extension based + # on stdenv.hostPlatform. + # + # For generic builds (e.g. x86_64) this can mean using an implementation not optimized for the + # potentially available more modern hardware extensions (e.g. x86_64 with AVX512). + cmakeFlags = [ (if enableShared then "-DBUILD_SHARED_LIBS=ON" else "BUILD_STATIC_LIBS=ON") ] + ++ + (if lib.elem stdenv.hostPlatform.system [ "x86_64-linux" "i686-linux" ] then + [ "-DBUILD_AVX2=ON" "-DBUILD_AVX512=ON" "-DBUILD_AVX512VBMI=ON" "-DFAT_RUNTIME=ON" ] + else + (if (stdenv.isLinux && stdenv.isAarch64) then + [ "-DBUILD_SVE=ON" "-DBUILD_SVE2=ON" "-DBUILD_SVE2_BITPERM=ON" "-DFAT_RUNTIME=ON" ] + else + [ "-DFAT_RUNTIME=OFF" ] + ++ lib.optional stdenv.hostPlatform.avx2Support "-DBUILD_AVX2=ON" + ++ lib.optional stdenv.hostPlatform.avx512Support "-DBUILD_AVX512=ON" + ) + ); + + doCheck = true; + checkPhase = '' + runHook preCheck + + ./bin/unit-hyperscan + + runHook postCheck + ''; meta = with lib; { description = "A portable fork of the high-performance regular expression matching library"; From dbaa125957f8b68a28d556a165dabab89be56d1c Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Wed, 10 Apr 2024 13:51:36 +0200 Subject: [PATCH 125/262] vectorscan: 5.4.10.1 -> 5.4.11 The darwin (or libcxxStdenv) builds use C++17, which only seems to work with boost >= 1.83. The errors look like this: include/boost/functional.hpp:454:62: error: no template named 'binary_function' in namespace 'boost::functional::detail'; did you mean '__binary_function'? class mem_fun1_ref_t : public boost::functional::detail::binary_function ~~~~~~~~~~~~~~~~~~~~~~~~~~~^ include/boost/functional.hpp:46:24: note: '__binary_function' declared here using std::binary_function; --- pkgs/development/libraries/vectorscan/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vectorscan/default.nix b/pkgs/development/libraries/vectorscan/default.nix index 57445d452670..e9724ced0c70 100644 --- a/pkgs/development/libraries/vectorscan/default.nix +++ b/pkgs/development/libraries/vectorscan/default.nix @@ -2,32 +2,38 @@ , stdenv , fetchFromGitHub , cmake +, pkg-config , ragel , util-linux , python3 -, boost +, boost184 +, sqlite +, pcre , enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "vectorscan"; - version = "5.4.10.1"; + version = "5.4.11"; src = fetchFromGitHub { owner = "VectorCamp"; repo = "vectorscan"; rev = "vectorscan/${version}"; - hash = "sha256-x6FefOrUvpN/A4GXTd+3SGZEAQL6pXt83ufxRIY3Q9k="; + hash = "sha256-wz2oIhau/vjnri3LOyPZSCFAWg694FTLVt7+SZYEsL4="; }; nativeBuildInputs = [ cmake + pkg-config ragel python3 ] ++ lib.optional stdenv.isLinux util-linux; buildInputs = [ - boost + boost184 + sqlite + pcre ]; # FAT_RUNTIME bundles optimized implementations for different CPU extensions and uses CPUID to From 644fc7e4f6882a48db7ab6677b23c1548dabaf0c Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 17 May 2024 12:09:29 -0800 Subject: [PATCH 126/262] code-server: 4.23.1 -> 4.89.1 --- pkgs/servers/code-server/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index aaf3152f9b9c..0fd434ab1009 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -71,18 +71,18 @@ let # To compute the commit when upgrading this derivation, do: # `$ git rev-parse ` where is the git revision of the `src` # Example: `$ git rev-parse v4.16.1` - commit = "9a28bc29dbddb6886dfe03dc1c31320249a901ce"; + commit = "effc6e95b4ad1c5ac5f9083ec06663ba4a2e005c"; in stdenv.mkDerivation (finalAttrs: { pname = "code-server"; - version = "4.23.1"; + version = "4.89.1"; src = fetchFromGitHub { owner = "coder"; repo = "code-server"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-nOfdEbnnNLfePhqGSXD/2A0DxqoJCo8U18VFYnNvFMU="; + hash = "sha256-exFt7dgy076MJJKDzTRRlTVjucfIXVaXKgurYfJ1Uvo="; }; yarnCache = stdenv.mkDerivation { @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-MxUQ9Gw7MabLKPs5j8+Q4v7IULr68Pd/OIBWpfZ+rVU="; + outputHash = "sha256-BYz7ym+tsdbExUNOL3GV0wSMYuy4Q0GadZterH0ZGM0="; }; nativeBuildInputs = [ From f3c37a65526c7509a6b2a77d1fc60e3ae85edd64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 21:32:34 +0000 Subject: [PATCH 127/262] consul: 1.18.1 -> 1.18.2 --- pkgs/by-name/co/consul/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index 1a5eb769016d..edc3db672bd6 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "consul"; - version = "1.18.1"; + version = "1.18.2"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -22,7 +22,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-r1xdz1rjvbvB93hRpvTNQwSqQLOJwqMhqCiXdIttY10="; + hash = "sha256-9feeWsCAZKip+AYUJTCcqFOTfxsUFMzTRqHjo/Pptho="; }; # This corresponds to paths with package main - normally unneeded but consul @@ -32,7 +32,7 @@ buildGoModule rec { "connect/certgen" ]; - vendorHash = "sha256-DcpEHJ88Ehz5m+ddMd44mYTz0agwYhoels5jWJzu1EM="; + vendorHash = "sha256-bBc3qgPUOmR8c/sFyiskePKLKjHTQcWVTLY6esFIRTc="; doCheck = false; From 2581379f6dd3278971f127814e7e0699a7ff41cc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 18 May 2024 00:24:42 +0200 Subject: [PATCH 128/262] sdrangel: fix build on x86_64-darwin --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dfb71748bff..e6f5e4373280 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27837,7 +27837,9 @@ with pkgs; sdparm = callPackage ../os-specific/linux/sdparm { }; - sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { }; + sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; setools = callPackage ../os-specific/linux/setools { }; From c74a895cf9b3fea7f6e1c210bddb93378d904e2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 22:35:47 +0000 Subject: [PATCH 129/262] libretro.play: unstable-2024-05-05 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..42895423523e 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -652,11 +652,11 @@ "src": { "owner": "jpd002", "repo": "Play-", - "rev": "700a44a1548d099705c901203414724518c90d43", - "hash": "sha256-OZO8vVA2B/SdckC2Rm/v35cdJDzkpdU9lJhFYEyyl1U=", + "rev": "0efd17e79dc470c86cd1363a93130888c1e7a528", + "hash": "sha256-+f1xOSqKUJmM0bhtsPR9zk6mybo2HOXLURtYVb6qBGU=", "fetchSubmodules": true }, - "version": "unstable-2024-05-05" + "version": "unstable-2024-05-17" }, "ppsspp": { "fetcher": "fetchFromGitHub", From 277baf909bf0148d95279b4d2e49023efad98522 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 22:43:20 +0000 Subject: [PATCH 130/262] libretro.mrboom: unstable-2024-02-26 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..91408295b424 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -529,11 +529,11 @@ "src": { "owner": "Javanaise", "repo": "mrboom-libretro", - "rev": "3d5a840e424df30beaf2746c98f538ea1b44bd31", - "hash": "sha256-emNX2U4y2CO6biJ6vwY15otRs44WbPJTGmgP+uCSUfM=", + "rev": "d9695504924344eb681b526d0cc3bb5e3884a32b", + "hash": "sha256-incaTU5pFv5K4jeiWx09Cp50+4Ewf13tT83zr7Zidmo=", "fetchSubmodules": true }, - "version": "unstable-2024-02-26" + "version": "unstable-2024-05-17" }, "mupen64plus": { "fetcher": "fetchFromGitHub", From 1c8055779e797a0e488597c5a7142f4e6a9accd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 22:56:38 +0000 Subject: [PATCH 131/262] crystalline: 0.12.2 -> 0.13.1 --- .../tools/language-servers/crystalline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/crystalline/default.nix b/pkgs/development/tools/language-servers/crystalline/default.nix index aaff50d67190..ca885985025c 100644 --- a/pkgs/development/tools/language-servers/crystalline/default.nix +++ b/pkgs/development/tools/language-servers/crystalline/default.nix @@ -7,7 +7,7 @@ }: let - version = "0.12.2"; + version = "0.13.1"; in crystal.buildCrystalPackage { pname = "crystalline"; @@ -17,7 +17,7 @@ crystal.buildCrystalPackage { owner = "elbywan"; repo = "crystalline"; rev = "v${version}"; - hash = "sha256-9CXWw7Jye5XZzPdzz+Dnvyy7Wk1ENM0an8vOFrPbESA="; + hash = "sha256-Exv83jmSyhJv90Oo4oApZwNgNjy7tOKxLNh7yJIbfws="; }; format = "crystal"; From 8b4ffdfb438175cd22e1f7dba2704e471f9a01a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 23:03:51 +0000 Subject: [PATCH 132/262] libretro.snes9x: unstable-2024-05-01 -> unstable-2024-05-13 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..f531267905ee 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -754,10 +754,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "771b0ffc3792ffeca10baa88d6a62e3889060236", - "hash": "sha256-U8O4u6gD8jopqzwcnWy9xLSuuBjMSq5nhncSQmrIePs=" + "rev": "8f41776532c407744c41e5d08444cb2dbd492c14", + "hash": "sha256-w8RWXqTjAUVrg3U0aMdaZ5mOlZYhgARzOAgyc57AhGQ=" }, - "version": "unstable-2024-05-01" + "version": "unstable-2024-05-13" }, "snes9x2002": { "fetcher": "fetchFromGitHub", From 7f479ba25cdfeff9b85e3dbba00a9f6e5effcd07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 23:04:28 +0000 Subject: [PATCH 133/262] libretro.beetle-psx-hw: unstable-2024-05-10 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..0343ccb47942 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "0c8abf7f9dda23874b5b9cecfcec519a9dfb032b", - "hash": "sha256-psGXpYzKI1QicoHxGhHwR92kymZ+9EaJUpGMcM2OMUY=" + "rev": "1743ca1a97cc90eac463def2e6118602b3d230c0", + "hash": "sha256-0ViuIo+iEIthRayJQeedOo2L+uTsJQh6PTJ21zlC/f0=" }, - "version": "unstable-2024-05-10" + "version": "unstable-2024-05-17" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", From eee3813e2fced07479e7dbbf10faa6b51ad528a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 23:04:34 +0000 Subject: [PATCH 134/262] libretro.pcsx-rearmed: unstable-2024-04-22 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..84cf63242c11 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -631,10 +631,10 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "87a0a6318564fc171d0b576da8ea7e629aa229e7", - "hash": "sha256-quIvyfigl/4itSldj73HpZezeHQwVGlz/jQvwmmsDik=" + "rev": "db02598e737b8d50cd347fe2ef13cb85ade051dd", + "hash": "sha256-BgqwKbmRXKIMfv8xPBH38wTMSVWvkFKOJCb0emZkx5Y=" }, - "version": "unstable-2024-04-22" + "version": "unstable-2024-05-17" }, "picodrive": { "fetcher": "fetchFromGitHub", From f341a9aa7a580a7ef1171bb3bb7052f7a3cf2dba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 23:07:36 +0000 Subject: [PATCH 135/262] libretro.stella: unstable-2024-05-03 -> unstable-2024-05-13 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..f4126ae7091e 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -794,10 +794,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "68e671169f11373e00c88b24d7b319a42b69a715", - "hash": "sha256-WpkUbnYaohP6rDKYi3pPdDxGfW9f7d1QjhJVSBzqLjc=" + "rev": "49166ca9949708c3bddaed5cc549194c4bfcfae5", + "hash": "sha256-Oszglo1BQYTkuSZ96RSIBa1A0v/4qLQSBzsSVmOq07I=" }, - "version": "unstable-2024-05-03" + "version": "unstable-2024-05-13" }, "stella2014": { "fetcher": "fetchFromGitHub", From 13c37137552d8909b070af9a076ac171dff6633d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 23:11:57 +0000 Subject: [PATCH 136/262] libretro.beetle-pce-fast: unstable-2024-05-03 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..d798f88bfa98 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -65,10 +65,10 @@ "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "e2c0259a6941285f853bdc81dfd33756e107c2c2", - "hash": "sha256-S5p38rC5JqLL7ydeEtYR29rWFx1Pok3s7SNPr9zKwb8=" + "rev": "414149d335ce2a3284db6cdffbb8ed2ce42dbe5f", + "hash": "sha256-sta71o4NJIPDZlQkAFLzx+XlHVA8MmUjuZ17MuCKhOY=" }, - "version": "unstable-2024-05-03" + "version": "unstable-2024-05-17" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", From e826ed179f9ea9f4495756f4e1b7521343de058d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 23:21:54 +0000 Subject: [PATCH 137/262] libretro.mame2003: unstable-2024-02-08 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..6454bf11466b 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -429,10 +429,10 @@ "src": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "838f84f14422529c37bbb9803eb649209c8ba4e8", - "hash": "sha256-NiqlA4FjHS0GLypEg6QbhEJlhV0YU7VmMquzqnyr7aA=" + "rev": "aed807fce1acd4fbc70f7ced8fa52548220082ac", + "hash": "sha256-48C2vJIFfna2LcbcLVTTVmJzvV87DZBa+6UQz/LfaVU=" }, - "version": "unstable-2024-02-08" + "version": "unstable-2024-05-17" }, "mame2003-plus": { "fetcher": "fetchFromGitHub", From 92db67caf24082e0cc223dd2546f5c2c2f6f205a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 23:22:05 +0000 Subject: [PATCH 138/262] libretro.beetle-supergrafx: unstable-2024-05-03 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..73e98e1682c5 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "77a965d3433b1585638b54aa6a15d0c33a64ea0c", - "hash": "sha256-KuXvzse/EnzCcRoWVtZP1f/SKOp6qGrLbzbQEuFQGqA=" + "rev": "c96c05c0b6e948df00da7e6253ff3e2874314baa", + "hash": "sha256-ruxp66E7D+r/9h7lzggIy9q9DKWKJikVzL5Oqsy9kQM=" }, - "version": "unstable-2024-05-03" + "version": "unstable-2024-05-17" }, "beetle-vb": { "fetcher": "fetchFromGitHub", From 89619cb44808ebf11e3f189ebea5b9a29e95d917 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 23:22:06 +0000 Subject: [PATCH 139/262] libretro.beetle-pce: unstable-2024-05-03 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..86675ac8deb2 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -55,10 +55,10 @@ "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "b5dd6466f18714ab4c9702e5bdb51cc9dfea061b", - "hash": "sha256-PBirwijCwaOcjRdyIyx/UsnYMQuojQuogK7X7Hte7r8=" + "rev": "0eb4b423452da40dbf4393e09d4126c3090a1210", + "hash": "sha256-PhhItDKvlvx3uBDx+xEUVr0sW2Y9HiTR/IvsnXVNAqo=" }, - "version": "unstable-2024-05-03" + "version": "unstable-2024-05-17" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", From 659e499de4a548714d804c0d8dc37658107d2a96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 00:26:25 +0000 Subject: [PATCH 140/262] libretro.ppsspp: unstable-2024-05-03 -> unstable-2024-05-14 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..a9bc86e3679c 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -663,11 +663,11 @@ "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "60ffd07116d0a2e07db141db8414524138b6f035", - "hash": "sha256-tkIbsYjQRoV9A8NIDMJCRnHd+NCPycqrPu6JRjF6dHs=", + "rev": "dbcac0e48c769e4874028496c6d6f6ecc418e16f", + "hash": "sha256-Nn1kRh2xgKZWrrWRIuYkm4U7sJ5U9tMBRMZFTA4pcEE=", "fetchSubmodules": true }, - "version": "unstable-2024-05-03" + "version": "unstable-2024-05-14" }, "prboom": { "fetcher": "fetchFromGitHub", From 2a9f8e4832c52ee74c184c8cc51fdb6abdd4d0e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 00:26:28 +0000 Subject: [PATCH 141/262] libretro.fbneo: unstable-2024-05-07 -> unstable-2024-05-15 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..ce73ebec509e 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -287,10 +287,10 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "573c9b99e3cc0b11a652b2f21a22dcb15a2c4dda", - "hash": "sha256-MTRv/F68GiEwt5iN4xilTWGgTw2mf2aAvqDExgeN/g0=" + "rev": "d64b24ca2eaf5dcdc0e9e5a8ada95af736ec80d7", + "hash": "sha256-3arvKLXFXr7+s08IF4Qv215qfvi6uOk3afpo8zT4d3I=" }, - "version": "unstable-2024-05-07" + "version": "unstable-2024-05-15" }, "fceumm": { "fetcher": "fetchFromGitHub", From c6eda7dd345a22ab1ce35990fe6b460edb467889 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 00:26:34 +0000 Subject: [PATCH 142/262] libretro.mame2003-plus: unstable-2024-05-03 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..df04b8dd1f74 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -439,10 +439,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "11fad92faea0acfd3eb4fd15beced9088caab1fc", - "hash": "sha256-ck+zdwiuVw4bhPSdQxEz8a0nj8J6GP7ccvYRZ1WJy8s=" + "rev": "f0135f7f610c43496f376dfddbc60fc0ed24a736", + "hash": "sha256-jHilxNFL+n8QesjgD6lt8HQSVwA4uiLMsNa1JkkCIuA=" }, - "version": "unstable-2024-05-03" + "version": "unstable-2024-05-17" }, "mame2010": { "fetcher": "fetchFromGitHub", From 35f04b31e7a3c1165214faa4da766f4364d61d0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 00:27:20 +0000 Subject: [PATCH 143/262] libretro.tic80: unstable-2022-06-11 -> unstable-2024-05-13 --- pkgs/applications/emulators/retroarch/hashes.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..dbacfc11917d 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -844,11 +844,11 @@ "src": { "owner": "libretro", "repo": "tic-80", - "rev": "bd6ce86174fc7c9d7d3a86263acf3a7de1b62c11", + "rev": "6412f72d0f4725c153ce3d245729b829e713542e", "hash": "sha256-RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=", "fetchSubmodules": true }, - "version": "unstable-2022-06-11" + "version": "unstable-2024-05-13" }, "vba-m": { "fetcher": "fetchFromGitHub", From df7a9e9236bc33da5c5a5a7de0e55d5c4bff644a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 00:54:17 +0000 Subject: [PATCH 144/262] cyclonedds: 0.10.4 -> 0.10.5 --- pkgs/development/libraries/cyclonedds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cyclonedds/default.nix b/pkgs/development/libraries/cyclonedds/default.nix index 899249150b31..bdea4b68138a 100644 --- a/pkgs/development/libraries/cyclonedds/default.nix +++ b/pkgs/development/libraries/cyclonedds/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cyclonedds"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "eclipse-cyclonedds"; repo = "cyclonedds"; rev = version; - sha256 = "sha256-LSCfQPyd/QOsrnLNbKb0OlCvmHi/2aDDhi8VeXpYb1w="; + sha256 = "sha256-MQVUZ7PkxauoPpfxlhhAtsKztMe9tcZOpOzshuz/eb8="; }; patches = [ From e319c6c5eb7ae77458fdf4ced3aea188a4e86024 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 00:56:52 +0000 Subject: [PATCH 145/262] python311Packages.kaggle: 1.6.12 -> 1.6.14 --- pkgs/development/python-modules/kaggle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 38c3dce53151..815d1cd27e77 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "kaggle"; - version = "1.6.12"; + version = "1.6.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8SoFuC0q+xCnStxppfinNsZL2ZNNC1rPtP5PlzV1MLQ="; + sha256 = "sha256-WDUyveyjyeDK/EkxESxnN7Xmjxh6tZ7nff/fCf3529k="; }; propagatedBuildInputs = [ From 3f4f9b51d5c1cf4f32cc8c1e06d555c844497816 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 00:57:59 +0000 Subject: [PATCH 146/262] seqkit: 2.8.1 -> 2.8.2 --- pkgs/applications/science/biology/seqkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/applications/science/biology/seqkit/default.nix index 5c46e25f5d6d..0fbda84ccea7 100644 --- a/pkgs/applications/science/biology/seqkit/default.nix +++ b/pkgs/applications/science/biology/seqkit/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "seqkit"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "shenwei356"; repo = "seqkit"; rev = "v${version}"; - sha256 = "sha256-LtPf99spy2ByTnSMJ5k1mWkh+Nct3Fg4Y9mXARxuXlA="; + sha256 = "sha256-jCzd36ds9YVBpnyR3gDJSX3CCVXzC9WkQWmkcDiDWfM="; }; vendorHash = "sha256-0//kySYhNmfiwiys/Ku0/8RzKpnxO0+byD8pcIkvDY0="; From d870725f6bb51abb6de47dcf165b97c1365c49d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 01:15:00 +0000 Subject: [PATCH 147/262] libretro.bluemsx: unstable-2023-11-10 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..19ea8baee611 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -155,10 +155,10 @@ "src": { "owner": "libretro", "repo": "bluemsx-libretro", - "rev": "e8a4280bcbd149d1e020adcd9469ad9d8bd67412", - "hash": "sha256-uh4lMOCN1WXKVJybFkkGxIRWAlde74yPH5eaB1/1qsk=" + "rev": "0dcb73adef9601ca70d94b3f4e3ba1b3b54edbc0", + "hash": "sha256-jjo9vUMRZjHwhnh5OiC1JuNc/diJWoa/GcHwHnLIFqw=" }, - "version": "unstable-2023-11-10" + "version": "unstable-2024-05-17" }, "bsnes": { "fetcher": "fetchFromGitHub", From ac9b1ed2d830b01a0cffa0c0653f5c8af6626824 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 01:18:05 +0000 Subject: [PATCH 148/262] mdbook-katex: 0.8.0 -> 0.8.1 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 84e04e8e5669..f914dedaf6aa 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.8.0"; + version = "0.8.1"; src = fetchCrate { inherit pname version; - hash = "sha256-E/MVijHbd0VgBBHFGjizEBpHeNi52ina8k6dO+BOH/U="; + hash = "sha256-mVgI2lvT4w5+Tpq3Sx7j86LHFnuwI4bAAAqrUkiF1B4="; }; - cargoHash = "sha256-ZEN7tAB9+SX9hXvu4VHab8DwRp112hKIY/6yA97T+fw="; + cargoHash = "sha256-ps31HGsAqWJBTP7HNLjfTz610ihDlvfAvlRHqZR01No="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From bf0acb465619d4f0f625331d693e5faf21a6dbf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 01:21:06 +0000 Subject: [PATCH 149/262] nixpacks: 1.21.3 -> 1.22.0 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 5bbb8b217525..6d6fd23717e5 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.21.3"; + version = "1.22.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-niEuOsSOjHDP4KEax/OqQfxWC3XmTRUKB8k0DQ3Ybq0="; + sha256 = "sha256-O2A75cjTU72DGrg4PmEogN9aANYKIZWUkXfIJXs7CwA="; }; - cargoHash = "sha256-LMVYrxYpkwM9rdGkKaeLFKB+B2HI+AEDwrdBCAFLpJQ="; + cargoHash = "sha256-FS38zqPtmtyV6oSjfxtNMe8n+LMTU1eBN6oX6CGph6k="; # skip test due FHS dependency doCheck = false; From 6117d3d5c9793c3d78884b80b2915a8ca2db2fdc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 14 May 2024 22:56:33 +0000 Subject: [PATCH 150/262] buildbot: 3.11.1 -> 3.11.2 --- .../buildbot/master.nix | 4 +- .../continuous-integration/buildbot/pkg.nix | 4 +- .../buildbot/plugins.nix | 44 +++++++++---------- .../buildbot/worker.nix | 4 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 8de60461f730..7bf5eeab82ec 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -72,14 +72,14 @@ let in buildPythonApplication rec { pname = "buildbot"; - version = "3.11.1"; + version = "3.11.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ruYW1sVoGvFMi+NS+xiNsn0Iq2RmKlax4bxHgYrj6ZY="; + hash = "sha256-x7RaApfIe1x7Py1KLQCcotxU6dJRXTOk67W+QOhNJf0="; }; build-system = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index 4ccdb66d7b11..d121ec68cbde 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, buildbot }: buildPythonPackage rec { - pname = "buildbot-pkg"; + pname = "buildbot_pkg"; inherit (buildbot) version; src = fetchPypi { inherit pname version; - hash = "sha256-cfPsNnR0gEgz1y/GNR6faixk2HyuHaRh1E9nGHjCb58="; + hash = "sha256-ZgDHPC2j3vV3m7wBZhUUh/Th/oGKq+8RxnfQ71Cr6oY="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index b84e42c1bee7..ade8f2e243d4 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -3,12 +3,12 @@ # this is exposed for potential plugins to use and for nix-update inherit buildbot-pkg; www = buildPythonPackage rec { - pname = "buildbot-www"; + pname = "buildbot_www"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-5q4N76XHUhvc2lIqup0dYwrEdI5bR/96N7m2rhvPJh4="; + hash = "sha256-xOsz71kprzKKqvvwpsZTACWf4z+Svx9BQ72xGEZXKdw="; }; # Remove unnecessary circular dependency on buildbot @@ -30,12 +30,12 @@ }; www-react = buildPythonPackage rec { - pname = "buildbot-www-react"; + pname = "buildbot_www_react"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-kjow5WksdBzeo8nwXk5Djm/4tym8XvMo+VgiqSSAyKk="; + hash = "sha256-wUiMEAFmqjHXPjnPhsaLWqxvOXyEQIeRBL4W3LB3vkw="; }; # Remove unnecessary circular dependency on buildbot @@ -57,12 +57,12 @@ }; console-view = buildPythonPackage rec { - pname = "buildbot-console-view"; + pname = "buildbot_console_view"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-IrXDwO0YSpiZfw6B/lorEQdbAIZ5qCja75L/PFRmJms="; + hash = "sha256-KerHS5F4b30TvlGeSf6QLUt49S6Iki7O5nex6KPypJY="; }; buildInputs = [ buildbot-pkg ]; @@ -79,12 +79,12 @@ }; react-console-view = buildPythonPackage rec { - pname = "buildbot-react-console-view"; + pname = "buildbot_react_console_view"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-ZkUsAN56OEI/SphQydv4HkVV6Eobd0pd+UbXa23mBfQ="; + hash = "sha256-XrywoVM2ErJ4i7WrRKPRaCOwt5JVDJT6xP7L/Dfv+gk="; }; buildInputs = [ buildbot-pkg ]; @@ -101,12 +101,12 @@ }; waterfall-view = buildPythonPackage rec { - pname = "buildbot-waterfall-view"; + pname = "buildbot_waterfall_view"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-qL1+bpgxflcRTFPOvDHKdHilio28bbHClqy1Um4Se+o="; + hash = "sha256-mhVbuOhe0BrXHbn8bd41Q7I8Xak7fO8ahIK0r113vGY="; }; buildInputs = [ buildbot-pkg ]; @@ -123,12 +123,12 @@ }; react-waterfall-view = buildPythonPackage rec { - pname = "buildbot-react-waterfall-view"; + pname = "buildbot_react_waterfall_view"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-5D0N/5Sf8YNQBKt8GzAk1htdEY/xOmE5Abt5y7P9h34="; + hash = "sha256-X89XrjdD0GL7MabLWtkQcdCa4Ain1AGre6mXF/inmck="; }; buildInputs = [ buildbot-pkg ]; @@ -145,12 +145,12 @@ }; grid-view = buildPythonPackage rec { - pname = "buildbot-grid-view"; + pname = "buildbot_grid_view"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-snyJbQZqSIqOk6dTJidSv1VmE/Gn+pblcZs8BpZ+fdA="; + hash = "sha256-YH5SfYuW07Pp00LoBvcDB8MiHB1HzYWg5kQVICrkS5s="; }; buildInputs = [ buildbot-pkg ]; @@ -167,12 +167,12 @@ }; react-grid-view = buildPythonPackage rec { - pname = "buildbot-react-grid-view"; + pname = "buildbot_react_grid_view"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-0Ggm3NQn1ZZfMsMqf1qdCD1+HkJZmM1p+TqOPF0Q9CE="; + hash = "sha256-rmyAsFCTeIYPdrlWDCxlbjw+BCKwcIaTHlK8KJP0T88="; }; buildInputs = [ buildbot-pkg ]; @@ -189,12 +189,12 @@ }; wsgi-dashboards = buildPythonPackage rec { - pname = "buildbot-wsgi-dashboards"; + pname = "buildbot_wsgi_dashboards"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-rBUrYSeAWrxn5mlXaAAtE58jIZVLs/q69ARY2u6rTsI="; + hash = "sha256-Ls3NJka5vVTx1GW9bnr3jlulj7/pNkX9omXrTIWrwtU="; }; buildInputs = [ buildbot-pkg ]; @@ -211,12 +211,12 @@ }; react-wsgi-dashboards = buildPythonPackage rec { - pname = "buildbot-react-wsgi-dashboards"; + pname = "buildbot_react_wsgi_dashboards"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-U0DHWFMmvTKFBW1C5bnoemjMOKpw1H3GXnBn/AU52vY="; + hash = "sha256-t3LLZJ+kPcowqSyeRcuH3kEjBEiju1MI0z1qhU6KPBs="; }; buildInputs = [ buildbot-pkg ]; @@ -233,12 +233,12 @@ }; badges = buildPythonPackage rec { - pname = "buildbot-badges"; + pname = "buildbot_badges"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-7t4E7twn4TeJJCE5Vn83UzIRE2Okvcox2us1d8j50Os="; + hash = "sha256-//MftUqUWE2+RpxRPzDEH7tOCN2D1HD8dETZw1OQe5s="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 1b73737e42cb..80e255153b77 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -23,12 +23,12 @@ }: buildPythonPackage (rec { - pname = "buildbot-worker"; + pname = "buildbot_worker"; inherit (buildbot) version; src = fetchPypi { inherit pname version; - hash = "sha256-hRsmgP8IiWg5+YCqMVYgZc4ljWwz7YWfAFrmMHx8wBY="; + hash = "sha256-7DAo1Yy20FeWXawV4wHzXDGtgyIGDJQuD2joJma96rM="; }; postPatch = '' From 4b0c84c95a0747c55db48e09bc3b7d406be53f69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 01:35:22 +0000 Subject: [PATCH 151/262] process-compose: 1.5.0 -> 1.6.1 --- pkgs/applications/misc/process-compose/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 78a122528707..9cda45b04c32 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-OxEo5fkRSdEZLyvK4Pt3EOWLO0ph6RkSD2OOeAWg72M="; + hash = "sha256-yFKqdUlfiMQbx3yJLD5/BJ8pecg5NRr64+HbUwsEOE4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-X4pMes9hLMF8bZ6MX5cZdm4HfjnHYshGlA/lXlHr1Ow="; + vendorHash = "sha256-c53Af0X/TUFsxpV4YE525uh+yLG/t2tSmQkr9ElziBM="; doCheck = false; From bb40bd881a0d453cdc1b51f6d17540c36b83eb2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 01:36:42 +0000 Subject: [PATCH 152/262] php82Extensions.phalcon: 5.6.2 -> 5.7.0 --- pkgs/development/php-packages/phalcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index a8d19fa96b0a..09d35a40f0a3 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -9,13 +9,13 @@ buildPecl rec { pname = "phalcon"; - version = "5.6.2"; + version = "5.7.0"; src = fetchFromGitHub { owner = "phalcon"; repo = "cphalcon"; rev = "v${version}"; - hash = "sha256-AgyV9pxyXcXuhrRgozN2p67u8xZMepbWrzYaBZMFn6k="; + hash = "sha256-nckc7LPhXuUBJJvsqWEhH37K8fKdm9hIdkmVdiM3vcc="; }; internalDeps = [ From 5bee88d55cab342d875f044c7e1501f0c1c0e196 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 01:48:32 +0000 Subject: [PATCH 153/262] fflogs: 8.4.0 -> 8.5.6 --- pkgs/by-name/ff/fflogs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 350b62c224fb..bc0ca54fcebb 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.4.0"; + version = "8.5.6"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-dj6WUatWJBQZwNc8uHJYTRTpbhAmJowJmfUzbB2qbnw="; + hash = "sha256-mLqQ1T5mBNUkTkgbGO/nVkoSy6U7hVBk9EcYAjo3i3k="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in From 352da9cdd82f208db1826c3019c1eefce823aacf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 02:10:12 +0000 Subject: [PATCH 154/262] libretro.bsnes: unstable-2024-05-03 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..2b58bbc3ffd5 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -165,10 +165,10 @@ "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "b2f3ca10ee48546ad267719fb21bcf6b503d91e6", - "hash": "sha256-qClpkmkERAxdVL3DZvkUsmmGmFj6TArEBdS0AcIyXuA=" + "rev": "37606e377ebae5d3175cd6267e4ddfa3f3c5091f", + "hash": "sha256-B1ragos8ZeCjg8Xlt6SC8V69iTZ6OXTpPptlWw4EMOU=" }, - "version": "unstable-2024-05-03" + "version": "unstable-2024-05-17" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", From bcc4db60d8e62512d763e88aa7e84113f2f787c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 02:12:26 +0000 Subject: [PATCH 155/262] libretro.flycast: unstable-2024-05-11 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..a84588daa2e4 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -307,11 +307,11 @@ "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "f13d7ad2dcf141f59a999090dbc0f78be196e665", - "hash": "sha256-YFLSUaEikwLPglHh3t8sHiKHRn5cchKzzkJlZDdgVsU=", + "rev": "88f23958ace20840fb2666ccc42750a6f9b20d19", + "hash": "sha256-foLCf8E8HNT2DgSM5sUN4fkvJqBrlvOU6XBK4NgZzEU=", "fetchSubmodules": true }, - "version": "unstable-2024-05-11" + "version": "unstable-2024-05-17" }, "fmsx": { "fetcher": "fetchFromGitHub", From 60404a85f7b5afa4e9d5dc03198f7d152beee77b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 02:14:11 +0000 Subject: [PATCH 156/262] libretro.genesis-plus-gx: unstable-2024-05-10 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..d9021bdd7702 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -358,10 +358,10 @@ "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "ba9fc37cfa4930311a9c77b1d8a23df0cae95e9a", - "hash": "sha256-Smw0MoUfewlz0zYQmtFLB0n8l0KyyoInohXZ7d9Xrwk=" + "rev": "58cf8471e3aa09ac4cb4c4b2dc5fdf3d1d54d626", + "hash": "sha256-y1pVoKrIV5n2wKoUIkUEor2CKTx9CyvkDagkByuFeiE=" }, - "version": "unstable-2024-05-10" + "version": "unstable-2024-05-17" }, "gpsp": { "fetcher": "fetchFromGitHub", From 07e96fc0e1010feee4ae536553cba79c2f95fab0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 02:17:16 +0000 Subject: [PATCH 157/262] ff2mpv-rust: 1.1.3 -> 1.1.4 --- pkgs/by-name/ff/ff2mpv-rust/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ff/ff2mpv-rust/package.nix b/pkgs/by-name/ff/ff2mpv-rust/package.nix index 8114704b982c..a0d78cb2c3bc 100644 --- a/pkgs/by-name/ff/ff2mpv-rust/package.nix +++ b/pkgs/by-name/ff/ff2mpv-rust/package.nix @@ -23,16 +23,16 @@ in rustPlatform.buildRustPackage rec { pname = "ff2mpv-rust"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "ryze312"; repo = "ff2mpv-rust"; rev = version; - hash = "sha256-gk3MqoMCau6RTlttTLqFtlXhrYMOf89YFg8aAlh++9s="; + hash = "sha256-lQ1VRz/1HYZ3Il/LNNL+Jr6zFvGyxw9rUuzCCA1DZYo="; }; - cargoHash = "sha256-NjzqzfueqR1MNR23lRYj7IYIa+OHzVhpuAo18avKMUk="; + cargoHash = "sha256-cbueToB7zDHV4k9K8RusHjnMR0ElXsPEfuqHYli25nc="; postInstall = '' $out/bin/ff2mpv-rust manifest > manifest.json From 4a73c7b9a9ba51054ed72168eb363f1d685d6611 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 02:18:33 +0000 Subject: [PATCH 158/262] libretro.gambatte: unstable-2024-05-10 -> unstable-2024-05-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..8d2c20775ba1 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -348,10 +348,10 @@ "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "a7e645196f5e54904a056e390ac7ceb033037de0", - "hash": "sha256-pz/IQpjySByHnRu64Ysd1LJPrcImMQ0CfTRV4ONUsA0=" + "rev": "238b195bca073bc1a2032c4e92c097d157e521f8", + "hash": "sha256-i9+a1kVlJ6EPaCOMkuIZgujNEg6MwPRM3mHnhconWHo=" }, - "version": "unstable-2024-05-10" + "version": "unstable-2024-05-17" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", From a43331a5dbe0b365e4d4cacfee91b4987f3e8246 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 02:23:44 +0000 Subject: [PATCH 159/262] libretro.dosbox-pure: unstable-2023-12-29 -> unstable-2024-05-15 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d1ea92493c1c..2d540d3fe0ec 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -246,10 +246,10 @@ "src": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "87bf6365158325b76ff238c1ad8daf16a859bbe8", - "hash": "sha256-IU5AnOEuwZm/bJ9NuxhTQ8Tb5ngmjysLj/om/6P730s=" + "rev": "640452c18bbe15bfea4763883bcbc277317f1b6f", + "hash": "sha256-d1iyJNnq+ZbwAiRNOpmk+fDMnO/yg8EkvOuuHoyIyVw=" }, - "version": "unstable-2023-12-29" + "version": "unstable-2024-05-15" }, "easyrpg": { "fetcher": "fetchFromGitHub", From b2b7a4b1b1d6ac6496258eb654887a1c39691f59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 02:38:40 +0000 Subject: [PATCH 160/262] sickgear: 3.30.18 -> 3.30.19 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index fd405b598e92..1ad5c7c26eff 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.30.18"; + version = "3.30.19"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-Xt4/bAK48A57n2Kl3LQICem8IR3pgsdgMjlP9qEVvBM="; + hash = "sha256-OC/BJ0wG6as1dt2dO9gUFD+FG85Vt2ehCoTcmh6iT7w="; }; patches = [ From b537d168222d81f4e8b90592cddd0319322f1421 Mon Sep 17 00:00:00 2001 From: YvesStraten Date: Fri, 17 May 2024 10:45:28 +0800 Subject: [PATCH 161/262] picom-pijulius: init at 8.2-unstable-2024-04-30 --- pkgs/by-name/pi/picom-pijulius/package.nix | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/pi/picom-pijulius/package.nix diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix new file mode 100644 index 000000000000..bb41a7d221af --- /dev/null +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -0,0 +1,32 @@ +{ + picom, + lib, + fetchFromGitHub, + pcre +}: +picom.overrideAttrs (previousAttrs: { + pname = "picom-pijulius"; + version = "8.2-unstable-2024-04-30"; + + src = fetchFromGitHub { + owner = "pijulius"; + repo = "picom"; + rev = "e7b14886ae644aaa657383f7c4f44be7797fd5f6"; + hash = "sha256-YQVp5HicO+jbvCYSY+hjDTnXCU6aS3aCvbux6NFcJ/Y="; + }; + + buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; + + meta = { + inherit (previousAttrs.meta) + license + platforms + mainProgram + longDescription + ; + + description = "Pijulius's picom fork with extensive animation support"; + homepage = "https://github.com/pijulius/picom"; + maintainers = with lib.maintainers; [ YvesStraten ]; + }; +}) From 2d170a79f41487b9dd5250122acb47982fee320a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 02:57:00 +0000 Subject: [PATCH 162/262] vultr-cli: 3.0.3 -> 3.1.0 --- pkgs/development/tools/vultr-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index c380a2c45bc8..bab599fec169 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vultr-cli"; - version = "3.0.3"; + version = "3.1.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-6OVigI2eHE8qFC5nmH67NcKkDD0iFXl3ynYJyFcpmGw="; + hash = "sha256-Ur+zqoO824EHiVC5hW0twhxk5yRbKruqcQtLBOe7PXE="; }; - vendorHash = "sha256-MDzYiLMYoR9qOTPVnlzTDbgVvg72HDP2DpM6NKUFNdg="; + vendorHash = "sha256-fryHPFIgpuW05AwGozjefa+Nogh0gEOTh2C/JLrOm8Y="; nativeBuildInputs = [ installShellFiles ]; From 325de9f06bbe5e893a8860bd9529cf28a5dd4ef8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 03:01:00 +0000 Subject: [PATCH 163/262] xiu: 0.12.6 -> 0.12.7 --- pkgs/by-name/xi/xiu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix index 7857c9b1c3e6..369432312f04 100644 --- a/pkgs/by-name/xi/xiu/package.nix +++ b/pkgs/by-name/xi/xiu/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "xiu"; - version = "0.12.6"; + version = "0.12.7"; src = fetchFromGitHub { owner = "harlanc"; repo = "xiu"; rev = "v${version}"; - hash = "sha256-53fVb5c9uS92/rPvZDWXxZX42p4cHqumGe6Dw+/hLvk="; + hash = "sha256-tFArcI7NcIopM5uPshaOU3ExJW5URc5Mf2V0ZwwgwKo="; }; - cargoHash = "sha256-ICZQ+UJ4LPNSeT9SjdcCUXgam40hMAOrJmLIwPEfqs4="; + cargoHash = "sha256-OBL1uDVogcU6saEz2d2sWJTwXM2KE/YfhsNZtH0Cnk8="; nativeBuildInputs = [ cmake From 77c4ec3c6f3fbb8b4ece6c362edc1fe654db6ba2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 03:14:50 +0000 Subject: [PATCH 164/262] crunchy-cli: 3.6.1 -> 3.6.2 --- pkgs/by-name/cr/crunchy-cli/Cargo.lock | 63 +++++++++++++------------ pkgs/by-name/cr/crunchy-cli/package.nix | 4 +- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/cr/crunchy-cli/Cargo.lock b/pkgs/by-name/cr/crunchy-cli/Cargo.lock index 44a47cd532de..198afc90c11d 100644 --- a/pkgs/by-name/cr/crunchy-cli/Cargo.lock +++ b/pkgs/by-name/cr/crunchy-cli/Cargo.lock @@ -343,7 +343,7 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "crunchy-cli" -version = "3.6.1" +version = "3.6.2" dependencies = [ "chrono", "clap", @@ -356,7 +356,7 @@ dependencies = [ [[package]] name = "crunchy-cli-core" -version = "3.6.1" +version = "3.6.2" dependencies = [ "anyhow", "async-speed-limit", @@ -386,6 +386,7 @@ dependencies = [ "shlex", "sys-locale", "tempfile", + "time", "tokio", "tokio-util", "tower-service", @@ -475,12 +476,13 @@ dependencies = [ [[package]] name = "dash-mpd" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b4bdd5f1c0c7493d780c645f0bff5b9361e6408210fa88910adb181efca64c" +checksum = "876a00c22923799ac46365eb528c10134f979bf58ced5e3113de5b98d9835290" dependencies = [ "base64 0.22.1", "base64-serde", + "bytes", "chrono", "fs-err", "iso8601", @@ -580,9 +582,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1155,9 +1157,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -1344,9 +1346,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -1511,12 +1513,13 @@ checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" [[package]] name = "rsubs-lib" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcca2a9560fca05de8f95bc3767e46673d4b4c1f2c7a11092e10efd95bbdf62" +checksum = "f43e1a7f184bc76407dbaa67bd2aeea8a15430d7e1e498070963336d03ebedee" dependencies = [ "regex", "serde", + "time", ] [[package]] @@ -1533,9 +1536,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustfft" @@ -1604,9 +1607,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" @@ -1631,9 +1634,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" @@ -1669,18 +1672,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.200" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", @@ -1689,9 +1692,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -1839,9 +1842,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.60" +version = "2.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" dependencies = [ "proc-macro2", "quote", @@ -1898,18 +1901,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/by-name/cr/crunchy-cli/package.nix b/pkgs/by-name/cr/crunchy-cli/package.nix index 0855864a3fe8..059b28b1a4e0 100644 --- a/pkgs/by-name/cr/crunchy-cli/package.nix +++ b/pkgs/by-name/cr/crunchy-cli/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "crunchy-cli"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "crunchy-labs"; repo = "crunchy-cli"; rev = "v${version}"; - hash = "sha256-SlTdyEeqQ9lCrFFTDtMhP0Kvm+3gxiUS+ZB5LvNWSZU="; + hash = "sha256-gBkM+bcYfQNadFdC0lelaZmHi73zZvoq5HbgndMhbHk="; }; cargoLock = { From 9b15a14a98c48797ef4cff93f40c315822086099 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 03:27:56 +0000 Subject: [PATCH 165/262] surrealdb-migrations: 1.1.0 -> 1.5.0 --- .../database/surrealdb-migrations/Cargo.lock | 1222 ++++++++++------- .../database/surrealdb-migrations/default.nix | 4 +- 2 files changed, 702 insertions(+), 524 deletions(-) diff --git a/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock b/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock index 1f2f5fe8cd0f..4ccab5df7b79 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock +++ b/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock @@ -28,9 +28,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom", "once_cell", @@ -39,9 +39,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -52,18 +52,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -96,9 +96,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -134,6 +134,15 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea50b14b7a4b9343f8c627a7a53c52076482bd4bdad0a24fd3ec533ed616cc2c" +[[package]] +name = "approx" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" +dependencies = [ + "num-traits", +] + [[package]] name = "approx" version = "0.5.1" @@ -151,9 +160,9 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "argon2" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" dependencies = [ "base64ct", "blake2", @@ -178,9 +187,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.12" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" +checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" dependencies = [ "anstyle", "bstr", @@ -193,9 +202,9 @@ dependencies = [ [[package]] name = "assert_fs" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc5d78e9048d836d12a0c0040ca5f45b18a94d204b4ba4f677a8a7de162426b" +checksum = "2cd762e110c8ed629b11b6cde59458cc1c71de78ebbcc30099fc8e0403a2a2ec" dependencies = [ "anstyle", "doc-comment", @@ -219,9 +228,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee" dependencies = [ "async-lock", "async-task", @@ -233,24 +242,24 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 4.0.1", + "event-listener 4.0.3", "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] @@ -272,24 +281,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] name = "async-task" -version = "4.6.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.76" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531b97fb4cd3dfdce92c35dedbfdc1f0b9d8091c8ca943d6dae340ef5012d514" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] @@ -318,28 +327,17 @@ dependencies = [ "critical-section", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -352,9 +350,15 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "base64ct" @@ -364,11 +368,11 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bcrypt" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d1c9c15093eb224f0baa400f38fcd713fc1391a6f1c389d886beef146d60a3" +checksum = "e65938ed058ef47d92cf8b346cc76ef48984572ade631927e9937b5ffc7662c7" dependencies = [ - "base64", + "base64 0.22.0", "blowfish", "getrandom", "subtle", @@ -407,9 +411,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitvec" @@ -453,9 +457,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d4d6dafc1a3bb54687538972158f07b2c948bc57d5890df22c0739098b3028" +checksum = "0901fc8eb0aca4c83be0106d6f2db17d86a08dfc2c25f0e84464bf381158add6" dependencies = [ "borsh-derive", "cfg_aliases", @@ -463,23 +467,23 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0" +checksum = "51670c3aa053938b0ee3bd67c3817e471e626151131b934038e83c5bf8de48f5" dependencies = [ "once_cell", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", "syn_derive", ] [[package]] name = "bstr" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "regex-automata", @@ -488,15 +492,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecheck" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -505,9 +509,9 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ "proc-macro2", "quote", @@ -516,9 +520,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -528,24 +532,21 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" [[package]] name = "cedar-policy" -version = "2.4.3" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ff2003d0aba0a4b2e5212660321d63dc7c36efe636d6ca1882d489cbc0bef8" +checksum = "3d91e3b10a0f7f2911774d5e49713c4d25753466f9e11d1cd2ec627f8a2dc857" dependencies = [ "cedar-policy-core", "cedar-policy-validator", @@ -560,9 +561,9 @@ dependencies = [ [[package]] name = "cedar-policy-core" -version = "2.4.3" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c52f9666c7cb1b6f14a6e77d3ffcffa20fd3e1012ac8dcc393498c33ff632c3" +checksum = "cd2315591c6b7e18f8038f0a0529f254235fd902b6c217aabc04f2459b0d9995" dependencies = [ "either", "ipnet", @@ -583,9 +584,9 @@ dependencies = [ [[package]] name = "cedar-policy-validator" -version = "2.4.3" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a63c1a72bcafda800830cbdde316162074b341b7d59bd4b1cea6156f22dfa7" +checksum = "e756e1b2a5da742ed97e65199ad6d0893e9aa4bd6b34be1de9e70bd1e6adc7df" dependencies = [ "cedar-policy-core", "itertools 0.10.5", @@ -612,9 +613,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -622,7 +623,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] @@ -634,6 +635,33 @@ dependencies = [ "chrono", ] +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "cipher" version = "0.4.4" @@ -646,82 +674,43 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.25" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_derive 3.2.25", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", - "clap_derive 4.4.7", + "clap_derive", ] [[package]] name = "clap_builder" -version = "4.4.12" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", - "clap_lex 0.6.0", - "strsim", + "clap_lex", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", - "proc-macro-error", + "heck 0.5.0", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cli-table" @@ -748,9 +737,9 @@ dependencies = [ [[package]] name = "color-eyre" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" dependencies = [ "backtrace", "color-spantrace", @@ -796,9 +785,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-random" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" dependencies = [ "const-random-macro", ] @@ -841,9 +830,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -856,34 +845,28 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "crossbeam-deque" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.17" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -924,9 +907,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -934,27 +917,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.43", + "strsim 0.10.0", + "syn 2.0.58", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] @@ -964,7 +947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -978,9 +961,9 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -999,9 +982,9 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae2a35373c5c74340b79ae6780b498b2b183915ec5dacf263aac5a099bf485a" +checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" [[package]] name = "diff" @@ -1102,9 +1085,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "ena" @@ -1117,9 +1100,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1154,9 +1137,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.1" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ "concurrent-queue", "parking", @@ -1169,15 +1152,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.1", + "event-listener 4.0.3", "pin-project-lite", ] [[package]] name = "eyre" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", @@ -1185,9 +1168,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fixedbitset" @@ -1282,9 +1265,9 @@ dependencies = [ [[package]] name = "futures-concurrency" -version = "7.4.3" +version = "7.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef6712e11cdeed5c8cf21ea0b90fec40fbe64afc9bbf2339356197eeca829fc3" +checksum = "9b590a729e1cbaf9ae3ec294143ea034d93cbb1de01c884d04bcd0af8b613d02" dependencies = [ "bitvec", "futures-core", @@ -1318,9 +1301,9 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ "fastrand", "futures-core", @@ -1337,7 +1320,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] @@ -1426,11 +1409,11 @@ dependencies = [ [[package]] name = "geo-types" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567495020b114f1ce9bed679b29975aa0bfae06ac22beacd5cfde5dabe7b05d6" +checksum = "9ff16065e5720f376fbced200a5ae0f47ace85fd70b7e54269790281353b6d61" dependencies = [ - "approx", + "approx 0.5.1", "arbitrary", "num-traits", "rstar", @@ -1439,18 +1422,18 @@ dependencies = [ [[package]] name = "geographiclib-rs" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea804e7bd3c6a4ca6a01edfa35231557a8a81d4d3f3e1e2b650d028c42592be" +checksum = "e6e5ed84f8089c70234b0a8e0aedb6dc733671612ddc0d37c6066052f9781960" dependencies = [ - "lazy_static", + "libm", ] [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -1475,25 +1458,25 @@ dependencies = [ "bstr", "log", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "globwalk" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "ignore", "walkdir", ] [[package]] name = "h2" -version = "0.3.22" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1501,13 +1484,23 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", "tracing", ] +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + [[package]] name = "hash32" version = "0.2.1" @@ -1523,17 +1516,18 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.7", + "ahash 0.7.8", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.11", "allocator-api2", + "serde", ] [[package]] @@ -1556,19 +1550,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.1.19" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1587,9 +1578,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1665,9 +1656,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1704,9 +1695,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ "crossbeam-deque", "globset", @@ -1756,12 +1747,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -1780,17 +1771,6 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" -[[package]] -name = "is-terminal" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" -dependencies = [ - "hermit-abi 0.3.3", - "rustix", - "windows-sys 0.52.0", -] - [[package]] name = "itertools" version = "0.10.5" @@ -1811,58 +1791,57 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "lalrpop" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" +checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" dependencies = [ "ascii-canvas", "bit-set", - "diff", "ena", - "is-terminal", - "itertools 0.10.5", + "itertools 0.11.0", "lalrpop-util", "petgraph", "pico-args", "regex", - "regex-syntax 0.7.5", + "regex-syntax", "string_cache", "term", "tiny-keccak", "unicode-xid", + "walkdir", ] [[package]] name = "lalrpop-util" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" +checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex", + "regex-automata", ] [[package]] @@ -1885,9 +1864,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libm" @@ -1897,20 +1876,31 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", - "redox_syscall", +] + +[[package]] +name = "linfa-linalg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e7562b41c8876d3367897067013bb2884cc78e6893f092ecd26b305176ac82" +dependencies = [ + "ndarray", + "num-traits", + "rand", + "thiserror", ] [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -1924,9 +1914,19 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "matrixmultiply" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +dependencies = [ + "autocfg", + "rawpointer", +] [[package]] name = "md-5" @@ -1940,9 +1940,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "miette" @@ -1964,7 +1964,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] @@ -1991,18 +1991,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -2015,7 +2015,6 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" dependencies = [ - "clap 3.2.25", "rand", ] @@ -2038,10 +2037,39 @@ dependencies = [ ] [[package]] -name = "new_debug_unreachable" -version = "1.0.4" +name = "ndarray" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" +dependencies = [ + "approx 0.4.0", + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits", + "rawpointer", +] + +[[package]] +name = "ndarray-stats" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af5a8477ac96877b5bd1fd67e0c28736c12943aba24eda92b127e036b0c8f400" +dependencies = [ + "indexmap 1.9.3", + "itertools 0.10.5", + "ndarray", + "noisy_float", + "num-integer", + "num-traits", + "rand", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nibble_vec" @@ -2052,6 +2080,15 @@ dependencies = [ "smallvec", ] +[[package]] +name = "noisy_float" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978fe6e6ebc0bf53de533cd456ca2d9de13de13856eda1518a285d7705a213af" +dependencies = [ + "num-traits", +] + [[package]] name = "nom" version = "7.1.3" @@ -2107,20 +2144,34 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-complex" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -2129,9 +2180,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -2143,7 +2194,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "libc", ] @@ -2185,20 +2236,14 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "ordered-multimap" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "overload" version = "0.1.1" @@ -2251,6 +2296,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + [[package]] name = "path-clean" version = "1.0.1" @@ -2275,7 +2326,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" dependencies = [ - "base64", + "base64 0.21.7", "serde", ] @@ -2301,7 +2352,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.6", ] [[package]] @@ -2331,29 +2382,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2402,14 +2453,13 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "predicates" -version = "3.0.4" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" dependencies = [ "anstyle", "difflib", "float-cmp", - "itertools 0.11.0", "normalize-line-endings", "predicates-core", "regex", @@ -2443,11 +2493,10 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_datetime", "toml_edit", ] @@ -2477,9 +2526,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.71" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -2521,21 +2570,21 @@ dependencies = [ [[package]] name = "quick_cache" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c20af3800cee5134b79a3bd4a3d4b583c16ccfa5f53338f46400851a5b3819" +checksum = "b1380629287ed1247c1e0fcc6d43efdcec508b65382c9ab775cc8f3df7ca07b0" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.11", "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "parking_lot", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2587,6 +2636,18 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[package]] +name = "reblessive" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4149deda5bd21e0f6ccaa2f907cd542541521dead5861bc51bebdf2af4acaf2a" + [[package]] name = "redox_syscall" version = "0.4.1" @@ -2598,9 +2659,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -2609,75 +2670,69 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53313ec9f12686aeeffb43462c3ac77aa25f590a5f630eb2cde0de59417b29c7" +checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2566c4bf6845f2c2e83b27043c3f5dfcd5ba8f2937d6c00dc009bfb51a079dc4" +checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rend" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ "bytecheck", ] [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -2700,6 +2755,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-rustls", @@ -2714,17 +2770,11 @@ dependencies = [ "winreg", ] -[[package]] -name = "retain_mut" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" - [[package]] name = "revision" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87eb86913082f8976b06d07a59f17df9120e6f38b882cf3fc5a45b4499e224b6" +checksum = "588784c1d9453cfd2ce1b7aff06c903513677cf0e63779a0a3085ee8a44f5b17" dependencies = [ "bincode", "chrono", @@ -2740,15 +2790,15 @@ dependencies = [ [[package]] name = "revision-derive" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf996fc5f61f1dbec35799b5c00c6dda12e8862e8cb782ed24e10d0292e60ed3" +checksum = "854ff0b6794d4e0aab5e4486870941caefe9f258e63cad2f21b49a6302377c85" dependencies = [ "darling", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] @@ -2768,23 +2818,24 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rkyv" -version = "0.7.43" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ "bitvec", "bytecheck", @@ -2800,9 +2851,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.43" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ "proc-macro2", "quote", @@ -2810,14 +2861,34 @@ dependencies = [ ] [[package]] -name = "roaring" -version = "0.10.2" +name = "rmp" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6106b5cf8587f5834158895e9715a3c6c9716c8aefab57f1f7680917191c7873" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmpv" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e540282f11751956c82bc5529a7fb71b871b998fbf9cf06c2419b22e1b4350df" +dependencies = [ + "num-traits", + "rmp", +] + +[[package]] +name = "roaring" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf" dependencies = [ "bytemuck", "byteorder", - "retain_mut", "serde", ] @@ -2860,12 +2931,13 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" dependencies = [ "cfg-if", "ordered-multimap", + "trim-in-place", ] [[package]] @@ -2880,9 +2952,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.33.1" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ "arrayvec", "borsh", @@ -2920,11 +2992,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -2933,12 +3005,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", - "ring 0.17.7", + "ring 0.17.8", "rustls-webpki", "sct", ] @@ -2949,7 +3021,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64", + "base64 0.21.7", ] [[package]] @@ -2958,21 +3030,21 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "salsa20" @@ -3016,7 +3088,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -3028,9 +3100,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] @@ -3043,31 +3115,31 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -3087,16 +3159,17 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ - "base64", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", + "serde_derive", "serde_json", "serde_with_macros", "time", @@ -3104,21 +3177,21 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] name = "serial_test" -version = "2.0.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" +checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" dependencies = [ "dashmap", "futures", @@ -3130,13 +3203,13 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "2.0.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" +checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] @@ -3215,15 +3288,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smol_str" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" +checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" dependencies = [ "serde", ] @@ -3244,7 +3317,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -3258,12 +3331,12 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3272,7 +3345,7 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", "num-traits", "robust", "smallvec", @@ -3305,9 +3378,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.40.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c80afe31cdb649e56c0d9bb5503be9166600d68a852c38dd445636d126858e5" +checksum = "f7bbffee862a796d67959a89859d6b1046bb5016d63e23835ad0da182777bbe0" dependencies = [ "log", ] @@ -3362,6 +3435,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "subtle" version = "2.5.0" @@ -3370,9 +3449,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "surrealdb" -version = "1.2.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4c189541c759c763d4f5859a853afe85773baa0c95891f262425ff422394b0" +checksum = "6d8bb7301422b4b0945aef848285073fa95c1e1412a0952dbdc50917104c26d2" dependencies = [ "async-channel", "bincode", @@ -3382,19 +3461,20 @@ dependencies = [ "futures", "futures-concurrency", "geo 0.27.0", - "indexmap 2.1.0", + "indexmap 2.2.6", "once_cell", "path-clean", "pharos", "reqwest", "revision", - "ring 0.17.7", + "ring 0.17.8", "rust_decimal", "rustls", "semver", "serde", "serde_json", - "surrealdb-core", + "surrealdb-core 1.4.2", + "surrealdb-core 2.0.0-1.5.0", "thiserror", "tokio", "tokio-tungstenite", @@ -3410,9 +3490,9 @@ dependencies = [ [[package]] name = "surrealdb-core" -version = "1.2.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf33ccbc2348089fab502d38198f86762fc951ec90413fbd63f9195e76e6e08" +checksum = "7a2f403dba761e0e3404f90334f8ff1454f1f308e88c84dd5dbcee52866ff30e" dependencies = [ "addr", "any_ascii", @@ -3420,7 +3500,7 @@ dependencies = [ "async-channel", "async-executor", "async-recursion", - "base64", + "base64 0.21.7", "bcrypt", "bincode", "bytes", @@ -3450,7 +3530,86 @@ dependencies = [ "rand", "regex", "revision", - "ring 0.17.7", + "ring 0.17.8", + "roaring", + "rust-stemmers", + "rust_decimal", + "scrypt", + "semver", + "serde", + "serde_json", + "sha1", + "sha2", + "snap", + "storekey", + "surrealdb-derive", + "surrealdb-jsonwebtoken", + "thiserror", + "tokio", + "tracing", + "trice", + "ulid", + "url", + "uuid", + "wasm-bindgen-futures", + "wasmtimer", + "ws_stream_wasm", +] + +[[package]] +name = "surrealdb-core" +version = "2.0.0-1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a7c90233b21c23c669d462c1305693a4cdd6a5c7424654fbd9564564a6b8bf8" +dependencies = [ + "addr", + "ahash 0.8.11", + "any_ascii", + "argon2", + "async-channel", + "async-executor", + "async-recursion", + "base64 0.21.7", + "bcrypt", + "bincode", + "bytes", + "cedar-policy", + "chrono", + "ciborium", + "dashmap", + "deunicode", + "dmp", + "fst", + "futures", + "fuzzy-matcher", + "geo 0.27.0", + "geo-types", + "hashbrown 0.14.5", + "hex", + "ipnet", + "lexicmp", + "linfa-linalg", + "md-5", + "nanoid", + "ndarray", + "ndarray-stats", + "nom", + "num-traits", + "num_cpus", + "object_store", + "once_cell", + "pbkdf2", + "pharos", + "pin-project-lite", + "quick_cache", + "radix_trie", + "rand", + "reblessive", + "regex", + "reqwest", + "revision", + "ring 0.17.8", + "rmpv", "roaring", "rust-stemmers", "rust_decimal", @@ -3492,7 +3651,7 @@ version = "8.3.0-surreal.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02d4f759c65df8a8cf2d83c99db7fdd3ae5b8fff05fa7fe69a8612f29dd5f99b" dependencies = [ - "base64", + "base64 0.21.7", "getrandom", "hmac", "pem", @@ -3507,13 +3666,13 @@ dependencies = [ [[package]] name = "surrealdb-migrations" -version = "1.1.0" +version = "1.5.0" dependencies = [ "assert_cmd", "assert_fs", "chrono", "chrono-human-duration", - "clap 4.4.12", + "clap", "cli-table", "color-eyre", "convert_case", @@ -3521,7 +3680,7 @@ dependencies = [ "dir-diff", "fs_extra", "include_dir", - "itertools 0.12.0", + "itertools 0.12.1", "names", "predicates", "pretty_assertions", @@ -3549,9 +3708,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.43" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -3567,9 +3726,15 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "system-configuration" version = "0.5.1" @@ -3599,13 +3764,12 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", "windows-sys 0.52.0", ] @@ -3623,9 +3787,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -3636,37 +3800,31 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" -version = "1.0.52" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.52" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -3674,12 +3832,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -3694,10 +3853,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -3727,9 +3887,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -3750,7 +3910,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] @@ -3765,9 +3925,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -3776,9 +3936,9 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" +checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" dependencies = [ "async-stream", "bytes", @@ -3819,17 +3979,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "toml_datetime", "winnow", ] @@ -3859,7 +4019,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] @@ -3904,6 +4064,12 @@ dependencies = [ "web-sys", ] +[[package]] +name = "trim-in-place" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" + [[package]] name = "try-lock" version = "0.2.5" @@ -3938,12 +4104,14 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ulid" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" +checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" dependencies = [ + "getrandom", "rand", "serde", + "web-time", ] [[package]] @@ -3957,9 +4125,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -3969,24 +4137,24 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-script" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" [[package]] name = "unicode-security" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef5756b3097992b934b06608c69f48448a0fbe804bb1e72b982f6d7983e9e63" +checksum = "ee9e13753df674873f3c4693b240ae5c03245ddc157dfccf7c26db9329af3a11" dependencies = [ "unicode-normalization", "unicode-script", @@ -3994,9 +4162,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -4053,9 +4221,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "atomic", "getrandom", @@ -4086,9 +4254,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4111,9 +4279,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4121,24 +4289,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -4148,9 +4316,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4158,28 +4326,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -4203,9 +4371,19 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -4213,9 +4391,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "winapi" @@ -4254,7 +4432,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -4272,7 +4450,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -4292,17 +4470,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -4313,9 +4491,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -4325,9 +4503,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -4337,9 +4515,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -4349,9 +4527,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -4361,9 +4539,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -4373,9 +4551,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -4385,15 +4563,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.31" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -4459,7 +4637,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.58", ] [[package]] diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index 8ea134184326..39ecd0678ed1 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -10,7 +10,7 @@ let pname = "surrealdb-migrations"; - version = "1.1.0"; + version = "1.5.0"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-UnRf9HdEcKH0cOWKJIjgjNBlSVjXyk27bwB+4ftzAcs="; + hash = "sha256-x5WyaVHLVFCHWPqyEuaVSbeIaGXDB0o7h776udcC4DM="; }; cargoLock = { From 59921e79a26bfce40bc591c260684afa63a8e641 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Tue, 14 May 2024 18:33:58 -0400 Subject: [PATCH 166/262] ratchet: init at 0.9.2 Signed-off-by: Cameron Smith --- pkgs/by-name/ra/ratchet/package.nix | 70 +++++++++++++++++++++++++++++ pkgs/by-name/ra/ratchet/tests.nix | 17 +++++++ 2 files changed, 87 insertions(+) create mode 100644 pkgs/by-name/ra/ratchet/package.nix create mode 100644 pkgs/by-name/ra/ratchet/tests.nix diff --git a/pkgs/by-name/ra/ratchet/package.nix b/pkgs/by-name/ra/ratchet/package.nix new file mode 100644 index 000000000000..627ba522491f --- /dev/null +++ b/pkgs/by-name/ra/ratchet/package.nix @@ -0,0 +1,70 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + callPackage, +}: +buildGoModule rec { + pname = "ratchet"; + version = "0.9.2"; + + # ratchet uses the git sha-1 in the version string, e.g. + # + # $ ./ratchet --version + # ratchet 0.9.2 (d57cc1a53c022d3f87c4820bc6b64384a06c8a07, darwin/arm64) + # + # so we need to either hard-code the sha-1 corresponding to the version tag + # head or retain the git metadata folder and extract it using the git cli. + # We currently hard-code it. + src = fetchFromGitHub { + owner = "sethvargo"; + repo = "ratchet"; + rev = "d57cc1a53c022d3f87c4820bc6b64384a06c8a07"; + hash = "sha256-gQ98uD9oPUsECsduv/lqGdYNmtHetU49ETfWCE8ft8U="; + }; + + proxyVendor = true; + vendorHash = "sha256-J7LijbhpKDIfTcQMgk2x5FVaYG7Kgkba/1aSTmgs5yw="; + + subPackages = [ "." ]; + + ldflags = + let + package_url = "github.com/sethvargo/ratchet"; + in + [ + "-s" + "-w" + "-X ${package_url}/internal/version.name=${pname}" + "-X ${package_url}/internal/version.version=${version}" + "-X ${package_url}/internal/version.commit=${src.rev}" + ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/ratchet --version 2>&1 | grep ${version}; + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -Dm755 "$GOPATH/bin/ratchet" -T $out/bin/ratchet + runHook postInstall + ''; + + passthru.tests = { + execution = callPackage ./tests.nix { }; + }; + + meta = with lib; { + description = "A tool for securing CI/CD workflows with version pinning."; + mainProgram = "ratchet"; + downloadPage = "https://github.com/sethvargo/ratchet"; + homepage = "https://github.com/sethvargo/ratchet"; + license = licenses.asl20; + maintainers = with maintainers; [ + cameronraysmith + ryanccn + ]; + }; +} diff --git a/pkgs/by-name/ra/ratchet/tests.nix b/pkgs/by-name/ra/ratchet/tests.nix new file mode 100644 index 000000000000..7585c06d9172 --- /dev/null +++ b/pkgs/by-name/ra/ratchet/tests.nix @@ -0,0 +1,17 @@ +{ + lib, + runCommand, + ratchet, +}: let + inherit (ratchet) pname version; +in + runCommand "${pname}-tests" {meta.timeout = 60;} + '' + set -euo pipefail + + # Ensure ratchet is executable + ${ratchet}/bin/ratchet --version + ${ratchet}/bin/ratchet --help + + touch $out + '' From 6baeab792e4d19e74f360c1ffe5d5f019751ae3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 03:39:40 +0000 Subject: [PATCH 167/262] mpvScripts.mpv-webm: 0-unstable-2024-04-22 -> 0-unstable-2024-05-13 --- pkgs/applications/video/mpv/scripts/mpv-webm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv-webm.nix b/pkgs/applications/video/mpv/scripts/mpv-webm.nix index 051cc76883c4..409d86c193f4 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-webm.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -8,13 +8,13 @@ buildLua { pname = "mpv-webm"; - version = "0-unstable-2024-04-22"; + version = "0-unstable-2024-05-13"; src = fetchFromGitHub { owner = "ekisu"; repo = "mpv-webm"; - rev = "225e8e53842f7da6f77034309c1e54293dc629a4"; - hash = "sha256-82xWiuOChxfzX6e0+cGFxTqyuiPefyVwpvLM5ka7nPk="; + rev = "8d4902b2aec92f40e4595ec9a411ab90488dcf4e"; + hash = "sha256-aPPVAZu9reDdyovSpDklYZYLaapKBclAx3lCYUMJt+w="; }; passthru.updateScript = unstableGitUpdater { # only "latest" tag pointing at HEAD From adc0a50adf2df0e157b9b923f89e716386b79fe3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 04:09:56 +0000 Subject: [PATCH 168/262] python311Packages.pycaption: 2.2.6 -> 2.2.7 --- pkgs/development/python-modules/pycaption/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index 900f93bbea87..3d4e391c0be1 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.2.6"; + version = "2.2.7"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pbs"; repo = "pycaption"; rev = "refs/tags/${version}"; - hash = "sha256-XN83L6WsRyl9G0ia4uz3SCVcwwUNUyfNMB64RfZh+PA="; + hash = "sha256-0rh8w4zQN5qAIPwnm7FO6VyPxMdutYFflpY+xWdEm3M="; }; nativeBuildInputs = [ From 970f689a49f098197464b053a67c753738733a8d Mon Sep 17 00:00:00 2001 From: crayor1 <126188437+crayor1@users.noreply.github.com> Date: Sat, 18 May 2024 07:06:50 +0200 Subject: [PATCH 169/262] nixos/doc: fix a typo in option-declarations.section.md (#304733) Fix a typo --- nixos/doc/manual/development/option-declarations.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index 325f4d11cb08..ee4540d0cf6f 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -173,7 +173,7 @@ lib.mkOption { ## Extensible Option Types {#sec-option-declarations-eot} -Extensible option types is a feature that allow to extend certain types +Extensible option types is a feature that allows to extend certain types declaration through multiple module files. This feature only work with a restricted set of types, namely `enum` and `submodules` and any composed forms of them. From 537c6bc478509bba0a7d698fbedaef79ca615ed0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 05:08:10 +0000 Subject: [PATCH 170/262] python311Packages.summarytools: 0.2.3 -> 0.3.0 --- pkgs/development/python-modules/summarytools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/summarytools/default.nix b/pkgs/development/python-modules/summarytools/default.nix index 4bbbae78c88b..b9ae6876c945 100644 --- a/pkgs/development/python-modules/summarytools/default.nix +++ b/pkgs/development/python-modules/summarytools/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "summarytools"; - version = "0.2.3"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { # no version tags in GitHub repo src = fetchPypi { inherit pname version; - hash = "sha256-wsDf9IXCMQe0cVfQQuRVwMhxkhhUxbPu06yWZPLvgw4="; + hash = "sha256-m29ug+JZC4HgMIVopovA/dyR40Z1IcADOiDWKg9mzdc="; }; nativeBuildInputs = [ setuptools ]; From 2db0f27a1625fa96a61bed8b03f954401042ca36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 05:24:26 +0000 Subject: [PATCH 171/262] go-minimock: 3.3.8 -> 3.3.9 --- pkgs/development/tools/go-minimock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix index 8a02ab2c82da..efcece3e61c1 100644 --- a/pkgs/development/tools/go-minimock/default.nix +++ b/pkgs/development/tools/go-minimock/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-minimock"; - version = "3.3.8"; + version = "3.3.9"; src = fetchFromGitHub { owner = "gojuno"; repo = "minimock"; rev = "v${version}"; - sha256 = "sha256-FPp2CunPCVxuz+MUKyy1HQdWc9TeLG7ri5vI7ig/xeM="; + sha256 = "sha256-J/nZJrq7CKF5dYj096svBZf9SaD9ehIk/I293y7IQXc="; }; ldflags = [ From 35c35026c13e81cfae1be8e1f9e1f0d2decf84b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 05:24:48 +0000 Subject: [PATCH 172/262] goreleaser: 1.26.0 -> 1.26.1 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index d1e82f654b85..1fff3856bfb6 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -9,16 +9,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-opc/bCqTZuQaNghQcS5iBMgKBdg8ppw3xlU9JZlHDGk="; + hash = "sha256-ZUHXH8WBjYW5qE7iQPP8URMUNxn2eLl4UbhAxDbn3qI="; }; - vendorHash = "sha256-8ZdeOXS5fixazL7jzLYNmff/5SRSgzKvXK95hmOLd/I="; + vendorHash = "sha256-EPrYZz6I9M+zih4gGQTtJ5LAjsQgDqvNMk7hU3PwkKQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; From fea90b41720d833d21396649d110c38c59e1095a Mon Sep 17 00:00:00 2001 From: oluceps Date: Sat, 18 May 2024 05:30:01 +0000 Subject: [PATCH 173/262] hysteria: 2.4.3 -> 2.4.4 Diff: https://github.com/apernet/hysteria/compare/app/v2.4.3...app/v2.4.4 --- pkgs/tools/networking/hysteria/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index 5443d2c7f957..b6fdc349b9c7 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "hysteria"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "apernet"; repo = pname; rev = "app/v${version}"; - hash = "sha256-4i3bXtg7WCSPDE7fUWVJnOOFNGLAo1F/a2wbuUH785o="; + hash = "sha256-p6h9cZYSxyMgLaVASnbHk6Bjdt6tTqj/9vhTS/CaiWA="; }; - vendorHash = "sha256-dV/bomGPg0Q3OEDuu6vRVsFRveDVzw6Hv0KLla2uZqc="; + vendorHash = "sha256-DiwF8QuEs5JaSL+G6aycW01bXnQtL/GTd5kYsYeJUD4="; proxyVendor = true; ldflags = From c8b6ef7da02fee24fc927d4d63c49b6d47c879f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 05:38:30 +0000 Subject: [PATCH 174/262] python311Packages.weaviate-client: 4.6.0 -> 4.6.2 --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 9047bc8fb176..8e5b16ef0015 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.6.0"; + version = "4.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; rev = "refs/tags/v${version}"; - hash = "sha256-F4FFG8W8zjEcD1OssioKTik0sy6B/kGITYfW+bqhNkQ="; + hash = "sha256-BegAiAOhVafH7NWVgayRbdLKBYjWmD5zC6P7tU11XKM="; }; pythonRelaxDeps = [ From 8b636537d6d9591e8165ac450dbebbd4eca3429c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 06:05:32 +0000 Subject: [PATCH 175/262] python311Packages.google-cloud-netapp: 0.3.9 -> 0.3.10 --- .../python-modules/google-cloud-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index 6f9162b757a7..7c6b06e12180 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-netapp"; - version = "0.3.9"; + version = "0.3.10"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Vohliy9W+fkY4YmSIvw6WiWVlLBk+Fo9CvZG/VKeU1o="; + hash = "sha256-Bau1Xqb+lmG6aCoWm93mtfOII7CbnnaeZ5vmLp6n0Zs="; }; build-system = [ From 42d7fd413c945f3c379319a98ba151a17051c1a3 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sat, 18 May 2024 06:18:24 +0000 Subject: [PATCH 176/262] kakoune: 2024.05.09 -> 2024.05.18 --- pkgs/applications/editors/kakoune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 9a3522c5a531..a1319f573546 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "kakoune-unwrapped"; - version = "2024.05.09"; + version = "2024.05.18"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${finalAttrs.version}"; - hash = "sha256-Dfp33zk9ZUMrCZRfPNfoSX6rgQKItvOQx+CuRNQgtTA="; + hash = "sha256-1nYSVbvQ4tz1r8p7zCD6w/79haqpelb15qva9r3Fwew="; }; makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; From 8abfe4639a1788c9c613a25d4ab7912cb03c4a07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 06:29:45 +0000 Subject: [PATCH 177/262] rar: 7.00 -> 7.01 --- pkgs/tools/archivers/rar/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index fabcfde887e0..cd78e11e80bb 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -6,25 +6,25 @@ }: let - version = "7.00"; + version = "7.01"; downloadVersion = lib.replaceStrings [ "." ] [ "" ] version; # Use `./update.sh` to generate the entries below srcs = { i686-linux = { url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz"; - hash = "sha256-5y2BaclEKLUpZayqzilaLPcYi0dZkKpn99n5E+Z5lOo="; + hash = "sha256-1CSbxM7arGpn4Yj5fHEFKcDURFPrC2+XptLoaDH8LDs="; }; x86_64-linux = { url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz"; - hash = "sha256-Hbv68alpeCbuHFLP36EGZ/9nE1ANlpJjg6h3Gz7u4iI="; + hash = "sha256-34iWajylsSmIOuAT6kV7c2537qWFHc+gT+JT/trWrw8="; }; aarch64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz"; - hash = "sha256-icfpbU/UkysY4Z2wHDMWy1FnuqYkDJeDkF8yUrZuMUM="; + hash = "sha256-BjEJFzKyRpN4XL6KYW7ykQcSxqF4tYr2dCFf50JHH38="; }; x86_64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz"; - hash = "sha256-/ImdlFyCCKU1/1XluAxCz11lge7+EoIE1zjBL9c2IQc="; + hash = "sha256-1ExnVDre49wWwB/BKP/L9xdYOMx8qkeZfmObJ7xm4dY="; }; }; manSrc = fetchurl { From a11ac03aeb21778b38af8555dd8c9c78e0b715ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 06:52:28 +0000 Subject: [PATCH 178/262] python311Packages.influxdb3-python: 0.4.0 -> 0.5.0 --- pkgs/development/python-modules/influxdb3-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb3-python/default.nix b/pkgs/development/python-modules/influxdb3-python/default.nix index 23b4bcc4c3bf..86a774e916c3 100644 --- a/pkgs/development/python-modules/influxdb3-python/default.nix +++ b/pkgs/development/python-modules/influxdb3-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "influxdb3-python"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "InfluxCommunity"; repo = "influxdb3-python"; rev = "refs/tags/v${version}"; - hash = "sha256-qFcXqbYsjn27BPeKxTsWxKJdF6y8Oz3VBrmSyO0vCGo="; + hash = "sha256-vumKOvCLpcu0z1W/zmf3qsSo3a8FEbI+20/IMt6nCX4="; }; build-system = [ setuptools ]; From 9cc583b9d176d38d31e433f22838c78b74878d23 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Fri, 17 May 2024 16:39:13 -0700 Subject: [PATCH 179/262] unixtools: Add entries for FreeBSD --- pkgs/top-level/unixtools.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index 454c4802dc91..428a37363d7e 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -1,4 +1,4 @@ -{ pkgs, buildEnv, runCommand, lib, stdenv }: +{ pkgs, buildEnv, runCommand, lib, stdenv, freebsd }: # These are some unix tools that are commonly included in the /usr/bin # and /usr/sbin directory under more normal distributions. Along with @@ -59,6 +59,7 @@ let arp = { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; + freebsd = pkgs.freebsd.arp; }; col = { linux = pkgs.util-linux; @@ -80,6 +81,7 @@ let linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc.getent else pkgs.netbsd.getent; darwin = pkgs.netbsd.getent; + freebsd = pkgs.freebsd.getent; }; getopt = { linux = pkgs.util-linux; @@ -88,6 +90,7 @@ let fdisk = { linux = pkgs.util-linux; darwin = pkgs.darwin.diskdev_cmds; + freebsd = pkgs.freebsd.fdisk; }; fsck = { linux = pkgs.util-linux; @@ -100,10 +103,12 @@ let hostname = { linux = pkgs.nettools; darwin = pkgs.darwin.shell_cmds; + freebsd = pkgs.freebsd.bin; }; ifconfig = { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; + freebsd = pkgs.freebsd.ifconfig; }; killall = { linux = pkgs.psmisc; @@ -112,6 +117,7 @@ let locale = { linux = pkgs.glibc; darwin = pkgs.darwin.adv_cmds; + freebsd = pkgs.freebsd.locale; }; logger = { linux = pkgs.util-linux; @@ -123,18 +129,22 @@ let mount = { linux = pkgs.util-linux; darwin = pkgs.darwin.diskdev_cmds; + freebsd = freebsd.mount; }; netstat = { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; + freebsd = pkgs.freebsd.netstat; }; ping = { linux = pkgs.iputils; darwin = pkgs.darwin.network_cmds; + freebsd = freebsd.ping; }; ps = { linux = pkgs.procps; darwin = pkgs.darwin.ps; + freebsd = pkgs.freebsd.bin; }; quota = { linux = pkgs.linuxquota; @@ -143,6 +153,7 @@ let route = { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; + freebsd = pkgs.freebsd.route; }; script = { linux = pkgs.util-linux; @@ -151,10 +162,12 @@ let sysctl = { linux = pkgs.procps; darwin = pkgs.darwin.system_cmds; + freebsd = pkgs.freebsd.sysctl; }; top = { linux = pkgs.procps; darwin = pkgs.darwin.top; + freebsd = pkgs.freebsd.top; }; umount = { linux = pkgs.util-linux; @@ -171,8 +184,9 @@ let linux = pkgs.procps; # watch is the only command from procps that builds currently on - # Darwin. Unfortunately no other implementations exist currently! + # Darwin/FreeBSD. Unfortunately no other implementations exist currently! darwin = pkgs.callPackage ../os-specific/linux/procps-ng {}; + freebsd = pkgs.callPackage ../os-specific/linux/procps-ng {}; }; write = { linux = pkgs.util-linux; @@ -181,6 +195,7 @@ let xxd = { linux = pkgs.vim.xxd; darwin = pkgs.vim.xxd; + freebsd = pkgs.vim.xxd; }; }; From f3cb8b378d5e8899990162c8788c067166a04334 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 10:09:41 +0300 Subject: [PATCH 180/262] trilium-{server,desktop}: 0.63.5 -> 0.63.6 --- pkgs/applications/office/trilium/desktop.nix | 6 +++--- pkgs/applications/office/trilium/server.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index e2ad6d5d5f82..9681c5fc9b8a 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -7,13 +7,13 @@ let pname = "trilium-desktop"; - version = "0.63.5"; + version = "0.63.6"; linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - linuxSource.sha256 = "1a2h96gd04mqn6cskjhj657dx9wqvlqsvgydjbaqpwc8593swpb3"; + linuxSource.sha256 = "12kgq5x4f93hxz057zqhz0x1y0rxfxh90fv9fjjs3jrnk0by7f33"; darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; - darwinSource.sha256 = "155y85vsawrqd0wcdpl87sv9s2nkamc73aiklsw8nbw1x96hqvap"; + darwinSource.sha256 = "0ry512cn622av3nm8rnma2yvqc71rpzax639872ivvc5vm4rsc30"; meta = metaCommon // { mainProgram = "trilium"; diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 09983d4d0091..4d6dbaa0f7cf 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -3,8 +3,8 @@ let serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "02kd7gm93nmxsxy1bx5kac7jizslik9nlfcnq8kn6mprfcv8anfn"; - version = "0.63.5"; + serverSource.sha256 = "0gwp6h6nvfzq7k1g3233h838nans45jkd5c3pzl6qdhhm19vcs27"; + version = "0.63.6"; in stdenv.mkDerivation { pname = "trilium-server"; inherit version; From d0f0b1917f9e3364454c397ae4a2a35e16e4a8f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 09:37:13 +0200 Subject: [PATCH 181/262] cnspec: 11.4.2 -> 11.4.3 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.4.2...v11.4.3 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.4.3 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 6bcdfd5a17de..2835576a8d6a 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.4.2"; + version = "11.4.3"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-+UKiv+0BRmzu7ER6NE9jkZlov2MC2EEmpH7XWtJkBxA="; + hash = "sha256-vLkGysRhcSzSu++p71hZLbA0RNCDcukC3HqPrUugd/s="; }; proxyVendor = true; - vendorHash = "sha256-JxyThRpr1XFYtg3Z5cF/LnGFqG9vzVpGZRNpgHpE458="; + vendorHash = "sha256-wL0cXNfJ8qyonUQRE7w2cRoqGLa6NGhv3EPFie/9/Z4="; subPackages = [ "apps/cnspec" ]; From ddedbaa78d3e3091b9f0746d653348c61367b63d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 May 2024 11:50:43 +0200 Subject: [PATCH 182/262] qovery-cli: 0.92.4 -> 0.92.6 Diff: https://github.com/Qovery/qovery-cli/compare/refs/tags/v0.92.4...v0.92.6 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.92.6 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 2abc5b851039..c2b9dcd154a8 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.92.4"; + version = "0.92.6"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-A8R1QbUFD4wJyLrTrxE8w9rz0E/vhaPXXAt80UpAOSc="; + hash = "sha256-SM24vC3vVAsRwndrfjz2rLRLfvDJ8o7YnUGCFbIt4gQ="; }; vendorHash = "sha256-6gjYnDv4L2AO47uWcp/MySX9i3IDMIWQUvgglxPCvGo="; From 1e59710d0f39f17d45a6e4955e9493cb756a1ac4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 09:38:35 +0200 Subject: [PATCH 183/262] qovery-cli: 0.92.6 -> 0.92.8 Diff: https://github.com/Qovery/qovery-cli/compare/refs/tags/v0.92.6...v0.92.8 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.92.8 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index c2b9dcd154a8..d51b0e716c97 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.92.6"; + version = "0.92.8"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-SM24vC3vVAsRwndrfjz2rLRLfvDJ8o7YnUGCFbIt4gQ="; + hash = "sha256-8QDuYb6NzoX9c+gROR5ECqAp/pfwFtPPNMaNiWGPtD4="; }; vendorHash = "sha256-6gjYnDv4L2AO47uWcp/MySX9i3IDMIWQUvgglxPCvGo="; From 2d2dacc5d5b38a660e3740d357d8aa7fd6e9c3eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 09:41:16 +0200 Subject: [PATCH 184/262] python312Packages.playwrightcapture: 1.24.8 -> 1.24.9 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.24.8...v1.24.9 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.24.9 --- .../python-modules/playwrightcapture/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index c13df7c6fea1..6b56b7c67fc0 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -1,11 +1,13 @@ { lib, + aiohttp, + aiohttp-socks, beautifulsoup4, buildPythonPackage, dateparser, fetchFromGitHub, - playwright, playwright-stealth, + playwright, poetry-core, puremagic, pydub, @@ -21,7 +23,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.24.8"; + version = "1.24.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +32,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-91EVR4cW383HiwcAg4BuhuC5jlwLwP1IFodD1iIo1j4="; + hash = "sha256-XWl/vvPMSD7oCl2/qG4y1ERopQdi5O9erFFpTmK8U5k="; }; pythonRelaxDeps = [ @@ -45,6 +47,8 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ + aiohttp + aiohttp-socks beautifulsoup4 dateparser playwright From b22f296313b56ed6e0aef23c88542431d2183c34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 04:16:51 +0000 Subject: [PATCH 185/262] phosh: 0.37.1 -> 0.39.0 --- pkgs/applications/window-managers/phosh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 853ceb8a083b..df57c4cbec10 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -36,12 +36,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "phosh"; - version = "0.37.1"; + version = "0.39.0"; src = fetchurl { # Release tarball which includes subprojects gvc and libcall-ui url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-74H4GLFIIs97iVE8IWPxS9hALkBGkcKmrMe6/uxtPuM="; + hash = "sha256-n1ZegSJAUr1Lbn0+Mx64vHhl4bwSJEdnO1xN/QdEKlw="; }; nativeBuildInputs = [ From cfa2ca888d02bfb784362512c235177953c466e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 09:45:16 +0200 Subject: [PATCH 186/262] python312Packages.pytransportnswv2: 0.2.4 -> 0.3.0 --- .../python-modules/pytransportnswv2/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix index a2cf2afb7087..b211c271ce20 100644 --- a/pkgs/development/python-modules/pytransportnswv2/default.nix +++ b/pkgs/development/python-modules/pytransportnswv2/default.nix @@ -8,15 +8,14 @@ buildPythonPackage rec { pname = "pytransportnswv2"; - version = "0.2.4"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { - pname = "PyTransportNSWv2"; - inherit version; - sha256 = "129rrqckqgfrwdx0b83dqphcv55cxs5i8jl1ascia7rpzjn109ah"; + inherit pname version; + hash = "sha256-9bpIu+Uc6eFSEGeEfpVwfrhvLekR8qOd571qMnLTpVg="; }; propagatedBuildInputs = [ From b0997943982a4e4aac679ea79b952bb4ce5e2a51 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Sat, 18 May 2024 09:46:07 +0200 Subject: [PATCH 187/262] platformsh: fix build --- pkgs/by-name/pl/platformsh/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pl/platformsh/package.nix b/pkgs/by-name/pl/platformsh/package.nix index eb4c12e88b8b..6bf7a9a9c9b4 100644 --- a/pkgs/by-name/pl/platformsh/package.nix +++ b/pkgs/by-name/pl/platformsh/package.nix @@ -3,6 +3,7 @@ lib, fetchurl, testers, + installShellFiles, platformsh }: @@ -10,6 +11,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "platformsh"; version = "5.0.13"; + nativeBuildInputs = [ installShellFiles ]; + src = { x86_64-darwin = fetchurl { @@ -39,7 +42,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm755 platformsh $out/bin/platformsh + install -Dm755 platform $out/bin/platform + + installShellCompletion completion/bash/platform.bash \ + completion/zsh/_platform runHook postInstall ''; From cfc8c3afcde9e34ca31dfef9a24a116026f30c81 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 09:51:42 +0200 Subject: [PATCH 188/262] python312Packages.pytransportnswv2: refactor --- .../python-modules/pytransportnswv2/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix index b211c271ce20..6d3e6d8a59ec 100644 --- a/pkgs/development/python-modules/pytransportnswv2/default.nix +++ b/pkgs/development/python-modules/pytransportnswv2/default.nix @@ -1,24 +1,29 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , gtfs-realtime-bindings +, pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "pytransportnswv2"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-9bpIu+Uc6eFSEGeEfpVwfrhvLekR8qOd571qMnLTpVg="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ gtfs-realtime-bindings requests ]; @@ -31,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to access Transport NSW information"; homepage = "https://github.com/andystewart999/TransportNSW"; - license = with licenses; [ gpl3Only ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; } From a00b196f102e91108ee79193715610b70dae9735 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 09:51:59 +0200 Subject: [PATCH 189/262] python312Packages.pytransportnswv2: format with nixfmt --- .../pytransportnswv2/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix index 6d3e6d8a59ec..2f4bc7370976 100644 --- a/pkgs/development/python-modules/pytransportnswv2/default.nix +++ b/pkgs/development/python-modules/pytransportnswv2/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchPypi -, gtfs-realtime-bindings -, pythonOlder -, requests -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + gtfs-realtime-bindings, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { @@ -19,9 +20,7 @@ buildPythonPackage rec { hash = "sha256-9bpIu+Uc6eFSEGeEfpVwfrhvLekR8qOd571qMnLTpVg="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ gtfs-realtime-bindings From e8c4a99e94fadc4b46e6026f5b1579b3df35bfde Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 18 May 2024 10:18:15 +1000 Subject: [PATCH 190/262] treefmt2: 2.0.0-rc1 -> 2.0.0-rc2 Diff: https://github.com/numtide/treefmt/compare/v2.0.0-rc1...v2.0.0-rc2 --- pkgs/by-name/tr/treefmt2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/treefmt2/package.nix b/pkgs/by-name/tr/treefmt2/package.nix index defe9100906a..e6919ad15ad4 100644 --- a/pkgs/by-name/tr/treefmt2/package.nix +++ b/pkgs/by-name/tr/treefmt2/package.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "treefmt"; - version = "2.0.0-rc1"; + version = "2.0.0-rc2"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-iRjd7iYd3617XZrGD6Bi6d1SoE8dgATMbT4AMXklfgM="; + hash = "sha256-qFSZLndhxC/RJdlA5fzgDxx/onFEy0wEz7XJLnmKmDo="; }; - vendorHash = "sha256-xbXy5Csl2JD5/F5mtvh8J36VZqrUIfO3OBV/LE+KzWA="; + vendorHash = "sha256-rjdGNfR2DpLZCzL/+3xiZ7gGDd4bPyBT5qMCO+NyWbg="; subPackages = [ "." ]; From 3983b7677d3495c03e62093cb7889d01cbc61e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 18 May 2024 10:57:02 +0200 Subject: [PATCH 191/262] nixos/rl-2405: fix typo in chromium DRM change entry stanging -> standing Fixes: e4f185cfaf2c6ba5 ("nixos/rl-2405: mention chromium DRM change") --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 72f24f5e1905..da2f89824af8 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -478,7 +478,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `firefox-devedition`, `firefox-beta`, `firefox-esr` executable file names for now match their package names, which is consistent with the `firefox-*-bin` packages. The desktop entries are also updated so that you can have multiple editions of firefox in your app launcher. -- `chromium` and `ungoogled-chromium` had a long stanging issue regarding Widevine DRM handling in nixpkgs fixed. +- `chromium` and `ungoogled-chromium` had a long standing issue regarding Widevine DRM handling in nixpkgs fixed. `chromium` now no longer automatically downloads Widevine when encountering DRM protected content. To be able to play DRM protected content in `chromium` now, you have to explicitly opt-in as originally intended using `chromium.override { enableWideVine = true; }`. This override has been added almost 10 years ago. From 6708ce7cb9ed0edb40c1deceb31372e5246b14bb Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sat, 18 May 2024 17:02:24 +0800 Subject: [PATCH 192/262] moar: 1.23.14 -> 1.23.15 --- pkgs/tools/misc/moar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 919609a2cb3e..4140308c4967 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.23.14"; + version = "1.23.15"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-Ss4xblv7F3fco1qUXkzhUWEDnyE/bdXv6Gs8cN9HWZw="; + hash = "sha256-tRjKBHsNJL66oz+0gZTrL8xFHQEyHLG+W35LHUYQKwU="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; From deed4ed21f1dff977baf71500c81da8d4d77651a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 09:14:11 +0000 Subject: [PATCH 193/262] files-cli: 2.13.41 -> 2.13.49 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 886bf6297c85..853d30f3e4a5 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.41"; + version = "2.13.49"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-WW6E0K3HOi8gtBwcmN9syV4wM73BPGyXbv3t4ZJjoIc="; + hash = "sha256-QQ2UzWGodQASHJVfnTIp/BUNkAPAV0q8UpTk7qBYgc0="; }; - vendorHash = "sha256-LdebAbdbiUX0xw1EJKCzK1jdt5+FgoZQBPI0apZkcsc="; + vendorHash = "sha256-L6UnKbqS6aO8+XSPt5KaKGYr30y9RE+l4U3hapPHHvA="; ldflags = [ "-s" From 550f53b3e6cfa58df8f7ff33bb5f0a9e0fca48f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 11:31:40 +0200 Subject: [PATCH 194/262] python312Packages.isoweek: refactor - switch to unittestCheckHook - add pythonImportsCheck --- .../python-modules/isoweek/default.nix | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/isoweek/default.nix b/pkgs/development/python-modules/isoweek/default.nix index e16d27c47bcf..23be48c71a73 100644 --- a/pkgs/development/python-modules/isoweek/default.nix +++ b/pkgs/development/python-modules/isoweek/default.nix @@ -1,18 +1,39 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, setuptools +, unittestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "isoweek"; version = "1.3.3"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1s7zsf0pab0l9gn6456qadnz5i5h90hafcjwnhx5mq23qjxggwvk"; + hash = "sha256-c/P3usRD4Fo6tFwypyBIsMTybVPYFGLsSxQsdYHT/+g="; }; + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "isoweek" + ]; + meta = with lib; { - description = "The module provide the class Week. Instances represent specific weeks spanning Monday to Sunday."; + description = "Module work with ISO weeks"; homepage = "https://github.com/gisle/isoweek"; + changelog = "https://github.com/gisle/isoweek/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ mrmebelman ]; }; From c28748ef965d4a376af826458a334fce15841b69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 11:32:39 +0200 Subject: [PATCH 195/262] python312Packages.isoweek: format with nixfmt --- .../python-modules/isoweek/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/isoweek/default.nix b/pkgs/development/python-modules/isoweek/default.nix index 23be48c71a73..70c38d790430 100644 --- a/pkgs/development/python-modules/isoweek/default.nix +++ b/pkgs/development/python-modules/isoweek/default.nix @@ -1,9 +1,10 @@ -{ lib -, fetchPypi -, buildPythonPackage -, setuptools -, unittestCheckHook -, pythonOlder +{ + lib, + fetchPypi, + buildPythonPackage, + setuptools, + unittestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -18,17 +19,11 @@ buildPythonPackage rec { hash = "sha256-c/P3usRD4Fo6tFwypyBIsMTybVPYFGLsSxQsdYHT/+g="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - unittestCheckHook - ]; + nativeCheckInputs = [ unittestCheckHook ]; - pythonImportsCheck = [ - "isoweek" - ]; + pythonImportsCheck = [ "isoweek" ]; meta = with lib; { description = "Module work with ISO weeks"; @@ -38,4 +33,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ mrmebelman ]; }; } - From b0eac0bd4af5aedb929cd1d0e155ff74ec700553 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sat, 18 May 2024 12:09:06 +0200 Subject: [PATCH 196/262] electrs: 0.10.1 -> 0.10.5 --- pkgs/applications/blockchains/electrs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 2401231367ef..e289aede5473 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.10.1"; + version = "0.10.5"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-cRnCo/N0k5poiOh308Djw6bySFQFIY3GiD2qjRyMjLM="; + hash = "sha256-tAHN5HWI9XsiCQzqLNtiib9wMskjfogc44+b4Bsjpog="; }; - cargoHash = "sha256-fsYJ+80se5VsIaRkFgwJaPPgRw/WdsecRTt6EIjoQTQ="; + cargoHash = "sha256-M0DIKt41K3BcP43+fBhv3HbRcIh8U9nhQYA/sm+bNow="; # needed for librocksdb-sys nativeBuildInputs = [ rustPlatform.bindgenHook ]; From 611718e91a980510af50346a0a3e75a31cba6a00 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 18 May 2024 14:37:39 +0400 Subject: [PATCH 197/262] =?UTF-8?q?gitui:=200.26.1=20=E2=86=92=200.26.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/gi/gitui/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix index edc03effa5fd..de1eb48edaac 100644 --- a/pkgs/by-name/gi/gitui/package.nix +++ b/pkgs/by-name/gi/gitui/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.26.1"; + version = "0.26.2"; src = fetchFromGitHub { owner = "extrawurst"; repo = "gitui"; rev = "v${version}"; - hash = "sha256-JqxZbxjZrrdsXWhpYu0E9F18gMldtOLrAYd+uiY8IcQ="; + hash = "sha256-eXkbvBdymwOUPLimv2zaJr9zqc+5LGK3hghZ2aUVWA0="; }; - cargoHash = "sha256-zEoNyIiHQT6HBNSe+H7pz229K4eD0WMhp3I/6zJQHuU="; + cargoHash = "sha256-Cb3/4l7fECVfmvPIw3n1QT8CoC+Kuohtfk+huKv9Yrg="; nativeBuildInputs = [ pkg-config ]; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { # The cargo config overrides linkers for some targets, breaking the build # on e.g. `aarch64-linux`. These overrides are not required in the Nix # environment: delete them. - rm .cargo/config + rm .cargo/config.toml # build script tries to get version information from git rm build.rs From 595501a3a1982fe8cdcc1122eabc3e0d695cd66c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 13:01:36 +0200 Subject: [PATCH 198/262] python311Packages.raincloudy: refactor --- .../python-modules/raincloudy/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix index 3a247bc6a81e..16d6f39b13ee 100644 --- a/pkgs/development/python-modules/raincloudy/default.nix +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -19,33 +19,33 @@ buildPythonPackage rec { pname = "raincloudy"; version = "1.2.0"; - format = "setuptools"; + pypriject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "vanstinator"; - repo = pname; + repo = "raincloudy"; rev = "refs/tags/${version}"; hash = "sha256-qCkBVirM09iA1sXiOB9FJns8bHjQq7rRk8XbRWrtBDI="; }; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; - postPatch = '' # https://github.com/vanstinator/raincloudy/pull/60 substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" \ + --replace-fail "bs4" "beautifulsoup4" \ # fix raincloudy.aio package discovery, by relying on # autodiscovery instead. sed -i '/packages=/d' setup.py ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ aiohttp requests beautifulsoup4 @@ -74,7 +74,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with Melnor RainCloud Smart Garden Watering Irrigation Timer"; homepage = "https://github.com/vanstinator/raincloudy"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/vanstinator/raincloudy/releases/tag/${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From cefc7f029e63cdb7cc41189eec5148747fc8e6ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 13:01:55 +0200 Subject: [PATCH 199/262] python312Packages.raincloudy: format with nixfmt --- .../python-modules/raincloudy/default.nix | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix index 16d6f39b13ee..2d97d7945589 100644 --- a/pkgs/development/python-modules/raincloudy/default.nix +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -1,19 +1,20 @@ -{ lib -, aiohttp -, aioresponses -, beautifulsoup4 -, buildPythonPackage -, fetchFromGitHub -, html5lib -, pytest-asyncio -, pytest-aiohttp -, pytestCheckHook -, pythonOlder -, requests -, requests-mock -, setuptools -, setuptools-scm -, urllib3 +{ + lib, + aiohttp, + aioresponses, + beautifulsoup4, + buildPythonPackage, + fetchFromGitHub, + html5lib, + pytest-asyncio, + pytest-aiohttp, + pytestCheckHook, + pythonOlder, + requests, + requests-mock, + setuptools, + setuptools-scm, + urllib3, }: buildPythonPackage rec { From 254e223f2dbbc76c40893e37075fc307a82cb550 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 13:09:40 +0200 Subject: [PATCH 200/262] python312Packages.raincloudy: disable on Python 3.12 Still uses imp https://github.com/vanstinator/raincloudy/issues/65 --- pkgs/development/python-modules/raincloudy/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix index 2d97d7945589..5db3430efb3d 100644 --- a/pkgs/development/python-modules/raincloudy/default.nix +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -9,6 +9,7 @@ pytest-asyncio, pytest-aiohttp, pytestCheckHook, + pythonAtLeast, pythonOlder, requests, requests-mock, @@ -22,7 +23,8 @@ buildPythonPackage rec { version = "1.2.0"; pypriject = true; - disabled = pythonOlder "3.7"; + # https://github.com/vanstinator/raincloudy/issues/65 + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "vanstinator"; From f0ebaaefc22108a777f2807576ec4e7a100b3e58 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 18 May 2024 13:02:51 +0200 Subject: [PATCH 201/262] tinymist: 0.11.8 -> 0.11.9 Diff: https://github.com/Myriad-Dreamin/tinymist/compare/v0.11.8...v0.11.9 Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/v0.11.9/CHANGELOG.md --- pkgs/by-name/ti/tinymist/Cargo.lock | 683 ++++++++++++++------------- pkgs/by-name/ti/tinymist/package.nix | 8 +- 2 files changed, 365 insertions(+), 326 deletions(-) diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index d841971169af..ee6705a0f511 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -72,47 +72,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -120,9 +121,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "27a4bd113ab6da4cd0f521068a6e2ee1065eab54107266a11835d02c8ec86a37" [[package]] name = "append-only-vec" @@ -165,20 +166,20 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "await-tree" @@ -227,9 +228,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64-serde" @@ -326,9 +327,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "by_address" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytecheck" @@ -354,9 +361,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" [[package]] name = "byteorder" @@ -372,9 +379,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "camino" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ "serde", ] @@ -404,12 +411,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -438,9 +446,9 @@ checksum = "7588475145507237ded760e52bf2f1085495245502033756d28ea72ade0e498b" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -448,7 +456,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -480,9 +488,9 @@ dependencies = [ [[package]] name = "citationberg" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82108f2b676c954076d2e5044f19a6a03887b24bd42804f322e0650d13035899" +checksum = "d259fe9fd78ffa05a119581d20fddb50bfba428311057b12741ffb9015123d0b" dependencies = [ "quick-xml", "serde", @@ -507,7 +515,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", + "strsim 0.11.1", "terminal_size", "unicase", "unicode-width", @@ -515,9 +523,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" +checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" dependencies = [ "clap", ] @@ -541,7 +549,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -595,9 +603,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "comemo" @@ -629,7 +637,7 @@ checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -640,7 +648,7 @@ checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -790,12 +798,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -814,16 +822,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.55", + "strsim 0.11.1", + "syn 2.0.64", ] [[package]] @@ -839,13 +847,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.8", + "darling_core 0.20.9", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -855,7 +863,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -863,9 +871,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "data-url" @@ -990,20 +998,14 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] -[[package]] -name = "dissimilar" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" - [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "ecow" @@ -1025,9 +1027,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "elsa" @@ -1046,9 +1048,9 @@ checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" [[package]] name = "ena" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5" dependencies = [ "log", ] @@ -1067,9 +1069,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1091,7 +1093,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -1125,9 +1127,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1151,9 +1153,9 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1172,15 +1174,15 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "windows-sys 0.52.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1331,7 +1333,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -1385,9 +1387,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1459,9 +1461,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1478,9 +1480,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1497,9 +1499,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", @@ -1511,14 +1513,14 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] name = "hayagriva" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2e670de5191df083ddd112cd253049f8213277ccf0c15e18a8bf10e6c666cc" +checksum = "1d0d20c98b77b86ce737876b2a1653e2e6abbeee84afbb39d72111091191c97a" dependencies = [ "biblatex", "ciborium", @@ -1812,7 +1814,7 @@ checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -1899,7 +1901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -1911,9 +1913,9 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "indextree" -version = "4.6.0" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c40411d0e5c63ef1323c3d09ce5ec6d84d71531e18daed0743fccea279d7deb6" +checksum = "3a6f7e29c1619ec492f411b021ac9f30649d5f522ca6f287f2467ee48c8dfe10" [[package]] name = "inotify" @@ -1937,9 +1939,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.37.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1718b3f2b85bb5054baf8ce406e36401f27c3169205f4175504c4b1d98252d3f" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "globset", @@ -1951,9 +1953,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -1994,6 +1996,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -2021,6 +2029,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2029,9 +2046,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2097,9 +2114,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" @@ -2121,13 +2138,12 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.5.0", "libc", - "redox_syscall", ] [[package]] @@ -2156,9 +2172,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lipsum" @@ -2181,9 +2197,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2222,9 +2238,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -2253,9 +2269,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -2330,11 +2346,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -2356,9 +2371,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2405,9 +2420,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.1.2" +version = "5.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" +checksum = "2eb49fbd5616580e9974662cb96a3463da4476e649a7e4b258df0de065db0657" dependencies = [ "is-wsl", "libc", @@ -2437,7 +2452,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -2448,9 +2463,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.101" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -2466,9 +2481,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "palette" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" +checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" dependencies = [ "approx", "fast-srgb8", @@ -2478,20 +2493,21 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" +checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" dependencies = [ + "by_address", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -2499,22 +2515,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "path-clean" @@ -2530,9 +2546,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pdf-writer" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644b654f2de28457bf1e25a4905a76a563d1128a33ce60cf042f721f6818feaf" +checksum = "24e9127455063c816e661caac9ecd9043ad2871f55be93014e6838a8ced2332b" dependencies = [ "bitflags 1.3.2", "itoa", @@ -2576,7 +2592,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -2611,14 +2627,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2724,9 +2740,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -2778,9 +2794,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2851,10 +2867,19 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.4" +name = "redox_syscall" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -2863,11 +2888,11 @@ dependencies = [ [[package]] name = "reflexo" -version = "0.5.0-rc3" +version = "0.5.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22b4f1e922d63bb11a86512f3cd05c04573076f670ef03340058c4d3c9f1d45b" +checksum = "803cbdda7d5beefc048966f342ba9a13dab586f136a8fe7f6d915b2f073a9151" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "bitvec", "comemo 0.4.0", "dashmap", @@ -3052,9 +3077,9 @@ checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] name = "rust_iso3166" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e676677b94480848a8d88c74553bad50aed2ee77d8c0985aa50d8c4e26f3054b" +checksum = "dd3126eab517ef8ca4761a366cb0d55e1bf5ab9c7b7f18301d712a57de000a90" dependencies = [ "js-sys", "phf", @@ -3075,9 +3100,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3096,9 +3121,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -3109,9 +3134,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", @@ -3140,9 +3165,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustybuzz" @@ -3162,9 +3187,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3208,11 +3233,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -3221,9 +3246,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -3231,38 +3256,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.197" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -3271,20 +3296,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -3303,11 +3328,11 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.7.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", @@ -3321,14 +3346,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.7.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ - "darling 0.20.8", + "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -3368,9 +3393,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3389,9 +3414,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "similar" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "simplecss" @@ -3440,9 +3465,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3496,9 +3521,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -3528,7 +3553,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -3541,7 +3566,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -3588,9 +3613,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.55" +version = "2.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" +checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f" dependencies = [ "proc-macro2", "quote", @@ -3611,7 +3636,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -3718,7 +3743,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.8" +version = "0.11.9" dependencies = [ "insta", "lsp-server", @@ -3730,22 +3755,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -3756,9 +3781,9 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -3779,9 +3804,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -3815,11 +3840,11 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.8" +version = "0.11.9" dependencies = [ "anyhow", "async-trait", - "base64 0.22.0", + "base64 0.22.1", "cargo_metadata", "chrono", "clap", @@ -3846,7 +3871,7 @@ dependencies = [ "tinymist-render", "tokio", "tokio-util", - "toml 0.8.12", + "toml 0.8.13", "typst", "typst-assets", "typst-pdf", @@ -3866,20 +3891,21 @@ dependencies = [ [[package]] name = "tinymist-query" -version = "0.11.8" +version = "0.11.9" dependencies = [ "anyhow", "biblatex", "comemo 0.4.0", + "dashmap", "ecow 0.2.2", "ena", "fxhash", + "hashbrown 0.14.5", "hex", "if_chain", "indexmap 2.2.6", "insta", "itertools 0.12.1", - "lazy_static", "log", "lsp-types", "once_cell", @@ -3896,7 +3922,8 @@ dependencies = [ "sha2", "siphasher 1.0.1", "strum 0.26.2", - "toml 0.8.12", + "toml 0.8.13", + "triomphe", "ttf-parser", "typst", "typst-ts-compiler", @@ -3908,9 +3935,9 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.8" +version = "0.11.9" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "log", "serde", "tinymist-query", @@ -3945,9 +3972,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -3970,7 +3997,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -4007,16 +4034,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4033,21 +4059,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.13", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -4067,15 +4093,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.8", ] [[package]] @@ -4103,7 +4129,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -4115,6 +4141,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "triomphe" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" + [[package]] name = "try-lock" version = "0.2.5" @@ -4171,8 +4203,8 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typst" -version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" +version = "0.11.1" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" dependencies = [ "az", "bitflags 2.5.0", @@ -4214,13 +4246,13 @@ dependencies = [ "stacker", "syntect", "time", - "toml 0.8.12", + "toml 0.8.13", "ttf-parser", "two-face", "typed-arena", "typst-assets", "typst-macros", - "typst-syntax 0.11.0", + "typst-syntax 0.11.1", "typst-timing", "unicode-bidi", "unicode-math-class", @@ -4232,27 +4264,27 @@ dependencies = [ [[package]] name = "typst-assets" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13f85360328da54847dd7fefaf272dfa5b6d1fdeb53f32938924c39bf5b2c6c" +checksum = "2b3061f8d268e8eec7481c9ab24540455cb4912983c49aae38fa6e8bf8ef4d9c" [[package]] name = "typst-macros" -version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" +version = "0.11.1" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] name = "typst-pdf" -version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" +version = "0.11.1" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "bytemuck", "comemo 0.4.0", "ecow 0.2.2", @@ -4274,9 +4306,9 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1323cc2de067d19919891a1ee3f43af5c96d91decce44044347137d3e06fce" +checksum = "193407d42cff6e7fa4b5e0b634b9ead7ccc5393cfb708ed2bd60d930d9f1d9de" dependencies = [ "anyhow", "await-tree", @@ -4309,8 +4341,8 @@ dependencies = [ [[package]] name = "typst-render" -version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" +version = "0.11.1" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" dependencies = [ "bytemuck", "comemo 0.4.0", @@ -4329,10 +4361,10 @@ dependencies = [ [[package]] name = "typst-svg" -version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" +version = "0.11.1" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "comemo 0.4.0", "ecow 0.2.2", "flate2", @@ -4362,8 +4394,8 @@ dependencies = [ [[package]] name = "typst-syntax" -version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" +version = "0.11.1" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" dependencies = [ "comemo 0.4.0", "ecow 0.2.2", @@ -4378,28 +4410,27 @@ dependencies = [ [[package]] name = "typst-timing" -version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" +version = "0.11.1" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" dependencies = [ "parking_lot", "serde", "serde_json", - "typst-syntax 0.11.0", + "typst-syntax 0.11.1", ] [[package]] name = "typst-ts-compiler" -version = "0.5.0-rc3" +version = "0.5.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10e68e9eb24ee181713bcc0a9a08c5b9c2c77c2015d8497f077f79617ae731e3" +checksum = "1b5d68fc30324347a294155cc4691defa4e01aaff23d7e3c1c40a3c8e5d22e3f" dependencies = [ "append-only-vec", - "base64 0.22.0", + "base64 0.22.1", "chrono", "codespan-reporting", "comemo 0.4.0", "dirs", - "dissimilar", "flate2", "fontdb", "fst", @@ -4428,11 +4459,11 @@ dependencies = [ [[package]] name = "typst-ts-core" -version = "0.5.0-rc3" +version = "0.5.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3097a2ceef78a2a764b9ec3f9b813c012b97b6c79c3a0835d5314ab895bc0557" +checksum = "5b9355a7f3b2f687088524fa1d5c0d0cbe45878e9672d7a321aec491ae10b1dd" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "base64-serde", "bitvec", "byteorder", @@ -4466,11 +4497,11 @@ dependencies = [ [[package]] name = "typst-ts-svg-exporter" -version = "0.5.0-rc3" +version = "0.5.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0afefc1f581cdc28d230a36a17f0fa195f4ad4792206ca7f6e389146e6b13802" +checksum = "13b1e7baba2453d072cbc1e97a43d5a8ecfe36299fc103e9156bb9470abd35e0" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "comemo 0.4.0", "log", "once_cell", @@ -4499,34 +4530,35 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.17" +version = "0.11.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25283094eca3cf1200a2105bb339f367e1fb127e69b22ae106d7e706d7eb08d" +checksum = "af9697d141856bfe6c865c9ef74d04c62dd6cd1b3b63c1e284b96974871a2fc7" dependencies = [ "anyhow", "clap", - "itertools 0.12.1", + "itertools 0.13.0", "once_cell", "pretty", - "typst-syntax 0.11.0", + "typst-syntax 0.11.1", "vergen", + "walkdir", "wasm-bindgen", ] [[package]] name = "unic-langid" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" dependencies = [ "serde", "tinystr", @@ -4606,9 +4638,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unsafe-libyaml" @@ -4807,7 +4839,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", "wasm-bindgen-shared", ] @@ -4841,7 +4873,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4885,9 +4917,9 @@ dependencies = [ [[package]] name = "wasmparser-nostd" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" dependencies = [ "indexmap-nostd", ] @@ -4938,11 +4970,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4957,7 +4989,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4975,7 +5007,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4995,17 +5027,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -5016,9 +5049,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -5028,9 +5061,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -5040,9 +5073,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -5052,9 +5091,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -5064,9 +5103,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -5076,9 +5115,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -5088,9 +5127,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -5103,9 +5142,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] @@ -5204,28 +5243,28 @@ checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] [[package]] @@ -5245,7 +5284,7 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", "synstructure", ] @@ -5281,5 +5320,5 @@ checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.64", ] diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 9849b56f1eef..a9b79e071459 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -13,19 +13,19 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.8"; + version = "0.11.9"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; - rev = "v${version}"; - hash = "sha256-1mgtyOXSvovO2f4XSdirzTIcUlbFoT9t/UFa2uW5CpI="; + rev = "refs/tags/v${version}"; + hash = "sha256-Oa88WBkV9q17KNJuc/sGSQS39yVyqme66SfB0ZZw7b8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "typst-0.11.0" = "sha256-J3oSrxylR00r3Tc4KDmuW6ungQkoYJiI7cZEpbyyNsc="; + "typst-0.11.1" = "sha256-VDwyTKrtzmjMhVCp/GnZrgL6P6dLyKlLNA+LhoXBDl0="; "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; "typstfmt_lib-0.2.7" = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI="; }; From 8b422fffe6d75b21be14477db470b4418ab7f55e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 18 May 2024 13:12:34 +0200 Subject: [PATCH 202/262] vscode-extensions.myriad-dreamin.tinymist: 0.11.8 -> 0.11.9 Diff: https://github.com/Myriad-Dreamin/tinymist/compare/v0.11.8...v0.11.9 Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/v0.11.9/CHANGELOG.md --- .../vscode/extensions/myriad-dreamin.tinymist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index b8281e83c564..21a412b91e31 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { publisher = "myriad-dreamin"; # Please update the corresponding binary (tinymist) when updating # this extension. - version = "0.11.8"; - hash = "sha256-ELqk94xhPJwHlxQ0ie9DMBNOiqszpi3mYF+wHxoY2xw="; + version = "0.11.9"; + hash = "sha256-h49SI/KoA5sbLIkJreZoux7mTIhGZ7HqtgE1EAh3vYM="; }; nativeBuildInputs = [ From 39b93fc4ee6b3bfcf5444b047b1286136b738610 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 14:01:03 +0200 Subject: [PATCH 203/262] python312Packages.niapy: 2.1.0 -> 2.3.1 Diff: https://github.com/NiaOrg/NiaPy/compare/refs/tags/v2.1.0...v2.3.1 Changelog: https://github.com/NiaOrg/NiaPy/releases/tag/2.3.1 --- pkgs/development/python-modules/niapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index c05c0fb25a74..3f4f164b5656 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "niapy"; - version = "2.1.0"; + version = "2.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NiaOrg"; repo = "NiaPy"; - rev = "refs/tags/${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-cT5CU1r3LZ9ValJwRUA0PaISmF6kXAz40alXbWYogGA="; }; From 981bc952f105c423a16756acf25b282928f6a093 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 14:06:27 +0200 Subject: [PATCH 204/262] python312Packages.niapy: refactor --- pkgs/development/python-modules/niapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index 3f4f164b5656..30ac98560882 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { hash = "sha256-cT5CU1r3LZ9ValJwRUA0PaISmF6kXAz40alXbWYogGA="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib numpy openpyxl From bde92aee46e707e7d615baef9eab3b4bbd64d3a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 14:06:43 +0200 Subject: [PATCH 205/262] python312Packages.niapy: format with nixftm --- .../python-modules/niapy/default.nix | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index 30ac98560882..60308f21573f 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, matplotlib -, numpy -, openpyxl -, pandas -, poetry-core -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + matplotlib, + numpy, + openpyxl, + pandas, + poetry-core, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -24,9 +25,7 @@ buildPythonPackage rec { hash = "sha256-cT5CU1r3LZ9ValJwRUA0PaISmF6kXAz40alXbWYogGA="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ matplotlib @@ -35,13 +34,9 @@ buildPythonPackage rec { pandas ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "niapy" - ]; + pythonImportsCheck = [ "niapy" ]; meta = with lib; { description = "Micro framework for building nature-inspired algorithms"; From 3f36810e15370835d6663b1b623e5d69a01a74c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 12:28:54 +0000 Subject: [PATCH 206/262] colima: 0.6.8 -> 0.6.9 --- pkgs/applications/virtualization/colima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index e9e769767358..b3b981079d84 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "colima"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - hash = "sha256-9mBjK+VArfsLfwRRIFn8kY2scAtvIjIMWX84Bi7MBvU="; + hash = "sha256-7kaZ55Uhvx8V75IgURD03fLoAd/O/+2h/7tv9XiqnX4="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -35,7 +35,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ] ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; - vendorHash = "sha256-QS0TwXI2Md+PXmT2UrzCMQoHRj+wjTSjWPv9CeVzyFU="; + vendorHash = "sha256-FPcz109zQBHaS/bIl78rVeiEluR1PhrJhgs21Ex6qEg="; # disable flaky Test_extractZones # https://hydra.nixos.org/build/212378003/log From 79f2579994196a848b0d2e66e1284276871698aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 12:34:03 +0000 Subject: [PATCH 207/262] tgpt: 2.7.3 -> 2.7.4 --- pkgs/by-name/tg/tgpt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tg/tgpt/package.nix b/pkgs/by-name/tg/tgpt/package.nix index 0719016d1e8f..9c0e87a0562f 100644 --- a/pkgs/by-name/tg/tgpt/package.nix +++ b/pkgs/by-name/tg/tgpt/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tgpt"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "tgpt"; rev = "refs/tags/v${version}"; - hash = "sha256-tInbOCrGXZkyGrkXSppK7Qugh0E2CdjmybMeH49Wc5s="; + hash = "sha256-Nk+iLsTXnw6RAc1VztW8ZqeUVsywFjMCOBY2yuWbUXQ="; }; vendorHash = "sha256-docq/r6yyMPsuUyFbtCMaYfEVL0gLmyTy4PbrAemR00="; From cd3506a1e4bdb0451d88f0ff43e42e83a95a2be6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 12:36:20 +0000 Subject: [PATCH 208/262] git-quick-stats: 2.5.5 -> 2.5.6 --- .../version-management/git-quick-stats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-quick-stats/default.nix b/pkgs/applications/version-management/git-quick-stats/default.nix index e8292e84af45..5f845a510fd6 100644 --- a/pkgs/applications/version-management/git-quick-stats/default.nix +++ b/pkgs/applications/version-management/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-7riA3yYw2D8+x/wzzbv0RF+zHCtqVC1ZpVANZp9x2AQ="; + sha256 = "sha256-xd/ItpngreR77QTsSHLCgZfyvUZXBfOVPJaVtBZ2iTc="; }; nativeBuildInputs = [ makeWrapper ]; From a4405f833498ed995cc72761878525d7d7c9c30c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 14:47:18 +0200 Subject: [PATCH 209/262] python311Packages.django-import-export: 3.3.8 -> 4.0.3 Changelog: https://github.com/django-import-export/django-import-export/blob/4.0.3/docs/changelog.rst --- .../python-modules/django-import-export/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 50e60202dc97..92e5daf6fd29 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -8,12 +8,13 @@ , python , pythonOlder , pytz +, setuptools-scm , tablib }: buildPythonPackage rec { pname = "django-import-export"; - version = "3.3.8"; + version = "4.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,9 +23,13 @@ buildPythonPackage rec { owner = "django-import-export"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9BsaYLAkd6UvQxMtwk+pI7HyOWNU4rUmingkyemRCz4="; + hash = "sha256-ItJx9yJSy88/OvkpjGDWGBOMk5YlSquicSWi0tbKeWE="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ diff-match-patch django From 63e1bf13d579e441b4d6d6b7e715f7b1837a6cf4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 14:52:44 +0200 Subject: [PATCH 210/262] python311Packages.django-import-export: add optional-dependencies --- .../django-import-export/default.nix | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 92e5daf6fd29..b0e89e389274 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -34,13 +34,37 @@ buildPythonPackage rec { diff-match-patch django tablib - ] ++ (with tablib.optional-dependencies; html ++ ods ++ xls ++ xlsx ++ yaml); + ]; + + passthru.optional-dependencies = { + all = [ + tablib + ] ++ tablib.optional-dependencies.all; + cli = [ + tablib + ] ++ tablib.optional-dependencies.cli; + ods = [ + tablib + ] ++ tablib.optional-dependencies.ods; + pandas = [ + tablib + ] ++ tablib.optional-dependencies.pandas; + xls = [ + tablib + ] ++ tablib.optional-dependencies.xls; + xlsx = [ + tablib + ] ++ tablib.optional-dependencies.xlsx; + yaml = [ + tablib + ] ++ tablib.optional-dependencies.yaml; + }; nativeCheckInputs = [ chardet psycopg2 pytz - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); checkPhase = '' runHook preCheck From 34273406beb9f4d7b26c12aaaf72bbfed5538d2c Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sat, 18 May 2024 01:08:05 +0800 Subject: [PATCH 211/262] python311Packages.pypng,python312Packages.pypng: fix test imports and PATH --- pkgs/development/python-modules/pypng/default.nix | 13 ++++++++++++- .../python-modules/pypng/setup-cfg-pngsuite.patch | 12 ++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pypng/setup-cfg-pngsuite.patch diff --git a/pkgs/development/python-modules/pypng/default.nix b/pkgs/development/python-modules/pypng/default.nix index ca47266e9dfc..71882ee1f2eb 100644 --- a/pkgs/development/python-modules/pypng/default.nix +++ b/pkgs/development/python-modules/pypng/default.nix @@ -21,7 +21,18 @@ buildPythonPackage rec { setuptools ]; - pythonImportsCheck = [ "png" ]; + patches = [ + # pngsuite is imported by code/test_png.py but is not defined in + # setup.cfg, so it isn't built - this adds it to py_modules + ./setup-cfg-pngsuite.patch + ]; + + # allow tests to use the binaries produced by this package + preCheck = '' + export PATH="$out/bin:$PATH" + ''; + + pythonImportsCheck = [ "png" "pngsuite" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pypng/setup-cfg-pngsuite.patch b/pkgs/development/python-modules/pypng/setup-cfg-pngsuite.patch new file mode 100644 index 000000000000..085aa47f7f46 --- /dev/null +++ b/pkgs/development/python-modules/pypng/setup-cfg-pngsuite.patch @@ -0,0 +1,12 @@ +diff --git a/setup.cfg b/setup.cfg +index 04bba8a..db159d2 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -28,6 +28,7 @@ package_dir = + = code + py_modules = + png ++ pngsuite + scripts = + code/prichunkpng + code/pricolpng From eaaf883c8599d0f5c9a6cd7d368786e8e27ebd00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 14:56:16 +0200 Subject: [PATCH 212/262] python311Packages.django-import-export: refactor --- .../django-import-export/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index b0e89e389274..fd6f0d43f7ea 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -7,6 +7,7 @@ , psycopg2 , python , pythonOlder +, pythonRelaxDepsHook , pytz , setuptools-scm , tablib @@ -15,22 +16,30 @@ buildPythonPackage rec { pname = "django-import-export"; version = "4.0.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "django-import-export"; - repo = pname; + repo = "django-import-export"; rev = "refs/tags/${version}"; hash = "sha256-ItJx9yJSy88/OvkpjGDWGBOMk5YlSquicSWi0tbKeWE="; }; - nativeBuildInputs = [ + pythonRelaxDeps = [ + "tablib" + ]; + + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + dependencies = [ diff-match-patch django tablib From 12ba07f728f610cdd680ee3e45d965b85f9be06d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 14:56:44 +0200 Subject: [PATCH 213/262] python311Packages.django-import-export: format with nixfmt --- .../django-import-export/default.nix | 71 +++++++------------ 1 file changed, 25 insertions(+), 46 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index fd6f0d43f7ea..a57a770444ed 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, chardet -, diff-match-patch -, django -, fetchFromGitHub -, psycopg2 -, python -, pythonOlder -, pythonRelaxDepsHook -, pytz -, setuptools-scm -, tablib +{ + lib, + buildPythonPackage, + chardet, + diff-match-patch, + django, + fetchFromGitHub, + psycopg2, + python, + pythonOlder, + pythonRelaxDepsHook, + pytz, + setuptools-scm, + tablib, }: buildPythonPackage rec { @@ -27,17 +28,11 @@ buildPythonPackage rec { hash = "sha256-ItJx9yJSy88/OvkpjGDWGBOMk5YlSquicSWi0tbKeWE="; }; - pythonRelaxDeps = [ - "tablib" - ]; + pythonRelaxDeps = [ "tablib" ]; - build-system = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ diff-match-patch @@ -46,27 +41,13 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - all = [ - tablib - ] ++ tablib.optional-dependencies.all; - cli = [ - tablib - ] ++ tablib.optional-dependencies.cli; - ods = [ - tablib - ] ++ tablib.optional-dependencies.ods; - pandas = [ - tablib - ] ++ tablib.optional-dependencies.pandas; - xls = [ - tablib - ] ++ tablib.optional-dependencies.xls; - xlsx = [ - tablib - ] ++ tablib.optional-dependencies.xlsx; - yaml = [ - tablib - ] ++ tablib.optional-dependencies.yaml; + all = [ tablib ] ++ tablib.optional-dependencies.all; + cli = [ tablib ] ++ tablib.optional-dependencies.cli; + ods = [ tablib ] ++ tablib.optional-dependencies.ods; + pandas = [ tablib ] ++ tablib.optional-dependencies.pandas; + xls = [ tablib ] ++ tablib.optional-dependencies.xls; + xlsx = [ tablib ] ++ tablib.optional-dependencies.xlsx; + yaml = [ tablib ] ++ tablib.optional-dependencies.yaml; }; nativeCheckInputs = [ @@ -81,9 +62,7 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ - "import_export" - ]; + pythonImportsCheck = [ "import_export" ]; meta = with lib; { description = "Django application and library for importing and exporting data with admin integration"; From a886427a1da694ce4b23c31f3c4ce603564c6243 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 18 May 2024 08:56:08 -0400 Subject: [PATCH 214/262] wine64Packages.{unstable,staging}: 9.8 -> 9.9 https://gitlab.winehq.org/wine/wine/-/releases/wine-9.9 --- pkgs/applications/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 62fc12dd4eaf..abede892b5ec 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.8"; + version = "9.9"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-hpQ8g47aj62aeUDUCZcDOUvx0b6aEBQ0L+2HnH3DuZM="; + hash = "sha256-TWengSxKvUo96SMjjmD1qGsWrH+yD2KU4Nxu+ei+yjY="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-c69E+jr5DKdD8JJxQhM3ILJgvmGvOe54FqMghcVPkpg="; + hash = "sha256-JJrt2zTCjI8Zectoa5B0eZm2BLQm9u5cHbqVEHygwd0="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; From 5a1a9a662b207835d5364b21393f73c70e169155 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 15:58:38 +0300 Subject: [PATCH 215/262] nufmt: fix build on darwin --- pkgs/development/tools/nufmt/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/nufmt/default.nix b/pkgs/development/tools/nufmt/default.nix index e753c134d1ab..a73e300052fc 100644 --- a/pkgs/development/tools/nufmt/default.nix +++ b/pkgs/development/tools/nufmt/default.nix @@ -1,8 +1,10 @@ { lib, + stdenv, fetchFromGitHub, rustPlatform, + darwin, ... }: rustPlatform.buildRustPackage rec { @@ -16,6 +18,10 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BwKLl8eMCrqVt9PA5SHAXxu3ypP2ePcSuljKL+wSkvw="; }; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + IOKit + ]); + cargoSha256 = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc="; meta = with lib; { From 499418387cd19f3279c054a96ef636b7399f278e Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 15:59:10 +0300 Subject: [PATCH 216/262] python3Packages.pystatgrab: fix build on darwin --- pkgs/development/python-modules/pystatgrab/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pystatgrab/default.nix b/pkgs/development/python-modules/pystatgrab/default.nix index 9ba3fb7b3785..574cc349d5de 100644 --- a/pkgs/development/python-modules/pystatgrab/default.nix +++ b/pkgs/development/python-modules/pystatgrab/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , cython , fetchFromGitHub @@ -8,6 +9,7 @@ , setuptools , unittestCheckHook , wheel +, darwin }: buildPythonPackage rec { @@ -33,7 +35,9 @@ buildPythonPackage rec { buildInputs = [ libstatgrab - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + IOKit + ]); nativeCheckInputs = [ unittestCheckHook From 8f153fdae698b667da5e8d2938866760e3d4d758 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 16:00:41 +0300 Subject: [PATCH 217/262] rcp: add missing framework on darwin --- pkgs/by-name/rc/rcp/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index b5b64741ac0a..fa44bf9b670c 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -1,6 +1,8 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform +, darwin }: rustPlatform.buildRustPackage rec { @@ -14,6 +16,10 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kVO2WMwB/Lv4fCcdXaWL/Gfmenky6uMNVrUwhWU9y7A="; }; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + IOKit + ]); + cargoHash = "sha256-Pa8YgFAT9nue/QLhHQm6PlTJU/myK60UcND5TthMOxc="; RUSTFLAGS = "--cfg tokio_unstable"; From c08e006d36b34a59de4a7bd80eeb76fd6fa86b20 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 16:01:00 +0300 Subject: [PATCH 218/262] rcp: mark as broken on darwin-x86_64 --- pkgs/by-name/rc/rcp/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index fa44bf9b670c..f04fa7e769eb 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -36,5 +36,7 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mit ]; mainProgram = "rcp"; maintainers = with maintainers; [ wykurz ]; + # = note: Undefined symbols for architecture x86_64: "_utimensat" + broken = stdenv.isDarwin && stdenv.isx86_64; }; } From 8e04dcc3917aafef0200456748f598a292757134 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 13:02:16 +0000 Subject: [PATCH 219/262] boxbuddy: 2.2.3 -> 2.2.4 --- pkgs/by-name/bo/boxbuddy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index 9d94d80f7516..ed1d5c8956b1 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-b7b5IWo2REr0HBfsKbnFYcReEQG5SfuGDa9KSKIC3t0="; + hash = "sha256-1a9rSVP40+ZKp21BJLO+6HGDf1m6dROqGyTkql58iA4="; }; - cargoHash = "sha256-h+pDjS+VtvfiaWMQjpFHBBJ/8bZ0SRgayRmx4vg96Jw="; + cargoHash = "sha256-Y89TkqjTmaYnFsQmg48FSPMFoUL7Wbgb2xh60boILdQ="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here From 85ae8fced58e8dedba3e7f037bd905fc36fbfb79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 13:13:14 +0000 Subject: [PATCH 220/262] cargo-binstall: 1.6.6 -> 1.6.7 --- pkgs/development/tools/rust/cargo-binstall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 3c7421f84101..50d3c984cf21 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-o31/cEkQyn89URqmJpOZHG6YII8VOle1X3vwdgJF334="; + hash = "sha256-BMWcLEoqX8uHXazitOuzon5Sef3xMQ0b6Lk0IiVGFP8="; }; - cargoHash = "sha256-kZZ2S3XDdCREuit3RIByLXn/tEiqY+Oap242ZXx6y6s="; + cargoHash = "sha256-nAp2wySQ8u9lgixE9M6ri/Mk4BUBBe3CLHnqUv+mdxk="; nativeBuildInputs = [ pkg-config From e0b917d7dc93058f3bbb09bbf97501fca9e7f848 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 15:31:08 +0200 Subject: [PATCH 221/262] python312Packages.reportengine: mark as broken Incompatibility with ruamel >= 0.18 https://github.com/NNPDF/reportengine/issues/60 --- pkgs/development/python-modules/reportengine/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/reportengine/default.nix b/pkgs/development/python-modules/reportengine/default.nix index 79e1a908f7eb..3eb6cf2a869c 100644 --- a/pkgs/development/python-modules/reportengine/default.nix +++ b/pkgs/development/python-modules/reportengine/default.nix @@ -49,5 +49,8 @@ buildPythonPackage rec { homepage = "https://github.com/NNPDF/reportengine/"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ veprbl ]; + # Incompatibility with ruamel >= 0.18 + # https://github.com/NNPDF/reportengine/issues/60 + broken = versionAtLeast ruamel-yaml.version "0.18"; }; } From 07ef71ef0b5607a6e2e84b167486b8186f01f330 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 15:38:26 +0200 Subject: [PATCH 222/262] python312Packages.summarytools: refactor --- .../python-modules/summarytools/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/summarytools/default.nix b/pkgs/development/python-modules/summarytools/default.nix index b9ae6876c945..32d4f2d1f6eb 100644 --- a/pkgs/development/python-modules/summarytools/default.nix +++ b/pkgs/development/python-modules/summarytools/default.nix @@ -17,27 +17,34 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - # no version tags in GitHub repo src = fetchPypi { inherit pname version; hash = "sha256-m29ug+JZC4HgMIVopovA/dyR40Z1IcADOiDWKg9mzdc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ ipython matplotlib numpy pandas ]; - nativeCheckImports = [ pytestCheckHook ]; - pythonImportsCheck = [ "summarytools" ]; + nativeCheckImports = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "summarytools" + ]; meta = with lib; { description = "Python port of the R summarytools package for summarizing dataframes"; homepage = "https://github.com/6chaoran/jupyter-summarytools"; + changelog = "https://github.com/6chaoran/jupyter-summarytools/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ bcdarwin ]; }; From 2423109d7fdd31ec4ce093e1c56eb81c9c610d9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 15:39:18 +0200 Subject: [PATCH 223/262] python311Packages.summarytools: format with nixfmt --- .../python-modules/summarytools/default.nix | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/summarytools/default.nix b/pkgs/development/python-modules/summarytools/default.nix index 32d4f2d1f6eb..58457768fe0e 100644 --- a/pkgs/development/python-modules/summarytools/default.nix +++ b/pkgs/development/python-modules/summarytools/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, setuptools -, ipython -, matplotlib -, numpy -, pandas -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, + ipython, + matplotlib, + numpy, + pandas, + pytestCheckHook, }: buildPythonPackage rec { @@ -22,9 +23,7 @@ buildPythonPackage rec { hash = "sha256-m29ug+JZC4HgMIVopovA/dyR40Z1IcADOiDWKg9mzdc="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ ipython @@ -33,13 +32,9 @@ buildPythonPackage rec { pandas ]; - nativeCheckImports = [ - pytestCheckHook - ]; + nativeCheckImports = [ pytestCheckHook ]; - pythonImportsCheck = [ - "summarytools" - ]; + pythonImportsCheck = [ "summarytools" ]; meta = with lib; { description = "Python port of the R summarytools package for summarizing dataframes"; From 4253630492f8e5954673651da3f7d31dfe13a594 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 15:53:47 +0200 Subject: [PATCH 224/262] python312Packages.google-ai-generativelanguage: 0.6.3 -> 0.6.4 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-ai-generativelanguage-v0.6.4/packages/google-ai-generativelanguage/CHANGELOG.md --- .../python-modules/google-ai-generativelanguage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 37194dc41b01..9de834fab5d7 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.3"; + version = "0.6.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EKEfHhu4Rw/1ADDBrNcps6unopreLDDPHRyRcpE2bGc="; + hash = "sha256-F1CEjBKvlsskrhw90F5L/iSGfcRXcAntA+EELYQh6HQ="; }; build-system = [ setuptools ]; From 194acf32d59ca3f3d21d58217b68a904688265e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 13:56:52 +0000 Subject: [PATCH 225/262] invidtui: 0.4.4 -> 0.4.5 --- pkgs/by-name/in/invidtui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/invidtui/package.nix b/pkgs/by-name/in/invidtui/package.nix index d141398a2f9d..68f31ed6f10b 100644 --- a/pkgs/by-name/in/invidtui/package.nix +++ b/pkgs/by-name/in/invidtui/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "invidtui"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "darkhz"; repo = "invidtui"; rev = "refs/tags/v${version}"; - hash = "sha256-nNJ2bjrHRIzcPs+jbZpgaHBxSWRzSRIsT6xx9EsbISg="; + hash = "sha256-ErdoAHXdptUCZ2aW4XT1Hul/OBfnK6dfncgQ8JRFHxg="; }; vendorHash = "sha256-C7O2GJuEdO8geRPfHx1Sq6ZveDE/u65JBx/Egh3cnK4="; From 7bfd7a33cae60151ad1b0966cfeb687f5d7053f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 13:59:16 +0000 Subject: [PATCH 226/262] kodiPackages.jellyfin: 1.0.2 -> 1.0.3 --- pkgs/applications/video/kodi/addons/jellyfin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 7623a3c4db13..9f16d0a86f7e 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -5,13 +5,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-yCgsQnzmlmyYAjp1q0J9QxGDRg5JCd23H9xgVozHiGM="; + sha256 = "sha256-Uyo8GClJU2/gdk4PeFNnoyvxOhooaxeXN3Wc5YGuCiM="; }; nativeBuildInputs = [ From 18d8d7757abefea9149c31f79fa58fc81e769336 Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 16 May 2024 16:23:22 -0300 Subject: [PATCH 227/262] collision: fix build Signed-off-by: lucasew --- pkgs/applications/misc/collision/default.nix | 32 +++++++++++++++++--- pkgs/applications/misc/collision/make.patch | 20 ------------ 2 files changed, 28 insertions(+), 24 deletions(-) delete mode 100644 pkgs/applications/misc/collision/make.patch diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix index b86053932a86..8fd8ad8f33ba 100644 --- a/pkgs/applications/misc/collision/default.nix +++ b/pkgs/applications/misc/collision/default.nix @@ -4,8 +4,9 @@ , crystal , wrapGAppsHook4 , desktopToDarwinBundle -, gi-crystal , gobject-introspection +, gnome +, python3 , libadwaita , openssl , libxml2 @@ -16,6 +17,7 @@ , crystal2nix , writeShellScript }: + crystal.buildCrystalPackage rec { pname = "Collision"; version = "3.8.0"; @@ -26,17 +28,35 @@ crystal.buildCrystalPackage rec { rev = "v${version}"; hash = "sha256-Bo/u0UYM/N7tLqdCs2OU5pdj2s9LXPooSR1PCGk9dSc="; }; - patches = [ ./make.patch ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail 'gtk-update-icon-cache $(PREFIX)/share/icons/hicolor' 'true' + ''; + shardsFile = ./shards.nix; + copyShardDeps = true; + + preBuild = '' + cd lib/gi-crystal && shards build -Dpreview_mt --release --no-debug + cd ../.. && mkdir bin/ && cp lib/gi-crystal/bin/gi-crystal bin/ + ''; # Crystal compiler has a strange issue with OpenSSL. The project will not compile due to # main_module:(.text+0x6f0): undefined reference to `SSL_library_init' # There is an explanation for this https://danilafe.com/blog/crystal_nix_revisited/ # Shortly, adding pkg-config to buildInputs along with openssl fixes the issue. - nativeBuildInputs = [ wrapGAppsHook4 pkg-config gobject-introspection gi-crystal ] + nativeBuildInputs = [ wrapGAppsHook4 pkg-config gobject-introspection ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; - buildInputs = [ libadwaita openssl libxml2 ]; + + buildInputs = [ + libadwaita + openssl + libxml2 + gnome.nautilus-python + python3.pkgs.pygobject3 + ]; buildTargets = ["bindings" "build"]; @@ -45,6 +65,10 @@ crystal.buildCrystalPackage rec { installTargets = ["desktop" "install"]; + postInstall = '' + install -Dm555 ./nautilus-extension/collision-extension.py -t $out/share/nautilus-python/extensions + ''; + passthru = { updateScript = _experimental-update-script-combinators.sequence [ (gitUpdater { rev-prefix = "v"; }) diff --git a/pkgs/applications/misc/collision/make.patch b/pkgs/applications/misc/collision/make.patch deleted file mode 100644 index 73872a789278..000000000000 --- a/pkgs/applications/misc/collision/make.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Makefile 2023-07-09 10:49:31.064190374 +0300 -+++ b/Makefile 2023-07-19 11:19:37.415480179 +0300 -@@ -6,7 +6,7 @@ - all: desktop bindings build - - bindings: -- ./bin/gi-crystal || $(CRYSTAL_LOCATION)shards install && ./bin/gi-crystal -+ gi-crystal - - build: - COLLISION_LOCALE_LOCATION="$(PREFIX)$(LOCALE_LOCATION)" $(CRYSTAL_LOCATION)shards build -Dpreview_mt --release --no-debug -@@ -43,7 +43,7 @@ - install -D -m 0644 data/dev.geopjr.Collision.desktop $(PREFIX)/share/applications/dev.geopjr.Collision.desktop - install -D -m 0644 data/icons/dev.geopjr.Collision.svg $(PREFIX)/share/icons/hicolor/scalable/apps/dev.geopjr.Collision.svg - install -D -m 0644 data/icons/dev.geopjr.Collision-symbolic.svg $(PREFIX)/share/icons/hicolor/symbolic/apps/dev.geopjr.Collision-symbolic.svg -- gtk-update-icon-cache $(PREFIX)/share/icons/hicolor -+ gtk4-update-icon-cache --ignore-theme-index $(PREFIX)/share/icons/hicolor - glib-compile-schemas $(PREFIX)/share/glib-2.0/schemas/ - - uninstall: \ No newline at end of file From b9c7eb096dd43ae936d55a170c2f2d8244d06488 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 16:22:47 +0200 Subject: [PATCH 228/262] python312Packages.pynetdicom: add patches to use setup_method --- .../python-modules/pynetdicom/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 6f0407aacdff..c8e11897c727 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -29,10 +29,22 @@ buildPythonPackage rec { patches = [ (fetchpatch { - name = "fix-python-3.11-test-attribute-errors"; + name = "fix-python-3.11-test-attribute-errors.patch"; url = "https://github.com/pydicom/pynetdicom/pull/754/commits/2126bd932d6dfb3f07045eb9400acb7eaa1b3069.patch"; hash = "sha256-t6Lg0sTZSWIE5q5pkBvEoHDQ+cklDn8SgNBcFk1myp4="; }) + (fetchpatch { + # https://github.com/pydicom/pynetdicom/pull/848 + name = "replace-setup-with-setup_method1.patch"; + url = "https://github.com/pydicom/pynetdicom/commit/09b4e0901445d46868668bc69a7b4f7f00cf6cbb.patch"; + hash = "sha256-1ea1A/LU6qY+hd23b6H4OkKHQ0hI2/MYgBgZUZE0kRU="; + }) + (fetchpatch { + # https://github.com/pydicom/pynetdicom/pull/848 + name = "replace-setup-with-setup_method2.patch"; + url = "https://github.com/pydicom/pynetdicom/commit/3966c2d749eeda718caccf9a88a0495d1823825d.patch"; + hash = "sha256-C4MSfwwxDgr5T0XQMlR5j2wElPu83TqPhjyNDvfBjJs="; + }) ]; build-system = [ setuptools ]; @@ -86,7 +98,7 @@ buildPythonPackage rec { pytestFlagsArray = [ # https://github.com/pydicom/pynetdicom/issues/923 "-W" - "ignore::pytest.PytestRemovedIn8Warning" + "ignore::pytest.PytestRemovedIn9Warning" ]; meta = with lib; { From 8082d3c3f1648a820023e6a56e7a746668b30225 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 May 2024 16:26:17 +0200 Subject: [PATCH 229/262] python312Packages.homeassistant-stubs: 2024.5.3 -> 2024.5.4 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.5.4 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index f09d06370eaf..6587cda515dc 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.5.3"; + version = "2024.5.4"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-cWt5hOLnri+m7WXAjCA3z1k5ctDia2sAoZiyGe8zadI="; + hash = "sha256-wW3qRXdT3FmAj5bOBzBmrD97o/pONowi7F0Cbj6ndLg="; }; nativeBuildInputs = [ From 2e41a137237fbf1f0e0305721d2631e2bf55d101 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 14:54:03 +0000 Subject: [PATCH 230/262] aws-lambda-rie: 1.17 -> 1.19 --- .../admin/aws-lambda-runtime-interface-emulator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix index b1993ef05c10..85509d92b369 100644 --- a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix +++ b/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "aws-lambda-runtime-interface-emulator"; - version = "1.17"; + version = "1.19"; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-runtime-interface-emulator"; rev = "v${version}"; - sha256 = "sha256-dJbN3Ln3nXED8HmIHSrdKW37fj8dyGnJG27S12VydiE="; + sha256 = "sha256-z4drwdODY+FjrDpdXK7zXD1yiQmpdItzVjzKHj0ZTJk="; }; vendorHash = "sha256-fGoqKDBg+O4uzGmhEIROsBvDS+6zWCzsXe8U6t98bqk="; From 9ed538df59cc99e40af85acde439179d08a45189 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 15:17:12 +0000 Subject: [PATCH 231/262] namespace-cli: 0.0.369 -> 0.0.371 --- pkgs/by-name/na/namespace-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 463fad226834..30812bd5ad16 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.369"; + version = "0.0.371"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-OmU6C0hapdpM/41kEeNwpcMRooCWMLzI5FgQbIvjsb8="; + hash = "sha256-5cP5Z2VDxpBneDX+jhciaNrtDGi8XDm7DhhRBKh6ACU="; }; vendorHash = "sha256-72cHswoTZszo42NOrPNuokDlqoJ3/YEhGe+rQSKvgAw="; From 8283cd36782e6eac42c827f299fde5b1ef14fbd8 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 18:39:06 +0300 Subject: [PATCH 232/262] szyszka: fix build on darwin --- pkgs/tools/misc/szyszka/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/szyszka/default.nix b/pkgs/tools/misc/szyszka/default.nix index 7bcce4158faf..8be3e0caf8b6 100644 --- a/pkgs/tools/misc/szyszka/default.nix +++ b/pkgs/tools/misc/szyszka/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -9,6 +10,7 @@ , gdk-pixbuf , gtk4 , wrapGAppsHook4 +, darwin }: rustPlatform.buildRustPackage rec { @@ -36,7 +38,9 @@ rustPlatform.buildRustPackage rec { atk gdk-pixbuf gtk4 - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); meta = with lib; { description = "A simple but powerful and fast bulk file renamer"; From 0502412807ceca5ed5da066240219e1cb231a224 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 15:48:37 +0000 Subject: [PATCH 233/262] vdrPlugins.softhddevice: 2.3.0 -> 2.3.1 --- pkgs/applications/video/vdr/softhddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 9271a9bf7064..e4dc348fa740 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-qyl4XDLJ99QXQY0XXYMteja0oWZ+vkFa4RwEo1Hv3bo="; + sha256 = "sha256-hg4zx3M5X56u3AqG8Aj9DDDB/V0w4EiU9EAz8Qe+NVY="; rev = "v${version}"; }; From 5ca82dd69fb0689cd86de63bcc8e305a104b5209 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 18:27:10 +0300 Subject: [PATCH 234/262] heh: fix build on darwin --- pkgs/applications/editors/heh/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/heh/default.nix b/pkgs/applications/editors/heh/default.nix index 0b31e30e67f5..23d9ffafea20 100644 --- a/pkgs/applications/editors/heh/default.nix +++ b/pkgs/applications/editors/heh/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub +, darwin }: rustPlatform.buildRustPackage rec { @@ -15,6 +16,10 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zkb+HogwioqxZ+BTl7bcDQx9i9uWhT2QdAIXpHqvDl0="; }; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AppKit + ]); + cargoHash = "sha256-YcTaLq04NhmnJ1pdbiKMRIBSFvHNWNgoAS8Uz8uGGAw="; meta = with lib; { From 97f6f6a2f405fbd70302d4bb6f574402ff3f80dd Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 18:59:25 +0300 Subject: [PATCH 235/262] tkimg: fix build on darwin --- pkgs/development/libraries/tkimg/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tkimg/default.nix b/pkgs/development/libraries/tkimg/default.nix index 094a6b5dda3d..90970a45602a 100644 --- a/pkgs/development/libraries/tkimg/default.nix +++ b/pkgs/development/libraries/tkimg/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchsvn, tcl, tcllib, tk, xorg }: +{ stdenv, lib, fetchsvn, tcl, tcllib, tk, xorg, darwin }: tcl.mkTclDerivation rec { pname = "tkimg"; @@ -16,7 +16,9 @@ tcl.mkTclDerivation rec { "--with-tkinclude=${tk.dev}/include" ]; - buildInputs = [ xorg.libX11 tcllib ]; + buildInputs = [ xorg.libX11 tcllib ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa + ]); meta = { homepage = "https://sourceforge.net/projects/tkimg/"; From e562c1a88d13152dde97185f4fffea683766c07c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 May 2024 18:09:59 +0200 Subject: [PATCH 236/262] python311Packages.pefile: fetch from pypi The GitHub repository contains a large chunk of unusable test fixtures and there is no point in fetching >60 MB of source, that we cannot use. --- pkgs/development/python-modules/pefile/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix index 55bd8c0cc07d..97b3419d7b55 100644 --- a/pkgs/development/python-modules/pefile/default.nix +++ b/pkgs/development/python-modules/pefile/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , future -, fetchFromGitHub +, fetchPypi , setuptools-scm , pythonOlder }: @@ -13,11 +13,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - src = fetchFromGitHub { - owner = "erocarrera"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-lD8GpNl+cVNYTZUKFRF1/2kDwEbn/ekRBNBTYuFmFW0="; + # DON'T fetch from github, the repo is >60 MB due to test artifacts, which we cannot use + src = fetchPypi { + inherit pname version; + hash = "sha256-guYRQASz1pEcd8OVPjg4ZUsEURuLZuhYPbcMZZmAF9w="; }; nativeBuildInputs = [ @@ -28,7 +27,7 @@ buildPythonPackage rec { future ]; - # Test data encrypted + # Test data contains properitary executables and malware, and is therefore encrypted doCheck = false; pythonImportsCheck = [ From ed5e9fa37199c847158ede52ac4648c6cbf3571f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 18 May 2024 18:23:08 +0200 Subject: [PATCH 237/262] river: 0.3.0 -> 0.3.1 Changelog: https://codeberg.org/river/river/releases/tag/v0.3.1 --- pkgs/applications/window-managers/river/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 3d3008692922..698d785a1911 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "river"; - version = "0.3.0"; + version = "0.3.1"; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "river"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-6LZuWx0sC6bW0K7D0PR8hJlVW6i6NIzOOORdMu3Gk5U="; + hash = "sha256-H/908/TP2uzJD1yH4mCXHvorY+4kAhzEkWn6nZGsyBg="; }; nativeBuildInputs = [ From 0822442cbfce5f2e95a81798f6119495affe2d66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 17:35:10 +0000 Subject: [PATCH 238/262] taskwarrior-tui: 0.26.0 -> 0.26.3 --- pkgs/applications/misc/taskwarrior-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 922a7d19d4f9..e96478d96c68 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.26.0"; + version = "0.26.3"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-/OIBWUDMPMbCFLnoCJORgzlhUAqlFIItXQSzLTWZ7Jo="; + sha256 = "sha256-8PFGlsm9B6qHRrY7YIPwknmGS+Peg5MWd0kMT173wIQ="; }; - cargoHash = "sha256-JR6KX5x8BLfX8keofoYqS2eftCDoMLg25OMfTf0k53Q="; + cargoHash = "sha256-Cd319GCvdh6S8OO2ylKs1H2+zO4Uq1tgNakghVD12BA="; nativeBuildInputs = [ installShellFiles ]; From 0a4a33d623390760758c25652c0649b9f477c69d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 17:35:20 +0000 Subject: [PATCH 239/262] xpipe: 9.2 -> 9.3 --- pkgs/applications/networking/xpipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix index 00329886b299..c099f1c5d14c 100644 --- a/pkgs/applications/networking/xpipe/default.nix +++ b/pkgs/applications/networking/xpipe/default.nix @@ -33,14 +33,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-yz8D40ckr6oydlY6+kjQqXtWQ6Q+ZmGQccNVBFbW3/k="; + x86_64-linux = "sha256-PFAs/HoQsTqgThN5jdfwU07QNxThBrO7ES1D7GZCPH0="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "9.2"; + version = "9.3"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; From e5d4072b74f6aca3cbacbadf13311dd05152aea0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 May 2024 19:35:09 +0200 Subject: [PATCH 240/262] python311Packages.virt-firmware: fix tests --- .../python-modules/virt-firmware/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/virt-firmware/default.nix b/pkgs/development/python-modules/virt-firmware/default.nix index d5da9d57c40f..f319de6370fb 100644 --- a/pkgs/development/python-modules/virt-firmware/default.nix +++ b/pkgs/development/python-modules/virt-firmware/default.nix @@ -1,4 +1,6 @@ { lib +, pkgs +, stdenv , buildPythonPackage , fetchPypi , setuptools @@ -10,7 +12,6 @@ buildPythonPackage rec { pname = "virt-firmware"; version = "24.4"; - pyproject = true; src = fetchPypi { @@ -18,23 +19,28 @@ buildPythonPackage rec { hash = "sha256-rqhaKDOQEOj6bcRz3qZJ+a4yG1qTC9SUjuxMhZlnmwU="; }; - pythonImportsCheck = [ "virt.firmware.efi" ]; - - nativeBuildInputs = [ + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; - pytestFlagsArray = ["tests/tests.py"]; - - propagatedBuildInputs = [ + dependencies = [ setuptools cryptography pefile ]; + # tests require systemd-detect-virt + doCheck = lib.meta.availableOn stdenv.hostPlatform pkgs.systemd; + + nativeCheckInputs = [ + pytestCheckHook + pkgs.systemd + ]; + + pytestFlagsArray = [ "tests/tests.py" ]; + + pythonImportsCheck = [ "virt.firmware.efi" ]; + meta = with lib; { description = "Tools for virtual machine firmware volumes"; homepage = "https://gitlab.com/kraxel/virt-firmware"; From e789427dd610b24d81afa0fe6a58ff359665d44e Mon Sep 17 00:00:00 2001 From: cryptoluks <9020527+cryptoluks@users.noreply.github.com> Date: Fri, 17 May 2024 15:29:57 +0200 Subject: [PATCH 241/262] maintainers: add cryptoluks --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index df3308c01abf..fca7b1e13d2c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4239,6 +4239,11 @@ githubId = 111202; name = "Henry Bubert"; }; + cryptoluks = { + github = "cryptoluks"; + githubId = 9020527; + name = "cryptoluks"; + }; CrystalGamma = { email = "nixos@crystalgamma.de"; github = "CrystalGamma"; From a1a755e3171418027cba6b2d2245d987c1d321e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 20:05:52 +0200 Subject: [PATCH 242/262] python312Packages.pybids: disable failing tests --- pkgs/development/python-modules/pybids/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index d702b4d509d3..841648247695 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -58,19 +58,23 @@ buildPythonPackage rec { ]; disabledTests = [ - # looks for missing data: + # Test looks for missing data "test_config_filename" - # regression associated with formulaic >= 0.6.0 + # Regression associated with formulaic >= 0.6.0 # (see https://github.com/bids-standard/pybids/issues/1000) "test_split" + # AssertionError, TypeError + "test_run_variable_collection_bad_length_to_df_all_dense_var" + "test_extension_initial_dot" + "test_to_df" ]; meta = with lib; { description = "Python tools for querying and manipulating BIDS datasets"; - mainProgram = "pybids"; homepage = "https://github.com/bids-standard/pybids"; changelog = "https://github.com/bids-standard/pybids/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; + mainProgram = "pybids"; }; } From fb19b3d723604032ae4ab7cc986e97641ad1035d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 20:06:43 +0200 Subject: [PATCH 243/262] python312Packages.pybids: format with nixfmt --- .../python-modules/pybids/default.nix | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 841648247695..33a00bac9284 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -1,19 +1,20 @@ -{ buildPythonPackage -, lib -, fetchPypi -, setuptools -, formulaic -, click -, num2words -, numpy -, scipy -, pandas -, nibabel -, bids-validator -, sqlalchemy -, pytestCheckHook -, versioneer -, pythonRelaxDepsHook +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + formulaic, + click, + num2words, + numpy, + scipy, + pandas, + nibabel, + bids-validator, + sqlalchemy, + pytestCheckHook, + versioneer, + pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -49,13 +50,9 @@ buildPythonPackage rec { sqlalchemy ]; - pythonImportsCheck = [ - "bids" - ]; + pythonImportsCheck = [ "bids" ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Test looks for missing data From 7fa181801d6a4bd78059698b8b2572a75574d17d Mon Sep 17 00:00:00 2001 From: cryptoluks <9020527+cryptoluks@users.noreply.github.com> Date: Fri, 17 May 2024 15:30:40 +0200 Subject: [PATCH 244/262] canon-capt: init at 0.1.4.2-GxB Add canon-capt driver package. This is a community-driven driver for Canon CAPT-based printers, based on reverse engineering attempts. Note that this is not the official Canon driver. --- pkgs/by-name/ca/canon-capt/package.nix | 71 ++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 pkgs/by-name/ca/canon-capt/package.nix diff --git a/pkgs/by-name/ca/canon-capt/package.nix b/pkgs/by-name/ca/canon-capt/package.nix new file mode 100644 index 000000000000..e2f77fee9c07 --- /dev/null +++ b/pkgs/by-name/ca/canon-capt/package.nix @@ -0,0 +1,71 @@ +{ + autoconf, + automake, + cups, + fetchFromGitHub, + lib, + stdenv, +}: + +let + version = "0.1.4.2-GxB"; +in +stdenv.mkDerivation { + pname = "canon-capt"; + inherit version; + + src = fetchFromGitHub { + owner = "mounaiban"; + repo = "captdriver"; + rev = "8ecc3cde1ae9a20dcb015994bb0fea0dbefa2b83"; + hash = "sha256-FslofWZNmF7G9+lmw1JehRBYZIAXcg6Dmv9xJ/c4Evo="; + }; + + nativeBuildInputs = [ + autoconf + automake + ]; + + buildInputs = [ cups ]; + + # Fix for 'ppdc: Unable to find include file ""', which blocks '*.ppd' generation. + # Issue occurs in hermetic sandbox; this workaround is the current solution. + # Source: https://github.com/NixOS/nixpkgs/blob/9997402000a82eda4327fde36291234118c7515e/pkgs/misc/drivers/hplip/default.nix#L160 + CUPS_DATADIR = "${cups}/share/cups"; + + configurePhase = '' + runHook preConfigure + aclocal + autoconf + automake --add-missing + ./configure --prefix=$out/usr + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + make + make ppd + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/cups/filter + install -D -m 755 ./src/rastertocapt $out/lib/cups/filter/rastertocapt + + mkdir -p $out/share/cups/model/canon + install -D -m 644 ./ppd/CanonLBP-2900-3000.ppd $out/share/cups/model/canon/CanonLBP-2900-3000.ppd + install -D -m 644 ./ppd/CanonLBP-3010-3018-3050.ppd $out/share/cups/model/canon/CanonLBP-3010-3018-3050.ppd + + runHook postInstall + ''; + + meta = with lib; { + description = "Community-driven driver for Canon CAPT-based printers"; + homepage = "https://github.com/mounaiban/captdriver"; + license = licenses.gpl3; + maintainers = with maintainers; [ cryptoluks ]; + platforms = platforms.linux; + }; +} From 2990b3c1ac9677352aed7813f35135dc4f21610a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 20:13:39 +0200 Subject: [PATCH 245/262] python312Packages.dcmstack: refactor --- .../python-modules/dcmstack/default.nix | 31 ++++++++++++++----- .../python-modules/heudiconv/default.nix | 18 +++++------ 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix index 8e7b74fc8dd3..a1dd38e9be24 100644 --- a/pkgs/development/python-modules/dcmstack/default.nix +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -1,37 +1,54 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, pytestCheckHook , nibabel , pydicom , pylibjpeg-libjpeg +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "dcmstack"; version = "0.9"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "moloney"; - repo = pname; + repo = "dcmstack"; rev = "refs/tags/v${version}"; hash = "sha256-GVzih9H2m2ZGSuZMRuaDG78b95PI3j0WQw5M3l4KNCs="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ nibabel pydicom pylibjpeg-libjpeg ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dcmstack" + ]; + + disabledTestPaths = [ + # AttributeError: 'TestNitoolCli' object has no attribute 'out_dir' + "test/test_cli.py" + ]; meta = with lib; { - homepage = "https://github.com/moloney/dcmstack"; description = "DICOM to Nifti conversion preserving metadata"; + homepage = "https://github.com/moloney/dcmstack"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index 9c78027e0a83..c80ff30b5217 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -14,13 +14,12 @@ , pythonOlder , setuptools , versioningit -, wheel }: buildPythonPackage rec { pname = "heudiconv"; version = "1.1.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -31,22 +30,21 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "versioningit ~=" "versioningit >=" + --replace-fail "versioningit ~=" "versioningit >=" ''; - nativeBuildInputs = [ + build-system = [ setuptools versioningit - wheel ]; - propagatedBuildInputs = [ - nibabel - pydicom - nipype + dependencies = [ dcmstack etelemetry filelock + nibabel + nipype + pydicom ]; nativeCheckInputs = [ @@ -65,8 +63,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://heudiconv.readthedocs.io"; description = "Flexible DICOM converter for organizing imaging data"; + homepage = "https://heudiconv.readthedocs.io"; changelog = "https://github.com/nipy/heudiconv/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ bcdarwin ]; From aba3b8455534d3402df4d74dc6c08c426e8e30ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 20:13:58 +0200 Subject: [PATCH 246/262] python312Packages.dcmstack: format with nixfmt --- .../python-modules/dcmstack/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix index a1dd38e9be24..fd84640e8d78 100644 --- a/pkgs/development/python-modules/dcmstack/default.nix +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, nibabel -, pydicom -, pylibjpeg-libjpeg -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + nibabel, + pydicom, + pylibjpeg-libjpeg, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-GVzih9H2m2ZGSuZMRuaDG78b95PI3j0WQw5M3l4KNCs="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ nibabel @@ -33,13 +32,9 @@ buildPythonPackage rec { pylibjpeg-libjpeg ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dcmstack" - ]; + pythonImportsCheck = [ "dcmstack" ]; disabledTestPaths = [ # AttributeError: 'TestNitoolCli' object has no attribute 'out_dir' From 85046d1188d994e83a0b99a0a832cf15eaf06be9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 20:15:54 +0200 Subject: [PATCH 247/262] python312Packages.heudiconv: refactor --- pkgs/development/python-modules/heudiconv/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index c80ff30b5217..f20f95f1041b 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -62,6 +62,11 @@ buildPythonPackage rec { "heudiconv" ]; + disabledTests = [ + # No such file or directory + "test_bvals_are_zero" + ]; + meta = with lib; { description = "Flexible DICOM converter for organizing imaging data"; homepage = "https://heudiconv.readthedocs.io"; From 3dbac594158c0a06c747a143dfa26090e2008fc1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 20:16:13 +0200 Subject: [PATCH 248/262] python312Packages.heudiconv: format with nixfmt --- .../python-modules/heudiconv/default.nix | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index f20f95f1041b..58a2e777a9cc 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildPythonPackage -, datalad -, dcm2niix -, dcmstack -, etelemetry -, fetchPypi -, filelock -, git -, nibabel -, nipype -, pydicom -, pytestCheckHook -, pythonOlder -, setuptools -, versioningit +{ + lib, + buildPythonPackage, + datalad, + dcm2niix, + dcmstack, + etelemetry, + fetchPypi, + filelock, + git, + nibabel, + nipype, + pydicom, + pytestCheckHook, + pythonOlder, + setuptools, + versioningit, }: buildPythonPackage rec { @@ -58,9 +59,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - pythonImportsCheck = [ - "heudiconv" - ]; + pythonImportsCheck = [ "heudiconv" ]; disabledTests = [ # No such file or directory From c09e7c4629d262bce0aa1625b1a4d1ffcb1a0393 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 20:33:12 +0200 Subject: [PATCH 249/262] python312Packages.pynmea2: refactor --- .../python-modules/pynmea2/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index 2bfdd61a6202..972bbee4a9f9 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -1,22 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, setuptools +, pythonOlder +}: buildPythonPackage rec { pname = "pynmea2"; version = "1.19.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-Hap5uTJ5+IfRwjXlzFx54yZEVkE4zkaYmrD0ovyXDXw="; }; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ + setuptools + ]; - pythonImportsCheck = [ "pynmea2" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pynmea2" + ]; meta = { - homepage = "https://github.com/Knio/pynmea2"; description = "Python library for the NMEA 0183 protcol"; + homepage = "https://github.com/Knio/pynmea2"; + changelog = "https://github.com/Knio/pynmea2/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ oxzi ]; }; From cff14ad57255c0be7dd20359c2507cb01dc02a7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 20:33:42 +0200 Subject: [PATCH 250/262] python312Packages.pynmea2: add patch to remove imp --- pkgs/development/python-modules/pynmea2/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index 972bbee4a9f9..30b2ac658624 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pytestCheckHook , setuptools , pythonOlder @@ -18,6 +19,15 @@ buildPythonPackage rec { hash = "sha256-Hap5uTJ5+IfRwjXlzFx54yZEVkE4zkaYmrD0ovyXDXw="; }; + patches = [ + # Removed depreciated imp and replaced with importlib, https://github.com/Knio/pynmea2/pull/164 + (fetchpatch { + name = "remove-imp.patch"; + url = "https://github.com/Knio/pynmea2/commit/c56717b5e859e978ad3b52b8f826faa5d50489f8.patch"; + hash = "sha256-jeFyfukT+0NLNxvNCxL7TzL/8oKmKOam5ZUIvjdvN/Q="; + }) + ]; + build-system = [ setuptools ]; From ab8373bf628ef54df8a34d15812c25119bb394f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 20:34:04 +0200 Subject: [PATCH 251/262] python312Packages.pynmea2: format with nixfmt --- .../python-modules/pynmea2/default.nix | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index 30b2ac658624..e4e9f37d2f50 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fetchpatch -, pytestCheckHook -, setuptools -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + fetchpatch, + pytestCheckHook, + setuptools, + pythonOlder, }: buildPythonPackage rec { @@ -28,17 +29,11 @@ buildPythonPackage rec { }) ]; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "pynmea2" - ]; + pythonImportsCheck = [ "pynmea2" ]; meta = { description = "Python library for the NMEA 0183 protcol"; From 1e03a6a730ea3a27508b6cbc72be2f42e4308474 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 18:54:10 +0000 Subject: [PATCH 252/262] python311Packages.slackclient: 3.27.1 -> 3.27.2 --- pkgs/development/python-modules/slackclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 9769f22727a3..5c9c6ed8a52e 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.27.1"; + version = "3.27.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-fBHu4e6pSt8yzXbLWr5cwjRFDfvdH2jzpSNzdMBg4N0="; + hash = "sha256-1I08OUseiwCN9vUd56f9IFzCSB9kGjTLojyWm2dIimE="; }; propagatedBuildInputs = [ From 1fe5e14323dcdcf67d79cb57fc2f3f8e408af35b Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 22:14:14 +0300 Subject: [PATCH 253/262] nym: fix build on darwin --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32999844a62b..baf859c834d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11187,7 +11187,7 @@ with pkgs; nylon = callPackage ../tools/networking/nylon { }; - nym = callPackage ../applications/networking/nym { + nym = darwin.apple_sdk_11_0.callPackage ../applications/networking/nym { inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; From 7798bd992c42133d747d4de4163a63d69e753655 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 22:14:30 +0300 Subject: [PATCH 254/262] git-credential-keepassxc: fix build on darwin --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index baf859c834d0..18344b19e42b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2334,7 +2334,7 @@ with pkgs; git-credential-1password = callPackage ../applications/version-management/git-credential-1password { }; - git-credential-keepassxc = callPackage ../applications/version-management/git-credential-keepassxc { + git-credential-keepassxc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-credential-keepassxc { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; }; From f1cf08e23f985cdc910044c425ab4ce87106f9e9 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 22:15:10 +0300 Subject: [PATCH 255/262] veilid: fix build on darwin --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18344b19e42b..997bf8d24fc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40258,7 +40258,7 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - veilid = callPackage ../tools/networking/veilid { + veilid = darwin.apple_sdk_11_0.callPackage ../tools/networking/veilid { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; From bdf93b60f37d03fb7db3cc12a612ad60bfad8b99 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 22:19:24 +0300 Subject: [PATCH 256/262] jikken: fix build on darwin --- pkgs/by-name/ji/jikken/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ji/jikken/package.nix b/pkgs/by-name/ji/jikken/package.nix index 9b51b96ac2dc..79f0343932a8 100644 --- a/pkgs/by-name/ji/jikken/package.nix +++ b/pkgs/by-name/ji/jikken/package.nix @@ -26,9 +26,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration + darwin.apple_sdk_11_0.frameworks.IOKit + darwin.apple_sdk_11_0.frameworks.Security + darwin.apple_sdk_11_0.frameworks.SystemConfiguration ]; passthru.updateScript = nix-update-script { }; From 7c0b3127529cd1ad2d30090f1afad2e6d1320d97 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 14 May 2024 15:31:05 -0400 Subject: [PATCH 257/262] python311Packages.torchgpipe: remove at 0.0.7 --- .../python-modules/torchgpipe/default.nix | 42 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 pkgs/development/python-modules/torchgpipe/default.nix diff --git a/pkgs/development/python-modules/torchgpipe/default.nix b/pkgs/development/python-modules/torchgpipe/default.nix deleted file mode 100644 index f96add92f0cc..000000000000 --- a/pkgs/development/python-modules/torchgpipe/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pytestCheckHook -, torch -}: - -buildPythonPackage rec { - pname = "torchgpipe"; - version = "0.0.7"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "kakaobrain"; - repo = pname; - rev = "v${version}"; - sha256 = "0ki0njhmz1i3pkpr3y6h6ac7p5qh1kih06mknc2s18mfw34f2l55"; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'" "" - ''; - - propagatedBuildInputs = [ torch ]; - - nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - "test_inplace_on_requires_grad" - "test_input_requiring_grad" - ]; - - meta = with lib; { - description = "GPipe implemented in Pytorch and optimized for CUDA rather than TPU"; - homepage = "https://torchgpipe.readthedocs.io"; - license = licenses.asl20; - maintainers = [ maintainers.bcdarwin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 8a2789e5dc6b..69a78d27314c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -516,6 +516,7 @@ mapAliases ({ TheanoWithCuda = theanoWithCuda; # added 2023-02-19 TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19 thumborPexif = throw "thumborPexif has been removed, because it was unused."; # added 2024-01-07 + torchgpipe = throw "torchgpipe has been removed, because it appears unmaintained and Pytorch now includes pipeline parallelism support"; # added 2024-05-18 torrent_parser = torrent-parser; # added 2023-11-04 transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27 py-tree-sitter = throw "Was merged with tree-sitter."; # added 2024-03-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 455b2ddbff3b..bcfb9b58eb98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15303,8 +15303,6 @@ self: super: with self; { torchdiffeq = callPackage ../development/python-modules/torchdiffeq { }; - torchgpipe = callPackage ../development/python-modules/torchgpipe { }; - torchmetrics = callPackage ../development/python-modules/torchmetrics { }; torchio = callPackage ../development/python-modules/torchio { }; From ccaeceb7082583bd0cff49884efeb3a5b74e3bd5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:36:17 +0200 Subject: [PATCH 258/262] python312Packages.hickle: remove disabled tests --- pkgs/development/python-modules/hickle/default.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index ec802955c0d3..b4597cd0c0d4 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "5.0.3"; pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -47,17 +47,6 @@ buildPythonPackage rec { 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" - # broken in 5.0.2 - "test_slash_dict_keys" - ]; - meta = with lib; { description = "Serialize Python data to HDF5"; homepage = "https://github.com/telegraphic/hickle"; From e79fd7526593114bc3678219978a077bdb7dca4b Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 18 May 2024 15:56:47 -0400 Subject: [PATCH 259/262] python311Packages.pytest-postgresql: 5.0.0 -> 6.0.0 --- .../python-modules/pytest-postgresql/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytest-postgresql/default.nix b/pkgs/development/python-modules/pytest-postgresql/default.nix index 6eed5ef6ad2c..b5804dcf4977 100644 --- a/pkgs/development/python-modules/pytest-postgresql/default.nix +++ b/pkgs/development/python-modules/pytest-postgresql/default.nix @@ -13,8 +13,8 @@ buildPythonPackage rec { pname = "pytest-postgresql"; - version = "5.0.0"; - format = "pyproject"; + version = "6.0.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -22,13 +22,13 @@ buildPythonPackage rec { owner = "ClearcodeHQ"; repo = "pytest-postgresql"; rev = "refs/tags/v${version}"; - hash = "sha256-uWKp9yxTdlswoDPMlhx+2mF1cdhFzhGYKGHdXPGlz+w="; + hash = "sha256-6D9QNcfq518ORQDYCH5G+LLJ7tVWPFwB6ylZR3LOZ5g="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov" "" \ - --replace "--max-worker-restart=0" "" + --replace-fail "--cov" "" \ + --replace-fail "--max-worker-restart=0" "" sed -i 's#/usr/lib/postgresql/.*/bin/pg_ctl#${postgresql}/bin/pg_ctl#' pytest_postgresql/plugin.py ''; @@ -54,6 +54,7 @@ buildPythonPackage rec { # permissions issue running pg as Nixbld user "test_executor_init_with_password" # "ValueError: Pytest terminal summary report not found" + "test_postgres_loader_in_cli" "test_postgres_options_config_in_cli" "test_postgres_options_config_in_ini" ]; From 082b2c1fcfd11123f7f759166e89f40472159835 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 18 May 2024 16:30:30 -0400 Subject: [PATCH 260/262] python311Packages.skorch: unbreak by patching out failing test --- pkgs/development/python-modules/skorch/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 01d23f596dd9..ab128f978571 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch , pythonOlder , numpy , scikit-learn @@ -26,6 +27,13 @@ buildPythonPackage rec { hash = "sha256-39XVBlCmbg162z9uL84GZrU+v+M8waXbGdVV72ZYf84="; }; + # Remove at next skorch release: + patches = [ (fetchpatch { + name = "unbreak-tests-with-sklearn-1.4"; + url = "https://github.com/skorch-dev/skorch/commit/1f7a779d0aa78589e17262c206f5775f2fcd75f8.diff"; + hash = "sha256-X3SgjgDeq3PlBI13cC56LIL1dV1e+Z3tsBj9sz5pizo="; + }) ]; + disabled = pythonOlder "3.8"; propagatedBuildInputs = [ From 391dfcf9af4d46d6bffea00c83bb407b2d152c2b Mon Sep 17 00:00:00 2001 From: Jack Wilsdon Date: Sat, 18 May 2024 21:50:10 +0100 Subject: [PATCH 261/262] nixos/steam: fix maintainers --- nixos/modules/programs/steam.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index d317398495f5..d76863aff83b 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -192,5 +192,5 @@ in { ]; }; - meta.maintainers = lib.teams.steam; + meta.maintainers = lib.teams.steam.members; } From 4582b524ba35b8186a9b3a366eaba8cbe31d140f Mon Sep 17 00:00:00 2001 From: TNE <38938720+JustTNE@users.noreply.github.com> Date: Sun, 19 May 2024 00:16:00 +0200 Subject: [PATCH 262/262] pgadmin: Use systemd's LoadCredential for password files (#312569) * pgadmin: Use systemd's LoadCredential for password files * Update nixos/modules/services/admin/pgadmin.nix --------- Co-authored-by: Sandro --- nixos/modules/services/admin/pgadmin.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/admin/pgadmin.nix b/nixos/modules/services/admin/pgadmin.nix index ead0c3c6c9a3..b3dd3c78874c 100644 --- a/nixos/modules/services/admin/pgadmin.nix +++ b/nixos/modules/services/admin/pgadmin.nix @@ -152,7 +152,8 @@ in # Check here for password length to prevent pgadmin from starting # and presenting a hard to find error message # see https://github.com/NixOS/nixpkgs/issues/270624 - PW_LENGTH=$(wc -m < ${escapeShellArg cfg.initialPasswordFile}) + PW_FILE="$CREDENTIALS_DIRECTORY/initial_password" + PW_LENGTH=$(wc -m < "$PW_FILE") if [ $PW_LENGTH -lt ${toString cfg.minimumPasswordLength} ]; then echo "Password must be at least ${toString cfg.minimumPasswordLength} characters long" exit 1 @@ -162,7 +163,7 @@ in echo ${escapeShellArg cfg.initialEmail} # file might not contain newline. echo hack fixes that. - PW=$(cat ${escapeShellArg cfg.initialPasswordFile}) + PW=$(cat "$PW_FILE") # Password: echo "$PW" @@ -181,6 +182,8 @@ in LogsDirectory = "pgadmin"; StateDirectory = "pgadmin"; ExecStart = "${cfg.package}/bin/pgadmin4"; + LoadCredential = [ "initial_password:${cfg.initialPasswordFile}" ] + ++ optional cfg.emailServer.enable "email_password:${cfg.emailServer.passwordFile}"; }; }; @@ -193,7 +196,8 @@ in environment.etc."pgadmin/config_system.py" = { text = lib.optionalString cfg.emailServer.enable '' - with open("${cfg.emailServer.passwordFile}") as f: + import os + with open(os.path.join(os.environ['CREDENTIALS_DIRECTORY'], 'email_password')) as f: pw = f.read() MAIL_PASSWORD = pw '' + formatPy cfg.settings;