From 0cdf53a57f8318cee86dd682fd1523b8aaa69d0f Mon Sep 17 00:00:00 2001 From: Sander Date: Thu, 22 Aug 2024 13:38:57 +0000 Subject: [PATCH 01/69] nixos/datadog-agent: fix deprecated trace agent option --- nixos/modules/services/monitoring/datadog-agent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index 5ac98bdf0382e86..04232b3c9346625 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -288,7 +288,7 @@ in { path = [ ]; script = '' export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile}) - ${datadogPkg}/bin/trace-agent -config /etc/datadog-agent/datadog.yaml + ${datadogPkg}/bin/trace-agent --config /etc/datadog-agent/datadog.yaml ''; }); From 79474fd4c31d496bc51fa3ee80c96742527889e1 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Mon, 9 Sep 2024 19:46:59 +0000 Subject: [PATCH 02/69] gmic: enable OpenCV, OpenMP (Clang) and X11 fixes #265966 --- pkgs/by-name/gm/gmic/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 602f9cc80294a6d..104ea8a2c7f78b5 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -13,9 +13,12 @@ , gnused , graphicsmagick , jq +, libX11 +, libXext , libjpeg , libpng , libtiff +, llvmPackages , ninja , opencv , openexr @@ -55,18 +58,24 @@ stdenv.mkDerivation (finalAttrs: { cimg fftw graphicsmagick + libX11 + libXext libjpeg libpng libtiff opencv openexr zlib + ] ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp ]; cmakeFlags = [ (lib.cmakeBool "BUILD_LIB_STATIC" false) (lib.cmakeBool "ENABLE_CURL" false) (lib.cmakeBool "ENABLE_DYNAMIC_LINKING" true) + (lib.cmakeBool "ENABLE_OPENCV" true) + (lib.cmakeBool "ENABLE_XSHM" true) (lib.cmakeBool "USE_SYSTEM_CIMG" true) ]; From cc0811a5dad333cefde6d50fe8c1fa0942d19f74 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Mon, 9 Sep 2024 19:46:59 +0000 Subject: [PATCH 03/69] gmic-qt: enable OpenMP (Clang) --- pkgs/by-name/gm/gmic-qt/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix index 5d097f13f5c62c7..06601e08fe4c5c9 100644 --- a/pkgs/by-name/gm/gmic-qt/package.nix +++ b/pkgs/by-name/gm/gmic-qt/package.nix @@ -12,6 +12,7 @@ , libpng , libsForQt5 , libtiff +, llvmPackages , ninja , nix-update-script , openexr @@ -79,7 +80,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ (with libsForQt5; [ qtbase qttools - ]) ++ variants.${variant}.extraDeps; + ]) ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + ] ++ variants.${variant}.extraDeps; postPatch = '' patchShebangs \ From 0a522de24902f9bbdb9423c101038cab1e9c84b1 Mon Sep 17 00:00:00 2001 From: toastal Date: Wed, 25 Sep 2024 13:25:11 +0700 Subject: [PATCH 04/69] =?UTF-8?q?movim:=200.27.1=20=E2=86=92=200.28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/mo/movim/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 665b0d5cd8899d6..ef5dac3d58fed1a 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -38,13 +38,13 @@ let in php.buildComposerProject (finalAttrs: { pname = "movim"; - version = "0.27.1"; + version = "0.28"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-7/8d+GU/hLaiFqo4Rl0ardhOwEpSeJ3GfJMNpGbNlnU="; + hash = "sha256-mjBeBu1seH5XMls+e4ON13ayVeugKogbNTzbjp1pUjE="; }; php = php.buildEnv ({ @@ -67,7 +67,7 @@ php.buildComposerProject (finalAttrs: { # pinned commonmark composerStrictValidation = false; - vendorHash = "sha256-wDnOh1CdJOovqmr4k45ksycuylYwL0Dm/UTl4EETf1k="; + vendorHash = "sha256-ZfMUpkIRCAsiQf6PEVPrMpljZWjP9JXf+nEFA/LunsQ="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; From 780aa2379092d0f11ec55466170e7d90e9515196 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 25 Sep 2024 19:21:17 -0300 Subject: [PATCH 05/69] bibletime: libsForQt5.callPackage -> callPackage --- pkgs/applications/misc/bibletime/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 1b7fde5d7de84a4..619bca65ed0a119 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -4,17 +4,17 @@ , cmake , docbook_xml_dtd_45 , pkg-config -, wrapQtAppsHook , boost , clucene_core_2 , docbook_xsl_ns , perlPackages -, qtbase -, qtsvg -, qttools , sword +, qt5 }: +let + inherit (qt5) qtbase qtsvg qttools wrapQtAppsHook; +in stdenv.mkDerivation (finalAttrs: { pname = "bibletime"; version = "3.0.3"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e0dffbeec0ac64..7030807d823544b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28573,7 +28573,7 @@ with pkgs; bfcal = libsForQt5.callPackage ../applications/misc/bfcal { }; - bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; + bibletime = callPackage ../applications/misc/bibletime { }; bino3d = qt6Packages.callPackage ../applications/video/bino3d { }; From b38bd06347fda29a5060d3e6a2dfae05f9f81d47 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 25 Sep 2024 19:24:15 -0300 Subject: [PATCH 06/69] bibletime: migrate to by-name --- .../bibletime/default.nix => by-name/bi/bibletime/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/bibletime/default.nix => by-name/bi/bibletime/package.nix} (100%) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/by-name/bi/bibletime/package.nix similarity index 100% rename from pkgs/applications/misc/bibletime/default.nix rename to pkgs/by-name/bi/bibletime/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7030807d823544b..094dd318bdde86e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28573,8 +28573,6 @@ with pkgs; bfcal = libsForQt5.callPackage ../applications/misc/bfcal { }; - bibletime = callPackage ../applications/misc/bibletime { }; - bino3d = qt6Packages.callPackage ../applications/video/bino3d { }; bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; From 3a2b613ecac020ba61ca5b2752b5f672ef578179 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 25 Sep 2024 20:05:26 -0300 Subject: [PATCH 07/69] bibletime: refactor - use lib.* - strictDeps - no nested with --- pkgs/by-name/bi/bibletime/package.nix | 52 +++++++++++++++------------ 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/bi/bibletime/package.nix b/pkgs/by-name/bi/bibletime/package.nix index 619bca65ed0a119..2c95eb11b25ba62 100644 --- a/pkgs/by-name/bi/bibletime/package.nix +++ b/pkgs/by-name/bi/bibletime/package.nix @@ -1,19 +1,25 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, docbook_xml_dtd_45 -, pkg-config -, boost -, clucene_core_2 -, docbook_xsl_ns -, perlPackages -, sword -, qt5 +{ + lib, + boost, + clucene_core_2, + cmake, + docbook_xml_dtd_45, + docbook_xsl_ns, + fetchFromGitHub, + perlPackages, + pkg-config, + qt5, + stdenv, + sword, }: let - inherit (qt5) qtbase qtsvg qttools wrapQtAppsHook; + inherit (qt5) + qtbase + qtsvg + qttools + wrapQtAppsHook + ; in stdenv.mkDerivation (finalAttrs: { pname = "bibletime"; @@ -31,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_45 pkg-config wrapQtAppsHook + perlPackages.Po4a ]; buildInputs = [ boost clucene_core_2 - perlPackages.Po4a qtbase qtsvg qttools @@ -49,18 +55,20 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - "-DBUILD_HOWTO_PDF=OFF" - "-DBUILD_HANDBOOK_PDF=OFF" - "-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl" - "-DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl" + (lib.cmakeBool "BUILD_HOWTO_PDF" false) + (lib.cmakeBool "BUILD_HANDBOOK_PDF" false) + (lib.cmakeFeature "BT_DOCBOOK_XSL_HTML_CHUNK_XSL" "${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl") + (lib.cmakeFeature "BT_DOCBOOK_XSL_PDF_DOCBOOK_XSL" "${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl") ]; - meta = with lib; { + strictDeps = true; + + meta = { homepage = "http://www.bibletime.info/"; description = "Powerful cross platform Bible study tool"; + license = lib.licenses.gpl2Plus; mainProgram = "bibletime"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; }) From 8d6e1018936c4f9f7cd322a6dd08bef6a26d0435 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 26 Sep 2024 00:36:32 +0100 Subject: [PATCH 08/69] tests.pkg-config: extend current Nixpkgs configuration This was enabling aliases on ofborg. --- pkgs/top-level/pkg-config/tests.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/pkg-config/tests.nix b/pkgs/top-level/pkg-config/tests.nix index 786e2ecc534b8a9..dbf766a0cf267ca 100644 --- a/pkgs/top-level/pkg-config/tests.nix +++ b/pkgs/top-level/pkg-config/tests.nix @@ -1,6 +1,6 @@ # cd nixpkgs # nix-build -A tests.pkg-config -{ lib, stdenv, ... }: +{ lib, config, stdenv, ... }: let # defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform @@ -10,7 +10,7 @@ let allPkgs = import ../default.nix { system = stdenv.hostPlatform.system; localSystem = stdenv.buildPlatform.system; - config = { + config = config // { allowUnsupportedSystem = true; }; overlays = []; From 77eb5dfe220b9ebee8a7b0274b8ceee939f34b07 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 15 Sep 2024 17:16:06 +0100 Subject: [PATCH 09/69] cudaPackages_{10*,11*}: warn about upcoming removal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We currently package all CUDA versions from 10.0 onwards. In some cases, CUDA is the only thing preventing us from removing old versions of GCC. Since we currently don’t deprecate or remove CUDA versions, this will be an increasing drag on compiler maintenance in Nixpkgs going forward unless we establish a sensible policy. After discussing this with @SomeoneSerge in the context of old versions of GCC, I learned that there was already a desire to remove at least versions prior to 11.3, as those versions were only packaged in the old “runfile” format, but that it was blocked on someone doing the work to warn about the upcoming deprecation for a release cycle. This change adds a release note and warnings indicating that CUDA 10.x and 11.x will be removed in Nixpkgs 25.05, about 8 months from now. I chose this version cut‐off because these versions of CUDA require GCC < 12. GCC releases a major version every year, and seems to support about four releases at a time, releasing the last update to the oldest version and marking it as unsupported on their site around the time of the release of the next major version. Therefore, by the time of the 25.05 release, we should expect GCC 15 to be released and GCC 11 to become unsupported. Adding a warning and communicating the policy of only shipping CUDA versions that work with supported compilers in the release notes means that we should be able to clean up old versions as required without any issue or extensive deprecation period in future, without obligating us to do so if there is a strongly compelling reason to be more lenient. That should help solve both shipping an indefinitely‐growing list of CUDA versions and an indefinitely‐growing list of GCC and LLVM versions. As I’m not a user of CUDA myself, I can’t be sure of how sensible this version support policy is, but I think it’s fair to say that it’s reasonable for Nixpkgs to choose not to maintain compiler versions that are unsupported upstream just for the sake of versions of CUDA that are also unmaintained. CUDA 11.x has not received an update for two years already, and would only become unsupported in Nixpkgs in over half a year’s time. CUDA 10.x is currently unused in‐tree except for the unmaintained Caffe and NVIDIA DCGM, which depends on multiple CUDA versions solely so that it can provide plugins for those versions. The latest DCGM version has already removed support for CUDA 10.x and is just awaiting an update in Nixpkgs. They maintain a list of supported versions to build plugins for in their CMake build system, so it should be simple enough for us to only build support for the versions of CUDA that we support in Nixpkgs. From what I can tell, CUDA 11.x is currently used by the following packages other than DCGM: * `catboost`, because of . It looks like upstream has since redesigned this part of their build system, so perhaps the problem is no longer present, or would be easier to fix. * `magma_2_6_2`, an old version from before upstream added CUDA 12 support. This seems okay to break to me; that version is not maintained and will never be updated for new CUDA versions, and the CUDA support is optional. * `paddlepaddle`, which, uh, also requires OpenSSL 1.1 of all things. states that PaddlePaddle supports up to 12.3. * `python3Packages.cupy`, which is listed as “possibly incompatible with cutensor 2.0 that comes with `cudaPackages_12`”. I’m not sure what the “possibly” means here, but according to they ship binary wheels using CUDA 12.x so I think this should be fine. * `python3Packages.tensorrt`, which supports CUDA 12.x going by . * TensorFlow, which has a link to above the `python3Packages.tensorflow-bin` definition, but that page lists the versions we package as supporting CUDA 12.x. Given the years since CUDA 11.x received any update upstream, and the seemingly very limited set of packages that truly require it, I think the policy of being able to drop versions that require unsupported compilers starting from the next Nixpkgs release is a reasonable one, but of course I’m open to feedback from the CUDA maintainers about this. --- nixos/doc/manual/release-notes/rl-2411.section.md | 4 ++++ pkgs/top-level/cuda-packages.nix | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 4f773fccd23a14e..0aaca05780a0b44 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -9,6 +9,10 @@ Users on old macOS versions should consider upgrading to a supported version (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS. If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports back to Mac OS X Snow Leopard 10.6. +- This will be the last release of Nixpkgs to support versions of CUDA prior to CUDA 12.0. + These versions only work with old compiler versions that will be unsupported by the time of the Nixpkgs 25.05 release. + In future, users should expect CUDA versions to be dropped as the compiler versions they require leave upstream support windows. + - Convenience options for `amdgpu`, open source driver for Radeon cards, is now available under `hardware.amdgpu`. - [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured as `hardware.amdgpu.amdvlk` option. diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 639fa70446bee6b..bdd193db04264b2 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -123,4 +123,10 @@ let fixedPoints.extends composedExtension passthruFunction ); in -cudaPackages +# We want to warn users about the upcoming deprecation of old CUDA +# versions, without breaking Nixpkgs CI with evaluation warnings. This +# gross hack ensures that the warning only triggers if aliases are +# enabled, which is true by default, but not for ofborg. +lib.warnIf (cudaPackages.cudaOlder "12.0" && config.allowAliases) + "CUDA versions older than 12.0 will be removed in Nixpkgs 25.05; see the 24.11 release notes for more information" + cudaPackages From 6bf2f1589cf4d304fba849f4466ebd7a517bbb0d Mon Sep 17 00:00:00 2001 From: Jan Christoph Ebersbach Date: Wed, 25 Sep 2024 12:42:42 +0900 Subject: [PATCH 10/69] sogo: 5.10.0 -> 5.11.0 --- pkgs/servers/web-apps/sogo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index a6740f7422902e3..b24910f4bb0525d 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -5,14 +5,14 @@ , libwbxml }: gnustep.stdenv.mkDerivation rec { pname = "sogo"; - version = "5.10.0"; + version = "5.11.0"; # always update the sope package as well, when updating sogo src = fetchFromGitHub { owner = "Alinto"; repo = pname; rev = "SOGo-${version}"; - hash = "sha256-ZmpOI1zk/TkRNFmwTXugVb9IvxYSP4LgNrApSytdI7s="; + hash = "sha256-2/0OaCAQkdnDPGOVERZs2Oz+bCpQN3MTLzp2pz0WB08="; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ]; @@ -77,7 +77,7 @@ gnustep.stdenv.mkDerivation rec { license = with licenses; [ gpl2Only lgpl21Only ]; homepage = "https://sogo.nu/"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ jceb ]; }; } From f6882726d8f62259668c1090ac3fe461b39c1185 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 27 Sep 2024 15:05:27 -0300 Subject: [PATCH 11/69] luckybackup: libsForQt5.callPackage -> callPackage --- pkgs/tools/backup/luckybackup/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix index 6fd32a2ceb44a5d..8f51f494b742760 100644 --- a/pkgs/tools/backup/luckybackup/default.nix +++ b/pkgs/tools/backup/luckybackup/default.nix @@ -1,9 +1,9 @@ -{ mkDerivation, lib, fetchurl -, pkg-config, libtool, qmake -, rsync, ssh +{ stdenv, lib, fetchurl +, pkg-config, libtool, qt5 +, rsync, openssh }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "luckybackup"; version = "0.5.0"; @@ -12,9 +12,9 @@ mkDerivation rec { sha256 = "0nwjsk1j33pm8882jbj8h6nxn6n5ab9dxqpqkay65pfbhcjay0g8"; }; - buildInputs = [ rsync ssh ]; + buildInputs = [ rsync openssh ]; - nativeBuildInputs = [ pkg-config libtool qmake ]; + nativeBuildInputs = [ pkg-config libtool qt5.qmake qt5.wrapQtAppsHook ]; prePatch = '' for File in luckybackup.pro menu/luckybackup-pkexec \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bdc99a11d17d55..a2d0f76293fa0ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7203,9 +7203,7 @@ with pkgs; evtx = callPackage ../tools/security/evtx { }; - luckybackup = libsForQt5.callPackage ../tools/backup/luckybackup { - ssh = openssh; - }; + luckybackup = callPackage ../tools/backup/luckybackup { }; kics = callPackage ../tools/admin/kics { }; From 758ee91317eafeaa1f3bbaf976af04e0efbe866c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 27 Sep 2024 15:36:42 -0300 Subject: [PATCH 12/69] luckybackup: migrate to by-name --- .../default.nix => by-name/lu/luckybackup/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/backup/luckybackup/default.nix => by-name/lu/luckybackup/package.nix} (100%) diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/by-name/lu/luckybackup/package.nix similarity index 100% rename from pkgs/tools/backup/luckybackup/default.nix rename to pkgs/by-name/lu/luckybackup/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2d0f76293fa0ed..d63847c14ac157a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7203,8 +7203,6 @@ with pkgs; evtx = callPackage ../tools/security/evtx { }; - luckybackup = callPackage ../tools/backup/luckybackup { }; - kics = callPackage ../tools/admin/kics { }; kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; From a689118a3ff401667f3144f260764f5895b8f869 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 27 Sep 2024 16:50:45 -0300 Subject: [PATCH 13/69] luckybackup: refactor - finalAttrs - split outputs - strictDeps - no nested with --- pkgs/by-name/lu/luckybackup/package.nix | 66 ++++++++++++++++++------- 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/lu/luckybackup/package.nix b/pkgs/by-name/lu/luckybackup/package.nix index 8f51f494b742760..7fe889178cf78ea 100644 --- a/pkgs/by-name/lu/luckybackup/package.nix +++ b/pkgs/by-name/lu/luckybackup/package.nix @@ -1,31 +1,59 @@ -{ stdenv, lib, fetchurl -, pkg-config, libtool, qt5 -, rsync, openssh +{ + lib, + fetchurl, + libtool, + openssh, + pkg-config, + qt5, + rsync, + stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "luckybackup"; version = "0.5.0"; src = fetchurl { - url = "mirror://sourceforge/project/luckybackup/${version}/source/${pname}-${version}.tar.gz"; - sha256 = "0nwjsk1j33pm8882jbj8h6nxn6n5ab9dxqpqkay65pfbhcjay0g8"; + url = "mirror://sourceforge/project/luckybackup/${finalAttrs.version}/source/luckybackup-${finalAttrs.version}.tar.gz"; + hash = "sha256-6AGvJIPL3WK8mvji3tJSxRrbrYFILikQQvWOIcPUkls="; }; - buildInputs = [ rsync openssh ]; + outputs = [ + "out" + "doc" + "man" + ]; - nativeBuildInputs = [ pkg-config libtool qt5.qmake qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ + libtool + pkg-config + qt5.qmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + rsync + openssh + ]; + + strictDeps = true; prePatch = '' - for File in luckybackup.pro menu/luckybackup-pkexec \ - menu/luckybackup-su.desktop menu/luckybackup.desktop \ - menu/net.luckybackup.su.policy src/functions.cpp \ - src/global.cpp src/scheduleDialog.cpp; do - substituteInPlace $File --replace "/usr" "$out" + for File in \ + luckybackup.pro \ + menu/luckybackup-pkexec \ + menu/luckybackup-su.desktop \ + menu/luckybackup.desktop \ + menu/net.luckybackup.su.policy \ + src/functions.cpp \ + src/global.cpp \ + src/scheduleDialog.cpp; do + substituteInPlace $File --replace "/usr" "$out" done ''; - meta = with lib; { + meta = { + homepage = "https://luckybackup.sourceforge.net/"; description = "Powerful, fast and reliable backup & sync tool"; longDescription = '' luckyBackup is an application for data back-up and synchronization @@ -36,9 +64,9 @@ stdenv.mkDerivation rec { before proceeding in any data manipulation), reliable and fully customizable. ''; - homepage = "https://luckybackup.sourceforge.net/"; - license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + mainProgram = "luckybackup"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) From be39682588126e0270546398271f39d0e974ed49 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 27 Sep 2024 20:44:36 -0300 Subject: [PATCH 14/69] renderdoc: libsForQt5.callPackage -> callPackage --- pkgs/development/tools/renderdoc/default.nix | 41 ++++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/development/tools/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix index beeeddeb70c5757..682fe81dc90c22d 100644 --- a/pkgs/development/tools/renderdoc/default.nix +++ b/pkgs/development/tools/renderdoc/default.nix @@ -1,27 +1,28 @@ { lib +, addDriverRunpath +, autoconf +, automake +, bison +, cmake , fetchFromGitHub +, libglvnd +, makeWrapper , nix-update-script -, cmake +, pcre , pkg-config -, mkDerivation -, qtbase -, qtx11extras -, qtsvg -, makeWrapper -, vulkan-loader -, libglvnd -, xorg -, python311 , python311Packages -, bison -, pcre -, automake -, autoconf -, addDriverRunpath -, waylandSupport ? false +, vulkan-loader , wayland +, xorg +, qt5 +, stdenv +# Boolean flags +, waylandSupport ? true }: + let + inherit (qt5) qtbase qtsvg qtx11extras wrapQtAppsHook; + custom_swig = fetchFromGitHub { owner = "baldurk"; repo = "swig"; @@ -29,7 +30,7 @@ let sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6"; }; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "renderdoc"; version = "1.34"; @@ -41,13 +42,13 @@ mkDerivation rec { }; buildInputs = [ - qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python311 + qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader ] ++ (with python311Packages; [ - pyside2 pyside2-tools shiboken2 + python pyside2 pyside2-tools shiboken2 ]) ++ lib.optional waylandSupport wayland; - nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addDriverRunpath ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addDriverRunpath wrapQtAppsHook ]; postUnpack = '' cp -r ${custom_swig} swig diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d80d39bedd7d50..bc4da1418b30985 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11875,7 +11875,7 @@ with pkgs; renameutils = callPackage ../tools/misc/renameutils { }; - renderdoc = libsForQt5.callPackage ../development/tools/renderdoc { }; + renderdoc = callPackage ../development/tools/renderdoc { }; repgrep = callPackage ../tools/text/repgrep { }; From 257ebd4d0bd6354094e982548764dd16a4dcac78 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 27 Sep 2024 20:44:44 -0300 Subject: [PATCH 15/69] renderdoc: migrate to by-name --- .../renderdoc/default.nix => by-name/re/renderdoc/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/renderdoc/default.nix => by-name/re/renderdoc/package.nix} (100%) diff --git a/pkgs/development/tools/renderdoc/default.nix b/pkgs/by-name/re/renderdoc/package.nix similarity index 100% rename from pkgs/development/tools/renderdoc/default.nix rename to pkgs/by-name/re/renderdoc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc4da1418b30985..a9dd366e208ef6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11875,8 +11875,6 @@ with pkgs; renameutils = callPackage ../tools/misc/renameutils { }; - renderdoc = callPackage ../development/tools/renderdoc { }; - repgrep = callPackage ../tools/text/repgrep { }; replace = callPackage ../tools/text/replace { }; From 4e77373c08eed2b6734e29bec656aa74a141b848 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 27 Sep 2024 22:59:21 -0300 Subject: [PATCH 16/69] renderdoc: refactor - nixfmt-rfc-style - finalAttrs - strictDeps - and related changes - cmakeFlagsArray instead of cmakeFlags --- pkgs/by-name/re/renderdoc/package.nix | 155 ++++++++++++++++---------- 1 file changed, 99 insertions(+), 56 deletions(-) diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index 682fe81dc90c22d..9f2fea85ff530df 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -1,100 +1,143 @@ -{ lib -, addDriverRunpath -, autoconf -, automake -, bison -, cmake -, fetchFromGitHub -, libglvnd -, makeWrapper -, nix-update-script -, pcre -, pkg-config -, python311Packages -, vulkan-loader -, wayland -, xorg -, qt5 -, stdenv -# Boolean flags -, waylandSupport ? true +{ + lib, + addDriverRunpath, + autoconf, + automake, + bison, + cmake, + fetchFromGitHub, + libXdmcp, + libglvnd, + libpthreadstubs, + makeWrapper, + nix-update-script, + pcre, + pkg-config, + python311Packages, + qt5, + stdenv, + vulkan-loader, + wayland, + # Boolean flags + waylandSupport ? true, }: let - inherit (qt5) qtbase qtsvg qtx11extras wrapQtAppsHook; - custom_swig = fetchFromGitHub { owner = "baldurk"; repo = "swig"; rev = "renderdoc-modified-7"; - sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6"; + hash = "sha256-RsdvxBBQvwuE5wSwL8OBXg5KMSpcO6EuMS0CzWapIpc="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "renderdoc"; version = "1.34"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; - rev = "v${version}"; - sha256 = "sha256-obRCILzMR7tCni0YoT3/oesTSADGI2sXqY3G6RS1h1o="; + rev = "v${finalAttrs.version}"; + hash = "sha256-obRCILzMR7tCni0YoT3/oesTSADGI2sXqY3G6RS1h1o="; }; - buildInputs = [ - qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader - ] ++ (with python311Packages; [ - python pyside2 pyside2-tools shiboken2 - ]) - ++ lib.optional waylandSupport wayland; + outputs = [ + "out" + "dev" + "doc" + ]; - nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addDriverRunpath wrapQtAppsHook ]; + buildInputs = + [ + libXdmcp + libpthreadstubs + python311Packages.pyside2 + python311Packages.pyside2-tools + python311Packages.shiboken2 + qt5.qtbase + qt5.qtsvg + vulkan-loader + ] + ++ lib.optionals waylandSupport [ + wayland + ]; - postUnpack = '' - cp -r ${custom_swig} swig - chmod -R +w swig - patchShebangs swig/autogen.sh - ''; + nativeBuildInputs = [ + addDriverRunpath + autoconf + automake + bison + cmake + makeWrapper + pcre + pkg-config + python311Packages.python + qt5.qtx11extras + qt5.wrapQtAppsHook + ]; cmakeFlags = [ - (lib.cmakeFeature "BUILD_VERSION_HASH" src.rev) + (lib.cmakeFeature "BUILD_VERSION_HASH" finalAttrs.src.rev) (lib.cmakeFeature "BUILD_VERSION_DIST_NAME" "NixOS") - (lib.cmakeFeature "BUILD_VERSION_DIST_VER" version) - (lib.cmakeFeature "BUILD_VERSION_DIST_CONTACT" "https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc") + (lib.cmakeFeature "BUILD_VERSION_DIST_VER" finalAttrs.version) + (lib.cmakeFeature "BUILD_VERSION_DIST_CONTACT" "https://github.com/NixOS/nixpkgs/") (lib.cmakeBool "BUILD_VERSION_STABLE" true) (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) ]; - # TODO: define these in the above array via placeholders, once those are widely supported - preConfigure = '' - cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" - cmakeFlags+=" -DRENDERDOC_SWIG_PACKAGE=$PWD/../swig" + dontWrapQtApps = true; + + strictDeps = true; + + postUnpack = '' + cp -r ${custom_swig} swig + chmod -R +w swig + patchShebangs swig/autogen.sh ''; - dontWrapQtApps = true; - preFixup = '' - wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib" - wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib" + # TODO: define these in the above array via placeholders, once those are + # widely supported + preConfigure = '' + cmakeFlagsArray+=( + "-DRENDERDOC_SWIG_PACKAGE=$PWD/../swig" + "-DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" + ) ''; - # The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh + preFixup = + let + libPath = lib.makeLibraryPath [ + libglvnd + vulkan-loader + ]; + in + '' + wrapQtApp $out/bin/qrenderdoc \ + --suffix LD_LIBRARY_PATH : "$out/lib:${libPath}" + wrapProgram $out/bin/renderdoccmd \ + --suffix LD_LIBRARY_PATH : "$out/lib:${libPath}" + ''; + + # The only documentation for this so far is in the setup-hook.sh script from + # add-opengl-runpath postFixup = '' addDriverRunpath $out/lib/librenderdoc.so ''; passthru.updateScript = nix-update-script { }; - meta = with lib; { - description = "Single-frame graphics debugger"; + meta = { homepage = "https://renderdoc.org/"; - license = licenses.mit; + description = "Single-frame graphics debugger"; longDescription = '' RenderDoc is a free MIT licensed stand-alone graphics debugger that allows quick and easy single-frame capture and detailed introspection of any application using Vulkan, D3D11, OpenGL or D3D12 across Windows 7 - 10, Linux or Android. ''; - maintainers = [ ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.mit; + mainProgram = "renderdoccmd"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.i686); }; -} +}) From 7451f5ed7d304fa58b0459d3439f15b70d6e364b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 27 Sep 2024 23:45:44 -0300 Subject: [PATCH 17/69] renderdoc: 1.34 -> 1.35 Co-authored-by: R. RyanTM --- pkgs/by-name/re/renderdoc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index 9f2fea85ff530df..17d161aa707b319 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "renderdoc"; - version = "1.34"; + version = "1.35"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${finalAttrs.version}"; - hash = "sha256-obRCILzMR7tCni0YoT3/oesTSADGI2sXqY3G6RS1h1o="; + hash = "sha256-iBe3JNtG9P1IAd00s/fL2RcImMrTwruld98OFHrIhp4="; }; outputs = [ From 5fd94c39d46bf68843b0ba090e4ba0ff04afce74 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 30 Sep 2024 00:32:55 +0200 Subject: [PATCH 18/69] mathmod: move to pkgs/by-name --- .../math => by-name/ma}/mathmod/fix-paths.patch | 0 .../ma/mathmod/package.nix} | 16 ++++++++++------ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 10 insertions(+), 8 deletions(-) rename pkgs/{applications/science/math => by-name/ma}/mathmod/fix-paths.patch (100%) rename pkgs/{applications/science/math/mathmod/default.nix => by-name/ma/mathmod/package.nix} (81%) diff --git a/pkgs/applications/science/math/mathmod/fix-paths.patch b/pkgs/by-name/ma/mathmod/fix-paths.patch similarity index 100% rename from pkgs/applications/science/math/mathmod/fix-paths.patch rename to pkgs/by-name/ma/mathmod/fix-paths.patch diff --git a/pkgs/applications/science/math/mathmod/default.nix b/pkgs/by-name/ma/mathmod/package.nix similarity index 81% rename from pkgs/applications/science/math/mathmod/default.nix rename to pkgs/by-name/ma/mathmod/package.nix index dd85d0678492286..6f4490e28df6cf3 100644 --- a/pkgs/applications/science/math/mathmod/default.nix +++ b/pkgs/by-name/ma/mathmod/package.nix @@ -1,10 +1,11 @@ -{ lib -, mkDerivation -, fetchFromGitHub -, qmake +{ + lib, + stdenv, + fetchFromGitHub, + libsForQt5, }: -mkDerivation { +stdenv.mkDerivation { pname = "mathmod"; version = "11.1-unstable-2024-01-26"; @@ -21,7 +22,10 @@ mkDerivation { substituteInPlace MathMod.pro --subst-var out ''; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = with libsForQt5; [ + qmake + wrapQtAppsHook + ]; meta = { description = "Mathematical modelling software"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b8abbdc94439b7..4885b0881fe0ab7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36487,8 +36487,6 @@ with pkgs; cudaSupport = true; }; - mathmod = libsForQt5.callPackage ../applications/science/math/mathmod { }; - metis = callPackage ../development/libraries/science/math/metis { }; nauty = callPackage ../applications/science/math/nauty { }; From 3bd63480277c0d53c1da3168863c3c855ef3ac31 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 30 Sep 2024 00:41:52 +0200 Subject: [PATCH 19/69] mathmod: 11.1-unstable-2024-01-26 -> 12.0 --- pkgs/by-name/ma/mathmod/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ma/mathmod/package.nix b/pkgs/by-name/ma/mathmod/package.nix index 6f4490e28df6cf3..df64cf723125e88 100644 --- a/pkgs/by-name/ma/mathmod/package.nix +++ b/pkgs/by-name/ma/mathmod/package.nix @@ -5,15 +5,15 @@ libsForQt5, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "mathmod"; - version = "11.1-unstable-2024-01-26"; + version = "12.0"; src = fetchFromGitHub { owner = "parisolab"; repo = "mathmod"; - rev = "24d03a04c17363520ae7cf077e72a7b8684eb6fd"; - hash = "sha256-HiqHssPGqYEVZWchZRj4rFPc+xNVZk1ryl5qvFC2BmQ="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-h1iI7bheJVfE2+0m6Yk7QNCkl9Vye97tqb/WkQExVcQ="; }; patches = [ ./fix-paths.patch ]; @@ -28,6 +28,7 @@ stdenv.mkDerivation { ]; meta = { + changelog = "https://github.com/parisolab/mathmod/releases/tag/${finalAttrs.version}"; description = "Mathematical modelling software"; homepage = "https://github.com/parisolab/mathmod"; license = lib.licenses.gpl2Plus; @@ -35,4 +36,4 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ tomasajt ]; platforms = lib.platforms.unix; }; -} +}) From f3535797cc87709eb61dc51470410b6de3511898 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Mon, 30 Sep 2024 17:40:53 +0200 Subject: [PATCH 20/69] hercules: 4.6 -> 4.7 --- pkgs/by-name/he/hercules/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/hercules/package.nix b/pkgs/by-name/he/hercules/package.nix index 8a7e4a16dbafa68..c5635d960fbb086 100644 --- a/pkgs/by-name/he/hercules/package.nix +++ b/pkgs/by-name/he/hercules/package.nix @@ -105,13 +105,13 @@ let in stdenv.mkDerivation rec { pname = "hercules"; - version = "4.6"; + version = "4.7"; src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "hyperion"; rev = "Release_${version}"; - hash = "sha256-ZhMTun6tmTsmIiFPTRFudwRXzWydrih61RsLyv0p24U="; + hash = "sha256-5Kvs2OWQrlsRZpmx7vet8GCky5xAISBNAqn+NHgicOM"; }; postPatch = '' From 7dc6b7b9dd00ec838a207026c8295265a6a51ace Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Tue, 1 Oct 2024 17:51:49 +0200 Subject: [PATCH 21/69] proton-pass: 1.22.1 -> 1.23.0 --- pkgs/by-name/pr/proton-pass/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index afcd0483eb60e7b..be85c54ffc17d24 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.22.1"; + version = "1.23.0"; src = fetchurl { - url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb"; - hash = "sha256-DIA54xxJ8Nhh8wb4p13yjdenqgTgenAH4Tmbqk3IXwo="; + url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; + hash = "sha256-ewrPk3v1jgF87uY+7P8oQdWARcuFKdfiM1BzulMPBpg="; }; dontConfigure = true; From 2b59e8e4a33a309e7789e67dbb55ba0785a580b2 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 1 Oct 2024 15:19:22 -0700 Subject: [PATCH 22/69] mozillavpn: extract netfilter derivation for updateScript Signed-off-by: Anders Kaseorg --- pkgs/by-name/mo/mozillavpn/package.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index 0d480d4eefa4f62..e24238857507618 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -30,17 +30,16 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ ]; - netfilterGoModules = - (buildGoModule { - inherit (finalAttrs) - pname - version - src - patches - ; - modRoot = "linux/netfilter"; - vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; - }).goModules; + netfilter = buildGoModule { + pname = "${finalAttrs.pname}-netfilter"; + inherit (finalAttrs) + version + src + patches + ; + modRoot = "linux/netfilter"; + vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; + }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src patches; @@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace extension/CMakeLists.txt \ --replace '/etc' "$out/etc" - ln -s '${finalAttrs.netfilterGoModules}' linux/netfilter/vendor + ln -s '${finalAttrs.netfilter.goModules}' linux/netfilter/vendor ''; cmakeFlags = [ From 228cd97d9c213347885e497b6bc7bd1d89b21510 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 1 Oct 2024 15:01:16 -0700 Subject: [PATCH 23/69] mozillavpn: add updateScript Signed-off-by: Anders Kaseorg --- pkgs/by-name/mo/mozillavpn/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index e24238857507618..ba5129d1f8221fd 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -1,4 +1,5 @@ { + _experimental-update-script-combinators, buildGoModule, cargo, cmake, @@ -9,6 +10,7 @@ libgcrypt, libgpg-error, libsecret, + nix-update-script, pkg-config, python3, qt6, @@ -99,6 +101,14 @@ stdenv.mkDerivation (finalAttrs: { (lib.makeBinPath [ wireguard-tools ]) ]; + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { }) + (nix-update-script { + attrPath = "mozillavpn.netfilter"; + extraArgs = [ "--version=skip" ]; + }) + ]; + meta = { description = "Client for the Mozilla VPN service"; mainProgram = "mozillavpn"; From 93a5b980b835ff5d2588e083f59b8eeff1782c5c Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 1 Oct 2024 15:05:00 -0700 Subject: [PATCH 24/69] =?UTF-8?q?mozillavpn:=202.24.0=20=E2=86=92=202.24.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/by-name/mo/mozillavpn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index ba5129d1f8221fd..828300f4e5ff713 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mozillavpn"; - version = "2.24.0"; + version = "2.24.1"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-iTnwx+KPZ5b8qT0fEMUCGQx1UyGVM4VCzooZqslGWtw="; + hash = "sha256-X2rtHAZ9vbWjuOmD3B/uPasUQ1Q+b4SkNqk4MqGMaYo="; }; patches = [ ]; From 62939616bcc4da119f15eed184b124a9383fcf56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Oct 2024 02:04:44 +0200 Subject: [PATCH 25/69] python313: 3.13.0rc2 -> 3.13.0rc3 https://docs.python.org/3.13/whatsnew/changelog.html#python-3-13-0rc3 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 3f8338845d6310b..f8e886c803d62ae 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -93,9 +93,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "rc2"; + suffix = "rc3"; }; - hash = "sha256-1g6LfBDeT3HS3/r3x76O+lTcHlMv6THbuE5fYlcJ4jc="; + hash = "sha256-yLx5AYWvHLd7dcAcvBqmQt/c+Xo3DS0QCQvHuqcNpX4="; inherit (darwin) configd; inherit passthruFun; }; From 1db5cd42534146fcdb2d5bc952b36800029c679b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Wed, 2 Oct 2024 05:40:39 +0200 Subject: [PATCH 26/69] contour: mark broken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since 648fd81e3e4834328d5d79f6fa22981f4d75ac89, contour has been broken with what looks like a buffer overflow check failing. The current version is also far behind upstream, and has been broken on aarch64 for over a year. Refs: #345752 648fd81e3e4834328d5d79f6fa22981f4d75ac89 Signed-off-by: Christina Sørensen --- pkgs/applications/terminal-emulators/contour/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index f01c47afdd36d97..78a1b7243cdc946 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -99,5 +99,8 @@ stdenv.mkDerivation (final: { maintainers = with maintainers; [ moni ]; platforms = platforms.unix; mainProgram = "contour"; + # This was caused by boxed-cpp 1.4.2 -> 1.4.3 + # More details in issue #345752 + broken = true; }; }) From c911876981f3190de0debfb763920204c9222a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Wed, 2 Oct 2024 05:45:28 +0200 Subject: [PATCH 27/69] nixos/terminfo: remove broken package contour MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Contour was broken for aarch64 in #253334, and completely broke in #344788 for all platforms. This removes the broken package, and adds a notice to remove broken packages in the future. aarch64 users have waited a year for this to be fixed, so I think we should lean to be more eager to remove in general, and then the fix can come when it is ready, instead of letting it block this. Resolves: #258515 Signed-off-by: Christina Sørensen --- nixos/modules/config/terminfo.nix | 40 +++++++++++++++++++------------ 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix index bf8bc43d6bb5701..78d4847092d5d1a 100644 --- a/nixos/modules/config/terminfo.nix +++ b/nixos/modules/config/terminfo.nix @@ -24,25 +24,35 @@ config = { + # This should not contain packages that are broken or can't build, since it + # will break this expression + # + # Currently broken packages: + # - contour + # # can be generated with: # lib.attrNames (lib.filterAttrs # (_: drv: (builtins.tryEval (lib.isDerivation drv && drv ? terminfo)).value) # pkgs) - environment.systemPackages = lib.mkIf config.environment.enableAllTerminfo (map (x: x.terminfo) (with pkgs.pkgsBuildBuild; [ - alacritty - contour - foot - kitty - mtm - rio - rxvt-unicode-unwrapped - rxvt-unicode-unwrapped-emoji - st - termite - tmux - wezterm - yaft - ])); + environment.systemPackages = lib.mkIf config.environment.enableAllTerminfo ( + map (x: x.terminfo) ( + with pkgs.pkgsBuildBuild; + [ + alacritty + foot + kitty + mtm + rio + rxvt-unicode-unwrapped + rxvt-unicode-unwrapped-emoji + st + termite + tmux + wezterm + yaft + ] + ) + ); environment.pathsToLink = [ "/share/terminfo" From 4012dccf9d7293a11a332afd96688e8b6d2128ec Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Wed, 2 Oct 2024 06:57:31 +0200 Subject: [PATCH 28/69] clifm: 1.20 -> 1.21 --- pkgs/applications/file-managers/clifm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index f24445f2a6d2321..83fbaf6fd213574 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - hash = "sha256-TKQxNl+RTPQAE7mMALugm3rg8mPZq3eD/uW23DLws8I="; + hash = "sha256-x7Mdt8XcTtqxaHo28jrpyYPHZ/X1g9h4aulrW3YIXGQ="; }; buildInputs = [ From 8ed8dbfc6654711b00be870bf17bfa5cdc7f6a1f Mon Sep 17 00:00:00 2001 From: huantian Date: Tue, 1 Oct 2024 22:03:28 -0700 Subject: [PATCH 29/69] tetrio-plus: 0.27.2 -> 0.27.4 --- pkgs/by-name/te/tetrio-plus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tetrio-plus/package.nix b/pkgs/by-name/te/tetrio-plus/package.nix index 460741366612295..86ee4bda8d70343 100644 --- a/pkgs/by-name/te/tetrio-plus/package.nix +++ b/pkgs/by-name/te/tetrio-plus/package.nix @@ -18,14 +18,14 @@ }: let - version = "0.27.2"; + version = "0.27.4"; rev = "electron-v${version}-tetrio-v${tetrio-desktop.version}"; src = fetchFromGitLab { owner = "UniQMG"; repo = "tetrio-plus"; inherit rev; - hash = "sha256-pcT8/YsfHeimSkeNziW9ha63hEgCg2vnvJSZAY1c7P0="; + hash = "sha256-HwGFg8dxqtqghdP+PXWXr6Fi5vfgopThs+QNa3N1awk="; fetchSubmodules = true; }; @@ -41,7 +41,7 @@ let sourceRoot = "${src.name}/tpsecore"; - cargoHash = "sha256-K9l8wQOtjf3l8gZMMdVnaNrgzVWGl62iBBcpA+ulJbw="; + cargoHash = "sha256-zqeoPeGZvSz7W3c7MXnvvq73hvavg1RGzPc3iTqAjBo="; nativeBuildInputs = [ wasm-pack From 9e050daa933c95c6bd699651f9bbf7ccbd17bc9d Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Wed, 2 Oct 2024 07:26:59 +0200 Subject: [PATCH 30/69] invidious-router: format with `nixfmt-rfc-style` --- pkgs/by-name/in/invidious-router/package.nix | 41 ++++++++++---------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index d61e0076f957a4d..a1c18856a88659b 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -2,29 +2,30 @@ lib, buildGoModule, fetchFromGitLab, -}: let +}: +let version = "1.1"; in - buildGoModule { - pname = "invidious-router"; - inherit version; +buildGoModule { + pname = "invidious-router"; + inherit version; - src = fetchFromGitLab { - owner = "gaincoder"; - repo = "invidious-router"; - rev = version; - hash = "sha256-t8KQqMPkBbVis1odDcSu+H0uvyvoFqCmtWoHqVRxmfc="; - }; + src = fetchFromGitLab { + owner = "gaincoder"; + repo = "invidious-router"; + rev = version; + hash = "sha256-t8KQqMPkBbVis1odDcSu+H0uvyvoFqCmtWoHqVRxmfc="; + }; - vendorHash = "sha256-c03vYidm8SkoesRVQZdg/bCp9LIpdTmpXdfwInlHBKk="; + vendorHash = "sha256-c03vYidm8SkoesRVQZdg/bCp9LIpdTmpXdfwInlHBKk="; - doCheck = true; + doCheck = true; - meta = { - homepage = "https://gitlab.com/gaincoder/invidious-router"; - description = "Go application that routes requests to different Invidious instances based on their health status and (optional) response time"; - license = with lib.licenses; [mit]; - maintainers = with lib.maintainers; [sils]; - mainProgram = "invidious-router"; - }; - } + meta = { + homepage = "https://gitlab.com/gaincoder/invidious-router"; + description = "Go application that routes requests to different Invidious instances based on their health status and (optional) response time"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ sils ]; + mainProgram = "invidious-router"; + }; +} From 5cafb0d3d933c143227852b0c3be27e04236745d Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Wed, 2 Oct 2024 07:30:21 +0200 Subject: [PATCH 31/69] invidious-router: 1.1 -> 1.2 --- pkgs/by-name/in/invidious-router/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index a1c18856a88659b..4bee845d2909097 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -4,7 +4,7 @@ fetchFromGitLab, }: let - version = "1.1"; + version = "1.2"; in buildGoModule { pname = "invidious-router"; @@ -13,8 +13,8 @@ buildGoModule { src = fetchFromGitLab { owner = "gaincoder"; repo = "invidious-router"; - rev = version; - hash = "sha256-t8KQqMPkBbVis1odDcSu+H0uvyvoFqCmtWoHqVRxmfc="; + rev = "refs/tags/${version}"; + hash = "sha256-YcMtZq4VMHr6XqHcsAAEmMF6jF1j1wb7Lq4EK42QAEo="; }; vendorHash = "sha256-c03vYidm8SkoesRVQZdg/bCp9LIpdTmpXdfwInlHBKk="; From 94c6a192b61da2d18d35b74c396dcd188fc7393c Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Wed, 2 Oct 2024 07:34:02 +0200 Subject: [PATCH 32/69] invidious-router: add `updateScript` --- pkgs/by-name/in/invidious-router/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index 4bee845d2909097..5ac25de4e2a2822 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitLab, + nix-update-script, }: let version = "1.2"; @@ -19,6 +20,8 @@ buildGoModule { vendorHash = "sha256-c03vYidm8SkoesRVQZdg/bCp9LIpdTmpXdfwInlHBKk="; + passthru.updateScript = nix-update-script { }; + doCheck = true; meta = { From 47079c2c1c0d1804c6da51fc0e91e412b6597339 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Wed, 2 Oct 2024 15:04:22 +0900 Subject: [PATCH 33/69] cfn-nag: 0.8.9 -> 0.8.10 --- pkgs/development/tools/cfn-nag/Gemfile | 5 +- pkgs/development/tools/cfn-nag/Gemfile.lock | 111 +++-- pkgs/development/tools/cfn-nag/default.nix | 17 +- pkgs/development/tools/cfn-nag/gemset.nix | 513 ++++++++++++++++---- 4 files changed, 528 insertions(+), 118 deletions(-) diff --git a/pkgs/development/tools/cfn-nag/Gemfile b/pkgs/development/tools/cfn-nag/Gemfile index 5ccc66872d4156e..7f4f5e950d1572e 100644 --- a/pkgs/development/tools/cfn-nag/Gemfile +++ b/pkgs/development/tools/cfn-nag/Gemfile @@ -1,2 +1,5 @@ +# frozen_string_literal: true + source 'https://rubygems.org' -gem 'cfn-nag' + +gemspec diff --git a/pkgs/development/tools/cfn-nag/Gemfile.lock b/pkgs/development/tools/cfn-nag/Gemfile.lock index 86bfdad86108187..7892e62b052ca90 100644 --- a/pkgs/development/tools/cfn-nag/Gemfile.lock +++ b/pkgs/development/tools/cfn-nag/Gemfile.lock @@ -1,26 +1,7 @@ -GEM - remote: https://rubygems.org/ +PATH + remote: . specs: - aws-eventstream (1.2.0) - aws-partitions (1.568.0) - aws-sdk-core (3.130.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.55.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.4.0) - aws-eventstream (~> 1, >= 1.0.2) - cfn-model (0.6.6) - kwalify (= 0.7.2) - psych (~> 3) - cfn-nag (0.8.9) + cfn-nag (0.8.10) aws-sdk-s3 (~> 1.76) cfn-model (= 0.6.6) lightly (~> 0.3.2) @@ -28,24 +9,98 @@ GEM netaddr (~> 2.0.4) optimist (~> 3.0.0) rexml - jmespath (1.6.1) + +GEM + remote: https://rubygems.org/ + specs: + ast (2.4.2) + aws-eventstream (1.3.0) + aws-partitions (1.982.0) + aws-sdk-core (3.209.1) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.9) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.94.0) + aws-sdk-core (~> 3, >= 3.207.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.166.0) + aws-sdk-core (~> 3, >= 3.207.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.0) + aws-eventstream (~> 1, >= 1.0.2) + cfn-model (0.6.6) + kwalify (= 0.7.2) + psych (~> 3) + diff-lcs (1.5.1) + docile (1.4.1) + jmespath (1.6.2) + json (2.7.2) kwalify (0.7.2) + language_server-protocol (3.17.0.3) lightly (0.3.3) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) multi_json (1.15.0) - netaddr (2.0.5) + netaddr (2.0.6) optimist (3.0.1) - psych (3.3.2) - rexml (3.2.5) + parallel (1.26.3) + parser (3.3.5.0) + ast (~> 2.4.1) + racc + psych (3.3.4) + racc (1.8.1) + rainbow (3.1.1) + rake (13.2.1) + regexp_parser (2.9.2) + rexml (3.3.8) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rubocop (1.66.1) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.3.0.2) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + ruby-progressbar (1.13.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.13.1) + simplecov_json_formatter (0.1.4) + unicode-display_width (2.6.0) PLATFORMS + arm64-darwin-23 ruby DEPENDENCIES - cfn-nag + cfn-nag! + rake + rspec (~> 3.4) + rubocop + simplecov (~> 0.21) BUNDLED WITH - 2.2.28 + 2.5.11 diff --git a/pkgs/development/tools/cfn-nag/default.nix b/pkgs/development/tools/cfn-nag/default.nix index 8438607102c3600..4ec8f7848cbcad3 100644 --- a/pkgs/development/tools/cfn-nag/default.nix +++ b/pkgs/development/tools/cfn-nag/default.nix @@ -1,19 +1,24 @@ -{ lib, bundlerEnv, bundlerUpdateScript, ruby }: +{ + lib, + bundlerEnv, + bundlerUpdateScript, + ruby, +}: bundlerEnv { pname = "cfn-nag"; - version = "0.8.9"; + version = "0.8.10"; inherit ruby; gemdir = ./.; passthru.updateScript = bundlerUpdateScript "cfn-nag"; - meta = with lib; { + meta = { description = "Linting tool for CloudFormation templates"; homepage = "https://github.com/stelligent/cfn_nag"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ momeemt ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/cfn-nag/gemset.nix b/pkgs/development/tools/cfn-nag/gemset.nix index e2e39f7a81372f2..c8d2cd75d6cff82 100644 --- a/pkgs/development/tools/cfn-nag/gemset.nix +++ b/pkgs/development/tools/cfn-nag/gemset.nix @@ -1,189 +1,536 @@ { + ast = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + type = "gem"; + }; + version = "2.4.2"; + }; aws-eventstream = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + remotes = [ "https://rubygems.org" ]; + sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; aws-partitions = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ap27g6hxcczpb5dj7v0wzxrvywfa2kf3zx69xnjz1qvxf3plw54"; + remotes = [ "https://rubygems.org" ]; + sha256 = "075y2zwfqwg7qb7w34bfvp8dkjcmiz6hx5a3rbhpqglnlkav7ir4"; type = "gem"; }; - version = "1.568.0"; + version = "1.982.0"; }; aws-sdk-core = { - dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; - groups = ["default"]; - platforms = []; + dependencies = [ + "aws-eventstream" + "aws-partitions" + "aws-sigv4" + "jmespath" + ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "14ymvp06k46gvkpvz5zaqvbvr6wd8vdka5iq25q0wd0fzdx7aivm"; + remotes = [ "https://rubygems.org" ]; + sha256 = "06mrp7g24ndg55w85ndyrvxfx2v6hnkh5fj32w9s6w3xsc8v5kqq"; type = "gem"; }; - version = "3.130.0"; + version = "3.209.1"; }; aws-sdk-kms = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - groups = ["default"]; - platforms = []; + dependencies = [ + "aws-sdk-core" + "aws-sigv4" + ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi"; + remotes = [ "https://rubygems.org" ]; + sha256 = "1acx3bhqkhni3kbl7xnjdgy8raq5y7p0zyniq61bsihzkwcj7imh"; type = "gem"; }; - version = "1.55.0"; + version = "1.94.0"; }; aws-sdk-s3 = { - dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; - groups = ["default"]; - platforms = []; + dependencies = [ + "aws-sdk-core" + "aws-sdk-kms" + "aws-sigv4" + ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax"; + remotes = [ "https://rubygems.org" ]; + sha256 = "0zpww3lxpjg8smmznz2nbx5hrpnkzflbasllxjwprkqr56rrrjap"; type = "gem"; }; - version = "1.113.0"; + version = "1.166.0"; }; aws-sigv4 = { - dependencies = ["aws-eventstream"]; - groups = ["default"]; - platforms = []; + dependencies = [ "aws-eventstream" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; + remotes = [ "https://rubygems.org" ]; + sha256 = "176zh13m1vhwgys0drlqiw79ljmmx84vva036shsb7rzr4yi36qm"; type = "gem"; }; - version = "1.4.0"; + version = "1.10.0"; }; cfn-model = { - dependencies = ["kwalify" "psych"]; - groups = ["default"]; - platforms = []; + dependencies = [ + "kwalify" + "psych" + ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1b3ix36yfnfwyxb4w9ss8a7nc6w15m1wbj3q8rarsqjrs3xj6wjs"; type = "gem"; }; version = "0.6.6"; }; cfn-nag = { - dependencies = ["aws-sdk-s3" "cfn-model" "lightly" "logging" "netaddr" "optimist" "rexml"]; - groups = ["default"]; - platforms = []; + dependencies = [ + "aws-sdk-s3" + "cfn-model" + "lightly" + "logging" + "netaddr" + "optimist" + "rexml" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = ./.; + type = "path"; + }; + version = "0.8.10"; + }; + diff-lcs = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; + type = "gem"; + }; + version = "1.5.1"; + }; + docile = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "14qlnflxx5chjvda9n2ka2axcfcjbmn9h00cija8k7kvpy1dgqga"; + remotes = [ "https://rubygems.org" ]; + sha256 = "07pj4z3h8wk4fgdn6s62vw1lwvhj0ac0x10vfbdkr9xzk7krn5cn"; type = "gem"; }; - version = "0.8.9"; + version = "1.4.1"; }; jmespath = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; + remotes = [ "https://rubygems.org" ]; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; + }; + json = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; + type = "gem"; + }; + version = "2.7.2"; }; kwalify = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1ngxg3ysq5vip9dn3d32ajc7ly61kdin86hfycm1hkrcvkkn1vjf"; type = "gem"; }; version = "0.7.2"; }; + language_server-protocol = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; + type = "gem"; + }; + version = "3.17.0.3"; + }; lightly = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0sgj2r6j7qxb9vqzkx5isjbphi38rplk4h8838am0cjcpq5h3jb3"; type = "gem"; }; version = "0.3.3"; }; little-plugger = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; type = "gem"; }; version = "1.1.4"; }; logging = { - dependencies = ["little-plugger" "multi_json"]; - groups = ["default"]; - platforms = []; + dependencies = [ + "little-plugger" + "multi_json" + ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; type = "gem"; }; version = "2.2.2"; }; multi_json = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; version = "1.15.0"; }; netaddr = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r7nln9xvrralwwhd5s1q4sghp0k9y7g9z5pinzpqkx715xcpdxm"; + remotes = [ "https://rubygems.org" ]; + sha256 = "1d7iccg9cjcsfl0fd0iiqfc5s7yh2602dgscbji5lrn2q879ghz7"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; optimist = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; type = "gem"; }; version = "3.0.1"; }; + parallel = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; + type = "gem"; + }; + version = "1.26.3"; + }; + parser = { + dependencies = [ + "ast" + "racc" + ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cqs31cyg2zp8yx2zzm3zkih0j93q870wasbviy2w343nxqvn3pk"; + type = "gem"; + }; + version = "3.3.5.0"; + }; psych = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "186i2hc6sfvg4skhqf82kxaf4mb60g65fsif8w8vg1hc9mbyiaph"; + type = "gem"; + }; + version = "3.3.4"; + }; + racc = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; + type = "gem"; + }; + version = "1.8.1"; + }; + rainbow = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "10iawnkpa44hcfrapy7yw6zmjn4g1g0y09lw244qiv424f7jasn5"; + remotes = [ "https://rubygems.org" ]; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; type = "gem"; }; - version = "3.3.2"; + version = "3.1.1"; + }; + rake = { + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; + type = "gem"; + }; + version = "13.2.1"; + }; + regexp_parser = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ik40vcv7mqigsfpqpca36hpmnx0536xa825ai5qlkv3mmkyf9ss"; + type = "gem"; + }; + version = "2.9.2"; }; rexml = { - groups = ["default" "development"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rr145mvjgc4n28lfy0gw87aw3ab680h83bdi5i102ik8mixk3zn"; + type = "gem"; + }; + version = "3.3.8"; + }; + rspec = { + dependencies = [ + "rspec-core" + "rspec-expectations" + "rspec-mocks" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; + type = "gem"; + }; + version = "3.13.0"; + }; + rspec-core = { + dependencies = [ "rspec-support" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0s688wfw77fjldzayvczg8bgwcgh6bh552dw7qcj1rhjk3r4zalx"; + type = "gem"; + }; + version = "3.13.1"; + }; + rspec-expectations = { + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; + type = "gem"; + }; + version = "3.13.3"; + }; + rspec-mocks = { + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88"; + type = "gem"; + }; + version = "3.13.1"; + }; + rspec-support = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; + type = "gem"; + }; + version = "3.13.1"; + }; + rubocop = { + dependencies = [ + "json" + "language_server-protocol" + "parallel" + "parser" + "rainbow" + "regexp_parser" + "rubocop-ast" + "ruby-progressbar" + "unicode-display_width" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rsyxrl647bz49gpa4flh8igg6wy7qxyh2jrp01x0kqnn5iw4y86"; + type = "gem"; + }; + version = "1.66.1"; + }; + rubocop-ast = { + dependencies = [ "parser" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03zywfpm4540q6hw8srhi8pzp0gg51w65ir8jkaw58vk3j31w820"; + type = "gem"; + }; + version = "1.32.3"; + }; + ruby-progressbar = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; + type = "gem"; + }; + version = "1.13.0"; + }; + simplecov = { + dependencies = [ + "docile" + "simplecov-html" + "simplecov_json_formatter" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; + type = "gem"; + }; + version = "0.22.0"; + }; + simplecov-html = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx"; + type = "gem"; + }; + version = "0.13.1"; + }; + simplecov_json_formatter = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; + type = "gem"; + }; + version = "0.1.4"; + }; + unicode-display_width = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + remotes = [ "https://rubygems.org" ]; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "3.2.5"; + version = "2.6.0"; }; } From 6d73f83f1e9147568265746e6e9d8143d685a500 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Wed, 2 Oct 2024 15:06:02 +0900 Subject: [PATCH 34/69] cfn-nag: moved to by-name --- pkgs/{development/tools => by-name/cf}/cfn-nag/Gemfile | 0 pkgs/{development/tools => by-name/cf}/cfn-nag/Gemfile.lock | 0 pkgs/{development/tools => by-name/cf}/cfn-nag/gemset.nix | 0 .../cfn-nag/default.nix => by-name/cf/cfn-nag/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{development/tools => by-name/cf}/cfn-nag/Gemfile (100%) rename pkgs/{development/tools => by-name/cf}/cfn-nag/Gemfile.lock (100%) rename pkgs/{development/tools => by-name/cf}/cfn-nag/gemset.nix (100%) rename pkgs/{development/tools/cfn-nag/default.nix => by-name/cf/cfn-nag/package.nix} (100%) diff --git a/pkgs/development/tools/cfn-nag/Gemfile b/pkgs/by-name/cf/cfn-nag/Gemfile similarity index 100% rename from pkgs/development/tools/cfn-nag/Gemfile rename to pkgs/by-name/cf/cfn-nag/Gemfile diff --git a/pkgs/development/tools/cfn-nag/Gemfile.lock b/pkgs/by-name/cf/cfn-nag/Gemfile.lock similarity index 100% rename from pkgs/development/tools/cfn-nag/Gemfile.lock rename to pkgs/by-name/cf/cfn-nag/Gemfile.lock diff --git a/pkgs/development/tools/cfn-nag/gemset.nix b/pkgs/by-name/cf/cfn-nag/gemset.nix similarity index 100% rename from pkgs/development/tools/cfn-nag/gemset.nix rename to pkgs/by-name/cf/cfn-nag/gemset.nix diff --git a/pkgs/development/tools/cfn-nag/default.nix b/pkgs/by-name/cf/cfn-nag/package.nix similarity index 100% rename from pkgs/development/tools/cfn-nag/default.nix rename to pkgs/by-name/cf/cfn-nag/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 131cca72e54e620..fedfd708ab1c8c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -355,8 +355,6 @@ with pkgs; cbfmt = callPackage ../development/tools/cbfmt { }; - cfn-nag = callPackage ../development/tools/cfn-nag { }; - circumflex = callPackage ../applications/networking/circumflex { }; citron = callPackage ../tools/misc/citron { }; From 3100acba084f1804ac35eeb1a23417d591e809bb Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 2 Oct 2024 11:34:50 +0200 Subject: [PATCH 35/69] treewide: `\xc2\xa0` -> ` ` I have no idea what this escape sequence even is, but it breaks the nix parser with cryptic errors if not used in a comment. A friend let me know MacOS is prone to input weird spaces, not sure if that is the source. Candidates were located and created with: chr="$(echo -e '\xc2\xa0')"; rg -F "$chr" -l | xe sd -F "$chr" " " There are some examples left, most being example output from `tree` in various markdown documents, some patches which we can't really touch, and `pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py` which I'm not sure if should be addressed --- nixos/modules/installer/cd-dvd/iso-image.nix | 2 +- nixos/modules/security/acme/default.nix | 2 +- nixos/modules/services/web-apps/nextcloud.nix | 2 +- nixos/modules/services/web-apps/pixelfed.nix | 2 +- nixos/tests/slurm.nix | 2 +- pkgs/by-name/os/ossia-score/package.nix | 2 +- pkgs/data/fonts/league-spartan/default.nix | 2 +- pkgs/development/libraries/google-cloud-cpp/default.nix | 2 +- pkgs/development/python-modules/fsspec/default.nix | 2 +- pkgs/development/python-modules/layoutparser/default.nix | 2 +- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 2aa8899e5b351bf..63abf88cab09eb7 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -8,7 +8,7 @@ let * to a menuentry for use in grub. * * * defaults: {name, image, params, initrd} - * * options: [ option... ] + * * options: [ option... ] * * option: {name, params, class} */ menuBuilderGrub2 = diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index f7774e685f7ec28..a9cb396f13fd6d7 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -344,7 +344,7 @@ let serviceConfig = commonServiceConfig // { Group = data.group; - # Let's Encrypt Failed Validation Limit allows 5 retries per hour, per account, hostname and hour. + # Let's Encrypt Failed Validation Limit allows 5 retries per hour, per account, hostname and hour. # This avoids eating them all up if something is misconfigured upon the first try. RestartSec = 15 * 60; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 8d58470c51f567b..fcaca9244c76f24 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -1020,7 +1020,7 @@ in { ''; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; - # On Nextcloud ≥ 26, it is not necessary to patch the database files to prevent + # On Nextcloud ≥ 26, it is not necessary to patch the database files to prevent # an automatic creation of the database user. environment.NC_setup_create_db_user = lib.mkIf (nextcloudGreaterOrEqualThan "26") "false"; }; diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix index 46d671f8504b67c..62db479da3d4190 100644 --- a/nixos/modules/services/web-apps/pixelfed.nix +++ b/nixos/modules/services/web-apps/pixelfed.nix @@ -406,7 +406,7 @@ in { # is unnecessary as it's part of the installPhase of pixelfed. # Install Horizon - # FIXME: require write access to public/ — should be done as part of install — pixelfed-manage horizon:publish + # FIXME: require write access to public/ — should be done as part of install — pixelfed-manage horizon:publish # Perform the first migration. [[ ! -f ${cfg.dataDir}/.initial-migration ]] && pixelfed-manage migrate --force && touch ${cfg.dataDir}/.initial-migration diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index ad516b6e8d2b501..f35eaf9c8e78428 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -154,7 +154,7 @@ in { with subtest("run_distributed_command"): # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes). - # The output must contain the 3 different names + # The output must contain the 3 different names submit.succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq") with subtest("check_slurm_dbd"): diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix index 8eb6df45db9a030..ee8e0a99a948883 100644 --- a/pkgs/by-name/os/ossia-score/package.nix +++ b/pkgs/by-name/os/ossia-score/package.nix @@ -111,7 +111,7 @@ clangStdenv.mkDerivation (finalAttrs: { "-DSuil_INCLUDE_DIR=${suil}/include/suil-0" ]; - # Needed for libraries that get dlopen'd + # Needed for libraries that get dlopen'd env.NIX_LDFLAGS = toString [ "-lasound" "-llilv-0" diff --git a/pkgs/data/fonts/league-spartan/default.nix b/pkgs/data/fonts/league-spartan/default.nix index 10691f10c8e0306..022346c5abca8c9 100644 --- a/pkgs/data/fonts/league-spartan/default.nix +++ b/pkgs/data/fonts/league-spartan/default.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { Taking a strong influence from ATF's classic Spartan family, we're starting our own family out with a single strong weight. We've put a few unique touches into a beautiful, historical typeface, and made sure to - include an extensive characterset – currently totaling over 300 glyphs. + include an extensive characterset – currently totaling over 300 glyphs. Over time, the open-source license will allow us expand League Spartan into a full family, with multiple weights and styles, and we're starting diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index e8caeadcd32d887..2bc678e8b4afe68 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { # Disable any integration tests, which need to contact the internet. # Also disable the `storage_benchmark_*` tests. # With Protobuf < 23.x they require -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=ON. - # With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF + # With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF ctest --label-exclude integration-test --exclude-regex storage_benchmarks_ runHook postInstallCheck diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 741755247223f5f..8f6e77800b565e3 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -113,7 +113,7 @@ buildPythonPackage rec { ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # works locally on APFS, fails on hydra with AssertionError comparing timestamps # darwin hydra builder uses HFS+ and has only one second timestamp resolution - # this two tests however, assume nanosecond resolution + # this two tests however, assume nanosecond resolution "test_modified" "test_touch" # tries to access /home, ignores $HOME diff --git a/pkgs/development/python-modules/layoutparser/default.nix b/pkgs/development/python-modules/layoutparser/default.nix index 6e3e795de0ab9c3..4a6c983e75abbf9 100644 --- a/pkgs/development/python-modules/layoutparser/default.nix +++ b/pkgs/development/python-modules/layoutparser/default.nix @@ -40,7 +40,7 @@ let torchvision effdet ]; - # paddledetection = [ paddlepaddle ] + # paddledetection = [ paddlepaddle ] }; in buildPythonPackage { diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0b3da3f22f71be2..ee3862052135a5e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -562,7 +562,7 @@ let USB_EHCI_ROOT_HUB_TT = yes; # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED = yes; # Improved transaction translator scheduling - USB_HIDDEV = yes; # USB Raw HID Devices (like monitor controls and Uninterruptable Power Supplies) + USB_HIDDEV = yes; # USB Raw HID Devices (like monitor controls and Uninterruptable Power Supplies) # default to dual role mode USB_DWC2_DUAL_ROLE = yes; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 93690b573020f42..11e724146798fb8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1561,7 +1561,7 @@ mapAliases { invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 timescale-prometheus = promscale; # Added 2020-09-29 tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 - tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 + tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tkcvs = tkrev; # Added 2022-03-07 toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22 diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 56bfd093fdd4be5..6d2fb6f0484c24d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18770,7 +18770,7 @@ with self; { buildInputs = [ TestNoWarnings ]; perlPreHook = "export LD=$CC"; meta = { - description = "Internationalizing Domain Names in Applications (UTS #46)"; + description = "Internationalizing Domain Names in Applications (UTS #46)"; homepage = "https://metacpan.org/release/Net-IDN-Encode"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; From a8fd21134b26acff9cd41c2264315bf9947c7483 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Oct 2024 17:43:34 +0200 Subject: [PATCH 36/69] exploitdb: 2024-08-29 -> 2024-10-02 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2024-08-29...2024-10-02 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 8a5f7a44118b144..68c8aab57a4257b 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-08-29"; + version = "2024-10-02"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-QZO7wJiqVVt9vpocC2X4Vrj8s02kh/E3j96JKbYoJJo="; + hash = "sha256-uNFBMZ6pk/xT6OZMb8EKax141lc+uumQl3xbihFMYAI="; }; nativeBuildInputs = [ makeWrapper ]; From 257a687043c9eee0eafd5d2da78f910d3749e0d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Oct 2024 23:21:23 +0000 Subject: [PATCH 37/69] notcurses: 3.0.9 -> 3.0.11 --- pkgs/by-name/no/notcurses/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix index 67c640ddb265950..4fca583a6264fa8 100644 --- a/pkgs/by-name/no/notcurses/package.nix +++ b/pkgs/by-name/no/notcurses/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "notcurses"; - version = "3.0.9"; + version = "3.0.11"; src = fetchFromGitHub { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-8SJeqLcV4xp968YgGsJccsgpB5wwaJDaoWsaYxf8upM="; + sha256 = "sha256-3ddiHzPZ74GN2Hu+6Oe1DaNFn6S9gegGwXSX8fbtPp8="; }; outputs = [ "out" "dev" ]; From acc467c1d94fc8588cc01c1eff27506b7b47616c Mon Sep 17 00:00:00 2001 From: DeftDawg Date: Wed, 2 Oct 2024 22:20:18 -0400 Subject: [PATCH 38/69] maintainers: add deftdawg --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a2a689a9f61bc05..67a55db38c34e0b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5016,6 +5016,12 @@ github = "definfo"; githubId = 66514911; }; + deftdawg = { + name = "DeftDawg"; + github = "deftdawg"; + email = "deftdawg@gmail.com"; + githubId = 4991612; + }; deifactor = { name = "Ash Zahlen"; email = "ext0l@riseup.net"; From 8019b9413deaea8ab229f2a254efff1087a0ff29 Mon Sep 17 00:00:00 2001 From: DeftDawg Date: Wed, 2 Oct 2024 22:20:30 -0400 Subject: [PATCH 39/69] cope: init at 0-unstable-2024-03-27 --- pkgs/by-name/co/cope/package.nix | 44 ++++++++++++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/co/cope/package.nix diff --git a/pkgs/by-name/co/cope/package.nix b/pkgs/by-name/co/cope/package.nix new file mode 100644 index 000000000000000..d1aed0b02c5b710 --- /dev/null +++ b/pkgs/by-name/co/cope/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + perl, + perlPackages, +}: + +perlPackages.buildPerlPackage { + pname = "cope"; + version = "0-unstable-2024-03-27"; + + src = fetchFromGitHub { + owner = "deftdawg"; + repo = "cope"; + rev = "ad0c1ebec5684f5ec3e8becf348414292c489175"; + hash = "sha256-LMAir7tUkjHtKz+KME/Raa9QHGN1g0bzr56fNxfURQY="; + }; + + buildInputs = with perlPackages; [ + EnvPath + FileShareDir + IOPty + IOStty + ListMoreUtils + RegexpCommon + RegexpIPv6 + ]; + + postInstall = '' + mkdir -p $out/bin + mv $out/${perlPackages.perl.libPrefix}/${perlPackages.perl.version}/auto/share/dist/Cope/* $out/bin/ + rm -r $out/${perlPackages.perl.libPrefix}/${perlPackages.perl.version}/auto + ''; + + meta = { + description = "A colourful wrapper for terminal programs"; + homepage = "https://github.com/deftdawg/cope"; + license = with lib.licenses; [ + artistic1 + gpl1Plus + ]; + maintainers = with lib.maintainers; [ deftdawg ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 17682f14430c8bc..2bb31f1c7fe3ff8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -255,7 +255,6 @@ mapAliases { CoinMP = coinmp; # Added 2024-06-12 collada-dom = opencollada; # added 2024-02-21 composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 - cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12 coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01 cosmic-tasks = tasks; # Added 2024-07-04 From b7f2a0aa48026ef006788cc24078730cfb7b593e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Oct 2024 03:03:51 +0000 Subject: [PATCH 40/69] lumafly: 3.2.0.0 -> 3.3.0.0 --- pkgs/by-name/lu/lumafly/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lumafly/package.nix b/pkgs/by-name/lu/lumafly/package.nix index c15e290b465cd01..24e45cb0870837f 100644 --- a/pkgs/by-name/lu/lumafly/package.nix +++ b/pkgs/by-name/lu/lumafly/package.nix @@ -12,13 +12,13 @@ }: buildDotnetModule rec { pname = "lumafly"; - version = "3.2.0.0"; + version = "3.3.0.0"; src = fetchFromGitHub { owner = "TheMulhima"; repo = "lumafly"; rev = "v${version}"; - hash = "sha256-oDSM5Ev9SCjbvCgDZcpzm2bVnzG04yy/WaSwJyh0b18="; + hash = "sha256-GVPMAwxbq9XlKjMKd9G5yUol42f+6lSyHukN7NMCVDA="; }; projectFile = "Lumafly/Lumafly.csproj"; From 718581f55b637d017d3f205660b56dd96ee2242c Mon Sep 17 00:00:00 2001 From: huantian Date: Wed, 2 Oct 2024 21:55:31 -0700 Subject: [PATCH 41/69] scarab: format with nixfmt --- pkgs/tools/games/scarab/default.nix | 49 +++++++++++++++-------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/games/scarab/default.nix b/pkgs/tools/games/scarab/default.nix index 25ac92691e89669..e84a210f4083c18 100644 --- a/pkgs/tools/games/scarab/default.nix +++ b/pkgs/tools/games/scarab/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildDotnetModule -, fetchFromGitHub -, glibc -, zlib -, gtk3 -, copyDesktopItems -, icoutils -, wrapGAppsHook3 -, makeDesktopItem +{ + lib, + buildDotnetModule, + fetchFromGitHub, + glibc, + zlib, + gtk3, + copyDesktopItems, + icoutils, + wrapGAppsHook3, + makeDesktopItem, }: buildDotnetModule rec { @@ -58,26 +59,28 @@ buildDotnetModule rec { done ''; - desktopItems = [(makeDesktopItem { - desktopName = "Scarab"; - name = "scarab"; - exec = "Scarab"; - icon = "scarab"; - comment = meta.description; - type = "Application"; - categories = [ "Game" ]; - })]; + desktopItems = [ + (makeDesktopItem { + desktopName = "Scarab"; + name = "scarab"; + exec = "Scarab"; + icon = "scarab"; + comment = meta.description; + type = "Application"; + categories = [ "Game" ]; + }) + ]; passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "Hollow Knight mod installer and manager"; homepage = "https://github.com/fifty-six/Scarab"; downloadPage = "https://github.com/fifty-six/Scarab/releases"; changelog = "https://github.com/fifty-six/Scarab/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ huantian ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ huantian ]; mainProgram = "Scarab"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 2edfaf4d64bfa00d7f1a8fe6b0d8994d920ea272 Mon Sep 17 00:00:00 2001 From: huantian Date: Wed, 2 Oct 2024 21:56:44 -0700 Subject: [PATCH 42/69] scarab: fix crash (#345038), don't bundle tests By using testProjectFile, we can properly build the test and run it in checkPhase, as well as not include the test in the derivation output. This also happens to fix the startup crash as described in #345038. --- pkgs/tools/games/scarab/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/games/scarab/default.nix b/pkgs/tools/games/scarab/default.nix index e84a210f4083c18..617f8f0e87b27e0 100644 --- a/pkgs/tools/games/scarab/default.nix +++ b/pkgs/tools/games/scarab/default.nix @@ -23,7 +23,8 @@ buildDotnetModule rec { }; nugetDeps = ./deps.nix; - projectFile = "Scarab.sln"; + projectFile = "Scarab/Scarab.csproj"; + testProjectFile = "Scarab.Tests/Scarab.Tests.csproj"; executables = [ "Scarab" ]; preConfigureNuGet = '' @@ -48,6 +49,8 @@ buildDotnetModule rec { wrapGAppsHook3 ]; + doCheck = true; + postFixup = '' # Icons for the desktop file icotool -x $src/Scarab/Assets/omegamaggotprime.ico From fb3637c7ae0ea997f165f13e4c1d9a6df8866fd2 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Thu, 3 Oct 2024 07:54:14 +0200 Subject: [PATCH 43/69] mpvScripts.modernx-zydezu: 0.3.6.6 -> 0.3.7 --- pkgs/applications/video/mpv/scripts/modernx-zydezu.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix index 426d9a3521f2a78..4d36bdc4a89237d 100644 --- a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix +++ b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernx-zydezu"; - version = "0.3.6.6"; + version = "0.3.7"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "zydezu"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-Jt3Y/4no3dUOopjvbS/dBGU0vw9Lq4o5inb4efuyYBM="; + hash = "sha256-slJYbhjNrzwq5rl83HV0Uy7BUK/bbltWSyH0198kSqw="; }; postInstall = '' From b35a0e8e939677c67d1ece02f9f90a0ccc53113a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 2 Oct 2024 00:40:13 +0200 Subject: [PATCH 44/69] python312Packages.keras: remove tf-keras dependency --- pkgs/development/python-modules/keras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index ac5d47623a8ac5f..6ac92f94406d2d5 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -19,7 +19,8 @@ packaging, rich, tensorflow, - tf-keras, + pythonAtLeast, + distutils, }: buildPythonPackage rec { @@ -52,8 +53,7 @@ buildPythonPackage rec { packaging rich tensorflow - tf-keras - ]; + ] ++ lib.optionals (pythonAtLeast "3.12") [ distutils ]; pythonImportsCheck = [ "keras" From 44337891d6a039915f1d57a2b66ee354c685dd94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Oct 2024 07:18:51 +0000 Subject: [PATCH 45/69] fishPlugins.forgit: 24.09.0 -> 24.10.0 --- pkgs/shells/fish/plugins/forgit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index 3c1811d57dbe7cb..014c2a0dc1fdfb6 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "24.09.0"; + version = "24.10.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-8QgnEu41BHeX6heP2slQT+X+Dti+7Ij+J2zqmU4dm3I="; + hash = "sha256-g1uedR9BLG0DuGdM/9xqFv6yhBHHnqjQMt1n0z9I29I="; }; postInstall = '' From c71f5316024c1d2e26f75a26e760a105f9743f72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Oct 2024 08:09:01 +0000 Subject: [PATCH 46/69] marwaita-red: 21 -> 22 --- pkgs/by-name/ma/marwaita-red/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/marwaita-red/package.nix b/pkgs/by-name/ma/marwaita-red/package.nix index 4e65a2d83614e3e..685d0df7d8adce2 100644 --- a/pkgs/by-name/ma/marwaita-red/package.nix +++ b/pkgs/by-name/ma/marwaita-red/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-red"; - version = "21"; + version = "22"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-VCNwWtAzMORF+gXjcLhJCsmllGD2xGgRSS3WxaVoRfU="; + hash = "sha256-oUJ74MNAFbbM123v7i+b29UEFFumswPI3DmqeeahMd4="; }; buildInputs = [ From 066b875a2df1460fcac4e38af865cc393f4dac54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Oct 2024 08:09:35 +0000 Subject: [PATCH 47/69] atlas: 0.27.0 -> 0.28.0 --- pkgs/by-name/at/atlas/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix index f026836039fa7fd..d19454e84ce5189 100644 --- a/pkgs/by-name/at/atlas/package.nix +++ b/pkgs/by-name/at/atlas/package.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "atlas"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-av2WKuEzDhjvqGHIAlNR/Tt8AhqkjLhgcZIpJEKgEVA="; + hash = "sha256-D6dHHTxD2eObmXwYntIOtcPsU1vP+K289n+XVoaGUVc="; }; modRoot = "cmd/atlas"; proxyVendor = true; - vendorHash = "sha256-wu2WONeL5LNGjn/xaRDPtBBVcvLOxSeelj7a6xxMHTY="; + vendorHash = "sha256-SFG//hc5vLQXC3SeEn4YRcc82PItYZy+TNqzq19sRnI="; nativeBuildInputs = [ installShellFiles ]; From ae5064f6cead05ca5142e723a52db25157d2db79 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 2 Oct 2024 23:07:12 +0200 Subject: [PATCH 48/69] wstunnel: 10.1.1 -> 10.1.3 https://github.com/erebe/wstunnel/releases/tag/v10.1.2 https://github.com/erebe/wstunnel/releases/tag/v10.1.3 --- pkgs/by-name/ws/wstunnel/Cargo.lock | 3231 ++++++++++++++++++++++++++ pkgs/by-name/ws/wstunnel/package.nix | 11 +- 2 files changed, 3239 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/ws/wstunnel/Cargo.lock diff --git a/pkgs/by-name/ws/wstunnel/Cargo.lock b/pkgs/by-name/ws/wstunnel/Cargo.lock new file mode 100644 index 000000000000000..23168aeacee72c1 --- /dev/null +++ b/pkgs/by-name/ws/wstunnel/Cargo.lock @@ -0,0 +1,3231 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" + +[[package]] +name = "asn1-rs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "aws-lc-rs" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "untrusted 0.7.1", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bb8" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10cf871f3ff2ce56432fddc2615ac7acc3aa22ca321f8fea800846fbb32f188" +dependencies = [ + "async-trait", + "futures-util", + "parking_lot", + "tokio", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bollard" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41711ad46fda47cd701f6908e59d1bd6b9a2b7464c0d0aeab95c6d37096ff8a" +dependencies = [ + "base64 0.22.1", + "bollard-stubs", + "bytes", + "futures-core", + "futures-util", + "hex", + "home", + "http 1.1.0", + "http-body-util", + "hyper", + "hyper-named-pipe", + "hyper-rustls", + "hyper-util", + "hyperlocal", + "log", + "pin-project-lite", + "rustls 0.23.13", + "rustls-native-certs 0.7.3", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "serde", + "serde_derive", + "serde_json", + "serde_repr", + "serde_urlencoded", + "thiserror", + "tokio", + "tokio-util", + "tower-service", + "url", + "winapi", +] + +[[package]] +name = "bollard-stubs" +version = "1.45.0-rc.26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7c5415e3a6bc6d3e99eff6268e488fd4ee25e7b28c10f08fa6760bd9de16e4" +dependencies = [ + "serde", + "serde_repr", + "serde_with", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" + +[[package]] +name = "cc" +version = "1.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "serde", + "windows-targets 0.52.6", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "cmake" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +dependencies = [ + "cc", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "mio 1.0.2", + "parking_lot", + "rustix", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "docker_credential" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31951f49556e34d90ed28342e1df7e1cb7a229c4cab0aecc627b5d91edd41d07" +dependencies = [ + "base64 0.21.7", + "serde", + "serde_json", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "enum-as-inner" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener", + "pin-project-lite", +] + +[[package]] +name = "fast-socks5" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89f36d4ee12370d30d57b16c7e190950a1a916e7dbbb5fd5a412f5ef913fe84" +dependencies = [ + "anyhow", + "async-trait", + "log", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "fastwebsockets" +version = "0.8.0" +source = "git+https://github.com/erebe/fastwebsockets.git#ef904598ec168d7748b28d77ec1803ba721932d8" +dependencies = [ + "base64 0.21.7", + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "pin-project", + "rand", + "sha1", + "simdutf8", + "thiserror", + "tokio", + "utf-8", +] + +[[package]] +name = "filetime" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +dependencies = [ + "cfg-if", + "libc", + "libredox", + "windows-sys 0.59.0", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.6.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.6.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hickory-proto" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" +dependencies = [ + "async-trait", + "bytes", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "rustls-pemfile 1.0.4", + "thiserror", + "tinyvec", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "smallvec", + "thiserror", + "tokio", + "tokio-rustls 0.24.1", + "tracing", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-named-pipe" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" +dependencies = [ + "hex", + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", + "winapi", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper", + "hyper-util", + "rustls 0.23.13", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "hyperlocal" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" +dependencies = [ + "hex", + "http-body-util", + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.0", + "serde", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2", + "widestring", + "windows-sys 0.48.0", + "winreg", +] + +[[package]] +name = "ipnet" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +dependencies = [ + "serde", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jsonwebtoken" +version = "9.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +dependencies = [ + "base64 0.21.7", + "js-sys", + "ring", + "serde", + "serde_json", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.5.7", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "log", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.6.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio 0.8.11", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "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 = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[package]] +name = "oid-registry" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" +dependencies = [ + "asn1-rs", +] + +[[package]] +name = "once_cell" +version = "1.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.7", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "parse-display" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914a1c2265c98e2446911282c6ac86d8524f495792c38c5bd884f80499c7538a" +dependencies = [ + "parse-display-derive", + "regex", + "regex-syntax 0.8.5", +] + +[[package]] +name = "parse-display-derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae7800a4c974efd12df917266338e79a7a74415173caf7e70aa0a0707345281" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "regex-syntax 0.8.5", + "structmeta", + "syn", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppp" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d901d7dd743c478e14af9518bdbc33e53e50be56429233f812537f29dbf0d1" +dependencies = [ + "thiserror", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rcgen" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779" +dependencies = [ + "aws-lc-rs", + "ring", + "rustls-pki-types", + "time", + "yasna", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regex" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname", + "quick-error", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.23.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +dependencies = [ + "aws-lc-rs", + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted 0.9.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "aws-lc-rs", + "ring", + "rustls-pki-types", + "untrusted 0.9.0", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted 0.9.0", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_regex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" +dependencies = [ + "regex", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9720086b3357bcb44fce40117d769a4d068c70ecfa190850a980a71755f66fcc" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.6.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f1abbfe725f27678f4663bcacb75a83e829fd464c25d78dd038a3a29e307cec" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.6.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio 1.0.2", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "structmeta" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" +dependencies = [ + "proc-macro2", + "quote", + "structmeta-derive", + "syn", +] + +[[package]] +name = "structmeta-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "testcontainers" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f40cc2bd72e17f328faf8ca7687fe337e61bccd8acf9674fa78dd3792b045e1" +dependencies = [ + "async-trait", + "bollard", + "bollard-stubs", + "bytes", + "docker_credential", + "either", + "etcetera", + "futures", + "log", + "memchr", + "parse-display", + "pin-project-lite", + "serde", + "serde_json", + "serde_with", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tar", + "tokio-util", + "url", +] + +[[package]] +name = "thiserror" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio 1.0.2", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-fd" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cedf0b897610a4baff98bf6116c060c5cfe7574d4339c50e9d23fe09377641d" +dependencies = [ + "libc", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.13", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tar" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" +dependencies = [ + "filetime", + "futures-core", + "libc", + "redox_syscall 0.3.5", + "tokio", + "tokio-stream", + "xattr", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "time", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-bidi" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wstunnel" +version = "10.1.3" +dependencies = [ + "ahash", + "anyhow", + "async-channel", + "async-trait", + "base64 0.22.1", + "bb8", + "bytes", + "clap", + "crossterm", + "fast-socks5", + "fastwebsockets", + "futures-util", + "hickory-resolver", + "http-body-util", + "hyper", + "hyper-util", + "ipnet", + "jsonwebtoken", + "log", + "nix", + "notify", + "parking_lot", + "pin-project", + "ppp", + "rcgen", + "regex", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.2.0", + "scopeguard", + "serde", + "serde_regex", + "serde_yaml", + "socket2", + "testcontainers", + "tokio", + "tokio-fd", + "tokio-rustls 0.26.0", + "tokio-stream", + "tokio-util", + "tracing", + "tracing-subscriber", + "url", + "urlencoding", + "uuid", + "x509-parser", +] + +[[package]] +name = "x509-parser" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +dependencies = [ + "asn1-rs", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ + "time", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index ba3800abcd51c00..1ea48259ebce712 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -10,7 +10,7 @@ }: let - version = "10.1.1"; + version = "10.1.3"; in rustPlatform.buildRustPackage { @@ -21,10 +21,15 @@ rustPlatform.buildRustPackage { owner = "erebe"; repo = "wstunnel"; rev = "v${version}"; - hash = "sha256-qEWIyQkLRrmTH40S96hj8JXFz/VJChIbg8qEQc938nI="; + hash = "sha256-mrCDx9f+EeA6McRc1s9YwYL4RHKSla10fxXZc1WYPio="; }; - cargoHash = "sha256-3b+pX/qQuhOY1OYr+CfT5wtiJcEJ8CJJsQZ4QOcYv74="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "fastwebsockets-0.8.0" = "sha256-eqtCh9fMOG2uvL/GLUVXNiSB+ovYLc/Apuq9zssn8hU="; + }; + }; nativeBuildInputs = [ versionCheckHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ From 5b1d3e232c6928bda90d3108a70541e2b872accc Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Thu, 3 Oct 2024 10:23:47 +0200 Subject: [PATCH 49/69] gotemplate: 3.7.5 -> 3.9.1 --- pkgs/development/tools/gotemplate/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/gotemplate/default.nix b/pkgs/development/tools/gotemplate/default.nix index 57dbba5db01e906..b950f5865ce632e 100644 --- a/pkgs/development/tools/gotemplate/default.nix +++ b/pkgs/development/tools/gotemplate/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGo123Module, fetchFromGitHub }: -buildGoModule rec { +buildGo123Module rec { pname = "gotemplate"; - version = "3.7.5"; + version = "3.9.1"; src = fetchFromGitHub { owner = "coveooss"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BMZyq7fa57WaE0cSkGjHWxtEnbC7vEy+kLaHDoI/KZU="; + hash = "sha256-sRCyOQmj4ti+1Qdap0Q5MLoJZLwjZtw1cYjZMGksvuA="; }; - vendorHash = "sha256-uRB3atrJ+A1/xXvgmkyM/AKN+9VKSIDvsnPIdtsc3vc="; + vendorHash = "sha256-xtvexOmzTXjP3QsGp0aL3FdJe3mdBSCnTeM6hLq/tIo="; meta = with lib; { description = "CLI for go text/template"; From a37cee3694acb7fa55e845d6977a635d83f13958 Mon Sep 17 00:00:00 2001 From: Jakuzure Nonon Date: Thu, 3 Oct 2024 10:39:52 +0200 Subject: [PATCH 50/69] certinfo: 1.0.23 -> 1.0.24 --- pkgs/tools/security/certinfo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/certinfo/default.nix b/pkgs/tools/security/certinfo/default.nix index 3d48985d78a51bd..f8ec56585c4f11f 100644 --- a/pkgs/tools/security/certinfo/default.nix +++ b/pkgs/tools/security/certinfo/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, libX11, darwin }: +{ stdenv, lib, buildGo123Module, fetchFromGitHub, libX11, darwin }: -buildGoModule rec { +buildGo123Module rec { pname = "certinfo"; - version = "1.0.23"; + version = "1.0.24"; src = fetchFromGitHub { owner = "pete911"; repo = "certinfo"; rev = "v${version}"; - sha256 = "sha256-el7qL2d8z50S+0vyy8zH1W1uNix9PXmDGS5y8P9fIVA="; + sha256 = "sha256-BI5gYWKGMU0wLvnArG41bLWj+9ipe/GARKRX0fwz4ag="; }; # clipboard functionality not working on Darwin From bf8c66fc22a5de0d5982922175d234e5edf379d2 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 3 Oct 2024 11:50:43 +0200 Subject: [PATCH 51/69] wstunnel: run the VM test on Linux only --- nixos/tests/wstunnel.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/tests/wstunnel.nix b/nixos/tests/wstunnel.nix index 7a0a8ce3496ada9..753f78061e7bc6e 100644 --- a/nixos/tests/wstunnel.nix +++ b/nixos/tests/wstunnel.nix @@ -1,3 +1,5 @@ +{ lib, ... }: + let certs = import ./common/acme/server/snakeoil-certs.nix; domain = certs.domain; @@ -6,6 +8,8 @@ in { name = "wstunnel"; + meta.platforms = lib.platforms.linux; + nodes = { server = { virtualisation.vlans = [ 1 ]; From 2a2b9ef2dc28c94f9b57f71cec86111c164b0a7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Oct 2024 10:34:48 +0000 Subject: [PATCH 52/69] marwaita-teal: 21 -> 22 --- pkgs/by-name/ma/marwaita-teal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/marwaita-teal/package.nix b/pkgs/by-name/ma/marwaita-teal/package.nix index 0c5784c3f71a778..b9d2b3f15a6b522 100644 --- a/pkgs/by-name/ma/marwaita-teal/package.nix +++ b/pkgs/by-name/ma/marwaita-teal/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-teal"; - version = "21"; + version = "22"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-9WH/mbnLLLAf8B5Fwd7PMRAX2psWVJn7gGO4C5KkLjM="; + hash = "sha256-aSzeF4winpea21gADa/HT+a+FZ4Ykrpue/ePmveJU8E="; }; buildInputs = [ From f1cb1ac417093b8fa5dde34ff0197577684b3c61 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 3 Oct 2024 14:56:50 +0300 Subject: [PATCH 53/69] hfsprogs: 332.25 -> 627.40.1 Use Gentoo fork, clean up build, nixfmt --- pkgs/tools/filesystems/hfsprogs/default.nix | 66 ++++++++------------- 1 file changed, 24 insertions(+), 42 deletions(-) diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix index 127050f02585100..17b787b08b83cc0 100644 --- a/pkgs/tools/filesystems/hfsprogs/default.nix +++ b/pkgs/tools/filesystems/hfsprogs/default.nix @@ -1,53 +1,35 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, openssl, libbsd }: - -let - version = "332.25"; - - apple_src = fetchFromGitHub { - owner = "apple-oss-distributions"; - repo = "diskdev_cmds"; - rev = "diskdev_cmds-${version}"; - hash = "sha256-cycPGPx2Gbjn4FKGKuQKJkh+dWGbJfy6C+LTz8rrs0A="; - name = "diskdev_cmds-${version}"; - }; -in - +{ + lib, + stdenv, + fetchFromGitHub, + libbsd, + libuuid, + openssl, +}: stdenv.mkDerivation rec { pname = "hfsprogs"; - inherit version; - - srcs = [ - (fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/hfsprogs_${version}-11.debian.tar.gz"; - sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c"; - }) - apple_src - ]; - - postPatch = '' - sed -ie '/sys\/sysctl.h/d' newfs_hfs.tproj/makehfs.c - ''; + version = "627.40.1-linux"; - sourceRoot = apple_src.name; - patches = [ "../debian/patches/*.patch" ]; + src = fetchFromGitHub { + owner = "glaubitz"; + repo = "hfs"; + rev = "a9496556b0a5fa805139ea20b44081d48aae912a"; + hash = "sha256-i6fXPWHU03ErUN2irP2cLJbpqi1OrTtcQE+ohAz+Eio="; + }; - buildInputs = [ openssl libbsd ]; - makefile = "Makefile.lnx"; + buildInputs = [ + libbsd + libuuid + openssl + ]; - # Inspired by PKGBUILD of https://www.archlinux.org/packages/community/x86_64/hfsprogs/ installPhase = '' - # Create required package directories - install -m 755 -d "$out/bin" - install -m 755 -d "$out/share/hfsprogs" - install -m 755 -d "$out/share/man/man8/" # Copy executables - install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus" - install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus" - # Copy shared data - install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/hfsprogs/hfsbootdata" + install -Dm 555 "newfs_hfs/newfs_hfs" "$out/bin/mkfs.hfsplus" + install -Dm 555 "fsck_hfs/fsck_hfs" "$out/bin/fsck.hfsplus" # Copy man pages - install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8" - install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8" + install -Dm 444 "newfs_hfs/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8" + install -Dm 444 "fsck_hfs/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8" ''; meta = { From 99684d17aec7891ee77a696e043a25e5dc794262 Mon Sep 17 00:00:00 2001 From: David Flanagan Date: Sun, 15 Sep 2024 22:40:43 +0100 Subject: [PATCH 54/69] runme: 3.0.2 -> 3.7.1 --- pkgs/development/tools/misc/runme/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 8299ceba5395642..07f24c3917a3293 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "runme"; - version = "3.0.2"; + version = "3.7.1"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-a+7Gff3Z1V17uaywoUE+nLVeVprB50Gslarcle/NPB8="; + hash = "sha256-b1HP5JCtQFA0+GIkMswb8o3k9zbD5sLrLR7yz8UivLk="; }; - vendorHash = "sha256-QoZzEq1aC7cjY/RVp5Z5HhSuTFf2BSYQnfg0jSaeTJU="; + vendorHash = "sha256-qOM66jiSjAU5e6eGrM8kgJxWJzxwgHpLadx5pTjNFOs="; nativeBuildInputs = [ installShellFiles @@ -39,17 +39,21 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/stateful/runme/internal/version.BuildDate=1970-01-01T00:00:00Z" - "-X=github.com/stateful/runme/internal/version.BuildVersion=${version}" - "-X=github.com/stateful/runme/internal/version.Commit=${src.rev}" + "-X=github.com/stateful/runme/v3/internal/version.BuildDate=1970-01-01T00:00:00Z" + "-X=github.com/stateful/runme/v3/internal/version.BuildVersion=${version}" + "-X=github.com/stateful/runme/v3/internal/version.Commit=${src.rev}" ]; + # checkFlags = [ + # "-ldflags=-X=github.com/stateful/runme/v3/internal/version.BuildVersion=${version}" + # ]; + # tests fail to access /etc/bashrc on darwin doCheck = !stdenv.isDarwin; postPatch = '' substituteInPlace testdata/{categories/basic,runall/basic,script/basic}.txtar \ - --replace /bin/bash "${runtimeShell}" + --replace-fail /bin/bash "${runtimeShell}" ''; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' From d3cbba5a3193f48847ed079976d7fc87b07374df Mon Sep 17 00:00:00 2001 From: Casey Link Date: Thu, 3 Oct 2024 14:05:26 +0200 Subject: [PATCH 55/69] roon-server: 2.0-1455 -> 2.0-1462 release notes: https://community.roonlabs.com/t/roon-2-0-41-and-arc-1-0-57-are-live/282035 --- pkgs/servers/roon-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 1f97fad7468fc65..0fa88aa91a5e0ee 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1455"; + version = "2.0-1462"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-R555u33S5jmqIKdDtRhMbfCMe5sG3x94naPX+qgrwHY="; + hash = "sha256-irTDjT9oN0CdxFKAgcHbL2grJ702E6H+WtifGh0pf0E="; }; dontConfigure = true; From 820eb4f3a698ae7477f1338bade0536de909a58c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 1 Oct 2024 09:19:35 +0200 Subject: [PATCH 56/69] jbigkit: add patch to fix security issue CVE-2017-9937 --- pkgs/development/libraries/jbigkit/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 8678cde4370ae90..6d4647fb583c262 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "jbigkit"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; }; + patches = [ + # Archlinux patch: this helps users to reduce denial-of-service risks, as in CVE-2017-9937 + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0013-new-jbig.c-limit-s-maxmem-maximum-decoded-image-size.patch"; + hash = "sha256-Yq5qCTF7KZTrm4oeWbpctb+QLt3shJUGEReZvd0ey9k="; + }) + ]; + makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" From 0115bf0f8090f1a9d09fe0faa239b580e49a00d9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 3 Oct 2024 14:40:44 +0200 Subject: [PATCH 57/69] jbigkit: add Archlinux patch to fix heap overflow issue --- pkgs/development/libraries/jbigkit/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 6d4647fb583c262..00c284c8bc9ea6d 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0013-new-jbig.c-limit-s-maxmem-maximum-decoded-image-size.patch"; hash = "sha256-Yq5qCTF7KZTrm4oeWbpctb+QLt3shJUGEReZvd0ey9k="; }) + # Archlinux patch: fix heap overflow + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0015-jbg_newlen-check-for-end-of-file-within-MARKER_NEWLE.patch"; + hash = "sha256-F3qA/btR9D9NfzrNY76X4Z6vG6NrisI36SjCDjS+F5s="; + }) ]; makeFlags = [ From 83bec9a6b393993ef4182f443e9397f7f9a375dc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 3 Oct 2024 12:58:50 +0200 Subject: [PATCH 58/69] python312Packages.sagemaker-core: init at 1.0.10 --- .../python-modules/sagemaker-core/default.nix | 82 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/development/python-modules/sagemaker-core/default.nix diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix new file mode 100644 index 000000000000000..2ae837fa6e40c0c --- /dev/null +++ b/pkgs/development/python-modules/sagemaker-core/default.nix @@ -0,0 +1,82 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + boto3, + importlib-metadata, + jsonschema, + mock, + platformdirs, + pydantic, + pyyaml, + rich, + + # optional-dependencies + black, + pandas, + pylint, + pytest, +}: + +buildPythonPackage rec { + pname = "sagemaker-core"; + version = "1.0.10"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aws"; + repo = "sagemaker-core"; + rev = "refs/tags/v${version}"; + hash = "sha256-UloQJ5B10XXPbwsktVZzjcW7BLW8wCAw3wGmAkSl6wc="; + }; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ + "importlib-metadata" + "mock" + ]; + + dependencies = [ + boto3 + importlib-metadata + jsonschema + mock + platformdirs + pydantic + pyyaml + rich + ]; + + optional-dependencies = { + codegen = [ + black + pandas + pylint + pytest + ]; + }; + + pythonImportsCheck = [ + "sagemaker_core" + ]; + + # Only a single test which fails with: + # ValueError: Must setup local AWS configuration with a region supported by SageMaker. + doCheck = false; + + meta = { + description = "Python SDK designed to provide an object-oriented interface for interacting with Amazon SageMaker resources"; + homepage = "https://github.com/aws/sagemaker-core"; + changelog = "https://github.com/aws/sagemaker-core/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb62367cb06ee71..e26247c259f26f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13907,6 +13907,8 @@ self: super: with self; { sagemaker = callPackage ../development/python-modules/sagemaker { }; + sagemaker-core = callPackage ../development/python-modules/sagemaker-core { }; + salib = callPackage ../development/python-modules/salib { }; salmon-mail = callPackage ../development/python-modules/salmon-mail { }; From 32b2c9d999dcf81d72057e70a86247ea26908d17 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 3 Oct 2024 12:47:05 +0200 Subject: [PATCH 59/69] python312Packages.sagemaker: 2.224.1 -> 2.232.1 Diff: https://github.com/aws/sagemaker-python-sdk/compare/refs/tags/v2.224.1...v2.232.1 Changelog: https://github.com/aws/sagemaker-python-sdk/blob/v2.232.1/CHANGELOG.md --- .../python-modules/sagemaker/default.nix | 66 ++++++++++--------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 7dfe98f36a55886..7c3b26cbb25ce00 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -1,47 +1,51 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, fetchpatch, - setuptools, + + # build-system + hatchling, + + # dependencies attrs, boto3, cloudpickle, + docker, google-pasta, - numpy, - protobuf, - smdebug-rulesconfig, importlib-metadata, + jsonschema, + numpy, packaging, pandas, pathos, - schema, - pyyaml, - jsonschema, platformdirs, - tblib, - urllib3, + protobuf, + psutil, + pyyaml, requests, - docker, + sagemaker-core, + schema, + smdebug-rulesconfig, + tblib, tqdm, - psutil, + urllib3, + + # optional-dependencies scipy, accelerate, }: buildPythonPackage rec { pname = "sagemaker"; - version = "2.224.1"; + version = "2.232.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-Kc66sygHGFqMvSY7rACb62wJEJesnN4KDmtYZLIOsqc="; + hash = "sha256-I+iZKx1CnZIGYgYuYhhs8BnY84KPyKOGw8M0He26DGU="; }; patches = [ @@ -58,10 +62,11 @@ buildPythonPackage rec { ]; build-system = [ - setuptools + hatchling ]; pythonRelaxDeps = [ + "boto3" "cloudpickle" "importlib-metadata" ]; @@ -70,24 +75,25 @@ buildPythonPackage rec { attrs boto3 cloudpickle + docker google-pasta - numpy - protobuf - smdebug-rulesconfig importlib-metadata + jsonschema + numpy packaging pandas pathos - schema - pyyaml - jsonschema platformdirs - tblib - urllib3 + protobuf + psutil + pyyaml requests - docker + sagemaker-core + schema + smdebug-rulesconfig + tblib tqdm - psutil + urllib3 ]; doCheck = false; # many test dependencies are not available in nixpkgs @@ -108,11 +114,11 @@ buildPythonPackage rec { # feature-processor = [ pyspark sagemaker-feature-store-pyspark ]; # not available in nixpkgs }; - meta = with lib; { + meta = { description = "Library for training and deploying machine learning models on Amazon SageMaker"; homepage = "https://github.com/aws/sagemaker-python-sdk/"; changelog = "https://github.com/aws/sagemaker-python-sdk/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ nequissimus ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nequissimus ]; }; } From 6d5e7f0425c30730038085053400d48381f59d7e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 3 Oct 2024 13:40:05 +0200 Subject: [PATCH 60/69] python312Packages.pycrdt: 0.9.11 -> 0.9.15 Diff: https://github.com/jupyter-server/pycrdt/compare/v0.9.11...v0.9.15 Changelog: https://github.com/jupyter-server/pycrdt/releases/tag/v0.9.15 --- .../python-modules/pycrdt/Cargo.lock | 85 ++++++++++--------- .../python-modules/pycrdt/default.nix | 11 ++- 2 files changed, 53 insertions(+), 43 deletions(-) diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index a2182a11dc06d6f..11e2f832d14c1f6 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -32,9 +32,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitflags" @@ -71,9 +71,9 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "lock_api" @@ -198,15 +198,18 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot_core" @@ -229,9 +232,9 @@ checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "proc-macro2" @@ -244,7 +247,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.9.11" +version = "0.9.15" dependencies = [ "pyo3", "yrs", @@ -252,9 +255,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" +checksum = "15ee168e30649f7f234c3d49ef5a7a6cbf5134289bc46c29ff3155fa3221c225" dependencies = [ "cfg-if", "indoc", @@ -270,9 +273,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" +checksum = "e61cef80755fe9e46bb8a0b8f20752ca7676dcc07a5277d8b7768c6172e529b3" dependencies = [ "once_cell", "target-lexicon", @@ -280,9 +283,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" +checksum = "67ce096073ec5405f5ee2b8b31f03a68e02aa10d5d4f565eca04acc41931fa1c" dependencies = [ "libc", "pyo3-build-config", @@ -290,9 +293,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" +checksum = "2440c6d12bc8f3ae39f1e775266fa5122fd0c8891ce7520fa6048e683ad3de28" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -302,9 +305,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" +checksum = "1be962f0e06da8f8465729ea2cb71a416d2257dff56cbe40a70d3e62a93ae5d1" dependencies = [ "heck", "proc-macro2", @@ -324,9 +327,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags", ] @@ -345,18 +348,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -365,9 +368,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -392,9 +395,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -409,18 +412,18 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -429,9 +432,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unindent" diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index c09682e6361233d..56fef5666e9e795 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -3,27 +3,34 @@ stdenv, buildPythonPackage, fetchFromGitHub, + + # buildInputs libiconv, + + # nativeBuildInputs rustPlatform, + + # tests anyio, objsize, pydantic, pytestCheckHook, trio, y-py, + nix-update-script, }: buildPythonPackage rec { pname = "pycrdt"; - version = "0.9.11"; + version = "0.9.15"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; rev = "refs/tags/v${version}"; - hash = "sha256-62r3AO+x9du6UjIdtqDPmwJ30/YmQxbPcCXgOaGNtL0="; + hash = "sha256-iaFpBD07l1WlC5FNzFxxF5gJS59yAyPmEn/NZg5U0AQ="; }; postPatch = '' From 023bdebe7756c19ae46cced7ff0d4b3feee0ab3a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 3 Oct 2024 14:37:56 +0100 Subject: [PATCH 61/69] buildGraalvm: move files in $out to $out/share Like $out/LICENSE.txt since this is generally a bad idea and can cause conflicts with other packages. Fixes #345907. --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 04f45c1ccddf277..d360da5dfa6c3c6 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -124,6 +124,12 @@ let # jni.h expects jni_md.h to be in the header search path. ln -sf $out/include/linux/*_md.h $out/include/ + mkdir -p $out/share + # move files in $out like LICENSE.txt + find $out/ -maxdepth 1 -type f -exec mv {} $out/share \; + # symbolic link to $out/lib/svm/LICENSE_NATIVEIMAGE.txt + rm -f $out/LICENSE_NATIVEIMAGE.txt + # copy-paste openjdk's preFixup # Set JAVA_HOME automatically. mkdir -p $out/nix-support From f927f502ddcab89228d13416a3b4c5a48e06c761 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 3 Oct 2024 16:46:23 +0300 Subject: [PATCH 62/69] plasma5Packages.partitionmanager: remove hfsprogs dependency Unmaintained, broken, hopefully unnecessary --- pkgs/applications/kde/partitionmanager/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/kde/partitionmanager/default.nix b/pkgs/applications/kde/partitionmanager/default.nix index f65eb6d02b0bab7..b5a5053419ecd2f 100644 --- a/pkgs/applications/kde/partitionmanager/default.nix +++ b/pkgs/applications/kde/partitionmanager/default.nix @@ -20,7 +20,6 @@ , exfat , f2fs-tools , fatresize -, hfsprogs , jfsutils , nilfs-utils , ntfs3g @@ -50,7 +49,7 @@ let exfat f2fs-tools fatresize - hfsprogs + # hfsprogs intentionally omitted due to being unmaintained jfsutils nilfs-utils ntfs3g From dbcffc18453eab755df6d02979b940384f1f5e5f Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 3 Oct 2024 16:46:40 +0300 Subject: [PATCH 63/69] kdePackages.kpmcore: remove hfsprogs dependency --- pkgs/kde/gear/kpmcore/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/kde/gear/kpmcore/default.nix b/pkgs/kde/gear/kpmcore/default.nix index 3da512e1701a951..fcbfa4a730d67e1 100644 --- a/pkgs/kde/gear/kpmcore/default.nix +++ b/pkgs/kde/gear/kpmcore/default.nix @@ -15,7 +15,6 @@ exfatprogs, f2fs-tools, fatresize, - hfsprogs, jfsutils, nilfs-utils, ntfs3g, @@ -41,7 +40,7 @@ let exfatprogs f2fs-tools fatresize - hfsprogs + # hfsprogs intentionally omitted due to being unmaintained jfsutils nilfs-utils ntfs3g From edab40d27f5af3d8d48ad8f87343332563d71ea9 Mon Sep 17 00:00:00 2001 From: dr56ekgbb Date: Thu, 3 Oct 2024 21:50:39 +0800 Subject: [PATCH 64/69] marble-shell-theme: init at 46.2.3 --- .../by-name/ma/marble-shell-theme/package.nix | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/ma/marble-shell-theme/package.nix diff --git a/pkgs/by-name/ma/marble-shell-theme/package.nix b/pkgs/by-name/ma/marble-shell-theme/package.nix new file mode 100644 index 000000000000000..35374f8c1ee3519 --- /dev/null +++ b/pkgs/by-name/ma/marble-shell-theme/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + python3, + colors ? [ "all" ], # Default to install all available colors + additionalInstallationTweaks ? [ ], # Additional installation tweaks +}: +assert lib.assertMsg (colors != [ ]) "The `colors` list can not be empty"; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "marble-shell-theme"; + version = "46.2.3"; + + src = fetchFromGitHub { + owner = "imarkoff"; + repo = "Marble-shell-theme"; + rev = "5971b15d8115c60c3a16b1d219ecffd2cfcdb323"; + hash = "sha256-TX6BSS29EAi2PjL1fMvEKD12RjB9xrfqPSQsJJrUcJg="; + }; + + nativeBuildInputs = [ python3 ]; + + patchPhase = '' + runHook prePatch + substituteInPlace scripts/config.py \ + --replace-fail "~/.themes" ".themes" + runHook postPatch + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + python install.py ${ + lib.escapeShellArgs (map (color: "--${color}") colors) + } ${lib.escapeShellArgs additionalInstallationTweaks} + cp -r .themes/* $out/share/themes/ + runHook postInstall + ''; + + meta = { + description = "Shell theme for GNOME DE"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + homepage = "https://github.com/imarkoff/Marble-shell-theme"; + changelog = "https://github.com/imarkoff/Marble-shell-theme/releases/tag/${finalAttrs.version}"; + maintainers = with lib.maintainers; [ aucub ]; + }; +}) From 4521df44aae6f762c5dff7d74e63b3bf1b6e33b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=81=E3=83=A3=E3=82=AD=E3=83=96=E3=83=BB=E3=83=81?= =?UTF-8?q?=E3=83=A3=E3=83=A0=E3=82=B9?= <41765106+chakibchemso@users.noreply.github.com> Date: Thu, 3 Oct 2024 15:55:15 +0100 Subject: [PATCH 65/69] unityhub: add unity 6 editor dependencies - added: [ harfbuzz ] - fixes: #346038 --- pkgs/development/tools/unityhub/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 893f476df63e790..c18c8b60f6d0e94 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -97,6 +97,9 @@ stdenv.mkDerivation rec { xorg.libXrender gnome2.GConf libcap + + # Unity Editor 6000 specific dependencies + harfbuzz ] ++ extraLibs pkgs; }; From 15559ac221e6d4aa8cf706e44a41061ff747b29a Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Thu, 3 Oct 2024 16:54:11 +0200 Subject: [PATCH 66/69] php84.extensions.pcov: fix build --- pkgs/development/php-packages/pcov/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix index 1ee88135b3b13ed..02af71c12e6e7b8 100644 --- a/pkgs/development/php-packages/pcov/default.nix +++ b/pkgs/development/php-packages/pcov/default.nix @@ -4,6 +4,7 @@ php, pcre2, fetchFromGitHub, + fetchpatch, }: let @@ -22,6 +23,14 @@ buildPecl { buildInputs = [ pcre2 ]; + patches = [ + # Allow building for PHP 8.4 + (fetchpatch { + url = "https://github.com/krakjoe/pcov/commit/7d764c7c2555e8287351961d72be3ebec4d8743f.patch"; + sha256 = "sha256-5wIHrrCwUXQpPdUg+3Kwyop5yvOzQQ3qc4pQXU8q2OM="; + }) + ]; + meta = with lib; { changelog = "https://github.com/krakjoe/pcov/releases/tag/v${version}"; description = "Self contained php-code-coverage compatible driver for PHP"; From 40d78f5d7b6cbbdbed2221c465c3e52f45c713ca Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Fri, 4 Oct 2024 00:44:57 +0900 Subject: [PATCH 67/69] kubelogin-oidc: 1.30.0 -> 1.30.1 (#346100) - Diff: https://github.com/int128/kubelogin/compare/v1.30.0...v1.30.1 - Pinned buildGo123Module to fix build - Added version in ldflags for correct version reporting - Run all package tests during build - Moved to by-name - Added myself as maintainer --- .../ku/kubelogin-oidc/package.nix} | 35 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 insertions(+), 11 deletions(-) rename pkgs/{applications/networking/cluster/kubelogin-oidc/default.nix => by-name/ku/kubelogin-oidc/package.nix} (53%) diff --git a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix similarity index 53% rename from pkgs/applications/networking/cluster/kubelogin-oidc/default.nix rename to pkgs/by-name/ku/kubelogin-oidc/package.nix index e7d879a83aac14a..efc658aae6a8c60 100644 --- a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix +++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix @@ -1,31 +1,48 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGo123Module, + fetchFromGitHub, +}: -buildGoModule rec { +buildGo123Module rec { pname = "kubelogin"; - version = "1.30.0"; + version = "1.30.1"; src = fetchFromGitHub { owner = "int128"; - repo = pname; + repo = "kubelogin"; rev = "v${version}"; - sha256 = "sha256-DHg46t0gMypK6Nj428gpOMtPuA+XcW4IJU39CHTVGPw="; + hash = "sha256-aoLPT3lX+q426QlxAPsjeQyTZMnmqMGh85jJPU7lQVU="; }; - subPackages = ["."]; + subPackages = [ "." ]; + ldflags = [ + "-s" + "-w" + "-X main.version=v${version}" + ]; vendorHash = "sha256-gr+SsC7MiLj/MZ8kca5Hcfge+7Pm4y963TfwyKHEhBY="; + # test all packages + preCheck = '' + unset subPackages + ''; + # Rename the binary instead of symlinking to avoid conflict with the # Azure version of kubelogin postInstall = '' mv $out/bin/kubelogin $out/bin/kubectl-oidc_login ''; - meta = with lib; { + meta = { description = "Kubernetes credential plugin implementing OpenID Connect (OIDC) authentication"; mainProgram = "kubectl-oidc_login"; inherit (src.meta) homepage; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + benley + nevivurn + ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6deb5d614871e50..7bd456cadc28ef5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30752,8 +30752,6 @@ with pkgs; kubelogin = callPackage ../applications/networking/cluster/kubelogin { }; - kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { }; - kubevpn = callPackage ../applications/networking/cluster/kubevpn { }; k8sgpt = callPackage ../applications/networking/cluster/k8sgpt { }; From e0a0f4f1f7ed5accae8b8d902b387a5d77cd5506 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Fri, 4 Oct 2024 02:04:20 +0900 Subject: [PATCH 68/69] almo: init at 0.9.5-alpha (#343864) almo: init at 0.9.5-alpha --- pkgs/by-name/al/almo/package.nix | 51 ++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/al/almo/package.nix diff --git a/pkgs/by-name/al/almo/package.nix b/pkgs/by-name/al/almo/package.nix new file mode 100644 index 000000000000000..00764f5301a7626 --- /dev/null +++ b/pkgs/by-name/al/almo/package.nix @@ -0,0 +1,51 @@ +{ + lib, + fetchFromGitHub, + stdenv, + gcc, + python312Packages, +}: +let + version = "0.9.5-alpha"; +in +stdenv.mkDerivation { + pname = "almo"; + inherit version; + + src = fetchFromGitHub { + owner = "abap34"; + repo = "almo"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Cz+XDJmdp+utzwm1c7ThTNS6kfNF6r4B16tnGQSCVMc="; + }; + + buildInputs = [ + gcc + python312Packages.pybind11 + ]; + + makeFlags = [ "all" ]; + + # remove darwin-only linker flag on linux + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace scripts/pybind.sh \ + --replace-fail " -undefined dynamic_lookup" "" + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/lib + cp build/almo $out/bin + cp almo.so $out/lib + runHook postInstall + ''; + + meta = { + description = "ALMO is markdown parser and static site generator"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + homepage = "https://github.com/abap34/almo"; + maintainers = with lib.maintainers; [ momeemt ]; + mainProgram = "almo"; + }; +} From 3b36b87e1a367c55dcee2ae424ff2a00df9378bb Mon Sep 17 00:00:00 2001 From: rian <19516527+360ied@users.noreply.github.com> Date: Thu, 3 Oct 2024 17:20:57 +0000 Subject: [PATCH 69/69] classicube: 1.3.6 -> 1.3.7 (#345753) --- pkgs/games/classicube/default.nix | 4 ++-- pkgs/games/classicube/fix-linking.patch | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix index d0c7fd79475a8d7..e17c8bffd336060 100644 --- a/pkgs/games/classicube/default.nix +++ b/pkgs/games/classicube/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ClassiCube"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "UnknownShadow200"; repo = "ClassiCube"; rev = version; - sha256 = "sha256-7VPn5YXNoAR3ftYMDQuQRqeMCrbyB56ir1sQWBiPWAI="; + sha256 = "sha256-ZITyfxkQB4Jpm2ZsQyM+ouPLqCVmGB7UZRXDSU/BX0k="; }; nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ]; diff --git a/pkgs/games/classicube/fix-linking.patch b/pkgs/games/classicube/fix-linking.patch index 4fc0e826cb4a839..a35d19caaca4963 100644 --- a/pkgs/games/classicube/fix-linking.patch +++ b/pkgs/games/classicube/fix-linking.patch @@ -1,13 +1,14 @@ diff --git a/Makefile b/Makefile -index 83188ce..3439cdb 100644 +index a10eb5214..70e2f720e 100644 --- a/Makefile +++ b/Makefile -@@ -40,7 +40,7 @@ LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -lcrypt32 -ld3d9 - endif +@@ -55,7 +55,7 @@ endif ifeq ($(PLAT),linux) --LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -+LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -lcurl -lopenal + CFLAGS += -DCC_BUILD_ICON +- LIBS = -lX11 -lXi -lpthread -lGL -ldl ++ LIBS = -lX11 -lXi -lpthread -lGL -ldl -lcurl -lopenal + BUILD_DIR = build-linux endif - ifeq ($(PLAT),sunos) +