diff --git a/doc/redirects.json b/doc/redirects.json index 4fada4e6cf2f..5065007b0ae9 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -827,6 +827,12 @@ "set-source-date-epoch-to-latest.sh": [ "index.html#set-source-date-epoch-to-latest.sh" ], + "add-bin-to-path.sh": [ + "index.html#add-bin-to-path.sh" + ], + "writable-tmpdir-as-home.sh": [ + "index.html#writable-tmpdir-as-home.sh" + ], "bintools-wrapper": [ "index.html#bintools-wrapper" ], diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index ed29d8459c33..9236d85a73aa 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1389,6 +1389,31 @@ The check for reflexivity is direct and does not account for transitivity, so th This sets `SOURCE_DATE_EPOCH` to the modification time of the most recent file. +### `add-bin-to-path.sh` {#add-bin-to-path.sh} + +This setup hook checks if the `bin/` directory exists in the `$out` output path +and, if so, adds it to the `PATH` environment variable. This ensures that +executables located in `$out/bin` are accessible. + +This hook is particularly useful during testing, as it allows packages to locate their executables without requiring manual modifications to the `PATH`. + +**Note**: This hook is specifically designed for the `$out/bin` directory only +and does not handle and support other paths like `$sourceRoot/bin`. It may not +work as intended in cases with multiple outputs or when binaries are located in +directories like `sbin/`. These caveats should be considered when using this +hook, as they might introduce unexpected behavior in some specific cases. + +### `writable-tmpdir-as-home.sh` {#writable-tmpdir-as-home.sh} + +This setup hook ensures that the directory specified by the `HOME` environment +variable is writable. If it is not, the hook assigns `HOME` to a writable +directory (in `.home` in `$NIX_BUILD_TOP`). This adjustment is necessary for +certain packages that require write access to a home directory. This hook can +be added to any phase. + +By setting `HOME` to a writable directory, this setup hook prevents failures in +packages that attempt to write to the home directory. + ### Bintools Wrapper and hook {#bintools-wrapper} The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targeting Linux, and a mix of cctools and GNU binutils for Darwin. \[The “Bintools” name is supposed to be a compromise between “Binutils” and “cctools” not denoting any specific implementation.\] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper. diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index 03fc2c4fe9d0..91731416199b 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-gjqAQrGJ9KFdzn2a3fOgu0VJ9zrX5stsbzriOGJaD/4="; }; - cargoHash = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA="; + useFetchCargoVendor = true; + cargoHash = "sha256-r/0aNzU8jm2AqiZWq4plxXY/H7qKVC8nEI9BwOUKCdA="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index f0096de5ae09..fd8505d21977 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -41,7 +41,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NIEiXwuy8zuUDxPsD4Hiq3x4cOG3VM+slfNIBSJU2Mk="; }; - cargoHash = "sha256-dfE4pfArW9hTPi7LCC9l274dNd1r0RAh50cciUGnv58="; + useFetchCargoVendor = true; + cargoHash = "sha256-e1JSK8RnBPGcAmgxJZ7DaYhMMaUqO412S9YvaqXll3E="; env.npmDeps_web_js = fetchNpmDeps { name = "npm-deps-web-js"; @@ -58,10 +59,10 @@ rustPlatform.buildRustPackage rec { src = "${src}/pagefind_ui/modular"; hash = "sha256-O0RqZUsRFtByxMQdwNGNcN38Rh+sDqqNo9YlBcrnsF4="; }; - env.cargoDeps_web = rustPlatform.fetchCargoTarball { + env.cargoDeps_web = rustPlatform.fetchCargoVendor { name = "cargo-deps-web"; src = "${src}/pagefind_web/"; - hash = "sha256-vDkVXyDePKgYTYE5ZTLLfOHwPYfgaqP9p5/fKCQQi0g="; + hash = "sha256-xFVMWX3q3za1w8v58Eysk6vclPd4qpCuQMjMcwwHoh0="; }; postPatch = '' @@ -81,8 +82,9 @@ rustPlatform.buildRustPackage rec { # patch a build-time dependency download ( - cd $cargoDepsCopy/lindera-unidic - oldHash=$(sha256sum build.rs | cut -d " " -f 1) + realpath $cargoDepsCopy/* | grep lindera-unidic # debug for when version number changes + cd $cargoDepsCopy/lindera-unidic-0.32.2 + #oldHash=$(sha256sum build.rs | cut -d " " -f 1) # serve lindera-unidic on localhost vacant port httplz_port="${ @@ -101,8 +103,9 @@ rustPlatform.buildRustPackage rec { "https://dlwqk3ibdg1xh.cloudfront.net/unidic-mecab-2.1.2.tar.gz" \ "http://localhost:$httplz_port/unidic-mecab-2.1.2.tar.gz" - newHash=$(sha256sum build.rs | cut -d " " -f 1) - substituteInPlace .cargo-checksum.json --replace-fail $oldHash $newHash + # not needed with useFetchCargoVendor=true, but kept in case it is required again + #newHash=$(sha256sum build.rs | cut -d " " -f 1) + #substituteInPlace .cargo-checksum.json --replace-fail $oldHash $newHash ) ''; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ee62b627df0f..f12ded476f33 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -45,11 +45,11 @@ "vendorHash": "sha256-3AlXMOpL5kctTSnA2V1RsMxRb9roELs1p5TL0uJFR4M=" }, "alicloud": { - "hash": "sha256-xHR2Yuyh5hxbTuu1QqkKSIJX2SyqsRaoa7GtOSFzLFA=", + "hash": "sha256-ZOcG5xfVJN3RFLtFyQr87feEQ1MoRtgPLt03bjbC1gc=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.239.0", + "rev": "v1.242.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -117,13 +117,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-731RvOhO1GyIx8ohIEVsWv8ZC3ksm4WQu7bUQagwv9Q=", + "hash": "sha256-G4frE2m7kjxiGSjIKbWltkTZ9Lba0CTgsOE+13+2bbo=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.80.0", + "rev": "v5.84.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-P7ykNhpFoPTINX3eo61/x/9Ts2Z9dscY/P5fQNRsmVo=" + "vendorHash": "sha256-u4xQyCDOZEczAqxgkxaKeS0Gy+PbIyYWtTxdPRiXMCw=" }, "azuread": { "hash": "sha256-UV6jgVS8tzWiEBC/C/U7/2bGZ1sqk2MnS8xNRBuL+C8=", @@ -135,11 +135,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-qN4Kl3Ud3Grcxs2Y5Mx6qxs3RnljT8+9TxC8l3xQjuw=", + "hash": "sha256-99SWoCpiXp2R673CAfPbKPSzhT2huVBRHcZN4XlUJJI=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v4.14.0", + "rev": "v4.16.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -198,13 +198,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "btp": { - "hash": "sha256-71i7iRTAsSZnq72ew4cEcDGFbsRPKWvEJ7y6onN1V68=", + "hash": "sha256-uyZ4HR9HVLHxGtRE4DTeNlG7RsYcmIxsZMxs5hQbJSc=", "homepage": "https://registry.terraform.io/providers/SAP/btp", "owner": "SAP", "repo": "terraform-provider-btp", - "rev": "v1.8.0", + "rev": "v1.9.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-A6/YN/iFxdfGjYO8Pum5nWysGmEeLaxgFPe8zaoPfjA=" + "vendorHash": "sha256-RnFY5fAkEV69nuFMcivCb232r/3sqqcgdMU/WYuK+yI=" }, "buildkite": { "hash": "sha256-xz9gYf13tNU3J7nQscuIRU41CGjYc6qMXnLltAaPQac=", @@ -252,13 +252,13 @@ "vendorHash": "sha256-QErIw/HQ4BMWmM0xEnYsOY0Vcfj50o6mnIWML4nK/SU=" }, "cloudflare": { - "hash": "sha256-RC8/tw01yNxeqOlmLzzagRgxQm+o+4ztJ/7KWyBPJ+I=", + "hash": "sha256-ne+G7tn09sDWVoU9JezCJxIn3F/bHXBp9QIDd0UhH9c=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.48.0", + "rev": "v4.51.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-tznAR/SRtJJdxm17f8ej5Lt8BCVlCW3zkrBX94ErbjQ=" + "vendorHash": "sha256-jZLkDnZpguVEZpbXG/IhgeyyvRLOVWBacoFTs7H8js0=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -498,22 +498,22 @@ "vendorHash": null }, "gitlab": { - "hash": "sha256-f+4eWx6CqQhqNyQUBsi0BR+J4N0yloZw01o8NffNYFE=", + "hash": "sha256-Fh1FYP5dBA7bJMOpYrASQC+3RMLx6O62ty+i0114fV4=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v17.6.1", + "rev": "v17.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-C7BJR8H1HP6TycbbXsY/xRhSzOmCpodN6vr/lzgXe+A=" + "vendorHash": "sha256-RoMknYUy73fiLrexhpM94qZ7l1F68o5/vfg8RXRtvHw=" }, "google": { - "hash": "sha256-swyE5pSVu5X5V6pfgJkpz7PmB1lk5l6OHoVetFfQHXU=", + "hash": "sha256-cRxUE6Ztys60AL4vHL4eBGlIfDtAxyFFhL7nh2LC7xo=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v6.13.0", + "rev": "v6.17.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-JUaXSF+UJCTHbr+Xq2zLpNuJVTW89gwEeFEXs44g5J4=" + "vendorHash": "sha256-NTUwfD1f6qtv0KKwzuxzMMCXgV7MgolbBWbwo9UxOaA=" }, "google-beta": { "hash": "sha256-O8pDsBTfr8Ep2pZmb2btKVuNrKx6PxLczmwTwwdJZ/c=", @@ -831,13 +831,13 @@ "vendorHash": "sha256-a9v1nVG3NiuyHwJGhIKKKXFDp4/Cb533EJxrfqK9h/A=" }, "mongodbatlas": { - "hash": "sha256-0CIHc3cIdhxX2T8dkccOLVFCgY3c1kz6vxlzmEN8YK0=", + "hash": "sha256-bngDZUqemOjmRTQC0UnQG2IvjuqjORrZ3Agr1K0T+TE=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.22.0", + "rev": "v1.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jHm6fDk8zjrZcWKHOKhhFmRICBwx/d7BD4Ycy8gcQWU=" + "vendorHash": "sha256-Dzd+0kGTK+8RITL/R4BRjJhD5sZKWSrprqNZQ/4Cm9E=" }, "namecheap": { "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=", @@ -1165,13 +1165,13 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "snowflake": { - "hash": "sha256-ImQcECv0fRGbOQvoG8rwQAb4jV7Ly72c6r6TlCMWdA0=", + "hash": "sha256-PzZ5vLAyJYT5UZ6C5mTzyoJTcru9JXu/Xy+cPJu4IB0=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.99.0", + "rev": "v1.0.2", "spdx": "MIT", - "vendorHash": "sha256-ZHwHYUk2JntdWWH4sqU63Ud/Zb86YNLTrPmJrwcuWDQ=" + "vendorHash": "sha256-Nf3MBMjsGDOdxTrhHo72NxIXx2xYCU/SEmYGHO6C/3s=" }, "sops": { "hash": "sha256-MdsWKV98kWpZpTK5qC7x6vN6cODxeeiVVc+gtlh1s88=", diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index bb363c9f537a..d9db711638e6 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wxmaxima"; - version = "24.11.0"; + version = "25.01.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${finalAttrs.version}"; - hash = "sha256-3tGMkxp7nadD+LNluIiyPf55Daf7N1MPTH62U8/GxuA="; + hash = "sha256-XFlEBmKxpi7NnUxVXV2F+zQKrvR4r93aLtHOoVZ7SPw="; }; buildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix index 72ee3d7fd29b..ba97017e8ffd 100644 --- a/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -9,11 +9,11 @@ buildKodiAddon rec { pname = "urllib3"; namespace = "script.module.urllib3"; - version = "2.1.0"; + version = "2.2.3"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-UCvkeguxytPoP1gIIt8N79TVs98ATzsfrRSabtbgnGc="; + sha256 = "sha256-xapFA51ENjkB3IldUey5WqXAjMij66dNqILQjKD/VkA="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix b/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix index f9fb728c73d3..bd103adb090c 100644 --- a/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "visualization-projectm"; namespace = "visualization.projectm"; - version = "21.0.2"; + version = "21.0.3"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-M+sHws9wp0sp1PnYXCLMZ9w48tJkG159XkyNvzHJNYo="; + hash = "sha256-J3RtVl+hO8DspLyF2KAVMLDIJBiEb0bKosKhJyKy9hk="; }; extraBuildInputs = [ pkg-config libGL projectm ]; diff --git a/pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix b/pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix index d162da18c018..ac2876055890 100644 --- a/pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix +++ b/pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, buildLua, - alass, + ffsubsync, }: buildLua { @@ -20,9 +20,9 @@ buildLua { patchPhase = '' runHook prePatch substituteInPlace autosubsync.lua \ - --replace-warn 'alass_path = ""' 'alass_path = "${alass}/bin/alass-cli"' \ - --replace-warn 'audio_subsync_tool = "ask"' 'audio_subsync_tool = "alass"' \ - --replace-warn 'altsub_subsync_tool = "ask"' 'altsub_subsync_tool = "alass"' + --replace-warn 'ffsubsync_path = ""' 'ffsubsync_path = "${lib.getExe ffsubsync}"' \ + --replace-warn 'audio_subsync_tool = "ask"' 'audio_subsync_tool = "ffsubsync"' \ + --replace-warn 'altsub_subsync_tool = "ask"' 'altsub_subsync_tool = "ffsubsync"' runHook postPatch ''; diff --git a/pkgs/applications/video/mpv/scripts/modernz.nix b/pkgs/applications/video/mpv/scripts/modernz.nix index a459aa6ad851..704848b263bd 100644 --- a/pkgs/applications/video/mpv/scripts/modernz.nix +++ b/pkgs/applications/video/mpv/scripts/modernz.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernx"; - version = "0.2.4"; + version = "0.2.5"; scriptPath = "modernz.lua"; src = fetchFromGitHub { owner = "Samillion"; repo = "ModernZ"; rev = "v${finalAttrs.version}"; - hash = "sha256-njFVAxrO5mGaf5zSA4EZN31SakWcroBZuGXYvTnqi68="; + hash = "sha256-7qzN9GiZbqzQMY2a0+CgXWirv7FUwIQbmH7ZzknlHlU="; }; postInstall = '' diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 8713b665cb5f..af5465ca0cbf 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchgit, - fetchpatch, pkg-config, protobuf, python3, @@ -14,33 +13,27 @@ virglrenderer, wayland, wayland-protocols, + writeShellScript, + unstableGitUpdater, + nix-update, pkgsCross, }: rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "130.0"; + version = "0-unstable-2025-01-21"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "9d42f918373f962b7d035ff52a1629e184cb496e"; - hash = "sha256-h8nAZ4kTidblKNvugEEZUorBthjGi0FmImcBwYy4EHQ="; + rev = "c93c22f1da264919ba551db84d43d4a11ea55d8d"; + hash = "sha256-edhg1ZtlbzsqvmeVO/AddMfmFBcicxTWV5VvZZ25v6U="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - name = "cross-domain.patch"; - url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/60053cdf0b360a03084292b39120365fff65d410%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-U5eOxuAtVLjJ+8h16lmbJYNxsP/AOEv/1ec4WlUxP2E="; - }) - ]; - separateDebugInfo = true; useFetchCargoVendor = true; - cargoHash = "sha256-NrRHLDRr5spB/qRvZungNL7qFTdYS32lynJNoY0EjDQ="; + cargoHash = "sha256-/0HXHCfaNixT+lKkGlB90bokNrCFQANHSkSKII2pHuU="; nativeBuildInputs = [ pkg-config @@ -70,7 +63,15 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "virgl_renderer" ]; passthru = { - updateScript = ./update.py; + updateScript = writeShellScript "update-crosvm.sh" '' + set -ue + ${lib.escapeShellArgs (unstableGitUpdater { + url = "https://chromium.googlesource.com/crosvm/crosvm.git"; + hardcodeZeroVersion = true; + })} + exec ${lib.getExe nix-update} --version=skip + ''; + tests = { musl = pkgsCross.musl64.crosvm; }; diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py deleted file mode 100755 index 92444d287478..000000000000 --- a/pkgs/applications/virtualization/crosvm/update.py +++ /dev/null @@ -1,57 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -p common-updater-scripts nix-update python3 -#! nix-shell -i python - -import csv -import json -import re -import shlex -import subprocess -from os.path import abspath, dirname, splitext -from urllib.request import urlopen - -# CrOS version numbers look like this: -# [.].. -# -# As far as I can tell, branches are where internal Google -# modifications are added to turn Chromium OS into Chrome OS, and -# branch branches are used for fixes for specific devices. So for -# Chromium OS they will always be 0. This is a best guess, and is not -# documented. -with urlopen('https://chromiumdash.appspot.com/cros/download_serving_builds_csv?deviceCategory=ChromeOS') as resp: - reader = csv.reader(map(bytes.decode, resp)) - header = reader.__next__() - cr_stable_index = header.index('cr_stable') - cros_stable_index = header.index('cros_stable') - chrome_version = [] - platform_version = [] - - for line in reader: - if line[cr_stable_index] == "no update": - continue - this_chrome_version = list(map(int, line[cr_stable_index].split('.'))) - this_platform_version = list(map(int, line[cros_stable_index].split('.'))) - chrome_version = max(chrome_version, this_chrome_version) - platform_version = max(platform_version, this_platform_version) - -chrome_major_version = chrome_version[0] -chromeos_tip_build = platform_version[0] -release_branch = f'release-R{chrome_major_version}-{chromeos_tip_build}.B' - -# Determine the git revision. -with urlopen(f'https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/{release_branch}?format=JSON') as resp: - resp.readline() # Remove )]}' header - rev = json.load(resp)['commit'] - -# Determine the patch version by counting the commits that have been -# added to the release branch since it forked off the chromeos branch. -with urlopen(f'https://chromium.googlesource.com/chromiumos/platform/crosvm/+log/refs/heads/chromeos..{rev}?format=JSON') as resp: - resp.readline() # Remove )]}' header - branch_commits = json.load(resp)['log'] - version = f'{chrome_major_version}.{len(branch_commits)}' - -# Update the version, git revision, and hash in crosvm's default.nix. -subprocess.run(['update-source-version', 'crosvm', f'--rev={rev}', version]) - -# Update cargoHash. -subprocess.run(['nix-update', '--version=skip', 'crosvm']) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 90b6d708da43..7da73350e68d 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -294,11 +294,11 @@ rec { }; docker_27 = callPackage dockerGen rec { - version = "27.5.0"; + version = "27.5.1"; cliRev = "v${version}"; - cliHash = "sha256-PbdT1CL8jSHHPV2iygTXNwoY0qcNF2XUDEAHHsM4fPM="; + cliHash = "sha256-7laxRfssh2aGfJeZI0PsJ/MCiy2npigSmCa1SUlWY4s="; mobyRev = "v${version}"; - mobyHash = "sha256-OSkI8F8bUjsCUT/pRWWbfTq9Fno5z35hW9OnLXHrIiQ="; + mobyHash = "sha256-q+VCJZ93jvPJQE0xn89prH/6spsarVY3VUEmgwyMxU4="; runcRev = "v1.2.3"; runcHash = "sha256-SdeCmPttMXQdIn3kGWsIM3dfhQCx1C5bMyAM889VVUc="; containerdRev = "v1.7.24"; diff --git a/pkgs/build-support/setup-hooks/add-bin-to-path.sh b/pkgs/build-support/setup-hooks/add-bin-to-path.sh new file mode 100644 index 000000000000..308c2706fd05 --- /dev/null +++ b/pkgs/build-support/setup-hooks/add-bin-to-path.sh @@ -0,0 +1,15 @@ +# shellcheck shell=bash +# This setup hook add $out/bin to the PATH environment variable. + +export PATH + +addBinToPath () { + # shellcheck disable=SC2154 + if [ -d "$out/bin" ]; then + PATH="$out/bin:$PATH" + export PATH + fi +} + +# shellcheck disable=SC2154 +addEnvHooks "$targetOffset" addBinToPath diff --git a/pkgs/build-support/setup-hooks/writable-tmpdir-as-home.sh b/pkgs/build-support/setup-hooks/writable-tmpdir-as-home.sh new file mode 100644 index 000000000000..f63f3499e736 --- /dev/null +++ b/pkgs/build-support/setup-hooks/writable-tmpdir-as-home.sh @@ -0,0 +1,15 @@ +# shellcheck shell=bash +# This setup hook set the HOME environment variable to a writable directory. + +export HOME + +writableTmpDirAsHome () { + if [ ! -w "$HOME" ]; then + HOME="$NIX_BUILD_TOP/.home" + mkdir -p "$HOME" + export HOME + fi +} + +# shellcheck disable=SC2154 +addEnvHooks "$targetOffset" writableTmpDirAsHome diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index 33ab8e65463d..55264bc6b50d 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ada"; - version = "2.9.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; rev = "v${version}"; - hash = "sha256-VWFxupmgc+fq9aj/02uMEsiwhP+9PWMSleoIoyKVe3c="; + hash = "sha256-6heohik9MlIvDTSWe8U6/mdHuSHaEv4rkGwaz0LH8NU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/al/alass/package.nix b/pkgs/by-name/al/alass/package.nix deleted file mode 100644 index 0ae84ada3dfb..000000000000 --- a/pkgs/by-name/al/alass/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - makeWrapper, - ffmpeg, -}: - -rustPlatform.buildRustPackage rec { - pname = "alass"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "kaegi"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-q1IV9TtmznpR7RO75iN0p16nmTja5ADWqFj58EOPWvU="; - }; - - cargoHash = "sha256-6swIoVp1B4CMvaGvq868LTKkzpI6zFKJNgUVqjdyH20="; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram "$out/bin/alass-cli" --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" - ''; - - meta = with lib; { - description = "Automatic Language-Agnostic Subtitles Synchronization"; - homepage = "https://github.com/kaegi/alass"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ erictapen ]; - mainProgram = "alass-cli"; - }; -} diff --git a/pkgs/by-name/an/ankama-launcher/package.nix b/pkgs/by-name/an/ankama-launcher/package.nix index 2b67e05d1541..d297039367e9 100644 --- a/pkgs/by-name/an/ankama-launcher/package.nix +++ b/pkgs/by-name/an/ankama-launcher/package.nix @@ -5,15 +5,15 @@ }: let pname = "ankama-launcher"; - version = "3.12.30"; + version = "3.12.31"; # The original URL for the launcher is: # https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage # As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL. # To update the client, head to web.archive.org and create a new snapshot of the download page. src = fetchurl { - url = "https://web.archive.org/web/20250118114812/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; - hash = "sha256-qgWhC/xWUQpIoCNZcRxBPGpbNTFGysIF2N9a1MsxCFk="; + url = "https://web.archive.org/web/20250131072647/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; + hash = "sha256-ntKuvkY3G00vzWyYnJfz9TifowH2pS9FMeEDDJZMPR8="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 9610a01feb64..e8fbc5afe95b 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.78.1-57736"; + version = "1.79.0-57949"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-n81GMJ1Lhx8z/wwicyEKCbJM7WVi0mepSbefSXMuM3g="; + hash = "sha256-qGcqtBLy83/5PtDxaB3aD5fCeSGQ1/63EpLCA26TDgM="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index cda2ad7e9c2c..802cf5c9ce75 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.13.3"; + version = "2.13.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-1z3tTXHVJ3e3g+DAoEGb8P6e4iEe1tiaM+7IPyuQp7U="; + hash = "sha256-LBA6GFMBY1zW7h94DBokxA/9dx5/tCSRe+rYQCOgSgo="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-p+9Q9VOdN7v7iK5oaO5f+B1iyOwVdk672zQsYsrb398="; + vendorHash = "sha256-HN0kxDG1DCl6lwmf44lMZmAZ2ban4iT8EIQ03dvZ6X0="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 2c521e13b4a1..02a42db4b23f 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -12,25 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.33.1"; + version = "0.34.3"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; tag = version; - hash = "sha256-p7SJhkCoo4jBDyr+Z2+qxjUwWXWpVMuXd2/DDOM7Z/Q="; + hash = "sha256-r82BDCncRUSmIBQFwsrKDwKEKmvGm/lKtz1rYC47Ems="; }; useFetchCargoVendor = true; - cargoHash = "sha256-l2fvQqkyAsLGm+KStc2CaTeLrxvNmQgNFd79pLiCk/Y="; + cargoHash = "sha256-hxIeRkKPuLftAYAsdk2Hq1+ittGeWDIl9Rryi7MLg90="; nativeBuildInputs = [ installShellFiles ]; - # error: linker `aarch64-linux-gnu-gcc` not found - postPatch = '' - rm .cargo/config.toml - ''; - cargoBuildFlags = [ "--package ast-grep --bin ast-grep" ] ++ lib.optionals enableLegacySg [ "--package ast-grep --bin sg" ]; @@ -53,21 +48,6 @@ rustPlatform.buildRustPackage rec { '' ); - checkFlags = - [ - # disable flaky test - "--skip=test::test_load_parser_mac" - - # BUG: Broke by 0.12.1 update (https://github.com/NixOS/nixpkgs/pull/257385) - # Please check if this is fixed in future updates of the package - "--skip=verify::test_case::tests::test_unmatching_id" - ] - ++ lib.optionals (with stdenv.hostPlatform; (isDarwin && isx86_64) || (isLinux && isAarch64)) [ - # x86_64-darwin: source/benches/fixtures/json-mac.so\' (no such file), \'/private/tmp/nix-build-.../source/benches/fixtures/json-mac.so\' (mach-o file, but is an incompatible architecture (have \'arm64\', need \'x86_64h\' or \'x86_64\'))" }) - # aarch64-linux: /build/source/benches/fixtures/json-linux.so: cannot open shared object file: No such file or directory" - "--skip=test::test_load_parser" - "--skip=test::test_register_lang" - ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index 7d573d478c1f..4bc884dd98a7 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.6.2"; + version = "1.6.3"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-FfowCbnhGI0sglFvxf7ActUJC9Lsj97Ui08nObBnjoE="; + hash = "sha256-wlPuQGfMq3rHWHMZ30xm5MGWu/ddnajz7GM3QUSrZPo="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 diff --git a/pkgs/by-name/be/berglas/package.nix b/pkgs/by-name/be/berglas/package.nix index f44b06b8631e..d5412784ba4a 100644 --- a/pkgs/by-name/be/berglas/package.nix +++ b/pkgs/by-name/be/berglas/package.nix @@ -35,16 +35,16 @@ in buildGoModule rec { pname = "berglas"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aTUMEn/QkPzvAyUvMxyqLl6KWFHs+dQK0VDqYv36AGM="; + sha256 = "sha256-bW8D8g4FPx0i4iPP7Pvm0UpaJFNsECR3kuHEZn8NLx0="; }; - vendorHash = "sha256-n/NOAmOOoZMFZGreUGNgrZ3XGbhmI52KtgakcJ/SJIc="; + vendorHash = "sha256-+ncl/6BJ7J2cby29I1IvkUgbiyDP+co/+Cyyh/V8A1I="; ldflags = [ "-s" diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index f059bd08c477..60630532c591 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.74.48"; + version = "1.74.50"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-rZl4ftEAXI3q5NYlusR1yFIS0scTc3ZT7O5W9OyHHiQ="; + hash = "sha256-vit57iZLBp1wP4SK8nqqZRaCHlxwgMRo2MXHVvw8apk="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-qNP3wsqys8iY/GQtDBL2OW8+jc2sZ20CfethR+L3c3E="; + hash = "sha256-XnaDaJaqjPOXSXaShia6Ooyn/DegU0vC0XefjBoX6zE="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-KCiPsXf24gOW3gBC1Ajiw6dtdZHHewMj8GTC1pAGiks="; + hash = "sha256-9fke4rkaXWO5e9GBF+hdiDUjST8OsYJQ8tHxE5kJAcc="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-GWVP/qucLc5KbaaK2GSjrp9hslczJ+vFqbNmIo7iWK0="; + hash = "sha256-TwBmR7LlGZlpgIDJ2ShAS5uHwTh8dHvRONJln7Z9rgs="; }; }; diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index 7f0b80515f7e..e24c351ffb5f 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.49.0"; + version = "1.50.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-fYCMVR3meuSrTCkM2SfKeh03k4a3n4RHMhWgQ7FsIAU="; + hash = "sha256-XRz6hju80NWi87NgVM/JzRNDIJeJSpZPVVEOoxvQAwc="; }; - vendorHash = "sha256-jfpB1QVc5xjJ9uYDcyVmK6fDqnNLV1goEBYX3oEDQQw="; + vendorHash = "sha256-7+fHUpYTAy/wBZKq58riNsZ29KnHUG0fWRUYfFhCaOY="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index 70f861a9265b..3e16d5c4f60a 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "c2FmZQ"; - version = "0.4.25"; + version = "0.4.27"; src = fetchFromGitHub { owner = "c2FmZQ"; repo = "c2FmZQ"; rev = "v${version}"; - hash = "sha256-1c2C+BVgf7NumOoCCMfGFpn1qwQ2V4524aG5yZO98vI="; + hash = "sha256-PGZN6+DJWMoBREqvqub9t1XxvtuhgFTFwerOu/v8xTI="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { sourceRoot = "${src.name}/c2FmZQ"; - vendorHash = "sha256-9eWLg0+HkpwUC+De62Izh3vadV3dnwPpf8ksH8KwGqQ="; + vendorHash = "sha256-zKELnKHwNlXnKsIPr51Ec0bBEOYVMWs/8oQU5zJ+z/s="; subPackages = [ "c2FmZQ-client" diff --git a/pkgs/by-name/ca/cables/package.nix b/pkgs/by-name/ca/cables/package.nix index 0cc7ca77c2d8..9a77b0a13369 100644 --- a/pkgs/by-name/ca/cables/package.nix +++ b/pkgs/by-name/ca/cables/package.nix @@ -7,12 +7,12 @@ let pname = "cables"; - version = "0.5.0"; + version = "0.5.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage"; - sha256 = "sha256-rwnCIIPQ7a+SDehtl72Q3K3igJmVcOyhKUb9lpW7Zvo="; + sha256 = "sha256-TJRhuruNo8LtLm0IS0KJRo4upgYowOtvMviHmfsVltc="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ca/cargo-aoc/package.nix b/pkgs/by-name/ca/cargo-aoc/package.nix index 35edbd666e5c..00b1c268bda8 100644 --- a/pkgs/by-name/ca/cargo-aoc/package.nix +++ b/pkgs/by-name/ca/cargo-aoc/package.nix @@ -2,9 +2,8 @@ lib, rustPlatform, fetchCrate, - testers, + versionCheckHook, nix-update-script, - cargo-aoc, }: rustPlatform.buildRustPackage rec { pname = "cargo-aoc"; @@ -18,10 +17,11 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-q0kpo6DNR+8129+vJSLoOC/bUYjlfaB77YTht6+kT00="; - passthru = { - tests.version = testers.testVersion { package = cargo-aoc; }; - updateScript = nix-update-script { }; - }; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; meta = { description = "Simple CLI tool that aims to be a helper for Advent of Code"; diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix index ad17ac53b517..c03a5b7045d3 100644 --- a/pkgs/by-name/ca/cargo-mobile2/package.nix +++ b/pkgs/by-name/ca/cargo-mobile2/package.nix @@ -13,7 +13,7 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.17.4"; + version = "0.17.5"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-1lrimBdJwur5b4wB8hZVUtJEbgXoib0ytzjzhkqNE6c="; + hash = "sha256-eaKj2S1qiG6qQd7yG4RrK/a+1IsgBybodSTfERDvGE4="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { # sourceRoot = "${src.name}/tooling/cli"; useFetchCargoVendor = true; - cargoHash = "sha256-ay3mB3FahVCx43ZnLSRwk9QR8R7KROCZSf+zfVqQKTY="; + cargoHash = "sha256-IW/2Xp52TlqYtvXZqSDv9/Uv9B/thM360ecbbWLXPNE="; preBuild = '' mkdir -p $out/share/ diff --git a/pkgs/by-name/ch/chainsaw/package.nix b/pkgs/by-name/ch/chainsaw/package.nix index 345d0801242b..a9d848a59619 100644 --- a/pkgs/by-name/ch/chainsaw/package.nix +++ b/pkgs/by-name/ch/chainsaw/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ErDIfLhzCiFm3dZzr6ThjYCplfDKbALAqcu8c0gREH4="; }; - cargoHash = "sha256-WuPfYxI61wsQyOKqPF7/a3Hx9vMBCkTkoXsZczgeKpg="; + useFetchCargoVendor = true; + cargoHash = "sha256-LTvCExHQnQIbGGeh4bK6b3r9XXOxREMTOlRQv+BjKrM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix index 837185dd651a..36a1a38de8e8 100644 --- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix +++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix @@ -7,15 +7,15 @@ }: rustPlatform.buildRustPackage rec { pname = "clang-tidy-sarif"; - version = "0.6.6"; + version = "0.7.0"; src = fetchCrate { inherit pname version; - hash = "sha256-rZnGueaqK7h8tWwwWacvFBvJwE1li2wN9iB4DJRHJ8U="; + hash = "sha256-DFen1QYQxArNfc0CXNtP0nZEvbCxqTH5KS3q3FcfDPs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dEOApNGFKoyYkaoJJqYnOxsntmYCfzSgTS2PQldI0oc="; + cargoHash = "sha256-AfkiK91vXaw4oWvfYlV3C0M/cGf4ZThALB/cANcZmFQ="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 46c5006a21a8..3bbc157b7ffd 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -30,7 +30,7 @@ let hash = "sha256-kZf5O3n0xmNUN0G4hAWQDN9Oj9K7PtLpv6jnhh1C5Hg="; }; - service-cargo-hash = "sha256-uo/2QBsZzoTdwRiW0Kr7GGiQCpQH4lW4h5XHqWd5sTU="; + service-cargo-hash = "sha256-Sof0jnU5+IGWMmbqVqJmhUzDO6CRlFpwwzYx9Z5tZbk="; service = callPackage ./service.nix { inherit diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix index 841ab702fbee..9641abcc922d 100644 --- a/pkgs/by-name/cl/clash-verge-rev/service.nix +++ b/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage { OPENSSL_NO_VENDOR = 1; }; + useFetchCargoVendor = true; cargoHash = service-cargo-hash; } diff --git a/pkgs/by-name/cl/clock-rs/package.nix b/pkgs/by-name/cl/clock-rs/package.nix index 2acd33536db7..089223d9093b 100644 --- a/pkgs/by-name/cl/clock-rs/package.nix +++ b/pkgs/by-name/cl/clock-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "06spnadlgy7902bqhhi6019ay5y55qfrarsfidp938icali9q5pi"; }; - cargoHash = "sha256-ir/IwhREheMSdElLYqp3/zHE54BMAK5/7f5/wyTd1yc="; + useFetchCargoVendor = true; + cargoHash = "sha256-3XIPrKt6oYugIo5erBE/od55AvBGEZe46l8DMXhhzF4="; meta = { description = "Modern, digital clock that effortlessly runs in your terminal"; diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix index 7cd746071be6..869875916794 100644 --- a/pkgs/by-name/cl/clorinde/package.nix +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "clorinde"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "halcyonnouveau"; repo = "clorinde"; tag = "clorinde-v${version}"; - hash = "sha256-Nqf0NNjE3gu+75tjMKAY3Wn75PiPwpnXgXtzdhqx7u8="; + hash = "sha256-03lKEAPJTxIXLNF2jVuD6DHJDqTkqCt1Vc+A1/E1CP4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ssyx72o/eTcFClLyl4QJ71okqKU2k6SZVH0eGEFzIjs="; + cargoHash = "sha256-a/MH1jG3w7zgUQnlLRtZyn+MM7vdlydq/u4XSGPGgSA="; cargoBuildFlags = [ "--package=clorinde" ]; diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix index 079f2c5f9855..bf1e12619bca 100644 --- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix +++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "cloudflare-dynamic-dns"; - version = "4.3.14"; + version = "4.3.15"; src = fetchFromGitHub { owner = "zebradil"; repo = "cloudflare-dynamic-dns"; tag = version; - hash = "sha256-inxDeATTu2nbKUQ1hUMuVE4Pnn9nY74HnjMg56n5tCg="; + hash = "sha256-COGGHvl6MlRd3mdQYmkMAw6J+G+usC10LHtoFGqzaXQ="; }; - vendorHash = "sha256-i/hPoBurDv/ya7JCnpmx3NHVcNzakdM65DDueBr5Hh4="; + vendorHash = "sha256-l/V1L2tsSD1aVXdJf+Kx9fsZjYqBZ3XDgWiUN6l+nE4="; subPackages = "."; diff --git a/pkgs/by-name/de/decasify/package.nix b/pkgs/by-name/de/decasify/package.nix index c45c48185103..e45007c8879e 100644 --- a/pkgs/by-name/de/decasify/package.nix +++ b/pkgs/by-name/de/decasify/package.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-HTUAb/yL3H4B/n/Ecd/fDpnTYiqwco/E07sa6pFIIU4="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; + dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-bD8MYufI87j//7dIAnCzmp4yoOaT81Zv1i7rjWpjPlc="; + hash = "sha256-TywF5nh3ptA4a/wUSlSd7fzcuX4cA2OHT1MbcnjfMq0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/distrobox/package.nix b/pkgs/by-name/di/distrobox/package.nix index cac3dd04da6b..74b87fda311c 100644 --- a/pkgs/by-name/di/distrobox/package.nix +++ b/pkgs/by-name/di/distrobox/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "distrobox"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "89luca89"; repo = "distrobox"; rev = finalAttrs.version; - hash = "sha256-e9oSTk+UlkrkRSipqjjMqwtxEvEZffVBmlSTmsIT7cU="; + hash = "sha256-SwSb3UETvimRtbcmD9f6A57MpnHP6p9trW+OBQW5ZyY="; }; dontConfigure = true; diff --git a/pkgs/by-name/ea/easyeffects/0001-Revert-Merge-pull-request-3340-from-violetmage-viole.patch b/pkgs/by-name/ea/easyeffects/0001-Revert-Merge-pull-request-3340-from-violetmage-viole.patch deleted file mode 100644 index e67e1bcf2c19..000000000000 --- a/pkgs/by-name/ea/easyeffects/0001-Revert-Merge-pull-request-3340-from-violetmage-viole.patch +++ /dev/null @@ -1,229 +0,0 @@ -From a2f524ffe163e1a15dc8a4b6f21964092ec8e0a7 Mon Sep 17 00:00:00 2001 -From: Sofi -Date: Sat, 28 Sep 2024 00:31:11 +0200 -Subject: [PATCH] Revert "Merge pull request #3340 from - violetmage/violetmage-spectrum-avsync" - -This reverts commit d40ff638e2f0db00579e1f30a9880b7d35f137fd, reversing -changes made to ee0fe4a8da57ef84a39600ad02280ddc98d9de31. ---- - ...thub.wwmm.easyeffects.spectrum.gschema.xml | 5 -- - data/ui/preferences_spectrum.ui | 21 ----- - include/spectrum.hpp | 5 -- - src/preferences_spectrum.cpp | 7 +- - src/spectrum.cpp | 86 +++---------------- - 5 files changed, 14 insertions(+), 110 deletions(-) - -diff --git a/data/schemas/com.github.wwmm.easyeffects.spectrum.gschema.xml b/data/schemas/com.github.wwmm.easyeffects.spectrum.gschema.xml -index 340da382e..1260810f3 100644 ---- a/data/schemas/com.github.wwmm.easyeffects.spectrum.gschema.xml -+++ b/data/schemas/com.github.wwmm.easyeffects.spectrum.gschema.xml -@@ -49,10 +49,5 @@ - - 20000 - -- -- -- -- 0 -- - - -\ No newline at end of file -diff --git a/data/ui/preferences_spectrum.ui b/data/ui/preferences_spectrum.ui -index 2eae7b8ab..97535d518 100644 ---- a/data/ui/preferences_spectrum.ui -+++ b/data/ui/preferences_spectrum.ui -@@ -18,27 +18,6 @@ - - - -- -- -- -- Compensating Delay (ms) -- -- -- -- center -- 0 -- -- -- 0 -- 1000 -- 1 -- 10 -- -- -- -- -- -- - - - -diff --git a/include/spectrum.hpp b/include/spectrum.hpp -index 546ceec59..af49dd9e5 100644 ---- a/include/spectrum.hpp -+++ b/include/spectrum.hpp -@@ -65,11 +65,6 @@ class Spectrum : public PluginBase { - - std::array real_input; - std::array output; -- -- std::vector left_delayed_vector; -- std::vector right_delayed_vector; -- std::span left_delayed; -- std::span right_delayed; - - std::array latest_samples_mono; - -diff --git a/src/preferences_spectrum.cpp b/src/preferences_spectrum.cpp -index 2902a8ee4..151960bef 100644 ---- a/src/preferences_spectrum.cpp -+++ b/src/preferences_spectrum.cpp -@@ -49,7 +49,7 @@ struct _PreferencesSpectrum { - - GtkDropDown* type; - -- GtkSpinButton *n_points, *height, *line_width, *minimum_frequency, *maximum_frequency, *avsync_delay; -+ GtkSpinButton *n_points, *height, *line_width, *minimum_frequency, *maximum_frequency; - - GSettings* settings; - -@@ -119,7 +119,6 @@ void preferences_spectrum_class_init(PreferencesSpectrumClass* klass) { - gtk_widget_class_bind_template_child(widget_class, PreferencesSpectrum, axis_color_button); - gtk_widget_class_bind_template_child(widget_class, PreferencesSpectrum, minimum_frequency); - gtk_widget_class_bind_template_child(widget_class, PreferencesSpectrum, maximum_frequency); -- gtk_widget_class_bind_template_child(widget_class, PreferencesSpectrum, avsync_delay); - - gtk_widget_class_bind_template_callback(widget_class, on_spectrum_color_set); - gtk_widget_class_bind_template_callback(widget_class, on_spectrum_axis_color_set); -@@ -193,9 +192,9 @@ void preferences_spectrum_init(PreferencesSpectrum* self) { - // spectrum section gsettings bindings - - gsettings_bind_widgets<"show", "fill", "rounded-corners", "show-bar-border", "dynamic-y-scale", "n-points", "height", -- "line-width", "minimum-frequency", "maximum-frequency", "avsync-delay">( -+ "line-width", "minimum-frequency", "maximum-frequency">( - self->settings, self->show, self->fill, self->rounded_corners, self->show_bar_border, self->dynamic_y_scale, -- self->n_points, self->height, self->line_width, self->minimum_frequency, self->maximum_frequency, self->avsync_delay); -+ self->n_points, self->height, self->line_width, self->minimum_frequency, self->maximum_frequency); - - ui::gsettings_bind_enum_to_combo_widget(self->settings, "type", self->type); - -diff --git a/src/spectrum.cpp b/src/spectrum.cpp -index 28f7ff4da..1075a358f 100644 ---- a/src/spectrum.cpp -+++ b/src/spectrum.cpp -@@ -55,30 +55,6 @@ Spectrum::Spectrum(const std::string& tag, - - plan = fftwf_plan_dft_r2c_1d(static_cast(n_bands), real_input.data(), complex_output, FFTW_ESTIMATE); - -- -- -- lv2_wrapper = std::make_unique("http://lsp-plug.in/plugins/lv2/comp_delay_x2_stereo"); -- -- package_installed = lv2_wrapper->found_plugin; -- -- if (!package_installed) { -- util::debug(log_tag + "http://lsp-plug.in/plugins/lv2/comp_delay_x2_stereo is not installed, spectrum will not have A/V sync compensation"); -- } -- -- lv2_wrapper->set_control_port_value("mode_l", 2); -- lv2_wrapper->set_control_port_value("mode_r", 2); -- -- lv2_wrapper->set_control_port_value("dry_l", 0.0F); -- lv2_wrapper->set_control_port_value("dry_r", 0.0F); -- -- lv2_wrapper->set_control_port_value("wet_l", static_cast(util::db_to_linear(0.0F))); -- lv2_wrapper->set_control_port_value("wet_r", static_cast(util::db_to_linear(0.0F))); -- -- lv2_wrapper->bind_key_int<"time_l", "avsync-delay">(settings); -- lv2_wrapper->bind_key_int<"time_r", "avsync-delay">(settings); -- -- -- - g_signal_connect(settings, "changed::show", G_CALLBACK(+[](GSettings* settings, char* key, gpointer user_data) { - auto* self = static_cast(user_data); - -@@ -106,19 +82,6 @@ Spectrum::~Spectrum() { - void Spectrum::setup() { - std::ranges::fill(real_input, 0.0F); - std::ranges::fill(latest_samples_mono, 0.0F); -- -- left_delayed_vector.resize(n_samples, 0.0F); -- right_delayed_vector.resize(n_samples, 0.0F); -- -- left_delayed = std::span(left_delayed_vector); -- right_delayed = std::span(right_delayed_vector); -- -- lv2_wrapper->set_n_samples(n_samples); -- -- if (lv2_wrapper->get_rate() != rate) { -- util::debug(log_tag + " creating instance of comp delay x2 stereo for spectrum A/V sync"); -- lv2_wrapper->create_instance(rate); -- } - } - - void Spectrum::process(std::span& left_in, -@@ -132,46 +95,19 @@ void Spectrum::process(std::span& left_in, - return; - } - -- // delay the visualization of the spectrum by the reported latency -- // of the output device, so that the spectrum is visually in sync -- // with the audio as experienced by the user. (A/V sync) -- if ( lv2_wrapper->found_plugin && lv2_wrapper->has_instance() ) { -- lv2_wrapper->connect_data_ports(left_in, right_in, left_delayed, right_delayed); -- lv2_wrapper->run(); -+ if (n_samples < n_bands) { -+ // Drop the oldest quantum. -+ std::memmove(&latest_samples_mono[0], &latest_samples_mono[n_samples], -+ (n_bands - n_samples) * sizeof(float)); - -- // Downmix the latest n_bands samples from the delayed signal. -- if (n_samples < n_bands) { -- // Drop the oldest quantum. -- std::memmove(&latest_samples_mono[0], &latest_samples_mono[n_samples], -- (n_bands - n_samples) * sizeof(float)); -- -- // Copy the new quantum. -- for (size_t n = 0; n < n_samples; n++) { -- latest_samples_mono[n_bands - n_samples + n] = 0.5F * (left_delayed[n] + right_delayed[n]); -- } -- } else { -- // Copy the latest n_bands samples. -- for (size_t n = 0; n < n_bands; n++) -- latest_samples_mono[n] = 0.5F * (left_delayed[n_samples - n_bands + n] + -- right_delayed[n_samples - n_bands + n]); -- } -+ // Copy the new quantum. -+ for (size_t n = 0; n < n_samples; n++) -+ latest_samples_mono[n_bands - n_samples + n] = 0.5F * (left_in[n] + right_in[n]); - } else { -- // Downmix the latest n_bands samples from the non-delayed signal. -- if (n_samples < n_bands) { -- // Drop the oldest quantum. -- std::memmove(&latest_samples_mono[0], &latest_samples_mono[n_samples], -- (n_bands - n_samples) * sizeof(float)); -- -- // Copy the new quantum. -- for (size_t n = 0; n < n_samples; n++) { -- latest_samples_mono[n_bands - n_samples + n] = 0.5F * (left_in[n] + right_in[n]); -- } -- } else { -- // Copy the latest n_bands samples. -- for (size_t n = 0; n < n_bands; n++) -- latest_samples_mono[n] = 0.5F * (left_in[n_samples - n_bands + n] + -- right_in[n_samples - n_bands + n]); -- } -+ // Copy the latest n_bands samples. -+ for (size_t n = 0; n < n_bands; n++) -+ latest_samples_mono[n] = 0.5F * (left_in[n_samples - n_bands + n] + -+ right_in[n_samples - n_bands + n]); - } - - /* --- -2.46.0 - diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index dabc47f19320..9cc27b35d31a 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -1,11 +1,11 @@ { lib, stdenv, - fetchFromGitHub, appstream-glib, calf, deepfilternet, desktop-file-utils, + fetchFromGitHub, fftw, fftwFloat, fmt_9, @@ -45,15 +45,16 @@ let # Fix crashes with speexdsp effects speexdsp' = speexdsp.override { withFftw3 = false; }; in + stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.1.9"; + version = "7.2.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; tag = "v${version}"; - hash = "sha256-It+kldlhThWF9y/rTgKt9QlIouH1cQcCtSHQTsaGjfo="; + hash = "sha256-bTyPStOQusIho8x6RI+2Z+4wHSG9ERjo4NuvLUILIm8="; }; nativeBuildInputs = [ @@ -102,6 +103,7 @@ stdenv.mkDerivation rec { mda_lv2 # loudness zam-plugins # maximizer ]; + ladspaPlugins = [ deepfilternet # deep noise remover rubberband # pitch shifting @@ -114,11 +116,6 @@ stdenv.mkDerivation rec { ) ''; - patches = [ - # Remove when lsp-plugins is >= 1.2.17. (https://github.com/wwmm/easyeffects/issues/3394) - ./0001-Revert-Merge-pull-request-3340-from-violetmage-viole.patch - ]; - separateDebugInfo = true; passthru = { diff --git a/pkgs/by-name/el/element-desktop/seshat/default.nix b/pkgs/by-name/el/element-desktop/seshat/default.nix index 5e3bb3f0aa07..cafc33f1eaf8 100644 --- a/pkgs/by-name/el/element-desktop/seshat/default.nix +++ b/pkgs/by-name/el/element-desktop/seshat/default.nix @@ -29,6 +29,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/seshat-node/native"; + useFetchCargoVendor = true; + nativeBuildInputs = [ nodejs python3 diff --git a/pkgs/by-name/el/element-desktop/seshat/pin.json b/pkgs/by-name/el/element-desktop/seshat/pin.json index f0648d11f2e0..aacdffa1ddd2 100644 --- a/pkgs/by-name/el/element-desktop/seshat/pin.json +++ b/pkgs/by-name/el/element-desktop/seshat/pin.json @@ -2,5 +2,5 @@ "version": "2.3.3", "srcHash": "sha256-HmKHWFoO8TQ9S/RcJnJ3h85/2uSkqGrgLnX82hkux4Q=", "yarnHash": "1cbkv8ap7f8vxl5brzqb86d2dyxg555sz67cldrp0vgnk8sq6ibp", - "cargoHash": "sha256-WsgTbQ91aZZV5sIuFVjsccdiXivjtAUC1Zs/4uNk1zU=" + "cargoHash": "sha256-klrFk0gpqQu/9MzLEYMNqEBETZMXtZJX67Sm5ZqyHfE==" } diff --git a/pkgs/by-name/el/elmerfem/package.nix b/pkgs/by-name/el/elmerfem/package.nix index 820781d98759..6c467fc19761 100644 --- a/pkgs/by-name/el/elmerfem/package.nix +++ b/pkgs/by-name/el/elmerfem/package.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { storepath = placeholder "out"; + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + cmakeFlags = [ "-DELMER_INSTALL_LIB_DIR=${storepath}/lib" "-DWITH_OpenMP:BOOLEAN=TRUE" diff --git a/pkgs/by-name/er/ergochat/package.nix b/pkgs/by-name/er/ergochat/package.nix index 9f2a004d6503..3a0de73fdf32 100644 --- a/pkgs/by-name/er/ergochat/package.nix +++ b/pkgs/by-name/er/ergochat/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ergo"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "ergochat"; repo = "ergo"; rev = "v${version}"; - sha256 = "sha256-vXspI0BkwpS9w7PQpj+U3REQcSPaPJAfIBRj62loQzQ="; + sha256 = "sha256-8qZ5pnbCYN/j8B5cS456HVK2hDGqJwrPo1k4oagJrqU="; }; vendorHash = null; diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index a276ded9f049..7e1681792dd1 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -3,25 +3,25 @@ "alpha": { "experimental": { "candidateHashFilenames": [ - "factorio_linux_2.0.28.tar.xz" + "factorio_linux_2.0.32.tar.xz" ], - "name": "factorio_alpha_x64-2.0.28.tar.xz", + "name": "factorio_alpha_x64-2.0.32.tar.xz", "needsAuth": true, - "sha256": "d3acf17e4ca56e3332e920a015d5ca53aea73088460c8b2f67e04b04e7b912bb", + "sha256": "4c3434986bbe7d10e02b742d36ecad36f13b7c125204bf2ad34f17b804cf611f", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.28/alpha/linux64", - "version": "2.0.28" + "url": "https://factorio.com/get-download/2.0.32/alpha/linux64", + "version": "2.0.32" }, "stable": { "candidateHashFilenames": [ - "factorio_linux_2.0.28.tar.xz" + "factorio_linux_2.0.32.tar.xz" ], - "name": "factorio_alpha_x64-2.0.28.tar.xz", + "name": "factorio_alpha_x64-2.0.32.tar.xz", "needsAuth": true, - "sha256": "d3acf17e4ca56e3332e920a015d5ca53aea73088460c8b2f67e04b04e7b912bb", + "sha256": "4c3434986bbe7d10e02b742d36ecad36f13b7c125204bf2ad34f17b804cf611f", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.28/alpha/linux64", - "version": "2.0.28" + "url": "https://factorio.com/get-download/2.0.32/alpha/linux64", + "version": "2.0.32" } }, "demo": { @@ -50,51 +50,51 @@ "expansion": { "experimental": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.28.tar.xz" + "factorio-space-age_linux_2.0.32.tar.xz" ], - "name": "factorio_expansion_x64-2.0.28.tar.xz", + "name": "factorio_expansion_x64-2.0.32.tar.xz", "needsAuth": true, - "sha256": "e3eee33c439abaffa305dd5c86edea97fbaa2a2b34c368cae3595c1d5d22739e", + "sha256": "51b1cad9d665015e200ea0f69619454ebf0f60557d1f78c857c4526dad2e3d77", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.28/expansion/linux64", - "version": "2.0.28" + "url": "https://factorio.com/get-download/2.0.32/expansion/linux64", + "version": "2.0.32" }, "stable": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.28.tar.xz" + "factorio-space-age_linux_2.0.32.tar.xz" ], - "name": "factorio_expansion_x64-2.0.28.tar.xz", + "name": "factorio_expansion_x64-2.0.32.tar.xz", "needsAuth": true, - "sha256": "e3eee33c439abaffa305dd5c86edea97fbaa2a2b34c368cae3595c1d5d22739e", + "sha256": "51b1cad9d665015e200ea0f69619454ebf0f60557d1f78c857c4526dad2e3d77", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.28/expansion/linux64", - "version": "2.0.28" + "url": "https://factorio.com/get-download/2.0.32/expansion/linux64", + "version": "2.0.32" } }, "headless": { "experimental": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.28.tar.xz", - "factorio_headless_x64_2.0.28.tar.xz" + "factorio-headless_linux_2.0.32.tar.xz", + "factorio_headless_x64_2.0.32.tar.xz" ], - "name": "factorio_headless_x64-2.0.28.tar.xz", + "name": "factorio_headless_x64-2.0.32.tar.xz", "needsAuth": false, - "sha256": "ea9937b6adc7a18e17a4e1e64992ec389407497b36e68280bb14fcdd4c884dd3", + "sha256": "2a6102ae42dcc5e8fe923bd68bcd326a569e35912acde121301e5d4d2d856417", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.28/headless/linux64", - "version": "2.0.28" + "url": "https://factorio.com/get-download/2.0.32/headless/linux64", + "version": "2.0.32" }, "stable": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.28.tar.xz", - "factorio_headless_x64_2.0.28.tar.xz" + "factorio-headless_linux_2.0.32.tar.xz", + "factorio_headless_x64_2.0.32.tar.xz" ], - "name": "factorio_headless_x64-2.0.28.tar.xz", + "name": "factorio_headless_x64-2.0.32.tar.xz", "needsAuth": false, - "sha256": "ea9937b6adc7a18e17a4e1e64992ec389407497b36e68280bb14fcdd4c884dd3", + "sha256": "2a6102ae42dcc5e8fe923bd68bcd326a569e35912acde121301e5d4d2d856417", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.28/headless/linux64", - "version": "2.0.28" + "url": "https://factorio.com/get-download/2.0.32/headless/linux64", + "version": "2.0.32" } } } diff --git a/pkgs/by-name/gg/gg-jj/native-tls.patch b/pkgs/by-name/gg/gg-jj/native-tls.patch new file mode 100644 index 000000000000..bcbd79fc812b --- /dev/null +++ b/pkgs/by-name/gg/gg-jj/native-tls.patch @@ -0,0 +1,351 @@ +diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock +index 37a1a2d..45640a1 100644 +--- a/src-tauri/Cargo.lock ++++ b/src-tauri/Cargo.lock +@@ -778,9 +778,9 @@ dependencies = [ + "bitflags 2.6.0", + "block", + "cocoa-foundation", +- "core-foundation", ++ "core-foundation 0.10.0", + "core-graphics", +- "foreign-types", ++ "foreign-types 0.5.0", + "libc", + "objc", + ] +@@ -793,7 +793,7 @@ checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" + dependencies = [ + "bitflags 2.6.0", + "block", +- "core-foundation", ++ "core-foundation 0.10.0", + "core-graphics-types", + "libc", + "objc", +@@ -873,6 +873,16 @@ dependencies = [ + "version_check", + ] + ++[[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" + version = "0.10.0" +@@ -896,9 +906,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" + dependencies = [ + "bitflags 2.6.0", +- "core-foundation", ++ "core-foundation 0.10.0", + "core-graphics-types", +- "foreign-types", ++ "foreign-types 0.5.0", + "libc", + ] + +@@ -909,7 +919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" + dependencies = [ + "bitflags 2.6.0", +- "core-foundation", ++ "core-foundation 0.10.0", + "libc", + ] + +@@ -1435,6 +1445,15 @@ version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++dependencies = [ ++ "foreign-types-shared 0.1.1", ++] ++ + [[package]] + name = "foreign-types" + version = "0.5.0" +@@ -1442,7 +1461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" + dependencies = [ + "foreign-types-macros", +- "foreign-types-shared", ++ "foreign-types-shared 0.3.1", + ] + + [[package]] +@@ -1456,6 +1475,12 @@ dependencies = [ + "syn 2.0.87", + ] + ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ + [[package]] + name = "foreign-types-shared" + version = "0.3.1" +@@ -2779,6 +2804,22 @@ dependencies = [ + "want", + ] + ++[[package]] ++name = "hyper-tls" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" ++dependencies = [ ++ "bytes", ++ "http-body-util", ++ "hyper", ++ "hyper-util", ++ "native-tls", ++ "tokio", ++ "tokio-native-tls", ++ "tower-service", ++] ++ + [[package]] + name = "hyper-util" + version = "0.1.10" +@@ -3418,9 +3459,9 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.163" ++version = "0.2.164" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1fdaeca4cf44ed4ac623e86ef41f056e848dbeab7ec043ecb7326ba300b36fd0" ++checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" + + [[package]] + name = "libgit2-sys" +@@ -3453,7 +3494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" + dependencies = [ + "cfg-if", +- "windows-targets 0.52.6", ++ "windows-targets 0.48.5", + ] + + [[package]] +@@ -3688,6 +3729,23 @@ dependencies = [ + "windows-sys 0.59.0", + ] + ++[[package]] ++name = "native-tls" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" ++dependencies = [ ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", ++] ++ + [[package]] + name = "ndk" + version = "0.9.0" +@@ -4065,6 +4123,32 @@ dependencies = [ + "pathdiff", + ] + ++[[package]] ++name = "openssl" ++version = "0.10.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f5e534d133a060a3c19daec1eb3e98ec6f4685978834f2dbadfe2ec215bab64e" ++dependencies = [ ++ "bitflags 2.6.0", ++ "cfg-if", ++ "foreign-types 0.3.2", ++ "libc", ++ "once_cell", ++ "openssl-macros", ++ "openssl-sys", ++] ++ ++[[package]] ++name = "openssl-macros" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.87", ++] ++ + [[package]] + name = "openssl-probe" + version = "0.1.5" +@@ -4854,19 +4938,23 @@ dependencies = [ + "http-body", + "http-body-util", + "hyper", ++ "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", ++ "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", ++ "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", ++ "tokio-native-tls", + "tokio-util 0.7.12", + "tower-service", + "url", +@@ -5000,6 +5088,21 @@ dependencies = [ + "windows-sys 0.52.0", + ] + ++[[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.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" ++ + [[package]] + name = "rustversion" + version = "1.0.18" +@@ -5027,6 +5130,15 @@ version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "088c5d71572124929ea7549a8ce98e1a6fd33d0a38367b09027b382e67c033db" + ++[[package]] ++name = "schannel" ++version = "0.1.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" ++dependencies = [ ++ "windows-sys 0.59.0", ++] ++ + [[package]] + name = "schemars" + version = "0.8.21" +@@ -5089,6 +5201,29 @@ version = "4.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + ++[[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 0.9.4", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "2.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ + [[package]] + name = "selectors" + version = "0.22.0" +@@ -5436,7 +5571,7 @@ dependencies = [ + "bytemuck", + "cfg_aliases", + "core-graphics", +- "foreign-types", ++ "foreign-types 0.5.0", + "js-sys", + "log", + "objc2", +@@ -5631,7 +5766,7 @@ checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da" + dependencies = [ + "bitflags 2.6.0", + "cocoa", +- "core-foundation", ++ "core-foundation 0.10.0", + "core-graphics", + "crossbeam-channel", + "dispatch", +@@ -6208,6 +6343,16 @@ dependencies = [ + "syn 2.0.87", + ] + ++[[package]] ++name = "tokio-native-tls" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" ++dependencies = [ ++ "native-tls", ++ "tokio", ++] ++ + [[package]] + name = "tokio-util" + version = "0.6.10" +@@ -7006,7 +7151,7 @@ version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" + dependencies = [ +- "windows-sys 0.59.0", ++ "windows-sys 0.48.0", + ] + + [[package]] +diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml +index 550b0cf..9b711a4 100644 +--- a/src-tauri/Cargo.toml ++++ b/src-tauri/Cargo.toml +@@ -14,7 +14,7 @@ zip = "0.6" + assert_matches = "1.5" + + [dependencies] +-tauri = { version = "2.0.0", features = [] } ++tauri = { version = "2.0.0", features = ["native-tls"] } + tauri-codegen = "2.0.0" + tauri-macros = "2.0.0" + tauri-plugin = "2.0.0" diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix index 2ac88766f92a..ff2c5240a4bc 100644 --- a/pkgs/by-name/gg/gg-jj/package.nix +++ b/pkgs/by-name/gg/gg-jj/package.nix @@ -32,22 +32,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-iQxPJgMxBtyindkNdQkehwPf7ZgWCI09PToqs2y1Hfw="; }; + patches = [ ./native-tls.patch ]; cargoRoot = "src-tauri"; buildAndTestSubdir = "src-tauri"; # FIXME: Switch back to cargoHash when https://github.com/NixOS/nixpkgs/issues/356811 is fixed cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) pname version src; + inherit (finalAttrs) + pname + version + src + patches + ; + # Tries to apply patches inside cargoRoot. + prePatch = "pushd .."; + postPatch = "popd"; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-IyU8dqtQbKcoymTOP01givB1968MUNas2znqsdbcqdw="; - - nativeBuildInputs = [ yq ]; - - # Work around https://github.com/rust-lang/cargo/issues/10801 - # See https://discourse.nixos.org/t/rust-tauri-v2-error-no-matching-package-found/56751/4 - preBuild = '' - tomlq -it '.dependencies.tauri.features += ["native-tls"]' Cargo.toml - ''; + hash = "sha256-zEYU5l57VxVKKhoGfa77kT05vwoLyAu9eyt7C9dhAGM="; }; npmDeps = fetchNpmDeps { diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index 37c89e4fb646..c34c432d37aa 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gh"; - version = "2.65.0"; + version = "2.66.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${version}"; - hash = "sha256-Rg6GAItG0OFDCK7rEuJs6i4QWHK3sveIh6UQVlA37mg="; + hash = "sha256-6IxXbi0vWb/AT64q5aZiV1wuz5viksXdxonLfJlu3y0="; }; - vendorHash = "sha256-MVjZUT1OEMAJZVsbCRg/ds57QgyiL9rLRfIo4HHHSmU="; + vendorHash = "sha256-gLFPr6b9zkkvmhcljnuB23MAMa9xELsUHtcP8xTfWFE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gh/ghostty/deps.nix b/pkgs/by-name/gh/ghostty/deps.nix index 4653a16a3153..fe2a11f4eef6 100644 --- a/pkgs/by-name/gh/ghostty/deps.nix +++ b/pkgs/by-name/gh/ghostty/deps.nix @@ -15,7 +15,10 @@ with lib; let unpackZigArtifact = - { name, artifact }: + { + name, + artifact, + }: runCommandLocal name { nativeBuildInputs = [ zig ]; @@ -89,11 +92,11 @@ let in linkFarm name [ { - name = "12206029de146b685739f69b10a6f08baee86b3d0a5f9a659fa2b2b66c9602078bbf"; + name = "1220ebf88622c4d502dc59e71347e4d28c47e033f11b59aff774ae5787565c40999c"; path = fetchZigArtifact { name = "libxev"; - url = "https://github.com/mitchellh/libxev/archive/db6a52bafadf00360e675fefa7926e8e6c0e9931.tar.gz"; - hash = "sha256-4GT5wkfkZnIjNv20yDiWEzHAhbIiwHHJfS7A4u/LoNQ="; + url = "https://github.com/mitchellh/libxev/archive/31eed4e337fed7b0149319e5cdbb62b848c24fbd.tar.gz"; + hash = "sha256-VHP90NTytIZ8UZsYRKOOxN490/I6yv6ec40sP8y5MJ8="; }; } { @@ -144,38 +147,6 @@ linkFarm name [ hash = "sha256-EhV2bmTY/OMYN1wEul35gD0hQgS/Al262jO3pVr0O+c="; }; } - { - name = "1220e17e64ef0ef561b3e4b9f3a96a2494285f2ec31c097721bf8c8677ec4415c634"; - path = fetchZigArtifact { - name = "zig_objc"; - url = "https://github.com/mitchellh/zig-objc/archive/9b8ba849b0f58fe207ecd6ab7c147af55b17556e.tar.gz"; - hash = "sha256-H+HIbh2T23uzrsg9/1/vl9Ir1HCAa2pzeTx6zktJH9Q="; - }; - } - { - name = "12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc"; - path = fetchZigArtifact { - name = "zig_js"; - url = "https://github.com/mitchellh/zig-js/archive/d0b8b0a57c52fbc89f9d9fecba75ca29da7dd7d1.tar.gz"; - hash = "sha256-fyNeCVbC9UAaKJY6JhAZlT0A479M/AKYMPIWEZbDWD0="; - }; - } - { - name = "12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25"; - path = fetchZigArtifact { - name = "ziglyph"; - url = "https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz"; - hash = "sha256-cse98+Ft8QUjX+P88yyYfaxJOJGQ9M7Ymw7jFxDz89k="; - }; - } - { - name = "1220cc25b537556a42b0948437c791214c229efb78b551c80b1e9b18d70bf0498620"; - path = fetchZigArtifact { - name = "iterm2_themes"; - url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/e030599a6a6e19fcd1ea047c7714021170129d56.tar.gz"; - hash = "sha256-hFGjD0rNfZ7Qd7uJZgVn+FmIVXunbjLT+E1BoXhXoJE="; - }; - } { name = "12200df4ebeaed45de26cb2c9f3b6f3746d8013b604e035dae658f86f586c8c91d2f"; path = fetchZigArtifact { @@ -200,6 +171,46 @@ linkFarm name [ hash = "sha256-2x9hT7bYq9KJYWLVOf21a+QvTG/F7HWT+YK15IMRzNY="; }; } + { + name = "12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a"; + path = fetchZigArtifact { + name = "z2d"; + url = "git+https://github.com/vancluever/z2d?ref=v0.4.0#4638bb02a9dc41cc2fb811f092811f6a951c752a"; + hash = "sha256-YpWXn1J3JKQSCrWB25mAfzd1/T56QstEZnhPzBwxgoM="; + }; + } + { + name = "1220e17e64ef0ef561b3e4b9f3a96a2494285f2ec31c097721bf8c8677ec4415c634"; + path = fetchZigArtifact { + name = "zig_objc"; + url = "https://github.com/mitchellh/zig-objc/archive/9b8ba849b0f58fe207ecd6ab7c147af55b17556e.tar.gz"; + hash = "sha256-H+HIbh2T23uzrsg9/1/vl9Ir1HCAa2pzeTx6zktJH9Q="; + }; + } + { + name = "12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc"; + path = fetchZigArtifact { + name = "zig_js"; + url = "https://github.com/mitchellh/zig-js/archive/d0b8b0a57c52fbc89f9d9fecba75ca29da7dd7d1.tar.gz"; + hash = "sha256-fyNeCVbC9UAaKJY6JhAZlT0A479M/AKYMPIWEZbDWD0="; + }; + } + { + name = "12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25"; + path = fetchZigArtifact { + name = "ziglyph"; + url = "https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz"; + hash = "sha256-cse98+Ft8QUjX+P88yyYfaxJOJGQ9M7Ymw7jFxDz89k="; + }; + } + { + name = "12209ca054cb1919fa276e328967f10b253f7537c4136eb48f3332b0f7cf661cad38"; + path = fetchZigArtifact { + name = "zig_wayland"; + url = "https://codeberg.org/ifreund/zig-wayland/archive/fbfe3b4ac0b472a27b1f1a67405436c58cbee12d.tar.gz"; + hash = "sha256-RtAystqK/GRYIquTK1KfD7rRSCrfuzAvCD1Z9DE1ldc="; + }; + } { name = "1220edc3b8d8bedbb50555947987e5e8e2f93871ca3c8e8d4cc8f1377c15b5dd35e8"; path = fetchZigArtifact { @@ -217,11 +228,35 @@ linkFarm name [ }; } { - name = "12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a"; + name = "12202cdac858abc52413a6c6711d5026d2d3c8e13f95ca2c327eade0736298bb021f"; path = fetchZigArtifact { - name = "z2d"; - url = "git+https://github.com/vancluever/z2d?ref=v0.4.0#4638bb02a9dc41cc2fb811f092811f6a951c752a"; - hash = "sha256-YpWXn1J3JKQSCrWB25mAfzd1/T56QstEZnhPzBwxgoM="; + name = "wayland"; + url = "https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz"; + hash = "sha256-m9G72jdG30KH2yQhNBcBJ46OnekzuX0i2uIOyczkpLk="; + }; + } + { + name = "12201a57c6ce0001aa034fa80fba3e1cd2253c560a45748f4f4dd21ff23b491cddef"; + path = fetchZigArtifact { + name = "wayland_protocols"; + url = "https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz"; + hash = "sha256-XO3K3egbdeYPI+XoO13SuOtO+5+Peb16NH0UiusFMPg="; + }; + } + { + name = "12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566"; + path = fetchZigArtifact { + name = "plasma_wayland_protocols"; + url = "git+https://github.com/KDE/plasma-wayland-protocols?ref=main#db525e8f9da548cffa2ac77618dd0fbe7f511b86"; + hash = "sha256-iWRv3+OfmHxmeCJ8m0ChjgZX6mwXlcFmK8P/Vt8gDj4="; + }; + } + { + name = "12204fc99743d8232e691ac22e058519bfc6ea92de4a11c6dba59b117531c847cd6a"; + path = fetchZigArtifact { + name = "iterm2_themes"; + url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/0e23daf59234fc892cba949562d7bf69204594bb.tar.gz"; + hash = "sha256-KswGCFqD1TOBkvaqtRcFOm96TbIqhqUEOg1u1ye/f0s="; }; } { @@ -321,11 +356,19 @@ linkFarm name [ }; } { - name = "12200984439edc817fbcbbaff564020e5104a0d04a2d0f53080700827052de700462"; + name = "122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd"; path = fetchZigArtifact { name = "wuffs"; - url = "https://github.com/google/wuffs/archive/refs/tags/v0.4.0-alpha.8.tar.gz"; - hash = "sha256-P3fpKYaiOpZffe2uNDkC43MFntV38Cl2XpHFF50r80Q="; + url = "https://github.com/google/wuffs/archive/refs/tags/v0.4.0-alpha.9.tar.gz"; + hash = "sha256-nkzSCr6W5sTG7enDBXEIhgEm574uLD41UVR2wlC+HBM="; + }; + } + { + name = "12207ff340169c7d40c570b4b6a97db614fe47e0d83b5801a932dcd44917424c8806"; + path = fetchZigArtifact { + name = "pixels"; + url = "git+https://github.com/make-github-pseudonymous-again/pixels?ref=main#d843c2714d32e15b48b8d7eeb480295af537f877"; + hash = "sha256-kXYGO0qn2PfyOYCrRA49BHIgTzdmKhI8SNO1ZKfUYEE="; }; } { diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index 2db4e3637f6c..d8462622da46 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ghostty"; - version = "1.0.1"; + version = "1.1.0"; outputs = [ "out" "man" @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ghostty-org"; repo = "ghostty"; tag = "v${finalAttrs.version}"; - hash = "sha256-BiXFNeoL+BYpiqzCuDIrZGQ6JVI8cBOXerJH48CbnxU="; + hash = "sha256-a2A/mt2xS19YEQB+cTPdew/a7xCnGWNvIOdO9QNqxm0="; }; deps = callPackage ./deps.nix { diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix index cecabf2a76e1..8df608c614fe 100644 --- a/pkgs/by-name/gi/git-lfs/package.nix +++ b/pkgs/by-name/gi/git-lfs/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "git-lfs"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "git-lfs"; repo = "git-lfs"; tag = "v${version}"; - hash = "sha256-PpNdbvtDAZDT43yyEkUvnhfUTAMM+mYImb3dVbAVPic="; + hash = "sha256-zZ9VYWVV+8G3gojj1m74syvsYM1mX0YT4hKnpkdMAQk="; }; vendorHash = "sha256-JT0r/hs7ZRtsYh4aXy+v8BjwiLvRJ10e4yRirqmWVW0="; diff --git a/pkgs/by-name/gi/git-warp-time/package.nix b/pkgs/by-name/gi/git-warp-time/package.nix index a4f19641adf0..e70059c509bd 100644 --- a/pkgs/by-name/gi/git-warp-time/package.nix +++ b/pkgs/by-name/gi/git-warp-time/package.nix @@ -24,10 +24,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-bt94Y1EIcLzz1v2Nwyde63y6FWD+iaFkoEYoQpWVWGY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; + dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-qUhMTuvli4hUyHrFWmyaB1Rc/DS9Epae9S/mp6c9LSw="; + hash = "sha256-FNt9spOFOSbOgpZnxLl3aIvU6lnIJHaVMoAKxl4lzhU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index df35284fc381..6847c1d82fda 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.23.2"; + version = "8.23.3"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; tag = "v${version}"; - hash = "sha256-lwjGoDMNRgYDHI+8IjOD8sWJMUgv/Bg3pUzrUrcYiR4="; + hash = "sha256-K1TjgpV6e3R5QJGglU47G/eNRDexIpPcy0x5+XmkqrQ="; }; vendorHash = "sha256-hq3v//fhCUOvKPBZ/+YrLIc4nDLxR9Yc+MeIXY7TArA="; diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index 2f54653f4a5d..bd9a740f73d4 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.14.12"; + version = "1.14.13"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - hash = "sha256-s1BSFTjqro3gFyKphU8FdpjViKyyZc0bt1m+lzkAcBU="; + hash = "sha256-oJe+V11WArXVmoIC7nYN6oKc0VoHtRtelidyb3v6skI="; }; proxyVendor = true; diff --git a/pkgs/by-name/ht/httplib/package.nix b/pkgs/by-name/ht/httplib/package.nix index caff7ad8ef27..b88b782a0cd4 100644 --- a/pkgs/by-name/ht/httplib/package.nix +++ b/pkgs/by-name/ht/httplib/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "httplib"; - version = "0.18.4"; + version = "0.18.5"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${finalAttrs.version}"; - hash = "sha256-gXtp59zEk98n+/+p2YPi91QYNne8ANp+2r2lc4AAQnU="; + hash = "sha256-d5b6WsqR9oTiWq9wED+7Ts0kjURutxAJVXbm1okNg8k="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/hy/hyprland-protocols/package.nix b/pkgs/by-name/hy/hyprland-protocols/package.nix index 814f3bd94857..68377ce31e3f 100644 --- a/pkgs/by-name/hy/hyprland-protocols/package.nix +++ b/pkgs/by-name/hy/hyprland-protocols/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprland-protocols"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-protocols"; rev = "v${finalAttrs.version}"; - hash = "sha256-mIQ3/axCZ4g8ySwWRbW4fJcyC9v55uAii3cqlJRtW8g="; + hash = "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 6ee11eef131f..5f0c800b27a1 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -64,6 +64,14 @@ gcc14Stdenv.mkDerivation (finalAttrs: { wayland-protocols ]; + # Install hyprlock config in location upstream looks + # https://github.com/hyprwm/hyprlock/blob/c976b6a1d135d3743556dc225c80e24918ef1fd5/src/config/ConfigManager.cpp#L185-L191 + # https://github.com/hyprwm/hyprutils/blob/6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab/src/path/Path.cpp#L71-L72 + postInstall = '' + mkdir -p $out/etc/xdg/hypr + ln -s $out/share/hypr/hyprlock.conf $out/etc/xdg/hypr/hyprlock.conf + ''; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index be53054ff9d6..7e2d317c5608 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.125.6", - "hash": "sha256-8rVpXo4pASKA5UTUGh3yHd5J7JPQe0kYOPQ/0hMED24=", + "version": "1.125.7", + "hash": "sha256-xXxLSfJgdBprDloJwjqLssux/M9+sOyyrzoqGp/dfOM=", "components": { "cli": { - "npmDepsHash": "sha256-DqyA/J90+PsjWiwXyGML0gJqYL8jBRR99SxoG0acxqY=", - "version": "2.2.47" + "npmDepsHash": "sha256-rAL+0GxC/GrgWwc5Z0hsJwInpQ/Afk+O2Pwz+I8vtk0=", + "version": "2.2.48" }, "server": { - "npmDepsHash": "sha256-4+G4mIxABb2Rr9HqbfzB2B7gwBLMlwZTDnH11Oi7kMc=", - "version": "1.125.6" + "npmDepsHash": "sha256-s20zBaB/uBDZe60OKtZkHte5AaYtsaKQtkObEl7SXDU=", + "version": "1.125.7" }, "web": { - "npmDepsHash": "sha256-iMFKWgYlCCdjGnnYx0vB5Vl4+d4ftPjPRenHQDPePSU=", - "version": "1.125.6" + "npmDepsHash": "sha256-1zwtrFcs7mW2wMIQSwPU/CT3XxHZoIeh5KC/vZEPL4E=", + "version": "1.125.7" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-nZTg6PmuMDqCFOoz+3INyRUMdbUKAqvkl+EHVkPZXoQ=", - "version": "1.125.6" + "npmDepsHash": "sha256-vjgalQXHOllSCkVAG6bm0jVM68V20WIFgV9L/mCkklU=", + "version": "1.125.7" }, "geonames": { - "timestamp": "20250128052059", - "hash": "sha256-QnDkaqJbOpaROXZRtr1nLJxtd70YULEuNqLlwgN/9lY=" + "timestamp": "20250129185843", + "hash": "sha256-poOvoBprzlEe4WDOdcO0TnIcwUp5xuKScumHMJ8YgO8=" } } } diff --git a/pkgs/by-name/is/isd/package.nix b/pkgs/by-name/is/isd/package.nix new file mode 100644 index 000000000000..5917238bdec1 --- /dev/null +++ b/pkgs/by-name/is/isd/package.nix @@ -0,0 +1,62 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + nix-update-script, +}: + +python3Packages.buildPythonApplication rec { + pname = "isd"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "isd-project"; + repo = "isd"; + tag = "v${version}"; + hash = "sha256-YOQoI9PB096C/wNF9y5nrXkpJGbO6cXQ2U6I2Ece2PM="; + }; + + build-system = with python3Packages; [ + hatchling + ]; + + dependencies = with python3Packages; [ + pfzy + pydantic + pydantic-settings + pyyaml + textual + types-pyyaml + xdg-base-dirs + ]; + + pythonRelaxDeps = [ + "pydantic" + "pydantic-settings" + "types-pyyaml" + ]; + + pythonImportsCheck = [ + "isd" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "TUI to interactively work with systemd units"; + longDescription = '' + isd (interactive systemd) is a TUI offering fuzzy search for systemd + units, auto-refreshing previews, smart `sudo` handling, and a fully + customizable interface for power-users and newcomers alike. + ''; + homepage = "https://github.com/isd-project/isd"; + changelog = "https://github.com/isd-project/isd/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + mainProgram = "isd"; + maintainers = with lib.maintainers; [ + gepbird + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/jb/jbig2enc/package.nix b/pkgs/by-name/jb/jbig2enc/package.nix index 6cb7ca15d17d..95b38a0a905a 100644 --- a/pkgs/by-name/jb/jbig2enc/package.nix +++ b/pkgs/by-name/jb/jbig2enc/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, leptonica, zlib, libwebp, @@ -10,18 +9,19 @@ libjpeg, libpng, libtiff, + python3, autoreconfHook, }: stdenv.mkDerivation rec { pname = "jbig2enc"; - version = "0.29"; + version = "0.30"; src = fetchFromGitHub { owner = "agl"; repo = "jbig2enc"; rev = version; - hash = "sha256-IAL4egXgaGmCilzcryjuvOoHhahyrfGWY68GBfXXgAM="; + hash = "sha256-B19l2NdMq+wWKQ5f/y5aoPiBtQnn6sqpaIoyIq+ugTg="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -34,20 +34,13 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff - ]; - - patches = [ - (fetchpatch { - name = "fix-build-leptonica-1.83.patch"; - url = "https://github.com/agl/jbig2enc/commit/ea050190466f5336c69c6a11baa1cb686677fcab.patch"; - hash = "sha256-+kScjFgDEU9F7VOUNAhm2XBjGm49fzAH8hYhmTm8xv8="; - }) + python3 ]; # We don't want to install this Python 2 script - postInstall = '' - rm "$out/bin/pdf.py" - ''; + #postInstall = '' + # rm "$out/bin/pdf.py" + #''; # This is necessary, because the resulting library has # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib diff --git a/pkgs/by-name/je/jellyfin-rpc/package.nix b/pkgs/by-name/je/jellyfin-rpc/package.nix index 43b0f9b2291c..67a7242fac58 100644 --- a/pkgs/by-name/je/jellyfin-rpc/package.nix +++ b/pkgs/by-name/je/jellyfin-rpc/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "jellyfin-rpc"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Radiicall"; repo = "jellyfin-rpc"; tag = version; - hash = "sha256-sr82lTOr6RUvYD0CVZMyyRAFjai1oLnRWIszuu7/jE0="; + hash = "sha256-cEHJJXMfXKDPKah2wDAdcO0SXO4ZPL/SqFbxONmI57M="; }; useFetchCargoVendor = true; - cargoHash = "sha256-fpd+KYKrKy6zS2YeNaUX5J+wtfzAiq7tMXRKSlZ9r7U="; + cargoHash = "sha256-CWl/hVtwv2Q4/GwJJGTHCxnMxj8ZR9wPmLTlai0MyBA="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/li/libargon2/package.nix b/pkgs/by-name/li/libargon2/package.nix index ca9049503dc7..0dbedc23577c 100644 --- a/pkgs/by-name/li/libargon2/package.nix +++ b/pkgs/by-name/li/libargon2/package.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "LIBRARIES=$(LIB_ST)" + "LINKED_LIB_EXT=" ]; meta = with lib; { diff --git a/pkgs/by-name/li/libnvidia-container/package.nix b/pkgs/by-name/li/libnvidia-container/package.nix index c4fe9a0da3ae..954e3f796d00 100644 --- a/pkgs/by-name/li/libnvidia-container/package.nix +++ b/pkgs/by-name/li/libnvidia-container/package.nix @@ -101,6 +101,15 @@ stdenv.mkDerivation rec { --replace-fail ldconfig true ''; + # Recreate library symlinks which ldconfig would have created + postFixup = '' + for lib in libnvidia-container libnvidia-container-go; do + rm -f "$out/lib/$lib.so" + ln -s "$out/lib/$lib.so.${version}" "$out/lib/$lib.so.1" + ln -s "$out/lib/$lib.so.1" "$out/lib/$lib.so" + done + ''; + enableParallelBuilding = true; preBuild = '' diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix index 5a5dee9255d3..29f575863fbe 100644 --- a/pkgs/by-name/li/libxls/package.nix +++ b/pkgs/by-name/li/libxls/package.nix @@ -9,23 +9,15 @@ stdenv.mkDerivation rec { pname = "libxls"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "libxls"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vjmYByk+IDBon8xGR1+oNaEQTiJK+IVpDXsG1IyVNoY="; + hash = "sha256-KbITHQ9s2RUeo8zR53R9s4WUM6z8zzddz1k47So0Mlw="; }; - patches = [ - # Fix cross-compilation - (fetchpatch { - url = "https://github.com/libxls/libxls/commit/007e63c1f5e19bc73292f267c85d7dd14e9ecb38.patch"; - sha256 = "sha256-PjPHuXth4Yaq9nVfk5MYJMRo5B0R6YA1KEqgwfjF3PM="; - }) - ]; - nativeBuildInputs = [ autoreconfHook autoconf-archive @@ -40,13 +32,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbradar ]; mainProgram = "xls2csv"; platforms = platforms.unix; - knownVulnerabilities = [ - "CVE-2023-38851" - "CVE-2023-38852" - "CVE-2023-38853" - "CVE-2023-38854" - "CVE-2023-38855" - "CVE-2023-38856" - ]; }; } diff --git a/pkgs/by-name/li/licensor/package.nix b/pkgs/by-name/li/licensor/package.nix deleted file mode 100644 index 0e69041844e1..000000000000 --- a/pkgs/by-name/li/licensor/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "licensor"; - version = "unstable-2021-02-03"; - - src = fetchFromGitHub { - owner = "raftario"; - repo = pname; - rev = "1897882a708ec6ed65a9569ae0e07d6ea576c652"; - sha256 = "0x0lkfrj7jka0p6nx6i9syz0bnzya5z9np9cw09zm1c9njv9mm32"; - }; - - cargoHash = "sha256-gEOMOb2VRx0cFnzmfKBh9W1FoI4Nr7/PW4GQnldoxsA="; - - # https://github.com/raftario/licensor/issues/67 - postPatch = '' - sed "/Copyright (c) 2021/s/2021/$(date +%Y)/" -i tests/integration.rs - ''; - - meta = with lib; { - description = "Write licenses to stdout"; - homepage = "https://github.com/raftario/licensor"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; - mainProgram = "licensor"; - }; -} diff --git a/pkgs/by-name/lp/lpac/lpac-version.patch b/pkgs/by-name/lp/lpac/lpac-version.patch new file mode 100644 index 000000000000..880bffdde934 --- /dev/null +++ b/pkgs/by-name/lp/lpac/lpac-version.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/git-version.cmake b/cmake/git-version.cmake +index be226fd..1451ff6 100644 +--- a/cmake/git-version.cmake ++++ b/cmake/git-version.cmake +@@ -15,6 +15,8 @@ if(GIT_EXECUTABLE) + endif() + endif() + ++set(LPAC_VERSION "$ENV{LPAC_VERSION}") ++ + # Final fallback: Just use a bogus version string that is semantically older + # than anything else and spit out a warning to the developer. + if(NOT DEFINED LPAC_VERSION) diff --git a/pkgs/by-name/lp/lpac/package.nix b/pkgs/by-name/lp/lpac/package.nix new file mode 100644 index 000000000000..630ba90a31ab --- /dev/null +++ b/pkgs/by-name/lp/lpac/package.nix @@ -0,0 +1,59 @@ +{ + stdenv, + fetchFromGitHub, + lib, + cmake, + pkg-config, + pcsclite, + curl, + withDrivers ? true, + withLibeuicc ? true, + nix-update-script, +}: + +let + inherit (lib) optional; +in +stdenv.mkDerivation (finalAttrs: { + + pname = "lpac"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "estkme-group"; + repo = "lpac"; + tag = "v${finalAttrs.version}"; + hash = "sha256-dxoYuX3dNj4piXQBqU4w1ICeyOGid35c+6ZITQiN6wA="; + }; + + env.LPAC_VERSION = finalAttrs.version; + + patches = [ ./lpac-version.patch ]; + + cmakeFlags = + optional withDrivers "-DLPAC_DYNAMIC_DRIVERS=on" + ++ optional withLibeuicc "-DLPAC_DYNAMIC_LIBEUICC=on"; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + curl + pcsclite + ]; + + passthru = { + updateScript = nix-update-script { attrPath = finalAttrs.pname; }; + }; + + meta = { + description = "C-based eUICC LPA"; + homepage = "https://github.com/estkme-group/lpac"; + mainProgram = "lpac"; + license = [ lib.licenses.agpl3Plus ] ++ optional withLibeuicc lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ sarcasticadmin ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/by-name/ls/lsp-plugins/package.nix similarity index 72% rename from pkgs/applications/audio/lsp-plugins/default.nix rename to pkgs/by-name/ls/lsp-plugins/package.nix index 89cbd99851d8..02a3f8f0b6b9 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/by-name/ls/lsp-plugins/package.nix @@ -1,28 +1,27 @@ { lib, stdenv, - fetchurl, - pkg-config, - makeWrapper, - libsndfile, - jack2, - libGLU, - libGL, - lv2, cairo, + fetchurl, + gst_all_1, + jack2, ladspaH, - php, + libGL, + libGLU, libXrandr, + libsndfile, + lv2, + php82, + pkg-config, }: -stdenv.mkDerivation rec { - pname = "lsp-plugins"; - version = "1.2.16"; +let + php = php82; +in - src = fetchurl { - url = "https://github.com/lsp-plugins/lsp-plugins/releases/download/${version}/lsp-plugins-src-${version}.tar.gz"; - sha256 = "sha256-w2BUIF44z78syLroQk2asVXA5bt9P9POiuwxpnlkc8o="; - }; +stdenv.mkDerivation (finalAttrs: { + pname = "lsp-plugins"; + version = "1.2.20"; outputs = [ "out" @@ -30,39 +29,57 @@ stdenv.mkDerivation rec { "doc" ]; + src = fetchurl { + url = "https://github.com/lsp-plugins/lsp-plugins/releases/download/${finalAttrs.version}/lsp-plugins-src-${finalAttrs.version}.tar.gz"; + hash = "sha256-yohg3Ka/see8q6NCwVPl/F06AlyR22akQz43gp+1kck="; + }; + + # By default, GStreamer plugins are installed right alongside GStreamer itself + # We can't do that in Nixpkgs, so lets install it to $out/lib like other plugins + postPatch = '' + substituteInPlace modules/lsp-plugin-fw/src/Makefile \ + --replace-fail '$(shell pkg-config --variable=pluginsdir gstreamer-1.0)' '$(LIBDIR)/gstreamer-1.0' + ''; + nativeBuildInputs = [ + php pkg-config - (php.withExtensions (_: [ ])) - makeWrapper ]; + buildInputs = [ - jack2 - libsndfile - libGLU - libGL - lv2 cairo + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + jack2 ladspaH + libGL + libGLU libXrandr + libsndfile + lv2 ]; makeFlags = [ - "PREFIX=${placeholder "out"}" "ETCDIR=${placeholder "out"}/etc" + "PREFIX=${placeholder "out"}" "SHAREDDIR=${placeholder "out"}/share" ]; env.NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; configurePhase = '' - make config PREFIX=${placeholder "out"} + runHook preConfigure + + make $makeFlags config + + runHook postConfigure ''; doCheck = true; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Collection of open-source audio plugins"; longDescription = '' Compatible with the following formats: @@ -123,11 +140,12 @@ stdenv.mkDerivation rec { - Trigger ''; homepage = "https://lsp-plug.in"; - maintainers = with maintainers; [ + changelog = "https://github.com/lsp-plugins/lsp-plugins/releases/tag/${finalAttrs.version}"; + maintainers = with lib.maintainers; [ magnetophon PowerUser64 ]; - license = licenses.gpl2; - platforms = platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/lu/luci-go/package.nix b/pkgs/by-name/lu/luci-go/package.nix new file mode 100644 index 000000000000..b48f09c251ea --- /dev/null +++ b/pkgs/by-name/lu/luci-go/package.nix @@ -0,0 +1,50 @@ +{ + buildGoModule, + fetchFromGitiles, + lib, +}: +let + commit = "500493c154652d6986a34b341e98df244ae1ad0d"; + git-repo = "https://chromium.googlesource.com/infra/luci/luci-go"; +in +buildGoModule { + pname = "luci-go"; + version = "0-unstable-2024-10-31"; + + src = fetchFromGitiles { + url = git-repo; + rev = commit; + hash = "sha256-HP4Aizt5FJA3IAlqs7gylw8/xUbBwsmReGaR8jIkmrk="; + }; + + vendorHash = "sha256-FMqbEls6MivPeReZTADrfcAvxo8o0Gy7bq9xG6WN38k="; + + checkFlags = + let + skippedTests = [ + # require network access + "TestDownloadInputs" + "TestInstallCipd" + "TestIsLocalAddr" + "TestGenerateSignedURL" + + # require filesystem access + "TestPythonBasic" + "TestPythonFromPath" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + meta = { + description = "LUCI services and tools in Go"; + longDescription = '' + LUCI services and tools in Go. This is part of Chromium infra and + provides facilities useful for packaging software from the Chromium + ecosystem. + ''; + homepage = "${git-repo}/"; + changelog = "${git-repo}/+log?s=${commit}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ gm6k ]; + }; +} diff --git a/pkgs/by-name/ma/makeBinaryWrapper/package.nix b/pkgs/by-name/ma/makeBinaryWrapper/package.nix index 23a8445c9af7..3ee645ad91f8 100644 --- a/pkgs/by-name/ma/makeBinaryWrapper/package.nix +++ b/pkgs/by-name/ma/makeBinaryWrapper/package.nix @@ -16,6 +16,9 @@ makeSetupHook { substitutions = { cc = "${cc}/bin/${cc.targetPrefix}cc ${ lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers) + + lib.optionalString ( + cc.isClang && !cc.stdenv.hostPlatform.isDarwin + ) "--ld-path=${cc.targetPrefix}ld" }"; }; diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index 3b3b2674c756..fd8662ec8a8c 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -11,8 +11,8 @@ mattermost.override { # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(10\\.[0-9]+\\.[0-9]+)$"; - version = "10.4.1"; - srcHash = "sha256-e7uT30tWhJpEQzlcDUY2huFcupDbe4l8B19Dgub2pg0="; + version = "10.4.2"; + srcHash = "sha256-R/LiExICunQeL7UPeqjKhMvCHMdibcPTnpTbGYQnbgI="; vendorHash = "sha256-AcemUxcBoytE/ZoXqaIlxkzAnmGV/C1laDqziMuE+XE="; npmDepsHash = "sha256-HABPwdhtev9DZLhWJQsyU4g2ZueYgsX+tUduMsc74YY="; lockfileOverlay = '' diff --git a/pkgs/by-name/me/memtier-benchmark/package.nix b/pkgs/by-name/me/memtier-benchmark/package.nix index 285aa85dc32d..9b3df51ff0ad 100644 --- a/pkgs/by-name/me/memtier-benchmark/package.nix +++ b/pkgs/by-name/me/memtier-benchmark/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "memtier-benchmark"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "redislabs"; repo = "memtier_benchmark"; tag = version; - sha256 = "sha256-3q+NOdmbOiRq+pUxy3d1UdpUxHsv2XfnScDIfB+xyhk="; + sha256 = "sha256-dZUJjilfzl8u/KdBS1iKaAwOXWYAIMDi55ZAYtyuuOI="; }; patchPhase = '' diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index e06b45b25df4..ad8c3a098eeb 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,13 +1,13 @@ { - "version": "3.129.0", + "version": "3.131.2", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.129.0/mirrord_linux_x86_64", - "hash": "sha256-kvyofs+kBXVJewdjloV/uwR8TMU3jhUbMF+wl7uyl/0=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_linux_x86_64", + "hash": "sha256-S5esVEqssMZJdxlR8MMVgMbsZkgewD69cNT/lI1LerE=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.129.0/mirrord_linux_aarch64", - "hash": "sha256-Lk5s2puKkz4hK0I2aQJzfQ5w66ERUtCK1plO52f2OZQ=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_linux_aarch64", + "hash": "sha256-2SC/6Q43AhUjx2i3kwCLHIMEnxp23qbUuFXYKZBLin8=" } } } diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index 6ba43eb79534..0987a312b2a6 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "muffet"; - version = "2.10.6"; + version = "2.10.7"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; rev = "v${version}"; - hash = "sha256-9dra/LhtSIWN2pjNEJMITz/GzyWRtXTyQBqBxRhjARc="; + hash = "sha256-txIH3FqKQ6IWN19aABmLAJicmXi6NK7VpH6NDMtAGUE="; }; - vendorHash = "sha256-MYU8zgqI05oBep/dehs59S3JcrThrgLEzIgrIr/Tr4Y="; + vendorHash = "sha256-IbpTQdJ6OssyzwS2H4iNgJybC9rvvlW6UYkihNkBYOE="; meta = with lib; { description = "Website link checker which scrapes and inspects all pages in a website recursively"; diff --git a/pkgs/by-name/my/mysql-workbench/package.nix b/pkgs/by-name/my/mysql-workbench/package.nix index bffefc955f02..e06cb8f4ac51 100644 --- a/pkgs/by-name/my/mysql-workbench/package.nix +++ b/pkgs/by-name/my/mysql-workbench/package.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mysql-workbench"; - version = "8.0.40"; + version = "8.0.41"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-/CrjHgZ3IFFvUB1IxeURme8Z6BoZx0b03MWk8QCe0Sg="; + hash = "sha256-H/u1nwizZ9pCEu9JPXRcKshxjvc/efcZ//6ankHcGGk="; }; patches = [ diff --git a/pkgs/by-name/na/nautilus-python/package.nix b/pkgs/by-name/na/nautilus-python/package.nix index ccc6f2d23e5e..565a188dd582 100644 --- a/pkgs/by-name/na/nautilus-python/package.nix +++ b/pkgs/by-name/na/nautilus-python/package.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc docbook-xsl-nons docbook_xml_dtd_412 + python3.pythonOnBuildForHost ]; buildInputs = [ diff --git a/pkgs/by-name/ne/netbox2netshot/package.nix b/pkgs/by-name/ne/netbox2netshot/package.nix index 0f15acef6e90..96d1bbb78e00 100644 --- a/pkgs/by-name/ne/netbox2netshot/package.nix +++ b/pkgs/by-name/ne/netbox2netshot/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "netbox2netshot"; - version = "0.1.13"; + version = "0.2.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "netbox2netshot"; rev = version; - hash = "sha256-zi/on31uYSW3XhIZzKMkxIj0QZxUzoOcpRR8w5LFH90="; + hash = "sha256-4Leg7MaLSos2RjmxB6yVzxGju6OzNrChXdw5htppuZU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/tvRITLa6O0zNM5eNORN2eaDUrrT/ds87phzFz2WcX8="; + cargoHash = "sha256-XjHOlpYSOwSXxbGp/xZVVcBGhprg4hh61L5dhVE5ODM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/nn/nng/package.nix b/pkgs/by-name/nn/nng/package.nix index 2dcac6e869b7..18ee8629de75 100644 --- a/pkgs/by-name/nn/nng/package.nix +++ b/pkgs/by-name/nn/nng/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.10"; + version = "1.10.1"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-HQQx65itnDPX/luN2JtU03R7o+jzmGXJPOh4ffodxzA="; + hash = "sha256-BBYfJ2j2IQkbluR3HQjEh1zFWPgOVX6kfyI0jG741Y4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/notion-app/info.json b/pkgs/by-name/no/notion-app/info.json index 20ea51f293f2..9b8664d7a88c 100644 --- a/pkgs/by-name/no/notion-app/info.json +++ b/pkgs/by-name/no/notion-app/info.json @@ -1,12 +1,12 @@ { "x86_64-darwin": { - "version": "4.2.0", - "url": "https://desktop-release.notion-static.com/Notion-4.2.0.zip", - "hash": "sha512-FLptPNEtS9fTevSeGC00hDtpgSks+8JtEKRTtWlYPtI0vpA1KqixBdv2OaNSK1W7Krlsl25RpTOl8cJdQxcv4Q==" + "version": "4.3.0", + "url": "https://desktop-release.notion-static.com/Notion-4.3.0.zip", + "hash": "sha512-shh85dNtzDrUGXbjODdtxpDlgQlF76a/PWDiuLrbx/GUn5xTVZkCCfTGEkSBInfjzJ0Z4iNJ/WlAXPvTGFJLiw==" }, "aarch64-darwin": { - "version": "4.2.0", - "url": "https://desktop-release.notion-static.com/Notion-arm64-4.2.0.zip", - "hash": "sha512-cxfO3Bm7ZzAQMi0Pdwd3nvQlRPjn4w7j0ojYUCcn660YsBtoVkpNhiuqg9pbWzY0Umh+/8Zig9CGXKjjP94Iww==" + "version": "4.3.0", + "url": "https://desktop-release.notion-static.com/Notion-arm64-4.3.0.zip", + "hash": "sha512-LcHKB1nVc2VnfrtLKlkBfxlFvTTIlACIazNOMr4ZjHj8N7Trg1oai5wdH/sA+mKFhHiWH5fzHk8QIuCLwjMK4A==" } } diff --git a/pkgs/by-name/ny/nyan/package.nix b/pkgs/by-name/ny/nyan/package.nix new file mode 100644 index 000000000000..be3b8891c96a --- /dev/null +++ b/pkgs/by-name/ny/nyan/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + clang, + cmake, + flex, + nix-update-script, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nyan"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "SFTtech"; + repo = "nyan"; + tag = "v${finalAttrs.version}"; + hash = "sha256-BtvMZaQutcPqTSCN5gxYUU3CQTyCns1ldkcnjwJOFa8="; + }; + + nativeBuildInputs = [ + clang + cmake + ]; + + buildInputs = [ + flex + ]; + + nativeInstallCheckHooks = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/nyancat"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Typesafe hierarchical key-value database"; + homepage = "https://openage.sft.mx"; + changelog = "https://github.com/SFTtech/nyan/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + mainProgram = "nyancat"; + }; +}) diff --git a/pkgs/by-name/oa/oathkeeper/package.nix b/pkgs/by-name/oa/oathkeeper/package.nix index ecbf70d5e0b5..7801017c0df9 100644 --- a/pkgs/by-name/oa/oathkeeper/package.nix +++ b/pkgs/by-name/oa/oathkeeper/package.nix @@ -5,7 +5,7 @@ }: let pname = "oathkeeper"; - version = "0.40.8"; + version = "0.40.9"; commit = "c75695837f170334b526359f28967aa33d61bce6"; in buildGoModule { @@ -15,10 +15,10 @@ buildGoModule { owner = "ory"; repo = "oathkeeper"; rev = "v${version}"; - hash = "sha256-syrOb8COZKgiW64Xlg+g+fu1y84jsKQ5QBFTrCl4Tys="; + hash = "sha256-R7xKhKF7mhS/vmSpOj+QDL0OBBWnh42X2Kr3TDQxVIo="; }; - vendorHash = "sha256-w6W02BHuDcZyh92CAli8XS9m7/fTYBulVsgYPow+yM4="; + vendorHash = "sha256-qETVUpxckZGa41Ll+SZTGcDlImsCvbvGQBcIwuIzSY8="; tags = [ "sqlite" diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index 3b3d668523b6..c9894806103b 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -13,7 +13,7 @@ }: let pname = "obsidian"; - version = "1.7.7"; + version = "1.8.3"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -37,9 +37,9 @@ let url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; hash = if stdenv.hostPlatform.isDarwin then - "sha256-vzYMTH1yaKxw1AwJOXVdzvKyQTkCMmx7NPPP/99xgMQ=" + "sha256-SqeCnS2Ncz8y1F+YAzAfBlsAgSaaMfmMcCjke9/UbXQ=" else - "sha256-6IHqBvZx2yxQAvADi3Ok5Le3ip2/c6qafQ3FSpPT0po="; + "sha256-t5iZOA/cFJpn9OtbutQ6gJ6SVkG0QljnJZ931YnGc54="; }; icon = fetchurl { diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix index e4b756748a55..1e1f549cf6c0 100644 --- a/pkgs/by-name/og/ogen/package.nix +++ b/pkgs/by-name/og/ogen/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ogen"; - version = "1.4.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "ogen-go"; repo = "ogen"; tag = "v${version}"; - hash = "sha256-SwJY9VQafclAxEQ/cbRJALvMLlnSIItIOz92XzuCoCk="; + hash = "sha256-clskb5DA1dNVKjKgtYakvshRrkeoqiwYX4QKAqSdKnE="; }; - vendorHash = "sha256-IxG7y0Zy0DerCh5DRdSWSaD643BG/8Wj2wuYvkn+XzE="; + vendorHash = "sha256-Ud1fg2wv+EM6h8dRO4R5SABOhPldF7uc9VwEw2/B6No="; patches = [ ./modify-version-handling.patch ]; diff --git a/pkgs/by-name/or/orz/package.nix b/pkgs/by-name/or/orz/package.nix index 6acd6736266d..d29a891692ce 100644 --- a/pkgs/by-name/or/orz/package.nix +++ b/pkgs/by-name/or/orz/package.nix @@ -7,16 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "orz"; - version = "1.6.2"; + version = "1.6.2-unstable-2024-11-08"; src = fetchFromGitHub { owner = "richox"; repo = "orz"; - rev = "v${version}"; - hash = "sha256-Yro+iXlg18Pj/AkU4IjvgA88xctK65yStfTilz+IRs0="; + rev = "c828a50f18a309d4715741056db74941e6a98867"; + hash = "sha256-PVso4ufBwxhF1yhzIkIwSbRJdnH9h8gn3nreWQJDMn4="; }; - cargoHash = "sha256-aUsRbIajBP6esjW7Wj7mqIkbYUCbZ2GgxjRXMPTnHYg="; + useFetchCargoVendor = true; + cargoHash = "sha256-vbhK4jHNhCI1nFv2pVOtjlxQe+b7NMP14z2Tk+no8Vs="; outputs = [ "out" diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index 4cfe1abf7965..98b0e8137cbf 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -47,14 +47,16 @@ stdenv.mkDerivation rec { preConfigure = '' pushd ovs ./boot.sh - ./configure + ./configure --with-dbdir=/var/lib/openvswitch make -j $NIX_BUILD_CORES popd ''; configureFlags = [ "--localstatedir=/var" + "--sharedstatedir=/var" "--with-dbdir=/var/lib/ovn" + "--sbindir=$(out)/bin" "--enable-ssl" ]; @@ -71,14 +73,20 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -vp $out/share/openvswitch/scripts mkdir -vp $out/etc/ovn - cp ovs/ovsdb/ovsdb-client $out/share/openvswitch/scripts - cp ovs/ovsdb/ovsdb-server $out/share/openvswitch/scripts - cp ovs/ovsdb/ovsdb-tool $out/share/openvswitch/scripts - cp ovs/utilities/ovs-appctl $out/share/openvswitch/scripts - cp ovs/utilities/ovs-vsctl $out/share/openvswitch/scripts + cp ovs/ovsdb/ovsdb-client $out/bin + cp ovs/ovsdb/ovsdb-server $out/bin + cp ovs/ovsdb/ovsdb-tool $out/bin + cp ovs/vswitchd/ovs-vswitchd $out/bin + cp ovs/utilities/ovs-appctl $out/bin + cp ovs/utilities/ovs-vsctl $out/bin + cp ovs/utilities/ovs-ctl $out/share/openvswitch/scripts cp ovs/utilities/ovs-lib $out/share/openvswitch/scripts - sed -i "s#/usr/local/bin#$out/share/openvswitch/scripts#g" $out/share/openvswitch/scripts/ovs-lib - sed -i "s#/usr/local/sbin#$out/share/openvswitch/scripts#g" $out/share/openvswitch/scripts/ovs-lib + cp ovs/utilities/ovs-kmod-ctl $out/share/openvswitch/scripts + cp ovs/vswitchd/vswitch.ovsschema $out/share/openvswitch + sed -i "s#/usr/local/etc#/var/lib#g" $out/share/openvswitch/scripts/ovs-lib + sed -i "s#/usr/local/bin#$out/bin#g" $out/share/openvswitch/scripts/ovs-lib + sed -i "s#/usr/local/sbin#$out/bin#g" $out/share/openvswitch/scripts/ovs-lib + sed -i "s#/usr/local/share#$out/share#g" $out/share/openvswitch/scripts/ovs-lib sed -i '/chown -R $INSTALL_USER:$INSTALL_GROUP $ovn_etcdir/d' $out/share/ovn/scripts/ovn-ctl ''; diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index ebe5564441ca..3db7a522fff6 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -29,11 +29,11 @@ assert petsc-withp4est -> p4est.mpiSupport; stdenv.mkDerivation rec { pname = "petsc"; - version = "3.21.3"; + version = "3.21.4"; src = fetchzip { url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${version}.tar.gz"; - hash = "sha256-dxHa8JUJCN4zRIXMCx7gcvbzFH2SPtkJ377ssIevjgU="; + hash = "sha256-l7v+ASBL9FLbBmBGTRWDwBihjwLe3uLz+GwXtn8u7e0="; }; strictDeps = true; diff --git a/pkgs/by-name/pf/pflotran/make.patch b/pkgs/by-name/pf/pflotran/make.patch new file mode 100644 index 000000000000..f4655d5a4936 --- /dev/null +++ b/pkgs/by-name/pf/pflotran/make.patch @@ -0,0 +1,45 @@ +diff --git a/src/pflotran/makefile b/src/pflotran/makefile +index 17587c91d..7caf73e8c 100644 +--- a/src/pflotran/makefile ++++ b/src/pflotran/makefile +@@ -51,7 +51,7 @@ PETSC_MAKE_STOP_ON_ERROR= + # so that PFLOTRAN will be built with the same options as + # the petsc configured in $PETSC_DIR/$PETSC_ARCH + +-MYFLAGS = -I. ++MYFLAGS = -I. -L@HDF5_FORTRAN_LIBS@ -I@HDF5_FORTRAN_INCLUDE@ + + ############################################################################### + # Preprocessor flags for special PFLOTRAN features/hacks +@@ -183,7 +183,7 @@ ifdef ug_mpi_scatter_ghost + endif + + ifdef have_hdf5 +-LIBS += -L${HDF5_LIB} -lhdf5_fortran -lhdf5 -lz ++LIBS += -L${HDF5_LIB} -lhdf5 -lhdf5_fortran -lhdf5_hl_fortran -lhdf5_f90cstub -lz + endif + + # Set this accordingly on your platform +@@ -273,7 +273,7 @@ pflotran_rxn_obj = ${pflotran_src}pflotran_rxn.o + + # PFLOTRAN executable + pflotran : $(pflotran_obj) +- ${FLINKER} -o pflotran $(pflotran_obj) ${PETSC_LIB} ${LIBS} ++ ${FLINKER} -o pflotran $(pflotran_obj) ${PETSC_LIB} ${LIBS} -lhdf5 -lhdf5_fortran -lhdf5_hl_fortran -lhdf5_f90cstub + + # PFLOTRAN as a library + libpflotran.a : $(pflotran_obj) +@@ -286,11 +286,11 @@ libpflotranchem.a : $(chem_obj) $(shared_mode_aux_obj) $(util_obj) + # object files lists below.... This is a workaround. + pflotran_rxn : libpflotranchem.a $(pflotran_rxn_obj) + ${FLINKER} -o $@ $(pflotran_rxn_obj) $(chem_obj) $(shared_mode_aux_obj) \ +- $(util_obj) ${PETSC_LIB} ${LIBS} ++ $(util_obj) ${PETSC_LIB} ${LIBS} -lhdf5 -lhdf5_fortran -lhdf5_hl_fortran -lhdf5_f90cstub + + # PFLOTRAN derivative test + pflotran_derivative : $(pflotran_base_obj) pflotran_derivative.o +- ${FLINKER} -o pflotran_derivative $(pflotran_base_obj) pflotran_derivative.o ${PETSC_LIB} ${LIBS} ++ ${FLINKER} -o pflotran_derivative $(pflotran_base_obj) pflotran_derivative.o ${PETSC_LIB} ${LIBS} -lhdf5 -lhdf5_fortran -lhdf5_hl_fortran -lhdf5_f90cstub + + $(SRC_DIR)/pflotran_provenance.F90 : FORCE + ifeq ($(UPDATE_PROVENANCE),1) diff --git a/pkgs/by-name/pf/pflotran/package.nix b/pkgs/by-name/pf/pflotran/package.nix new file mode 100644 index 000000000000..ec0fdf2d92e5 --- /dev/null +++ b/pkgs/by-name/pf/pflotran/package.nix @@ -0,0 +1,68 @@ +{ + stdenv, + lib, + fetchFromBitbucket, + gfortran, + mpi, + petsc, + blas, + lapack, + parmetis, + hdf5, + mpiCheckPhaseHook, + python3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "PFLOTRAN"; + version = "6.0.1"; + + src = fetchFromBitbucket { + owner = "pflotran"; + repo = "pflotran"; + rev = "v${finalAttrs.version}"; + hash = "sha256-AZXzay6GWbnxONB8Slg8gV0KN1CxGCXbJ45ZeWL1034="; + }; + + patches = [ ./make.patch ]; + + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ + petsc + blas + lapack + hdf5 + parmetis + ]; + + propagatedBuildInputs = [ mpi ]; + propagatedUserEnvPkgs = [ mpi ]; + passthru = { inherit mpi; }; + + enableParallelBuilding = true; + + /* + Pflotran does not use a "real" autotools configure script, but a simple bash + script, that is merely named configure. Consequently, many common mechanism + don't work. Thus, we need to help make to figure out some include and library + paths. + */ + preConfigure = '' + substituteInPlace src/pflotran/makefile \ + --subst-var-by "HDF5_FORTRAN_LIBS" "${lib.getLib hdf5}/lib" \ + --subst-var-by "HDF5_FORTRAN_INCLUDE" "${lib.getDev hdf5}/include" + ''; + + configureFlags = [ + "--with-petsc-dir=${petsc}" + "--with-petsc-arch=linux-gnu-c-release" + ]; + + meta = with lib; { + description = "Parallel, multi-physics simulation code for subsurface flow and transport"; + homepage = "https://pflotran.org/"; + license = licenses.lgpl3Only; + maintainers = [ maintainers.sheepforce ]; + }; +}) diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index 74cef9b8985d..9f3b782da308 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.35.5"; + version = "2.35.6"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-hPaZquiOcvRfWXG9nCKTvy7sPMueH/G/ikmdo87/0pg="; + sha256 = "sha256-oTiADsEck/TZpXlC7/HEBSyd68QAjUq76AGeawIPhS0="; }; - vendorHash = "sha256-2IgEkRgHxFagNQ7qgT2GchukALxjkCkkcGlyzQTJUDQ="; + vendorHash = "sha256-wIlntsf3PaRLWYZiI17ZdXidBV7LwAZdibUIX8yqATo="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix index 68526526ce86..a3eb42a24dc9 100644 --- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix +++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix @@ -2,6 +2,7 @@ buildPythonPackage, fetchFromGitHub, lib, + stdenv, pexpect, poetry, poetry-core, @@ -9,6 +10,7 @@ pytest-xdist, pytestCheckHook, shellingham, + darwin, }: buildPythonPackage rec { @@ -34,11 +36,15 @@ buildPythonPackage rec { shellingham ]; - nativeCheckInputs = [ - pytest-mock - pytest-xdist - pytestCheckHook - ]; + nativeCheckInputs = + [ + pytest-mock + pytest-xdist + pytestCheckHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.ps + ]; meta = { changelog = "https://github.com/python-poetry/poetry-plugin-shell/blob/${src.tag}/CHANGELOG.md"; diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index ba26b7d54be0..f3146cea2e61 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -32,7 +32,6 @@ httpretty, pytest-mock, pytest-xdist, - darwin, }: buildPythonPackage rec { @@ -110,17 +109,13 @@ buildPythonPackage rec { --zsh <($out/bin/poetry completions zsh) \ ''; - nativeCheckInputs = - [ - deepdiff - pytestCheckHook - httpretty - pytest-mock - pytest-xdist - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.ps - ]; + nativeCheckInputs = [ + deepdiff + pytestCheckHook + httpretty + pytest-mock + pytest-xdist + ]; preCheck = ( '' diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index 57f9a77368fa..e661078f2558 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "rattler-build"; - version = "0.34.1"; + version = "0.35.6"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${version}"; - hash = "sha256-HDRQveWOJKGBWxN7ZyIECo1HBfz+vSaLW7ueSok+d64="; + hash = "sha256-aCOHvJVGAxk0Lnpm772yLAuOmqgXE4RQB6s5YgmPOTw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-b44bL/xVUwBdqwr/jawZbyV+yHsGR3hREm4nvHDMCWA="; + cargoHash = "sha256-wldCQ2VD7jGir2shN1mjGdWU/04ZdAtHEmDPnDwdgCc="; doCheck = false; # test requires network access diff --git a/pkgs/by-name/re/recordbox/Cargo.lock b/pkgs/by-name/re/recordbox/Cargo.lock index f2b5d165262c..9e17fe481bd5 100644 --- a/pkgs/by-name/re/recordbox/Cargo.lock +++ b/pkgs/by-name/re/recordbox/Cargo.lock @@ -59,7 +59,7 @@ dependencies = [ "serde", "serde_repr", "url", - "zbus 5.2.0", + "zbus 5.3.0", ] [[package]] @@ -68,7 +68,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -161,7 +161,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "event-listener-strategy", "pin-project-lite", ] @@ -190,7 +190,7 @@ dependencies = [ "async-task", "blocking", "cfg-if", - "event-listener 5.3.1", + "event-listener 5.4.0", "futures-lite", "rustix", "tracing", @@ -260,9 +260,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", @@ -301,9 +301,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" [[package]] name = "block" @@ -383,7 +383,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae50b5510d86cf96ac2370e66d8dc960882f3df179d6a5a1e52bd94a1416c0f7" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "cairo-sys-rs", "glib", "libc", @@ -402,9 +402,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.5" +version = "1.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" +checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" dependencies = [ "shlex", ] @@ -440,7 +440,7 @@ dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -527,9 +527,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f" [[package]] name = "digest" @@ -609,9 +609,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -624,7 +624,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "pin-project-lite", ] @@ -695,9 +695,9 @@ checksum = "88a5a6882b2e137c4f2664562995865084eb5a00611fba30c582ef10354c4ad8" dependencies = [ "chrono", "log", - "nu-ansi-term", + "nu-ansi-term 0.50.1", "regex", - "thiserror 2.0.9", + "thiserror 2.0.11", ] [[package]] @@ -768,9 +768,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" +checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" dependencies = [ "fastrand", "futures-core", @@ -886,6 +886,19 @@ dependencies = [ "system-deps", ] +[[package]] +name = "generator" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd" +dependencies = [ + "cfg-if", + "libc", + "log", + "rustversion", + "windows 0.58.0", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -963,7 +976,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f969edf089188d821a30cde713b6f9eb08b20c63fc2e584aba2892a7984a8cc0" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "futures-channel", "futures-core", "futures-executor", @@ -1100,7 +1113,7 @@ dependencies = [ "paste", "pin-project-lite", "smallvec", - "thiserror 2.0.9", + "thiserror 2.0.11", ] [[package]] @@ -1213,7 +1226,7 @@ dependencies = [ "gstreamer-video-sys", "libc", "once_cell", - "thiserror 2.0.9", + "thiserror 2.0.11", ] [[package]] @@ -1498,11 +1511,11 @@ dependencies = [ [[package]] name = "inotify" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.7.0", "inotify-sys", "libc", ] @@ -1516,15 +1529,6 @@ dependencies = [ "libc", ] -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - [[package]] name = "itertools" version = "0.13.0" @@ -1542,9 +1546,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -1634,7 +1638,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "libc", "redox_syscall", ] @@ -1651,9 +1655,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -1686,9 +1690,9 @@ dependencies = [ [[package]] name = "lofty" -version = "0.21.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8bc4717ff10833a623b009e9254ae8667c7a59edc3cfb01c37aeeef4b6d54a7" +checksum = "b7c45b1baaa65506d6f6fe3a7dce7efae02d7d7fbe89907731686a39ab247a49" dependencies = [ "byteorder", "data-encoding", @@ -1712,13 +1716,26 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" dependencies = [ "value-bag", ] +[[package]] +name = "loom" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -1728,6 +1745,15 @@ dependencies = [ "libc", ] +[[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" @@ -1793,9 +1819,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", ] @@ -1814,25 +1840,23 @@ dependencies = [ [[package]] name = "moka" -version = "0.12.8" +version = "0.12.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cf62eb4dd975d2dde76432fb1075c49e3ee2331cf36f1f8fd4b66550d32b6f" +checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926" dependencies = [ "async-lock", - "async-trait", "crossbeam-channel", "crossbeam-epoch", "crossbeam-utils", - "event-listener 5.3.1", + "event-listener 5.4.0", "futures-util", - "once_cell", + "loom", "parking_lot", - "quanta", + "portable-atomic", "rustc_version", "smallvec", "tagptr", "thiserror 1.0.69", - "triomphe", "uuid", ] @@ -1861,7 +1885,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "cfg-if", "cfg_aliases", "libc", @@ -1870,11 +1894,11 @@ dependencies = [ [[package]] name = "notify" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009" +checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "filetime", "fsevent-sys", "inotify", @@ -1884,14 +1908,14 @@ dependencies = [ "mio", "notify-types", "walkdir", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "notify-debouncer-full" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcf855483228259b2353f89e99df35fc639b2b2510d1166e4858e3f67ec1afb" +checksum = "d2d88b1a7538054351c8258338df7c931a590513fb3745e8c15eb9ff4199b8d1" dependencies = [ "file-id", "log", @@ -1902,11 +1926,18 @@ dependencies = [ [[package]] name = "notify-types" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585d3cb5e12e01aed9e8a1f70d5c6b5e86fe2a6e48fc8cd0b3e0b8df6f6eb174" +checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ - "instant", + "overload", + "winapi", ] [[package]] @@ -1977,9 +2008,9 @@ dependencies = [ [[package]] name = "ogg_pager" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b0bef808533c5890ab77279538212efdbbbd9aa4ef1ccdfcfbf77a42f7e6fa" +checksum = "e034c10fb5c1c012c1b327b85df89fb0ef98ae66ec28af30f0d1eed804a40c19" dependencies = [ "byteorder", ] @@ -2009,6 +2040,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "pango" version = "0.20.7" @@ -2059,7 +2096,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -2076,9 +2113,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -2118,6 +2155,12 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "portable-atomic" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" + [[package]] name = "ppv-lite86" version = "0.2.20" @@ -2138,33 +2181,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] -[[package]] -name = "quanta" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773ce68d0bb9bc7ef20be3536ffe94e223e1f365bd374108b2659fac0c65cfe6" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi", - "web-sys", - "winapi", -] - [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -2221,18 +2249,9 @@ dependencies = [ "getrandom", ] -[[package]] -name = "raw-cpuid" -version = "11.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" -dependencies = [ - "bitflags 2.6.0", -] - [[package]] name = "recordbox" -version = "0.9.0" +version = "0.9.2" dependencies = [ "ashpd", "async-channel 2.3.1", @@ -2268,6 +2287,7 @@ dependencies = [ "strum_macros", "tr", "urlencoding", + "uuid", "walkdir", ] @@ -2277,18 +2297,18 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", ] [[package]] name = "reflink-copy" -version = "0.1.20" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17400ed684c3a0615932f00c271ae3eea13e47056a1455821995122348ab6438" +checksum = "0a7aea22fc8204e0f291719120cbcdae4f25f0807d7b00f5b6b27d95a8f1a2ad" dependencies = [ "cfg-if", "rustix", - "windows", + "windows 0.59.0", ] [[package]] @@ -2299,8 +2319,17 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.9", + "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]] @@ -2311,9 +2340,15 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "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" @@ -2335,7 +2370,7 @@ version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -2364,11 +2399,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "errno", "libc", "linux-raw-sys", @@ -2377,9 +2412,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" @@ -2405,6 +2440,12 @@ dependencies = [ "parking_lot", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.2.0" @@ -2431,18 +2472,18 @@ checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" [[package]] name = "serde" -version = "1.0.216" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.216" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", @@ -2451,9 +2492,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -2514,6 +2555,15 @@ dependencies = [ "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" @@ -2594,9 +2644,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.91" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -2647,12 +2697,13 @@ checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" [[package]] name = "tempfile" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", "fastrand", + "getrandom", "once_cell", "rustix", "windows-sys 0.59.0", @@ -2669,11 +2720,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.11", ] [[package]] @@ -2689,9 +2740,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", @@ -2791,6 +2842,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" 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.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +dependencies = [ + "matchers", + "nu-ansi-term 0.46.0", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", ] [[package]] @@ -2804,12 +2885,6 @@ dependencies = [ "syn", ] -[[package]] -name = "triomphe" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" - [[package]] name = "typenum" version = "1.17.0" @@ -2829,9 +2904,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.8.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-ident" @@ -2877,14 +2952,20 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" dependencies = [ "getrandom", "rand", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "value-bag" version = "1.10.0" @@ -2927,20 +3008,21 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", @@ -2952,9 +3034,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.49" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", @@ -2965,9 +3047,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2975,9 +3057,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -2988,15 +3070,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -3040,7 +3125,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ "windows-core 0.58.0", - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1" +dependencies = [ + "windows-core 0.59.0", + "windows-targets 0.53.0", ] [[package]] @@ -3049,7 +3144,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -3058,11 +3153,24 @@ version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-strings", - "windows-targets", + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings 0.1.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce" +dependencies = [ + "windows-implement 0.59.0", + "windows-interface 0.59.0", + "windows-result 0.3.0", + "windows-strings 0.3.0", + "windows-targets 0.53.0", ] [[package]] @@ -3076,6 +3184,17 @@ dependencies = [ "syn", ] +[[package]] +name = "windows-implement" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "windows-interface" version = "0.58.0" @@ -3087,13 +3206,33 @@ dependencies = [ "syn", ] +[[package]] +name = "windows-interface" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "windows-result" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08106ce80268c4067c0571ca55a9b4e9516518eaa1a1fe9b37ca403ae1d1a34" +dependencies = [ + "windows-targets 0.53.0", ] [[package]] @@ -3102,8 +3241,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-result", - "windows-targets", + "windows-result 0.2.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b888f919960b42ea4e11c2f408fadb55f78a9f236d5eef084103c8ce52893491" +dependencies = [ + "windows-targets 0.53.0", ] [[package]] @@ -3112,7 +3260,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -3121,7 +3269,7 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -3130,14 +3278,30 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "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-targets" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", ] [[package]] @@ -3146,42 +3310,84 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[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_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[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_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[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_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[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_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -3189,10 +3395,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "winnow" -version = "0.6.20" +name = "windows_x86_64_msvc" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + +[[package]] +name = "winnow" +version = "0.6.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" dependencies = [ "memchr", ] @@ -3221,9 +3433,9 @@ dependencies = [ [[package]] name = "xxhash-rust" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d48f1b18be023c95e7b75f481cac649d74be7c507ff4a407c55cfb957f7934" +checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3" [[package]] name = "yoke" @@ -3266,7 +3478,7 @@ dependencies = [ "async-trait", "blocking", "enumflags2", - "event-listener 5.3.1", + "event-listener 5.4.0", "futures-core", "futures-sink", "futures-util", @@ -3289,9 +3501,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb67eadba43784b6fb14857eba0d8fc518686d3ee537066eb6086dc318e2c8a1" +checksum = "192a0d989036cd60a1e91a54c9851fb9ad5bd96125d41803eed79d2e2ef74bd7" dependencies = [ "async-broadcast", "async-executor", @@ -3304,7 +3516,7 @@ dependencies = [ "async-trait", "blocking", "enumflags2", - "event-listener 5.3.1", + "event-listener 5.4.0", "futures-core", "futures-util", "hex", @@ -3318,9 +3530,9 @@ dependencies = [ "windows-sys 0.59.0", "winnow", "xdg-home", - "zbus_macros 5.2.0", - "zbus_names 4.1.0", - "zvariant 5.1.0", + "zbus_macros 5.3.0", + "zbus_names 4.1.1", + "zvariant 5.2.0", ] [[package]] @@ -3338,17 +3550,17 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d49ebc960ceb660f2abe40a5904da975de6986f2af0d7884b39eec6528c57" +checksum = "3685b5c81fce630efc3e143a4ded235b107f1b1cdf186c3f115529e5e5ae4265" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", "syn", - "zbus_names 4.1.0", - "zvariant 5.1.0", - "zvariant_utils 3.0.2", + "zbus_names 4.1.1", + "zvariant 5.2.0", + "zvariant_utils 3.1.0", ] [[package]] @@ -3364,14 +3576,14 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856b7a38811f71846fd47856ceee8bccaec8399ff53fb370247e66081ace647b" +checksum = "519629a3f80976d89c575895b05677cbc45eaf9f70d62a364d819ba646409cc8" dependencies = [ "serde", "static_assertions", "winnow", - "zvariant 5.1.0", + "zvariant 5.2.0", ] [[package]] @@ -3453,9 +3665,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.1.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1200ee6ac32f1e5a312e455a949a4794855515d34f9909f4a3e082d14e1a56f" +checksum = "55e6b9b5f1361de2d5e7d9fd1ee5f6f7fcb6060618a1f82f3472f58f2b8d4be9" dependencies = [ "endi", "enumflags2", @@ -3463,8 +3675,8 @@ dependencies = [ "static_assertions", "url", "winnow", - "zvariant_derive 5.1.0", - "zvariant_utils 3.0.2", + "zvariant_derive 5.2.0", + "zvariant_utils 3.1.0", ] [[package]] @@ -3482,15 +3694,15 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "5.1.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687e3b97fae6c9104fbbd36c73d27d149abf04fb874e2efbd84838763daa8916" +checksum = "573a8dd76961957108b10f7a45bac6ab1ea3e9b7fe01aff88325dc57bb8f5c8b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", "syn", - "zvariant_utils 3.0.2", + "zvariant_utils 3.1.0", ] [[package]] @@ -3506,9 +3718,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "3.0.2" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20d1d011a38f12360e5fcccceeff5e2c42a8eb7f27f0dcba97a0862ede05c9c6" +checksum = "ddd46446ea2a1f353bfda53e35f17633afa79f4fe290a611c94645c69fe96a50" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix index 1708547a2b8a..d747c407719e 100644 --- a/pkgs/by-name/re/recordbox/package.nix +++ b/pkgs/by-name/re/recordbox/package.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "recordbox"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "edestcroix"; repo = "Recordbox"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-KfIlh9ORqjJ5V8mNOx7Q9jsYg4OJDX6q+ht+eckxMRU="; + hash = "sha256-Vt/uOueDKBjCVgFg6gMnOvbvR37udJ6J3BjE0LaL4Gw="; }; # Patch in our Cargo.lock and ensure AppStream tests don't use the network @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; }; meta = { diff --git a/pkgs/by-name/ro/roogle/package.nix b/pkgs/by-name/ro/roogle/package.nix index 26cb21501157..070f99dfdcb5 100644 --- a/pkgs/by-name/ro/roogle/package.nix +++ b/pkgs/by-name/ro/roogle/package.nix @@ -6,21 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "roogle"; - version = "0.1.4"; + version = "1.0.2"; src = fetchFromGitHub { owner = "hkmatsumoto"; repo = pname; rev = version; - sha256 = "1h0agialbvhhiijkdnr47y7babq432limdl6ag2rmjfs7yishn4r"; + sha256 = "sha256-oeQwRcDn4X/CL+O4APmGv9T19c9oD5tCBRz4K41K1Zg="; }; - cargoHash = "sha256-CzFfFKTmBUAafk8PkkWmUkRIyO+yEhmCfN1zsLRq4Iw="; - - postInstall = '' - mkdir -p $out/share/roogle - cp -r assets $out/share/roogle - ''; + useFetchCargoVendor = true; + cargoHash = "sha256-lmRo6Q67hJ3hv0jQt6epiNOckRv0rA0a0DNEKIdDoUE="; meta = with lib; { description = "Rust API search engine which allows you to search functions by names and type signatures"; diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index f87928256351..2207d5cc1f23 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = version; - hash = "sha256-V05GUo5nA6RhVWD7mn94GF3/93In3cnljd2G3hPeBZ0="; + hash = "sha256-HUCquxp8U6ZoHNSuUSu56EyiaSRRA8qUMYu6nNibt6w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-FpybUZZ5qjo87fYbUAnK+w4cUPx4UWGzexL92cEnIFU="; + cargoHash = "sha256-EiIN97I72Iam7STjZhHnvVktJXJocnVomjVp8a8t+fM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index 0c6ecb9a6bd3..2b0e553d1609 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -38,7 +38,8 @@ let hash = "sha256-SbwqWapJbt6+RoqRKi+wkSH1D+Wz7JmnVbfcfKkjt8Q="; }; - cargoHash = "sha256-dDyiptG9TKes+fXx2atwx697SWH7Rltx6xVubtTn7FM="; + useFetchCargoVendor = true; + cargoHash = "sha256-4khuq/DK4sP98AMHyr/lEo1OJdqLujOIi8IgbKBY60Y="; cargoBuildFlags = [ "--package" "flutter_rust_bridge_codegen" diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix index b113c86fa2e8..ccf53bc4a492 100644 --- a/pkgs/by-name/ru/rustywind/package.nix +++ b/pkgs/by-name/ru/rustywind/package.nix @@ -14,10 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "avencera"; repo = "rustywind"; rev = "v${version}"; - hash = "sha256-NRIWjmKjteJibqnOjkkUY9eKIM65H7NaRX8rn1MdXmY="; + hash = "sha256-4VpSf6ukeDbz8pRxsDt38MxMDgavAOqgzIof/3AaJ04="; }; - cargoHash = "sha256-yUODUAhWtRGCj3U9nBlw3+5dNv6vGHXmJzUd8hGKnu0="; + useFetchCargoVendor = true; + cargoHash = "sha256-zpSsDxUhQinKtjWuDeINenKedYKhPyW5u4bglmSgVdk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/sa/samply/Cargo.lock b/pkgs/by-name/sa/samply/Cargo.lock new file mode 100644 index 000000000000..c8a43ddb2fdb --- /dev/null +++ b/pkgs/by-name/sa/samply/Cargo.lock @@ -0,0 +1,2497 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli 0.28.1", +] + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "fallible-iterator 0.3.0", + "gimli 0.29.0", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-compression" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "autocfg" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line 0.21.0", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object 0.32.2", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + +[[package]] +name = "binary-merge" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597bb81c80a54b6a4381b23faba8d7774b144c94cbd1d6fe3f1329bd776554ab" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "bitvec" +version = "0.19.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "brotli" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "125740193d7fee5cc63ab9e16c2fdc4e07c74ba755cc53b327d6ea029e9fc569" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65622a320492e09b5e0ac436b14c54ff68199bac392d0e89a6832c4518eea525" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + +[[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.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "cab" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "171228650e6721d5acc0868a462cd864f49ac5f64e4a42cde270406e64e404d2" +dependencies = [ + "byteorder", + "flate2", + "lzxd", + "time", +] + +[[package]] +name = "cc" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" + +[[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.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "clap" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpp_demangle" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "uuid", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "elsa" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fastrand" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[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 = "framehop" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775adc24f975a49a55a31d53664838836e70d8bafac569ee19f5fd9b6403eb88" +dependencies = [ + "arrayvec", + "cfg-if", + "fallible-iterator 0.3.0", + "gimli 0.29.0", + "macho-unwind-info", + "pe-unwind-info", + "thiserror", + "thiserror-no-std", +] + +[[package]] +name = "fs4" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dabded2e32cd57ded879041205c60a4a4c4bab47bd0fd2fa8b01f30849f02b" +dependencies = [ + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[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 2.0.58", +] + +[[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-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "fxprof-processed-profile" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce20bbb48248608ba4908b45fe36e17e40f56f8c6bb385ecf5d3c4a1e8b05a22" +dependencies = [ + "bitflags 2.5.0", + "debugid", + "fxhash", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "getrandom" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +dependencies = [ + "fallible-iterator 0.3.0", + "stable_deref_trait", +] + +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[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 = "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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f24ce812868d86d19daa79bf3bf9175bc44ea323391147a5e3abde2a283871b" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[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 = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "inplace-vec-builder" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf64c2edc8226891a71f127587a2861b132d2b942310843814d5001d99a1d307" +dependencies = [ + "smallvec", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[package]] +name = "linear-map" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee" + +[[package]] +name = "linux-perf-data" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4533101fd9e7cdabbdb80e09b45cf200ee3c2252a5d4aadaae5325ab46769747" +dependencies = [ + "byteorder", + "linear-map", + "linux-perf-event-reader", + "memchr", + "thiserror", +] + +[[package]] +name = "linux-perf-event-reader" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41064623ecf100db029bd29e4a1cdec25fc513d45c15619ecd03504e2ffb1687" +dependencies = [ + "bitflags 2.5.0", + "byteorder", + "memchr", + "thiserror", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + +[[package]] +name = "lzxd" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de7336a183103429ad66d11d56d8bdc9c4a2916f6b85a8f11e5b127bde12001" + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "macho-unwind-info" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b6086acc74bc23f56b60e88bb082d505e23849d68d6c0f12bb6a7ad5c60e03e" +dependencies = [ + "thiserror", + "zerocopy", + "zerocopy-derive", +] + +[[package]] +name = "maybe-owned" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[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.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[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 = "msvc-demangler" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2588c982e3a7fbfbd73b21f824cacc43fc6392a1103c709ffd6001c0bf33fdb3" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nix-base32" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8548db8274cf1b2b4c093557783f99e9ad64ffdaaa29a6c1af0abc9895c15612" + +[[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 = "normpath" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5831952a9476f2fed74b77d74182fa5ddc4d21c72ec45a333b250e3ed0272804" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "object" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +dependencies = [ + "crc32fast", + "flate2", + "hashbrown", + "indexmap", + "memchr", + "ruzstd", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "opener" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9901cb49d7fc923b256db329ee26ffed69130bf05d74b9efdd1875c92d6af01" +dependencies = [ + "bstr", + "normpath", + "windows-sys 0.52.0", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "pdb-addr2line" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb51ef7ed9998e108891711812822831daac0b17d67768c3bdc69aa909366123" +dependencies = [ + "bitflags 2.5.0", + "elsa", + "maybe-owned", + "pdb2", + "range-collections", + "thiserror", +] + +[[package]] +name = "pdb2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00e30e131bcab0d41a2e471cf777ea9b1402f2a0764bcf1780251eab1b0d175d" +dependencies = [ + "fallible-iterator 0.2.0", + "scroll", + "uuid", +] + +[[package]] +name = "pe-unwind-info" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ec3b43050c38ffb9de87e17d874e9956e3a9131b343c9b7b7002597727c3891" +dependencies = [ + "arrayvec", + "bitflags 2.5.0", + "thiserror", + "zerocopy", + "zerocopy-derive", +] + +[[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 2.0.58", +] + +[[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 = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + +[[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 = "range-collections" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca9edd21e2db51000ac63eccddabba622f826e631a60be7bade9bd6a76b69537" +dependencies = [ + "binary-merge", + "inplace-vec-builder", + "ref-cast", + "smallvec", +] + +[[package]] +name = "rangemap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "ref-cast" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" + +[[package]] +name = "reqwest" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +dependencies = [ + "async-compression", + "base64", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots", + "winreg", +] + +[[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", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustix" +version = "0.38.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "ruzstd" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b" +dependencies = [ + "byteorder", + "derive_more", + "twox-hash", +] + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[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 = "samply" +version = "0.12.0" +dependencies = [ + "byteorder", + "clap", + "crossbeam-channel", + "debugid", + "dirs", + "flate2", + "framehop", + "futures-util", + "fxhash", + "fxprof-processed-profile", + "http-body-util", + "hyper", + "hyper-util", + "lazy_static", + "libc", + "linux-perf-data", + "mach", + "memchr", + "memmap2", + "mio", + "nix", + "nix-base32", + "num_cpus", + "object 0.35.0", + "once_cell", + "opener", + "parking_lot", + "percent-encoding", + "rand", + "serde", + "serde_derive", + "serde_json", + "signal-hook", + "sysctl", + "tempfile", + "thiserror", + "tokio", + "tokio-util", + "uname", + "uuid", + "wholesym", +] + +[[package]] +name = "samply-api" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ba2d4cd2e2684f911e234613f0659e2df56db773609ab940b1b02e984bda886" +dependencies = [ + "samply-symbols", + "serde", + "serde_derive", + "serde_json", + "thiserror", + "yaxpeax-arch", + "yaxpeax-arm", + "yaxpeax-x86", +] + +[[package]] +name = "samply-symbols" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "992d7259f93744ea3f094eea6f0f2be59facc45245fd8e0f693fad1e69ea5d16" +dependencies = [ + "addr2line 0.22.0", + "bitflags 2.5.0", + "cpp_demangle", + "debugid", + "elsa", + "flate2", + "gimli 0.29.0", + "linux-perf-data", + "lzma-rs", + "macho-unwind-info", + "memchr", + "msvc-demangler", + "nom", + "object 0.35.0", + "pdb-addr2line", + "rangemap", + "rustc-demangle", + "scala-native-demangle", + "srcsrv", + "thiserror", + "uuid", + "yoke", + "yoke-derive", + "zerocopy", + "zerocopy-derive", +] + +[[package]] +name = "scala-native-demangle" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4416eddc0eaf31e04aa4039bd3db4288ea1ba613955d86cf9c310049c5d1e2" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scroll" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "serde_json" +version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[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 = "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-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +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 = "srcsrv" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "022437a70e522e49b1952cb1d923589d629cb4aee97eb56d65ce938c04e8ac70" +dependencies = [ + "memchr", + "thiserror", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "symsrv" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "098492916b4954d05c9f195d073714401a48ad9d0c1d4690a4074146c9924804" +dependencies = [ + "async-compression", + "cab", + "dirs", + "fs4", + "futures-util", + "http", + "reqwest", + "scopeguard", + "thiserror", + "tokio", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "sysctl" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" +dependencies = [ + "bitflags 2.5.0", + "byteorder", + "enum-as-inner", + "libc", + "thiserror", + "walkdir", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "thiserror-impl-no-std" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58e6318948b519ba6dc2b442a6d0b904ebfb8d411a3ad3e07843615a72249758" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "thiserror-no-std" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ad459d94dd517257cc96add8a43190ee620011bb6e6cdc82dafd97dfafafea" +dependencies = [ + "thiserror-impl-no-std", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +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.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[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-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + +[[package]] +name = "uname" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" +dependencies = [ + "libc", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[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.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.58", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "wholesym" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dd2331e4836f219a2da809a672abbd7f1d3ee33e0db30a28357a5a0fd6f4157" +dependencies = [ + "bytes", + "core-foundation", + "core-foundation-sys", + "debugid", + "futures-util", + "libc", + "memmap2", + "reqwest", + "samply-api", + "samply-symbols", + "symsrv", + "tokio", + "uuid", + "yoke", + "yoke-derive", +] + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[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-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.4", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + +[[package]] +name = "yaxpeax-arch" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1ba5c2f163fa2f866c36750c6c931566c6d93231ae9410083b0738953b609d5" +dependencies = [ + "num-traits", +] + +[[package]] +name = "yaxpeax-arm" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0430c0047803b6aabfa3cb62f84a78d05b933e62bfcee97c7491bf634df9123" +dependencies = [ + "bitvec", + "yaxpeax-arch", +] + +[[package]] +name = "yaxpeax-x86" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107477944697db42c41326f82d4c65b769b32512cdad1e086f36f0e0f25ff45" +dependencies = [ + "cfg-if", + "num-traits", + "yaxpeax-arch", +] + +[[package]] +name = "yoke" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" +dependencies = [ + "serde", + "stable_deref_trait", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "zerofrom" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index 20c15023db3c..c8e4c86e66f8 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -17,7 +17,9 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7bf1lDIZGhRpvnn8rHNwzH2GBY8CwtYCjuRAUTQgbsA="; }; - cargoHash = "sha256-QGvtKx+l6+UxdlziHnF63geAvW55RRlatK2/J8LR0Ck="; + # Can't use fetchCargoVendor: + # https://github.com/NixOS/nixpkgs/issues/377986 + cargoLock.lockFile = ./Cargo.lock; # the dependencies linux-perf-data and linux-perf-event-reader contains both README.md and Readme.md, # which causes a hash mismatch on systems with a case-insensitive filesystem diff --git a/pkgs/by-name/se/seafile-server/package.nix b/pkgs/by-name/se/seafile-server/package.nix index 0c030b9d8e27..c30fa38965a5 100644 --- a/pkgs/by-name/se/seafile-server/package.nix +++ b/pkgs/by-name/se/seafile-server/package.nix @@ -51,6 +51,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config + python3 + libsearpc # searpc-codegen.py + vala # valac + which ]; buildInputs = [ @@ -64,8 +68,6 @@ stdenv.mkDerivation { fuse libarchive libjwt - which - vala libevhtp oniguruma ]; diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index 307df39ca282..b2b1d7a27871 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -36,10 +36,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+9pZUDszPYJmFgHbZH0aKtZ6qLcJjh73jG2CFoRKxWc="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; + dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-qw5XvXFhYLQJalk3fQwKakgBwfWMjhJzHKbqjchE2V0="; + hash = "sha256-FdUrivumG5R69CwZedpkBzds5PcZr4zSsA6QW/+rDBM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/siril/package.nix b/pkgs/by-name/si/siril/package.nix index 7e4e3e11fca2..1526d82ff48f 100644 --- a/pkgs/by-name/si/siril/package.nix +++ b/pkgs/by-name/si/siril/package.nix @@ -28,17 +28,19 @@ ffms, wrapGAppsHook3, curl, + versionCheckHook, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "siril"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitLab { owner = "free-astro"; repo = "siril"; - rev = version; - hash = "sha256-orNu9qo7sutMUPeIPPhxKETEKbCm4D6nAuo4Hc/8Bdo="; + tag = "${finalAttrs.version}"; + hash = "sha256-pSJp4Oj8x4pKuwPSaSyGbyGfpnanoWBxAdXtzGTP7uA="; }; nativeBuildInputs = [ @@ -86,12 +88,22 @@ stdenv.mkDerivation rec { cd nixbld ''; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { homepage = "https://www.siril.org/"; description = "Astrophotographic image processing tool"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; changelog = "https://gitlab.com/free-astro/siril/-/blob/HEAD/ChangeLog"; - maintainers = with maintainers; [ hjones2199 ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ hjones2199 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index 0fa7b1deeacb..501e14e1d263 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; - version = "2.22.0"; + version = "2.22.1"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${finalAttrs.version}"; - hash = "sha256-0082rRSfIKJFTAzmJ65ItEdLSwjFks5ZkTlVZqaWKEw="; + hash = "sha256-272lrH0ee4z4hcY4Hqt/UxjGwH6RFPEP4n0jz6Ab/+c="; }; buildInputs = [ diff --git a/pkgs/by-name/sl/slippy/package.nix b/pkgs/by-name/sl/slippy/package.nix index 29ac95bfb9c8..70e757d7c1a1 100644 --- a/pkgs/by-name/sl/slippy/package.nix +++ b/pkgs/by-name/sl/slippy/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - jq, - moreutils, pkg-config, openssl, stdenv, @@ -21,28 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7Uvo5+saxwTMQjfDliyOYC6j6LbpMf/FiONfX38xepI="; }; - cargoHash = "sha256-6nB+rHBJU9qhA7azz2ynaBw1UJdwE+T7pgpoPzhD5Bk="; - - # the dependency css-minify contains both README.md and Readme.md, - # which causes a hash mismatch on systems with a case-insensitive filesystem - # this removes the readme files and updates cargo's checksum file accordingly - depsExtraArgs = { - nativeBuildInputs = [ - jq - moreutils - ]; - - postBuild = '' - pushd $name/css-minify - - rm -f README.md Readme.md - jq 'del(.files."README.md") | del(.files."Readme.md")' \ - .cargo-checksum.json -c \ - | sponge .cargo-checksum.json - - popd - ''; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-RGSc+jy2i97QZGfafe3M25bunBmCYAJ0UW3dAnvl5gs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sm/smartgithg/package.nix b/pkgs/by-name/sm/smartgithg/package.nix index df3322024973..cae009d14bd1 100644 --- a/pkgs/by-name/sm/smartgithg/package.nix +++ b/pkgs/by-name/sm/smartgithg/package.nix @@ -14,15 +14,15 @@ let jre = openjdk21; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smartgithg"; - version = "23.1.3"; + version = "24.1.1"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${ - builtins.replaceStrings [ "." ] [ "_" ] version + builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }.tar.gz"; - hash = "sha256-UvdHr1L5MYwl7eT1BVS/M8Ydtw8VjDG+QuqMW0Q5La4="; + hash = "sha256-Lv5U/D1p5+Xiq/IeQJGDu3t6j6sP0r0vMYpfAEeExfI="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; @@ -79,10 +79,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "smartgit"; exec = "smartgit"; - comment = meta.description; + comment = finalAttrs.meta.description; icon = "smartgit"; desktopName = "SmartGit"; categories = [ @@ -96,16 +96,16 @@ stdenv.mkDerivation rec { "x-scheme-handler/sourcetree" ]; startupNotify = true; - startupWMClass = name; + startupWMClass = "smartgit"; keywords = [ "git" ]; }; - meta = with lib; { + meta = { description = "GUI for Git, Mercurial, Subversion"; homepage = "https://www.syntevo.com/smartgit/"; changelog = "https://www.syntevo.com/smartgit/changelog.txt"; - license = licenses.unfree; - platforms = platforms.linux; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jraygauthier ]; }; -} +}) diff --git a/pkgs/by-name/sn/sn-pro/package.nix b/pkgs/by-name/sn/sn-pro/package.nix index be2b251a97f3..51bbee772936 100644 --- a/pkgs/by-name/sn/sn-pro/package.nix +++ b/pkgs/by-name/sn/sn-pro/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "sn-pro"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "supernotes"; repo = "sn-pro"; rev = version; - hash = "sha256-J2rIBerbkHsuAKi8lRO3D7strL+n2IZlayijz7s6l+k="; + hash = "sha256-bagirVJtpGZOB3rULKemniGj1BkN9SQYpFhTm4ZX/is="; }; installPhase = '' diff --git a/pkgs/by-name/sp/sploitscan/package.nix b/pkgs/by-name/sp/sploitscan/package.nix index 8a73b5fa9f9c..b58e7ef17f27 100644 --- a/pkgs/by-name/sp/sploitscan/package.nix +++ b/pkgs/by-name/sp/sploitscan/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sploitscan"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "xaitax"; repo = "SploitScan"; tag = "v.${version}"; - hash = "sha256-d9s0j/78arKnbDCgMJMdUVF/RPfnAl59WAiJ0UvCCUU="; + hash = "sha256-5aSEHZKTmkO/KcklMUEt2q8hqPc8XiT5QUU1YY3wmBw="; }; pythonRelaxDeps = [ @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Cybersecurity utility designed to provide detailed information on vulnerabilities and associated exploits"; homepage = "https://github.com/xaitax/SploitScan"; - changelog = "https://github.com/xaitax/SploitScan/releases/tag/v${version}"; + changelog = "https://github.com/xaitax/SploitScan/releases/tag/v.${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "sploitscan"; diff --git a/pkgs/by-name/sr/srsran/package.nix b/pkgs/by-name/sr/srsran/package.nix index 3b32a70f7a6a..98d930b6c24d 100644 --- a/pkgs/by-name/sr/srsran/package.nix +++ b/pkgs/by-name/sr/srsran/package.nix @@ -14,6 +14,7 @@ soapysdr-with-plugins, libbladeRF, zeromq, + enableLteRates ? false, enableAvx ? stdenv.hostPlatform.avxSupport, enableAvx2 ? stdenv.hostPlatform.avx2Support, enableFma ? stdenv.hostPlatform.fmaSupport, @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_WERROR=OFF" + (lib.cmakeBool "ENABLE_LTE_RATES" enableLteRates) (lib.cmakeBool "ENABLE_AVX" enableAvx) (lib.cmakeBool "ENABLE_AVX2" enableAvx2) (lib.cmakeBool "ENABLE_FMA" enableFma) diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix index 1569f36a82aa..46be3abb2f37 100644 --- a/pkgs/by-name/st/stalwart-cli/package.nix +++ b/pkgs/by-name/st/stalwart-cli/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { src = stalwart-mail.src; buildAndTestSubdir = "crates/cli"; - cargoHash = "sha256-9gqk26qCic1N8LHXLX3fWyk/oQr3QifbmPzAEWL6ZHo="; + useFetchCargoVendor = true; + cargoHash = "sha256-k0pNNLwFRLI7eHjVwHGjgrnX4moWOwoWvMiyPfGMgCo="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index 8cf8b5418d44..81d86a11b169 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s="; }; - cargoHash = "sha256-uyLGrCZvKiePHFG0C++ELwT/1FTH8c4baAUxV2ueHZ8="; + useFetchCargoVendor = true; + cargoHash = "sha256-rXpyPLe28YgUkDJNBEA0HGSpmcHOik9em1uwLuYAU8I="; postPatch = '' # Using local tailwindcss for compilation diff --git a/pkgs/by-name/su/sub-batch/package.nix b/pkgs/by-name/su/sub-batch/package.nix index 90d335096c62..0a9ca35acc85 100644 --- a/pkgs/by-name/su/sub-batch/package.nix +++ b/pkgs/by-name/su/sub-batch/package.nix @@ -3,8 +3,6 @@ lib, fetchFromGitHub, rustPlatform, - makeWrapper, - alass, }: rustPlatform.buildRustPackage rec { @@ -21,12 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-eT4u/IHj+yqeLQZ7E4cWAJFMT503zHq7HYyIhsoaj6s="; - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram "$out/bin/sub-batch" --prefix PATH : "${lib.makeBinPath [ alass ]}" - ''; - meta = with lib; { description = "Match and rename subtitle files to video files and perform other batch operations on subtitle files"; homepage = "https://github.com/kl/sub-batch"; diff --git a/pkgs/by-name/sw/swayws/package.nix b/pkgs/by-name/sw/swayws/package.nix index 90752a14da04..1bc606d030bf 100644 --- a/pkgs/by-name/sw/swayws/package.nix +++ b/pkgs/by-name/sw/swayws/package.nix @@ -11,15 +11,14 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitLab { owner = "w0lff"; repo = pname; - rev = "v${version}"; - hash = "sha256-f0kXy7/31imgHHqKPmW9K+QrLqroaPaXwlJkzOoezRU="; + # Specifying commit hash rather than tag because upstream has + # rewritten a tag before: + # https://gitlab.com/w0lff/swayws/-/issues/1#note_1342349382 + rev = "98f0d5c1896b10e890e1727654f1cf3b34a2371e"; + hash = "sha256-zeM6/x2vjZ2IL+nZz1WBf5yY4C6ovmxyvgVLD54BKVc="; }; cargoHash = "sha256-VYT6wV59fraAoJgR/i6GlO8s7LUoehGtxPAggEL1eLo="; - # Required patch until upstream fixes https://gitlab.com/w0lff/swayws/-/issues/1 - cargoPatches = [ - ./ws-update-Cargo-lock.patch - ]; # swayws does not have any tests doCheck = false; diff --git a/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch b/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch deleted file mode 100644 index e1d7614e8bfa..000000000000 --- a/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index f01f824..e00d079 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -328,7 +328,7 @@ dependencies = [ - - [[package]] - name = "swayws" --version = "1.1.1" -+version = "1.2.0" - dependencies = [ - "clap", - "env_logger", diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index 03027ea2c9d6..b455322bee9f 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { pname = "sydbox"; - version = "3.29.4"; + version = "3.30.0"; outputs = [ "out" @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec { domain = "gitlab.exherbo.org"; owner = "Sydbox"; repo = "sydbox"; - rev = "refs/tags/v${version}"; - hash = "sha256-k7qh375SuonybwgECI9Bl898FFigVxJ4L174AUDxntk="; + tag = "v${version}"; + hash = "sha256-EbdJuJefFQaL6e+2AcsPF4eXin3ky+jlt4s68mSusoc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RpMHq8y80syLKj0uqpfxg3W3y4W4laBsGK9n27AdwFY="; + cargoHash = "sha256-+tyUKX0hzVt2CkbbNYuonWfh1sJBaqmbaeYdctHbPVw="; nativeBuildInputs = [ mandoc @@ -80,7 +80,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "seccomp-based application sandbox"; homepage = "https://gitlab.exherbo.org/sydbox/sydbox"; - changelog = "https://gitlab.exherbo.org/sydbox/sydbox/-/blob/v${version}/ChangeLog.md"; + changelog = "https://gitlab.exherbo.org/sydbox/sydbox/-/blob/${src.tag}/ChangeLog.md"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ mvs diff --git a/pkgs/by-name/sy/systemd-netlogd/package.nix b/pkgs/by-name/sy/systemd-netlogd/package.nix index 65853d5cfddf..6c5a67893114 100644 --- a/pkgs/by-name/sy/systemd-netlogd/package.nix +++ b/pkgs/by-name/sy/systemd-netlogd/package.nix @@ -13,12 +13,13 @@ sphinx, systemd, systemdLibs, + testers, opensslSupport ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "systemd-netlogd"; - version = "1.4.3"; + version = "1.4.4"; outputs = [ "out" @@ -29,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd-netlogd"; tag = "v${finalAttrs.version}"; - hash = "sha256-NwDmNrq2rLing5BQrSXoNDErcLK0Q8go9TN9zLSW5rE="; + hash = "sha256-Kgr6KZp2SSLG8xnqXNWsDgIa9rNnBGcN+TkuAbr+yAA="; }; # Fixup a few installation paths @@ -69,9 +70,13 @@ stdenv.mkDerivation (finalAttrs: { passthru = { # Make sure x86_64-linux -> aarch64-linux cross compilation works - tests = lib.optionalAttrs (stdenv.buildPlatform.system == "x86_64-linux") { - aarch64-cross = pkgsCross.aarch64-multiplatform.systemd-netlogd; - }; + tests = + { + version = testers.testVersion { package = finalAttrs.finalPackage; }; + } + // lib.optionalAttrs (stdenv.buildPlatform.system == "x86_64-linux") { + aarch64-cross = pkgsCross.aarch64-multiplatform.systemd-netlogd; + }; updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/tc/tcpdump/package.nix b/pkgs/by-name/tc/tcpdump/package.nix index 4c46ced1dec5..a52df1bb054d 100644 --- a/pkgs/by-name/tc/tcpdump/package.nix +++ b/pkgs/by-name/tc/tcpdump/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs tests ''; - nativeBuildInputs = lib.optional (stdenv.hostPlatform.isStatic) [ pkg-config ]; + nativeBuildInputs = [ pkg-config ]; nativeCheckInputs = [ perl ]; diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 5ff361ae260e..7ea0cc6a6908 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage rec { pname = "television"; - version = "0.9.4"; + version = "0.10.2"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = version; - hash = "sha256-S0at9qiPaHtFSag/DjJxczcjuQwPIWQBqxrRwrWIPk0="; + hash = "sha256-VOoRl//Z0AiRv96SqopjUYePPUa9KRbEpLYzJ6k1b8Q="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7M/PMKyvnQnebY+VXstBJ3jNgqW1ycI/8eJF9r3RslQ="; + cargoHash = "sha256-OFSbynO7FSDxMiXVmB+STWB45iIhIn2rq+8Mjz37MwE="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/tp/tpsecore/package.nix b/pkgs/by-name/tp/tpsecore/package.nix index e8e50ea26e6a..b4501a90f222 100644 --- a/pkgs/by-name/tp/tpsecore/package.nix +++ b/pkgs/by-name/tp/tpsecore/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { hash = "sha256-+OynnLMBEiYwdFzxGzgkcBN6xrHoH1Q6O5i+OW7RBLo="; }; - cargoHash = "sha256-mPaWXiDjJd/uTBpktauKWg8X9sNBb3FXw5BSGB33NxI="; + useFetchCargoVendor = true; + cargoHash = "sha256-EM/THiR0NV4N3mFGjRYe1cpaF82rCYnOPLxv67BronU="; nativeBuildInputs = [ wasm-pack diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index f15d22117714..62d57d898168 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -8,16 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "turn-rs"; - version = "3.3.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "mycrl"; repo = "turn-rs"; tag = "v${version}"; - hash = "sha256-ITs6kNI1g7k8bcSSG6GwPGY5U+mFGqCTU6JIEj9mH/Q="; + hash = "sha256-4I4mjG/euBL08v4xZdnrI8aTGVo5z2F2FDYtxKW1Qt8="; }; - cargoHash = "sha256-bmeTDMa/khX7fTDCGpf3U2LZPnkXL+bi69sv6NPnANI="; + useFetchCargoVendor = true; + cargoHash = "sha256-qSYGcZdMn7uelufs6z1UQtLxrRbBGNf3o1a1jR+qiqo="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/vd/vdhcoapp/filepicker.nix b/pkgs/by-name/vd/vdhcoapp/filepicker.nix index 3a8b145a8c90..cd2f34dc114a 100644 --- a/pkgs/by-name/vd/vdhcoapp/filepicker.nix +++ b/pkgs/by-name/vd/vdhcoapp/filepicker.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7sRzf3SA9RSBf4O36olXgka8c6Bufdb0qsuTofVe55s="; }; - cargoHash = "sha256-aal7ppFkCpNc+QTS4Qklsb9WfJ65QqG6p1eOskiX+/Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-HUNBGG1+LsjaDsJS4p5aAdCRyltylQUtdydGSoUdNgo="; buildInputs = [ atk diff --git a/pkgs/by-name/vd/vdo/package.nix b/pkgs/by-name/vd/vdo/package.nix index f705dd6f8d18..9a1454840f52 100644 --- a/pkgs/by-name/vd/vdo/package.nix +++ b/pkgs/by-name/vd/vdo/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vdo"; - version = "8.3.0.72"; + version = "8.3.0.73"; src = fetchFromGitHub { owner = "dm-vdo"; repo = pname; rev = version; - hash = "sha256-ILS5cUWR04/GePyXHj00Am4HMDAhAaN/uUe7kchjo/8="; + hash = "sha256-JowaGWh9LXEixxeVn3RmXTfKjVBOZLYQpF7pum79kUE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 900d2a801a9d..bbad3c0b8d7d 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-S1gNm8joPS2VKsTF2zUG9zSttFkSPBBOs4bpcph+saE=", - "version": "0.2025.01.08.08.02.stable_04" + "hash": "sha256-OxBFw18XHLbR7HoJHYxVQVwkO14HvJjpjrWt8nQ+FDQ=", + "version": "0.2025.01.22.08.02.stable_05" }, "linux_x86_64": { - "hash": "sha256-HHQnH4Sqju68RCBZxUpmdlpN6xSMB+3al8wKgLuvPVs=", - "version": "0.2025.01.08.08.02.stable_04" + "hash": "sha256-5Ro7nLGzmAWQGG0e2797LvvBW5nkB+OHSiw5hXw75wM=", + "version": "0.2025.01.22.08.02.stable_05" }, "linux_aarch64": { - "hash": "sha256-N0qHBTE6pczK5ceHXvCxNxWR9O7qcCtkgiPkGFUgNNE=", - "version": "0.2025.01.08.08.02.stable_04" + "hash": "sha256-C00/LQc4AmB+8UcNENrt1Qrk6nZmPwQtHHa7SEvQ+GY=", + "version": "0.2025.01.22.08.02.stable_05" } } diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix index 50177f296200..b5417d5bc1c4 100644 --- a/pkgs/by-name/we/weaviate/package.nix +++ b/pkgs/by-name/we/weaviate/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "weaviate"; - version = "1.28.3"; + version = "1.28.4"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-PV1KRPcxhGm0q4+g36MAsAPAV1IdcAD+MjOOkDcQn3Q="; + hash = "sha256-nHvN+VSk+kw4jmniKXmUJEf4cRDH7s5yMOL/asXkTNM="; }; vendorHash = "sha256-OYLHHIOZWmkAxVethJNJfJOz3kDIXefu/aAUJ/rvxeQ="; diff --git a/pkgs/by-name/wi/wike/package.nix b/pkgs/by-name/wi/wike/package.nix index 45546a31ded6..90cfb897ffbf 100644 --- a/pkgs/by-name/wi/wike/package.nix +++ b/pkgs/by-name/wi/wike/package.nix @@ -21,14 +21,14 @@ python3.pkgs.buildPythonApplication rec { pname = "wike"; - version = "3.1.0"; + version = "3.1.1"; format = "other"; src = fetchFromGitHub { owner = "hugolabe"; repo = "Wike"; rev = version; - hash = "sha256-Wx0jMO9a2K22zIU0B++0ZtPzLi+PrsJ5Sw8Sb8BODdU="; + hash = "sha256-Unw+r8NlfaSn/UCtdnkCCsC6xM33Qy6hQdUg/4bIG+I="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 94390278a683..6e7b77e2089d 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -38,7 +38,7 @@ libtiff, libwebp, libxkbcommon, - luajit, + lua, lz4, mesa, mint-x-icons, @@ -59,11 +59,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.27.0"; + version = "1.28.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PfuZ+8wmjAvHl+L4PoxQPvneZihPQLOBu1l6CBhcAPQ="; + sha256 = "sha256-8JpD1rSGG+BswOKEnFMpZBPU5SyOMfUvyV6epfHFmjY="; }; nativeBuildInputs = [ @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { libspectre libwebp libxkbcommon - luajit + lua mint-x-icons # Mint-X is a parent icon theme of Enlightenment-X openjpeg poppler diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index f3c61f2e61f2..c723ce7b137e 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "enlightenment"; - version = "0.26.0"; + version = "0.27.0"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-EbbvBnG+X+rWiL9VTDCiocaDSTrRDF/jEV/7RlVCToQ="; + sha256 = "sha256-W2a5FMbZCpFrP+ZrX/cKn9kSCIqmOZvd4bOlBarlAzE="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index eed744d1c015..d352e4bdb268 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "lxqt-panel"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-p4Y+0Ym0NNG4yrlfrLqCQyMYVjyogNb1V1QAooQ82LE="; + hash = "sha256-WS+rPiPB/BBmg4yNkpZ2cFJG/1awdjCN0ziWtcESRP4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 55ae196fe253..415c4029bfb6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -18,10 +18,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.8.4"; + version = "2.9.0"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-ykb/1+BYT0JfDpp9ZKTSy88TmQdXOjsK/eW58ZGKdJQ="; + sha256 = "sha256-j2KatlML8NuUH+IKWodDT5VeG7XL27wwiqMKjurt9rM="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 152bc01e318a..0d358ccb073d 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -282,7 +282,7 @@ stdenv.mkDerivation { # b2 needs to be explicitly told how to find Python when cross-compiling + lib.optionalString enablePython '' cat << EOF >> user-config.jam - using python : : ${python.interpreter} + using python : : ${python.pythonOnBuildForHost.interpreter} : ${python}/include/python${python.pythonVersion} : ${python}/lib ; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index c3726929f9df..46be24a05630 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { lib.optional stdenv.hostPlatform.isLinux gtk3 ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + postPatch = '' + substituteInPlace darwin/text.m unix/text.c \ + --replace-fail "strcasecmp" "g_strcasecmp" + ''; + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt ''; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index d6fd860a9870..cc7b9c9dd4a8 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -505,9 +505,9 @@ in lua-rtoml = prev.lua-rtoml.overrideAttrs (oa: { - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = oa.src; - hash = "sha256-EcP4eYsuOVeEol+kMqzsVHd8F2KoBdLzf6K0KsYToUY="; + hash = "sha256-7mFn4dLgaxfAxtPFCc3VzcBx2HuywcZTYqCGTbaGS0k="; }; propagatedBuildInputs = oa.propagatedBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; @@ -831,9 +831,9 @@ in }); tiktoken_core = prev.tiktoken_core.overrideAttrs (oa: { - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = oa.src; - hash = "sha256-pKqG8aiV8BvvDO6RE6J3HEA/S4E4QunbO4WBpV5jUYk="; + hash = "sha256-sO2q4cmkJc6T4iyJUWpBfr2ISycS1cXAIO0ibMfzyIE="; }; nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; }); @@ -846,9 +846,9 @@ in toml-edit = prev.toml-edit.overrideAttrs (oa: { - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = oa.src; - hash = "sha256-lguGj8fDqztrvqvEYVcJLmiuxPDaCpXU8aztInKjF+E="; + hash = "sha256-ow0zefFFrU91Q2PJww2jtd6nqUjwXUtfQzjkzl/AXuo="; }; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index 4a3f21a08a90..2dba7c619475 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -5,6 +5,7 @@ php, openssl, hiredis, + libck, zstd, lz4, autoPatchelfHook, @@ -14,42 +15,36 @@ }: let - version = "0.7.0"; + version = "0.10.0"; hashes = { "aarch64-darwin" = { platform = "darwin-arm64"; hash = { - "8.0" = "sha256-pd/9TWZPgAfmVM0/QVYRHu5k4gANcxCSnfAl38irO0Y="; - "8.1" = "sha256-OpxE/nu8MZedTmKGQeyJm36pyyHlRpW11avuGcnGP68="; - "8.2" = "sha256-+CMPdXZotUr43Qda1FwGpuWPEE1K4RuBNE9fiokAtoY="; - "8.3" = "sha256-lbKVxOd5gK5VDGnJ42w7L5DFKsBQDZXgEZLR/Y0gP88="; + "8.1" = "sha256-aEuYKo31dKV7TSOeKt4BSShstNxfS4EdibJ2279XTbg="; + "8.2" = "sha256-tjE+bAiVWYh6od8rW7flZ6ajMGxMJszw7H055VtDJsc="; + "8.3" = "1czi5sfic13068hj8x1fgzkwsykbrr1g5ifc53zxds5vqywa74d7"; + "8.4" = "sha256-QUryARS5omADR3kEykCnoK4IFau1RpTQKDcCJ+lN/SY="; + "8.5" = "0k33qfrlxb9v0d15mdzzqsgdcik8z65nv1q9spn7ibdxg6clzykj"; }; }; "aarch64-linux" = { platform = "debian-aarch64+libssl3"; hash = { - "8.0" = "sha256-NfeC3p0YLYz3NbjzjMRRuzMsnYe9JRwlBjddAG2WV7g="; - "8.1" = "sha256-kvO0PE3BSgFSfe1zHh3WnygQfVV+5V0YFfClBim1Kj4="; - "8.2" = "sha256-illxRqqwMKVNAp6BD+mktKDccM7B/Q1W1KF9UB6aMUQ="; - "8.3" = "sha256-QdB7g+ePJU8qt/BVo1CFnQ2vfkqR29WueBy3dLOOaR0="; - }; - }; - "x86_64-darwin" = { - platform = "darwin-x86-64"; - hash = { - "8.0" = "sha256-rd3pt2N22bF4a8OOwksI7KJjR91IoxHwk3LcKuHSpV0="; - "8.1" = "sha256-Y/moZrBe4rooQBSQKS8vPCTjviHKy4O7d4T1kD3udC4="; - "8.2" = "sha256-H3EWFk/ZmE+fSU98nLHyq1p1vtU/TYp28OzNLox6kYY="; - "8.3" = "sha256-vZTarrauo7U2JLOXUCwmu2h+vBtWZpm0Q39KkuLyVgY="; + "8.1" = "sha256-Aq4jZyo5JzVtJM96HzzsnSnx8jOCAmHB6f3eo1922gs="; + "8.2" = "sha256-Yd1bWEsRXuG30aDE9lCgLa/qlnXyeMehR3ROF0uAVTY="; + "8.3" = "sha256-j6qhr04zQDi+mQh968nVxlTGEnhQobI7kG8DK35sCiM="; + "8.4" = "0av8g5n4h3g2r4jbv3v1bwyx256z58wyygnd5jk4jzpx0ik2c1vv"; + "8.5" = "1aav4lh29d507av5ydxjvgm20fljl5lwdljdyq3038g3gi06yjaj"; }; }; "x86_64-linux" = { platform = "debian-x86-64+libssl3"; hash = { - "8.0" = "sha256-jq/nHC9IGevYBqbM08nF71P9jH6z4NB8s1NdjHOfXQA="; - "8.1" = "sha256-vbFONNHpuSTQsZMrAIdGEoBl5ySchcFkSuhW5uZKbWg="; - "8.2" = "sha256-mXUAMkxwtuPZbIyCybBcxpmaBplr5h59pZEdgJ3PWtA="; - "8.3" = "sha256-YL0P8GtFkV0cmJX1y6wd/HtA0LFzeuOcKDLUCagxHxE="; + "8.1" = "sha256-306YMQr/UCJ+LOgEdzmqAPVBvbq2TDXnvSxdh4u6Nbc="; + "8.2" = "sha256-tapNth0vqNlCh1c3HryIYOs+V9jadTV1rMvoz+tVbeI="; + "8.3" = "sha256-f0eKpHcdiOHM55VuPYq+AJnbIwnBDLaECv+hYMBh0dw="; + "8.4" = "05h2ikl0ymd2xmqifvv700xazhllsm234s41ipdgfwdj7zyxv58s"; + "8.5" = "0frnd7y3zvj8vq10r4479lx04lj606xzd3hjg61lg5mq65i6xih0"; }; }; }; @@ -79,17 +74,17 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ autoPatchelfHook ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + hiredis + libck openssl zstd lz4 ]; + internalDeps = [ php.extensions.session ]; installPhase = '' runHook preInstall - - mkdir -p $out/lib/php/extensions - cp relay-pkg.so $out/lib/php/extensions/relay.so - chmod +w $out/lib/php/extensions/relay.so + install -Dm755 relay.so -t $out/lib/php/extensions '' + ( if stdenv.hostPlatform.isDarwin then @@ -105,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { [ (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis.1.1.0.dylib" hiredis) (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" hiredis) + (nameValuePair "/opt/homebrew/opt/concurrencykit/lib/libck.0.dylib" libck) (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib" openssl) (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib" openssl) (nameValuePair "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib" zstd) @@ -136,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { common-updater-scripts ] }" - NEW_VERSION=$(curl --silent https://builds.r2.relay.so/meta/builds | tail -n1 | cut -c2-) + NEW_VERSION=$(curl --silent https://builds.r2.relay.so/meta/builds | sort -V | tail -n1 | cut -c2-) if [[ "${version}" = "$NEW_VERSION" ]]; then echo "The new version same as the old version." @@ -144,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { fi for source in ${lib.concatStringsSep " " (builtins.attrNames finalAttrs.passthru.updateables)}; do - update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "$NEW_VERSION" --ignore-same-version + update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "$NEW_VERSION" --ignore-same-version --ignore-same-hash --print-changes done ''; diff --git a/pkgs/development/python-modules/aiohttp-sse/default.nix b/pkgs/development/python-modules/aiohttp-sse/default.nix new file mode 100644 index 000000000000..851f0fef08cb --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-sse/default.nix @@ -0,0 +1,49 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + lib, + pytest-aiohttp, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "aiohttp-sse"; + version = "2.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "aiohttp-sse"; + tag = "v${version}"; + hash = "sha256-iCjWuECUQukCtlQPjztEwawqSzd3LvvWRGXnhZem22w="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + ]; + + pythonImportsCheck = [ "aiohttp_sse" ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + changelog = "https://github.com/aio-libs/aiohttp-sse/blob/${src.tag}/CHANGES.rst"; + description = "Server-sent events support for aiohttp"; + homepage = "https://github.com/aio-libs/aiohttp-sse"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 1625eceb7a82..728e54994ce5 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M4if9eSRG7544OaVj3HXtvOWPm1mg8Nz5dh6nl0hx+4="; + hash = "sha256-4zLvrOHsQg8NhZlTSkAzNffN56H89JeYkKxwHNb3n+Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index cc66dcd155df..67a771304cc7 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.7.2"; + version = "4.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "auth0"; repo = "auth0-python"; tag = version; - hash = "sha256-g6sbxPglKDGbDMiB9crnua86y6TPIbLiFddeymrLAP0="; + hash = "sha256-E+vZJ4yuWA5iy5/7PAGnk8rcSd9gWbgIoezyfnnvP7M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index 0ebf099404d2..7e12b5eeac90 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "authlib"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "lepture"; repo = "authlib"; tag = "v${version}"; - hash = "sha256-GUB/ioyeFfuuKZqsqJkDq0e6ETa1jqyr+GJHPddLRkA="; + hash = "sha256-1Iygc35+Vc1zyn8rjubnSLmpvjckY4TRKOtf2bkrkdI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix index c4ac42a60452..dadde046f6ff 100644 --- a/pkgs/development/python-modules/bdffont/default.nix +++ b/pkgs/development/python-modules/bdffont/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bdffont"; - version = "0.0.26"; + version = "0.0.27"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "bdffont"; inherit version; - hash = "sha256-Q8IqwJmAYFicTX7RrVU9UvGZX+oaPb0RKlIFwArktXk="; + hash = "sha256-1sYjiCklQ2gfQQIZcZ/Fk27XBzRrbZEY+1JNaJ/8LTs="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/beanhub-import/default.nix b/pkgs/development/python-modules/beanhub-import/default.nix index 81f2c43db56e..c79aa99ec891 100644 --- a/pkgs/development/python-modules/beanhub-import/default.nix +++ b/pkgs/development/python-modules/beanhub-import/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "beanhub-import"; - version = "1.0.3"; + version = "1.0.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-import"; tag = version; - hash = "sha256-6Y1gYAi8A6H0a0vj2avWxGS7hvjrvLBUS+LsgvY4sZo="; + hash = "sha256-cDvYebzR9OmBYC+sjwNNf2nm4lxWGZVKuW4BusecDCk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index 60a826b8b44c..c0f7c257da9d 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.5.0"; + version = "1.5.1"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "boost-histogram"; tag = "v${version}"; - hash = "sha256-GsgzJqZTrtc4KRkGn468m0e+sgX9rzJdwA9JMPSSPWk="; + hash = "sha256-7E4y3P3RzVmIHb5mEoEYWZSwWnmL3LbGqYjGbnszM98="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 502f538739ba..e133c9643d59 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.36.8"; + version = "1.36.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-8J+hyMYuDd3zvMQFORoSErHe5W1wQ3izg/9A8d3BSNs="; + hash = "sha256-jz2FqS9C6N9E807AHHwWIv753NPoXUfvlaO88UEp6ZI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 81238266e916..e026589768f6 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.36.8"; + version = "1.36.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-qLZdf2rhSqkNA/vBwnt8PGs8o9fC6x2BREG6BKIt2YE="; + hash = "sha256-eGhX/J9OEfFrYuA4O41go6A6msEP4j1X0fpybndiZTU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/character-encoding-utils/default.nix b/pkgs/development/python-modules/character-encoding-utils/default.nix index 83d01916d3c6..663d89f5ab68 100644 --- a/pkgs/development/python-modules/character-encoding-utils/default.nix +++ b/pkgs/development/python-modules/character-encoding-utils/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "character-encoding-utils"; - version = "0.0.8"; + version = "0.0.9"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "character_encoding_utils"; inherit version; - hash = "sha256-UXX4L/x7fP37ZEFDCPc0KRNyx47xvwY0Jz+lfxzUulg="; + hash = "sha256-QxnXNerl7qncoBxhfC3G0ar+YprfBpn6pWnUKakNR+c="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index 4eba6cd7c5c0..5bab592a0e69 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.4.3"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; tag = "v${version}"; - hash = "sha256-1gKL97oS06vgq4gpQSXeMfKzAtjAGQnB48W5BOiMBHA="; + hash = "sha256-x24TyJYy+z3v41DpJyOTYin/YvkqMHd/Rg4bTivk9M0="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix index 891012810bf8..696e4d19feec 100644 --- a/pkgs/development/python-modules/geometric/default.nix +++ b/pkgs/development/python-modules/geometric/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, lib, fetchFromGitHub, - fetchpatch, networkx, numpy, scipy, @@ -12,24 +11,16 @@ buildPythonPackage rec { pname = "geometric"; - version = "1.0.2"; + version = "1.1"; format = "setuptools"; src = fetchFromGitHub { owner = "leeping"; repo = "geomeTRIC"; tag = version; - hash = "sha256-DmrKLVQrPQDzTMxqEImnvRr3Wb2R3+hxtDVCN9XUcFM="; + hash = "sha256-8kM6zaQPxtFiJGT8ZW0ivg7bJc/8sdfoTv7NGW2wwR8="; }; - patches = [ - (fetchpatch { - name = "ase-is-optional"; - url = "https://github.com/leeping/geomeTRIC/commit/aff6e4411980ac9cbe112a050c3a34ba7e305a43.patch"; - hash = "sha256-JGGPX+JwkQ8Imgmyx+ReRTV+k6mxHYgm+Nd8WUjbFEg="; - }) - ]; - propagatedBuildInputs = [ networkx numpy diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 76f2cfd98b6e..846e9c506755 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "1.5.5"; + version = "1.5.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; tag = version; - hash = "sha256-SyyyNBhJVVKAzPl288B7E2PoqNd9Pp9VmSJASYez6Gs="; + hash = "sha256-TQSQ+gW79GV3lkdPAYsJb2stvVY4CktjjS3yO7S8o2E="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index f1e2cbbed7b9..5ceb8a4729c4 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "25.1.0"; + version = "25.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "gvm-tools"; tag = "v${version}"; - hash = "sha256-+2GoWsGDMrsKyTbDB3MVWRtgqyEZuSWznCW8eUmYVFE="; + hash = "sha256-2IE2Nxz0EBWlbL09XgA/AtfFi9gOE/VSMZmb5Op+clY="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index e9c6c2cf6f42..dc3868210bca 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.27.1"; + version = "0.28.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; tag = "v${version}"; - hash = "sha256-7cfu+qBro6u7bcRTTWHq+AemHqW7yb702owGoE5iTVg="; + hash = "sha256-QrbwpJub4+pfbFERBk6GSZDSrjoCPniO+kB5hiddk28="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 6c549c1d29ce..284dce8d24be 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.6.5"; + version = "2.6.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = "identify"; tag = "v${version}"; - hash = "sha256-FKF3+jN5/D0hRSvr90AY/C/5KBx0c7LvR+l12IP+zbU="; + hash = "sha256-yglqCpaX9RnFn4kARf5HIu7xnL2ZbUet4ukbqECTwCw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 474f20b5b37c..34ff46b4c310 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "5.1.0"; + version = "5.2.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Ja8fSNFFa5oKzHsyxoxm6czLrlQWcvm5ck8nTXgQowc="; + hash = "sha256-yB1YmHF7grYJo84qc/i40yMLDHV+XA3p1rGs/cIk9VE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix index 8ed87aca939a..a3439ea1b824 100644 --- a/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "jsonschema-spec"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = pname; tag = version; - hash = "sha256-oBzB6Ke19QDcMQm4MpnaS132/prrtnCekAXuPMloZx4="; + hash = "sha256-rCepDnVAOEsokKjWCuqDYbGIq6/wn4rsQRx5dXTUsYo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 533367d32d46..5f1e6e7ad2e7 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.9"; + version = "0.1.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-/AO9M4odoEt2B6RNgqYrPrF42ArwWlNlPoAdb4u2ffc="; + hash = "sha256-1L5bSGWf2f4WmHJ74lcmmiLX8nM6LtEbznBldo65TL4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 81a888cad69c..0c253982aa61 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-PF2Dacn7DhoI6pLWJCh3idKhwc0VM9jgaBzmW8uSg6E="; + hash = "sha256-wTmLGWu/Wnrs1sXqs4LFigJVR+/iAGWxUv6oTFGfLBQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index 98ab38e96010..0ab026a499e5 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.6.3"; + version = "0.6.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-8J5BgsvCor11roXOuxaBB1JH8NkbkxsJTKxDFThs6Ho="; + hash = "sha256-C0WXPLLclwISIAYBm/tVbcq7oxsL33mvx7N2yoFD3wM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index c4028223a15b..160aaa37b664 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.5.19"; + version = "0.5.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-22nacOGZomZHBeuYOnD6krfO4Z3Wz/F1r3aSoLik3VM="; + hash = "sha256-ZJ4lZDHTdTAluaMguwO3aEnOS1oRITlMgD31Q+bBAG8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 36c2a05eeb59..d137329a7b92 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -134,8 +134,8 @@ rec { "sha256-mmoqRFyHOcY9oVufUP5t9OlhUVQt1Fu5zaIC6iLiBt8="; mypy-boto3-appsync = - buildMypyBoto3Package "appsync" "1.36.0" - "sha256-06PnQoBKYhqj97pumXoknt4QwWTmFZqdHw80WnMBad8="; + buildMypyBoto3Package "appsync" "1.36.8" + "sha256-NSE8FKmNW1g3TTddFEJ22R80oEncfEAifk22xnCn2Bw="; mypy-boto3-arc-zonal-shift = buildMypyBoto3Package "arc-zonal-shift" "1.36.0" @@ -382,8 +382,8 @@ rec { "sha256-BThesaer2rOGyx8OtRo6cWQoX2xnyTgSgi3amd+qDrU="; mypy-boto3-datasync = - buildMypyBoto3Package "datasync" "1.36.0" - "sha256-THPRUkDTeUFwsWUKU3I8OcZ+U2VsqY56zhVLqhUml6U="; + buildMypyBoto3Package "datasync" "1.36.8" + "sha256-aKU44bUh6A9jiezNPDWYIFzXNYIX8VJ9+4rrxQ0xPkg="; mypy-boto3-dax = buildMypyBoto3Package "dax" "1.36.0" @@ -446,20 +446,20 @@ rec { "sha256-YrzTW5fEsZPDu4p84jhY4avS/wM01XybrvGCOtF48cQ="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.36.5" - "sha256-BKeub+Y+DKAAMTtps97o9nMVHpcPA+QF10sRAIH5VE8="; + buildMypyBoto3Package "ec2" "1.36.8" + "sha256-r63ya2QLeI3N0onajpBwq98ikz4pv6VlS5GVYpOoXyA="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.36.0" "sha256-q6u1MssNxk38vE2Gy/508A5bhdUrqxH/Mq3DeBFVfqA="; mypy-boto3-ecr = - buildMypyBoto3Package "ecr" "1.36.0" - "sha256-ZCGpMLVliE01R1c+qomlyo4TELGfWZuSICdMeVvFxL4="; + buildMypyBoto3Package "ecr" "1.36.9" + "sha256-fcK3kDTHtZ1wsCJ1LL3kd3+tz0ukEejeW/badxJQvBg="; mypy-boto3-ecr-public = - buildMypyBoto3Package "ecr-public" "1.36.0" - "sha256-ezh5me1scgEEH0I/19CSVDstsLkwYgdVhwPuVivbKWk="; + buildMypyBoto3Package "ecr-public" "1.36.9" + "sha256-PDee5f426UyeflcN83ETtwpUmIY6AqqGu7Q6JdOnazM="; mypy-boto3-ecs = buildMypyBoto3Package "ecs" "1.36.1" @@ -534,8 +534,8 @@ rec { "sha256-Jkf9euVgG4wY8vyMfj1FV973DxZjly1lNZ5MKN/b6WA="; mypy-boto3-firehose = - buildMypyBoto3Package "firehose" "1.36.0" - "sha256-4rg+/mUkoFhYUQ5E46VAJCT6zPDxWo4fYXBnQzkfLDI="; + buildMypyBoto3Package "firehose" "1.36.8" + "sha256-5NcedA+2dPGC4qTg9HPT0nA3Y4QIGECNVaIy6c09lMw="; mypy-boto3-fis = buildMypyBoto3Package "fis" "1.36.0" @@ -634,8 +634,8 @@ rec { "sha256-YBNZe+PnJgXQ2On2x1ppx/a2ua/HMS9XQjg6nYlsLj4="; mypy-boto3-iot = - buildMypyBoto3Package "iot" "1.36.0" - "sha256-bxtAI1FJFqb2mQAbKxZJCl5w8DHtU3CNHwiqI7ewahw="; + buildMypyBoto3Package "iot" "1.36.7" + "sha256-C+UaX7jvRy/g54924iLazVt1Dg67gkW8/wI1+NfU7wY="; mypy-boto3-iot-data = buildMypyBoto3Package "iot-data" "1.36.0" @@ -862,8 +862,8 @@ rec { "sha256-kNE9LvLz9ltNM6UcMhXeyGWm+uHMAK3E5V/t30QYo+0="; mypy-boto3-mediaconvert = - buildMypyBoto3Package "mediaconvert" "1.36.0" - "sha256-d4AwaMKqhplnUnpLQv+zukeKX7+TlhGt5YwTZFCPlKo="; + buildMypyBoto3Package "mediaconvert" "1.36.7" + "sha256-SuIB0cn2magEfWAeNIxCa2AiEgklovL2PO8fWdRm26A="; mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.36.4" @@ -1162,12 +1162,12 @@ rec { "sha256-DLbt+8tSmmMHfjifzFJGKezEmbiTxiA5KfCfcL+I/V8="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.36.0" - "sha256-gKiBhHsOH7xe3K2LKHDBEOMefvEo20JAK3DBWbfpPVo="; + buildMypyBoto3Package "s3" "1.36.9" + "sha256-NoyWOWntpluzqd9h6HUQ3YsyR8zln1WcLsbEPVeWvvU="; mypy-boto3-s3control = - buildMypyBoto3Package "s3control" "1.36.0" - "sha256-5MjHD4znZ8FLET4YRpO0k3QQVUfSdB/2ufTTDwmCSYM="; + buildMypyBoto3Package "s3control" "1.36.7" + "sha256-mGZawDNAK8+MpJihk1AVKiXRQ3GhLQvvYZbn6hGskVE="; mypy-boto3-s3outposts = buildMypyBoto3Package "s3outposts" "1.36.0" diff --git a/pkgs/development/python-modules/myuplink/default.nix b/pkgs/development/python-modules/myuplink/default.nix index fff9867a2109..dcfe77f78c85 100644 --- a/pkgs/development/python-modules/myuplink/default.nix +++ b/pkgs/development/python-modules/myuplink/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "myuplink"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pajzo"; repo = "myuplink"; tag = version; - hash = "sha256-QIFTM4RQR3C67q+sBUCPhUyXylzplNAppHjzvU7i2YU="; + hash = "sha256-r06aap8FiRslRRgKKSH7vNzpoVn6rX8ZR0oQ0D68xDo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix index 33553d8c1121..04d9b221cd39 100644 --- a/pkgs/development/python-modules/niaaml/default.nix +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "niaaml"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "NiaAML"; tag = version; - hash = "sha256-3wr+72j/0HR9gRwxdzP4QyLKFaobkrD4QwTtiAUik0Q="; + hash = "sha256-i5hjmvN9qJCGVDmRDBTiaNQn+1kZHr2iWNnD7GUimr4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index eb23d5df9707..1d52e82799d8 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.8.7"; + version = "0.8.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; tag = "v${version}"; - hash = "sha256-TUR3+UqsV04YLoLWiAp24viteKDkUsJ3MPCzirKBP8A="; + hash = "sha256-Djega2v8ybzTBfczPz/5INjGZpiWjunInLa0ywKuXL4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/peco/default.nix b/pkgs/development/python-modules/peco/default.nix index 22f5d29faf8e..6497063c4f7d 100644 --- a/pkgs/development/python-modules/peco/default.nix +++ b/pkgs/development/python-modules/peco/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "peco"; - version = "0.1.1"; + version = "0.1.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-p9Uxckc88HbUUtpg3fHGwYojU57mCuRzh3M1RAjKLX0="; + hash = "sha256-xW65tEL86ecOfGIbnGiSnKtq7SmKQxW2eMTVrs/nxNc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index 5276e951b3c7..765b25b70f58 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, capnproto, - cython, + cython_0, fetchFromGitHub, isPy27, isPyPy, @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "pycapnp"; - version = "1.1.0"; + version = "2.0.0"; format = "setuptools"; disabled = isPyPy || isPy27; src = fetchFromGitHub { owner = "capnproto"; repo = pname; - rev = "v${version}"; - sha256 = "1xi6df93ggkpmwckwbi356v7m32zv5qry8s45hvsps66dz438kmi"; + tag = "v${version}"; + sha256 = "sha256-SVeBRJMMR1Z8+S+QoiUKGRFGUPS/MlmWLi1qRcGcPoE="; }; nativeBuildInputs = [ - cython + cython_0 pkgconfig ]; @@ -38,8 +38,5 @@ buildPythonPackage rec { homepage = "https://capnproto.github.io/pycapnp/"; maintainers = [ ]; license = licenses.bsd2; - # No support for capnproto 1.0 yet - # https://github.com/capnproto/pycapnp/issues/323 - broken = lib.versionAtLeast capnproto.version "1.0"; }; } diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index db1452a61451..a1958b26bb2f 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.13"; + version = "1.4.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Osz4UulGZT45nD1Nu+EZ28bT9yz9LVqVyr8L8Mf5JP4="; + hash = "sha256-EISP9qxzMraOZb+MLolme2tisHWq0nI0d0Smm/HIrX4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index ee18a98ab2f9..2c3af130fee4 100644 --- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; tag = "v${version}"; - hash = "sha256-6L+o+XM+im8qJFyd3h+b1ZxY1QSEdoXDop5en33fECI="; + hash = "sha256-zDv04yHYQP2ZKX9g4v7kR8l3OmAyvh7GtmmqjxPtFvI="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pystac/default.nix b/pkgs/development/python-modules/pystac/default.nix index e63f79533bc2..da3b526e56fc 100644 --- a/pkgs/development/python-modules/pystac/default.nix +++ b/pkgs/development/python-modules/pystac/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pystac"; - version = "1.11.0"; + version = "1.12.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "stac-utils"; repo = "pystac"; tag = "v${version}"; - hash = "sha256-yuAam/sXaGMFp1Kwxd28v3nOV05GC3sUY+gKJ4nLwTs="; + hash = "sha256-VTpkQdPydKUb/FGZhfFM/2IDUbsVz903q6s5MxLRlYM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 0ddb147a32a0..ce0501d4eaa8 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "24.12.0"; + version = "25.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "pytest-ansible"; tag = "v${version}"; - hash = "sha256-Z0pgWptr/bDGZCMi0l8J+q39d3zwBHfawNeJtELHo0E="; + hash = "sha256-8Lwr8n2zMztE13ExQk+QYsS7lcLxj7hqpRWMACthXZs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-textual-snapshot/default.nix b/pkgs/development/python-modules/pytest-textual-snapshot/default.nix index a670bd842bb6..b0ab480685fd 100644 --- a/pkgs/development/python-modules/pytest-textual-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-textual-snapshot/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-textual-snapshot"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "pytest-textual-snapshot"; tag = "v${version}"; - hash = "sha256-C8vL2kLOvVcDlTtNiG/pf7PwHzb/F0sWdkEcLvdGrd8="; + hash = "sha256-ItwwaODnlya/T0Fk5DOPRLoBOwkUN5wq69cELuvy/Js="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/quantile-forest/default.nix b/pkgs/development/python-modules/quantile-forest/default.nix index 8861ac8de900..39e1b01cdbcc 100644 --- a/pkgs/development/python-modules/quantile-forest/default.nix +++ b/pkgs/development/python-modules/quantile-forest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "quantile-forest"; - version = "1.3.11"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zillow"; repo = "quantile-forest"; tag = "v${version}"; - hash = "sha256-0gdXjr+mRInZtvmgH1vRjLCkXZmTn1zWmD3E1ass9hQ="; + hash = "sha256-VzHGjV2WWCebUh3UINFi4DbrXBnZXVK2GQtcJb0oKoM="; }; build-system = [ diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index 517f380fd6a1..bd49a7a1ded7 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/pkgs/development/python-modules/resend/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resend"; - version = "2.5.1"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; tag = "v${version}"; - hash = "sha256-KOZJiJYqUdQYJPyxoNJ8sMUR1gIZF8+i9m+cAQokByI="; + hash = "sha256-Sxe1TS/MahzKObPpo4+Iq+jbIuw4H1NJ3oU74MXZByQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix index 1ae3f05c5697..cc7238f80678 100644 --- a/pkgs/development/python-modules/roadrecon/default.nix +++ b/pkgs/development/python-modules/roadrecon/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "roadrecon"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0Rv88lbqvTJD183nLhvi2Ue1ZD1eoRW1sytJ+t85bcg="; + hash = "sha256-yyPqXLkKe1LpDJDfREYDyVpgpvDB04Lh2YaL3c6ZYYc="; }; pythonRelaxDeps = [ "flask" ]; diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index f851a547c16e..9a57ffadaa51 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.13.4"; + version = "0.13.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; tag = version; - hash = "sha256-WzhLHFOL0DY6DfDxRZlhcXXfiHWAg1jzXHtXBmmbAbQ="; + hash = "sha256-guGWvoR+T3rFumGdMNMKsEYgjpfdvHf9QI1JJ0T3ROE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index 49b0c4c42620..5ecd35e78a8c 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, @@ -28,14 +27,14 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "3.3.1"; + version = "3.4.1"; pyproject = true; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; tag = "v${version}"; - hash = "sha256-D8LHzEVHRuayod084B05cL3OvZiO1ByDZLxROGxTD0I="; + hash = "sha256-TNqCukHdjQYxK/UkAV/lm+TTAm5NyoZjVPUyHPyE3Ko="; }; build-system = [ setuptools ]; @@ -64,14 +63,18 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access + "test_LabelAccuracyEvaluator" + "test_ParaphraseMiningEvaluator" + "test_TripletEvaluator" "test_cmnrl_same_grad" "test_forward" "test_initialization_with_embedding_dim" "test_initialization_with_embedding_weights" - "test_LabelAccuracyEvaluator" + "test_loading_model2vec" + "test_model_card_base" "test_model_card_reuse" + "test_nanobeir_evaluator" "test_paraphrase_mining" - "test_ParaphraseMiningEvaluator" "test_save_and_load" "test_simple_encode" "test_tokenize" diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix index b7fddfd9e782..1c1325653ee5 100644 --- a/pkgs/development/python-modules/skrl/default.nix +++ b/pkgs/development/python-modules/skrl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "skrl"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Toni-SM"; repo = pname; tag = version; - hash = "sha256-e08hhO7CTH6V+8ZUhte36GD0fL7XvuW/CgIuARU3c6E="; + hash = "sha256-5Poc079E+6jpNsm/WUFBXqsIKWZpIIAW0fmoWLVEZDg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/tinytuya/default.nix b/pkgs/development/python-modules/tinytuya/default.nix index 9ff3e7c7ac5b..d4ff3e2a7fca 100644 --- a/pkgs/development/python-modules/tinytuya/default.nix +++ b/pkgs/development/python-modules/tinytuya/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tinytuya"; - version = "1.16.0"; + version = "1.16.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jasonacox"; repo = "tinytuya"; tag = "v${version}"; - hash = "sha256-K65kZjLa5AJG9FEYAs/Jf2UC8qiP7BkC8znHMHMYeg4="; + hash = "sha256-+ReTNPKMYUXNA5tu7kZM8/7Bh4XjHSjZTiW8ROHkk5M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 718bf06ea14d..2711b55448bc 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -59,14 +59,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.48.1"; + version = "4.48.2"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; tag = "v${version}"; - hash = "sha256-doYvjwajwXqqaKZ363p2SE//9eupfkwrG66j0iUAnU0="; + hash = "sha256-jW/yhzmxQd/5BgbDImUaJSF0oMKIpIGhFoJuMZu0tv0="; }; patches = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index dcff8b4f0dea..a1ff069ce3fe 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.6.0"; + version = "4.6.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-XySMp5DvwkHEbsmj1+50TMcopnz1KoR592ZZG+UfoaQ="; + hash = "sha256-/uoiGFhKZnEzinDryUMwpoxZwSggV0ZPd9kqgB1vQPI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index fc3f4e38236e..2ec55d8b6020 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.23.6"; + version = "0.23.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-QFvOjCgfnnxskqIpIlzAvxDTBymmpgESMhM4m9UkuLE="; + hash = "sha256-IUE5Go9NNs8JhAbBnZBgs08TpVjCLUqtrCUKDFfRJxA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix index 793cbc7428a0..df0f39d9ce77 100644 --- a/pkgs/development/python-modules/unidata-blocks/default.nix +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "unidata-blocks"; - version = "0.0.15"; + version = "0.0.16"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "unidata_blocks"; inherit version; - hash = "sha256-dPVJjA+udN6hD8v+pp59/SsHHCwmJLVRYuCDBQIGJQk="; + hash = "sha256-b/5Yq9wI+qSYSObBMCqZ3j8fSXwe4ssenNlvpkJSZro="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index c903ede48d27..5ea52995d331 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -37,10 +37,10 @@ let hash = "sha256-Iu28LMDNmtL2r7gJV5Vbb8HZj18dlkHe+mw/Y1L8YKE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - sha256 = cargoHash; + hash = cargoHash; }; nativeBuildInputs = @@ -87,19 +87,19 @@ in wasmer = common { pname = "wasmer"; buildAndTestSubdir = "packages/api"; - cargoHash = "sha256-HKbVss6jGFdnCgXV3UYf6RxtmQM3+tq3cHfOSKw5JnY="; + cargoHash = "sha256-oHyjzEqv88e2CHhWhKjUh6K0UflT9Y1JD//3oiE/UBQ="; }; wasmer-compiler-cranelift = common { pname = "wasmer-compiler-cranelift"; buildAndTestSubdir = "packages/compiler-cranelift"; - cargoHash = "sha256-BTBkoTluK7IVS+TpbQnMjn2Wvwhfxv1ev5PZWS/kW0w="; + cargoHash = "sha256-oHyjzEqv88e2CHhWhKjUh6K0UflT9Y1JD//3oiE/UBQ="; }; wasmer-compiler-llvm = common { pname = "wasmer-compiler-llvm"; buildAndTestSubdir = "packages/compiler-llvm"; - cargoHash = "sha256-AfLp4RLfnJ3R1Wg+RCJRmYr7748LQtl1W+ttTgIMls4="; + cargoHash = "sha256-oHyjzEqv88e2CHhWhKjUh6K0UflT9Y1JD//3oiE/UBQ="; extraNativeBuildInputs = [ llvm_14 ]; extraBuildInputs = [ libffi @@ -112,6 +112,6 @@ in wasmer-compiler-singlepass = common { pname = "wasmer-compiler-singlepass"; buildAndTestSubdir = "packages/compiler-singlepass"; - cargoHash = "sha256-4DoeKRjS/2ijpUva0p/AE3qoIyt8CvCjkPWFPyLH6gs="; + cargoHash = "sha256-oHyjzEqv88e2CHhWhKjUh6K0UflT9Y1JD//3oiE/UBQ="; }; } diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 9e631be1be0e..9e5d4f009b32 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7RSwRKLfNEZQczMriaeXH8uMMqR5Drdmtc68RCO2xTA="; }; - cargoHash = "sha256-O7AhHkL59/B6cbjfyeWbbevJHxOLcQfNQ3mbLAnQwQk="; + useFetchCargoVendor = true; + cargoHash = "sha256-z89LPoXsJKoKm+Aqi7PHtRn4iI77hAJQPVjKWNTgm8U="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index dcae9d8664c4..893951cabd75 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.17.1"; + version = "3.17.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-a57l7QUTeaacpFFzrGxd61a0ShwW4wt8NxNDMD2DWsY="; + hash = "sha256-ner+7Q7P6eZeZCzY5hl/CGT3P817lLWxma5NLgei6mQ="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 82b8cd33972b..b89c62871c02 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -12,6 +12,7 @@ linkFarm, substitute, installShellFiles, + buildPackages, enableShared ? !stdenv.hostPlatform.isStatic, enableStatic ? stdenv.hostPlatform.isStatic, webUISupport ? false, @@ -195,15 +196,24 @@ rustPlatform.buildRustPackage { bash ./script/build-wasm --debug ''; - postInstall = '' - PREFIX=$out make install - ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"} - ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"} - installShellCompletion --cmd tree-sitter \ - --bash <("$out/bin/tree-sitter" complete --shell bash) \ - --zsh <("$out/bin/tree-sitter" complete --shell zsh) \ - --fish <("$out/bin/tree-sitter" complete --shell fish) - ''; + postInstall = + '' + PREFIX=$out make install + ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"} + ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"} + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd tree-sitter \ + --bash <("$out/bin/tree-sitter" complete --shell bash) \ + --zsh <("$out/bin/tree-sitter" complete --shell zsh) \ + --fish <("$out/bin/tree-sitter" complete --shell fish) + '' + + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd tree-sitter \ + --bash "${buildPackages.tree-sitter}"/share/bash-completion/completions/*.bash \ + --zsh "${buildPackages.tree-sitter}"/share/zsh/site-functions/* \ + --fish "${buildPackages.tree-sitter}"/share/fish/*/* + ''; # test result: FAILED. 120 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out doCheck = false; diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index b0afedff7f98..8cc82cea4e40 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -18,8 +18,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.18.1"; - sha256 = "91df43f8ab6c3f7be81522d73313dbdd5634bbca228ef0e6d9369fe0ab8cccd0"; + version = "20.18.2"; + sha256 = "69bf81b70f3a95ae0763459f02860c282d7e3a47567c8afaf126cc778176a882"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index 3d6a8ae1ae44..a5ba3104eb3e 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -13,11 +13,11 @@ mkKdeDerivation rec { pname = "angelfish"; inherit (sources.${pname}) version; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { # include version in the name so we invalidate the FOD name = "${pname}-${version}"; src = sources.${pname}; - hash = "sha256-offD53HaPG0GQk+aPjRzhhc8d8wfHYmdaJ0X8NtluMU="; + hash = "sha256-5TMHytHLIjdzY6O1+V9do/JCfxFfBkYD+bd+FNLlrMk="; }; extraNativeBuildInputs = [ diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 43a3cf721426..45b65560eb81 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.17.1"; + version = "10.18.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; tag = "v${version}"; - hash = "sha256-GN66AC/afsSTonx7en2cUDQMAAgROJ392LzglVJsx+o="; + hash = "sha256-gO0l7Gx/lw/r5VZ2PgglTFv+XyfRyefG6YM/EFdty8o="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-pr/iZH+L7by1alUzGFid51wYOI/TcC3aUQmzl9udXE0="; + vendorHash = "sha256-NGO4SB2wl5ivehHgm+cQnTee4XTwaztLTno5POpCVuw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 98c16ec36983..d1a99a741e7d 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "headscale"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - hash = "sha256-s6s+0RHgAPxmSidfAoAne1d7DRwbC3d9udki3TlPmlY="; + hash = "sha256-LNTXXzCly0FMriS+J6VhSbvRmo7ILKOjNmfgp3h4SYo="; }; vendorHash = "sha256-SBfeixT8DQOrK2SWmHHSOBtzRdSZs+pwomHpw6Jd+qc="; diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix index a6e80230b47b..6ce4f09a4bf6 100644 --- a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "make-all"; domain = "tuya_local"; - version = "2024.11.4"; + version = "2025.1.2"; src = fetchFromGitHub { inherit owner; repo = "tuya-local"; tag = version; - hash = "sha256-Mmcq0GBWiE6IWUVL6q9lw29wKEymAQn439/pOSqWgdQ="; + hash = "sha256-qgNXY31YPzD1R+mdkw1nb35JU1rZ6kNj5Npjn+qfon4="; }; dependencies = [ diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 0335af7ab50b..c305b363602d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -28,10 +28,10 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-pucGVKEjQNihlHmFxhgJSiX7sxpQYrCpSwhZByBtbe8="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-AZi3QIPHqfxfCGcZAAD0rzmzLH6tUxhuq+Tc38qdUKc="; + hash = "sha256-1BFVW89+1js5mn/EPxkuHaUfkFn/dNlMlH1pN2lDcwE="; }; postPatch = '' diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index ec5aa5f90fcf..7877f48a7620 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -10,13 +10,13 @@ buildPostgresqlExtension rec { pname = "citus"; - version = "12.1.6"; + version = "13.0.0"; src = fetchFromGitHub { owner = "citusdata"; repo = "citus"; rev = "v${version}"; - hash = "sha256-PYABH4e5Wp5hMvEQMRHjPL7gDVu8Wud6d+BzrBBMjIQ="; + hash = "sha256-1if/rYMQV1RG4ZkjqTFuFYu5f1JhJiMF4rCVo8gp7+8="; }; buildInputs = [ diff --git a/pkgs/tools/archivers/gbl/default.nix b/pkgs/tools/archivers/gbl/default.nix deleted file mode 100644 index 889c6b5ad1a7..000000000000 --- a/pkgs/tools/archivers/gbl/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - fetchpatch, - pkg-config, - openssl, - testers, - gbl, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "gbl"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "dac-gmbh"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Xzx14fvYWTZYM9Pnowf1M3D0PTPRLwsXHUj/PJskRWw="; - }; - - cargoPatches = [ - # update ring to fix building on Mac M1 - # https://github.com/dac-gmbh/gbl/pull/64 - (fetchpatch { - url = "https://github.com/raboof/gbl/commit/17e154d66932af59abe8677309792606b7f64c7d.patch"; - sha256 = "sha256-5Itoi86Q+9FzSTtnggODKPwwYPp5BpIVgR2vYMLHBts="; - }) - # Upstream does not include Cargo.lock, even though this is recommended for applications. - (fetchpatch { - url = "https://github.com/raboof/gbl/commit/9423d36ee3168bca8db7a7cb65611dc7ddc2daf0.patch"; - sha256 = "sha256-zwHXgUVkAYiQs/AT/pINnZoECoXzh+9astWMYENGTL8="; - }) - ]; - - cargoHash = "sha256-CeGLSseKUe2XudRqZm5Y7o7ZLDtDBg/MFunOGqxFZGM="; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - - passthru.tests.version = testers.testVersion { package = gbl; }; - - meta = with lib; { - description = "GBL Firmware file manipulation"; - longDescription = '' - Utility to read, create and manipulate `.gbl` firmware update - files targeting the Silicon Labs Gecko Bootloader. - ''; - homepage = "https://github.com/jonas-schievink/gbl"; - license = licenses.mit; - maintainers = [ maintainers.raboof ]; - mainProgram = "gbl"; - }; -} diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 0afd39c0f4fe..a157107b6a1e 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -38,6 +38,7 @@ let rm .cargo/config.toml || true ''; + useFetchCargoVendor = true; inherit cargoHash cargoPatches; nativeBuildInputs = [ @@ -119,7 +120,7 @@ rec { garage_0_8_7 = generic { version = "0.8.7"; hash = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc="; - cargoHash = "sha256-1cGlJP/RRgxt3GGMN1c+7Y5lLHJyvHEnpLsR35R5FfI="; + cargoHash = "sha256-NmeAkm35Su4o5JEn75pZmxhVHh+VMwKwULKY0eCVlYo="; cargoPatches = [ ./update-time-0.8.patch ]; broken = stdenv.hostPlatform.isDarwin; }; @@ -127,7 +128,7 @@ rec { garage_0_9_4 = generic { version = "0.9.4"; hash = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk="; - cargoHash = "sha256-1Hrip4R5dr31czOcFMGW4ZvVfVwvdd7LkwukwNpS3o4="; + cargoHash = "sha256-ittesFz1GUGipQecsmMA+GEaVoUY+C9DtEvsO0HFNCc="; cargoPatches = [ ./update-time.patch ]; broken = stdenv.hostPlatform.isDarwin; }; @@ -135,7 +136,7 @@ rec { garage_1_0_1 = generic { version = "1.0.1"; hash = "sha256-f6N2asycN04I6U5XQ5LEAqYu/v5jYZiFCxZ8YQ32XyM="; - cargoHash = "sha256-jpc/vaygC5WNSkVA3P01mCRk9Nx/CUumE893tHWoe34="; + cargoHash = "sha256-DX20Uv4g8JO3PlRsTbvr8nF4g9aw1/hW0bfQm6zGBd4="; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix deleted file mode 100644 index fdffb8829532..000000000000 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - stdenv, - lib, - rustPlatform, - fetchFromGitLab, - pkg-config, - file, - perl, - curl, - cmake, - openssl, - libssh2, - libgit2, - libzip, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "powerline-rs"; - version = "0.2.0"; - - src = fetchFromGitLab { - owner = "jD91mZM2"; - repo = "powerline-rs"; - rev = version; - - sha256 = "0rqlxxl58dpfvm2idhi0vzinraf4bgiapmawiih9wxs599fnhm3y"; - }; - - cargoHash = "sha256-NAhLTrTshCm1QKGaOdD/YaqD6c3oYZwVBst8fvTlScQ="; - - nativeBuildInputs = [ - pkg-config - file - perl - cmake - curl - ]; - buildInputs = [ - openssl - libssh2 - libgit2 - libzip - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; - - COMPLETION_OUT = "out"; - postInstall = '' - install -Dm 755 "${COMPLETION_OUT}/powerline-rs.bash" "$out/share/bash-completion/completions/powerline-rs" - install -Dm 755 "${COMPLETION_OUT}/powerline-rs.fish" "$out/share/fish/vendor_completions.d/powerline-rs" - ''; - - meta = with lib; { - description = "powerline-shell rewritten in Rust, inspired by powerline-go"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - mainProgram = "powerline-rs"; - }; -} diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index d5cac504012c..3c2a6e40d1ab 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.88.2"; + version = "3.88.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-p5vB9ug/H7xV7Y4GIk2BUUMFJ4/tcKj+V4qvYwCJlRU="; + hash = "sha256-OPXDDLlrX8lV1u6/o7xa7jhX4UmFwTJLSxMmmzcYRVk="; }; vendorHash = "sha256-YsUAu2gEXzpjM/jg4VJ7KTvf1/cLTO04hLOLmUDeYk0="; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 6f6119737184..6ef03ad24d95 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -15,13 +15,13 @@ let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "4.14"; + version = "4.15"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - hash = "sha256-UxbgYspocoy9ul2dhIhvIwqKMeWSG7vJY1df3UkgpHQ="; + hash = "sha256-CpbVm5Z9cKPQdOzBNOXsgrX3rfC6DTVE7xfmOAshbEs="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix index 00bc5e50c8b4..253b579bb191 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f02SOyU5REm+uP4/vB/1yG9M0Vg8ShF2hj5NKuh0jLU="; }; - cargoHash = "sha256-cMCNZ8Ezp7bFx4EnuZCXhqoaE0yN3iK9KnCYBYGPHKc="; + useFetchCargoVendor = true; + cargoHash = "sha256-A1pFifxshWynwA88iLTMOm21NKCH8fHl5nFiV4wEG8A="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index bf6d4ad84dc8..58c92c1dc4af 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -49,7 +49,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-Zn+xU6NJOY+jDYrSGsbYGAVqprQ6teEdNvlTNDXuzKs="; + useFetchCargoVendor = true; + cargoHash = "sha256-OMa89riyopKMQf9E9Fr7Qs4hFfEfjnDFzaSWFtkYUXE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c15766780974..601b86517977 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -96,6 +96,7 @@ mapAliases { aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15 afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10" + alass = throw "'alass' has been removed due to being unmaintained upstream"; # Added 2025-01-25 alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17 alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17 alsaPluginWrapper = throw "'alsaPluginWrapper' has been renamed to/replaced by 'alsa-plugins-wrapper'"; # Converted to throw 2024-10-17 @@ -443,6 +444,7 @@ mapAliases { g4music = gapless; # Added 2024-07-26 g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17 gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19 + gbl = throw "'gbl' has been removed because the upstream repository no longer exists"; # Added 2025-01-26 gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10 gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 @@ -730,6 +732,7 @@ mapAliases { libxplayer-plparser = throw "libxplayer-plparser has been removed as the upstream project was archived"; # Added 2024-12-27 libyamlcpp = yaml-cpp; # Added 2023-01-29 libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29 + licensor = throw "'licensor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; limesctl = throw "limesctl has been removed because it is insignificant."; # Added 2024-11-25 @@ -1138,6 +1141,7 @@ mapAliases { PlistCpp = plistcpp; # Added 2024-01-05 pocket-updater-utility = pupdate; # Added 2024-01-25 + powerline-rs = throw "'powerline-rs' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20 prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20 probe-rs = probe-rs-tools; # Added 2024-05-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1b9d8596b19..cc9e35e3c482 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -163,6 +163,13 @@ with pkgs; __flattenIncludeHackHook = callPackage ../build-support/setup-hooks/flatten-include-hack { }; + addBinToPathHook = callPackage ( + { makeSetupHook }: + makeSetupHook { + name = "add-bin-to-path-hook"; + } ../build-support/setup-hooks/add-bin-to-path.sh + ) { }; + autoreconfHook = callPackage ( { makeSetupHook, autoconf, automake, gettext, libtool }: makeSetupHook { @@ -853,6 +860,13 @@ with pkgs; name = "setup-debug-info-dirs-hook"; } ../build-support/setup-hooks/setup-debug-info-dirs.sh; + writableTmpDirAsHomeHook = callPackage ( + { makeSetupHook }: + makeSetupHook { + name = "writable-tmpdir-as-home-hook"; + } ../build-support/setup-hooks/writable-tmpdir-as-home.sh + ) { }; + useOldCXXAbi = makeSetupHook { name = "use-old-cxx-abi-hook"; } ../build-support/setup-hooks/use-old-cxx-abi.sh; @@ -1763,10 +1777,6 @@ with pkgs; fluffychat-web = fluffychat.override { targetFlutterPlatform = "web"; }; - gbl = callPackage ../tools/archivers/gbl { - inherit (darwin.apple_sdk.frameworks) Security; - }; - genpass = callPackage ../tools/security/genpass { }; gammaray = qt6Packages.callPackage ../development/tools/gammaray { }; @@ -3613,6 +3623,12 @@ with pkgs; hdf5-fortran = hdf5.override { fortranSupport = true; }; + hdf5-fortran-mpi = hdf5.override { + fortranSupport = true; + mpiSupport = true; + cppSupport = false; + }; + hdf5-threadsafe = hdf5.override { threadsafe = true; }; heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack { }; @@ -12718,10 +12734,6 @@ with pkgs; polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { }; - powerline-rs = callPackage ../tools/misc/powerline-rs { - inherit (darwin.apple_sdk.frameworks) Security; - }; - qogir-kde = libsForQt5.callPackage ../data/themes/qogir-kde { }; ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix { @@ -14218,8 +14230,6 @@ with pkgs; portaudio = null; }; - lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php82; }; - luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; luddite = with python3Packages; toPythonApplication luddite; @@ -17069,6 +17079,15 @@ with pkgs; ### SCIENCE/PROGRAMMING + ### SCIENCE/GEOLOGY + pflotran = callPackage ../by-name/pf/pflotran/package.nix { + petsc = petsc.override { + hdf5-support = true; + hdf5 = hdf5-fortran-mpi; + petsc-optimized = true; + }; + }; + ### SCIENCE/LOGIC abella = callPackage ../applications/science/logic/abella { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6756cd56430..e74ec4d3e709 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -283,6 +283,8 @@ self: super: with self; { aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; + aiohttp-sse = callPackage ../development/python-modules/aiohttp-sse { }; + aiohttp-sse-client2 = callPackage ../development/python-modules/aiohttp-sse-client2 { }; aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { };