From a2b293e3c950b40e5f5644031a715d9ccc128e77 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 3 Jan 2025 22:43:56 +0000 Subject: [PATCH 001/280] stdenv: introduce nixLog and nixLogWithLevel --- pkgs/stdenv/generic/setup.sh | 72 ++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 541689287970..19a836b80b05 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -56,60 +56,100 @@ getAllOutputNames() { fi } +# All provided arguments are joined with a space, then prefixed by the name of the function which invoked `nixLog` (or +# the hook name if the caller was an implicit hook), then directed to $NIX_LOG_FD, if it's set. +nixLog() { + # Return a value explicitly instead of the implicit return of the last command (result of the test). + [[ -z ${NIX_LOG_FD-} ]] && return 0 + + # Use the function name of the caller, unless it is _callImplicitHook, in which case use the name of the hook. + local callerName="${FUNCNAME[1]}" + if [[ $callerName == "_callImplicitHook" ]]; then + callerName="${hookName:?}" + fi + printf "%s: %s\n" "$callerName" "$*" >&"$NIX_LOG_FD" +} + +# Identical to nixLog, but additionally prefixed by the logLevel. +# NOTE: This function is only every meant to be called from the nix*Log family of functions. +nixLogWithLevel() { + # Return a value explicitly instead of the implicit return of the last command (result of the test). + [[ -z ${NIX_LOG_FD-} || ${NIX_DEBUG:-0} -lt ${1:?} ]] && return 0 + + local logLevel + case "${1:?}" in + 0) logLevel=ERROR ;; + 1) logLevel=WARN ;; + 2) logLevel=NOTICE ;; + 3) logLevel=INFO ;; + 4) logLevel=TALKATIVE ;; + 5) logLevel=CHATTY ;; + 6) logLevel=DEBUG ;; + 7) logLevel=VOMIT ;; + *) + echo "nixLogWithLevel: called with invalid log level: ${1:?}" >&"$NIX_LOG_FD" + return 1 + ;; + esac + + # Use the function name of the caller, unless it is _callImplicitHook, in which case use the name of the hook. + # NOTE: Our index into FUNCNAME is 2, not 1, because we are only ever to be called from the nix*Log family of + # functions, never directly. + local callerName="${FUNCNAME[2]}" + if [[ $callerName == "_callImplicitHook" ]]; then + callerName="${hookName:?}" + fi + + # Use the function name of the caller's caller, since we should only every be invoked by nix*Log functions. + printf "%s: %s: %s\n" "$logLevel" "$callerName" "${2:?}" >&"$NIX_LOG_FD" +} + # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlError` in the Nix source. nixErrorLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 0 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + nixLogWithLevel 0 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlWarn` in the Nix source. nixWarnLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 1 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + nixLogWithLevel 1 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlNotice` in the Nix source. nixNoticeLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 2 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + nixLogWithLevel 2 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlInfo` in the Nix source. nixInfoLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 3 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + nixLogWithLevel 3 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlTalkative` in the Nix source. nixTalkativeLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 4 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + nixLogWithLevel 4 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlChatty` in the Nix source. nixChattyLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 5 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + nixLogWithLevel 5 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlDebug` in the Nix source. nixDebugLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 6 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + nixLogWithLevel 6 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlVomit` in the Nix source. nixVomitLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 7 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + nixLogWithLevel 7 "$*" } # Log a hook, to be run before the hook is actually called. From 591c6de7bc2aa7265e29a943d923d7e384230e25 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 6 Jan 2025 06:28:33 +0000 Subject: [PATCH 002/280] e2fsprogs: 1.47.1 -> 1.47.2 Changes: https://github.com/tytso/e2fsprogs/compare/v1.47.1...v1.47.2 --- pkgs/by-name/e2/e2fsprogs/package.nix | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix index 6210299c3645..590938068d85 100644 --- a/pkgs/by-name/e2/e2fsprogs/package.nix +++ b/pkgs/by-name/e2/e2fsprogs/package.nix @@ -3,7 +3,6 @@ stdenv, buildPackages, fetchurl, - fetchpatch, pkg-config, libuuid, gettext, @@ -17,11 +16,11 @@ stdenv.mkDerivation rec { pname = "e2fsprogs"; - version = "1.47.1"; + version = "1.47.2"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-mvzSAfOUKdLbJJKusT26XnXWzFBoK3MtyjVkO9XwkuM="; + url = "mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"; + hash = "sha256-CCQuZMoOgZTZwcqtSXYrGSCaBjGBmbY850rk7y105jw="; }; # fuse2fs adds 14mb of dependencies @@ -43,19 +42,6 @@ stdenv.mkDerivation rec { gettext ] ++ lib.optionals withFuse [ fuse3 ]; - patches = [ - (fetchurl { - name = "SIZEOF_SIZE_T.patch"; - url = "https://lore.kernel.org/linux-ext4/20240527074121.2767083-1-hi@alyssa.is/raw"; - hash = "sha256-QdsvcvBi0mC/4YErqG0UKl94MH0OZpFVTGszNqBe/qw="; - }) - (fetchurl { - name = "unused-parameters.patch"; - url = "https://lore.kernel.org/linux-ext4/20240527091542.4121237-2-hi@alyssa.is/raw"; - hash = "sha256-pMoqm2eo5zYaTdU+Ppa4+posCVFb2A9S4uo5oApaaqc="; - }) - ]; - configureFlags = if stdenv.hostPlatform.isLinux then [ From 2a6ea1be572cbab04c870d7005c60679d0aabc01 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 003/280] flwrap: fix cross build --- pkgs/by-name/fl/flwrap/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flwrap/package.nix b/pkgs/by-name/fl/flwrap/package.nix index e1a4f93a179f..1666191e48a5 100644 --- a/pkgs/by-name/fl/flwrap/package.nix +++ b/pkgs/by-name/fl/flwrap/package.nix @@ -16,13 +16,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-g1V7bOcgVHpD+Ndn02Nj4I3rGItuQ2qLGlrZZshfGP8="; }; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ fltk13 libjpeg ]; - nativeBuildInputs = [ - pkg-config + configureFlags = [ + "FLTK_CONFIG=${lib.getExe' (lib.getDev fltk13) "fltk-config"}" ]; meta = { From 172d46ee3c773fa212c13e71d73ded157dde2960 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 004/280] fastjet: fix cross build --- pkgs/by-name/fa/fastjet/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/fa/fastjet/package.nix b/pkgs/by-name/fa/fastjet/package.nix index cdb7394c9688..f64e8acad983 100644 --- a/pkgs/by-name/fa/fastjet/package.nix +++ b/pkgs/by-name/fa/fastjet/package.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { hash = "sha256-zBdUcb+rhla4xhg6jl6a0F1fdQbkbzISqagjCQW49qM="; }; + postPatch = '' + patchShebangs --build fastjet-config.in + ''; + buildInputs = lib.optional withPython python; configureFlags = [ From f01beefa3d3da9c1ea06947f0731166f9cda1ad9 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 005/280] fastjet-contrib: fix cross build --- pkgs/by-name/fa/fastjet-contrib/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastjet-contrib/package.nix b/pkgs/by-name/fa/fastjet-contrib/package.nix index 4bb49c711d58..5e39dcb3b8fc 100644 --- a/pkgs/by-name/fa/fastjet-contrib/package.nix +++ b/pkgs/by-name/fa/fastjet-contrib/package.nix @@ -17,10 +17,12 @@ stdenv.mkDerivation rec { buildInputs = [ fastjet ]; postPatch = '' - for f in Makefile.in */Makefile; do + for f in Makefile.in */Makefile scripts/internal/Template/Makefile; do substituteInPlace "$f" --replace "CXX=g++" "" + substituteInPlace "$f" --replace-quiet "ar " "${stdenv.cc.targetPrefix}ar " + substituteInPlace "$f" --replace-quiet "ranlib " "${stdenv.cc.targetPrefix}ranlib " done - patchShebangs ./utils/check.sh ./utils/install-sh + patchShebangs --build ./utils/check.sh ./utils/install-sh ''; # Written in shell manually, does not support autoconf-style @@ -28,6 +30,10 @@ stdenv.mkDerivation rec { # Error: --build=x86_64-unknown-linux-gnu: unrecognised argument configurePlatforms = [ ]; + configureFlags = [ + "--fastjet-config=${lib.getExe' (lib.getDev fastjet) "fastjet-config"}" + ]; + enableParallelBuilding = true; doCheck = true; From 045d5755a2f05a585665d3ca13a8b869a5957bf8 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 006/280] flpsed: fix cross build --- pkgs/by-name/fl/flpsed/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/fl/flpsed/package.nix b/pkgs/by-name/fl/flpsed/package.nix index 479c2902902a..cfa8f3d05124 100644 --- a/pkgs/by-name/fl/flpsed/package.nix +++ b/pkgs/by-name/fl/flpsed/package.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { -i src/GsWidget.cxx ''; + configureFlags = [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + "FLTKCONFIG=${lib.getExe' (lib.getDev fltk13) "fltk-config"}" + ]; + meta = with lib; { description = "WYSIWYG PostScript annotator"; homepage = "https://flpsed.org/flpsed.html"; From b3b3fe03c458a4e929705f36cddcbf87d21149a7 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 007/280] SDL_gfx: fix cross build --- pkgs/by-name/sd/SDL_gfx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/SDL_gfx/package.nix b/pkgs/by-name/sd/SDL_gfx/package.nix index a6044b31790f..65711ff5e396 100644 --- a/pkgs/by-name/sd/SDL_gfx/package.nix +++ b/pkgs/by-name/sd/SDL_gfx/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-37FaxfjOeklS3BLSrtl0dRjF5rM1wOMWNtI/k8Yw9Bk="; }; - nativeBuildInputs = [ SDL ]; - buildInputs = [ SDL ]; # SDL_gfx.pc refers to sdl.pc and some SDL_gfx headers import SDL.h propagatedBuildInputs = [ SDL ]; + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + configureFlags = [ (lib.enableFeature false "mmx") (lib.enableFeature enableSdltest "sdltest") From a0aefa462bfe5401f51048a470183c83ae24f612 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 008/280] SDL_mixer: fix cross build --- pkgs/by-name/sd/SDL_mixer/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix index e42592d5bc58..bedfda42842a 100644 --- a/pkgs/by-name/sd/SDL_mixer/package.nix +++ b/pkgs/by-name/sd/SDL_mixer/package.nix @@ -70,9 +70,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - SDL pkg-config - smpeg ]; buildInputs = [ @@ -84,6 +82,10 @@ stdenv.mkDerivation (finalAttrs: { smpeg ]; + # pass in correct *-config for cross builds + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SMPEG_CONFIG = lib.getExe' smpeg.dev "smpeg-config"; + configureFlags = [ (lib.enableFeature false "music-ogg-shared") (lib.enableFeature false "music-mod-shared") From 70ffa2d78517310567ea2a5168f018cbd3d36f21 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 009/280] gtk2: fix cross / strictDeps build --- pkgs/development/libraries/gtk/2.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 9b1a3fc32439..d1abe9b8e035 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = finalAttrs.setupHooks ++ [ + gdk-pixbuf gettext gobject-introspection perl From 639b190d8254478387b0116336897fd92bbcf331 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 010/280] freedroidrpg: fix cross build --- pkgs/by-name/fr/freedroidrpg/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/fr/freedroidrpg/package.nix b/pkgs/by-name/fr/freedroidrpg/package.nix index 9be15316e687..021abb8c7e9b 100644 --- a/pkgs/by-name/fr/freedroidrpg/package.nix +++ b/pkgs/by-name/fr/freedroidrpg/package.nix @@ -56,6 +56,8 @@ stdenv.mkDerivation { zlib ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + enableParallelBuilding = true; meta = with lib; { From a7b52c47963f68a4c8b7acf3bcc6e635ec68e240 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 011/280] fish-fillets-ng: fix cross / strictDeps build --- pkgs/by-name/fi/fish-fillets-ng/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/fi/fish-fillets-ng/package.nix b/pkgs/by-name/fi/fish-fillets-ng/package.nix index 7a0a88f9739d..73011c6bafd3 100644 --- a/pkgs/by-name/fi/fish-fillets-ng/package.nix +++ b/pkgs/by-name/fi/fish-fillets-ng/package.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { SDL_ttf ]; + # pass in correct sdl-config for cross builds + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; + desktopItems = [ (makeDesktopItem { name = "fish-fillets-ng"; From 8a5f060b32dad9ef86b783bca141e8aed8c70262 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 012/280] SDL_ttf: fix cross / strictDeps build --- pkgs/by-name/sd/SDL_ttf/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix index d243dc90ab12..df6ce3b42ec7 100644 --- a/pkgs/by-name/sd/SDL_ttf/package.nix +++ b/pkgs/by-name/sd/SDL_ttf/package.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation (finalAttrs: { freetype ]; - nativeBuildInputs = [ - SDL - freetype - ]; + # pass in correct *-config for cross builds + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.FREETYPE_CONFIG = lib.getExe' freetype.dev "freetype-config"; configureFlags = [ (lib.enableFeature enableSdltest "sdltest") From 3422fb581d03e075d741712357f02235883afc49 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 013/280] fllog: fix cross / strictDeps build --- pkgs/by-name/fl/fllog/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fl/fllog/package.nix b/pkgs/by-name/fl/fllog/package.nix index 00d3de60d783..f69b5aa0cfb3 100644 --- a/pkgs/by-name/fl/fllog/package.nix +++ b/pkgs/by-name/fl/fllog/package.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + fltk13 # fltk-config pkg-config ]; From ec1af801cb24f2d207f08ae794a08830ab26ecb3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 014/280] lvtk: install includes in regular location ttl2c (next commit) looks for them there. --- pkgs/by-name/lv/lvtk/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/lv/lvtk/package.nix b/pkgs/by-name/lv/lvtk/package.nix index fc5dacaba82d..7e0b9f8ff379 100644 --- a/pkgs/by-name/lv/lvtk/package.nix +++ b/pkgs/by-name/lv/lvtk/package.nix @@ -37,11 +37,15 @@ stdenv.mkDerivation (finalAttrs: { pugl ]; + postInstall = '' + mv $out/include/lvtk-3.0/lvtk $out/include/ + rmdir $out/include/lvtk-3.0/ + ''; + enableParallelBuilding = true; meta = { description = "Set C++ wrappers around the LV2 C API"; - mainProgram = "ttl2c"; homepage = "https://lvtk.org/"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ bot-wxt1221 ]; From 943657de1c36d8a24932ff0b64a6980d8f6358f0 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 015/280] fcitx5-mcbopomofo: fix strictDeps build --- pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix index 698329d15ec2..e5b499f20f8a 100644 --- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix +++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix @@ -28,16 +28,19 @@ stdenv.mkDerivation rec { cmake extra-cmake-modules gettext - json_c - icu - fmt gtest ]; buildInputs = [ fcitx5 + fmt + gtest + icu + json_c ]; + strictDeps = true; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; From 741bc47b4252055e7cea9e9ef1cbfc854220ce04 Mon Sep 17 00:00:00 2001 From: scraptux Date: Mon, 6 Jan 2025 17:42:27 +0100 Subject: [PATCH 016/280] grpc: 1.69.0 -> 1.69.0 --- pkgs/by-name/gr/grpc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index 74fe412380b2..ee3780a42bc9 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/pkgs/by-name/gr/grpc/package.nix @@ -24,7 +24,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "grpc"; - version = "1.68.1"; # N.B: if you change this, please update: + version = "1.69.0"; # N.B: if you change this, please update: # pythonPackages.grpcio # pythonPackages.grpcio-channelz # pythonPackages.grpcio-health-checking @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-Rp+vg90biF6XXa4rVaLPWMjmWYut9XmBPgxQDTnltzk="; + hash = "sha256-rRiPUcr6of/sjqB+qr7eOkKVFGTnu8UjluULmcn8df4="; fetchSubmodules = true; }; From 6eea40ac74dc04981a0a52904ba6b6ed0d27d9ef Mon Sep 17 00:00:00 2001 From: scraptux Date: Mon, 6 Jan 2025 17:42:41 +0100 Subject: [PATCH 017/280] python312Packages.grpcio: 1.68.1 -> 1.69.0 --- pkgs/development/python-modules/grpcio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 002d5dde36d6..6d294ad9243c 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -18,14 +18,14 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio"; - version = "1.68.1"; + version = "1.69.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-RKhQLdXeZTrmpz4t5QpAHYQYTwMx0Kw9rrBE5m1cUFQ="; + hash = "sha256-k2+kQkG1N5xa/DROEmDUZ77klXR+r0eN6CW6snkdpvU="; }; outputs = [ From cc0066dac2d6a80c9721ea3502731c5389a9a655 Mon Sep 17 00:00:00 2001 From: scraptux Date: Mon, 6 Jan 2025 17:42:52 +0100 Subject: [PATCH 018/280] python312Packages.grpcio-channelz: 1.68.1 -> 1.69.0 --- pkgs/development/python-modules/grpcio-channelz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 8a1517b6b979..cbb83238b8fc 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.68.1"; + version = "1.69.0"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-6+mxJ3RTBtsXB7y46w3Fa5R8O2FnKbWde0UeJjnsttI="; + hash = "sha256-x7WQCm08PoIp5lrktjE9ZMFpPfqnZ/Ww4cbRkVMkgg8="; }; build-system = [ setuptools ]; From 063befa54a445035e1c1cca8a0e4b25affbcd759 Mon Sep 17 00:00:00 2001 From: scraptux Date: Mon, 6 Jan 2025 17:43:02 +0100 Subject: [PATCH 019/280] python312Packages.grpcio-health-checking: 1.68.1 -> 1.69.0 --- .../python-modules/grpcio-health-checking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index 75249187dab7..cb08d814fe6f 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -11,13 +11,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.68.1"; + version = "1.69.0"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-6pNs+gxkokr9gAWHPqYbGsyDqUHAC1amM5ybIlyAoag="; + hash = "sha256-/24dOMKjALG70paRb72RZWZ7xLWoVX+Z3UIm1Pno9ME="; }; propagatedBuildInputs = [ From 3efb8d5f9e8ac5afa18f38962f2c7b25d69217ca Mon Sep 17 00:00:00 2001 From: scraptux Date: Mon, 6 Jan 2025 17:43:10 +0100 Subject: [PATCH 020/280] python312Packages.grpcio-reflection: 1.68.1 -> 1.69.0 --- pkgs/development/python-modules/grpcio-reflection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index eb6ba8dcbd47..4678c3e2fdbb 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.68.1"; + version = "1.69.0"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-z/yzPEy93ncaBv1Vym/hScb4nsMwyaQBBzC7KZhZeYI="; + hash = "sha256-NHSq7fsQ2NpVAxNaL7n7tOH3IEStfuLQvyIJCTToCQg="; }; build-system = [ setuptools ]; From e6061077fbd7edab921043fd730a1f96c3cbf600 Mon Sep 17 00:00:00 2001 From: scraptux Date: Mon, 6 Jan 2025 17:43:18 +0100 Subject: [PATCH 021/280] python312Packages.grpcio-status: 1.68.1 -> 1.69.0 --- pkgs/development/python-modules/grpcio-status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 2dec36e979fa..8207553e80b1 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-status"; - version = "1.68.1"; + version = "1.69.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-4TeNA2yBoWENe0x6FGzWY90T/MkVz019BTkp26W7tuE="; + hash = "sha256-WV74TlF41igcqnMsz2j/gyWSQWCNJrDpxApeZu7iotI="; }; postPatch = '' From 62db239a007b1ef68028719e21794a3c690dedfe Mon Sep 17 00:00:00 2001 From: scraptux Date: Mon, 6 Jan 2025 17:43:26 +0100 Subject: [PATCH 022/280] python312Packages.grpcio-testing: 1.68.1 -> 1.69.0 --- pkgs/development/python-modules/grpcio-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index cf121cce3e6c..7d06b0816a3b 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.68.1"; + version = "1.69.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-tK6vhvVlqPiCMxfwUVLABuVZDnfPafmCDtmzdb/WHrM="; + hash = "sha256-PEOmf3VnSK7E2bCoWLCO7/JGZYcrDEa1CRX5emTeL0A="; }; postPatch = '' From 4edcae720740d977e6af7b78044887da6f9eaf38 Mon Sep 17 00:00:00 2001 From: scraptux Date: Mon, 6 Jan 2025 17:43:35 +0100 Subject: [PATCH 023/280] python312Packages.grpcio-tools: 1.68.1 -> 1.69.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 29e206098294..019db2b4ac1d 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.68.1"; + version = "1.69.0"; pyproject = true; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-JBOhetFsnIIbNuSmf8ZMN7nkY2qxw6B3eAGIATeHObo="; + hash = "sha256-PhqY9Nney4SXnh3dPesJwKM6hLbjwHdtW95Al+OrZt0="; }; outputs = [ From a2b5eb2e969ab20fe548f3a89830b8554ff00623 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 6 Jan 2025 19:54:21 +0100 Subject: [PATCH 024/280] postgresql: fix build on x86_64-darwin Resolves #371242 --- pkgs/servers/sql/postgresql/generic.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 2effd687e8e4..aa3e1d766658 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -387,9 +387,15 @@ let # https://www.postgresql.org/message-id/flat/4D8E1BC5-BBCF-4B19-8226-359201EA8305%40gmail.com # Also see /doc/stdenv/platform-notes.chapter.md doCheck = false; - # Tests just get stuck on macOS 14.x for v13 and v14 doInstallCheck = - !(stdenv'.hostPlatform.isDarwin && olderThan "15") && !(stdenv'.hostPlatform.isStatic); + !(stdenv'.hostPlatform.isStatic) + && + # Tests just get stuck on macOS 14.x for v13 and v14 + !(stdenv'.hostPlatform.isDarwin && olderThan "15") + && + # Likely due to rosetta emulation: + # FATAL: could not create shared memory segment: Cannot allocate memory + !(stdenv'.hostPlatform.isDarwin && stdenv'.hostPlatform.isx86_64); installCheckTarget = "check-world"; passthru = From 914846dbe98f001a2aac86f9534041e9668b44fe Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 7 Jan 2025 06:30:47 +0000 Subject: [PATCH 025/280] xterm: 396 -> 397 Changes: https://invisible-island.net/xterm/xterm.log.html#xterm_397 --- pkgs/by-name/xt/xterm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix index c467b38928ea..b3ceeac4b34b 100644 --- a/pkgs/by-name/xt/xterm/package.nix +++ b/pkgs/by-name/xt/xterm/package.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "396"; + version = "397"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-Q/lLbQ7stCGamfRjUudG8qtVWOQNki1BGs/5bMd4pqU="; + hash = "sha256-Lpt0K5y6ROzsWAdOUTI39s1tWSPxc3yzak5WJfSuhmI="; }; patches = [ ./sixel-256.support.patch ]; From 2b8070731ddeb85879e82c106a44bffa6cdd069c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jan 2025 13:30:10 +0000 Subject: [PATCH 026/280] lapack-reference: 3.12.0 -> 3.12.1 --- pkgs/by-name/la/lapack-reference/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lapack-reference/package.nix b/pkgs/by-name/la/lapack-reference/package.nix index ada93fccc580..5b5ecaa1d330 100644 --- a/pkgs/by-name/la/lapack-reference/package.nix +++ b/pkgs/by-name/la/lapack-reference/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liblapack"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = "Reference-LAPACK"; repo = "lapack"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-xn9HL4YF8JPka1gwet5bGGo2k505H3RfWpxkUIYNecQ="; + sha256 = "sha256-SfKsvZ07v87tFFd9bnkIEdervyX/ucLfs/TOsl08aKQ="; }; nativeBuildInputs = [ From 45c19f2b0674fb1345336cdde36fc71c7c1fb523 Mon Sep 17 00:00:00 2001 From: MidAutumnMoon Date: Wed, 8 Jan 2025 22:37:34 +0800 Subject: [PATCH 027/280] libavif: properly enable libsharpyuv support Otherwise `avifenc --sharpyuv --yuv 420` will fail to convert YUV. --- pkgs/by-name/li/libavif/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/libavif/package.nix b/pkgs/by-name/li/libavif/package.nix index 00273ae753f1..dccc2db404d9 100644 --- a/pkgs/by-name/li/libavif/package.nix +++ b/pkgs/by-name/li/libavif/package.nix @@ -8,6 +8,7 @@ zlib, libpng, libjpeg, + libwebp, dav1d, libyuv, gdk-pixbuf, @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { "-DAVIF_CODEC_AOM_DECODE=OFF" "-DAVIF_BUILD_APPS=ON" "-DAVIF_BUILD_GDK_PIXBUF=ON" + "-DAVIF_LIBSHARPYUV=SYSTEM" ]; nativeBuildInputs = [ @@ -53,6 +55,7 @@ stdenv.mkDerivation rec { zlib libpng libjpeg + libwebp ]; propagatedBuildInputs = [ From c0fbb8684e6223a90779119a122b233164571d85 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 8 Jan 2025 22:12:29 +0100 Subject: [PATCH 028/280] protobuf: 29.2 -> 29.3 Diff: https://github.com/protocolbuffers/protobuf/compare/v29.2...v29.3 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v29.3 --- pkgs/development/libraries/protobuf/29.nix | 4 ++-- pkgs/development/python-modules/protobuf/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/protobuf/29.nix b/pkgs/development/libraries/protobuf/29.nix index 79d3af637194..5b191dcea396 100644 --- a/pkgs/development/libraries/protobuf/29.nix +++ b/pkgs/development/libraries/protobuf/29.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "29.2"; - hash = "sha256-zClgj7m0JK2PNWi/1kA2L+HklzaHoT09KwnVt7Rm4ks="; + version = "29.3"; + hash = "sha256-zdOBzLdN0ySrdFTF/X/NYI57kJ1ZFyoIl1/Qtgh/VkI="; } // args ) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index bbc43eecbcd8..0a12fe7bd79f 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "protobuf"; - version = "5.29.2"; + version = "5.29.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ssyOi7fJMmmW8OFgE3sIYfGoIWJQJljfKVEgnQywMJ4="; + hash = "sha256-XaD0HtrxF73jFkBLrRpIbLTt7fjkpUiRKW9kjo4HZiA="; }; build-system = [ setuptools ]; From 26f09762a84387d1891f2effeb6f5071ff921b4f Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Wed, 9 Oct 2024 18:14:29 +0800 Subject: [PATCH 029/280] pytestCheckHook: support __structuredAttrs Add flag pytestFlags as the new, conforming interface replacing pytestFlagsArray. Stop Bash-expanding disabledTests and disabledTestPaths. Handle disabledTestPaths with `pytest --ignore-glob ` to keep globbing support. Check if each path glob matches at least one path using the `glob` module from the Python standard library. Also make buildPythonPackage and buildPythonApplication stop escaping the elements of disabledTests and disabledTestPaths. --- doc/languages-frameworks/python.section.md | 12 +++-- .../python/hooks/pytest-check-hook.sh | 44 +++++++++++-------- .../python/mk-python-derivation.nix | 8 ++-- 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 8cb52ba29861..5e2a4d0d56c5 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1273,7 +1273,7 @@ Using the example above, the analogous `pytestCheckHook` usage would be: ]; # requires additional data - pytestFlagsArray = [ + pytestFlags = [ "tests/" "--ignore=tests/integration" ]; @@ -2002,7 +2002,7 @@ Occasionally packages don't make use of a common test framework, which may then * Non-working tests can often be deselected. Most Python modules do follow the standard test protocol where the pytest runner can be used. - `pytest` supports the `-k` and `--ignore` parameters to ignore test + `pytest` supports the `-k` and `--ignore-glob` parameters to ignore test methods or classes as well as whole files. For `pytestCheckHook` these are conveniently exposed as `disabledTests` and `disabledTestPaths` respectively. @@ -2019,11 +2019,17 @@ Occasionally packages don't make use of a common test framework, which may then ]; disabledTestPaths = [ - "this/file.py" + "path/to/performance.py" + "path/to/connect-*.py" ]; } ``` + ::: {.note} + If the test path to disable contains characters like `*`, `?`, `[`, and `]`, + quote them with square brackets (`[*]`, `[?]`, `[[]`, and `[]]`) to match literally. + ::: + * Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)` * Compiling with Cython causes tests to fail with a `ModuleNotLoadedError`. diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index b542398a92b0..3c0bb623b2f9 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -1,33 +1,41 @@ # Setup hook for pytest -echo "Sourcing pytest-check-hook" -declare -ar disabledTests -declare -a disabledTestPaths +echo "Sourcing pytest-check-hook" function pytestCheckPhase() { echo "Executing pytestCheckPhase" runHook preCheck # Compose arguments - args=" -m pytest" - if [ -n "$disabledTests" ]; then + local -a flagsArray=(-m pytest) + if [ -n "${disabledTests[*]-}" ]; then disabledTestsString="not $(concatStringsSep " and not " disabledTests)" - args+=" -k \""$disabledTestsString"\"" + flagsArray+=(-k "$disabledTestsString") fi - if [ -n "${disabledTestPaths-}" ]; then - eval "disabledTestPaths=($disabledTestPaths)" - fi - - for path in ${disabledTestPaths[@]}; do - if [ ! -e "$path" ]; then - echo "Disabled tests path \"$path\" does not exist. Aborting" - exit 1 - fi - args+=" --ignore=\"$path\"" + local -a _pathsArray=() + concatTo _pathsArray disabledTestPaths + for path in "${_pathsArray[@]}"; do + # Check if every path glob matches at least one path + @pythonCheckInterpreter@ <(cat < Date: Fri, 20 Dec 2024 01:53:37 +0800 Subject: [PATCH 030/280] python3Packages.pytest-xdist: use pytestFlags --- pkgs/development/python-modules/pytest-xdist/default.nix | 2 +- pkgs/development/python-modules/pytest-xdist/setup-hook.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 972d0bdf23c7..5660820d969c 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { # pytest can already use xdist at this point preCheck = '' - appendToVar pytestFlagsArray "--numprocesses=$NIX_BUILD_CORES" + appendToVar pytestFlags "--numprocesses=$NIX_BUILD_CORES" ''; # access file system diff --git a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh index 8600ce998acc..30f8af1ba181 100644 --- a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh @@ -1,7 +1,5 @@ pytestXdistHook() { - pytestFlagsArray+=( - "--numprocesses=$NIX_BUILD_CORES" - ) + appendToVar pytestFlags "--numprocesses=$NIX_BUILD_CORES" } if [ -z "${dontUsePytestXdist-}" ] && [ -z "${dontUsePytestCheck-}" ]; then From 9bf387aa9d4bc4039accab9e301ae2cd9c98b0ca Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 20 Dec 2024 01:54:54 +0800 Subject: [PATCH 031/280] python3Packages.pytest-forked: use pytestFlags --- pkgs/development/python-modules/pytest-forked/setup-hook.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-forked/setup-hook.sh b/pkgs/development/python-modules/pytest-forked/setup-hook.sh index 88ccd0aac171..360ddfdfdaf5 100644 --- a/pkgs/development/python-modules/pytest-forked/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-forked/setup-hook.sh @@ -1,7 +1,5 @@ pytestForkedHook() { - pytestFlagsArray+=( - "--forked" - ) + appendToVar pytestFlags "--forked" # Using --forked on darwin leads to crashes when fork safety is # enabled. This often happens when urllib tries to request proxy From ec6f585f05963c59433fbbf6337d35c51fc475d1 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 7 Oct 2024 07:06:51 +0800 Subject: [PATCH 032/280] pytestCheckHook: lint with ShellCheck --- pkgs/development/interpreters/python/hooks/pytest-check-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index 3c0bb623b2f9..855c770e31b1 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -1,4 +1,5 @@ # Setup hook for pytest +# shellcheck shell=bash echo "Sourcing pytest-check-hook" From d8c36cb25232bb661ccf373a8911910690aa7e92 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 7 Oct 2024 08:27:09 +0800 Subject: [PATCH 033/280] setuptoolsBuildHook: support __structuredAttrs Handle flags with appendToVar and concatTo. Stop Bash-expanding elements of setupPyGlobalFlags and setupPyBuildFlags. --- .../python/hooks/setuptools-build-hook.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh index 4c63a18eca43..7f20b1ab2c61 100644 --- a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh @@ -3,23 +3,25 @@ echo "Sourcing setuptools-build-hook" setuptoolsBuildPhase() { echo "Executing setuptoolsBuildPhase" - local args setuptools_has_parallel=@setuptools_has_parallel@ + local setuptools_has_parallel=@setuptools_has_parallel@ runHook preBuild cp -f @setuppy@ nix_run_setup - args="" - if [ -n "$setupPyGlobalFlags" ]; then - args+="$setupPyGlobalFlags" + local -a flagsArray=() + if [ -n "${setupPyGlobalFlags[*]-}" ]; then + concatTo flagsArray setupPyGlobalFlags fi if [ -n "$enableParallelBuilding" ]; then if [ -n "$setuptools_has_parallel" ]; then - setupPyBuildFlags+=" --parallel $NIX_BUILD_CORES" + appendToVar setupPyBuildFlags --parallel "$NIX_BUILD_CORES" fi fi - if [ -n "$setupPyBuildFlags" ]; then - args+=" build_ext $setupPyBuildFlags" + if [ -n "${setupPyBuildFlags[*]-}" ]; then + flagsArray+=(build_ext) + concatTo flagsArray setupPyBuildFlags fi - eval "@pythonInterpreter@ nix_run_setup $args bdist_wheel" + echoCmd 'setup.py build flags' "${flagsArray[@]}" + @pythonInterpreter@ nix_run_setup "${flagsArray[@]}" bdist_wheel runHook postBuild echo "Finished executing setuptoolsBuildPhase" From 1c9b35c2483d4c2f8cc0f2416c8539d509f02274 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 19 Dec 2024 06:55:16 +0800 Subject: [PATCH 034/280] python3packages.mysql-connector: specify setupPyBuildFlags directly without expecting Bash expansion --- .../python-modules/mysql-connector/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index e234bbef0e18..be6966cd9a1e 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -18,10 +18,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; setupPyBuildFlags = [ - "--with-mysql-capi=\"${mysql80}\"" - "--with-openssl-include-dir=\"${openssl.dev}/include\"" - "--with-openssl-lib-dir=\"${lib.getLib openssl}/lib\"" - "-L \"${lib.getLib pkgs.zstd}/lib:${lib.getLib mysql80}/lib\"" + "--with-mysql-capi=${mysql80}" + "--with-openssl-include-dir=${openssl.dev}/include" + "--with-openssl-lib-dir=${lib.getLib openssl}/lib" + "-L" + "${lib.getLib pkgs.zstd}/lib:${lib.getLib mysql80}/lib" ]; src = fetchFromGitHub { From 71e47c958d46e4e7ac5a440754dad785904a944a Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 17 Dec 2024 22:02:44 +0800 Subject: [PATCH 035/280] python3Packages.vowpalwabbit: specify setupPyBuildFlags without Bash-expanding expection --- pkgs/development/python-modules/vowpalwabbit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 5dbf58739c75..10187ec4eb33 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { # As we disable configure via cmake, pass explicit global options to enable # spdlog and fmt packages - setupPyGlobalFlags = [ "--cmake-options=\"-DSPDLOG_SYS_DEP=ON;-DFMT_SYS_DEP=ON\"" ]; + setupPyGlobalFlags = [ "--cmake-options=-DSPDLOG_SYS_DEP=ON;-DFMT_SYS_DEP=ON" ]; propagatedBuildInputs = [ numpy From 76f6a3b292553fc95631fa54f90aed4ff87ffcbc Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 7 Oct 2024 08:17:24 +0800 Subject: [PATCH 036/280] setuptoolsBuildHook: lint with ShellCheck --- .../interpreters/python/hooks/setuptools-build-hook.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh index 7f20b1ab2c61..9f2185265b12 100644 --- a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh @@ -1,4 +1,6 @@ # Setup hook for setuptools. +# shellcheck shell=bash + echo "Sourcing setuptools-build-hook" setuptoolsBuildPhase() { From 1e8f39148abbc0fc4d446b088019364d1995c689 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 7 Oct 2024 08:37:10 +0800 Subject: [PATCH 037/280] unittestCheckHook: handle unittestFlagsArray `__structuredAttrs`-agnostically Take unittestFlags as the new and conforming interface. Keep unittestFlagsArray as is. --- doc/languages-frameworks/python.section.md | 2 +- .../interpreters/python/hooks/unittest-check-hook.sh | 9 ++++++++- .../interpreters/python/mk-python-derivation.nix | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 5e2a4d0d56c5..cee0882ce6cc 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1433,7 +1433,7 @@ automatically add `pythonRelaxDepsHook` if either `pythonRelaxDeps` or unittestCheckHook ]; - unittestFlagsArray = [ + unittestFlags = [ "-s" "tests" "-v" ]; } diff --git a/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh b/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh index 64ecb13cbc71..8795b680a310 100644 --- a/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh @@ -5,7 +5,14 @@ unittestCheckPhase() { echo "Executing unittestCheckPhase" runHook preCheck - eval "@pythonCheckInterpreter@ -m unittest discover $unittestFlagsArray" + local -a flagsArray=() + + # Compatibility layer to the obsolete unittestFlagsArray + eval "flagsArray+=(${unittestFlagsArray[*]-})" + + concatTo flagsArray unittestFlags + echoCmd 'unittest flags' "${flagsArray[@]}" + @pythonCheckInterpreter@ -m unittest discover "${flagsArray[@]}" runHook postCheck echo "Finished executing unittestCheckPhase" diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 7b1e212bbaf9..4aea3d8fe5e8 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -108,6 +108,7 @@ let "disabledTests" "pytestFlags" "pytestFlagsArray" + "unittestFlags" "unittestFlagsArray" "outputs" "stdenv" @@ -446,6 +447,9 @@ let // optionalAttrs (attrs ? pytestFlagsArray) { pytestFlagsArray = attrs.pytestFlagsArray; } + // optionalAttrs (attrs ? unittestFlags) { + unittestFlags = attrs.unittestFlags; + } // optionalAttrs (attrs ? unittestFlagsArray) { unittestFlagsArray = attrs.unittestFlagsArray; } From 9b07602c8e09a97f030986052a7841e3e2bb9bc8 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 28 Oct 2024 03:15:02 +0800 Subject: [PATCH 038/280] unittestCheckHook: lint with ShellCheck --- .../interpreters/python/hooks/unittest-check-hook.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh b/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh index 8795b680a310..3ee947e278e6 100644 --- a/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh @@ -1,4 +1,6 @@ # Setup hook for unittest. +# shellcheck shell=bash + echo "Sourcing unittest-check-hook" unittestCheckPhase() { @@ -18,7 +20,7 @@ unittestCheckPhase() { echo "Finished executing unittestCheckPhase" } -if [ -z "${dontUseUnittestCheck-}" ] && [ -z "${installCheckPhase-}" ]; then +if [[ -z "${dontUseUnittestCheck-}" ]] && [[ -z "${installCheckPhase-}" ]]; then echo "Using unittestCheckPhase" appendToVar preDistPhases unittestCheckPhase fi From 8be69aee9687540bda6f48e5bfdb8e01fb73de2d Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 21 Dec 2024 20:08:53 +0800 Subject: [PATCH 039/280] doc: python: elaborate the makeWrapperArgs behaviour --- doc/languages-frameworks/python.section.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index cee0882ce6cc..c25cccf2ecf1 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -183,7 +183,15 @@ following are specific to `buildPythonPackage`: [`makeWrapper`](#fun-makeWrapper) set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, - `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. + `makeWrapperArgs = ["--set" "FOO" "BAR" "--set" "BAZ" "QUX"]`. + + ::: {.note} + When `__structuredAttrs = false`, the attribute `makeWrapperArgs` is passed as a space-separated string to the build script. Developers should use `prependToVar` or `appendToVar` to add arguments to it in build phases, or use `__structuredAttrs = true` to ensure that `makeWrapperArgs` is passed as a Bash array. + + For compatibility purposes, + when `makeWrapperArgs` shell variable is specified as a space-separated string (instead of a Bash array) in the build script, the string content is Bash-expanded before concatenated into the `wrapProgram` command. Still, developers should not rely on such behaviours, but use `__structuredAttrs = true` to specify flags containing spaces (e.g. `makeWrapperArgs = [ "--set" "GREETING" "Hello, world!" ]`), or use -pre and -post phases to specify flags with Bash-expansions (e.g. `preFixup = ''makeWrapperArgs+=(--prefix PATH : "$SOME_PATH")`''). + ::: + * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.8-"` for Python 3.8, etc., and in case of applications to `""`. * `pypaBuildFlags ? []`: A list of strings. Arguments to be passed to `python -m build --wheel`. From 4fae2f59eeb9128d4c9021a063d34e62a5592d3b Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 17 Dec 2024 07:09:33 +0800 Subject: [PATCH 040/280] rl-2505.section.md: add entries about buildPython*'s __structuredAttrs support --- nixos/doc/manual/release-notes/rl-2505.section.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index eb15f1c4b8e9..e121e095db0f 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -22,6 +22,8 @@ - The default Elixir version has been updated to 1.18. +- `buildPythonPackage`, `buildPythonApplication` and the Python building setup hooks now support both `__structuredAttrs = true` and `__structuredAttrs = false`. + - `services.dex` now restarts upon changes to the `.environmentFile` or entries in `.settings.staticClients[].secretFile` when the entry is a `path` type. - `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default. @@ -120,6 +122,16 @@ instead of the python tester launcher. You can still refer to the python launcher via `python3Packages.toPythonApplication python3Packages.playwright` +- The representation of the flags attributes as shell/environment variables for most Python building setup hooks are now the same as `stdenv.mkDerivation` and other build helpers -- they are space-separated environment variables when `__structuredAttrs = false` and Bash arrays when `__structuredAttrs = true`, and are concatenated to the command without Bash-evaluation. The following behaviour changes are introduced during the conversion: + + - The following flags are no longer Bash-expanded before concatenated to the command: + - `disabledTests` and `disabledTestPaths` for `pytestCheckHook`. (`disabledTestPaths` used to be expanded twice before concatenation.) + - `setupPyBuildFlags` and `setupPyGlobalFlags` for `setuptoolsBuildHook`. + + - `pytestFlags` and `unittestFlags` replace `pytestFlagsArray` and `unittestFlagsArray` and become the new and conforming interface. + + - `pytestFlagsArray` and `unittestFlagsArray` are kept for compatibility purposes. They continue to be Bash-expanded before concatenated. This compatibility layer will be removed in future releases. + - `strawberry` has been updated to 1.2, which drops support for the VLC backend and Qt 5. The `strawberry-qt5` package and `withGstreamer`/`withVlc` override options have been removed due to this. From 53da12177e3e6674872f7890665636591eda05d7 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 21 Dec 2024 20:49:02 +0800 Subject: [PATCH 041/280] python3Packages.conda: use __structuredAttrs = true --- pkgs/development/python-modules/conda/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index b1942a35a256..7de699646cef 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -26,6 +26,7 @@ defaultPkgPath ? "~/.conda/pkgs", # default path to store download conda packages }: buildPythonPackage rec { + __structuredAttrs = true; pname = "conda"; version = "24.7.1"; pyproject = true; @@ -63,9 +64,17 @@ buildPythonPackage rec { patches = [ ./0001-conda_exe.patch ]; makeWrapperArgs = [ - "--set CONDA_EXE ${placeholder "out"}/bin/conda" - ''--set-default CONDA_ENVS_PATH "${defaultEnvPath}"'' - ''--set-default CONDA_PKGS_DIRS "${defaultPkgPath}"'' + "--set" + "CONDA_EXE" + "${placeholder "out"}/bin/conda" + + "--set-default" + "CONDA_ENVS_PATH" + defaultEnvPath + + "--set-default" + "CONDA_PKGS_DIRS" + defaultPkgPath ]; pythonImportsCheck = [ "conda" ]; From 625cf90466022be8a17879224ff90daa6d38b5af Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 21 Dec 2024 20:50:50 +0800 Subject: [PATCH 042/280] python3Packages.tensorflow: use __structuredAttrs = true --- pkgs/development/python-modules/tensorflow/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index ac2430d1a2b6..e3081deb2f92 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -607,6 +607,7 @@ let }; in buildPythonPackage { + __structuredAttrs = true; inherit version pname; disabled = pythonAtLeast "3.12"; @@ -636,7 +637,10 @@ buildPythonPackage { rm $out/bin/tensorboard ''; - setupPyGlobalFlags = [ "--project_name ${pname}" ]; + setupPyGlobalFlags = [ + "--project_name" + pname + ]; # tensorflow/tools/pip_package/setup.py propagatedBuildInputs = [ From 80b2f9f1bbffe7d19a6ee879b322d8ac974b7aa3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 4 Jan 2025 17:50:59 +0200 Subject: [PATCH 043/280] python312Packages.scipy: 1.14.1 -> 1.15.0 Diff: https://github.com/scipy/scipy/compare/refs/tags/v1.14.1...v1.15.0 Changelog: https://github.com/scipy/scipy/releases/tag/v1.15.0 --- pkgs/development/python-modules/scipy/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index ad7b85eb7170..9372e5f9934f 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -34,7 +34,7 @@ # tests hypothesis, - pytest7CheckHook, + pytestCheckHook, pytest-xdist, # Reverse dependency @@ -48,8 +48,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.14.1"; - srcHash = "sha256-eYuUHr9wZMXvEsIhssGR35JnRBNGaOL/j1LNM5sHuYY="; + version = "1.15.0"; + srcHash = "sha256-HAL9Ebfrm08UiSzWrgXQpoYLh5Nz57ykLz2EMBaygN0="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -92,11 +92,6 @@ buildPythonPackage { }) ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "pybind11>=2.12.0,<2.13.0" "pybind11>=2.12.0" \ - ''; - build-system = [ cython @@ -129,8 +124,7 @@ buildPythonPackage { nativeCheckInputs = [ hypothesis - # Failed: DID NOT WARN. No warnings of type (, , ) were emitted. - pytest7CheckHook + pytestCheckHook pytest-xdist ]; From 75dfe81caf85265943e23070f98c1ddc8c69aa18 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 4 Jan 2025 13:42:55 +0100 Subject: [PATCH 044/280] buildGoModule: fix GO_NO_VENDOR_CHECKS for v1.23+ There was an additional check added for vendor/modules.txt when loading packages, see https://github.com/golang/go/commit/38ee0c7630e999f97d96899ecf4e8d0230236cd6#diff-61fb6e44eac25bd4d6a8a64b3f38ee8a41faaefd1ef481170a011ecfc0f7c76bR344 The new version of the patch tries to also disable these checks. Signed-off-by: Paul Meyer --- pkgs/development/compilers/go/1.23.nix | 2 +- pkgs/development/compilers/go/1.24.nix | 2 +- .../go/go_no_vendor_checks-1.23.patch | 26 +++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/go/go_no_vendor_checks-1.23.patch diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 85c9be094a0d..ed0263ade430 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { inherit tzdata; }) ./remove-tools-1.11.patch - ./go_no_vendor_checks-1.22.patch + ./go_no_vendor_checks-1.23.patch ]; GOOS = if stdenv.targetPlatform.isWasi then "wasip1" else stdenv.targetPlatform.parsed.kernel.name; diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 7f95a41f14ed..06cea795f789 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { inherit tzdata; }) ./remove-tools-1.11.patch - ./go_no_vendor_checks-1.22.patch + ./go_no_vendor_checks-1.23.patch ]; GOOS = if stdenv.targetPlatform.isWasi then "wasip1" else stdenv.targetPlatform.parsed.kernel.name; diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.23.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.23.patch new file mode 100644 index 000000000000..eaffb1bef648 --- /dev/null +++ b/pkgs/development/compilers/go/go_no_vendor_checks-1.23.patch @@ -0,0 +1,26 @@ +diff --git a/src/cmd/go/internal/modload/import.go b/src/cmd/go/internal/modload/import.go +index a3105b6b6d..0e10154a70 100644 +--- a/src/cmd/go/internal/modload/import.go ++++ b/src/cmd/go/internal/modload/import.go +@@ -345,7 +345,7 @@ func importFromModules(ctx context.Context, path string, rs *Requirements, mg *M + // vendor/modules.txt does not exist or the user manually added directories to the vendor directory. + // Go 1.23 and later require vendored packages to be present in modules.txt to be imported. + _, ok := vendorPkgModule[path] +- if ok || (gover.Compare(MainModules.GoVersion(), gover.ExplicitModulesTxtImportVersion) < 0) { ++ if ok || (gover.Compare(MainModules.GoVersion(), gover.ExplicitModulesTxtImportVersion) < 0) || os.Getenv("GO_NO_VENDOR_CHECKS") == "1" { + mods = append(mods, vendorPkgModule[path]) + dirs = append(dirs, dir) + roots = append(roots, vendorDir) +diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go +index b2cb44100e..05bf3829d5 100644 +--- a/src/cmd/go/internal/modload/vendor.go ++++ b/src/cmd/go/internal/modload/vendor.go +@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, modFiles []*modfile.File, m + panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes))) + } + index := indexes[0] +- if gover.Compare(index.goVersion, "1.14") < 0 { ++ if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. From 553d898940b35a12c33fbc5596c69965e924c559 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:09:41 +0100 Subject: [PATCH 045/280] lpd8editor: replace `git` with `gitMinimal` --- pkgs/applications/audio/lpd8editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lpd8editor/default.nix b/pkgs/applications/audio/lpd8editor/default.nix index 6592f68fa98a..b5071a2c5a41 100644 --- a/pkgs/applications/audio/lpd8editor/default.nix +++ b/pkgs/applications/audio/lpd8editor/default.nix @@ -2,7 +2,7 @@ lib, qt5, stdenv, - git, + gitMinimal, fetchFromGitHub, cmake, alsa-lib, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - git + gitMinimal qt5.wrapQtAppsHook ]; From 676389b044ad39df3febba0a9b35b93066af4d03 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:20:33 +0100 Subject: [PATCH 046/280] nano: replace `git` with `gitMinimal` --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index f88249db0a54..d4dfd8a839b1 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -7,7 +7,7 @@ texinfo, writeScript, common-updater-scripts, - git, + gitMinimal, nix, nixfmt-classic, coreutils, @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { PATH=${ lib.makeBinPath [ common-updater-scripts - git + gitMinimal nixfmt-classic nix coreutils From 5a40872640be5414bbe26e737a242caeddc28055 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:21:24 +0100 Subject: [PATCH 047/280] zcash: replace `git` with `gitMinimal` --- pkgs/applications/blockchains/zcash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 14ca8b1a88b0..ecd50d3744cf 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -7,7 +7,7 @@ cxx-rs, db62, fetchFromGitHub, - git, + gitMinimal, hexdump, lib, libevent, @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { autoreconfHook cargo cxx-rs - git + gitMinimal hexdump makeWrapper pkg-config From 31d83c33622ac109800cae8b16dc05f58628bada Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:21:43 +0100 Subject: [PATCH 048/280] visidata: replace `git` with `gitMinimal` --- pkgs/applications/misc/visidata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index d3b8dcc2bdff..7bb38e8b0d1b 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -40,7 +40,7 @@ zstandard, zulip, # other - git, + gitMinimal, withPcap ? true, dpkt, dnslib, @@ -121,7 +121,7 @@ buildPythonApplication rec { ++ lib.optional withXclip xclip; nativeCheckInputs = [ - git + gitMinimal ]; # check phase uses the output bin, which is not possible when cross-compiling From c89ad2075009e81af1bf6db1644637dd9659e489 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:21:58 +0100 Subject: [PATCH 049/280] biome: replace `git` with `gitMinimal` --- pkgs/by-name/bi/biome/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index 993e087d6dec..e96b039d82f8 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -6,7 +6,7 @@ libgit2, rust-jemalloc-sys, zlib, - git, + gitMinimal, }: rustPlatform.buildRustPackage rec { pname = "biome"; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { zlib ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ gitMinimal ]; cargoBuildFlags = [ "-p=biome_cli" ]; cargoTestFlags = From 17dabde5c6ff1ea6580abd80b195e625c1d944c3 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:22:16 +0100 Subject: [PATCH 050/280] cargo-llvm-cov: replace `git` with `gitMinimal` --- pkgs/by-name/ca/cargo-llvm-cov/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index b70ed7d24c38..68721800f1fd 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -20,7 +20,7 @@ fetchFromGitHub, rustPlatform, llvmPackages_19, - git, + gitMinimal, }: let @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage { LLVM_PROFDATA = "${llvm}/bin/llvm-profdata"; nativeCheckInputs = [ - git + gitMinimal ]; # `cargo-llvm-cov` tests rely on `git ls-files. From 87516c65d331a8802abbb641debb4dae369846c5 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:22:38 +0100 Subject: [PATCH 051/280] databricks-cli: replace `git` with `gitMinimal` --- pkgs/by-name/da/databricks-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index fa6ca494349e..b4d80becdd75 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - git, + gitMinimal, python3, }: @@ -37,7 +37,7 @@ buildGoModule rec { ]); nativeCheckInputs = [ - git + gitMinimal (python3.withPackages ( ps: with ps; [ setuptools From b28a138a7733863dcd1249920a01c31662407d0d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:22:53 +0100 Subject: [PATCH 052/280] github-runner: replace `git` with `gitMinimal` --- pkgs/by-name/gi/github-runner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 7200995f2d31..ef4499e499cf 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -6,7 +6,7 @@ dotnetCorePackages, fetchFromGitHub, fetchpatch, - git, + gitMinimal, glibc, glibcLocales, lib, @@ -112,7 +112,7 @@ buildDotnetModule (finalAttrs: { nativeBuildInputs = [ which - git + gitMinimal # needed for `uname` coreutils ] From 3c05d6b61bf6d21708590c0be2dc538c27bbfa72 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:23:06 +0100 Subject: [PATCH 053/280] gitstatus: replace `git` with `gitMinimal` --- pkgs/by-name/gi/gitstatus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix index d0eab16e0dec..6be2cb9f6f0f 100644 --- a/pkgs/by-name/gi/gitstatus/package.nix +++ b/pkgs/by-name/gi/gitstatus/package.nix @@ -3,7 +3,7 @@ lib, stdenv, fetchFromGitHub, - git, + gitMinimal, zsh, zlib, runtimeShell, @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { # command ran successfully. This tests the binary itself and the zsh # integration. nativeInstallCheckInputs = [ - git + gitMinimal zsh ]; doInstallCheck = true; From fcf74752116b703d96fcb487597b0a9d70bade5c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:23:19 +0100 Subject: [PATCH 054/280] glitter: replace `git` with `gitMinimal` --- pkgs/by-name/gl/glitter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glitter/package.nix b/pkgs/by-name/gl/glitter/package.nix index 14e783a00be9..70d7fee9cb71 100644 --- a/pkgs/by-name/gl/glitter/package.nix +++ b/pkgs/by-name/gl/glitter/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - git, + gitMinimal, }: rustPlatform.buildRustPackage rec { @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-7JQcY3HCG3UQ0Mfz/+ZZ0axGEpQoH410FT72tjHW7EE="; nativeCheckInputs = [ - git + gitMinimal ]; # tests require it to be in a git repository From ee9df0c5ae4a9671c960bb35c27949b823009896 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:24:32 +0100 Subject: [PATCH 055/280] ko: replace `git` with `gitMinimal` --- pkgs/by-name/ko/ko/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/ko/package.nix b/pkgs/by-name/ko/ko/package.nix index a59046b9dd20..c16bb3de59b5 100644 --- a/pkgs/by-name/ko/ko/package.nix +++ b/pkgs/by-name/ko/ko/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - git, + gitMinimal, installShellFiles, }: @@ -35,7 +35,7 @@ buildGoModule rec { "-skip=TestNewPublisherCanPublish" ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ gitMinimal ]; preCheck = '' # Feed in all the tests for testing # This is because subPackages above limits what is built to just what we From f5840d2bb7919233f3af98f8bfaa47bedb705df2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:24:43 +0100 Subject: [PATCH 056/280] log4j-sniffer: replace `git` with `gitMinimal` --- pkgs/by-name/lo/log4j-sniffer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/log4j-sniffer/package.nix b/pkgs/by-name/lo/log4j-sniffer/package.nix index 54f888ef89f5..4e5102574abb 100644 --- a/pkgs/by-name/lo/log4j-sniffer/package.nix +++ b/pkgs/by-name/lo/log4j-sniffer/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - git, + gitMinimal, }: buildGoModule rec { @@ -19,7 +19,7 @@ buildGoModule rec { vendorHash = null; nativeCheckInputs = [ - git + gitMinimal ]; preCheck = '' From 7d190c1e944ea4f73334ca7a8bf9cbd32c0a4832 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:24:57 +0100 Subject: [PATCH 057/280] onefetch: replace `git` with `gitMinimal` --- pkgs/by-name/on/onefetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix index c9ef055a1dd9..114bcb499242 100644 --- a/pkgs/by-name/on/onefetch/package.nix +++ b/pkgs/by-name/on/onefetch/package.nix @@ -8,7 +8,7 @@ zstd, stdenv, darwin, - git, + gitMinimal, }: let @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { ]; nativeCheckInputs = [ - git + gitMinimal ]; preCheck = '' From fcff431ba53a2aec882993bfc95a96fd926b6fec Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:25:07 +0100 Subject: [PATCH 058/280] pre-commit: replace `git` with `gitMinimal` --- pkgs/by-name/pr/pre-commit/package.nix | 5 ++--- pkgs/by-name/pr/pre-commit/tests.nix | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index d071d53f7218..334ab8816faf 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -6,13 +6,12 @@ cargo, coursier, dotnet-sdk, - git, + gitMinimal, glibcLocales, go, nodejs, perl, cabal-install, - testers, pre-commit, }: @@ -50,7 +49,7 @@ buildPythonApplication rec { cargo coursier dotnet-sdk - git + gitMinimal glibcLocales go libiconv # For rust tests on Darwin diff --git a/pkgs/by-name/pr/pre-commit/tests.nix b/pkgs/by-name/pr/pre-commit/tests.nix index a1b40bc2d8cc..2c9de8cbfc6f 100644 --- a/pkgs/by-name/pr/pre-commit/tests.nix +++ b/pkgs/by-name/pr/pre-commit/tests.nix @@ -1,5 +1,5 @@ { - git, + gitMinimal, pre-commit, runCommand, testers, @@ -9,7 +9,7 @@ runCommand "check-meta-hooks" { nativeBuildInputs = [ - git + gitMinimal pre-commit ]; } From d3826bcd89eb68be63e288b6dfae192353b4cab4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:25:25 +0100 Subject: [PATCH 059/280] stellar-core: replace `git` with `gitMinimal` --- pkgs/by-name/st/stellar-core/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stellar-core/package.nix b/pkgs/by-name/st/stellar-core/package.nix index 930efaa35dc6..a92100844a10 100644 --- a/pkgs/by-name/st/stellar-core/package.nix +++ b/pkgs/by-name/st/stellar-core/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, fetchpatch, flex, - git, + gitMinimal, lib, libtool, libunwind, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ automake autoconf - git + gitMinimal libtool pkg-config ripgrep From b24319726a948e4707015eae2bfe8d096cd8b5ee Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:25:37 +0100 Subject: [PATCH 060/280] taler-wallet-core: replace `git` with `gitMinimal` --- pkgs/by-name/ta/taler-wallet-core/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index 0d2330553fb2..9a2fd68d2894 100644 --- a/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -10,7 +10,7 @@ nodejs, pnpm, python3, - git, + gitMinimal, jq, zip, }: @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { customPython nodejs pnpm.configHook - git + gitMinimal jq zip ]; From 4930316677b7f341c745e411fec7b7c2d1e2534c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:25:59 +0100 Subject: [PATCH 061/280] flutter: replace `git` with `gitMinimal` --- pkgs/development/compilers/flutter/engine/package.nix | 4 ++-- pkgs/development/compilers/flutter/flutter.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index 4693062cacb8..4c10c665b023 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -38,7 +38,7 @@ ninja, python312, python39, - git, + gitMinimal, version, flutterVersion, dartSdkVersion, @@ -176,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: { [ python3 (tools.vpython python3) - git + gitMinimal pkg-config ninja dart diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index dcd8073b4f39..8d0ba5b8fb8f 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -22,7 +22,7 @@ callPackage, makeWrapper, darwin, - git, + gitMinimal, which, jq, flutterTools ? null, @@ -64,7 +64,7 @@ let nativeBuildInputs = [ makeWrapper jq - git + gitMinimal ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; strictDeps = true; From dc3d1433babf0f67aa9d3c9d5222fcf1c42f0bcf Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:26:15 +0100 Subject: [PATCH 062/280] julia-modules: replace `git` with `gitMinimal` --- pkgs/development/julia-modules/util.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/julia-modules/util.nix b/pkgs/development/julia-modules/util.nix index d70bdc48bffa..b1c63b2b234e 100644 --- a/pkgs/development/julia-modules/util.nix +++ b/pkgs/development/julia-modules/util.nix @@ -1,5 +1,5 @@ { - git, + gitMinimal, runCommand, }: @@ -20,7 +20,7 @@ # Convert an ordinary source checkout into a repo with a single commit repoifySimple = name: path: - runCommand ''${name}-repoified'' { buildInputs = [ git ]; } '' + runCommand ''${name}-repoified'' { buildInputs = [ gitMinimal ]; } '' mkdir -p $out cp -r ${path}/. $out cd $out @@ -36,7 +36,7 @@ # Convert an dependency source info into a repo with a single commit repoifyInfo = uuid: info: - runCommand ''julia-${info.name}-${info.version}'' { buildInputs = [ git ]; } '' + runCommand ''julia-${info.name}-${info.version}'' { buildInputs = [ gitMinimal ]; } '' mkdir -p $out cp -r ${info.src}/. $out cd $out From a78aaceefcb7ab1297058699813e3611f3e006f4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:26:38 +0100 Subject: [PATCH 063/280] python312Packages.commitizen: replace `git` with `gitMinimal` --- pkgs/development/python-modules/commitizen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 867b03e2c1b4..e382df9ed7c7 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -3,7 +3,7 @@ commitizen, fetchFromGitHub, buildPythonPackage, - git, + gitMinimal, pythonOlder, stdenv, installShellFiles, @@ -69,7 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ argcomplete deprecated - git + gitMinimal py pytest-freezer pytest-mock From 6c62a00e47ebf1caec4bc6a2b1a2615e94a4676d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:27:00 +0100 Subject: [PATCH 064/280] python312Packages.font-v: replace `git` with `gitMinimal` --- pkgs/development/python-modules/font-v/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/font-v/default.nix b/pkgs/development/python-modules/font-v/default.nix index 945f77698ef7..fd2970d07a34 100644 --- a/pkgs/development/python-modules/font-v/default.nix +++ b/pkgs/development/python-modules/font-v/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, fonttools, - git, + gitMinimal, gitpython, pytestCheckHook, }: @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - git + gitMinimal pytestCheckHook ]; preCheck = '' From f309a89c5aafa7864cd71f1dcf4a48cb994b47c3 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:27:35 +0100 Subject: [PATCH 065/280] python312Packages.fontbakery: replace `git` with `gitMinimal` --- pkgs/development/python-modules/fontbakery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index 5d7a30fdfa50..2765f62764ca 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -16,7 +16,7 @@ freetype-py, gflanguages, gfsubsets, - git, + gitMinimal, glyphsets, installShellFiles, jinja2, @@ -110,7 +110,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - git + gitMinimal pytestCheckHook pytest-xdist requests-mock From 88129f58679972030cf4f6dcdeb0e9825fbc7611 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:27:52 +0100 Subject: [PATCH 066/280] python312Packages.playwright: replace `git` with `gitMinimal` --- pkgs/development/python-modules/playwright/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index d230e237cec6..c844d2ea4887 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -3,7 +3,7 @@ stdenv, auditwheel, buildPythonPackage, - git, + gitMinimal, greenlet, fetchFromGitHub, pyee, @@ -71,7 +71,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - git + gitMinimal setuptools-scm setuptools ] ++ lib.optionals stdenv.hostPlatform.isLinux [ auditwheel ]; From 7d5bee9d1d013b54dd31ab06d27c5da9a3f05592 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:28:09 +0100 Subject: [PATCH 067/280] python312Packages.pre-commit-hooks: replace `git` with `gitMinimal` --- pkgs/development/python-modules/pre-commit-hooks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index a4aae5331b56..9124989c5d15 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, - git, + gitMinimal, pytestCheckHook, pythonOlder, ruamel-yaml, @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ruamel-yaml ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; nativeCheckInputs = [ - git + gitMinimal pytestCheckHook ]; From 2974863439d344118c2b2d8e592eb015ebee09b6 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 17:28:28 +0100 Subject: [PATCH 068/280] build-support/make-hardcode-gsettings-patch: replace `git` with `gitMinimal` --- pkgs/build-support/make-hardcode-gsettings-patch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/make-hardcode-gsettings-patch/default.nix b/pkgs/build-support/make-hardcode-gsettings-patch/default.nix index f3f781968788..e63e5976f3eb 100644 --- a/pkgs/build-support/make-hardcode-gsettings-patch/default.nix +++ b/pkgs/build-support/make-hardcode-gsettings-patch/default.nix @@ -1,6 +1,6 @@ { runCommand, - git, + gitMinimal, coccinelle, python3, }: @@ -60,7 +60,7 @@ runCommand "hardcode-gsettings.patch" { inherit src patches; nativeBuildInputs = [ - git + gitMinimal coccinelle python3 # For patch script ]; From a9115b3a83c938d794c5fda17e4ea05c9386fb57 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:36:35 +0100 Subject: [PATCH 069/280] nbstripout: replace `git` with `gitMinimal` --- pkgs/applications/version-management/nbstripout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 9c0465c46a03..6ce5b2919bb4 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -3,7 +3,7 @@ python3, fetchPypi, coreutils, - git, + gitMinimal, mercurial, }: @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = [ coreutils - git + gitMinimal mercurial ] ++ (with python3.pkgs; [ From f7e55fbcd058384a5ce15db2e6ac29f78c624431 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:46:40 +0100 Subject: [PATCH 070/280] cargo-generate: replace `git` with `gitMinimal` --- pkgs/by-name/ca/cargo-generate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix index a3f0fd572946..ca5ed22f9580 100644 --- a/pkgs/by-name/ca/cargo-generate/package.nix +++ b/pkgs/by-name/ca/cargo-generate/package.nix @@ -7,7 +7,7 @@ openssl, stdenv, darwin, - git, + gitMinimal, }: rustPlatform.buildRustPackage rec { @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ gitMinimal ]; # disable vendored libgit2 and openssl buildNoDefaultFeatures = true; From 31d810e933e3b10ef82a5928e6d9269cd87fc76e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:47:55 +0100 Subject: [PATCH 071/280] git-aggregator: replace `git` with `gitMinimal` --- pkgs/by-name/gi/git-aggregator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-aggregator/package.nix b/pkgs/by-name/gi/git-aggregator/package.nix index c74d926bde18..bb0fcabe04da 100644 --- a/pkgs/by-name/gi/git-aggregator/package.nix +++ b/pkgs/by-name/gi/git-aggregator/package.nix @@ -2,7 +2,7 @@ lib, python3Packages, fetchFromGitHub, - git, + gitMinimal, }: python3Packages.buildPythonApplication rec { @@ -23,13 +23,13 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ argcomplete colorama - git + gitMinimal kaptan requests ]; nativeCheckInputs = [ - git + gitMinimal ]; preCheck = '' From 7bb1650eed96d116672a7e937f3af089eba94c6b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:48:34 +0100 Subject: [PATCH 072/280] git-bug-migration: replace `git` with `gitMinimal` --- pkgs/by-name/gi/git-bug-migration/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-bug-migration/package.nix b/pkgs/by-name/gi/git-bug-migration/package.nix index df18c4fe8536..9bc2f1b30f41 100644 --- a/pkgs/by-name/gi/git-bug-migration/package.nix +++ b/pkgs/by-name/gi/git-bug-migration/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - git, + gitMinimal, }: buildGoModule rec { pname = "git-bug-migration"; @@ -17,7 +17,7 @@ buildGoModule rec { vendorHash = "sha256-Hid9OK91LNjLmDHam0ZlrVQopVOsqbZ+BH2rfQi5lS0="; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ gitMinimal ]; ldflags = [ "-X main.GitExactTag=${version}" From 4a9c8f10573db1d2a15ce1f26bc045fd1702a59c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:48:57 +0100 Subject: [PATCH 073/280] git-dive: replace `git` with `gitMinimal` --- pkgs/by-name/gi/git-dive/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-dive/package.nix b/pkgs/by-name/gi/git-dive/package.nix index 1f0c479abb4c..b730a025af0c 100644 --- a/pkgs/by-name/gi/git-dive/package.nix +++ b/pkgs/by-name/gi/git-dive/package.nix @@ -8,7 +8,7 @@ zlib, stdenv, darwin, - git, + gitMinimal, }: rustPlatform.buildRustPackage rec { @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { ]; nativeCheckInputs = [ - git + gitMinimal ]; # don't use vendored libgit2 From cd48b3042c8b6dc8e8ad28ea423c066e9661d347 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:49:18 +0100 Subject: [PATCH 074/280] git-fast-export: replace `git` with `gitMinimal` --- pkgs/by-name/gi/git-fast-export/package.nix | 28 ++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/gi/git-fast-export/package.nix b/pkgs/by-name/gi/git-fast-export/package.nix index f94bf3a3e580..c12e760bf495 100644 --- a/pkgs/by-name/gi/git-fast-export/package.nix +++ b/pkgs/by-name/gi/git-fast-export/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - git, + gitMinimal, mercurial, makeWrapper, nix-update-script, @@ -27,7 +27,10 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + gitMinimal + makeWrapper + ]; buildInputs = [ mercurial.python mercurial @@ -48,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { for script in $out/bin/*.sh; do wrapProgram $script \ - --prefix PATH : "${git}/bin":"${mercurial.python}/bin":$libexec \ + --prefix PATH : "${gitMinimal}/bin":"${mercurial.python}/bin":$libexec \ --prefix PYTHONPATH : "${mercurial}/${mercurial.python.sitePackages}":$sitepackagesPath done ''; @@ -56,22 +59,28 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; # deliberately not adding git or hg into nativeInstallCheckInputs - package should # be able to work without them in runtime env + + nativeCheckInputs = [ + gitMinimal + mercurial + ]; + installCheckPhase = '' mkdir repo-hg pushd repo-hg - ${mercurial}/bin/hg init + hg init echo foo > bar - ${mercurial}/bin/hg add bar - ${mercurial}/bin/hg commit --message "baz" + hg add bar + hg commit --message "baz" popd mkdir repo-git pushd repo-git - ${git}/bin/git init - ${git}/bin/git config core.ignoreCase false # for darwin + git init + git config core.ignoreCase false # for darwin $out/bin/hg-fast-export.sh -r ../repo-hg/ --hg-hash for s in "foo" "bar" "baz" ; do - (${git}/bin/git show | grep $s > /dev/null) && echo $s found + (git show | grep $s > /dev/null) && echo $s found done popd ''; @@ -84,5 +93,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.koral ]; platforms = lib.platforms.unix; + mainProgram = "hg-fast-export.sh"; }; }) From 375f99903358a306b9ff61f65facad3817b5bba2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:49:45 +0100 Subject: [PATCH 075/280] gst: replace `git` with `gitMinimal` --- pkgs/by-name/gs/gst/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gs/gst/package.nix b/pkgs/by-name/gs/gst/package.nix index ac906d3003f9..e0411e873b4c 100644 --- a/pkgs/by-name/gs/gst/package.nix +++ b/pkgs/by-name/gs/gst/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - git, + gitMinimal, ghq, }: @@ -22,7 +22,7 @@ buildGoModule rec { doCheck = false; nativeBuildInputs = [ - git + gitMinimal ghq ]; From ad0ad610967810c0ce7650e1006020389c7f1130 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:50:08 +0100 Subject: [PATCH 076/280] zoekt: replace `git` with `gitMinimal` --- pkgs/by-name/zo/zoekt/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index eb5430d3742d..29f9df11b28f 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -1,8 +1,9 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, git -, nix-update-script +{ + lib, + buildGoModule, + fetchFromGitHub, + gitMinimal, + nix-update-script, }: buildGoModule { @@ -19,7 +20,7 @@ buildGoModule { vendorHash = "sha256-Dvs8XMOxZEE9moA8aCxuxg947+x/6C8cKtgdcByL4Eo="; nativeCheckInputs = [ - git + gitMinimal ]; preCheck = '' @@ -28,7 +29,10 @@ buildGoModule { ''; passthru.updateScript = nix-update-script { - extraArgs = [ "--version" "branch" ]; + extraArgs = [ + "--version" + "branch" + ]; }; meta = { From 2705763c5f61a2d4a2e07952e4523086c7cc82f7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:50:35 +0100 Subject: [PATCH 077/280] python312Packages.dunamai: replace `git` with `gitMinimal` --- pkgs/development/python-modules/dunamai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 24e765cfb35b..02ef9994acbb 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -7,7 +7,7 @@ importlib-metadata, packaging, pytestCheckHook, - git, + gitMinimal, }: buildPythonPackage rec { @@ -38,7 +38,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - git + gitMinimal pytestCheckHook ]; From 15b915cc8b851a543fc19dee26b38a7ab771485f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:51:00 +0100 Subject: [PATCH 078/280] python312Packages.gto: replace `git` with `gitMinimal` --- pkgs/development/python-modules/gto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gto/default.nix b/pkgs/development/python-modules/gto/default.nix index 6664570ef150..8ee83e7b84dd 100644 --- a/pkgs/development/python-modules/gto/default.nix +++ b/pkgs/development/python-modules/gto/default.nix @@ -6,7 +6,7 @@ fetchFromGitHub, freezegun, funcy, - git, + gitMinimal, pydantic, pytest-cov-stub, pytest-mock, @@ -56,7 +56,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - git + gitMinimal pytest-cov-stub pytest-mock pytest-test-utils From 170c8ab0eb218636495de6f80d139852708d2c61 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:51:31 +0100 Subject: [PATCH 079/280] python312Packages.nbdime: replace `git` with `gitMinimal` --- pkgs/development/python-modules/nbdime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 7a873014640e..9ccb1a257b88 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -15,7 +15,7 @@ jupyter-server, jupyter-server-mathjax, jinja2, - git, + gitMinimal, pytest-tornado, pytestCheckHook, }: @@ -51,7 +51,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - git + gitMinimal pytest-tornado pytestCheckHook ]; From 6a187ef35a4027c33c1eb87400e2e80835553c83 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:52:19 +0100 Subject: [PATCH 080/280] python312Packages.pdm-backend: replace `git` with `gitMinimal` --- pkgs/development/python-modules/pdm-backend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 578d1fb96449..d6b18382a726 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -9,7 +9,7 @@ # tests editables, - git, + gitMinimal, mercurial, pytestCheckHook, setuptools, @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeCheckInputs = [ editables - git + gitMinimal mercurial pytestCheckHook setuptools From 67a5a288c9271234527ba400e3a87d705ba439d7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:52:44 +0100 Subject: [PATCH 081/280] python312Packages.pdm-pep517: replace `git` with `gitMinimal` --- pkgs/development/python-modules/pdm-pep517/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index f914b5b86ed9..29829575fcbd 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - git, + gitMinimal, pytestCheckHook, setuptools, }: @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - git + gitMinimal setuptools ]; From 2a4bb2ea5933144c609326335cf1420a6cf2e246 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:53:19 +0100 Subject: [PATCH 082/280] python312Packages.pypass: replace `git` with `gitMinimal` --- .../development/python-modules/pypass/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 1b9dc08d6720..d1581e898547 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -5,7 +5,7 @@ click, colorama, fetchPypi, - git, + gitMinimal, gnugrep, gnupg, pbr, @@ -34,7 +34,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./mark-executables.patch; - git_exec = "${git}/bin/git"; + git_exec = "${gitMinimal}/bin/git"; grep_exec = "${gnugrep}/bin/grep"; gpg_exec = "${gnupg}/bin/gpg2"; tree_exec = "${tree}/bin/tree"; @@ -57,15 +57,18 @@ buildPythonPackage rec { pexpect ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + gitMinimal + pytestCheckHook + ]; # Configuration so that the tests work preCheck = '' export HOME=$(mktemp -d) export GNUPGHOME=pypass/tests/gnupg - ${git}/bin/git config --global user.email "nix-builder@nixos.org" - ${git}/bin/git config --global user.name "Nix Builder" - ${git}/bin/git config --global pull.ff only + git config --global user.email "nix-builder@nixos.org" + git config --global user.name "Nix Builder" + git config --global pull.ff only make setup_gpg ''; From 1a91e2f24b014f14e81fb56032a3b88521120902 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:53:50 +0100 Subject: [PATCH 083/280] dune-release: replace `git` with `gitMinimal` --- pkgs/development/tools/ocaml/dune-release/default.nix | 9 ++++++--- pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index bd061e4bddf6..d402387a7778 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -19,7 +19,7 @@ yojson, astring, opam, - git, + gitMinimal, findlib, mercurial, bzip2, @@ -34,7 +34,7 @@ let runtimeInputs = [ opam findlib - git + gitMinimal mercurial bzip2 gnutar @@ -78,7 +78,10 @@ buildDunePackage rec { astring fpath ]; - nativeCheckInputs = [ odoc ]; + nativeCheckInputs = [ + odoc + gitMinimal + ]; checkInputs = [ alcotest ] ++ runtimeInputs; doCheck = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 093a0638c8c7..9f389c1be5dd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -418,7 +418,7 @@ let dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { }; dune-release = callPackage ../development/tools/ocaml/dune-release { - inherit (pkgs) opam git mercurial coreutils gnutar bzip2; + inherit (pkgs) opam gitMinimal mercurial coreutils gnutar bzip2; }; dune-rpc = callPackage ../development/ocaml-modules/dune-rpc { }; From 756d00ccfb963491c4eafd60882bc1b1af39860c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 4 Jan 2025 21:54:30 +0100 Subject: [PATCH 084/280] cargo-crev: replace `git` with `gitMinimal` --- .../tools/rust/cargo-crev/default.nix | 54 +++++++++++++------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 31bc6f219ab4..b9ee51deb2ee 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv -, fetchFromGitHub -, rustPlatform -, perl -, pkg-config -, SystemConfiguration -, Security -, CoreFoundation -, curl -, libiconv -, openssl -, git +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + perl, + pkg-config, + SystemConfiguration, + Security, + CoreFoundation, + curl, + libiconv, + openssl, + gitMinimal, }: rustPlatform.buildRustPackage rec { @@ -31,17 +33,35 @@ rustPlatform.buildRustPackage rec { git config --global user.email "nobody@example.com" ''; - nativeBuildInputs = [ perl pkg-config ]; + nativeBuildInputs = [ + perl + pkg-config + ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + SystemConfiguration + Security + CoreFoundation + libiconv + curl + ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ gitMinimal ]; meta = with lib; { description = "Cryptographically verifiable code review system for the cargo (Rust) package manager"; mainProgram = "cargo-crev"; homepage = "https://github.com/crev-dev/cargo-crev"; - license = with licenses; [ asl20 mit mpl20 ]; - maintainers = with maintainers; [ b4dm4n matthiasbeyer ]; + license = with licenses; [ + asl20 + mit + mpl20 + ]; + maintainers = with maintainers; [ + b4dm4n + matthiasbeyer + ]; }; } From 55442f689a925f1a4d2efb4d4990d98cc9faca98 Mon Sep 17 00:00:00 2001 From: w Date: Thu, 9 Jan 2025 05:45:17 +0000 Subject: [PATCH 085/280] elixir: use env shebang only on Darwin --- .../interpreters/elixir/generic-builder.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index b3a7f60e0308..1abbdd25c989 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -57,6 +57,16 @@ let true else versionOlder (versions.major (getVersion erlang)) maxShiftMajor; + + elixirShebang = + if stdenv.hostPlatform.isDarwin then + # Darwin disallows shebang scripts from using other scripts as their + # command. Use env as an intermediary instead of calling elixir directly + # (another shebang script). + # See https://github.com/NixOS/nixpkgs/pull/9671 + "${coreutils}/bin/env $out/bin/elixir" + else + "$out/bin/elixir"; in assert assertMsg (versionAtLeast (getVersion erlang) minimumOTPVersion) compatibilityMsg; assert assertMsg maxAssert compatibilityMsg; @@ -104,7 +114,7 @@ stdenv.mkDerivation ({ done substituteInPlace $out/bin/mix \ - --replace "/usr/bin/env elixir" "${coreutils}/bin/env $out/bin/elixir" + --replace "/usr/bin/env elixir" "${elixirShebang}" ''; pos = builtins.unsafeGetAttrPos "sha256" args; From 5716880c92498936b3bba2a27077270c54dd4eae Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 9 Jan 2025 21:23:34 -0600 Subject: [PATCH 086/280] neovim-require-check-hook: fix ignore directories Properly matching entire directory node name instead of just ending name. --- .../editors/vim/plugins/neovim-require-check-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh index 242db546e766..258598b46ab7 100644 --- a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh +++ b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh @@ -11,7 +11,7 @@ discover_modules() { while IFS= read -r lua_file; do # Ignore certain infra directories - if [[ "$lua_file" =~ debug/|scripts?/|tests?/|spec/ || "$lua_file" =~ .*\meta.lua ]]; then + if [[ "$lua_file" =~ (^|/)(debug|script|scripts|test|tests|spec)(/|$) || "$lua_file" =~ .*\meta.lua ]]; then continue # Ignore optional telescope and lualine modules elif [[ "$lua_file" =~ ^lua/telescope/_extensions/(.+)\.lua || "$lua_file" =~ ^lua/lualine/(.+)\.lua ]]; then From 8d18f59ff5bd747f789737f4136c8d46fda66c58 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 10 Jan 2025 07:32:36 +0000 Subject: [PATCH 087/280] ed: 1.20.2 -> 1.21 Changes: https://lists.gnu.org/archive/html/info-gnu/2025-01/msg00005.html --- pkgs/by-name/ed/ed/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ed/ed/package.nix b/pkgs/by-name/ed/ed/package.nix index a4fe441ae083..ad64a6c72a77 100644 --- a/pkgs/by-name/ed/ed/package.nix +++ b/pkgs/by-name/ed/ed/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ed"; - version = "1.20.2"; + version = "1.21"; src = fetchurl { url = "mirror://gnu/ed/ed-${finalAttrs.version}.tar.lz"; - hash = "sha256-Zf7HMY9IwsoX8zSsD0cD3v5iA3uxPMI5IN4He1+iRSM="; + hash = "sha256-YOJJmHJ9RTpc8CxUZkuXU23kais0zR9PZ8HBphu7rXU="; }; nativeBuildInputs = [ lzip ]; From 4aa504148c5e67f790c0b0b2ac73df68592b134a Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 15:16:28 +0900 Subject: [PATCH 088/280] python312Packages.zope-configuration: 5.0.1 -> 6.0 Changelog: https://github.com/zopefoundation/zope.configuration/blob/6.0/CHANGES.rst --- .../zope-configuration/default.nix | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix index c658412f6b3d..bd10c096a65e 100644 --- a/pkgs/development/python-modules/zope-configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -1,51 +1,50 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, + fetchFromGitHub, + python, setuptools, zope-i18nmessageid, zope-interface, zope-schema, - pytestCheckHook, - zope-testing, - zope-testrunner, - manuel, + unittestCheckHook, }: buildPythonPackage rec { pname = "zope-configuration"; - version = "5.0.1"; + version = "6.0"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "zope.configuration"; - inherit version; - hash = "sha256-81h36tXpmANjhdLdxGkZ6ryZjmmcBZh5ZPFxrY3ZJxs="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.configuration"; + tag = version; + hash = "sha256-dkEVIHaXk/oP4uYYzI1hgSnPZXBMDjDu97zmOXnj9NA="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools < 74" "setuptools" + ''; - nativeCheckInputs = [ - manuel - pytestCheckHook - zope-testing - zope-testrunner - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ zope-i18nmessageid zope-interface zope-schema ]; - # Need to investigate how to run the tests with zope-testrunner - doCheck = false; - pythonImportsCheck = [ "zope.configuration" ]; + nativeCheckInputs = [ unittestCheckHook ]; + + preCheck = '' + cd $out/${python.sitePackages}/zope/ + ''; + + unittestFlagsArray = [ "configuration/tests" ]; + pythonNamespaces = [ "zope" ]; meta = with lib; { From ec57e55c470688c43ad243b12951886f3bd2f73d Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 15:22:11 +0900 Subject: [PATCH 089/280] python312Packages.zope-i18nmessageid: 6.1.0 -> 7.0 Changelog: https://github.com/zopefoundation/zope.i18nmessageid/blob/7.0/CHANGES.rst --- .../zope-i18nmessageid/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/zope-i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix index 0d1f93014fc4..ff6c15ac9746 100644 --- a/pkgs/development/python-modules/zope-i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix @@ -1,22 +1,31 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, zope-testrunner, unittestCheckHook, }: buildPythonPackage rec { pname = "zope-i18nmessageid"; - version = "6.1.0"; - format = "setuptools"; + version = "7.0"; + pyproject = true; - src = fetchPypi { - pname = "zope.i18nmessageid"; - inherit version; - hash = "sha256-Rawm/chvq997ePHBvM/B1DctGlSDi7rt2p26dEStiUE="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.i18nmessageid"; + tag = version; + hash = "sha256-rdTs1pNMKpPAR2CewXdg1KmI61Sw5r62OobYlJHsUaQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; + + build-system = [ setuptools ]; + nativeCheckInputs = [ unittestCheckHook zope-testrunner @@ -26,11 +35,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "zope.i18nmessageid" ]; - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; description = "Message Identifiers for internationalization"; changelog = "https://github.com/zopefoundation/zope.i18nmessageid/blob/${version}/CHANGES.rst"; - license = licenses.zpl20; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From dbedf7e8fe6af735abb2d7d0eddefb170fbb0c4c Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 15:27:38 +0900 Subject: [PATCH 090/280] python312Packages.zope-interface: 6.4.post2 -> 7.2 Changelog: https://github.com/zopefoundation/zope.interface/blob/7.2/CHANGES.rst --- .../python-modules/zope-interface/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/zope-interface/default.nix b/pkgs/development/python-modules/zope-interface/default.nix index 830e4291ef4f..3c5f5b0c478f 100644 --- a/pkgs/development/python-modules/zope-interface/default.nix +++ b/pkgs/development/python-modules/zope-interface/default.nix @@ -1,32 +1,40 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, - zope-event, }: buildPythonPackage rec { - pname = "zope.interface"; - version = "6.4.post2"; + pname = "zope-interface"; + version = "7.2"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-HCB+b239V0mib1pf2WZgLWuCTsANLfhKfpqSTokzZU4="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.interface"; + tag = version; + hash = "sha256-WrS/YHkEmV1G/Scg0xpyu2uFVWTWnEpajqNDvGioVgc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools < 74" "setuptools" + ''; + build-system = [ setuptools ]; - dependencies = [ zope-event ]; + pythonImportsCheck = [ "zope.interface" ]; doCheck = false; # Circular deps. - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { changelog = "https://github.com/zopefoundation/zope.interface/blob/${version}/CHANGES.rst"; description = "Zope.Interface"; homepage = "https://github.com/zopefoundation/zope.interface"; - license = licenses.zpl20; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From 93dc9c630e3aed9c1e3093112f143a2c0c6fb9c4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 16:17:19 +0900 Subject: [PATCH 091/280] python312Packages.zope-security: init at 7.3 --- .../python-modules/zope-security/default.nix | 79 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/development/python-modules/zope-security/default.nix diff --git a/pkgs/development/python-modules/zope-security/default.nix b/pkgs/development/python-modules/zope-security/default.nix new file mode 100644 index 000000000000..ca25a0f0ed76 --- /dev/null +++ b/pkgs/development/python-modules/zope-security/default.nix @@ -0,0 +1,79 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + zope-component, + zope-i18nmessageid, + zope-interface, + zope-location, + zope-proxy, + zope-schema, + pytz, + zope-configuration, + btrees, + unittestCheckHook, + zope-exceptions, +}: + +buildPythonPackage rec { + pname = "zope-security"; + version = "7.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.security"; + tag = version; + hash = "sha256-p+9pCcBsCJY/V6vraVZHMr5VwYHFe217AbRVoSnDphs="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + zope-component + zope-i18nmessageid + zope-interface + zope-location + zope-proxy + zope-schema + ]; + + optional-dependencies = { + pytz = [ pytz ]; + # untrustedpython = [ zope-untrustedpython ]; + zcml = [ zope-configuration ]; + }; + + pythonImportsCheck = [ "zope.security" ]; + + nativeCheckInputs = [ + btrees + unittestCheckHook + zope-exceptions + ]; + + # Import process is too complex and some tests fail + preCheck = '' + rm -r src/zope/security/tests/test_metaconfigure.py + rm -r src/zope/security/tests/test_proxy.py + rm -r src/zope/security/tests/test_zcml_functest.py + ''; + + unittestFlagsArray = [ "src/zope/security/tests" ]; + + pythonNamespaces = [ "zope" ]; + + meta = { + description = "Zope Security Framework"; + homepage = "https://github.com/zopefoundation/zope.security"; + changelog = "https://github.com/zopefoundation/zope.security/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a645667f114d..afec7a27d3c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18548,6 +18548,8 @@ self: super: with self; { zope-schema = callPackage ../development/python-modules/zope-schema { }; + zope-security = callPackage ../development/python-modules/zope-security { }; + zope-size = callPackage ../development/python-modules/zope-size { }; zope-testbrowser = callPackage ../development/python-modules/zope-testbrowser { }; From 270f14c060ed483b528b8e07c5152db468bb702b Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 16:19:15 +0900 Subject: [PATCH 092/280] python312Packages.zope-size: refactor --- .../python-modules/zope-size/default.nix | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/zope-size/default.nix b/pkgs/development/python-modules/zope-size/default.nix index d526d01e3fa0..36e009c142e6 100644 --- a/pkgs/development/python-modules/zope-size/default.nix +++ b/pkgs/development/python-modules/zope-size/default.nix @@ -2,28 +2,49 @@ lib, buildPythonPackage, fetchPypi, + setuptools, zope-i18nmessageid, zope-interface, + unittestCheckHook, + zope-component, + zope-security, }: buildPythonPackage rec { - pname = "zope.size"; + pname = "zope-size"; version = "5.0"; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "zope.size"; + inherit version; hash = "sha256-sVRT40+Bb/VFmtg82TUCmqWBxqRTRj4DxeLZe9IKQyo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ zope-i18nmessageid zope-interface ]; - meta = with lib; { + pythonImportsCheck = [ "zope.size" ]; + + nativeCheckInputs = [ + unittestCheckHook + zope-component + zope-security + ]; + + unittestFlagsArray = [ "src/zope/size" ]; + + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.size"; description = "Interfaces and simple adapter that give the size of an object"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zope.size/blob/${version}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From fdc65b20c155a16557e618d713b110fea5d820c2 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 16:21:55 +0900 Subject: [PATCH 093/280] python312Packages.zope-copy: 4.3 -> 5.0 Changelog: https://github.com/zopefoundation/zope.copy/blob/5.0/CHANGES.rst --- .../python-modules/zope-copy/default.nix | 39 ++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/zope-copy/default.nix b/pkgs/development/python-modules/zope-copy/default.nix index daa93782014d..f44ae81ab072 100644 --- a/pkgs/development/python-modules/zope-copy/default.nix +++ b/pkgs/development/python-modules/zope-copy/default.nix @@ -1,8 +1,9 @@ { lib, buildPythonPackage, - fetchPypi, - isPy27, + fetchFromGitHub, + setuptools, + zodbpickle, zope-interface, zope-location, zope-schema, @@ -10,17 +11,31 @@ }: buildPythonPackage rec { - pname = "zope.copy"; - version = "4.3"; + pname = "zope-copy"; + version = "5.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-epg2yjqX9m1WGzYPeGUBKGif4JNAddzg75ECe9xPOlc="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.copy"; + tag = version; + hash = "sha256-uQUvfZGrMvtClXa8tLKZFYehbcBIRx7WQnumUrdQjIk="; }; - propagatedBuildInputs = [ zope-interface ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools < 74" "setuptools" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + zodbpickle + zope-interface + ]; + + pythonImportsCheck = [ "zope.copy" ]; - doCheck = !isPy27; # namespace conflicts nativeCheckInputs = [ unittestCheckHook zope-location @@ -32,7 +47,13 @@ buildPythonPackage rec { "src/zope/copy" ]; + pythonNamespaces = [ "zope" ]; + meta = { + description = "Pluggable object copying mechanism"; + homepage = "https://github.com/zopefoundation/zope.copy"; + changelog = "https://github.com/zopefoundation/zope.copy/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = with lib.maintainers; [ domenkozar ]; }; } From e5e387929b565f6b7e1e36c5f15aa7932dbd21ef Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 16:30:56 +0900 Subject: [PATCH 094/280] python312Packages.zope-event: 4.6 -> 5.0 Changelog: https://github.com/zopefoundation/zope.event/blob/5.0/CHANGES.rst --- .../python-modules/zope-event/default.nix | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/zope-event/default.nix b/pkgs/development/python-modules/zope-event/default.nix index 805fc285e0a0..e63aebca47de 100644 --- a/pkgs/development/python-modules/zope-event/default.nix +++ b/pkgs/development/python-modules/zope-event/default.nix @@ -1,22 +1,38 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { - pname = "zope.event"; - version = "4.6"; + pname = "zope-event"; + version = "5.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-gdmIEwRvyGzEE242mP7mKKMoL5wyDbGGWMIXSSNfzoA="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.event"; + tag = version; + hash = "sha256-85jXSrploTcskdOBI84KGGf9Bno41ZTtT/TrbgmTxiA="; }; - meta = with lib; { + build-system = [ setuptools ]; + + pythonImportsCheck = [ "zope.event" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "src/zope/event/tests.py" ]; + + pythonNamespaces = [ "zope" ]; + + meta = { description = "Event publishing system"; - homepage = "https://pypi.org/project/zope.event/"; - license = licenses.zpl20; + homepage = "https://github.com/zopefoundation/zope.event"; + changelog = "https://github.com/zopefoundation/zope.event/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From 09aee68012350575e577a84655bd274d158328f1 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 16:40:22 +0900 Subject: [PATCH 095/280] python312Packages.zope-proxy: 5.3 -> 6.1 Changelog: https://github.com/zopefoundation/zope.proxy/blob/6.1/CHANGES.rst --- .../python-modules/zope-proxy/default.nix | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix index cb204cc57753..b480cdd9396e 100644 --- a/pkgs/development/python-modules/zope-proxy/default.nix +++ b/pkgs/development/python-modules/zope-proxy/default.nix @@ -1,39 +1,44 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, + fetchFromGitHub, setuptools, zope-interface, }: buildPythonPackage rec { pname = "zope-proxy"; - version = "5.3"; + version = "6.1"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "zope.proxy"; - inherit version; - hash = "sha256-rSTSjrxq3p++vgzEvcTsUNHe5BpFPjMa/SoSYL6Wdgg="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.proxy"; + tag = version; + hash = "sha256-RgkUojCAfwAGv8Jek2Ucg0KMtPviwXjuiO70iisParM="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; - propagatedBuildInputs = [ zope-interface ]; + build-system = [ setuptools ]; + + dependencies = [ zope-interface ]; # circular deps doCheck = false; pythonImportsCheck = [ "zope.proxy" ]; - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.proxy"; description = "Generic Transparent Proxies"; changelog = "https://github.com/zopefoundation/zope.proxy/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From ac4d0ff3b6e3508eb283bea178d2778ad715e848 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 16:49:15 +0900 Subject: [PATCH 096/280] python312Packages.zope-schema: refactor --- .../python-modules/zope-schema/default.nix | 43 ++++++++++++------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/zope-schema/default.nix b/pkgs/development/python-modules/zope-schema/default.nix index a1f4a8f263f7..739e55795ced 100644 --- a/pkgs/development/python-modules/zope-schema/default.nix +++ b/pkgs/development/python-modules/zope-schema/default.nix @@ -1,38 +1,49 @@ { lib, buildPythonPackage, - fetchPypi, - zope-location, + fetchFromGitHub, + setuptools, zope-event, zope-interface, - zope-testing, + unittestCheckHook, + zope-i18nmessageid, }: buildPythonPackage rec { - pname = "zope.schema"; + pname = "zope-schema"; version = "7.0.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-6tTbywM1TU5BDJo7kERR60TZAlR1Gxy97fSmGu3p+7k="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.schema"; + tag = version; + hash = "sha256-aUjlSgMfoKQdE0ta8jxNjh+L7OKkfOVvUWnvhx+QRsI="; }; - propagatedBuildInputs = [ - zope-location + build-system = [ setuptools ]; + + dependencies = [ zope-event zope-interface - zope-testing ]; - # ImportError: No module named 'zope.event' - # even though zope-event has been included. - # Package seems to work fine. - doCheck = false; + pythonImportsCheck = [ "zope.schema" ]; - meta = with lib; { + nativeCheckInputs = [ + unittestCheckHook + zope-i18nmessageid + ]; + + unittestFlagsArray = [ "src/zope/schema/tests" ]; + + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.schema"; description = "zope.interface extension for defining data schemas"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zope.schema/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From 183b8f5a441fa5491e0cebdb4047935597f625d6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 16:50:59 +0900 Subject: [PATCH 097/280] python312Packages.zope-testing: refactor --- pkgs/development/python-modules/zope-testing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope-testing/default.nix b/pkgs/development/python-modules/zope-testing/default.nix index 8b0c7e22cfd5..34d686ebf7e5 100644 --- a/pkgs/development/python-modules/zope-testing/default.nix +++ b/pkgs/development/python-modules/zope-testing/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; doCheck = !isPyPy; @@ -30,11 +30,11 @@ buildPythonPackage rec { pythonNamespaces = [ "zope" ]; - meta = with lib; { + meta = { description = "Zope testing helpers"; homepage = "https://github.com/zopefoundation/zope.testing"; changelog = "https://github.com/zopefoundation/zope.testing/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From 04622d274f83c2b2412067ede3833922850745c4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 17:01:37 +0900 Subject: [PATCH 098/280] python312Packages.zope-location: refactor --- .../python-modules/zope-location/default.nix | 52 ++++++++++++++----- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/zope-location/default.nix b/pkgs/development/python-modules/zope-location/default.nix index 19dfb93b98c9..8b4ff8bf7e88 100644 --- a/pkgs/development/python-modules/zope-location/default.nix +++ b/pkgs/development/python-modules/zope-location/default.nix @@ -1,32 +1,60 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, + zope-interface, zope-proxy, + zope-schema, + zope-component, + zope-configuration, + unittestCheckHook, }: buildPythonPackage rec { - pname = "zope.location"; + pname = "zope-location"; version = "5.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-AW/qk0uX2tKwimTqfy+8PeVduwdMRh9m2HHHC/OqrqU="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.location"; + tag = version; + hash = "sha256-C8tQ4qqzkQx+iU+Pm3iCEchtqOZT/qcYFSzJWzqlhnI="; }; - propagatedBuildInputs = [ zope-proxy ]; + build-system = [ setuptools ]; - # ignore circular dependency on zope-schema - preBuild = '' - sed -i '/zope.schema/d' setup.py + dependencies = [ + zope-interface + zope-proxy + zope-schema + ]; + + optional-dependencies = { + zcml = [ zope-configuration ]; + component = [ zope-component ]; + }; + + pythonImportsCheck = [ "zope.location" ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + # prevent cirtular import + preCheck = '' + rm src/zope/location/tests/test_configure.py + rm src/zope/location/tests/test_pickling.py ''; - doCheck = false; + unittestFlagsArray = [ "src/zope/location/tests" ]; - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.location/"; description = "Zope Location"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zope.location/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From b23cbd820f174da25c6ff9a65f4593cdf89de521 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 17:02:47 +0900 Subject: [PATCH 099/280] python312Packages.zope-hookable: 6.0 -> 7.0 Changelog: https://github.com/zopefoundation/zope.hookable/blob/7.0/CHANGES.rst --- .../python-modules/zope-hookable/default.nix | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index 8af1d3d0b752..66f599332f22 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -1,29 +1,42 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, - zope-testing, + unittestCheckHook, }: buildPythonPackage rec { pname = "zope-hookable"; - version = "6.0"; + version = "7.0"; pyproject = true; - src = fetchPypi { - pname = "zope.hookable"; - inherit version; - hash = "sha256-FmiZPUCnz9yGeEPdVyWSnn+DpbDBlccJrx2u+CdPQ8s="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.hookable"; + tag = version; + hash = "sha256-qJJc646VSdNKors6Au4UAGvm7seFbvjEfpdqf//vJNE="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; - nativeCheckInputs = [ zope-testing ]; + build-system = [ setuptools ]; + + pythonImportsCheck = [ "zope.hookable" ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + unittestFlagsArray = [ "src/zope/hookable/tests" ]; + + pythonNamespaces = [ "zope" ]; meta = with lib; { description = "Supports the efficient creation of “hookable” objects"; homepage = "https://github.com/zopefoundation/zope.hookable"; + changelog = "https://github.com/zopefoundation/zope.hookable/blob/${src.tag}/CHANGES.rst"; license = licenses.zpl21; }; } From 72591df33c690d08ac71b9719f5ddd6270b3d1ce Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 17:21:11 +0900 Subject: [PATCH 100/280] python312Packages.zope-component: refactor --- .../python-modules/zope-component/default.nix | 54 ++++++++++++++----- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index db6a96e7fd62..81f90593b528 100644 --- a/pkgs/development/python-modules/zope-component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, - zope-configuration, - zope-deferredimport, - zope-deprecation, + setuptools, zope-event, zope-hookable, - zope-i18nmessageid, zope-interface, + persistent, + zope-configuration, + zope-i18nmessageid, + zope-location, + zope-proxy, + zope-security, + unittestCheckHook, }: buildPythonPackage rec { pname = "zope-component"; version = "6.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "zope.component"; @@ -22,26 +26,48 @@ buildPythonPackage rec { hash = "sha256-mgoEcq0gG5S0/mdBzprCwwuLsixRYHe/A2kt7E37aQY="; }; - propagatedBuildInputs = [ - zope-configuration - zope-deferredimport - zope-deprecation + build-system = [ setuptools ]; + + dependencies = [ zope-event zope-hookable - zope-i18nmessageid zope-interface ]; - # ignore tests because of a circular dependency on zope-security - doCheck = false; + optional-dependencies = { + persistentregistry = [ persistent ]; + security = [ + zope-location + zope-proxy + zope-security + ]; + zcml = [ + zope-configuration + zope-i18nmessageid + ]; + }; pythonImportsCheck = [ "zope.component" ]; - meta = with lib; { + nativeCheckInputs = [ + unittestCheckHook + zope-configuration + ]; + + unittestFlagsArray = [ "src/zope/component/tests" ]; + + # AssertionError: 'test_interface.IFoo' != 'zope.component.tests.test_interface.IFoo' + preCheck = '' + rm src/zope/component/tests/test_interface.py + ''; + + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.component"; description = "Zope Component Architecture"; changelog = "https://github.com/zopefoundation/zope.component/blob/${version}/CHANGES.rst"; - license = licenses.zpl20; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From 121c452051bf32413be5e954a6b91be2bbc15bac Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 17:22:09 +0900 Subject: [PATCH 101/280] python312Packages.zope-testrunner: 6.4 -> 6.6.1 Changelog: https://github.com/zopefoundation/zope.testrunner/blob/6.6.1/CHANGES.rst --- .../zope-testrunner/default.nix | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/zope-testrunner/default.nix b/pkgs/development/python-modules/zope-testrunner/default.nix index fbc82b59f7bd..85ef9af02889 100644 --- a/pkgs/development/python-modules/zope-testrunner/default.nix +++ b/pkgs/development/python-modules/zope-testrunner/default.nix @@ -1,36 +1,48 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, zope-interface, zope-exceptions, - zope-testing, - six, }: buildPythonPackage rec { - pname = "zope.testrunner"; - version = "6.6"; + pname = "zope-testrunner"; + version = "6.6.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-sReX6XWocHseM7ZUTKz5A3KHiG7leA7P7UvxiZ1CFe8="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.testrunner"; + tag = version; + hash = "sha256-cvZXQzbIUBq99P0FYSydG1tLNBMFTTvuMvqWGaNFhJc="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; + + build-system = [ setuptools ]; + + dependencies = [ zope-interface zope-exceptions - zope-testing - six ]; + pythonImportsCheck = [ "zope.testrunner" ]; + doCheck = false; # custom test modifies sys.path - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { description = "Flexible test runner with layer support"; mainProgram = "zope-testrunner"; - homepage = "https://pypi.python.org/pypi/zope.testrunner"; - license = licenses.zpl20; + homepage = "https://github.com/zopefoundation/zope.testrunner"; + changelog = "https://github.com/zopefoundation/zope.testrunner/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From 9ff0763eab781ce8926a8816dad6c635afd59071 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 17:33:01 +0900 Subject: [PATCH 102/280] python312Packages.zope-dottedname: refactor --- .../python-modules/zope-dottedname/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/zope-dottedname/default.nix b/pkgs/development/python-modules/zope-dottedname/default.nix index ed3dbab8d016..429f6198a73c 100644 --- a/pkgs/development/python-modules/zope-dottedname/default.nix +++ b/pkgs/development/python-modules/zope-dottedname/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, pytestCheckHook, }: @@ -12,15 +11,13 @@ buildPythonPackage rec { version = "6.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "zope.dottedname"; inherit version; hash = "sha256-28S4W/vzSx74jasWJSrG7xbZBDnyIjstCiYs9Bnq6QI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -30,11 +27,11 @@ buildPythonPackage rec { pythonNamespaces = [ "zope" ]; - meta = with lib; { + meta = { homepage = "https://github.com/zopefoundation/zope.dottedname"; description = "Resolver for Python dotted names"; changelog = "https://github.com/zopefoundation/zope.dottedname/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From 0026ea2a19193d59f98d69c95b52220bf44471c5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 17:35:41 +0900 Subject: [PATCH 103/280] python312Packages.zope-deprecation: refactor --- .../python-modules/zope-deprecation/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/zope-deprecation/default.nix b/pkgs/development/python-modules/zope-deprecation/default.nix index 3abbff8e18cd..11d49f3c00de 100644 --- a/pkgs/development/python-modules/zope-deprecation/default.nix +++ b/pkgs/development/python-modules/zope-deprecation/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, pytestCheckHook, }: @@ -12,15 +11,13 @@ buildPythonPackage rec { version = "5.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "zope.deprecation"; inherit version; hash = "sha256-t8MtM5IDayFFxAsxA+cyLbaGYqsJtyZ6/hUyqdk/ZA8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -28,11 +25,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "zope.deprecation" ]; - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.deprecation"; description = "Zope Deprecation Infrastructure"; changelog = "https://github.com/zopefoundation/zope.deprecation/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; - maintainers = with maintainers; [ domenkozar ]; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ domenkozar ]; }; } From cc1e8fb238f2d9f0e42b93eb894522075d5990f4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 17:37:24 +0900 Subject: [PATCH 104/280] python312Packages.zope-contenttype: refactor --- .../python-modules/zope-contenttype/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/zope-contenttype/default.nix b/pkgs/development/python-modules/zope-contenttype/default.nix index 3d70c4dc6788..18222ae51f89 100644 --- a/pkgs/development/python-modules/zope-contenttype/default.nix +++ b/pkgs/development/python-modules/zope-contenttype/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, - zope-testrunner, pytestCheckHook, }: @@ -13,28 +11,25 @@ buildPythonPackage rec { version = "5.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "zope.contenttype"; inherit version; hash = "sha256-AAHvG2XKZQUZBW3OUwxY0LOWlXzPBQIyPIoVSdtk0xc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - zope-testrunner - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "zope.contenttype" ]; - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.contenttype"; description = "Utility module for content-type (MIME type) handling"; changelog = "https://github.com/zopefoundation/zope.contenttype/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From 35156fa65ca7e08833103e6c8cf207cd08e90ef9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 17:44:43 +0900 Subject: [PATCH 105/280] python312Packages.zope-deferredimport: refactor --- .../zope-deferredimport/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 7cc6f18d5e3d..7f79f55b32b9 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -2,14 +2,15 @@ lib, buildPythonPackage, fetchPypi, + setuptools, zope-proxy, - zope-testrunner, + unittestCheckHook, }: buildPythonPackage rec { pname = "zope-deferredimport"; version = "5.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "zope.deferredimport"; @@ -17,19 +18,22 @@ buildPythonPackage rec { hash = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; }; - propagatedBuildInputs = [ zope-proxy ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ zope-testrunner ]; + dependencies = [ zope-proxy ]; - checkPhase = '' - zope-testrunner --test-path=src [] - ''; + pythonImportsCheck = [ "zope.deferredimport" ]; - doCheck = false; + nativeCheckInputs = [ unittestCheckHook ]; - meta = with lib; { + unittestFlagsArray = [ "src/zope/deferredimport" ]; + + pythonNamespaces = [ "zope" ]; + + meta = { description = "Allows you to perform imports names that will only be resolved when used in the code"; homepage = "https://github.com/zopefoundation/zope.deferredimport"; - license = licenses.zpl21; + changelog = "https://github.com/zopefoundation/zope.deferredimport/blob/${version}/CHANGES.rst"; + license = lib.licenses.zpl21; }; } From b8bcb1f21f387a76bce6885f737cb033b3ae36e1 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 17:48:24 +0900 Subject: [PATCH 106/280] python312Packages.zope-lifecycleevent: refactor --- .../zope-lifecycleevent/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/zope-lifecycleevent/default.nix b/pkgs/development/python-modules/zope-lifecycleevent/default.nix index 03f1a5cf111e..05c8fc237b97 100644 --- a/pkgs/development/python-modules/zope-lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope-lifecycleevent/default.nix @@ -2,10 +2,12 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, zope-event, zope-interface, + unittestCheckHook, + zope-component, + zope-testing, }: buildPythonPackage rec { @@ -13,34 +15,39 @@ buildPythonPackage rec { version = "5.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "zope.lifecycleevent"; inherit version; hash = "sha256-6tP7SW52FPm1adFtrUt4BSsKwhh1utjWbKNQNS2bb50="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ zope-event zope-interface ]; - # namespace colides with local directory - doCheck = false; - pythonImportsCheck = [ "zope.lifecycleevent" "zope.interface" ]; - meta = with lib; { + nativeCheckInputs = [ + unittestCheckHook + zope-component + zope-testing + ]; + + unittestFlagsArray = [ "src/zope/lifecycleevent" ]; + + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.lifecycleevent"; description = "Object life-cycle events"; changelog = "https://github.com/zopefoundation/zope.lifecycleevent/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From 50a847bbd2442f76536ef65f7131ad5be1c0743d Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 17:51:47 +0900 Subject: [PATCH 107/280] python312Packages.zope-cachedescriptors: refactor --- .../python-modules/zope-cachedescriptors/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 73aef8961525..30c6fcc2fe1d 100644 --- a/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -9,8 +9,7 @@ buildPythonPackage rec { pname = "zope-cachedescriptors"; version = "5.0"; - - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "zope.cachedescriptors"; @@ -18,7 +17,9 @@ buildPythonPackage rec { hash = "sha256-MVe+hm/Jck0Heotb9sP8IcOKQUerZk5yRiLf5fr/BIo="; }; - propagatedBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; + + dependencies = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -26,9 +27,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "zope.cachedescriptors" ]; + pythonNamespaces = [ "zope" ]; + meta = { description = "Method and property caching decorators"; homepage = "https://github.com/zopefoundation/zope.cachedescriptors"; + changelog = "https://github.com/zopefoundation/zope.cachedescriptors/blob/${version}/CHANGES.rst"; license = lib.licenses.zpl21; maintainers = with lib.maintainers; [ dotlambda ]; }; From 9f5143931680937243771a209a9eaa096e2b4d83 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 17:56:45 +0900 Subject: [PATCH 108/280] python312Packages.zope-filerepresentation: refactor --- .../zope-filerepresentation/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/zope-filerepresentation/default.nix b/pkgs/development/python-modules/zope-filerepresentation/default.nix index 347b634831f4..c4ab3f139014 100644 --- a/pkgs/development/python-modules/zope-filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope-filerepresentation/default.nix @@ -2,32 +2,43 @@ lib, buildPythonPackage, fetchPypi, + setuptools, zope-schema, zope-interface, + unittestCheckHook, }: buildPythonPackage rec { - pname = "zope.filerepresentation"; + pname = "zope-filerepresentation"; version = "6.0"; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "zope.filerepresentation"; + inherit version; hash = "sha256-yza3iGspJ2+C8WhfPykfQjXmac2HhdFHQtRl0Trvaqs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ zope-interface zope-schema ]; - checkPhase = '' - cd src/zope/filerepresentation && python -m unittest - ''; + pythonImportsCheck = [ "zope.filerepresentation" ]; - meta = with lib; { - homepage = "https://zopefilerepresentation.readthedocs.io/"; + nativeCheckInputs = [ unittestCheckHook ]; + + unittestFlagsArray = [ "src/zope/filerepresentation" ]; + + pythonNamespaces = [ "zope" ]; + + meta = { + homepage = "https://github.com/zopefoundation/zope.filerepresentation"; description = "File-system Representation Interfaces"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zope.filerepresentation/blob/${version}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From b2ce0ba3816ee25ed24c3e9858a1975c53063848 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 20:09:45 +0900 Subject: [PATCH 109/280] python312Packages.zodbpickle: fix licenses --- pkgs/development/python-modules/zodbpickle/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 6b0b0a97b584..da54bd6065d3 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -38,11 +38,14 @@ buildPythonPackage rec { "test_loads" ]; - meta = with lib; { + meta = { description = "Fork of Python's pickle module to work with ZODB"; homepage = "https://github.com/zopefoundation/zodbpickle"; changelog = "https://github.com/zopefoundation/zodbpickle/blob/${version}/CHANGES.rst"; - license = licenses.asl20; + license = with lib.licenses; [ + psfl + zpl21 + ]; maintainers = [ ]; }; } From 6d0259c66375b00afd661fa5f7a2013c580fefd7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 22:46:45 +0900 Subject: [PATCH 110/280] python312Packages.zconfig: refactor --- .../python-modules/zconfig/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index d31124a9ac1e..86a5a18c0fe8 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -5,9 +5,7 @@ docutils, fetchPypi, manuel, - pygments, pytestCheckHook, - pythonOlder, setuptools, zope-testrunner, }: @@ -17,8 +15,6 @@ buildPythonPackage rec { version = "4.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-tqed2hV/NpjIdo0s7cJjIW6K8kDTz50JoCpkKREU6yA="; @@ -26,29 +22,24 @@ buildPythonPackage rec { patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; - nativeBuildInputs = [ setuptools ]; - - buildInputs = [ - docutils - manuel - ]; - - propagatedBuildInputs = [ zope-testrunner ]; + build-system = [ setuptools ]; nativeCheckInputs = [ - pygments + docutils + manuel pytestCheckHook + zope-testrunner ]; pythonImportsCheck = [ "ZConfig" ]; pytestFlagsArray = [ "-s" ]; - meta = with lib; { + meta = { description = "Structured Configuration Library"; homepage = "https://github.com/zopefoundation/ZConfig"; changelog = "https://github.com/zopefoundation/ZConfig/blob/${version}/CHANGES.rst"; - license = licenses.zpl20; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From 2d90fabc797281f3b2ca22d7e20a21cacc5d2f1e Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 22:54:13 +0900 Subject: [PATCH 111/280] python312Packages.zc-lockfile: refactor --- .../python-modules/zc-lockfile/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/zc-lockfile/default.nix b/pkgs/development/python-modules/zc-lockfile/default.nix index 2d7c5dc0c87e..d09983531126 100644 --- a/pkgs/development/python-modules/zc-lockfile/default.nix +++ b/pkgs/development/python-modules/zc-lockfile/default.nix @@ -1,14 +1,16 @@ { + lib, buildPythonPackage, fetchPypi, - mock, + setuptools, + pytestCheckHook, zope-testing, - lib, }: buildPythonPackage rec { pname = "zc-lockfile"; version = "3.0.post1"; + pyproject = true; src = fetchPypi { pname = "zc.lockfile"; @@ -16,13 +18,24 @@ buildPythonPackage rec { hash = "sha256-rbLubZ5qIzPJEXjcssm5aldEx47bdxLceEp9dWSOgew="; }; - buildInputs = [ mock ]; - propagatedBuildInputs = [ zope-testing ]; + build-system = [ setuptools ]; - meta = with lib; { + pythonImportsCheck = [ "zc.lockfile" ]; + + nativeCheckInputs = [ + pytestCheckHook + zope-testing + ]; + + pytestFlagsArray = [ "src/zc/lockfile/tests.py" ]; + + pythonNamespaces = [ "zc" ]; + + meta = { description = "Inter-process locks"; homepage = "https://www.python.org/pypi/zc.lockfile"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zc.lockfile/blob/${version}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From 08c1723c1a9fa37402b548327ec2a5b1be7a2516 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Dec 2024 22:56:46 +0900 Subject: [PATCH 112/280] python312Packages.zdaemon: refactor --- .../python-modules/zbaemon/default.nix | 28 ---------------- .../python-modules/zdaemon/default.nix | 32 +++++++++++++------ 2 files changed, 22 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/python-modules/zbaemon/default.nix diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix deleted file mode 100644 index ee859b099d94..000000000000 --- a/pkgs/development/python-modules/zbaemon/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - zconfig, -}: - -buildPythonPackage rec { - pname = "zdaemon"; - version = "4.4"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-SCHjvbRzh88eklWwREusQ3z3KqC1nRQHuTLjH9QyPvw="; - }; - - propagatedBuildInputs = [ zconfig ]; - - # too many deps.. - doCheck = false; - - meta = with lib; { - description = "Daemon process control library and tools for Unix-based systems"; - homepage = "https://pypi.python.org/pypi/zdaemon"; - license = licenses.zpl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index 794801284b34..58b4fccde1e7 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -2,35 +2,47 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, + setuptools, zconfig, + manuel, + unittestCheckHook, + zope-testing, }: buildPythonPackage rec { pname = "zdaemon"; version = "5.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-Iun+UFDq67ngPZrWTk9jzNheBMOP2zUc8RO+9vaNt6Q="; }; - propagatedBuildInputs = [ zconfig ]; + build-system = [ setuptools ]; - # too many deps.. - doCheck = false; + dependencies = [ zconfig ]; pythonImportsCheck = [ "zdaemon" ]; - meta = with lib; { + # require zc-customdoctests but it is not packaged + doCheck = false; + + nativeCheckInputs = [ + manuel + unittestCheckHook + # zc-customdoctests + zope-testing + ]; + + unittestFlagsArray = [ "src/zdaemon/tests" ]; + + meta = { description = "Daemon process control library and tools for Unix-based systems"; mainProgram = "zdaemon"; - homepage = "https://pypi.python.org/pypi/zdaemon"; + homepage = "https://github.com/zopefoundation/zdaemon"; changelog = "https://github.com/zopefoundation/zdaemon/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From f0204274d3a7dd3153d99bf50f322ba5e75dc3a3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 11 Jan 2025 07:18:47 +0000 Subject: [PATCH 113/280] pre-commit.tests: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the fix the eval fails as: $ nix build --no-link -f. pre-commit.tests error: … while calling a functor (an attribute set with a '__functor' attribute) at lib/customisation.nix:304:7: 303| if missingArgs == { } then 304| makeOverridable f allArgs | ^ 305| # This needs to be an abort so it can't be caught with `builtins.tryEval`, … while evaluating a branch condition at lib/customisation.nix:171:7: 170| in 171| if isAttrs result then | ^ 172| result (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: function 'anonymous lambda' called with unexpected argument 'git' at pkgs/by-name/pr/pre-commit/tests.nix:1:1: 1| { | ^ 2| gitMinimal, --- pkgs/by-name/pr/pre-commit/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index 334ab8816faf..cd76cf379845 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -176,7 +176,7 @@ buildPythonApplication rec { ]; passthru.tests = callPackage ./tests.nix { - inherit git pre-commit; + inherit gitMinimal pre-commit; }; meta = with lib; { From 595caa6fdac4ec73997ecacc420096298b4d1bd4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 11 Jan 2025 17:37:58 +0200 Subject: [PATCH 114/280] python312Packages.scipy: 1.15.0 -> 1.15.1 Diff: https://github.com/scipy/scipy/compare/refs/tags/v1.15.0...v1.15.1 Changelog: https://github.com/scipy/scipy/releases/tag/v1.15.1 --- pkgs/development/python-modules/scipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 9372e5f9934f..bc5f963a9591 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -48,8 +48,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.15.0"; - srcHash = "sha256-HAL9Ebfrm08UiSzWrgXQpoYLh5Nz57ykLz2EMBaygN0="; + version = "1.15.1"; + srcHash = "sha256-pQfOiK/i/Nz1mCGdDA7ivnzHxqee1WVD62CxxgetGLg="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; From 0246f92d6c79f604487cff07986a041bdcd2a7e6 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 11 Jan 2025 08:33:21 -0800 Subject: [PATCH 115/280] vim: 9.1.0990 -> 9.1.1006 Resolves GHSA-5rgf-26wj-48v8. --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index d6a8185048bb..eb6389124600 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0990"; + version = "9.1.1006"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-KKjJCuGczwYP+NVx5f6YQRsKR0zW44ciNNvmjQ03ytM="; + hash = "sha256-GIuy2mY7jzB5PNrpq8YYlasuaFR9Wj5ip2tDbXTR1nI="; }; enableParallelBuilding = true; From 2b1e87e1ecb829fa76c1a326eca16a1896788083 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Jan 2025 17:39:27 +0100 Subject: [PATCH 116/280] python313Packages.sqlalchemy: 2.0.36 -> 2.0.37 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_37 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 39ef2c069326..44a129176dfe 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.36"; + version = "2.0.37"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-i1yyAVBXz0efAdpFvUPvdzS+4IRU94akmePoprb8Is0="; + hash = "sha256-KyYENF0c+Ki3k0Ba8v0quY86Jqi6EN3d0onHmzFnSOw="; }; postPatch = '' From 64ec158ea86f53e3d4e5807e5e4d0b16d95a1b1a Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 11 Jan 2025 23:54:17 +0000 Subject: [PATCH 117/280] libcap: remove runtime reference to `go` --- pkgs/by-name/li/libcap/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index 11fe3a7a777e..a15873a49c02 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -32,7 +32,9 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc - ] ++ lib.optionals withGo [ + ]; + + nativeBuildInputs = lib.optionals withGo [ go ]; @@ -47,6 +49,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withGo [ "GOLANG=yes" ''GOCACHE=''${TMPDIR}/go-cache'' + "GOFLAGS=-trimpath" "GOARCH=${go.GOARCH}" "GOOS=${go.GOOS}" ] ++ lib.optionals isStatic [ "SHARED=no" "LIBCSTATIC=yes" ]; @@ -83,6 +86,10 @@ stdenv.mkDerivation rec { strictDeps = true; + disallowedReferences = lib.optionals withGo [ + go + ]; + passthru.tests = { inherit bind From 8ac4a94f1b25a84c8bb5498cb4204dc5c2dd27ab Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Sun, 29 Dec 2024 13:47:24 -0500 Subject: [PATCH 118/280] sbcl: 2.4.11 -> 2.5.0 --- pkgs/development/compilers/sbcl/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 29d337a3310b..5a8348451e4a 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -14,14 +14,18 @@ let "2.4.6" = { sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE="; }; - # By unofficial and very loose convention we keep the latest version of - # SBCL, and the previous one in case someone quickly needs to roll back. + # Necessary for stumpwm "2.4.10" = { sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg="; }; + # By unofficial and very loose convention we keep the latest version of + # SBCL, and the previous one in case someone quickly needs to roll back. "2.4.11" = { sha256 = "sha256-TwPlhG81g0wQcAu+Iy2kG6S9v4G9zKyx1N4kKXZXpBU="; }; + "2.5.0" = { + sha256 = "sha256-Lhiv0Ijkot8ht3uuLhcM5XDRHabSdgcpImXxzGqKGbE="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1866c3b7c3bb..2c103d2a0d66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11135,7 +11135,12 @@ with pkgs; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_11; + sbcl_2_5_0 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.5.0"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_5_0; sbclPackages = recurseIntoAttrs sbcl.pkgs; From 3fc7fdef3923f01a33667a35c7fce462b5e9cb85 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 10 Jan 2025 18:01:08 +0200 Subject: [PATCH 119/280] gd: cleanup, modernize Signed-off-by: Alexander V. Nikolaev --- pkgs/development/libraries/gd/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index d7b50cce5d52..cadb226b1190 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -72,10 +72,6 @@ stdenv.mkDerivation rec { "out" ]; - postFixup = '' - moveToOutput "bin/gdlib-config" $dev - ''; - enableParallelBuilding = true; doCheck = false; # fails 2 tests diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 147d5b23b31b..184e4494c9ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8981,9 +8981,7 @@ with pkgs; gettext = callPackage ../development/libraries/gettext { }; - gd = callPackage ../development/libraries/gd { - automake = automake115x; - }; + gd = callPackage ../development/libraries/gd { }; gdal = callPackage ../development/libraries/gdal { }; From b17f43c5d536a3f008d2f8f63b31aa39cbb65dbc Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 10 Jan 2025 18:06:18 +0200 Subject: [PATCH 120/280] gd: move to pkgs/by-name Signed-off-by: Alexander V. Nikolaev --- .../libraries/gd/default.nix => by-name/gd/gd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/gd/default.nix => by-name/gd/gd/package.nix} (100%) diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/by-name/gd/gd/package.nix similarity index 100% rename from pkgs/development/libraries/gd/default.nix rename to pkgs/by-name/gd/gd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 184e4494c9ee..a34c28b2b125 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8981,8 +8981,6 @@ with pkgs; gettext = callPackage ../development/libraries/gettext { }; - gd = callPackage ../development/libraries/gd { }; - gdal = callPackage ../development/libraries/gdal { }; gdalMinimal = callPackage ../development/libraries/gdal { From 6eeba57d9a82dc0e6915b6ee5ca368e9feb55653 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 10 Jan 2025 17:54:00 +0200 Subject: [PATCH 121/280] xorg.{utilmacros,xkeyboardconfig}: treat autotools as native inputs Signed-off-by: Alexander V. Nikolaev --- pkgs/servers/x11/xorg/overrides.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 268c3fbc72f1..bd76e8844228 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -468,7 +468,7 @@ self: super: transset = addMainProgram super.transset { }; utilmacros = super.utilmacros.overrideAttrs (attrs: { # not needed for releases, we propagate the needed tools - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ automake autoconf libtool ]; + propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or [] ++ [ automake autoconf libtool ]; }); viewres = addMainProgram super.viewres { }; @@ -725,7 +725,7 @@ self: super: ''; in xorg.xkeyboardconfig.overrideAttrs (old: { - buildInputs = old.buildInputs ++ [ automake ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ automake ]; postPatch = lib.concatStrings (lib.mapAttrsToList patchIn layouts); }); From 1c29d68344a8365367f9f01aa29af4641f89a2eb Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 10 Jan 2025 17:51:01 +0200 Subject: [PATCH 122/280] aalib: cleanup, config.{sub,guess} updated by stdenv hook now Signed-off-by: Alexander V. Nikolaev --- pkgs/by-name/if/iftop/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/if/iftop/package.nix b/pkgs/by-name/if/iftop/package.nix index ea33e56f5b35..2ba0eeef875f 100644 --- a/pkgs/by-name/if/iftop/package.nix +++ b/pkgs/by-name/if/iftop/package.nix @@ -4,7 +4,6 @@ fetchurl, ncurses, libpcap, - automake, nixosTests, }: @@ -21,10 +20,6 @@ stdenv.mkDerivation rec { # "libgcc_s.so.1 must be installed for pthread_cancel to work". LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-lgcc_s"; - preConfigure = '' - cp ${automake}/share/automake*/config.{sub,guess} config - ''; - buildInputs = [ ncurses libpcap From 4c3ed9d61d495456aeb9ea74a2d77ef445868352 Mon Sep 17 00:00:00 2001 From: Defelo Date: Mon, 23 Dec 2024 07:18:10 +0100 Subject: [PATCH 123/280] python312Packages.networkx: 3.3 -> 3.4.2 --- pkgs/development/python-modules/networkx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 46ba43afb139..eba7e30c2307 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "3.3"; + version = "3.4.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DBJ9iy9IZfWa6cuKr81gtccPMkHr1m997618SrkBJsk="; + hash = "sha256-MHw2aUKMU2KqsnyKEmCqj0fE6R04kfSL4BQXONjQU+E="; }; nativeBuildInputs = [ setuptools ]; From 833e0b1970936532dda4bd961c954499e1777fb0 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 12 Jan 2025 20:01:03 +0200 Subject: [PATCH 124/280] python312Packages.aiohappyeyeballs: sphinx-autobuild is unneeded for build, replace with regular sphinx Signed-off-by: Alexander V. Nikolaev --- pkgs/development/python-modules/aiohappyeyeballs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix index d20af3ace4d3..53759949277b 100644 --- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix +++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix @@ -10,7 +10,7 @@ # optional-dependencies furo, myst-parser, - sphinx-autobuild, + sphinx, sphinxHook, # tests @@ -44,7 +44,7 @@ buildPythonPackage rec { docs = [ furo myst-parser - sphinx-autobuild + sphinx sphinxHook ]; }; From cce6f178d2dd1f179a57b514d07280bb4d2a8164 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 18:08:45 +0900 Subject: [PATCH 125/280] python312Packages.fsspec: 2024.3.0 -> 2024.12.0 Diff: https://github.com/fsspec/filesystem_spec/compare/refs/tags/2024.3.0...2024.12.0 Changelog: https://github.com/fsspec/filesystem_spec/raw/2024.12.0/docs/source/changelog.rst --- pkgs/development/python-modules/fsspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index a3b1e9c3461e..79db1b7f43bd 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2024.3.0"; + version = "2024.12.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "filesystem_spec"; tag = version; - hash = "sha256-C+47BcIELZTEARXW8fAMHMjyKUWxU1tNKWGoPPtt/fQ="; + hash = "sha256-Vc0vBayPg6zZ4+pxJsHChSGg0kjA0Q16+Gk0bO0IEpI="; }; propagatedBuildInputs = [ From e132c131d966ee3abed7d614a7fe2e63186a24b8 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 3 Nov 2024 12:17:59 +0900 Subject: [PATCH 126/280] python312Packages.fsspec: refactor --- .../python-modules/fsspec/default.nix | 52 +++++++++++++------ 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 79db1b7f43bd..f50260858afd 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -4,6 +4,8 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + hatchling, + hatch-vcs, numpy, paramiko, pytest-asyncio, @@ -31,7 +33,7 @@ buildPythonPackage rec { pname = "fsspec"; version = "2024.12.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -42,18 +44,15 @@ buildPythonPackage rec { hash = "sha256-Vc0vBayPg6zZ4+pxJsHChSGg0kjA0Q16+Gk0bO0IEpI="; }; - propagatedBuildInputs = [ - aiohttp - paramiko - requests - smbprotocol - tqdm + build-system = [ + hatchling + hatch-vcs ]; optional-dependencies = { - entrypoints = [ ]; abfs = [ adlfs ]; adl = [ adlfs ]; + arrow = [ pyarrow ]; dask = [ dask distributed @@ -63,28 +62,49 @@ buildPythonPackage rec { requests dropbox ]; + entrypoints = [ ]; + full = [ + adlfs + aiohttp + dask + distributed + dropbox + # dropboxdrivefs + fusepy + gcsfs + libarchive-c + ocifs + panel + paramiko + pyarrow + pygit2 + requests + s3fs + smbprotocol + tqdm + ]; + fuse = [ fusepy ]; gcs = [ gcsfs ]; git = [ pygit2 ]; github = [ requests ]; gs = [ gcsfs ]; + gui = [ panel ]; hdfs = [ pyarrow ]; - arrow = [ pyarrow ]; http = [ aiohttp requests ]; - sftp = [ paramiko ]; - s3 = [ s3fs ]; + libarchive = [ libarchive-c ]; oci = [ ocifs ]; + s3 = [ s3fs ]; + sftp = [ paramiko ]; smb = [ smbprotocol ]; ssh = [ paramiko ]; - fuse = [ fusepy ]; - libarchive = [ libarchive-c ]; - gui = [ panel ]; tqdm = [ tqdm ]; }; nativeCheckInputs = [ + aiohttp numpy pytest-asyncio pytest-mock @@ -127,11 +147,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "fsspec" ]; - meta = with lib; { + meta = { description = "Specification that Python filesystems should adhere to"; homepage = "https://github.com/fsspec/filesystem_spec"; changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } From 1b21df1f3390d0e04a7ff0d93fd3523f771b3421 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 19:17:33 +0900 Subject: [PATCH 127/280] python312Packages.s3fs: 2024.9.0 -> 2024.12.0 Changelog: https://github.com/fsspec/s3fs/raw/2024.12.0/docs/source/changelog.rst --- pkgs/development/python-modules/s3fs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 7035c15615e7..9bdcd4867761 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2024.9.0"; + version = "2024.12.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ZJNwWrtQN01reZT5YW0nrb3YohnIY1EAvcKGOC79kfU="; + hash = "sha256-Gw86j1lGzKW6KYcdZ5KrHkUo7XYjJ9iu+vyBtzuZ/VY="; }; postPatch = '' From 18667eeb8c9435464f667ae1050dad071fd29ee4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 3 Nov 2024 12:12:08 +0900 Subject: [PATCH 128/280] python312Packages.s3fs: refactor --- .../python-modules/s3fs/default.nix | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 9bdcd4867761..8586914416eb 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -5,46 +5,56 @@ buildPythonPackage, docutils, fetchPypi, + flask, + flask-cors, fsspec, + moto, + pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "s3fs"; version = "2024.12.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-Gw86j1lGzKW6KYcdZ5KrHkUo7XYjJ9iu+vyBtzuZ/VY="; }; - postPatch = '' - sed -i 's/fsspec==.*/fsspec/' requirements.txt - ''; - buildInputs = [ docutils ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiobotocore aiohttp fsspec ]; - # Depends on `moto` which has a long dependency chain with exact - # version requirements that can't be made to work with current - # pythonPackages. - doCheck = false; - pythonImportsCheck = [ "s3fs" ]; - meta = with lib; { + nativeCheckInputs = [ + flask + flask-cors + moto + pytestCheckHook + ]; + + disabledTests = [ + # require network access + "test_async_close" + ]; + + meta = { description = "Pythonic file interface for S3"; homepage = "https://github.com/fsspec/s3fs"; changelog = "https://github.com/fsspec/s3fs/raw/${version}/docs/source/changelog.rst"; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ teh ]; }; } From da3c625f7c5bbaa52af4abc4965da8f82b7315ec Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sun, 12 Jan 2025 21:17:01 -0700 Subject: [PATCH 129/280] libcap: use correct cross golang cross compiler --- pkgs/by-name/li/libcap/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index a15873a49c02..f648e896d262 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -1,7 +1,8 @@ { stdenv, lib, buildPackages, fetchurl, runtimeShell +, pkgsBuildHost , usePam ? !isStatic, pam ? null , isStatic ? stdenv.hostPlatform.isStatic -, withGo ? go.meta.available, go +, withGo ? pkgsBuildHost.go.meta.available # passthru.tests , bind @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = lib.optionals withGo [ - go + pkgsBuildHost.go ]; buildInputs = lib.optional usePam pam; @@ -50,8 +51,8 @@ stdenv.mkDerivation rec { "GOLANG=yes" ''GOCACHE=''${TMPDIR}/go-cache'' "GOFLAGS=-trimpath" - "GOARCH=${go.GOARCH}" - "GOOS=${go.GOOS}" + "GOARCH=${pkgsBuildHost.go.GOARCH}" + "GOOS=${pkgsBuildHost.go.GOOS}" ] ++ lib.optionals isStatic [ "SHARED=no" "LIBCSTATIC=yes" ]; postPatch = '' @@ -87,7 +88,7 @@ stdenv.mkDerivation rec { strictDeps = true; disallowedReferences = lib.optionals withGo [ - go + pkgsBuildHost.go ]; passthru.tests = { From 81806a9294ea300a3e0161b9e0901b6a156361f4 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 10 Jan 2025 15:23:24 +0200 Subject: [PATCH 130/280] ladspaPlugins: fix cross-compilation for aarch64 Signed-off-by: Alexander V. Nikolaev --- pkgs/applications/audio/ladspa-plugins/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 3544d18878d0..2548696fb9a5 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, autoreconfHook, - automake, fftw, ladspaH, libxml2, @@ -25,19 +24,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config + perlPackages.perl + perlPackages.XMLParser ]; buildInputs = [ fftw ladspaH libxml2 - perlPackages.perl - perlPackages.XMLParser ]; - patchPhase = '' + postPatch = '' patchShebangs . - patchShebangs ./metadata/ - cp ${automake}/share/automake-*/mkinstalldirs . + substituteInPlace util/Makefile.am --replace-fail "ranlib" "$RANLIB" + substituteInPlace gsm/Makefile.am --replace-fail "ranlib" "$RANLIB" + substituteInPlace gverb/Makefile.am --replace-fail "ranlib" "$RANLIB" ''; meta = with lib; { From e11fc0b96a534b4c1ee32c5bb1750674cd556fa7 Mon Sep 17 00:00:00 2001 From: Dietrich Daroch Date: Sun, 12 Jan 2025 22:17:33 -0300 Subject: [PATCH 131/280] bzip2: Embed autoconf patch I'm seeing consistent failures trying to get the patch using ftp:// and it seems that the https:// download fails under IPv6-only connectivity. https://github.com/NixOS/nixpkgs/pull/272640 With this, it seems that just grabbing the patch is the best option around as suggested by jshort, https://github.com/NixOS/nixpkgs/pull/272640#issuecomment-2130354682 --- pkgs/tools/compression/bzip2/default.nix | 5 +- .../bzip2-1.0.6.2-autoconfiscated.patch | 370 ++++++++++++++++++ 2 files changed, 371 insertions(+), 4 deletions(-) create mode 100644 pkgs/tools/compression/bzip2/patches/bzip2-1.0.6.2-autoconfiscated.patch diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 46cd16374b32..34ba76acc1e0 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -30,10 +30,7 @@ stdenv.mkDerivation ( patchFlags = [ "-p0" ]; patches = [ - (fetchurl { - url = "ftp://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6.2-autoconfiscated.patch"; - sha256 = "sha256-QMufl6ffJVVVVZespvkCbFpB6++R1lnq1687jEsUjr0="; - }) + ./patches/bzip2-1.0.6.2-autoconfiscated.patch ]; # Fix up hardcoded version from the above patch, e.g. seen in bzip2.pc or libbz2.so.1.0.N postPatch = '' diff --git a/pkgs/tools/compression/bzip2/patches/bzip2-1.0.6.2-autoconfiscated.patch b/pkgs/tools/compression/bzip2/patches/bzip2-1.0.6.2-autoconfiscated.patch new file mode 100644 index 000000000000..d6288de7f27d --- /dev/null +++ b/pkgs/tools/compression/bzip2/patches/bzip2-1.0.6.2-autoconfiscated.patch @@ -0,0 +1,370 @@ +--- /dev/null ++++ autogen.sh +@@ -0,0 +1,8 @@ ++mv LICENSE COPYING ++mv CHANGES NEWS ++touch AUTHORS ++touch ChangeLog ++libtoolize --force ++aclocal ++automake --add-missing --gnu ++autoconf +--- /dev/null ++++ README.autotools +@@ -0,0 +1,41 @@ ++bzip2 autoconfiscated ++===================== ++ ++Temporarily at http://ftp.suse.com/pub/people/sbrabec/bzip2/ expecting ++that it will become a new upstream version to prevent per-distribution ++shared library patching done by nearly each Linux vendor separately. ++ ++Autoconfiscation brings standard ./configure ; make ; make install ++installation, seamless support of DESTDIR, automatic check for supported ++CFLAGS, standard shared library support, automatic large files CFLAGS ++check and all things that are supported by automake. ++ ++It makes obsolete Makefile-libbz2_so and README.COMPILATION.PROBLEMS. ++Now configure should automatically detect correct build flags. ++ ++In case of any problem or question with autotools support feel free to ++contact me: Stanislav Brabec ++ ++Autoconfiscated version binaries are exactly equal to ++bzip2-1.0.6.tar.gz. There are only few changes. See below. ++ ++ ++New features: ++ ++Trivial link man pages for bzcat and bunzip2 added. ++ ++bzip2.pc file for pkg-config. Packages can use it for checks. ++ ++ ++Incompatible changes: ++ ++soname change. Libtool has no support for two parts soname suffix (e. g. ++libbz2.so.1.0). It must be a single number (e. g. libbz2.so.1). That is ++why soname must change. But I see not a big problem with it. Several ++distributions already use the new number instead of the non-standard ++number from Makefile-libbz2_so. ++ ++Shared library exports only public symbols. ++ ++To be super-safe, I incremented minor number of the library file, so ++both instances of the shared library can live together. +--- /dev/null ++++ configure.ac +@@ -0,0 +1,62 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.57]) ++AC_INIT([bzip2], [1.0.6], [Julian Seward ]) ++BZIP2_LT_CURRENT=1 ++BZIP2_LT_REVISION=6 ++BZIP2_LT_AGE=0 ++AC_CONFIG_SRCDIR([bzlib.h]) ++AC_CONFIG_MACRO_DIR([m4]) ++ ++AM_INIT_AUTOMAKE([foreign subdir-objects]) ++AM_MAINTAINER_MODE ++ ++# Checks for programs. ++AC_PROG_AWK ++AC_PROG_CC_STDC ++AC_PROG_CC_C_O ++AC_USE_SYSTEM_EXTENSIONS ++AC_PROG_INSTALL ++AC_PROG_LN_S ++AC_PROG_MAKE_SET ++LT_INIT([disable-static pic-only]) ++PKG_PROG_PKG_CONFIG ++gl_VISIBILITY ++# Checks for libraries. ++ ++# Checks for header files. ++ ++# Checks for typedefs, structures, and compiler characteristics. ++ ++# Check for system features. ++AC_SYS_LARGEFILE ++ ++AC_MSG_CHECKING([whether compiler understands -Wall]) ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -Wall" ++AC_TRY_COMPILE([], [], [ ++ AC_MSG_RESULT([yes]) ++], [ ++ AC_MSG_RESULT([no]) ++ CFLAGS="$save_CFLAGS" ++]) ++ ++AC_MSG_CHECKING([whether compiler understands -Winline]) ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -Winline" ++AC_TRY_COMPILE([], [], [ ++ AC_MSG_RESULT([yes]) ++], [ ++ AC_MSG_RESULT([no]) ++ CFLAGS="$save_CFLAGS" ++]) ++ ++# Checks for library functions. ++ ++# Write the output. ++AC_SUBST([BZIP2_LT_CURRENT]) ++AC_SUBST([BZIP2_LT_REVISION]) ++AC_SUBST([BZIP2_LT_AGE]) ++AC_CONFIG_FILES([Makefile bzip2.pc]) ++AC_OUTPUT +--- /dev/null ++++ Makefile.am +@@ -0,0 +1,137 @@ ++ACLOCAL_AMFLAGS = -I m4 ++lib_LTLIBRARIES = libbz2.la ++AM_CFLAGS = $(CFLAG_VISIBILITY) ++libbz2_la_SOURCES = \ ++ blocksort.c \ ++ huffman.c \ ++ crctable.c \ ++ randtable.c \ ++ compress.c \ ++ decompress.c \ ++ bzlib.c ++ ++libbz2_la_LDFLAGS = \ ++ -version-info $(BZIP2_LT_CURRENT):$(BZIP2_LT_REVISION):$(BZIP2_LT_AGE) \ ++ -no-undefined ++ ++include_HEADERS = bzlib.h ++ ++noinst_HEADERS = bzlib_private.h ++ ++bin_PROGRAMS = bzip2 bzip2recover ++ ++bzip2_SOURCES = bzip2.c ++bzip2_LDADD = libbz2.la ++ ++bzip2recover_SOURCES = bzip2recover.c ++bzip2recover_LDADD = libbz2.la ++ ++bin_SCRIPTS = bzgrep bzmore bzdiff ++ ++man_MANS = bzip2.1 bzgrep.1 bzmore.1 bzdiff.1 ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = bzip2.pc ++ ++$(pkgconfig_DATA): $(srcdir)/bzip2.pc.in config.status ++ ++install-exec-hook: ++ rm -f $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzgrep" | sed 's,^.*/,,;$(transform)'` $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'` ++ $(LN_S) `echo "bzgrep" | sed 's,^.*/,,;$(transform)'` $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'` ++ $(LN_S) `echo "bzmore" | sed 's,^.*/,,;$(transform)'` $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform)'` ++ $(LN_S) `echo "bzdiff" | sed 's,^.*/,,;$(transform)'` $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'` ++ ++install-data-hook: ++ echo ".so man1/`echo "bzip2" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bunzip2" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzip2" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzcat" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzgrep" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzgrep" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzmore" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzless" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzdiff" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'`.1 ++ ++uninstall-hook: ++ rm -f $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform)'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'` ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bunzip2" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzcat" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzless" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'`.1 ++ ++test: bzip2 ++ @cat $(srcdir)/words1 ++ ./bzip2 -1 <$(srcdir)/sample1.ref >sample1.rb2 ++ ./bzip2 -2 <$(srcdir)/sample2.ref >sample2.rb2 ++ ./bzip2 -3 <$(srcdir)/sample3.ref >sample3.rb2 ++ ./bzip2 -d <$(srcdir)/sample1.bz2 >sample1.tst ++ ./bzip2 -d <$(srcdir)/sample2.bz2 >sample2.tst ++ ./bzip2 -ds <$(srcdir)/sample3.bz2 >sample3.tst ++ cmp $(srcdir)/sample1.bz2 sample1.rb2 ++ cmp $(srcdir)/sample2.bz2 sample2.rb2 ++ cmp $(srcdir)/sample3.bz2 sample3.rb2 ++ cmp sample1.tst $(srcdir)/sample1.ref ++ cmp sample2.tst $(srcdir)/sample2.ref ++ cmp sample3.tst $(srcdir)/sample3.ref ++ @cat $(srcdir)/words3 ++ ++manual: $(srcdir)/manual.html $(srcdir)/manual.ps $(srcdir)/manual.pdf ++ ++manual.ps: $(MANUAL_SRCS) ++ cd $(srcdir); ./xmlproc.sh -ps manual.xml ++ ++manual.pdf: $(MANUAL_SRCS) ++ cd $(srcdir); ./xmlproc.sh -pdf manual.xml ++ ++manual.html: $(MANUAL_SRCS) ++ cd $(srcdir); ./xmlproc.sh -html manual.xml ++ ++EXTRA_DIST = \ ++ $(bin_SCRIPTS) \ ++ $(man_MANS) \ ++ README.autotools \ ++ README.XML.STUFF \ ++ bz-common.xsl \ ++ bz-fo.xsl \ ++ bz-html.xsl \ ++ bzip.css \ ++ bzip2.1.preformatted \ ++ bzip2.pc.in \ ++ bzip2.txt \ ++ dlltest.c \ ++ dlltest.dsp \ ++ entities.xml \ ++ format.pl \ ++ libbz2.def \ ++ libbz2.dsp \ ++ makefile.msc \ ++ manual.html \ ++ manual.pdf \ ++ manual.ps \ ++ manual.xml \ ++ mk251.c \ ++ sample1.bz2 \ ++ sample1.ref \ ++ sample2.bz2 \ ++ sample2.ref \ ++ sample3.bz2 \ ++ sample3.ref \ ++ spewG.c \ ++ unzcrash.c \ ++ words0 \ ++ words1 \ ++ words2 \ ++ words3 \ ++ xmlproc.sh +--- /dev/null ++++ bzip2.pc.in +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++bindir=@bindir@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: bzip2 ++Description: Lossless, block-sorting data compression ++Version: @VERSION@ ++Libs: -L${libdir} -lbz2 ++Cflags: -I${includedir} +--- /dev/null ++++ m4/visibility.m4 +@@ -0,0 +1,78 @@ ++# visibility.m4 serial 4 (gettext-0.18.2) ++dnl Copyright (C) 2005, 2008, 2010-2011 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl From Bruno Haible. ++ ++dnl Tests whether the compiler supports the command-line option ++dnl -fvisibility=hidden and the function and variable attributes ++dnl __attribute__((__visibility__("hidden"))) and ++dnl __attribute__((__visibility__("default"))). ++dnl Does *not* test for __visibility__("protected") - which has tricky ++dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on ++dnl MacOS X. ++dnl Does *not* test for __visibility__("internal") - which has processor ++dnl dependent semantics. ++dnl Does *not* test for #pragma GCC visibility push(hidden) - which is ++dnl "really only recommended for legacy code". ++dnl Set the variable CFLAG_VISIBILITY. ++dnl Defines and sets the variable HAVE_VISIBILITY. ++ ++AC_DEFUN([gl_VISIBILITY], ++[ ++ AC_REQUIRE([AC_PROG_CC]) ++ CFLAG_VISIBILITY= ++ HAVE_VISIBILITY=0 ++ if test -n "$GCC"; then ++ dnl First, check whether -Werror can be added to the command line, or ++ dnl whether it leads to an error because of some other option that the ++ dnl user has put into $CC $CFLAGS $CPPFLAGS. ++ AC_MSG_CHECKING([whether the -Werror option is usable]) ++ AC_CACHE_VAL([gl_cv_cc_vis_werror], [ ++ gl_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[]], [[]])], ++ [gl_cv_cc_vis_werror=yes], ++ [gl_cv_cc_vis_werror=no]) ++ CFLAGS="$gl_save_CFLAGS"]) ++ AC_MSG_RESULT([$gl_cv_cc_vis_werror]) ++ dnl Now check whether visibility declarations are supported. ++ AC_MSG_CHECKING([for simple visibility declarations]) ++ AC_CACHE_VAL([gl_cv_cc_visibility], [ ++ gl_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -fvisibility=hidden" ++ dnl We use the option -Werror and a function dummyfunc, because on some ++ dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning ++ dnl "visibility attribute not supported in this configuration; ignored" ++ dnl at the first function definition in every compilation unit, and we ++ dnl don't want to use the option in this case. ++ if test $gl_cv_cc_vis_werror = yes; then ++ CFLAGS="$CFLAGS -Werror" ++ fi ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[extern __attribute__((__visibility__("hidden"))) int hiddenvar; ++ extern __attribute__((__visibility__("default"))) int exportedvar; ++ extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); ++ extern __attribute__((__visibility__("default"))) int exportedfunc (void); ++ void dummyfunc (void) {} ++ ]], ++ [[]])], ++ [gl_cv_cc_visibility=yes], ++ [gl_cv_cc_visibility=no]) ++ CFLAGS="$gl_save_CFLAGS"]) ++ AC_MSG_RESULT([$gl_cv_cc_visibility]) ++ if test $gl_cv_cc_visibility = yes; then ++ CFLAG_VISIBILITY="-fvisibility=hidden" ++ HAVE_VISIBILITY=1 ++ AC_DEFINE([BZ_EXTERN], [__attribute__((__visibility__("default")))], [To make symbol visible]) ++ fi ++ fi ++ AC_SUBST([CFLAG_VISIBILITY]) ++ AC_SUBST([HAVE_VISIBILITY]) ++ AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], ++ [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) ++]) +--- bzlib.h.orig ++++ bzlib.h +@@ -91,9 +91,11 @@ typedef + # endif + #else + # define BZ_API(func) func +-# define BZ_EXTERN extern + #endif + ++#ifndef BZ_EXTERN ++#define BZ_EXTERN extern ++#endif + + /*-- Core (low-level) library functions --*/ + From 2df17d7c9790b0fa0980bc4b4bc5f4e66c9faaf8 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 13 Jan 2025 19:38:56 +0000 Subject: [PATCH 132/280] cmake: clean up obsolete Darwin patches --- .../cm/cmake/002-application-services.diff | 39 ------------- .../cmake/003-libuv-application-services.diff | 55 ------------------- pkgs/by-name/cm/cmake/package.nix | 8 --- 3 files changed, 102 deletions(-) delete mode 100644 pkgs/by-name/cm/cmake/002-application-services.diff delete mode 100644 pkgs/by-name/cm/cmake/003-libuv-application-services.diff diff --git a/pkgs/by-name/cm/cmake/002-application-services.diff b/pkgs/by-name/cm/cmake/002-application-services.diff deleted file mode 100644 index 56f7cd266b7a..000000000000 --- a/pkgs/by-name/cm/cmake/002-application-services.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur cmake-3.25.1-old/Source/CMakeLists.txt cmake-3.25.1-new/Source/CMakeLists.txt ---- cmake-3.25.1-old/Source/CMakeLists.txt 2022-11-30 10:57:03.000000000 -0300 -+++ cmake-3.25.1-new/Source/CMakeLists.txt 2022-12-19 01:00:08.412064304 -0300 -@@ -916,7 +916,6 @@ - # On Apple we need CoreFoundation and CoreServices - if(APPLE) - target_link_libraries(CMakeLib PUBLIC "-framework CoreFoundation") -- target_link_libraries(CMakeLib PUBLIC "-framework CoreServices") - endif() - - if(WIN32 AND NOT UNIX) -diff -Naur cmake-3.25.1-old/Source/cmGlobalXCodeGenerator.cxx cmake-3.25.1-new/Source/cmGlobalXCodeGenerator.cxx ---- cmake-3.25.1-old/Source/cmGlobalXCodeGenerator.cxx 2022-11-30 10:57:03.000000000 -0300 -+++ cmake-3.25.1-new/Source/cmGlobalXCodeGenerator.cxx 2022-12-19 01:00:56.065135169 -0300 -@@ -56,10 +56,6 @@ - - #if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) - # include --# if !TARGET_OS_IPHONE --# define HAVE_APPLICATION_SERVICES --# include --# endif - #endif - - #if !defined(CMAKE_BOOTSTRAP) -diff -Naur cmake-3.25.1-old/Utilities/cmlibarchive/CMakeLists.txt cmake-3.25.1-new/Utilities/cmlibarchive/CMakeLists.txt ---- cmake-3.25.1-old/Utilities/cmlibarchive/CMakeLists.txt 2022-11-30 10:57:03.000000000 -0300 -+++ cmake-3.25.1-new/Utilities/cmlibarchive/CMakeLists.txt 2022-12-19 01:01:43.392205981 -0300 -@@ -2041,10 +2041,6 @@ - ADD_CUSTOM_TARGET(run_all_tests) - ENDIF(ENABLE_TEST) - --# We need CoreServices on Mac OS. --IF(APPLE) -- LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices") --ENDIF(APPLE) - - add_subdirectory(libarchive) - IF(0) # CMake does not build libarchive's command-line tools. diff --git a/pkgs/by-name/cm/cmake/003-libuv-application-services.diff b/pkgs/by-name/cm/cmake/003-libuv-application-services.diff deleted file mode 100644 index 6607a9c6ed1f..000000000000 --- a/pkgs/by-name/cm/cmake/003-libuv-application-services.diff +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt -index 7625cf65d9..167903e309 100644 ---- a/Utilities/cmlibuv/CMakeLists.txt -+++ b/Utilities/cmlibuv/CMakeLists.txt -@@ -193,6 +193,22 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - src/unix/kqueue.c - src/unix/proctitle.c - ) -+ -+ include(CheckIncludeFile) -+ -+ check_include_file("ApplicationServices/ApplicationServices.h" HAVE_ApplicationServices) -+ if (HAVE_ApplicationServices) -+ list(APPEND uv_defines -+ HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H=1 -+ ) -+ endif() -+ -+ check_include_file("CoreServices/CoreServices.h" HAVE_CoreServices) -+ if (HAVE_CoreServices) -+ list(APPEND uv_defines -+ HAVE_CORESERVICES_CORESERVICES_H=1 -+ ) -+ endif() - endif() - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -diff --git a/Utilities/cmlibuv/src/unix/fsevents.c b/Utilities/cmlibuv/src/unix/fsevents.c -index a51f29b3f6..3f6bf01968 100644 ---- a/Utilities/cmlibuv/src/unix/fsevents.c -+++ b/Utilities/cmlibuv/src/unix/fsevents.c -@@ -21,7 +21,7 @@ - #include "uv.h" - #include "internal.h" - --#if TARGET_OS_IPHONE || MAC_OS_X_VERSION_MAX_ALLOWED < 1070 -+#if !HAVE_CORESERVICES_CORESERVICES_H || MAC_OS_X_VERSION_MAX_ALLOWED < 1070 - - /* iOS (currently) doesn't provide the FSEvents-API (nor CoreServices) */ - /* macOS prior to 10.7 doesn't provide the full FSEvents API so use kqueue */ -@@ -39,7 +39,7 @@ int uv__fsevents_close(uv_fs_event_t* handle) { - void uv__fsevents_loop_delete(uv_loop_t* loop) { - } - --#else /* TARGET_OS_IPHONE */ -+#else /* !HAVE_CORESERVICES_CORESERVICES_H */ - - #include "darwin-stub.h" - -@@ -920,4 +920,4 @@ int uv__fsevents_close(uv_fs_event_t* handle) { - return 0; - } - --#endif /* TARGET_OS_IPHONE */ -+#endif /* !HAVE_CORESERVICES_CORESERVICES_H */ diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index cae5089ffdfc..36ba2ddbecfb 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -61,16 +61,8 @@ stdenv.mkDerivation (finalAttrs: { ./000-nixpkgs-cmake-prefix-path.diff # Don't search in non-Nix locations such as /usr, but do search in our libc. ./001-search-path.diff - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - # TODO: Remove these in `staging`. - - # Don't depend on frameworks. - ./002-application-services.diff - # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d - ./003-libuv-application-services.diff ] ++ lib.optional stdenv.hostPlatform.isCygwin ./004-cygwin.diff - # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. ++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff # On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path. From b851789ab0f7ae545da7292b04c8cd2aad12bff4 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 14 Jan 2025 12:32:40 +0100 Subject: [PATCH 133/280] openjpeg: apply patches for CVE-2024-56826 Preferred to apply patches instead of bumping to 2.5.3 until the upgrade can be dealt with, see https://github.com/NixOS/nixpkgs/pull/370072 for the last attempt. --- pkgs/by-name/op/openjpeg/package.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix index 15296d33b85d..d0ccfe04924e 100644 --- a/pkgs/by-name/op/openjpeg/package.nix +++ b/pkgs/by-name/op/openjpeg/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config , libpng, libtiff, zlib, lcms2 , jpipLibSupport ? false # JPIP library & executables , jpipServerSupport ? false, curl, fcgi # JPIP Server @@ -38,6 +38,21 @@ stdenv.mkDerivation rec { hash = "sha256-mQ9B3MJY2/bg0yY/7jUJrAXM6ozAHT5fmwES5Q1SGxw="; }; + patches = [ + (fetchpatch { + # https://github.com/uclouvain/openjpeg/issues/1564 + name = "CVE-2024-56826_ISSUE1564.patch"; + url = "https://github.com/uclouvain/openjpeg/commit/e492644fbded4c820ca55b5e50e598d346e850e8.patch"; + hash = "sha256-v+odu4/MXRA+RKOlPO+m/Xk66BMH6mOcEN4ScHn3VAo="; + }) + (fetchpatch { + # https://github.com/uclouvain/openjpeg/issues/1563 + name = "CVE-2024-56826_ISSUE1563.patch"; + url = "https://github.com/uclouvain/openjpeg/commit/98592ee6d6904f1b48e8207238779b89a63befa2.patch"; + hash = "sha256-1ScnEZAPuvclyRME5kbeo7dBMG31Njs5CaYC4sGyx08="; + }) + ]; + outputs = [ "out" "dev" ]; cmakeFlags = [ From d8c10f07988449084d174abd2f31e314938a49b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Jan 2025 18:52:24 +0100 Subject: [PATCH 134/280] python313Packages.django_4: 4.2.17 -> 4.2.18 https://docs.djangoproject.com/en/4.2/releases/4.2.18/ https://www.djangoproject.com/weblog/2025/jan/14/security-releases/ Fixes: CVE-2024-56374 --- pkgs/development/python-modules/django/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index b46237b1419e..cb833a407c60 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.17"; + version = "4.2.18"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-G3PAG/fe4yG55699XS8rcWigF92J0Fke1qnUxRqOUnc="; + hash = "sha256-aOTfZDJsEfWHXxkvTgyc2E9ye3LpzHG1bJTo40Dke4I="; }; patches = From 00d14b8fb7d129ba9b06307de50ddc194eab0e8c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 14 Jan 2025 18:05:53 +0000 Subject: [PATCH 135/280] libxcrypt: 4.4.36 -> 4.4.38 Changes: - https://github.com/besser82/libxcrypt/releases/tag/v4.4.37 - https://github.com/besser82/libxcrypt/releases/tag/v4.4.38 --- pkgs/development/libraries/libxcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index 571f18db3c4f..b848ace3879d 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxcrypt"; - version = "4.4.36"; + version = "4.4.38"; src = fetchurl { url = "https://github.com/besser82/libxcrypt/releases/download/v${finalAttrs.version}/libxcrypt-${finalAttrs.version}.tar.xz"; - hash = "sha256-5eH0yu4KAd4q7ibjE4gH1tPKK45nKHlm0f79ZeH9iUM="; + hash = "sha256-gDBLnDBup5kyfwHZp1Sb2ygxd4kYJjHxtU9FEbQgbdY="; }; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion From 7e92703f04b1096df66822ea227d8ffeeca3013d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 14 Jan 2025 19:17:04 +0100 Subject: [PATCH 136/280] git: 2.47.1 -> 2.47.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes CVE-2024-50349 and CVE-2024-52006 https://raw.githubusercontent.com/git/git/v2.47.2/Documentation/RelNotes/2.47.2.txt ``` - CVE-2024-50349: Printing unsanitized URLs when asking for credentials makes the user susceptible to crafted URLs (e.g. in recursive clones). These URLs can mislead the user into typing in passwords for trusted sites that would then be sent to untrusted sites instead. A potential scenario of how this can be exploited is a recursive clone where one of the submodules prompts for a password, pretending to ask for a different host than the password will be sent to. - CVE-2024-52006: Git may pass on Carriage Returns via the credential protocol to credential helpers which use line-reading functions that interpret Carriage Returns as line endings, even though this is not what was intended (but Git’s documentation did not clarify that "newline" meant "Line Feed character"). This affected the popular .NET-based Git Credential Manager, which has been updated accordingly in coordination with the Git project. ``` --- pkgs/applications/version-management/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 4ec161a89758..082b1c9f37aa 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -30,7 +30,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.47.1"; + version = "2.47.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-89j5uyOuOSN06RzZ05WXDavFucXucvOYhGE82Epu0xA="; + hash = "sha256-sZJovmtvFVa0ep3YNCcuFn06dXQM3NKDzzgS7f/jkw8="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; From 5e4ab19f509f38913b62f85ed40c01f757ca11ca Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 30 Oct 2024 15:14:18 +0000 Subject: [PATCH 137/280] release-staging: init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As discussed in the Staging room on Matrix recently. This could probably be a bit bigger than it is: perhaps building packages like `hello`, `hello-cpp`, and `coreutils`, making sure we exercise CMake and Meson, and possibly building Rust too. But I’ve left it at the bare minimum for now since this seems like an obvious Schelling point for what to build on `staging` and keeps any worries about Hydra load or cache size growth to a minimum. Closes: #43618 --- pkgs/top-level/release-staging.nix | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/top-level/release-staging.nix diff --git a/pkgs/top-level/release-staging.nix b/pkgs/top-level/release-staging.nix new file mode 100644 index 000000000000..3782c2c3d0c1 --- /dev/null +++ b/pkgs/top-level/release-staging.nix @@ -0,0 +1,43 @@ +# This file defines the builds that are run for the `staging` branch. +# +# This should be kept minimal to avoid unnecessary load on Hydra; the +# point is not to duplicate `staging-next`, but to catch basic issues +# early and make bisection less painful. + +{ + nixpkgs ? { + outPath = (import ../../lib).cleanSource ../..; + revCount = 1234; + shortRev = "abcdef"; + revision = "0000000000000000000000000000000000000000"; + }, + # The platform doubles for which we build Nixpkgs. + supportedSystems ? [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + "aarch64-darwin" + ], + # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { + config = { + allowUnfree = false; + inHydra = true; + }; + __allowFileset = false; + }, +}: + +let + release-lib = import ./release-lib.nix { + inherit supportedSystems nixpkgsArgs; + }; + + inherit (release-lib) + all + mapTestOn + ; +in +mapTestOn { + stdenv = all; +} From e30ba30304dbc49ec2e88e12840d0388c48dde48 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 28 Dec 2024 10:10:26 -0500 Subject: [PATCH 138/280] apple-sdk: use llvm-readtapi instead of tapi Newer versions of LLVM provide `llvm-readtapi`, which is functionally equivalent to `tapi` (with a slightly different CLI). Using it allows the SDK to drop `libtapi` as a dependency. --- .../ap/apple-sdk/common/process-stubs.nix | 20 ++++++++----------- pkgs/by-name/ap/apple-sdk/package.nix | 7 +++++-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix index 5a5cd345ec06..d562816c17bd 100644 --- a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix +++ b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix @@ -10,13 +10,13 @@ in { lib, jq, - libtapi, + llvm, }: self: super: { nativeBuildInputs = super.nativeBuildInputs or [ ] ++ [ jq - libtapi + llvm ]; buildPhase = @@ -24,22 +24,18 @@ self: super: { + '' echo "Removing the following dylibs from the libSystem reexported libraries list: ${lib.escapeShellArg (lib.concatStringsSep ", " removedDylibs)}" for libSystem in libSystem.B.tbd libSystem.B_asan.tbd; do - tapi stubify --filetype=tbd-v5 usr/lib/$libSystem -o usr/lib/$libSystem # tbd-v5 is a JSON-based format. - jq --argjson libs ${lib.escapeShellArg (builtins.toJSON removedDylibs)} ' + # tbd-v5 is a JSON-based format, which can be manipulated by `jq`. + llvm-readtapi --filetype=tbd-v5 usr/lib/$libSystem \ + | jq --argjson libs ${lib.escapeShellArg (builtins.toJSON removedDylibs)} ' if .libraries then .libraries[] |= select(.install_names[] | any([.] | inside($libs)) | not) else . end | .main_library.reexported_libraries[].names[] |= select([.] | inside($libs) | not) - ' usr/lib/$libSystem > usr/lib/$libSystem~ - mv usr/lib/$libSystem~ usr/lib/$libSystem + ' > usr/lib/$libSystem~ + # Convert libSystem back to tbd-v4 because not all tooling supports the JSON-based format yet. + llvm-readtapi -delete-input --filetype=tbd-v4 usr/lib/$libSystem~ -o usr/lib/$libSystem done - - # Rewrite the text-based stubs to v4 using `tapi`. This ensures a consistent format between SDK versions. - # tbd-v4 also drops certain elements that are no longer necessary (such as GUID lists). - find . -name '*.tbd' -type f \ - -exec echo "Converting {} to tbd-v4" \; \ - -exec tapi stubify --filetype=tbd-v4 {} -o {} \; ''; } diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix index 779ed45260ec..b465e0e20894 100644 --- a/pkgs/by-name/ap/apple-sdk/package.nix +++ b/pkgs/by-name/ap/apple-sdk/package.nix @@ -18,6 +18,7 @@ in # Required by various phases callPackage, jq, + llvm, }: let @@ -37,8 +38,10 @@ let (callPackage ./common/remove-disallowed-packages.nix { }) ] # Only process stubs and convert them to tbd-v4 if jq is available. This can be made unconditional once - # the bootstrap tools have jq and libtapi. - ++ lib.optional (jq != null) (callPackage ./common/process-stubs.nix { }) + # the bootstrap tools have jq and llvm-readtapi. + ++ lib.optional (jq != null && lib.getName llvm != "bootstrap-stage0-llvm") ( + callPackage ./common/process-stubs.nix { } + ) # Avoid infinite recursions by not propagating certain packages, so they can themselves build with the SDK. ++ lib.optionals (!enableBootstrap) [ (callPackage ./common/propagate-inputs.nix { }) From 25b03f7b4482be660eebc88232ee0bebdf082d32 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Tue, 14 Jan 2025 21:37:36 -0800 Subject: [PATCH 139/280] llvmPackages_19: 19.1.6 -> 19.1.7 --- pkgs/development/compilers/llvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 569c0e2dd0d0..c1615fc96ff9 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -29,7 +29,7 @@ let "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; - "19.1.6".officialRelease.sha256 = "sha256-LD4nIjZTSZJtbgW6tZopbTF5Mq0Tenj2gbuPXhtOeUI="; + "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.0.0-git".gitRelease = { rev = "eb5cda480d2ad81230b2aa3e134e2b603ff90a1c"; rev-version = "20.0.0-unstable-2024-11-26"; From 75716068845467b3d2ff87363c8052e3103a8fe5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 15 Jan 2025 07:00:16 +0000 Subject: [PATCH 140/280] libopenmpt: 0.7.12 -> 0.7.13 Changes: https://lib.openmpt.org/libopenmpt/2025/01/06/releases-0.7.13-0.6.22-0.5.36-0.4.48/ --- pkgs/development/libraries/audio/libopenmpt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index 30a454a25bea..4f69bfe39e5f 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.12"; + version = "0.7.13"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-eas842cmAeUltcyUTwJsgMAwMvN9OcqoTIyj/ddeDJg="; + hash = "sha256-3NfN5PnEmOtJbEVW4cG4E1Pip0dH6CcKQlZRF+pC4fE="; }; enableParallelBuilding = true; From 42a4514475d78b84ca77c32cc5896a8f0ad14d90 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:56:38 +0300 Subject: [PATCH 141/280] glslang: 15.0.0 -> 15.1.0 Diff: https://github.com/KhronosGroup/glslang/compare/15.0.0...15.1.0 --- pkgs/by-name/gl/glslang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix index bc57fca1a9ec..6feecafc1612 100644 --- a/pkgs/by-name/gl/glslang/package.nix +++ b/pkgs/by-name/gl/glslang/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "15.0.0"; + version = "15.1.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-QXNecJ6SDeWpRjzHRTdPJHob1H3q2HZmWuL2zBt2Tlw="; + hash = "sha256-E1Zenf7XSGoozx4hxdOlMu+XZ6mJROSu7jIVYPWe3go="; }; outputs = [ From cbb703b0611f3b8277ddac3a975257166d447e15 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:56:43 +0300 Subject: [PATCH 142/280] vulkan-headers: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/Vulkan-Headers/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/development/libraries/vulkan-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index b44f50c8b381..047a8e9d4475 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.296.0"; + version = "1.4.304.0"; # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or # later the build fails as: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-u/40rOQyYbQza0aYbechLdKhYM1DgoMKkxauW2zZ/w0="; + hash = "sha256-X6HqcZDZ4ZQGBG3PlSxi0mhmYyrjmJYwk/pJ/XBqEZU="; }; passthru.updateScript = ./update.sh; From d9f8dc86db7a32ae00d92c691807487a2f9bbbb2 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:56:47 +0300 Subject: [PATCH 143/280] vulkan-loader: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/Vulkan-Loader/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/vu/vulkan-loader/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix index 96ad2fa8407e..10993aa0e20b 100644 --- a/pkgs/by-name/vu/vulkan-loader/package.nix +++ b/pkgs/by-name/vu/vulkan-loader/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-6GHZUiYL3gDWN61SaLiD/3xXSoQb1rx6U5eu1cl8ZwM="; + hash = "sha256-qPknv8BvfJoewFfORXsFZlUnae36czHfOPXmtGccrOk="; }; patches = From 30d3ed43f63440639707037e00cf63bba61626a0 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:56:50 +0300 Subject: [PATCH 144/280] vulkan-validation-layers: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/vu/vulkan-validation-layers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix index 9aaebeb5b4ed..d6b112760091 100644 --- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix +++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-H5AG+PXM3IdCfDqHMdaunRUWRm8QgdS6ZbZLMaOOALk="; + hash = "sha256-n7fbhi5NCQRsj/sAjLfaW6EBFBqGutN5Cnl/CtnnVPY="; }; strictDeps = true; From 8349591ac575799c044636b338a19d1bf7e70fff Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:56:53 +0300 Subject: [PATCH 145/280] vulkan-tools: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/Vulkan-Tools/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/tools/graphics/vulkan-tools/default.nix | 8 +++++--- .../graphics/vulkan-tools/wayland-scanner.patch | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 435671c1915d..cc2370cfaa82 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -26,19 +26,22 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-+24IVmmcxuPaT/vYRYZ4yluHS/uKfWiVa7yIvzsdTuQ="; + hash = "sha256-PtxzLsywYwaL4vhbDiabryLaMUMcwJGcL14dt8dnzvs="; }; + patches = [ ./wayland-scanner.patch ]; + nativeBuildInputs = [ cmake pkg-config python3 + wayland-scanner ]; buildInputs = @@ -57,7 +60,6 @@ stdenv.mkDerivation rec { libXrandr wayland wayland-protocols - wayland-scanner ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moltenvk diff --git a/pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch b/pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch new file mode 100644 index 000000000000..cd5b56c10d04 --- /dev/null +++ b/pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch @@ -0,0 +1,17 @@ +diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt +index 4ecd3e36..17dc3f2e 100644 +--- a/cube/CMakeLists.txt ++++ b/cube/CMakeLists.txt +@@ -96,9 +96,9 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux|BSD|GNU") + pkg_get_variable(WAYLAND_SCANNER_EXECUTABLE wayland-scanner wayland_scanner) + message(DEBUG "WAYLAND_SCANNER_EXECUTABLE = ${WAYLAND_SCANNER_EXECUTABLE}") + +- pkg_get_variable(WAYLAND_CLIENT_PATH wayland-client pkgdatadir) +- message(DEBUG "WAYLAND_CLIENT_PATH = ${WAYLAND_CLIENT_PATH}") +- set(WAYLAND_CODE_PROTOCOL ${WAYLAND_CLIENT_PATH}/wayland.xml) ++ pkg_get_variable(WAYLAND_SCANNER_PATH wayland-scanner pkgdatadir) ++ message(DEBUG "WAYLAND_SCANNER_PATH = ${WAYLAND_SCANNER_PATH}") ++ set(WAYLAND_CODE_PROTOCOL ${WAYLAND_SCANNER_PATH}/wayland.xml) + + pkg_get_variable(WAYLAND_PROTOCOLS_PATH wayland-protocols pkgdatadir) + message(DEBUG "WAYLAND_PROTOCOLS_PATH = ${WAYLAND_PROTOCOLS_PATH}") From b93ab769f8518fec272643cd42bdf869a69c4299 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:56:56 +0300 Subject: [PATCH 146/280] vulkan-tools-lunarg: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/LunarG/VulkanTools/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/vu/vulkan-tools-lunarg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix index e8bac27836eb..f36d96b07b77 100644 --- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix +++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-RaL7sqy5Rc8syPoM3SedZ6UilV9JUAA96JZh5/gIfPU="; + hash = "sha256-nudyg5YF2j4kv0fCx3vV/jGsYrEaTMf0xydvdHF6XCU="; }; nativeBuildInputs = [ From c556c6637504e4452fccdb595395dfcdc8bd1f67 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:57:00 +0300 Subject: [PATCH 147/280] vulkan-extension-layer: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/Vulkan-ExtensionLayer/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/vu/vulkan-extension-layer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix index 5abe48cbf00a..2a65766295dd 100644 --- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix +++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "vulkan-sdk-${version}"; - hash = "sha256-pBpHYxJq36FrHsvpaMJvX0IKTvAh0R86qR7/vn6EBCw="; + hash = "sha256-HdRbnXb9/YghxRJEg7Xx2q+YyiLAUBZ7lm0ibxVpbdA="; }; nativeBuildInputs = [ From 5baf9d17f281fde6217b2be67e9c6dd77447a064 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:57:03 +0300 Subject: [PATCH 148/280] vulkan-utility-libraries: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/vu/vulkan-utility-libraries/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix index 6d966b41716c..dc8643d0b3d6 100644 --- a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix +++ b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-WDRDpUOZN/akUA6gsJMlC2GKolVt3g1NerKqe7aLhek="; + hash = "sha256-d20PRTCCNWezwhTD3axiQeWvY9lqD/8XLGBlOFgNzFE="; }; nativeBuildInputs = [ From dfff72fd969bc1cf9d2633da4c808119147e269d Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:57:05 +0300 Subject: [PATCH 149/280] vulkan-volk: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/zeux/volk/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/vu/vulkan-volk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix index 8e511707dd96..71c1beabd447 100644 --- a/pkgs/by-name/vu/vulkan-volk/package.nix +++ b/pkgs/by-name/vu/vulkan-volk/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "zeux"; repo = "volk"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-faLszfOeFo5eAzwvnrAUDVAPCVt/F9xRUFGxC9TA8E8="; + hash = "sha256-+SLGRvCUKFntz60/xL/NjoFjvvATWMImR4CGnCHUj2o="; }; nativeBuildInputs = [ cmake ]; From c28b09d3eb76e31a955c6f486403f692ba4f1f91 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:57:08 +0300 Subject: [PATCH 150/280] spirv-headers: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/SPIRV-Headers/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/sp/spirv-headers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix index f03f327f5a1b..067e5fcb386a 100644 --- a/pkgs/by-name/sp/spirv-headers/package.nix +++ b/pkgs/by-name/sp/spirv-headers/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ="; + hash = "sha256-MCQ+i9ymjnxRZP/Agk7rOGdHcB4p67jT4J4athWUlcI="; }; nativeBuildInputs = [ cmake ]; From 863f9bc40631822ff8137830ac5c3878e4c8f5da Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:57:19 +0300 Subject: [PATCH 151/280] spirv-cross: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/SPIRV-Cross/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 Changelog: https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/1.4.304.0 --- pkgs/by-name/sp/spirv-cross/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix index 1661cd71d849..616d48c74177 100644 --- a/pkgs/by-name/sp/spirv-cross/package.nix +++ b/pkgs/by-name/sp/spirv-cross/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-HKEh/UQzDQEOvJGHQlM6kEYVZrMaUBOcOGjjHWXSPoo="; + hash = "sha256-cpWvGCXS6VaS0YehnGYTaXydL6S4FU9HLPh0JZ+jfd8="; }; nativeBuildInputs = [ From 872d8301e3ee5f16de91841b95073e7b8548bb3f Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:57:22 +0300 Subject: [PATCH 152/280] spirv-tools: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/SPIRV-Tools/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/sp/spirv-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix index cd7b3bdc8254..6ebbbb6cbb09 100644 --- a/pkgs/by-name/sp/spirv-tools/package.nix +++ b/pkgs/by-name/sp/spirv-tools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-ExseInoB/mMtVUOf0KMrQwDQ5UQdo3Ru7VnGMGPeXrk="; + hash = "sha256-alJ4X7qbTzsRTqRFdpjdsj0wERVb17czui2muEaKNyI="; }; # The cmake options are sufficient for turning on static building, but not From 47ab1050fa9a97fa410f81696677cf353d7ffee3 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 14 Jan 2025 18:13:55 -0500 Subject: [PATCH 153/280] libtapi: 1500.0.12.3 -> 1600.0.11.8 https://github.com/apple-oss-distributions/tapi/compare/tapi-1500.0.12.3...tapi-1600.0.11.8 --- .../0002-Pass-fileType-to-writeToStream.patch | 25 ------------------- pkgs/by-name/li/libtapi/package.nix | 23 +++++------------ 2 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch diff --git a/pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch b/pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch deleted file mode 100644 index ffcedb0c6f6e..000000000000 --- a/pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 77ca537cfc61765f2109c626757f2da8de602ce0 Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Fri, 5 Apr 2024 23:20:32 -0400 -Subject: [PATCH 2/3] Pass fileType to writeToStream - ---- - lib/Core/JSONReaderWriter.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tapi/lib/Core/JSONReaderWriter.cpp b/tapi/lib/Core/JSONReaderWriter.cpp -index c040670..c1be85f 100644 ---- a/tapi/lib/Core/JSONReaderWriter.cpp -+++ b/tapi/lib/Core/JSONReaderWriter.cpp -@@ -57,7 +57,7 @@ Error JSONWriter::writeFile(raw_ostream &os, const InterfaceFile *file, - if (file == nullptr) - return errorCodeToError(std::make_error_code(std::errc::invalid_argument)); - -- return TextAPIWriter::writeToStream(os, *file, /*Compact=*/false); -+ return TextAPIWriter::writeToStream(os, *file, fileType, /*Compact=*/false); - } - - TAPI_NAMESPACE_INTERNAL_END --- -2.42.0 - diff --git a/pkgs/by-name/li/libtapi/package.nix b/pkgs/by-name/li/libtapi/package.nix index 0e4f3db7611e..34cf750ec962 100644 --- a/pkgs/by-name/li/libtapi/package.nix +++ b/pkgs/by-name/li/libtapi/package.nix @@ -18,14 +18,14 @@ let # See: https://en.wikipedia.org/wiki/Xcode#Toolchain_versions # Note: Can’t use a sparse checkout because the Darwin stdenv bootstrap can’t depend on fetchgit. appleLlvm = { - version = "15.0.0"; # As reported by upstream’s `tapi --version`. - rev = "2b5ff47e44b059c03de5779479d01a133ab4d581"; # Per the TAPI repo. - hash = "sha256-X37zBbpSEWmqtdTXsd1t++gp+0ggA8YtB73fGKNaiR0="; + version = "16.0.0"; # As reported by upstream’s `tapi --version`. + rev = "3602748d4ec9947f0d1493511a8c34410909506e"; # Per the TAPI repo. + hash = "sha256-7o/JY/tcu4AeXCa7xhfjbuuV3/Cbf89AdoZOKrciJk0="; }; in stdenv.mkDerivation (finalAttrs: { pname = "libtapi"; - version = "1500.0.12.3"; + version = "1600.0.11.8"; outputs = [ "out" @@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { name = "tapi-src"; owner = "apple-oss-distributions"; repo = "tapi"; - rev = "tapi-${finalAttrs.version}"; - hash = "sha256-YeaA2OeSY1fXYJHPJJ0TrVC1brspSvutBtPMPGX6Y1o="; + tag = "tapi-${finalAttrs.version}"; + hash = "sha256-87AQZrCmZHv3lbfUnw0j17H4cP+GN5g0D6zhdT4P56Y="; }) # libtapi can’t avoid pulling the whole repo even though it needs only a couple of folders because # `fetchgit` can’t be used in the Darwin bootstrap. @@ -56,14 +56,6 @@ stdenv.mkDerivation (finalAttrs: { # when the linker supports it. # Note: This can be dropped once the bootstrap tools are updated after the ld64 update. ./0001-Check-for-no_exported_symbols-linker-support.patch - # The recommended upstream revision of Apple’s LLVM fork needs this patch, or - # `tapi stubify` will crash when generating stubs. - (fetchpatch { - url = "https://github.com/apple/llvm-project/commit/455bf3d1ccd6a52df5e38103532c1b8f49924edc.patch"; - hash = "sha256-ujZcfdAls20JPIvjvO2Xv8st8cNTY/XTEQusICKBKSA"; - }) - # Updates `JSONReaderWriter` to work with the API change in the above patch. - ./0002-Pass-fileType-to-writeToStream.patch # Fix build on Linux. GCC is more picky than clang about the field order. ./0003-Match-designator-order-with-declaration-order.patch ]; @@ -93,9 +85,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "DESTINATION $dir" "DESTINATION \''${$cmakevar}" done done - # Doesn’t seem to exist publically. - substituteInPlace tapi/test/CMakeLists.txt \ - --replace-fail tapi-configs "" '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Remove Darwin-specific versioning flags. From 79a3e7628f72045946fb3cb40509fdaa4be8655d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 14 Jan 2025 21:23:39 +0100 Subject: [PATCH 154/280] rsync: 3.3.0 -> 3.4.1 Follow-up to edccf51c1cb9202ee43999fc02ce83e68dbecc36. Changes: https://github.com/RsyncProject/rsync/blob/v3.4.1/NEWS.md The PGP key change is expected and has been confirmed by the maintainers. In a effort to provide traceability the new key has been signed by Wayne Davison, another rsync maintainer, see https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6c859fb14b96a8c5 --- .../0001-Some-checksum-buffer-fixes.patch | 151 -------------- ...other-cast-when-multiplying-integers.patch | 39 ---- ...event-information-leak-off-the-stack.patch | 27 --- ...uzzy-options-when-fuzzy-not-selected.patch | 37 ---- .../0002-added-secure_relative_open.patch | 103 ---------- ...-secure_relative_open-for-basis-file.patch | 103 ---------- ...nts-in-relpath-for-secure_relative_o.patch | 37 ---- .../0001-Refuse-a-duplicate-dirlist.patch | 45 ----- .../0002-range-check-dir_ndx-before-use.patch | 27 --- .../0001-make-safe-links-stricter.patch | 136 ------------- ...xed-symlink-race-condition-in-sender.patch | 187 ------------------ .../configure.ac-fix-failing-IPv6-check.patch | 12 -- .../networking/sync/rsync/default.nix | 23 +-- .../rsync/raise-protocol-version-to-32.patch | 26 --- 14 files changed, 3 insertions(+), 950 deletions(-) delete mode 100644 pkgs/applications/networking/sync/rsync/CVE-2024-12084/0001-Some-checksum-buffer-fixes.patch delete mode 100644 pkgs/applications/networking/sync/rsync/CVE-2024-12084/0002-Another-cast-when-multiplying-integers.patch delete mode 100644 pkgs/applications/networking/sync/rsync/CVE-2024-12085/0001-prevent-information-leak-off-the-stack.patch delete mode 100644 pkgs/applications/networking/sync/rsync/CVE-2024-12086/0001-refuse-fuzzy-options-when-fuzzy-not-selected.patch delete mode 100644 pkgs/applications/networking/sync/rsync/CVE-2024-12086/0002-added-secure_relative_open.patch delete mode 100644 pkgs/applications/networking/sync/rsync/CVE-2024-12086/0003-receiver-use-secure_relative_open-for-basis-file.patch delete mode 100644 pkgs/applications/networking/sync/rsync/CVE-2024-12086/0004-disallow-.-elements-in-relpath-for-secure_relative_o.patch delete mode 100644 pkgs/applications/networking/sync/rsync/CVE-2024-12087/0001-Refuse-a-duplicate-dirlist.patch delete mode 100644 pkgs/applications/networking/sync/rsync/CVE-2024-12087/0002-range-check-dir_ndx-before-use.patch delete mode 100644 pkgs/applications/networking/sync/rsync/CVE-2024-12088/0001-make-safe-links-stricter.patch delete mode 100644 pkgs/applications/networking/sync/rsync/CVE-2024-12747/0001-fixed-symlink-race-condition-in-sender.patch delete mode 100644 pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch delete mode 100644 pkgs/applications/networking/sync/rsync/raise-protocol-version-to-32.patch diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12084/0001-Some-checksum-buffer-fixes.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12084/0001-Some-checksum-buffer-fixes.patch deleted file mode 100644 index e5ba8ddc6f79..000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12084/0001-Some-checksum-buffer-fixes.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 0902b52f6687b1f7952422080d50b93108742e53 Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Tue, 29 Oct 2024 22:55:29 -0700 -Subject: [PATCH 1/2] Some checksum buffer fixes. - -- Put sum2_array into sum_struct to hold an array of sum2 checksums - that are each xfer_sum_len bytes. -- Remove sum2 buf from sum_buf. -- Add macro sum2_at() to access each sum2 array element. -- Throw an error if a sums header has an s2length larger than - xfer_sum_len. ---- - io.c | 3 ++- - match.c | 8 ++++---- - rsync.c | 5 ++++- - rsync.h | 4 +++- - sender.c | 4 +++- - 5 files changed, 16 insertions(+), 8 deletions(-) - -diff --git a/io.c b/io.c -index a99ac0ec..bb60eeca 100644 ---- a/io.c -+++ b/io.c -@@ -55,6 +55,7 @@ extern int read_batch; - extern int compat_flags; - extern int protect_args; - extern int checksum_seed; -+extern int xfer_sum_len; - extern int daemon_connection; - extern int protocol_version; - extern int remove_source_files; -@@ -1977,7 +1978,7 @@ void read_sum_head(int f, struct sum_struct *sum) - exit_cleanup(RERR_PROTOCOL); - } - sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f); -- if (sum->s2length < 0 || sum->s2length > MAX_DIGEST_LEN) { -+ if (sum->s2length < 0 || sum->s2length > xfer_sum_len) { - rprintf(FERROR, "Invalid checksum length %d [%s]\n", - sum->s2length, who_am_i()); - exit_cleanup(RERR_PROTOCOL); -diff --git a/match.c b/match.c -index cdb30a15..36e78ed2 100644 ---- a/match.c -+++ b/match.c -@@ -232,7 +232,7 @@ static void hash_search(int f,struct sum_struct *s, - done_csum2 = 1; - } - -- if (memcmp(sum2,s->sums[i].sum2,s->s2length) != 0) { -+ if (memcmp(sum2, sum2_at(s, i), s->s2length) != 0) { - false_alarms++; - continue; - } -@@ -252,7 +252,7 @@ static void hash_search(int f,struct sum_struct *s, - if (i != aligned_i) { - if (sum != s->sums[aligned_i].sum1 - || l != s->sums[aligned_i].len -- || memcmp(sum2, s->sums[aligned_i].sum2, s->s2length) != 0) -+ || memcmp(sum2, sum2_at(s, aligned_i), s->s2length) != 0) - goto check_want_i; - i = aligned_i; - } -@@ -271,7 +271,7 @@ static void hash_search(int f,struct sum_struct *s, - if (sum != s->sums[i].sum1) - goto check_want_i; - get_checksum2((char *)map, l, sum2); -- if (memcmp(sum2, s->sums[i].sum2, s->s2length) != 0) -+ if (memcmp(sum2, sum2_at(s, i), s->s2length) != 0) - goto check_want_i; - /* OK, we have a re-alignment match. Bump the offset - * forward to the new match point. */ -@@ -290,7 +290,7 @@ static void hash_search(int f,struct sum_struct *s, - && (!updating_basis_file || s->sums[want_i].offset >= offset - || s->sums[want_i].flags & SUMFLG_SAME_OFFSET) - && sum == s->sums[want_i].sum1 -- && memcmp(sum2, s->sums[want_i].sum2, s->s2length) == 0) { -+ && memcmp(sum2, sum2_at(s, want_i), s->s2length) == 0) { - /* we've found an adjacent match - the RLL coder - * will be happy */ - i = want_i; -diff --git a/rsync.c b/rsync.c -index cd288f57..b130aba5 100644 ---- a/rsync.c -+++ b/rsync.c -@@ -437,7 +437,10 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr, cha - */ - void free_sums(struct sum_struct *s) - { -- if (s->sums) free(s->sums); -+ if (s->sums) { -+ free(s->sums); -+ free(s->sum2_array); -+ } - free(s); - } - -diff --git a/rsync.h b/rsync.h -index d3709fe0..8ddbe702 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -958,12 +958,12 @@ struct sum_buf { - uint32 sum1; /**< simple checksum */ - int32 chain; /**< next hash-table collision */ - short flags; /**< flag bits */ -- char sum2[SUM_LENGTH]; /**< checksum */ - }; - - struct sum_struct { - OFF_T flength; /**< total file length */ - struct sum_buf *sums; /**< points to info for each chunk */ -+ char *sum2_array; /**< checksums of length xfer_sum_len */ - int32 count; /**< how many chunks */ - int32 blength; /**< block_length */ - int32 remainder; /**< flength % block_length */ -@@ -982,6 +982,8 @@ struct map_struct { - int status; /* first errno from read errors */ - }; - -+#define sum2_at(s, i) ((s)->sum2_array + ((OFF_T)(i) * xfer_sum_len)) -+ - #define NAME_IS_FILE (0) /* filter name as a file */ - #define NAME_IS_DIR (1<<0) /* filter name as a dir */ - #define NAME_IS_XATTR (1<<2) /* filter name as an xattr */ -diff --git a/sender.c b/sender.c -index 3d4f052e..ab205341 100644 ---- a/sender.c -+++ b/sender.c -@@ -31,6 +31,7 @@ extern int log_before_transfer; - extern int stdout_format_has_i; - extern int logfile_format_has_i; - extern int want_xattr_optim; -+extern int xfer_sum_len; - extern int csum_length; - extern int append_mode; - extern int copy_links; -@@ -94,10 +95,11 @@ static struct sum_struct *receive_sums(int f) - return(s); - - s->sums = new_array(struct sum_buf, s->count); -+ s->sum2_array = new_array(char, s->count * xfer_sum_len); - - for (i = 0; i < s->count; i++) { - s->sums[i].sum1 = read_int(f); -- read_buf(f, s->sums[i].sum2, s->s2length); -+ read_buf(f, sum2_at(s, i), s->s2length); - - s->sums[i].offset = offset; - s->sums[i].flags = 0; --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12084/0002-Another-cast-when-multiplying-integers.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12084/0002-Another-cast-when-multiplying-integers.patch deleted file mode 100644 index 5a21d71b292e..000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12084/0002-Another-cast-when-multiplying-integers.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 42e2b56c4ede3ab164f9a5c6dae02aa84606a6c1 Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Tue, 5 Nov 2024 11:01:03 -0800 -Subject: [PATCH 2/2] Another cast when multiplying integers. - ---- - rsync.h | 2 +- - sender.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rsync.h b/rsync.h -index 8ddbe702..0f9e277f 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -982,7 +982,7 @@ struct map_struct { - int status; /* first errno from read errors */ - }; - --#define sum2_at(s, i) ((s)->sum2_array + ((OFF_T)(i) * xfer_sum_len)) -+#define sum2_at(s, i) ((s)->sum2_array + ((size_t)(i) * xfer_sum_len)) - - #define NAME_IS_FILE (0) /* filter name as a file */ - #define NAME_IS_DIR (1<<0) /* filter name as a dir */ -diff --git a/sender.c b/sender.c -index ab205341..2bbff2fa 100644 ---- a/sender.c -+++ b/sender.c -@@ -95,7 +95,7 @@ static struct sum_struct *receive_sums(int f) - return(s); - - s->sums = new_array(struct sum_buf, s->count); -- s->sum2_array = new_array(char, s->count * xfer_sum_len); -+ s->sum2_array = new_array(char, (size_t)s->count * xfer_sum_len); - - for (i = 0; i < s->count; i++) { - s->sums[i].sum1 = read_int(f); --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12085/0001-prevent-information-leak-off-the-stack.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12085/0001-prevent-information-leak-off-the-stack.patch deleted file mode 100644 index 7356fb6cb022..000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12085/0001-prevent-information-leak-off-the-stack.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cf620065502f065d4ea44f5df4f81295a738aa21 Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Thu, 14 Nov 2024 09:57:08 +1100 -Subject: [PATCH] prevent information leak off the stack - -prevent leak of uninitialised stack data in hash_search ---- - match.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/match.c b/match.c -index 36e78ed2..dfd6af2c 100644 ---- a/match.c -+++ b/match.c -@@ -147,6 +147,9 @@ static void hash_search(int f,struct sum_struct *s, - int more; - schar *map; - -+ // prevent possible memory leaks -+ memset(sum2, 0, sizeof sum2); -+ - /* want_i is used to encourage adjacent matches, allowing the RLL - * coding of the output to work more efficiently. */ - want_i = 0; --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0001-refuse-fuzzy-options-when-fuzzy-not-selected.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0001-refuse-fuzzy-options-when-fuzzy-not-selected.patch deleted file mode 100644 index f409b1aa7ec7..000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0001-refuse-fuzzy-options-when-fuzzy-not-selected.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3feb8669d875d03c9ceb82e208ef40ddda8eb908 Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Sat, 23 Nov 2024 11:08:03 +1100 -Subject: [PATCH 1/4] refuse fuzzy options when fuzzy not selected - -this prevents a malicious server providing a file to compare to when -the user has not given the fuzzy option ---- - receiver.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/receiver.c b/receiver.c -index 6b4b369e..2d7f6033 100644 ---- a/receiver.c -+++ b/receiver.c -@@ -66,6 +66,7 @@ extern char sender_file_sum[MAX_DIGEST_LEN]; - extern struct file_list *cur_flist, *first_flist, *dir_flist; - extern filter_rule_list daemon_filter_list; - extern OFF_T preallocated_len; -+extern int fuzzy_basis; - - extern struct name_num_item *xfer_sum_nni; - extern int xfer_sum_len; -@@ -716,6 +717,10 @@ int recv_files(int f_in, int f_out, char *local_name) - fnamecmp = get_backup_name(fname); - break; - case FNAMECMP_FUZZY: -+ if (fuzzy_basis == 0) { -+ rprintf(FERROR_XFER, "rsync: refusing malicious fuzzy operation for %s\n", xname); -+ exit_cleanup(RERR_PROTOCOL); -+ } - if (file->dirname) { - pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, file->dirname, xname); - fnamecmp = fnamecmpbuf; --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0002-added-secure_relative_open.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0002-added-secure_relative_open.patch deleted file mode 100644 index 719c6f1a7cff..000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0002-added-secure_relative_open.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 33385aefe4773e7a3982d41995681eb079c92d12 Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Sat, 23 Nov 2024 12:26:10 +1100 -Subject: [PATCH 2/4] added secure_relative_open() - -this is an open that enforces no symlink following for all path -components in a relative path ---- - syscall.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 74 insertions(+) - -diff --git a/syscall.c b/syscall.c -index d92074aa..a4b7f542 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -33,6 +33,8 @@ - #include - #endif - -+#include "ifuncs.h" -+ - extern int dry_run; - extern int am_root; - extern int am_sender; -@@ -712,3 +714,75 @@ int do_open_nofollow(const char *pathname, int flags) - - return fd; - } -+ -+/* -+ open a file relative to a base directory. The basedir can be NULL, -+ in which case the current working directory is used. The relpath -+ must be a relative path, and the relpath must not contain any -+ elements in the path which follow symlinks (ie. like O_NOFOLLOW, but -+ applies to all path components, not just the last component) -+*/ -+int secure_relative_open(const char *basedir, const char *relpath, int flags, mode_t mode) -+{ -+ if (!relpath || relpath[0] == '/') { -+ // must be a relative path -+ errno = EINVAL; -+ return -1; -+ } -+ -+#if !defined(O_NOFOLLOW) || !defined(O_DIRECTORY) -+ // really old system, all we can do is live with the risks -+ if (!basedir) { -+ return open(relpath, flags, mode); -+ } -+ char fullpath[MAXPATHLEN]; -+ pathjoin(fullpath, sizeof fullpath, basedir, relpath); -+ return open(fullpath, flags, mode); -+#else -+ int dirfd = AT_FDCWD; -+ if (basedir != NULL) { -+ dirfd = openat(AT_FDCWD, basedir, O_RDONLY | O_DIRECTORY); -+ if (dirfd == -1) { -+ return -1; -+ } -+ } -+ int retfd = -1; -+ -+ char *path_copy = my_strdup(relpath, __FILE__, __LINE__); -+ if (!path_copy) { -+ return -1; -+ } -+ -+ for (const char *part = strtok(path_copy, "/"); -+ part != NULL; -+ part = strtok(NULL, "/")) -+ { -+ int next_fd = openat(dirfd, part, O_RDONLY | O_DIRECTORY | O_NOFOLLOW); -+ if (next_fd == -1 && errno == ENOTDIR) { -+ if (strtok(NULL, "/") != NULL) { -+ // this is not the last component of the path -+ errno = ELOOP; -+ goto cleanup; -+ } -+ // this could be the last component of the path, try as a file -+ retfd = openat(dirfd, part, flags | O_NOFOLLOW, mode); -+ goto cleanup; -+ } -+ if (next_fd == -1) { -+ goto cleanup; -+ } -+ if (dirfd != AT_FDCWD) close(dirfd); -+ dirfd = next_fd; -+ } -+ -+ // the path must be a directory -+ errno = EINVAL; -+ -+cleanup: -+ free(path_copy); -+ if (dirfd != AT_FDCWD) { -+ close(dirfd); -+ } -+ return retfd; -+#endif // O_NOFOLLOW, O_DIRECTORY -+} --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0003-receiver-use-secure_relative_open-for-basis-file.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0003-receiver-use-secure_relative_open-for-basis-file.patch deleted file mode 100644 index 4be6391648df..000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0003-receiver-use-secure_relative_open-for-basis-file.patch +++ /dev/null @@ -1,103 +0,0 @@ -From e59ef9939d3f0ccc8f9bab51442989a81be0c914 Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Sat, 23 Nov 2024 12:28:13 +1100 -Subject: [PATCH 3/4] receiver: use secure_relative_open() for basis file - -this prevents attacks where the basis file is manipulated by a -malicious sender to gain information about files outside the -destination tree ---- - receiver.c | 42 ++++++++++++++++++++++++++---------------- - 1 file changed, 26 insertions(+), 16 deletions(-) - -diff --git a/receiver.c b/receiver.c -index 2d7f6033..8031b8f4 100644 ---- a/receiver.c -+++ b/receiver.c -@@ -552,6 +552,8 @@ int recv_files(int f_in, int f_out, char *local_name) - progress_init(); - - while (1) { -+ const char *basedir = NULL; -+ - cleanup_disable(); - - /* This call also sets cur_flist. */ -@@ -722,27 +724,29 @@ int recv_files(int f_in, int f_out, char *local_name) - exit_cleanup(RERR_PROTOCOL); - } - if (file->dirname) { -- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, file->dirname, xname); -- fnamecmp = fnamecmpbuf; -- } else -- fnamecmp = xname; -+ basedir = file->dirname; -+ } -+ fnamecmp = xname; - break; - default: - if (fnamecmp_type > FNAMECMP_FUZZY && fnamecmp_type-FNAMECMP_FUZZY <= basis_dir_cnt) { - fnamecmp_type -= FNAMECMP_FUZZY + 1; - if (file->dirname) { -- stringjoin(fnamecmpbuf, sizeof fnamecmpbuf, -- basis_dir[fnamecmp_type], "/", file->dirname, "/", xname, NULL); -- } else -- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], xname); -+ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], file->dirname); -+ basedir = fnamecmpbuf; -+ } else { -+ basedir = basis_dir[fnamecmp_type]; -+ } -+ fnamecmp = xname; - } else if (fnamecmp_type >= basis_dir_cnt) { - rprintf(FERROR, - "invalid basis_dir index: %d.\n", - fnamecmp_type); - exit_cleanup(RERR_PROTOCOL); -- } else -- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], fname); -- fnamecmp = fnamecmpbuf; -+ } else { -+ basedir = basis_dir[fnamecmp_type]; -+ fnamecmp = fname; -+ } - break; - } - if (!fnamecmp || (daemon_filter_list.head -@@ -765,7 +769,7 @@ int recv_files(int f_in, int f_out, char *local_name) - } - - /* open the file */ -- fd1 = do_open(fnamecmp, O_RDONLY, 0); -+ fd1 = secure_relative_open(basedir, fnamecmp, O_RDONLY, 0); - - if (fd1 == -1 && protocol_version < 29) { - if (fnamecmp != fname) { -@@ -776,14 +780,20 @@ int recv_files(int f_in, int f_out, char *local_name) - - if (fd1 == -1 && basis_dir[0]) { - /* pre-29 allowed only one alternate basis */ -- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, -- basis_dir[0], fname); -- fnamecmp = fnamecmpbuf; -+ basedir = basis_dir[0]; -+ fnamecmp = fname; - fnamecmp_type = FNAMECMP_BASIS_DIR_LOW; -- fd1 = do_open(fnamecmp, O_RDONLY, 0); -+ fd1 = secure_relative_open(basedir, fnamecmp, O_RDONLY, 0); - } - } - -+ if (basedir) { -+ // for the following code we need the full -+ // path name as a single string -+ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basedir, fnamecmp); -+ fnamecmp = fnamecmpbuf; -+ } -+ - one_inplace = inplace_partial && fnamecmp_type == FNAMECMP_PARTIAL_DIR; - updating_basis_or_equiv = one_inplace - || (inplace && (fnamecmp == fname || fnamecmp_type == FNAMECMP_BACKUP)); --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0004-disallow-.-elements-in-relpath-for-secure_relative_o.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0004-disallow-.-elements-in-relpath-for-secure_relative_o.patch deleted file mode 100644 index 74a16e79a16a..000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0004-disallow-.-elements-in-relpath-for-secure_relative_o.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c78e53edb802d04f7e4e070fe8314f2544749e7a Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Tue, 26 Nov 2024 09:16:31 +1100 -Subject: [PATCH 4/4] disallow ../ elements in relpath for secure_relative_open - ---- - syscall.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/syscall.c b/syscall.c -index a4b7f542..47c5ea57 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -721,6 +721,8 @@ int do_open_nofollow(const char *pathname, int flags) - must be a relative path, and the relpath must not contain any - elements in the path which follow symlinks (ie. like O_NOFOLLOW, but - applies to all path components, not just the last component) -+ -+ The relpath must also not contain any ../ elements in the path - */ - int secure_relative_open(const char *basedir, const char *relpath, int flags, mode_t mode) - { -@@ -729,6 +731,11 @@ int secure_relative_open(const char *basedir, const char *relpath, int flags, mo - errno = EINVAL; - return -1; - } -+ if (strncmp(relpath, "../", 3) == 0 || strstr(relpath, "/../")) { -+ // no ../ elements allowed in the relpath -+ errno = EINVAL; -+ return -1; -+ } - - #if !defined(O_NOFOLLOW) || !defined(O_DIRECTORY) - // really old system, all we can do is live with the risks --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12087/0001-Refuse-a-duplicate-dirlist.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12087/0001-Refuse-a-duplicate-dirlist.patch deleted file mode 100644 index 99ebc15bd458..000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12087/0001-Refuse-a-duplicate-dirlist.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0ebc19ee486a8e928a68d8f98d07d40f176770aa Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Thu, 14 Nov 2024 15:46:50 -0800 -Subject: [PATCH 1/2] Refuse a duplicate dirlist. - ---- - flist.c | 9 +++++++++ - rsync.h | 1 + - 2 files changed, 10 insertions(+) - -diff --git a/flist.c b/flist.c -index 464d556e..847b1054 100644 ---- a/flist.c -+++ b/flist.c -@@ -2584,6 +2584,15 @@ struct file_list *recv_file_list(int f, int dir_ndx) - init_hard_links(); - #endif - -+ if (inc_recurse && dir_ndx >= 0) { -+ struct file_struct *file = dir_flist->files[dir_ndx]; -+ if (file->flags & FLAG_GOT_DIR_FLIST) { -+ rprintf(FERROR_XFER, "rsync: refusing malicious duplicate flist for dir %d\n", dir_ndx); -+ exit_cleanup(RERR_PROTOCOL); -+ } -+ file->flags |= FLAG_GOT_DIR_FLIST; -+ } -+ - flist = flist_new(0, "recv_file_list"); - flist_expand(flist, FLIST_START_LARGE); - -diff --git a/rsync.h b/rsync.h -index 0f9e277f..b9a7101a 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -84,6 +84,7 @@ - #define FLAG_DUPLICATE (1<<4) /* sender */ - #define FLAG_MISSING_DIR (1<<4) /* generator */ - #define FLAG_HLINKED (1<<5) /* receiver/generator (checked on all types) */ -+#define FLAG_GOT_DIR_FLIST (1<<5)/* sender/receiver/generator - dir_flist only */ - #define FLAG_HLINK_FIRST (1<<6) /* receiver/generator (w/FLAG_HLINKED) */ - #define FLAG_IMPLIED_DIR (1<<6) /* sender/receiver/generator (dirs only) */ - #define FLAG_HLINK_LAST (1<<7) /* receiver/generator */ --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12087/0002-range-check-dir_ndx-before-use.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12087/0002-range-check-dir_ndx-before-use.patch deleted file mode 100644 index b067809ebb3a..000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12087/0002-range-check-dir_ndx-before-use.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b3e16be18d582dac1513c0a932d146b36e867b1b Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Tue, 26 Nov 2024 16:12:45 +1100 -Subject: [PATCH 2/2] range check dir_ndx before use - ---- - flist.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/flist.c b/flist.c -index 847b1054..087f9da6 100644 ---- a/flist.c -+++ b/flist.c -@@ -2585,6 +2585,10 @@ struct file_list *recv_file_list(int f, int dir_ndx) - #endif - - if (inc_recurse && dir_ndx >= 0) { -+ if (dir_ndx >= dir_flist->used) { -+ rprintf(FERROR_XFER, "rsync: refusing invalid dir_ndx %u >= %u\n", dir_ndx, dir_flist->used); -+ exit_cleanup(RERR_PROTOCOL); -+ } - struct file_struct *file = dir_flist->files[dir_ndx]; - if (file->flags & FLAG_GOT_DIR_FLIST) { - rprintf(FERROR_XFER, "rsync: refusing malicious duplicate flist for dir %d\n", dir_ndx); --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12088/0001-make-safe-links-stricter.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12088/0001-make-safe-links-stricter.patch deleted file mode 100644 index 2ba588127013..000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12088/0001-make-safe-links-stricter.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 535f8f816539ba681ef0f12015d2cb587ae61b6d Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Sat, 23 Nov 2024 15:15:53 +1100 -Subject: [PATCH] make --safe-links stricter - -when --safe-links is used also reject links where a '../' component is -included in the destination as other than the leading part of the -filename ---- - testsuite/safe-links.test | 55 ++++++++++++++++++++++++++++++++++++ - testsuite/unsafe-byname.test | 2 +- - util1.c | 26 ++++++++++++++++- - 3 files changed, 81 insertions(+), 2 deletions(-) - create mode 100644 testsuite/safe-links.test - -diff --git a/testsuite/safe-links.test b/testsuite/safe-links.test -new file mode 100644 -index 00000000..6e95a4b9 ---- /dev/null -+++ b/testsuite/safe-links.test -@@ -0,0 +1,55 @@ -+#!/bin/sh -+ -+. "$suitedir/rsync.fns" -+ -+test_symlink() { -+ is_a_link "$1" || test_fail "File $1 is not a symlink" -+} -+ -+test_regular() { -+ if [ ! -f "$1" ]; then -+ test_fail "File $1 is not regular file or not exists" -+ fi -+} -+ -+test_notexist() { -+ if [ -e "$1" ]; then -+ test_fail "File $1 exists" -+ fi -+ if [ -h "$1" ]; then -+ test_fail "File $1 exists as a symlink" -+ fi -+} -+ -+cd "$tmpdir" -+ -+mkdir from -+ -+mkdir "from/safe" -+mkdir "from/unsafe" -+ -+mkdir "from/safe/files" -+mkdir "from/safe/links" -+ -+touch "from/safe/files/file1" -+touch "from/safe/files/file2" -+touch "from/unsafe/unsafefile" -+ -+ln -s ../files/file1 "from/safe/links/" -+ln -s ../files/file2 "from/safe/links/" -+ln -s ../../unsafe/unsafefile "from/safe/links/" -+ln -s a/a/a/../../../unsafe2 "from/safe/links/" -+ -+#echo "LISTING FROM" -+#ls -lR from -+ -+echo "rsync with relative path and just -a" -+$RSYNC -avv --safe-links from/safe/ to -+ -+#echo "LISTING TO" -+#ls -lR to -+ -+test_symlink to/links/file1 -+test_symlink to/links/file2 -+test_notexist to/links/unsafefile -+test_notexist to/links/unsafe2 -diff --git a/testsuite/unsafe-byname.test b/testsuite/unsafe-byname.test -index 75e72014..d2e318ef 100644 ---- a/testsuite/unsafe-byname.test -+++ b/testsuite/unsafe-byname.test -@@ -40,7 +40,7 @@ test_unsafe ..//../dest from/dir unsafe - test_unsafe .. from/file safe - test_unsafe ../.. from/file unsafe - test_unsafe ..//.. from//file unsafe --test_unsafe dir/.. from safe -+test_unsafe dir/.. from unsafe - test_unsafe dir/../.. from unsafe - test_unsafe dir/..//.. from unsafe - -diff --git a/util1.c b/util1.c -index da50ff1e..f260d398 100644 ---- a/util1.c -+++ b/util1.c -@@ -1318,7 +1318,14 @@ int handle_partial_dir(const char *fname, int create) - * - * "src" is the top source directory currently applicable at the level - * of the referenced symlink. This is usually the symlink's full path -- * (including its name), as referenced from the root of the transfer. */ -+ * (including its name), as referenced from the root of the transfer. -+ * -+ * NOTE: this also rejects dest names with a .. component in other -+ * than the first component of the name ie. it rejects names such as -+ * a/b/../x/y. This needs to be done as the leading subpaths 'a' or -+ * 'b' could later be replaced with symlinks such as a link to '.' -+ * resulting in the link being transferred now becoming unsafe -+ */ - int unsafe_symlink(const char *dest, const char *src) - { - const char *name, *slash; -@@ -1328,6 +1335,23 @@ int unsafe_symlink(const char *dest, const char *src) - if (!dest || !*dest || *dest == '/') - return 1; - -+ // reject destinations with /../ in the name other than at the start of the name -+ const char *dest2 = dest; -+ while (strncmp(dest2, "../", 3) == 0) { -+ dest2 += 3; -+ while (*dest2 == '/') { -+ // allow for ..//..///../foo -+ dest2++; -+ } -+ } -+ if (strstr(dest2, "/../")) -+ return 1; -+ -+ // reject if the destination ends in /.. -+ const size_t dlen = strlen(dest); -+ if (dlen > 3 && strcmp(&dest[dlen-3], "/..") == 0) -+ return 1; -+ - /* find out what our safety margin is */ - for (name = src; (slash = strchr(name, '/')) != 0; name = slash+1) { - /* ".." segment starts the count over. "." segment is ignored. */ --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12747/0001-fixed-symlink-race-condition-in-sender.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12747/0001-fixed-symlink-race-condition-in-sender.patch deleted file mode 100644 index c5401b5df319..000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12747/0001-fixed-symlink-race-condition-in-sender.patch +++ /dev/null @@ -1,187 +0,0 @@ -From f45f48055e548851bc7230f454dfeba139be6c04 Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Wed, 18 Dec 2024 08:59:42 +1100 -Subject: [PATCH] fixed symlink race condition in sender - -when we open a file that we don't expect to be a symlink use -O_NOFOLLOW to prevent a race condition where an attacker could change -a file between being a normal file and a symlink ---- - checksum.c | 2 +- - flist.c | 2 +- - generator.c | 4 ++-- - receiver.c | 2 +- - sender.c | 2 +- - syscall.c | 20 ++++++++++++++++++++ - t_unsafe.c | 3 +++ - tls.c | 3 +++ - trimslash.c | 2 ++ - util1.c | 2 +- - 10 files changed, 35 insertions(+), 7 deletions(-) - -diff --git a/checksum.c b/checksum.c -index cb21882c..66e80896 100644 ---- a/checksum.c -+++ b/checksum.c -@@ -406,7 +406,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum) - int32 remainder; - int fd; - -- fd = do_open(fname, O_RDONLY, 0); -+ fd = do_open_checklinks(fname); - if (fd == -1) { - memset(sum, 0, file_sum_len); - return; -diff --git a/flist.c b/flist.c -index 087f9da6..17832533 100644 ---- a/flist.c -+++ b/flist.c -@@ -1390,7 +1390,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, - - if (copy_devices && am_sender && IS_DEVICE(st.st_mode)) { - if (st.st_size == 0) { -- int fd = do_open(fname, O_RDONLY, 0); -+ int fd = do_open_checklinks(fname); - if (fd >= 0) { - st.st_size = get_device_size(fd, fname); - close(fd); -diff --git a/generator.c b/generator.c -index 110db28f..3f13bb95 100644 ---- a/generator.c -+++ b/generator.c -@@ -1798,7 +1798,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, - - if (write_devices && IS_DEVICE(sx.st.st_mode) && sx.st.st_size == 0) { - /* This early open into fd skips the regular open below. */ -- if ((fd = do_open(fnamecmp, O_RDONLY, 0)) >= 0) -+ if ((fd = do_open_nofollow(fnamecmp, O_RDONLY)) >= 0) - real_sx.st.st_size = sx.st.st_size = get_device_size(fd, fnamecmp); - } - -@@ -1867,7 +1867,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, - } - - /* open the file */ -- if (fd < 0 && (fd = do_open(fnamecmp, O_RDONLY, 0)) < 0) { -+ if (fd < 0 && (fd = do_open_checklinks(fnamecmp)) < 0) { - rsyserr(FERROR, errno, "failed to open %s, continuing", - full_fname(fnamecmp)); - pretend_missing: -diff --git a/receiver.c b/receiver.c -index 8031b8f4..edfbb210 100644 ---- a/receiver.c -+++ b/receiver.c -@@ -775,7 +775,7 @@ int recv_files(int f_in, int f_out, char *local_name) - if (fnamecmp != fname) { - fnamecmp = fname; - fnamecmp_type = FNAMECMP_FNAME; -- fd1 = do_open(fnamecmp, O_RDONLY, 0); -+ fd1 = do_open_nofollow(fnamecmp, O_RDONLY); - } - - if (fd1 == -1 && basis_dir[0]) { -diff --git a/sender.c b/sender.c -index 2bbff2fa..a4d46c39 100644 ---- a/sender.c -+++ b/sender.c -@@ -350,7 +350,7 @@ void send_files(int f_in, int f_out) - exit_cleanup(RERR_PROTOCOL); - } - -- fd = do_open(fname, O_RDONLY, 0); -+ fd = do_open_checklinks(fname); - if (fd == -1) { - if (errno == ENOENT) { - enum logcode c = am_daemon && protocol_version < 28 ? FERROR : FWARNING; -diff --git a/syscall.c b/syscall.c -index 081357bb..8cea2900 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -45,6 +45,8 @@ extern int preallocate_files; - extern int preserve_perms; - extern int preserve_executability; - extern int open_noatime; -+extern int copy_links; -+extern int copy_unsafe_links; - - #ifndef S_BLKSIZE - # if defined hpux || defined __hpux__ || defined __hpux -@@ -788,3 +790,21 @@ cleanup: - return retfd; - #endif // O_NOFOLLOW, O_DIRECTORY - } -+ -+/* -+ varient of do_open/do_open_nofollow which does do_open() if the -+ copy_links or copy_unsafe_links options are set and does -+ do_open_nofollow() otherwise -+ -+ This is used to prevent a race condition where an attacker could be -+ switching a file between being a symlink and being a normal file -+ -+ The open is always done with O_RDONLY flags -+ */ -+int do_open_checklinks(const char *pathname) -+{ -+ if (copy_links || copy_unsafe_links) { -+ return do_open(pathname, O_RDONLY, 0); -+ } -+ return do_open_nofollow(pathname, O_RDONLY); -+} -diff --git a/t_unsafe.c b/t_unsafe.c -index 010cac50..e10619a2 100644 ---- a/t_unsafe.c -+++ b/t_unsafe.c -@@ -28,6 +28,9 @@ int am_root = 0; - int am_sender = 1; - int read_only = 0; - int list_only = 0; -+int copy_links = 0; -+int copy_unsafe_links = 0; -+ - short info_levels[COUNT_INFO], debug_levels[COUNT_DEBUG]; - - int -diff --git a/tls.c b/tls.c -index e6b0708a..858f8f10 100644 ---- a/tls.c -+++ b/tls.c -@@ -49,6 +49,9 @@ int list_only = 0; - int link_times = 0; - int link_owner = 0; - int nsec_times = 0; -+int safe_symlinks = 0; -+int copy_links = 0; -+int copy_unsafe_links = 0; - - #ifdef SUPPORT_XATTRS - -diff --git a/trimslash.c b/trimslash.c -index 1ec928ca..f2774cd7 100644 ---- a/trimslash.c -+++ b/trimslash.c -@@ -26,6 +26,8 @@ int am_root = 0; - int am_sender = 1; - int read_only = 1; - int list_only = 0; -+int copy_links = 0; -+int copy_unsafe_links = 0; - - int - main(int argc, char **argv) -diff --git a/util1.c b/util1.c -index f260d398..d84bc414 100644 ---- a/util1.c -+++ b/util1.c -@@ -365,7 +365,7 @@ int copy_file(const char *source, const char *dest, int tmpfilefd, mode_t mode) - int len; /* Number of bytes read into `buf'. */ - OFF_T prealloc_len = 0, offset = 0; - -- if ((ifd = do_open(source, O_RDONLY, 0)) < 0) { -+ if ((ifd = do_open_nofollow(source, O_RDONLY)) < 0) { - int save_errno = errno; - rsyserr(FERROR_XFER, errno, "open %s", full_fname(source)); - errno = save_errno; --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch b/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch deleted file mode 100644 index 3305653d025f..000000000000 --- a/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup rsync-3.2.7/configure.sh rsync-3.2.7-fixed/configure.sh ---- rsync-3.2.7/configure.sh 2022-10-20 17:57:22 -+++ rsync-3.2.7-fixed/configure.sh 2024-01-01 19:51:58 -@@ -7706,7 +7706,7 @@ else $as_nop - #include - #include - #include --main() -+int main() - { - if (socket(AF_INET6, SOCK_STREAM, 0) < 0) - exit(1); diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 0badc906dfe8..f538d4d3125a 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { pname = "rsync"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { - # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 + # signed with key 9FEF 112D CE19 A0DC 7E88 2CB8 1BB2 4997 A853 5F6F url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; - hash = "sha256-c5nppnCMMtZ4pypjIZ6W8jvgviM25Q/RNISY0HBB35A="; + hash = "sha256-KSS8s6Hti1UfwQH3QLnw/gogKxFQJ2R89phQ1l/YjFI="; }; nativeBuildInputs = [ @@ -35,23 +35,6 @@ stdenv.mkDerivation rec { perl ]; - patches = [ - # https://github.com/WayneD/rsync/pull/558 - ./configure.ac-fix-failing-IPv6-check.patch - ./CVE-2024-12084/0001-Some-checksum-buffer-fixes.patch - ./CVE-2024-12084/0002-Another-cast-when-multiplying-integers.patch - ./CVE-2024-12085/0001-prevent-information-leak-off-the-stack.patch - ./CVE-2024-12086/0001-refuse-fuzzy-options-when-fuzzy-not-selected.patch - ./CVE-2024-12086/0002-added-secure_relative_open.patch - ./CVE-2024-12086/0003-receiver-use-secure_relative_open-for-basis-file.patch - ./CVE-2024-12086/0004-disallow-.-elements-in-relpath-for-secure_relative_o.patch - ./CVE-2024-12087/0001-Refuse-a-duplicate-dirlist.patch - ./CVE-2024-12087/0002-range-check-dir_ndx-before-use.patch - ./CVE-2024-12088/0001-make-safe-links-stricter.patch - ./CVE-2024-12747/0001-fixed-symlink-race-condition-in-sender.patch - ./raise-protocol-version-to-32.patch - ]; - buildInputs = [ libiconv diff --git a/pkgs/applications/networking/sync/rsync/raise-protocol-version-to-32.patch b/pkgs/applications/networking/sync/rsync/raise-protocol-version-to-32.patch deleted file mode 100644 index 94054fdc8c35..000000000000 --- a/pkgs/applications/networking/sync/rsync/raise-protocol-version-to-32.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 163e05b1680c4a3b448fa68d03c3fca9589f3bc4 Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Tue, 10 Dec 2024 13:34:01 +1100 -Subject: [PATCH 1/3] raise protocol version to 32 - -make it easier to spot unpatched servers ---- - rsync.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rsync.h b/rsync.h -index b9a7101a..9be1297b 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -111,7 +111,7 @@ - - /* Update this if you make incompatible changes and ALSO update the - * SUBPROTOCOL_VERSION if it is not a final (official) release. */ --#define PROTOCOL_VERSION 31 -+#define PROTOCOL_VERSION 32 - - /* This is used when working on a new protocol version or for any unofficial - * protocol tweaks. It should be a non-zero value for each pre-release repo --- -2.34.1 - From 910c397cad1a2e24c8af4eb0aea78b189cd0b7ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 04:10:28 +0000 Subject: [PATCH 155/280] libuv: 1.49.2 -> 1.50.0 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index a639f037641e..7cbd7c7d7cbd 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -24,14 +24,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.49.2"; + version = "1.50.0"; pname = "libuv"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${finalAttrs.version}"; - hash = "sha256-hNXW3cQVW8VGMQrHFkezRI2OqYF7Qf1riD8sHy66qxg="; + hash = "sha256-1Z/zf4qZYDM5upHdRtc1HGpHaGTRHm147azJZ0pT5pU="; }; outputs = [ From 7f3e38ca45fd28c829c9c85bcfbd0a63eb3d9b14 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 16 Jan 2025 03:19:24 +0100 Subject: [PATCH 156/280] rust-cbindgen: 0.27.0 -> 0.28.0 https://github.com/mozilla/cbindgen/blob/v0.28.0/CHANGES --- ...t-failures-due-to-CARGO_BUILD_TARGET.patch | 56 ------------------- .../tools/rust/cbindgen/default.nix | 12 +--- 2 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch diff --git a/pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch b/pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch deleted file mode 100644 index 85baa4fd03e0..000000000000 --- a/pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/tests/profile.rs b/tests/profile.rs -index 69433a2..596829d 100644 ---- a/tests/profile.rs -+++ b/tests/profile.rs -@@ -1,6 +1,7 @@ - use cbindgen::*; - - use serial_test::serial; -+use std::env; - use std::path::{Path, PathBuf}; - use std::process::Command; - -@@ -17,7 +18,12 @@ fn build_using_lib(config: fn(Builder) -> Builder) -> tempfile::TempDir { - .tempdir() - .expect("Creating tmp dir failed"); - -- std::env::set_var("CARGO_EXPAND_TARGET_DIR", tmp_dir.path()); -+ unsafe { -+ env::set_var("CARGO_EXPAND_TARGET_DIR", tmp_dir.path()); -+ env::remove_var("CARGO_BUILD_TARGET"); -+ // ^ avoid unexpected change of layout of the target directory; -+ // ... see: https://doc.rust-lang.org/cargo/guide/build-cache.html -+ } - let builder = Builder::new() - .with_config(Config::from_file(expand_dep_test_dir.join("cbindgen.toml")).unwrap()) - .with_crate(expand_dep_test_dir); -@@ -45,6 +51,9 @@ fn build_using_bin(extra_args: &[&str]) -> tempfile::TempDir { - Command::new(cbindgen_path) - .current_dir(expand_dep_test_dir) - .env("CARGO_EXPAND_TARGET_DIR", tmp_dir.path()) -+ .env_remove("CARGO_BUILD_TARGET") -+ // ^ avoid unexpected change of layout of the target directory; -+ // ... see: https://doc.rust-lang.org/cargo/guide/build-cache.html - .args(extra_args) - .output() - .expect("build should succeed"); -@@ -87,6 +96,19 @@ fn bin_default_uses_debug_build() { - assert_eq!(get_contents_of_dir(target_dir.path()), &["debug"]); - } - -+#[test] -+fn bin_ignore_cargo_build_target_in_tests() { -+ unsafe { -+ env::set_var("CARGO_BUILD_TARGET", "x86_64-unknown-linux-gnu"); -+ } -+ assert_eq!( -+ env::var("CARGO_BUILD_TARGET"), -+ Ok("x86_64-unknown-linux-gnu".into()) -+ ); -+ // ^ this env var should be ignored: -+ bin_default_uses_debug_build(); -+} -+ - #[test] - fn bin_explicit_debug_build() { - let target_dir = build_using_bin(&["--profile", "debug"]); diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index fa3b9fb98b78..6dc834822d4a 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -14,22 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "cbindgen"; rev = "v${version}"; - hash = "sha256-XTGHHD5Qw3mr+lkPKOXyqb0K3sEENW8Sf0n9mtrFFXI="; + hash = "sha256-1GT+EgltLhveEACxhY+748L1HIIyQHbEs7wLKANFWr0="; }; - patches = [ - # open PR: https://github.com/mozilla/cbindgen/pull/1010 - # see also: https://github.com/NixOS/nixpkgs/pull/298108 - ./1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch - ]; - - cargoHash = "sha256-l4FgwXdibek4BAnqjWd1rLxpEwuMNjYgvo6X3SS3fRo="; + cargoHash = "sha256-VaM2+az881qePMqkQRxVxoXCgrgPC8LqSQNDst1bnkY="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; From 5193dc335eafb561d719d3e91d94a8d5b3df629a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 16 Jan 2025 06:28:30 +0000 Subject: [PATCH 157/280] libsoup_3: 3.6.1 -> 3.6.3 Changes: https://gitlab.gnome.org/GNOME/libsoup/-/blob/3.6.3/NEWS?ref_type=tags --- pkgs/development/libraries/libsoup/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index e180e59648e0..f343b42245f7 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.6.1"; + version = "3.6.3"; outputs = [ "out" @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zrHxqivdc7LNgVnTmYyWxV7wl+8V5LTzYCkgn6GK+Dg="; + hash = "sha256-oNhKsHvRaLMX0xmw3EDIswG0VD+6LsQvpzORSyCBr70="; }; depsBuildBuild = [ From 878140ef759691234403d6fd7cbe2b55c657366b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 24 Nov 2024 18:17:48 +0100 Subject: [PATCH 158/280] psqlodbc: adopt with NixOS/postgres team Since psqlodbc is an official upstream project, we should take ownership of it. --- ci/OWNERS | 1 + pkgs/by-name/ps/psqlodbc/package.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/OWNERS b/ci/OWNERS index dd952ddeebb4..657afa5effc2 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -246,6 +246,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel # PostgreSQL and related stuff +/pkgs/by-name/ps/psqlodbc @NixOS/postgres /pkgs/servers/sql/postgresql @NixOS/postgres /pkgs/development/tools/rust/cargo-pgrx @NixOS/postgres /nixos/modules/services/databases/postgresql.md @NixOS/postgres diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix index 3b3de027f1f9..1f9e3ab13666 100644 --- a/pkgs/by-name/ps/psqlodbc/package.nix +++ b/pkgs/by-name/ps/psqlodbc/package.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; platforms = platforms.unix; - maintainers = [ ]; + maintainers = postgresql.meta.maintainers; }; } From e9da71e086951afc23af61cf86fd642d07ddf5ed Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 24 Nov 2024 18:14:44 +0100 Subject: [PATCH 159/280] psqlodbc: 16.00.0000 -> 17.00.0002 The latest version is not available from odbc/versions.old/.., thus move to fetchFromGitHub. No changelog found anywhere. --- pkgs/by-name/ps/psqlodbc/package.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix index 1f9e3ab13666..7562771762f6 100644 --- a/pkgs/by-name/ps/psqlodbc/package.nix +++ b/pkgs/by-name/ps/psqlodbc/package.nix @@ -1,7 +1,8 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, postgresql, openssl, withLibiodbc ? false, @@ -14,11 +15,13 @@ assert lib.xor withLibiodbc withUnixODBC; stdenv.mkDerivation rec { pname = "psqlodbc"; - version = "16.00.0000"; + version = "${builtins.replaceStrings [ "_" ] [ "." ] (lib.strings.removePrefix "REL-" src.tag)}"; - src = fetchurl { - url = "mirror://postgresql/odbc/versions.old/src/${pname}-${version}.tar.gz"; - hash = "sha256-r9iS+J0uzujT87IxTxvVvy0CIBhyxuNDHlwxCW7KTIs="; + src = fetchFromGitHub { + owner = "postgresql-interfaces"; + repo = "psqlodbc"; + tag = "REL-17_00_0002"; + hash = "sha256-zCjoX+Ew8sS5TWkFSgoqUN5ukEF38kq+MdfgCQQGv9w="; }; buildInputs = @@ -29,6 +32,10 @@ stdenv.mkDerivation rec { ++ lib.optional withLibiodbc libiodbc ++ lib.optional withUnixODBC unixODBC; + nativeBuildInputs = [ + autoreconfHook + ]; + passthru = lib.optionalAttrs withUnixODBC { fancyName = "PostgreSQL"; driver = "lib/psqlodbcw.so"; From bead84713d35f416f2789fedf8c2f4572ca5c54c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 24 Nov 2024 18:20:29 +0100 Subject: [PATCH 160/280] psqlodbc: add updateScript --- pkgs/by-name/ps/psqlodbc/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix index 7562771762f6..f83d41900fb3 100644 --- a/pkgs/by-name/ps/psqlodbc/package.nix +++ b/pkgs/by-name/ps/psqlodbc/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, autoreconfHook, postgresql, openssl, @@ -36,10 +37,14 @@ stdenv.mkDerivation rec { autoreconfHook ]; - passthru = lib.optionalAttrs withUnixODBC { - fancyName = "PostgreSQL"; - driver = "lib/psqlodbcw.so"; - }; + passthru = + { + updateScript = nix-update-script { }; + } + // lib.optionalAttrs withUnixODBC { + fancyName = "PostgreSQL"; + driver = "lib/psqlodbcw.so"; + }; configureFlags = [ "--with-libpq=${lib.getDev postgresql}/bin/pg_config" From e1a79456eb22fcbe9c4a097366ea6ff2b3429977 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 24 Nov 2024 22:56:34 +0100 Subject: [PATCH 161/280] hydra: postgresql is a check dependency only --- pkgs/by-name/hy/hydra/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index f59f77aff2d4..e6b509b67636 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -152,7 +152,6 @@ stdenv.mkDerivation (finalAttrs: { perl pixz boost - postgresql nlohmann_json prometheus-cpp ]; @@ -195,6 +194,7 @@ stdenv.mkDerivation (finalAttrs: { python3 libressl.nc openldap + postgresql ]; env = { From 48e18343ce808566a9f434c3613e5fc76b223a8f Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 17 Jan 2025 10:30:35 +0100 Subject: [PATCH 162/280] go_1_23: 1.23.4 -> 1.23.5 Signed-off-by: Paul Meyer --- pkgs/development/compilers/go/1.23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index ed0263ade430..76a3e8548681 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -49,11 +49,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.4"; + version = "1.23.5"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-rTRaxCHpCBQpOpaZzKGd1SOCUcP2h5gLvK4oSVsmNTE="; + hash = "sha256-pvP0u9PmvdYm95tmjyEvu1ZJ2vdQhPt5tnigrk2XQjs="; }; strictDeps = true; From 892f0edfb10f1b74bc2bf6fa2b49eef170819b0f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 18 Jan 2025 06:11:58 +0000 Subject: [PATCH 163/280] tzdata: 2024b -> 2025a Changes: https://github.com/eggert/tz/blob/2025a/NEWS --- pkgs/by-name/tz/tzdata/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tz/tzdata/package.nix b/pkgs/by-name/tz/tzdata/package.nix index 2ee4f60dc940..497b7e99364e 100644 --- a/pkgs/by-name/tz/tzdata/package.nix +++ b/pkgs/by-name/tz/tzdata/package.nix @@ -7,16 +7,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "tzdata"; - version = "2024b"; + version = "2025a"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${finalAttrs.version}.tar.gz"; - hash = "sha256-cOdU2xJqjQ2z0W1rTLX37B4E1fJhJV5FWKZ/6S055VA="; + hash = "sha256-TV/Lxyx8RQ6/4LZZvQ8cAvv1L9f1F6nqE/5xwh618NA="; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${finalAttrs.version}.tar.gz"; - hash = "sha256-XkOPxEliSQavFqGP9Fc3OfDNqYYuXsKNO8sZy67Q9nI="; + hash = "sha256-EZZ51Z92SB614D09KkfXhw1ZLzmZVJrxidvTHy6/UGE="; }) ]; From 0c912107eee197ef22af405944df9146db008007 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:20:50 +0900 Subject: [PATCH 164/280] python312Packages.bash-kernel: 0.9.3 -> 0.10.0 Changelog: https://github.com/takluyver/bash_kernel/releases/tag/0.10.0 --- .../python-modules/bash-kernel/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/bash-kernel/default.nix b/pkgs/development/python-modules/bash-kernel/default.nix index 0df270f8a2b7..ff088a618e1d 100644 --- a/pkgs/development/python-modules/bash-kernel/default.nix +++ b/pkgs/development/python-modules/bash-kernel/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, flit-core, + filetype, ipykernel, python, pexpect, @@ -12,13 +13,13 @@ buildPythonPackage rec { pname = "bash-kernel"; - version = "0.9.3"; + version = "0.10.0"; pyproject = true; src = fetchPypi { pname = "bash_kernel"; inherit version; - hash = "sha256-n3oDgRyn2csfv/gIIjfPBFC5cYIlL9C4BYeha2XmbVg="; + hash = "sha256-LtWgpBbEGNHXUecVBb1siJ4SFXREtQxCh6aF2ndcKMo="; }; patches = [ @@ -28,9 +29,10 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ + filetype ipykernel pexpect ]; @@ -58,11 +60,11 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Bash Kernel for Jupyter"; homepage = "https://github.com/takluyver/bash_kernel"; changelog = "https://github.com/takluyver/bash_kernel/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ zimbatm ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ zimbatm ]; }; } From 2d989c047998a0ecf2f8d9c75ba67a17c258aab7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:21:41 +0900 Subject: [PATCH 165/280] python312Packages.jupysql: 0.10.16 -> 0.10.17 Diff: https://github.com/ploomber/jupysql/compare/refs/tags/0.10.16...0.10.17 Changelog: https://github.com/ploomber/jupysql/blob/0.10.17/CHANGELOG.md --- pkgs/development/python-modules/jupysql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix index 6c2110d5df38..4e4ca10db874 100644 --- a/pkgs/development/python-modules/jupysql/default.nix +++ b/pkgs/development/python-modules/jupysql/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "jupysql"; - version = "0.10.16"; + version = "0.10.17"; pyproject = true; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "ploomber"; repo = "jupysql"; tag = version; - hash = "sha256-TIISiGvspRG0d/4nEyi8Tiu0y80D1Rf8puDEkGIeA08="; + hash = "sha256-0lrcNKDKmM3Peodc9ZzgqkzwPHPLMxxXHAj4OOKWZxA="; }; pythonRelaxDeps = [ "sqlalchemy" ]; From 8b7dd9cdd94fc4531f3a110596a9cb34fdacee26 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Tue, 17 Sep 2024 13:39:44 +0200 Subject: [PATCH 166/280] python312Packages.ckzg: init at 2.0.1 --- .../python-modules/ckzg/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/ckzg/default.nix diff --git a/pkgs/development/python-modules/ckzg/default.nix b/pkgs/development/python-modules/ckzg/default.nix new file mode 100644 index 000000000000..135c354d1224 --- /dev/null +++ b/pkgs/development/python-modules/ckzg/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + clang, + # dependencies + pyyaml, + blst, + # checkPhase dependencies + python, +}: + +buildPythonPackage rec { + pname = "ckzg"; + version = "2.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "c-kzg-4844"; + tag = "v${version}"; + hash = "sha256-kOoodri80p5tz8RlMz6mqsZRAuXBxZm4vr+VWJEtfA0="; + }; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ clang ]; + + dependencies = [ + pyyaml + blst + ]; + + postPatch = + # unvendor "blst" + '' + substituteInPlace setup.py \ + --replace-fail '"build_ext": CustomBuild,' "" + ''; + + checkPhase = '' + runHook preCheck + + cd bindings/python + ${python.interpreter} tests.py + + runHook postCheck + ''; + + pythonImportsCheck = [ "ckzg" ]; + + meta = { + description = "Minimal implementation of the Polynomial Commitments API for EIP-4844 and EIP-7594"; + homepage = "https://github.com/ethereum/c-kzg-4844"; + changelog = "https://github.com/ethereum/c-kzg-4844/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hellwolf ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c0b4b6e5bfd4..77018732cb41 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2332,6 +2332,8 @@ self: super: with self; { ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + ckzg = callPackage ../development/python-modules/ckzg { }; + clarabel = callPackage ../development/python-modules/clarabel { }; clarifai = callPackage ../development/python-modules/clarifai { }; From fd02b0a1536370b875823bb58c5e17a6f6c75c8f Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Tue, 17 Sep 2024 14:23:59 +0200 Subject: [PATCH 167/280] python312Packages.eth-abi: 4.1.0 -> 5.1.0 --- .../python-modules/eth-abi/default.nix | 40 ++++++++----------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix index 2b5d28056208..0aa81ae68668 100644 --- a/pkgs/development/python-modules/eth-abi/default.nix +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -2,62 +2,56 @@ lib, buildPythonPackage, fetchFromGitHub, - eth-hash, + setuptools, + # dependencies eth-typing, eth-utils, - hypothesis, parsimonious, + # nativeCheckInputs + hypothesis, pytestCheckHook, - pythonOlder, + pytest-xdist, + eth-hash, }: buildPythonPackage rec { pname = "eth-abi"; - version = "4.1.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "5.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-abi"; - rev = "v${version}"; - hash = "sha256-CGAfu3Ovz2WPJOD+4W2+cOAz+wYvuIyFL333Jw66ozA="; + tag = "v${version}"; + hash = "sha256-D3aGMx2oZFttwQ90ouwQbbRelCb2bvyQgvamKweX9Nw="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "parsimonious>=0.9.0,<0.10.0" "parsimonious" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ eth-typing eth-utils parsimonious ]; - # lots of: TypeError: isinstance() arg 2 must be a type or tuple of types - doCheck = false; - nativeCheckInputs = [ hypothesis pytestCheckHook + pytest-xdist ] ++ eth-hash.optional-dependencies.pycryptodome; disabledTests = [ # boolean list representation changed "test_get_abi_strategy_returns_certain_strategies_for_known_type_strings" - # hypothesis.errors.Flaky - "test_base_equals_has_expected_behavior_for_parsable_types" - "test_has_arrlist_has_expected_behavior_for_parsable_types" - "test_is_base_tuple_has_expected_behavior_for_parsable_types" ]; pythonImportsCheck = [ "eth_abi" ]; - meta = with lib; { + meta = { description = "Ethereum ABI utilities"; homepage = "https://github.com/ethereum/eth-abi"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/ethereum/eth-abi/blob/v${version}/docs/release_notes.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; }; } From 63c77937bbb9ee419094d14cdf7683578ee02d1b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 18 Jan 2025 12:39:44 +0100 Subject: [PATCH 168/280] redis: 7.2.6 -> 7.2.7 Fixes CVE-2024-46981 and CVE-2024-51741. https://github.com/redis/redis/releases/tag/7.2.7 --- pkgs/by-name/re/redis/package.nix | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index 5e008b7d4d90..8e6b697aaa39 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, lua, jemalloc, pkg-config, @@ -25,29 +24,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "redis"; - version = "7.2.6"; + version = "7.2.7"; src = fetchurl { url = "https://download.redis.io/releases/redis-${finalAttrs.version}.tar.gz"; - hash = "sha256-+xDWei/itFVvbLhABk3W5uMXXOjKA18HJpkOwtqfPQ4="; + hash = "sha256-csCB47jPrnFEJz0m12c28IMZAAr0bAFRXK1dKXZc6tU="; }; - patches = - [ - # fixes: make test [exception]: Executing test client: permission denied - # https://github.com/redis/redis/issues/12792 - (fetchpatch { - url = "https://github.com/redis/redis/pull/12887.diff"; - hash = "sha256-VZEMShW7Ckn5hLJHffQvE94Uly41WZW1bwvxny+Y3W8="; - }) - ] - ++ lib.optionals useSystemJemalloc [ - # use system jemalloc - (fetchurl { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch"; - hash = "sha256-VPRfoSnctkkkzLrXEWQX3Lh5HmZaCXoJafyOG007KzM="; - }) - ]; + patches = lib.optionals useSystemJemalloc [ + # use system jemalloc + (fetchurl { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch"; + hash = "sha256-VPRfoSnctkkkzLrXEWQX3Lh5HmZaCXoJafyOG007KzM="; + }) + ]; nativeBuildInputs = [ pkg-config ]; From 65f44ca919186dcaa1c1d18157a890714a97732b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:22:04 +0900 Subject: [PATCH 169/280] python312Packages.jupyter-events: 0.10.0 -> 0.11.0 Diff: https://github.com/jupyter/jupyter_events/compare/refs/tags/v0.10.0...v0.11.0 Changelog: https://github.com/jupyter/jupyter_events/releases/tag/v0.11.0 --- .../python-modules/jupyter-events/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index 93b6129e384b..0f7caeb8b45d 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pythonOlder, # build @@ -12,6 +13,8 @@ python-json-logger, pyyaml, referencing, + rfc3339-validator, + rfc3986-validator, traitlets, # optionals @@ -26,25 +29,34 @@ buildPythonPackage rec { pname = "jupyter-events"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_events"; tag = "v${version}"; - hash = "sha256-8aps8aNgXw+XbDgtCvWw+Ij1Cm1N0G+wcL35ySkofOk="; + hash = "sha256-e+BxJc/i5lpljvv6Uwqwrog+nLJ4NOBSqd47Q7DELOE="; }; - nativeBuildInputs = [ hatchling ]; + patches = [ + # https://github.com/jupyter/jupyter_events/pull/110 + (fetchpatch2 { + name = "python-json-logger-compatibility.patch"; + url = "https://github.com/jupyter/jupyter_events/commit/6704ea630522f44542d83608f750da0068e41443.patch"; + hash = "sha256-PfmOlbXRFdQxhM3SngjjUNsiueuUfCO7xlyLDGSnzj4="; + }) + ]; - propagatedBuildInputs = [ + build-system = [ hatchling ]; + + dependencies = [ jsonschema python-json-logger pyyaml referencing + rfc3339-validator + rfc3986-validator traitlets ] ++ jsonschema.optional-dependencies.format-nongpl; @@ -67,12 +79,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyter_events" ]; - meta = with lib; { + meta = { changelog = "https://github.com/jupyter/jupyter_events/releases/tag/v${version}"; description = "Configurable event system for Jupyter applications and extensions"; mainProgram = "jupyter-events"; homepage = "https://github.com/jupyter/jupyter_events"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } From be1859bf9613c124d50a7c5ee2be8bc38af56a7d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:22:17 +0900 Subject: [PATCH 170/280] python312Packages.jupyter-server: 2.14.2 -> 2.15.0 Changelog: https://github.com/jupyter-server/jupyter_server/blob/v2.15.0/CHANGELOG.md --- .../python-modules/jupyter-server/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 071b3707225b..2809ca2e619e 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -35,22 +35,22 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.14.2"; + version = "2.15.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-ZglQIaqWOM7SdsJIsdgYYuTFDyktV1kgu+lg3hxWsSs="; + hash = "sha256-nURrhpe09zN6G3zcrEB3i6vdk7phS21oqxwMkY8cQIQ="; }; - nativeBuildInputs = [ + build-system = [ hatch-jupyter-builder hatchling ]; - propagatedBuildInputs = [ + dependencies = [ argon2-cffi jinja2 tornado @@ -74,6 +74,8 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/issues/299427 stripExclude = lib.optionals stdenv.hostPlatform.isDarwin [ "favicon.ico" ]; + pythonImportsCheck = [ "jupyter_server" ]; + nativeCheckInputs = [ ipykernel pytestCheckHook @@ -123,12 +125,12 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { changelog = "https://github.com/jupyter-server/jupyter_server/blob/v${version}/CHANGELOG.md"; description = "Backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications"; mainProgram = "jupyter-server"; homepage = "https://github.com/jupyter-server/jupyter_server"; - license = licenses.bsdOriginal; + license = lib.licenses.bsdOriginal; maintainers = lib.teams.jupyter.members; }; } From 6d34e47c40e8032942ff9baf5b0723e8330595e6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:22:35 +0900 Subject: [PATCH 171/280] python312Packages.jupyterhub-ldapauthenticator: 2.0.1 -> 2.0.2 Diff: https://github.com/jupyterhub/ldapauthenticator/compare/refs/tags/2.0.1...2.0.2 Changelog: https://github.com/jupyterhub/ldapauthenticator/blob/2.0.2/CHANGELOG.md --- .../python-modules/jupyterhub-ldapauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 0121e2e6c2d3..114177120de6 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "jupyterhub-ldapauthenticator"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "jupyterhub"; repo = "ldapauthenticator"; tag = version; - hash = "sha256-pb1d0dqu3VGCsuibpYgncbqCM9fz09yyoKGcKb14f4k="; + hash = "sha256-xixgry/++E6RimB8wo1NF8SsfzxKL1ZlNQVrlBhQ674="; }; build-system = [ setuptools ]; From 1cf71b0533be4cf57321fba81d333c38f5d47bdc Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:22:47 +0900 Subject: [PATCH 172/280] python312Packages.jupyterlab: 4.2.5 -> 4.3.4 Changelog: https://github.com/jupyterlab/jupyterlab/blob/v4.3.4/CHANGELOG.md --- .../python-modules/jupyterlab/default.nix | 46 +++++++++++-------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 8105bf1ebc6f..119d1decc47b 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -6,29 +6,32 @@ hatchling, async-lru, httpx, - packaging, - tornado, + importlib-metadata, ipykernel, + jinja2, jupyter-core, jupyter-lsp, - jupyterlab-server, jupyter-server, + jupyterlab-server, notebook-shim, - jinja2, + packaging, + setuptools, tomli, + tornado, + traitlets, pythonOlder, }: buildPythonPackage rec { pname = "jupyterlab"; - version = "4.2.5"; + version = "4.3.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-rn86G4y4i09VAJznn6fAb5nXDNY2Ae5KqRgV0FT0b3U="; + hash = "sha256-8LubCaBHZuNCPMzC/CMWmqL/7c34cT6eD7M8rAtoWdA="; }; build-system = [ @@ -36,19 +39,24 @@ buildPythonPackage rec { hatchling ]; - dependencies = [ - async-lru - httpx - packaging - tornado - ipykernel - jupyter-core - jupyter-lsp - jupyterlab-server - jupyter-server - notebook-shim - jinja2 - ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = + [ + async-lru + httpx + ipykernel + jinja2 + jupyter-core + jupyter-lsp + jupyter-server + jupyterlab-server + notebook-shim + packaging + setuptools + tornado + traitlets + ] + ++ lib.optionals (pythonOlder "3.11") [ tomli ] + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; makeWrapperArgs = [ "--set" From 8cb5fba3d3e3ca26f21de6b34503d3406e503381 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:23:05 +0900 Subject: [PATCH 173/280] python312Packages.livelossplot: 0.5.5 -> 0.5.6 Diff: https://github.com/stared/livelossplot/compare/v0.5.5...v0.5.6 --- pkgs/development/python-modules/livelossplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix index 5c213fae0db5..a329967b2a51 100644 --- a/pkgs/development/python-modules/livelossplot/default.nix +++ b/pkgs/development/python-modules/livelossplot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "livelossplot"; - version = "0.5.5"; + version = "0.5.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "stared"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YU8vX4SubI6txmC/i5fOjcvWfuDFm8+SPmie8Eb1qRs="; + sha256 = "sha256-qC1FBFJyf2IlDIffJ5Xs89WcN/GFA/8maODhc1u2xhA="; }; propagatedBuildInputs = [ From 160d2cb80ab21f82bff97fa3f6d6d7bcfc74c8e5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:23:13 +0900 Subject: [PATCH 174/280] python312Packages.marimo: 0.10.9 -> 0.10.14 Changelog: https://github.com/marimo-team/marimo/releases/tag/0.10.14 --- .../python-modules/marimo/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index a2d391e263e7..75dddd820fd5 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + pythonOlder, # build-system hatchling, @@ -15,14 +16,16 @@ narwhals, packaging, psutil, + pycrdt, pygments, pymdown-extensions, + pyyaml, ruff, starlette, tomlkit, + typing-extensions, uvicorn, websockets, - pyyaml, # tests versionCheckHook, @@ -30,18 +33,21 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.10.9"; + version = "0.10.14"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-WoMfybvKlD8Gy2sc3/EhQZVN9WPh8eEVPlG5ksyjjGc="; + hash = "sha256-Af8KNgKBhgm2AwCrCrSRYWutarm4Z+ftdt0mFgApcsk="; }; build-system = [ hatchling ]; - pythonRelaxDeps = [ "websockets" ]; + pythonRelaxDeps = [ + "pycrdt" + "websockets" + ]; dependencies = [ click @@ -52,15 +58,16 @@ buildPythonPackage rec { narwhals packaging psutil + pycrdt pygments pymdown-extensions + pyyaml ruff starlette tomlkit uvicorn websockets - pyyaml - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; pythonImportsCheck = [ "marimo" ]; From 251026db0fa025aa15ca83638ee1370347d290ab Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:23:35 +0900 Subject: [PATCH 175/280] python312Packages.nbclassic: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/nbclassic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 6ac18bef5937..dd7576aebbea 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "nbclassic"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d7d7qF+emI+brYXfNFtRTp5kx/DoIpkqsd9KeKxk/B4="; + hash = "sha256-c27FBIOlRIWXHbITvpIH405R/BRMeDQ2JbaZF0I2RLo="; }; build-system = [ From 52ce6c2877317a88d4827c0c9b9b511d467b1f9b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:23:47 +0900 Subject: [PATCH 176/280] python312Packages.nbclient: 0.10.0 -> 0.10.2 Diff: https://github.com/jupyter/nbclient/compare/refs/tags/v0.10.0...v0.10.2 --- .../python-modules/nbclient/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 809b5af89c17..a6be3e24a047 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,15 +1,14 @@ { - async-generator, buildPythonPackage, fetchFromGitHub, hatchling, ipykernel, ipywidgets, jupyter-client, + jupyter-core, lib, nbconvert, nbformat, - nest-asyncio, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -21,26 +20,25 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.10.0"; - format = "pyproject"; + version = "0.10.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jupyter"; repo = pname; tag = "v${version}"; - hash = "sha256-8OLkpwX4Gpam9VSFUtNS41Ypxe4+2yN3ng6iVY9DSqY="; + hash = "sha256-+qSed6yy4YVZ25GigNTap+kMaoDiMYSJO85wurbzeDs="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - async-generator - traitlets - nbformat - nest-asyncio + dependencies = [ jupyter-client + jupyter-core + nbformat + traitlets ]; # circular dependencies if enabled by default @@ -66,11 +64,11 @@ let }); }; - meta = with lib; { + meta = { homepage = "https://github.com/jupyter/nbclient"; description = "Client library for executing notebooks"; mainProgram = "jupyter-execute"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; }; From fe79c96ab486cb238eda4e928fcf04c84b91ef7a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:23:56 +0900 Subject: [PATCH 177/280] python312Packages.nbconvert: 7.16.4 -> 7.16.5 Changelog: https://github.com/jupyter/nbconvert/blob/v7.16.5/CHANGELOG.md --- .../python-modules/nbconvert/default.nix | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index d13414c12567..8b012a4100e1 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -17,7 +17,6 @@ packaging, pandocfilters, pygments, - tinycss2, traitlets, importlib-metadata, flaky, @@ -35,14 +34,14 @@ let in buildPythonPackage rec { pname = "nbconvert"; - version = "7.16.4"; + version = "7.16.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hsqRuiZrCkSNyW+mxbnZiv+r3ihns2MlhwNTaAf59/Q="; + hash = "sha256-yDRnu1d3/fqsXru46GTzALJ39oaS7MBNbaty8thEI0Q="; }; # Add $out/share/jupyter to the list of paths that are used to search for @@ -56,24 +55,26 @@ buildPythonPackage rec { cp ${style-css} share/templates/classic/static/style.css ''; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - beautifulsoup4 - bleach - defusedxml - jinja2 - jupyter-core - jupyterlab-pygments - markupsafe - mistune - nbclient - packaging - pandocfilters - pygments - tinycss2 - traitlets - ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + dependencies = + [ + beautifulsoup4 + bleach + defusedxml + jinja2 + jupyter-core + jupyterlab-pygments + markupsafe + mistune + nbclient + packaging + pandocfilters + pygments + traitlets + ] + ++ bleach.optional-dependencies.css + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; preCheck = '' export HOME=$(mktemp -d) From 1552b6104ef272ab47da591e213f42ddc1ffbf4d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:24:28 +0900 Subject: [PATCH 178/280] python312Packages.notebook: 7.2.2 -> 7.3.2 Changelog: https://github.com/jupyter/notebook/blob/v7.3.2/CHANGELOG.md --- pkgs/development/python-modules/notebook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 9e796f6bf537..b86e529972f9 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.2.2"; + version = "7.3.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-LvB9QiBCFiOtP+iBGNaHvARQBVVwzdFggUpZzzocUW4="; + hash = "sha256-cF6DoXhfRbODvz7hPLdmgLktJPVvsMfSE2/h2FDNPKg="; }; postPatch = '' From 1967bc98d3ea2f8be7af49b8a65d7e7082549ca3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:25:00 +0900 Subject: [PATCH 179/280] python312Packages.pycrdt-websocket: 0.15.1 -> 0.15.3 Diff: https://github.com/jupyter-server/pycrdt-websocket/compare/refs/tags/v0.15.1...v0.15.3 Changelog: https://github.com/jupyter-server/pycrdt-websocket/blob/refs/tags/v0.15.3/CHANGELOG.md --- pkgs/development/python-modules/pycrdt-websocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix index cbf35e5c574d..f9a62593a4db 100644 --- a/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "pycrdt-websocket"; - version = "0.15.1"; + version = "0.15.3"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt-websocket"; tag = "v${version}"; - hash = "sha256-O0GRk81at8bgv+/4au8A55dZK2A28+ghy3sitAAZQBI="; + hash = "sha256-VK4nSsxF/FbCnyS1RM/JHCPS0Omj4rvdwjzLNDq2hjk="; }; build-system = [ hatchling ]; From 23b95cf5dfbc4794f5dff38ff6b868850bfbbd6f Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 16:50:28 +0900 Subject: [PATCH 180/280] python312Packages.jupyter-events: add teams.jupyter.members as maintainers --- pkgs/development/python-modules/jupyter-events/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index 0f7caeb8b45d..439de0c2224a 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -85,6 +85,6 @@ buildPythonPackage rec { mainProgram = "jupyter-events"; homepage = "https://github.com/jupyter/jupyter_events"; license = lib.licenses.bsd3; - maintainers = [ ]; + maintainers = lib.teams.jupyter.members; }; } From 57ab9a16eb4baf741b17ee3301dd1a5743815244 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 17:45:39 +0900 Subject: [PATCH 181/280] python312Packages.livelossplot: refactor --- .../python-modules/livelossplot/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix index a329967b2a51..80ef631363e9 100644 --- a/pkgs/development/python-modules/livelossplot/default.nix +++ b/pkgs/development/python-modules/livelossplot/default.nix @@ -2,12 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, pytestCheckHook, bokeh, ipython, matplotlib, - numpy, nbconvert, nbformat, }: @@ -15,34 +14,35 @@ buildPythonPackage rec { pname = "livelossplot"; version = "0.5.6"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchFromGitHub { owner = "stared"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-qC1FBFJyf2IlDIffJ5Xs89WcN/GFA/8maODhc1u2xhA="; + tag = "v${version}"; + hash = "sha256-qC1FBFJyf2IlDIffJ5Xs89WcN/GFA/8maODhc1u2xhA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ bokeh - ipython matplotlib - numpy ]; + pythonImportsCheck = [ "livelossplot" ]; + nativeCheckInputs = [ + ipython nbconvert nbformat pytestCheckHook ]; - meta = with lib; { + meta = { description = "Live training loss plot in Jupyter for Keras, PyTorch, and others"; homepage = "https://github.com/stared/livelossplot"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From bee8b40675c1707b7996725d9d7c4efc6100d789 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 Jan 2025 14:09:08 +0000 Subject: [PATCH 182/280] libsoup_3: 3.6.3 -> 3.6.4 Changes: https://gitlab.gnome.org/GNOME/libsoup/-/blob/3.6.4/NEWS?ref_type=tags Diff: https://gitlab.gnome.org/GNOME/libsoup/-/compare/3.6.3...3.6.4 We explicitly disabled pkcs11_tests and do not run any tests. --- pkgs/development/libraries/libsoup/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index f343b42245f7..7ab96d085c36 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.6.3"; + version = "3.6.4"; outputs = [ "out" @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-oNhKsHvRaLMX0xmw3EDIswG0VD+6LsQvpzORSyCBr70="; + hash = "sha256-m1THb1J2sFvryvK2wqFBoYj8e7HQYk7aJZ2sE6ZmXIo="; }; depsBuildBuild = [ From 137980a2a8d860c6e93478041d7aeccf5066f7dc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 19 Jan 2025 02:24:45 +0200 Subject: [PATCH 183/280] python312Packages.numpy: 2.2.0 -> 2.2.2 Changelog: https://github.com/numpy/numpy/releases/tag/v2.2.2 --- pkgs/development/python-modules/numpy/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index 90f1fc68e3c0..d2dec4459d92 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -59,7 +59,7 @@ let in buildPythonPackage rec { pname = "numpy"; - version = "2.2.0"; + version = "2.2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -67,7 +67,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-FA3YD/iYGlg6YJgL4aZVBo+K3r96RaBqaFjIc/zc1KA="; + hash = "sha256-7WkG9hg01odzjSWYiuEXaDcFY2k2zGBb4LsgiyPfTY8="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From 8adce9464c731d751863855c214ce5cd6617fbe7 Mon Sep 17 00:00:00 2001 From: DavHau Date: Tue, 14 Jan 2025 10:27:20 +0700 Subject: [PATCH 184/280] python3Packages.contourpy: fix cross build nuke-refs was used incorrectly --- pkgs/development/python-modules/contourpy/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix index 1758da63ed20..060c3b570f7d 100644 --- a/pkgs/development/python-modules/contourpy/default.nix +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -1,11 +1,9 @@ { lib, - buildPackages, buildPythonPackage, fetchFromGitHub, python, pythonOlder, - python3, # build meson, @@ -90,8 +88,7 @@ let # remove references to buildPackages.python3, which is not allowed for cross builds. preFixup = '' - nuke-refs -e "${buildPackages.python3}" \ - $out/${python3.sitePackages}/contourpy/util/{_build_config.py,__pycache__/_build_config.*} + nuke-refs $out/${python.sitePackages}/contourpy/util/{_build_config.py,__pycache__/_build_config.*} ''; meta = with lib; { From ab5f7ea487c5fe450955c31e8830514542d3c7d9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 19 Jan 2025 10:40:26 +0000 Subject: [PATCH 185/280] gdb: 15.2 -> 16.1 Changes: https://lists.gnu.org/archive/html/info-gnu/2025-01/msg00009.html --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 6dc6be7f442a..efca72816441 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -53,11 +53,11 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only"; - version = "15.2"; + version = "16.1"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - hash = "sha256-gzUMzTW1taDLprM0xBKU6paBWMVzlAkE8AuS92NFMU0="; + hash = "sha256-wsxczKApt6fDh5zoqWUo/f0Fa02ITysFEej3vHIzVcY="; }; postPatch = From d179b9d900e859925429c35385e3252019f1840f Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Sun, 19 Jan 2025 12:45:16 +0100 Subject: [PATCH 186/280] lvm2: reformat by nixfmt --- pkgs/os-specific/linux/lvm2/common.nix | 214 +++++++++++++++---------- 1 file changed, 128 insertions(+), 86 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index f24612acbca6..b4162761f438 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -1,29 +1,39 @@ { version, hash }: -{ lib, stdenv -, fetchurl -, pkg-config -, coreutils -, libuuid -, libaio -, replaceVars -, enableCmdlib ? false -, enableDmeventd ? false -, udevSupport ? !stdenv.hostPlatform.isStatic, udev -, onlyLib ? stdenv.hostPlatform.isStatic +{ + lib, + stdenv, + fetchurl, + pkg-config, + coreutils, + libuuid, + libaio, + replaceVars, + enableCmdlib ? false, + enableDmeventd ? false, + udevSupport ? !stdenv.hostPlatform.isStatic, + udev, + onlyLib ? stdenv.hostPlatform.isStatic, # Otherwise we have a infinity recursion during static compilation -, enableUtilLinux ? !stdenv.hostPlatform.isStatic, util-linux -, enableVDO ? false, vdo -, enableMdadm ? false, mdadm -, enableMultipath ? false, multipath-tools -, nixosTests + enableUtilLinux ? !stdenv.hostPlatform.isStatic, + util-linux, + enableVDO ? false, + vdo, + enableMdadm ? false, + mdadm, + enableMultipath ? false, + multipath-tools, + nixosTests, }: # configure: error: --enable-dmeventd requires --enable-cmdlib to be used as well assert enableDmeventd -> enableCmdlib; stdenv.mkDerivation rec { - pname = "lvm2" + lib.optionalString enableDmeventd "-with-dmeventd" + lib.optionalString enableVDO "-with-vdo"; + pname = + "lvm2" + + lib.optionalString enableDmeventd "-with-dmeventd" + + lib.optionalString enableVDO "-with-vdo"; inherit version; src = fetchurl { @@ -35,44 +45,55 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libaio - ] ++ lib.optionals udevSupport [ - udev - ] ++ lib.optionals (!onlyLib) [ - libuuid - ] ++ lib.optionals enableVDO [ - vdo - ]; + buildInputs = + [ + libaio + ] + ++ lib.optionals udevSupport [ + udev + ] + ++ lib.optionals (!onlyLib) [ + libuuid + ] + ++ lib.optionals enableVDO [ + vdo + ]; - configureFlags = [ - "--disable-readline" - "--enable-pkgconfig" - "--with-default-locking-dir=/run/lock/lvm" - "--with-default-run-dir=/run/lvm" - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - "--with-systemd-run=/run/current-system/systemd/bin/systemd-run" - ] ++ lib.optionals (!enableCmdlib && !onlyLib) [ - "--bindir=${placeholder "bin"}/bin" - "--sbindir=${placeholder "bin"}/bin" - "--libdir=${placeholder "lib"}/lib" - "--with-libexecdir=${placeholder "lib"}/libexec" - ] ++ lib.optional enableCmdlib "--enable-cmdlib" - ++ lib.optionals enableDmeventd [ - "--enable-dmeventd" - "--with-dmeventd-pidfile=/run/dmeventd/pid" - "--with-default-dm-run-dir=/run/dmeventd" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ] ++ lib.optionals udevSupport [ - "--enable-udev_rules" - "--enable-udev_sync" - ] ++ lib.optionals enableVDO [ - "--enable-vdo" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - "--enable-static_link" - ]; + configureFlags = + [ + "--disable-readline" + "--enable-pkgconfig" + "--with-default-locking-dir=/run/lock/lvm" + "--with-default-run-dir=/run/lvm" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--with-systemd-run=/run/current-system/systemd/bin/systemd-run" + ] + ++ lib.optionals (!enableCmdlib && !onlyLib) [ + "--bindir=${placeholder "bin"}/bin" + "--sbindir=${placeholder "bin"}/bin" + "--libdir=${placeholder "lib"}/lib" + "--with-libexecdir=${placeholder "lib"}/libexec" + ] + ++ lib.optional enableCmdlib "--enable-cmdlib" + ++ lib.optionals enableDmeventd [ + "--enable-dmeventd" + "--with-dmeventd-pidfile=/run/dmeventd/pid" + "--with-default-dm-run-dir=/run/dmeventd" + ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ] + ++ lib.optionals udevSupport [ + "--enable-udev_rules" + "--enable-udev_sync" + ] + ++ lib.optionals enableVDO [ + "--enable-vdo" + ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ + "--enable-static_link" + ]; preConfigure = '' sed -i /DEFAULT_SYS_DIR/d Makefile.in @@ -91,36 +112,47 @@ stdenv.mkDerivation rec { patches = [ # fixes paths to and checks for tools - (replaceVars ./fix-blkdeactivate.patch (let - optionalTool = cond: pkg: if cond then pkg else "/run/current-system/sw"; - in { - inherit coreutils; - util_linux = optionalTool enableUtilLinux util-linux; - mdadm = optionalTool enableMdadm mdadm; - multipath_tools = optionalTool enableMultipath multipath-tools; - vdo = optionalTool enableVDO vdo; - SBINDIR = null; # part of original source code in the patch's context - })) + (replaceVars ./fix-blkdeactivate.patch ( + let + optionalTool = cond: pkg: if cond then pkg else "/run/current-system/sw"; + in + { + inherit coreutils; + util_linux = optionalTool enableUtilLinux util-linux; + mdadm = optionalTool enableMdadm mdadm; + multipath_tools = optionalTool enableMultipath multipath-tools; + vdo = optionalTool enableVDO vdo; + SBINDIR = null; # part of original source code in the patch's context + } + )) ./fix-stdio-usage.patch ]; doCheck = false; # requires root - makeFlags = lib.optionals udevSupport [ - "SYSTEMD_GENERATOR_DIR=${placeholder "out"}/lib/systemd/system-generators" - ] ++ lib.optionals onlyLib [ - "libdm.device-mapper" - ]; + makeFlags = + lib.optionals udevSupport [ + "SYSTEMD_GENERATOR_DIR=${placeholder "out"}/lib/systemd/system-generators" + ] + ++ lib.optionals onlyLib [ + "libdm.device-mapper" + ]; # To prevent make install from failing. - installFlags = [ "OWNER=" "GROUP=" "confdir=$(out)/etc" ]; + installFlags = [ + "OWNER=" + "GROUP=" + "confdir=$(out)/etc" + ]; # Install systemd stuff. - installTargets = [ "install" ] ++ lib.optionals udevSupport [ - "install_systemd_generators" - "install_systemd_units" - "install_tmpfiles_configuration" - ]; + installTargets = + [ "install" ] + ++ lib.optionals udevSupport [ + "install_systemd_generators" + "install_systemd_units" + "install_tmpfiles_configuration" + ]; installPhase = lib.optionalString onlyLib '' make -C libdm install_${if stdenv.hostPlatform.isStatic then "static" else "dynamic"} @@ -129,15 +161,18 @@ stdenv.mkDerivation rec { ''; # only split bin and lib out from out if cmdlib isn't enabled - outputs = [ - "out" - ] ++ lib.optionals (!onlyLib) [ - "dev" - "man" - ] ++ lib.optionals (!onlyLib && !enableCmdlib) [ - "bin" - "lib" - ]; + outputs = + [ + "out" + ] + ++ lib.optionals (!onlyLib) [ + "dev" + "man" + ] + ++ lib.optionals (!onlyLib && !enableCmdlib) [ + "bin" + "lib" + ]; postInstall = lib.optionalString (enableCmdlib != true) '' moveToOutput lib/libdevmapper.so $lib @@ -152,7 +187,14 @@ stdenv.mkDerivation rec { homepage = "http://sourceware.org/lvm2/"; description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = platforms.linux; - license = with licenses; [ gpl2Only bsd2 lgpl21 ]; - maintainers = with maintainers; [ raskin ajs124 ]; + license = with licenses; [ + gpl2Only + bsd2 + lgpl21 + ]; + maintainers = with maintainers; [ + raskin + ajs124 + ]; }; } From 9d54b7793cf0593f1fd4da28075b809ea08f9404 Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Sun, 19 Jan 2025 12:46:22 +0100 Subject: [PATCH 187/280] lvm2: place profile snippets into profile.d to avoid path conflicts --- pkgs/os-specific/linux/lvm2/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index b4162761f438..379d1614878e 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { "--with-default-run-dir=/run/lvm" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "--with-systemd-run=/run/current-system/systemd/bin/systemd-run" + "--with-default-profile-subdir=profile.d" ] ++ lib.optionals (!enableCmdlib && !onlyLib) [ "--bindir=${placeholder "bin"}/bin" From 546ece569b66f3995839ffe87726177831aca72e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 23 Nov 2024 23:36:23 +0100 Subject: [PATCH 188/280] libpq: init at 17.2 Resolves #61580 --- .../blockchains/lighthouse/default.nix | 4 +- pkgs/applications/gis/grass/default.nix | 6 +- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 +- pkgs/applications/gis/qgis/unwrapped.nix | 4 +- pkgs/applications/misc/pgmodeler/default.nix | 9 +- .../instant-messengers/teamspeak/server.nix | 4 +- .../networking/p2p/gnunet/default.nix | 4 +- pkgs/applications/office/kexi/default.nix | 4 +- .../office/ledger-web/default.nix | 4 +- .../office/libreoffice/default.nix | 4 +- .../rust/default-crate-overrides.nix | 4 +- pkgs/by-name/al/algol68g/package.nix | 4 +- pkgs/by-name/cp/cppdb/package.nix | 4 +- pkgs/by-name/cy/cyrus-imapd/package.nix | 4 +- pkgs/by-name/di/diesel-cli/package.nix | 4 +- pkgs/by-name/dr/drogon/package.nix | 4 +- pkgs/by-name/ds/dspam/package.nix | 6 +- pkgs/by-name/ex/exim/package.nix | 8 +- pkgs/by-name/fl/fluent-bit/package.nix | 4 +- pkgs/by-name/fr/freeradius/package.nix | 4 +- pkgs/by-name/ga/gammu/package.nix | 4 +- pkgs/by-name/in/inspircd/package.nix | 4 +- pkgs/by-name/ke/kepler/package.nix | 4 +- pkgs/by-name/li/libdbiDrivers/package.nix | 7 +- pkgs/by-name/li/libpqxx/package.nix | 5 +- pkgs/by-name/lu/luanti/package.nix | 4 +- pkgs/by-name/ma/mapserver/package.nix | 4 +- pkgs/by-name/n8/n8n/package.nix | 4 +- pkgs/by-name/od/odyssey/package.nix | 8 +- pkgs/by-name/op/opendbx/package.nix | 4 +- pkgs/by-name/os/osm2pgsql/package.nix | 4 +- pkgs/by-name/pa/pam_pgsql/package.nix | 4 +- pkgs/by-name/pd/pdal/package.nix | 4 +- pkgs/by-name/pd/pdns/package.nix | 4 +- pkgs/by-name/pg/pgbackrest/package.nix | 4 +- pkgs/by-name/pg/pgmanage/package.nix | 4 +- pkgs/by-name/pg/pgpool/package.nix | 4 +- pkgs/by-name/pm/pmacct/package.nix | 4 +- pkgs/by-name/ps/pspg/package.nix | 4 +- pkgs/by-name/ps/psqlodbc/package.nix | 8 +- pkgs/by-name/sa/saga/package.nix | 4 +- pkgs/by-name/so/sope/package.nix | 6 +- pkgs/by-name/sp/spatialite-gui/package.nix | 4 +- pkgs/by-name/st/stellar-core/package.nix | 4 +- pkgs/by-name/sy/syndicate_utils/package.nix | 4 +- pkgs/by-name/ta/taler-challenger/package.nix | 4 +- pkgs/by-name/ta/taler-exchange/package.nix | 4 +- pkgs/by-name/ta/taler-sync/package.nix | 4 +- pkgs/by-name/th/thc-hydra/package.nix | 4 +- pkgs/by-name/tn/tntdb/package.nix | 4 +- pkgs/by-name/ul/ulogd/package.nix | 4 +- pkgs/by-name/vi/virtualpg/package.nix | 6 +- pkgs/by-name/za/zammad/package.nix | 3 +- pkgs/development/ada-modules/gnatcoll/db.nix | 4 +- pkgs/development/compilers/urweb/default.nix | 6 +- pkgs/development/libraries/gdal/default.nix | 4 +- pkgs/development/libraries/kdb/default.nix | 4 +- pkgs/development/libraries/libgda/6.x.nix | 6 +- pkgs/development/libraries/libgda/default.nix | 4 +- pkgs/development/libraries/librdf/redland.nix | 4 +- pkgs/development/libraries/mapnik/default.nix | 4 +- .../libraries/qt-5/modules/qtbase.nix | 8 +- .../libraries/qt-6/modules/qtbase/default.nix | 6 +- pkgs/development/libraries/soci/default.nix | 4 +- pkgs/development/libraries/wt/default.nix | 4 +- pkgs/development/lua-modules/overrides.nix | 4 +- .../ocaml-modules/postgresql/default.nix | 5 +- .../octave-modules/database/default.nix | 4 +- .../python-modules/pgsanity/default.nix | 5 +- .../python-modules/psycopg/default.nix | 9 +- .../ruby-modules/gem-config/default.nix | 6 +- pkgs/games/ldmud/default.nix | 4 +- pkgs/servers/http/openresty/default.nix | 4 +- pkgs/servers/mail/dovecot/default.nix | 4 +- pkgs/servers/mail/opensmtpd/extras.nix | 4 +- pkgs/servers/mail/postfix/default.nix | 4 +- pkgs/servers/monitoring/icinga2/default.nix | 4 +- pkgs/servers/monitoring/zabbix/proxy.nix | 4 +- pkgs/servers/monitoring/zabbix/server.nix | 4 +- pkgs/servers/mx-puppet-discord/default.nix | 4 +- pkgs/servers/nominatim/default.nix | 4 +- pkgs/servers/sip/freeswitch/modules.nix | 4 +- pkgs/servers/sql/postgresql/default.nix | 4 +- pkgs/servers/sql/postgresql/libpq.nix | 146 ++++++++++++++++++ pkgs/servers/web-apps/lemmy/server.nix | 4 +- pkgs/tools/backup/bacula/default.nix | 6 +- .../disnix/dysnomia/default.nix | 6 +- pkgs/tools/security/vaultwarden/default.nix | 4 +- pkgs/tools/system/collectd/plugins.nix | 4 +- pkgs/tools/system/rsyslog/default.nix | 4 +- pkgs/tools/text/gawk/gawkextlib.nix | 4 +- pkgs/top-level/all-packages.nix | 6 +- pkgs/top-level/ocaml-packages.nix | 2 +- pkgs/top-level/php-packages.nix | 13 +- 94 files changed, 364 insertions(+), 214 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/libpq.nix diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 3846ae0a82a1..d102d8778bc7 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -7,7 +7,7 @@ , nix-update-script , openssl , pkg-config -, postgresql +, libpq , protobuf , rustPlatform , rust-jemalloc-sys @@ -130,7 +130,7 @@ rustPlatform.buildRustPackage rec { ]; nativeCheckInputs = [ - postgresql + libpq ]; passthru = { diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 8f9d01d9273a..6e122db24f08 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -27,7 +27,7 @@ , netcdf , pdal , pkg-config -, postgresql +, libpq , proj , python3Packages , readline @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 netcdf pdal - postgresql + libpq proj readline sqlite @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-openmp" "--with-pdal" "--with-postgres" - "--with-postgres-libs=${postgresql.lib}/lib/" + "--with-postgres-libs=${libpq}/lib/" "--with-proj-includes=${proj.dev}/include" "--with-proj-libs=${proj}/lib" "--with-proj-share=${proj}/share/proj" diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index d0490702c2e3..01ead047445b 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -21,6 +21,7 @@ grass, gsl, hdf5, + libpq, libspatialindex, libspatialite, libzip, @@ -28,7 +29,6 @@ ninja, openssl, pdal, - postgresql, proj, protobuf, python3, @@ -116,13 +116,13 @@ mkDerivation rec { geos gsl hdf5 + libpq libspatialindex libspatialite libzip netcdf openssl pdal - postgresql proj protobuf qca-qt5 diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 50b8edba1ce1..45529ae2a55e 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -27,7 +27,7 @@ , ninja , openssl , pdal -, postgresql +, libpq , proj , protobuf , python3 @@ -119,7 +119,7 @@ in mkDerivation rec { netcdf openssl pdal - postgresql + libpq proj protobuf qca-qt5 diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index c134f00b2f88..884acd7aaa77 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -9,7 +9,7 @@ qmake, qtwayland, qtsvg, - postgresql, + libpq, cups, libxml2, }: @@ -37,17 +37,16 @@ stdenv.mkDerivation rec { "CONFIG+=release" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "PGSQL_INC=${lib.getDev postgresql}/include" - "PGSQL_LIB=${lib.getLib postgresql}/lib/libpq.dylib" + "PGSQL_INC=${lib.getDev libpq}/include" + "PGSQL_LIB=${lib.getLib libpq}/lib/libpq.dylib" "XML_INC=${libxml2.dev}/include/libxml2" "XML_LIB=${libxml2.out}/lib/libxml2.dylib" "PREFIX=${placeholder "out"}/Applications/pgModeler.app/Contents" ]; - # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. buildInputs = [ - postgresql + libpq qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index ba8a5c5fa610..35139f9c6f66 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - postgresql, + libpq, autoPatchelfHook, writeScript, }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc - postgresql.lib + libpq ]; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 0a6fa325cf4b..b8457092dda3 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -3,7 +3,7 @@ , makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib , libpulseaudio, libopus, libogg, jansson, libsodium -, postgresqlSupport ? true, postgresql }: +, postgresqlSupport ? true, libpq }: stdenv.mkDerivation rec { pname = "gnunet"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { adns curl gmp gnutls libextractor libgcrypt libgnurl libidn libmicrohttpd libunistring libxml2 ncurses gettext libsodium sqlite zlib libpulseaudio libopus libogg jansson - ] ++ lib.optional postgresqlSupport postgresql; + ] ++ lib.optional postgresqlSupport libpq; preConfigure = '' # Brute force: since nix-worker chroots don't provide diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index d081796bddb6..5b07dff5b925 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -30,8 +30,8 @@ kreport, lcms2, libmysqlclient, + libpq, marble, - postgresql, }: mkDerivation rec { @@ -74,8 +74,8 @@ mkDerivation rec { kreport lcms2 libmysqlclient + libpq marble - postgresql ]; propagatedUserEnvPkgs = [ kproperty ]; diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index 5662713bc6a0..8f5a9fa3831e 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -3,7 +3,7 @@ bundlerApp, bundlerUpdateScript, withPostgresql ? true, - postgresql, + libpq, withSqlite ? false, sqlite, }: @@ -13,7 +13,7 @@ bundlerApp { gemdir = ./.; exes = [ "ledger_web" ]; - buildInputs = lib.optional withPostgresql postgresql ++ lib.optional withSqlite sqlite; + buildInputs = lib.optional withPostgresql libpq ++ lib.optional withSqlite sqlite; passthru.updateScript = bundlerUpdateScript "ledger-web"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 438500f41cc0..5c29d3c718f1 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -113,7 +113,7 @@ , kwindowsystem ? null , variant ? "fresh" , symlinkJoin -, postgresql +, libpq , makeFontsConf , amiri , caladea @@ -395,7 +395,7 @@ in stdenv.mkDerivation (finalAttrs: { pam perl poppler - postgresql + libpq python311 sane-backends unixODBC diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 407f7e652c38..cb6d74c8b697 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -34,7 +34,7 @@ , openssl , pango , pkg-config -, postgresql +, libpq , protobuf , python3 , rdkafka @@ -259,7 +259,7 @@ in pq-sys = attr: { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ postgresql ]; + buildInputs = [ libpq ]; }; prost-build = attr: { diff --git a/pkgs/by-name/al/algol68g/package.nix b/pkgs/by-name/al/algol68g/package.nix index 1d3ed222b622..0a630c7e52f9 100644 --- a/pkgs/by-name/al/algol68g/package.nix +++ b/pkgs/by-name/al/algol68g/package.nix @@ -5,10 +5,10 @@ curl, gmp, gsl, + libpq, mpfr, ncurses, plotutils, - postgresql, pkg-config, withPDFDoc ? true, }: @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { gmp gsl plotutils - postgresql + libpq ]; strictDeps = true; diff --git a/pkgs/by-name/cp/cppdb/package.nix b/pkgs/by-name/cp/cppdb/package.nix index 0e92f0f2df81..f823aa8027e9 100644 --- a/pkgs/by-name/cp/cppdb/package.nix +++ b/pkgs/by-name/cp/cppdb/package.nix @@ -5,7 +5,7 @@ cmake, sqlite, libmysqlclient, - postgresql, + libpq, unixODBC, }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite libmysqlclient - postgresql + libpq unixODBC ]; diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix index afb1fef30293..fc7da9317abc 100644 --- a/pkgs/by-name/cy/cyrus-imapd/package.nix +++ b/pkgs/by-name/cy/cyrus-imapd/package.nix @@ -27,6 +27,7 @@ libchardet, libical, libmysqlclient, + libpq, libsrs2, libuuid, libxml2, @@ -34,7 +35,6 @@ openssl, pcre2, perl, - postgresql, rsync, shapelib, sqlite, @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { xapian ] ++ lib.optionals withMySQL [ libmysqlclient ] - ++ lib.optionals withPgSQL [ postgresql ] + ++ lib.optionals withPgSQL [ libpq ] ++ lib.optionals withSQLite [ sqlite ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 37b0afc49ebb..b2dbe6730cef 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -6,10 +6,10 @@ installShellFiles, libiconv, libmysqlclient, + libpq, nix-update-script, openssl, pkg-config, - postgresql, rustPlatform, sqlite, testers, @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optional sqliteSupport sqlite - ++ lib.optional postgresqlSupport postgresql + ++ lib.optional postgresqlSupport libpq ++ lib.optionals mysqlSupport [ libmysqlclient zlib diff --git a/pkgs/by-name/dr/drogon/package.nix b/pkgs/by-name/dr/drogon/package.nix index c1aedb044964..b52d146acbff 100644 --- a/pkgs/by-name/dr/drogon/package.nix +++ b/pkgs/by-name/dr/drogon/package.nix @@ -14,7 +14,7 @@ sqliteSupport ? true, sqlite, postgresSupport ? false, - postgresql, + libpq, redisSupport ? false, hiredis, mysqlSupport ? false, @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { c-ares ] ++ lib.optional sqliteSupport sqlite - ++ lib.optional postgresSupport postgresql + ++ lib.optional postgresSupport libpq ++ lib.optional redisSupport hiredis # drogon uses mariadb for mysql (see https://github.com/drogonframework/drogon/wiki/ENG-02-Installation#Library-Dependencies) ++ lib.optionals mysqlSupport [ diff --git a/pkgs/by-name/ds/dspam/package.nix b/pkgs/by-name/ds/dspam/package.nix index 60af92243c76..84563996a026 100644 --- a/pkgs/by-name/ds/dspam/package.nix +++ b/pkgs/by-name/ds/dspam/package.nix @@ -13,7 +13,7 @@ zlib, mariadb-connector-c, withPgSQL ? false, - postgresql, + libpq, withSQLite ? false, sqlite, withDB ? false, @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { zlib mariadb-connector-c.out ] - ++ lib.optional withPgSQL postgresql + ++ lib.optional withPgSQL libpq ++ lib.optional withSQLite sqlite ++ lib.optional withDB db; nativeBuildInputs = [ makeWrapper ]; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { "--with-mysql-includes=${mariadb-connector-c.dev}/include/mysql" "--with-mysql-libraries=${mariadb-connector-c.out}/lib/mysql" ] - ++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib"; + ++ lib.optional withPgSQL "--with-pgsql-libraries=${libpq}/lib"; # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix index 4c6c8a715478..873e643a2598 100644 --- a/pkgs/by-name/ex/exim/package.nix +++ b/pkgs/by-name/ex/exim/package.nix @@ -17,7 +17,7 @@ libmysqlclient, zlib, enablePgSQL ? false, - postgresql, + libpq, enableSqlite ? false, sqlite, enableAuthDovecot ? false, @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libmysqlclient zlib ] - ++ lib.optional enablePgSQL postgresql + ++ lib.optional enablePgSQL libpq ++ lib.optionals enableSqlite [ sqlite sqlite.dev @@ -117,8 +117,8 @@ stdenv.mkDerivation rec { ''} ${lib.optionalString enablePgSQL '' s:^# \(LOOKUP_PGSQL=yes\)$:\1: - s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lpq -L${postgresql.lib}/lib: - s:^# \(LOOKUP_LIBS\)=.*:\1=-lpq -L${postgresql.lib}/lib: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lpq -L${libpq}/lib: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lpq -L${libpq}/lib: ''} ${lib.optionalString enableSqlite '' s:^# \(LOOKUP_SQLITE=yes\)$:\1: diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 155acdbe28a4..ff89dec6f0eb 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -6,7 +6,7 @@ flex, bison, systemd, - postgresql, + libpq, openssl, libyaml, darwin, @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { [ openssl libyaml - postgresql + libpq ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/fr/freeradius/package.nix b/pkgs/by-name/fr/freeradius/package.nix index dda4a5943a72..c06d322e2b25 100644 --- a/pkgs/by-name/fr/freeradius/package.nix +++ b/pkgs/by-name/fr/freeradius/package.nix @@ -21,7 +21,7 @@ withMysql ? false, libmysqlclient, withPostgresql ? false, - postgresql, + libpq, withPcap ? true, libpcap, withRedis ? false, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ++ lib.optional withLdap openldap ++ lib.optional withMemcached libmemcached ++ lib.optional withMysql libmysqlclient - ++ lib.optional withPostgresql postgresql + ++ lib.optional withPostgresql libpq ++ lib.optional withPcap libpcap ++ lib.optional withRedis hiredis ++ lib.optional withRest curl diff --git a/pkgs/by-name/ga/gammu/package.nix b/pkgs/by-name/ga/gammu/package.nix index 2ee0061850b9..e914f59357e4 100644 --- a/pkgs/by-name/ga/gammu/package.nix +++ b/pkgs/by-name/ga/gammu/package.nix @@ -17,7 +17,7 @@ libdbi ? null, libdbiDrivers ? null, postgresSupport ? false, - postgresql ? null, + libpq ? null, }: stdenv.mkDerivation rec { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { libdbi libdbiDrivers ] - ++ lib.optionals postgresSupport [ postgresql ]; + ++ lib.optionals postgresSupport [ libpq ]; meta = with lib; { homepage = "https://wammu.eu/gammu/"; diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix index d66197ca4abd..c4227fd4d361 100644 --- a/pkgs/by-name/in/inspircd/package.nix +++ b/pkgs/by-name/in/inspircd/package.nix @@ -67,7 +67,7 @@ in , pkg-config , libargon2 , openldap -, postgresql +, libpq , libmysqlclient , pcre , pcre2 @@ -97,7 +97,7 @@ let ]; ldap = [ openldap ]; mysql = [ libmysqlclient ]; - pgsql = [ postgresql ]; + pgsql = [ libpq ]; regex_pcre = [ pcre ]; regex_pcre2 = [ pcre2 ]; regex_re2 = [ re2 ]; diff --git a/pkgs/by-name/ke/kepler/package.nix b/pkgs/by-name/ke/kepler/package.nix index b9da399e61f0..7c276f5a1731 100644 --- a/pkgs/by-name/ke/kepler/package.nix +++ b/pkgs/by-name/ke/kepler/package.nix @@ -3,9 +3,9 @@ stdenv, darwin, fetchFromGitHub, + libpq, openssl, pkg-config, - postgresql, rustPlatform, zstd, }: @@ -29,8 +29,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ + libpq openssl - postgresql zstd ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/li/libdbiDrivers/package.nix b/pkgs/by-name/li/libdbiDrivers/package.nix index 4334f8ba5cb0..7b8c38174138 100644 --- a/pkgs/by-name/li/libdbiDrivers/package.nix +++ b/pkgs/by-name/li/libdbiDrivers/package.nix @@ -6,7 +6,7 @@ # TODO: migrate away from overriding packages to null libmysqlclient ? null, sqlite ? null, - postgresql ? null, + libpq ? null, }: stdenv.mkDerivation rec { @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ libdbi sqlite - postgresql ] ++ lib.optional (libmysqlclient != null) libmysqlclient; patches = [ @@ -58,8 +57,10 @@ stdenv.mkDerivation rec { "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite" "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite" ] - ++ lib.optionals (postgresql != null) [ + ++ lib.optionals (libpq != null) [ "--with-pgsql" + "--with-pgsql-incdir=${libpq.dev}/include" + "--with-pgsql-libdir=${libpq}/lib/" ]; env.NIX_CFLAGS_COMPILE = toString ( diff --git a/pkgs/by-name/li/libpqxx/package.nix b/pkgs/by-name/li/libpqxx/package.nix index d2ed5b35c617..67c845585c38 100644 --- a/pkgs/by-name/li/libpqxx/package.nix +++ b/pkgs/by-name/li/libpqxx/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - postgresql, + libpq, python3, }: @@ -23,12 +23,11 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - postgresql.dev python3 ]; buildInputs = [ - postgresql.lib + libpq ]; postPatch = '' diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index e370c28dc14c..4f895a586999 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -26,7 +26,7 @@ gmp, libspatialindex, leveldb, - postgresql, + libpq, hiredis, libiconv, ninja, @@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals buildServer [ leveldb - postgresql + libpq hiredis prometheus-cpp ]; diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index 41218308567d..70376f102a2b 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -17,10 +17,10 @@ harfbuzz, libjpeg, libpng, + libpq, librsvg, libxml2, pkg-config, - postgresql, proj, protobufc, python3, @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { harfbuzz libjpeg libpng + libpq librsvg libxml2 - postgresql proj protobufc zlib diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index dce70e681e97..fd65dfed4632 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -10,7 +10,7 @@ xcbuild, libkrb5, libmongocrypt, - postgresql, + libpq, makeWrapper, }: @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs libkrb5 libmongocrypt - postgresql + libpq ]; buildPhase = '' diff --git a/pkgs/by-name/od/odyssey/package.nix b/pkgs/by-name/od/odyssey/package.nix index c57bd1c37e56..c0d466a71114 100644 --- a/pkgs/by-name/od/odyssey/package.nix +++ b/pkgs/by-name/od/odyssey/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, openssl, - postgresql, + libpq, zstd, fetchpatch, }: @@ -31,12 +31,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openssl - postgresql + libpq zstd ]; cmakeFlags = [ - "-DPQ_LIBRARY=${postgresql.lib}/lib" "-DBUILD_COMPRESSION=ON" + "-DPOSTGRESQL_INCLUDE_DIR=${lib.getDev libpq}/include/postgresql/server" + "-DPOSTGRESQL_LIBRARY=${libpq}/lib" + "-DPOSTGRESQL_LIBPGPORT=${lib.getDev libpq}/lib" ]; installPhase = '' diff --git a/pkgs/by-name/op/opendbx/package.nix b/pkgs/by-name/op/opendbx/package.nix index 51714e8bbd38..0e6db1ef2ec4 100644 --- a/pkgs/by-name/op/opendbx/package.nix +++ b/pkgs/by-name/op/opendbx/package.nix @@ -4,7 +4,7 @@ fetchurl, readline, libmysqlclient, - postgresql, + libpq, sqlite, }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline libmysqlclient - postgresql + libpq sqlite ]; diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix index b5c927740f34..d4fbb130bea9 100644 --- a/pkgs/by-name/os/osm2pgsql/package.nix +++ b/pkgs/by-name/os/osm2pgsql/package.nix @@ -10,7 +10,7 @@ cli11, zlib, boost, - postgresql, + libpq, python3, withLuaJIT ? false, lua, @@ -49,9 +49,9 @@ stdenv.mkDerivation (finalAttrs: { expat fmt_11 libosmium + libpq nlohmann_json opencv - postgresql potrace proj protozero diff --git a/pkgs/by-name/pa/pam_pgsql/package.nix b/pkgs/by-name/pa/pam_pgsql/package.nix index 326859b3367a..80a136311e2e 100644 --- a/pkgs/by-name/pa/pam_pgsql/package.nix +++ b/pkgs/by-name/pa/pam_pgsql/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, pkg-config, - postgresql, + libpq, libgcrypt, pam, libxcrypt, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt pam - postgresql + libpq libxcrypt ]; diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix index 0d2b095270e5..d72dead10d60 100644 --- a/pkgs/by-name/pd/pdal/package.nix +++ b/pkgs/by-name/pd/pdal/package.nix @@ -18,7 +18,7 @@ , libxml2 , openscenegraph , pkg-config -, postgresql +, libpq , proj , sqlite , tiledb @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libxml2 openscenegraph - postgresql + libpq proj sqlite tiledb diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix index d9bf21b24e46..b2b0798e9570 100644 --- a/pkgs/by-name/pd/pdns/package.nix +++ b/pkgs/by-name/pd/pdns/package.nix @@ -12,7 +12,7 @@ openssl, systemd, mariadb-connector-c, - postgresql, + libpq, lua, openldap, geoip, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost mariadb-connector-c - postgresql + libpq lua openldap sqlite diff --git a/pkgs/by-name/pg/pgbackrest/package.nix b/pkgs/by-name/pg/pgbackrest/package.nix index 8ea691c0d4e3..292d202a05b0 100644 --- a/pkgs/by-name/pg/pgbackrest/package.nix +++ b/pkgs/by-name/pg/pgbackrest/package.nix @@ -9,7 +9,7 @@ libbacktrace, bzip2, lz4, - postgresql, + libpq, libxml2, libyaml, zlib, @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libbacktrace bzip2 lz4 - postgresql + libpq libxml2 libyaml zlib diff --git a/pkgs/by-name/pg/pgmanage/package.nix b/pkgs/by-name/pg/pgmanage/package.nix index 351214ee0237..b4ee14fa0c12 100644 --- a/pkgs/by-name/pg/pgmanage/package.nix +++ b/pkgs/by-name/pg/pgmanage/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - postgresql, + libpq, openssl, nixosTests, }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - postgresql + libpq openssl ]; diff --git a/pkgs/by-name/pg/pgpool/package.nix b/pkgs/by-name/pg/pgpool/package.nix index 2519a6e988d8..063eaebe766e 100644 --- a/pkgs/by-name/pg/pgpool/package.nix +++ b/pkgs/by-name/pg/pgpool/package.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, postgresql +, libpq , openssl , libxcrypt , withPam ? stdenv.hostPlatform.isLinux @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - postgresql + libpq openssl libxcrypt ] ++ lib.optional withPam pam; diff --git a/pkgs/by-name/pm/pmacct/package.nix b/pkgs/by-name/pm/pmacct/package.nix index 7687e19493e5..b00ffe4196a6 100644 --- a/pkgs/by-name/pm/pmacct/package.nix +++ b/pkgs/by-name/pm/pmacct/package.nix @@ -15,7 +15,7 @@ withSQLite ? true, sqlite, withPgSQL ? true, - postgresql, + libpq, withMysql ? true, libmysqlclient, zlib, @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withJansson jansson ++ lib.optional withNflog libnetfilter_log ++ lib.optional withSQLite sqlite - ++ lib.optional withPgSQL postgresql + ++ lib.optional withPgSQL libpq ++ lib.optionals withMysql [ libmysqlclient zlib diff --git a/pkgs/by-name/ps/pspg/package.nix b/pkgs/by-name/ps/pspg/package.nix index 7646dac9aef5..a7b2aa02f4b4 100644 --- a/pkgs/by-name/ps/pspg/package.nix +++ b/pkgs/by-name/ps/pspg/package.nix @@ -7,7 +7,7 @@ pkg-config, installShellFiles, readline, - postgresql, + libpq, }: stdenv.mkDerivation rec { @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gnugrep + libpq ncurses readline - postgresql ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix index f83d41900fb3..0aacf5c815d6 100644 --- a/pkgs/by-name/ps/psqlodbc/package.nix +++ b/pkgs/by-name/ps/psqlodbc/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, nix-update-script, autoreconfHook, - postgresql, + libpq, openssl, withLibiodbc ? false, libiodbc, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ - postgresql + libpq openssl ] ++ lib.optional withLibiodbc libiodbc @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ - "--with-libpq=${lib.getDev postgresql}/bin/pg_config" + "--with-libpq=${lib.getDev libpq}" ] ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}"; meta = with lib; { @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; platforms = platforms.unix; - maintainers = postgresql.meta.maintainers; + maintainers = libpq.meta.maintainers; }; } diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index d73a00dcd7bb..d762cb8a82fe 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -19,7 +19,7 @@ opencv, vigra, pdal, - postgresql, + libpq, darwin, unixODBC, poppler, @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libharu opencv vigra - postgresql + libpq libiodbc xz qhull diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix index 67fcb756e9bc..3be97096dceb 100644 --- a/pkgs/by-name/so/sope/package.nix +++ b/pkgs/by-name/so/sope/package.nix @@ -1,5 +1,5 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, libxml2, openssl -, openldap, mariadb, libmysqlclient, postgresql }: +, openldap, mariadb, libmysqlclient, libpq }: gnustep.stdenv.mkDerivation rec { pname = "sope"; @@ -16,7 +16,7 @@ gnustep.stdenv.mkDerivation rec { buildInputs = [ gnustep.base libxml2 openssl ] ++ lib.optional (openldap != null) openldap ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ] - ++ lib.optional (postgresql != null) postgresql; + ++ lib.optional (libpq != null) libpq; # Configure directories where files are installed to. Everything is automatically # put into $out (thanks GNUstep) apart from the makefiles location which is where @@ -33,7 +33,7 @@ gnustep.stdenv.mkDerivation rec { configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ] ++ lib.optional (openldap != null) "--enable-openldap" ++ lib.optional (mariadb != null) "--enable-mysql" - ++ lib.optional (postgresql != null) "--enable-postgresql"; + ++ lib.optional (libpq != null) "--enable-postgresql"; env = { GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf"; diff --git a/pkgs/by-name/sp/spatialite-gui/package.nix b/pkgs/by-name/sp/spatialite-gui/package.nix index 3db1671858c1..df336adc0bfa 100644 --- a/pkgs/by-name/sp/spatialite-gui/package.nix +++ b/pkgs/by-name/sp/spatialite-gui/package.nix @@ -7,6 +7,7 @@ curl, freexl, geos, + libpq, librasterlite2, librttopo, libspatialite, @@ -16,7 +17,6 @@ lz4, minizip, openjpeg, - postgresql, proj, sqlite, virtualpg, @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { curl freexl geos + libpq librasterlite2 librttopo libspatialite @@ -51,7 +52,6 @@ stdenv.mkDerivation rec { lz4 minizip openjpeg - postgresql proj sqlite virtualpg diff --git a/pkgs/by-name/st/stellar-core/package.nix b/pkgs/by-name/st/stellar-core/package.nix index a92100844a10..9485fa2fb2c0 100644 --- a/pkgs/by-name/st/stellar-core/package.nix +++ b/pkgs/by-name/st/stellar-core/package.nix @@ -7,10 +7,10 @@ flex, gitMinimal, lib, + libpq, libtool, libunwind, pkg-config, - postgresql, ripgrep, stdenv, }: @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ bison flex - postgresql + libpq ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix index ee425f44d5d7..5ac8c4e48473 100644 --- a/pkgs/by-name/sy/syndicate_utils/package.nix +++ b/pkgs/by-name/sy/syndicate_utils/package.nix @@ -5,7 +5,7 @@ libxml2, libxslt, openssl, - postgresql, + libpq, sqlite, }: @@ -22,7 +22,7 @@ buildNimPackage (finalAttrs: { }; buildInputs = [ - postgresql.out + libpq sqlite libxml2 libxslt diff --git a/pkgs/by-name/ta/taler-challenger/package.nix b/pkgs/by-name/ta/taler-challenger/package.nix index ad4accab593a..69ba10d6c06d 100644 --- a/pkgs/by-name/ta/taler-challenger/package.nix +++ b/pkgs/by-name/ta/taler-challenger/package.nix @@ -13,7 +13,7 @@ libmicrohttpd, libsodium, libtool, - postgresql, + libpq, taler-exchange, taler-merchant, runtimeShell, @@ -59,9 +59,9 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt libgnurl libmicrohttpd + libpq libsodium libtool - postgresql taler-exchange taler-merchant ]; diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix index 99d917a7ed57..208a7dfbc686 100644 --- a/pkgs/by-name/ta/taler-exchange/package.nix +++ b/pkgs/by-name/ta/taler-exchange/package.nix @@ -10,7 +10,7 @@ libsodium, libunistring, pkg-config, - postgresql, + libpq, autoreconfHook, python3, recutils, @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libmicrohttpd jansson libsodium - postgresql + libpq curl recutils gettext diff --git a/pkgs/by-name/ta/taler-sync/package.nix b/pkgs/by-name/ta/taler-sync/package.nix index 931bf33c836b..34f9021c759b 100644 --- a/pkgs/by-name/ta/taler-sync/package.nix +++ b/pkgs/by-name/ta/taler-sync/package.nix @@ -9,9 +9,9 @@ gnunet, jansson, libmicrohttpd, + libpq, libsodium, libtool, - postgresql, taler-exchange, taler-merchant, runtimeShell, @@ -41,9 +41,9 @@ stdenv.mkDerivation (finalAttrs: { jansson libgcrypt libmicrohttpd + libpq libsodium libtool - postgresql taler-exchange taler-merchant ]; diff --git a/pkgs/by-name/th/thc-hydra/package.nix b/pkgs/by-name/th/thc-hydra/package.nix index 57d059e0b75c..567854757ae6 100644 --- a/pkgs/by-name/th/thc-hydra/package.nix +++ b/pkgs/by-name/th/thc-hydra/package.nix @@ -9,7 +9,7 @@ pcre, libssh, libmysqlclient, - postgresql, + libpq, samba, withGUI ? false, makeWrapper, @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { pcre libssh libmysqlclient - postgresql + libpq samba ] ++ lib.optional withGUI gtk2; diff --git a/pkgs/by-name/tn/tntdb/package.nix b/pkgs/by-name/tn/tntdb/package.nix index a3192d6c2b8c..16e7857ace28 100644 --- a/pkgs/by-name/tn/tntdb/package.nix +++ b/pkgs/by-name/tn/tntdb/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, cxxtools, - postgresql, + libpq, libmysqlclient, sqlite, zlib, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ cxxtools - postgresql + libpq libmysqlclient sqlite zlib diff --git a/pkgs/by-name/ul/ulogd/package.nix b/pkgs/by-name/ul/ulogd/package.nix index dd9bf17e33ad..f08977a88c09 100644 --- a/pkgs/by-name/ul/ulogd/package.nix +++ b/pkgs/by-name/ul/ulogd/package.nix @@ -12,7 +12,7 @@ autoconf, autogen, libtool, - postgresql, + libpq, libmysqlclient, sqlite, pkg-config, @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { libmnl libnfnetlink libpcap - postgresql + libpq libmysqlclient sqlite ]; diff --git a/pkgs/by-name/vi/virtualpg/package.nix b/pkgs/by-name/vi/virtualpg/package.nix index 79b184516650..3174eb547e81 100644 --- a/pkgs/by-name/vi/virtualpg/package.nix +++ b/pkgs/by-name/vi/virtualpg/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, validatePkgConfig, - postgresql, + libpq, sqlite, darwin, }: @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ validatePkgConfig - postgresql # for pg_config + libpq # for pg_config ]; buildInputs = [ - postgresql + libpq sqlite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Kerberos ]; diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix index 452af8ef5c94..a3929ae1c010 100644 --- a/pkgs/by-name/za/zammad/package.nix +++ b/pkgs/by-name/za/zammad/package.nix @@ -10,6 +10,7 @@ procps, ruby, postgresql, + libpq, imlib2, jq, moreutils, @@ -59,7 +60,7 @@ let ]; gemConfig = defaultGemConfig // { pg = attrs: { - buildFlags = [ "--with-pg-config=${lib.getDev postgresql}/bin/pg_config" ]; + buildInputs = [ libpq ]; }; rszr = attrs: { buildInputs = [ diff --git a/pkgs/development/ada-modules/gnatcoll/db.nix b/pkgs/development/ada-modules/gnatcoll/db.nix index 1a670b5abf60..3aa9995b4723 100644 --- a/pkgs/development/ada-modules/gnatcoll/db.nix +++ b/pkgs/development/ada-modules/gnatcoll/db.nix @@ -14,7 +14,7 @@ , gnatcoll-iconv , gnatcoll-readline , sqlite -, postgresql +, libpq }: let @@ -29,7 +29,7 @@ let ]; postgres = [ gnatcoll-sql - postgresql + libpq ]; sqlite = [ gnatcoll-sql diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index f916e0285dfa..ac258d26eae7 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -6,7 +6,7 @@ openssl, mlton, libmysqlclient, - postgresql, + libpq, sqlite, gcc, icu, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { openssl mlton libmysqlclient - postgresql + libpq sqlite icu ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { export CCARGS="-I$out/include \ -L${lib.getLib openssl}/lib \ -L${libmysqlclient}/lib \ - -L${postgresql.lib}/lib \ + -L${libpq}/lib \ -L${sqlite.out}/lib"; ''; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 937433329b7d..c9835f6c997b 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -53,6 +53,7 @@ libjpeg, libjxl, libmysqlclient, + libpq, libpng, libspatialite, libtiff, @@ -66,7 +67,6 @@ pcre2, pkg-config, poppler, - postgresql, proj, python3, qhull, @@ -153,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: { libhwy ]; mysqlDeps = lib.optionals useMysql [ libmysqlclient ]; - postgresDeps = lib.optionals usePostgres [ postgresql ]; + postgresDeps = lib.optionals usePostgres [ libpq ]; popplerDeps = lib.optionals usePoppler [ poppler ]; arrowDeps = lib.optionals useArrow [ arrow-cpp ]; hdfDeps = lib.optionals useHDF [ diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index dd2e88575c7b..ef74b9c5cc27 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -8,7 +8,7 @@ kcoreaddons, python3, sqlite, - postgresql, + libpq, libmysqlclient, qttools, }: @@ -44,7 +44,7 @@ mkDerivation rec { kcoreaddons python3 sqlite - postgresql + libpq libmysqlclient ]; diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index f0f23ec7953b..ea2aeae35218 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -24,11 +24,11 @@ mysqlSupport ? false, libmysqlclient ? null, postgresSupport ? false, - postgresql ? null, + libpq ? null, }: assert mysqlSupport -> libmysqlclient != null; -assert postgresSupport -> postgresql != null; +assert postgresSupport -> libpq != null; stdenv.mkDerivation rec { pname = "libgda"; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { libmysqlclient ] ++ lib.optionals postgresSupport [ - postgresql + libpq ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 8de4af61686b..1d3cb8f4aaa0 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -20,7 +20,7 @@ mysqlSupport ? false, libmysqlclient, postgresSupport ? false, - postgresql, + libpq, }: stdenv.mkDerivation rec { @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { libmysqlclient ] ++ lib.optionals postgresSupport [ - postgresql + libpq ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index ceac892f9934..e97125015879 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -13,7 +13,7 @@ gmp, libmysqlclient, withMysql ? false, - postgresql, + libpq, withPostgresql ? false, sqlite, withSqlite ? true, @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional withMysql libmysqlclient ++ lib.optional withSqlite sqlite - ++ lib.optional withPostgresql postgresql + ++ lib.optional withPostgresql libpq ++ lib.optional withBdb db; propagatedBuildInputs = [ librdf_rasqal ]; diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 8662434554ea..66bbceb2997f 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -22,7 +22,7 @@ sqlite, zlib, catch2, - postgresql, + libpq, protozero, sparsehash, }: @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { sqlite zlib libxml2 - postgresql + libpq protozero sparsehash ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index b8446fdd9556..6e695551b528 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -53,7 +53,7 @@ # optional dependencies cups ? null, - postgresql ? null, + libpq ? null, withGtk3 ? false, dconf, gtk3, @@ -162,7 +162,7 @@ stdenv.mkDerivation ( ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysqlSupport) libmysqlclient - ++ lib.optional (postgresql != null) postgresql; + ++ lib.optional (libpq != null) libpq; nativeBuildInputs = [ @@ -360,7 +360,7 @@ stdenv.mkDerivation ( # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag # if dependency paths contain the string "pq", which can occur in the hash. # To prevent these failures, we need to override PostgreSQL detection. - PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; + PSQL_LIBS = lib.optionalString (libpq != null) "-L${libpq}/lib -lpq"; } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { @@ -453,7 +453,7 @@ stdenv.mkDerivation ( "${openssl.dev}/include" "-system-sqlite" ''-${if mysqlSupport then "plugin" else "no"}-sql-mysql'' - ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' + ''-${if libpq != null then "plugin" else "no"}-sql-psql'' "-system-libpng" "-make libs" diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 5290c15fee37..2ea54d218c7c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -73,7 +73,7 @@ # optional dependencies cups, libmysqlclient, - postgresql, + libpq, withGtk3 ? false, gtk3, withLibinput ? false, @@ -176,9 +176,7 @@ stdenv.mkDerivation rec { ++ lib.optional withGtk3 gtk3 ++ lib.optional withLibinput libinput ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient - ++ lib.optional ( - postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql - ) postgresql; + ++ lib.optional (libpq != null && lib.meta.availableOn stdenv.hostPlatform libpq) libpq; nativeBuildInputs = [ bison diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index 7f4e7e01d1e9..bb9a91be24d9 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -3,7 +3,7 @@ fetchFromGitHub, fetchpatch, sqlite, - postgresql, + libpq, boost, darwin, lib, @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite - postgresql + libpq boost ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 60e786565a70..9b422f799d49 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qtbase, libharu -, pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl +, pango, fcgi, firebird, libmysqlclient, libpq, graphicsmagick, glew, openssl , pcre, harfbuzz, icu }: @@ -20,7 +20,7 @@ let nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost doxygen qtbase libharu - pango fcgi firebird libmysqlclient postgresql graphicsmagick glew + pango fcgi firebird libmysqlclient libpq graphicsmagick glew openssl pcre harfbuzz icu ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 54f0ea30053d..3f1d9a5e880e 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -30,6 +30,7 @@ , libmpack , libmysqlclient , libpsl +, libpq , libuuid , libuv , libxcrypt @@ -44,7 +45,6 @@ , openssl , pcre , pkg-config -, postgresql , readline , rustPlatform , sol2 @@ -361,7 +361,7 @@ in luadbi-postgresql = prev.luadbi-postgresql.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ - (lib.getDev postgresql) + (lib.getDev libpq) ]; }); diff --git a/pkgs/development/ocaml-modules/postgresql/default.nix b/pkgs/development/ocaml-modules/postgresql/default.nix index 25dddaed08c9..ab78b3f524a6 100644 --- a/pkgs/development/ocaml-modules/postgresql/default.nix +++ b/pkgs/development/ocaml-modules/postgresql/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, dune-configurator, postgresql }: +{ lib, fetchFromGitHub, buildDunePackage, dune-configurator, libpq }: buildDunePackage rec { pname = "postgresql"; @@ -15,9 +15,8 @@ buildDunePackage rec { sha256 = "1i4pnh2v00i0s7s9pcwz1x6s4xcd77d08gjjkvy0fmda6mqq6ghn"; }; - nativeBuildInputs = [ postgresql ]; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ postgresql ]; + propagatedBuildInputs = [ libpq ]; meta = { description = "Bindings to the PostgreSQL library"; diff --git a/pkgs/development/octave-modules/database/default.nix b/pkgs/development/octave-modules/database/default.nix index 0449c767e6d4..3bd6adb5d112 100644 --- a/pkgs/development/octave-modules/database/default.nix +++ b/pkgs/development/octave-modules/database/default.nix @@ -3,7 +3,7 @@ lib, fetchurl, struct, - postgresql, + libpq, }: buildOctavePackage rec { @@ -20,7 +20,7 @@ buildOctavePackage rec { ]; propagatedBuildInputs = [ - postgresql + libpq ]; requiredOctavePackages = [ diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix index df957c92c686..19c22876b93d 100644 --- a/pkgs/development/python-modules/pgsanity/default.nix +++ b/pkgs/development/python-modules/pgsanity/default.nix @@ -2,7 +2,7 @@ lib, fetchPypi, buildPythonPackage, - postgresql, + libpq, unittestCheckHook, }: @@ -18,12 +18,11 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook - postgresql ]; unittestFlagsArray = [ "test" ]; - propagatedBuildInputs = [ postgresql ]; + propagatedBuildInputs = [ libpq ]; meta = with lib; { homepage = "https://github.com/markdrago/pgsanity"; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index fcfa87b1a9b2..b25dd7e325e5 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -8,7 +8,7 @@ substituteAll, # build - postgresql, + libpq, setuptools, # propagates @@ -29,6 +29,7 @@ pproxy, pytest-randomly, pytestCheckHook, + postgresql, postgresqlTestHook, }: @@ -46,7 +47,7 @@ let patches = [ (substituteAll { src = ./ctypes.patch; - libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; + libpq = "${libpq}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; libc = "${stdenv.cc.libc}/lib/libc.so.6"; }) ]; @@ -74,13 +75,13 @@ let nativeBuildInputs = [ cython # needed to find pg_config with strictDeps - postgresql + libpq setuptools tomli ]; buildInputs = [ - postgresql + libpq ]; # tested in psycopg diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 618fbfdd19d5..bbbdca8d8591 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -18,7 +18,7 @@ # (to make gems behave if necessary). { lib, fetchurl, fetchpatch, fetchpatch2, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which -, libiconv, postgresql, nodejs, clang, sqlite, zlib, imagemagick, lasem +, libiconv, libpq, nodejs, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre2, gecode_3, curl , libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk3, lerc, buildRubyGem @@ -660,7 +660,7 @@ in # an unnecessary reference to the entire postgresql package. buildFlags = [ "--with-pg-config=ignore" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ postgresql ]; + buildInputs = [ libpq ]; }; psych = attrs: { @@ -813,7 +813,7 @@ in }; sequel_pg = attrs: { - buildInputs = [ postgresql ]; + buildInputs = [ libpq ]; }; snappy = attrs: { diff --git a/pkgs/games/ldmud/default.nix b/pkgs/games/ldmud/default.nix index de92518781fe..8287b3274c7d 100644 --- a/pkgs/games/ldmud/default.nix +++ b/pkgs/games/ldmud/default.nix @@ -16,7 +16,7 @@ , mysqlSupport ? false , libmysqlclient , postgresSupport ? false -, postgresql +, libpq , sqliteSupport ? false , sqlite , tlsSupport ? false @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { [ autoreconfHook pkg-config bison ]; buildInputs = [ libgcrypt libxcrypt pcre json_c libxml2 ] ++ lib.optional mccpSupport zlib ++ lib.optional mysqlSupport libmysqlclient - ++ lib.optional postgresSupport postgresql + ++ lib.optional postgresSupport libpq ++ lib.optional sqliteSupport sqlite ++ lib.optional tlsSupport openssl ++ lib.optional pythonSupport python310 ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index d40cb644cf4d..3b82179f73a3 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -4,7 +4,7 @@ lib, fetchurl, perl, - postgresql, + libpq, nixosTests, withPostgres ? true, ... @@ -36,7 +36,7 @@ callPackage ../nginx/generic.nix args rec { nativeBuildInputs = [ perl ]; - buildInputs = [ postgresql ]; + buildInputs = [ libpq ]; postPatch = '' patchShebangs configure bundle/ diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index ebfb9be622c6..6398b2c46171 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -25,7 +25,7 @@ withMySQL ? false, libmysqlclient, withPgSQL ? false, - postgresql, + libpq, withSQLite ? true, sqlite, withLua ? false, @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { inotify-tools ] ++ lib.optional withMySQL libmysqlclient - ++ lib.optional withPgSQL postgresql + ++ lib.optional withPgSQL libpq ++ lib.optional withSQLite sqlite ++ lib.optional withLua lua5_3; diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 0acf74133d9b..693e3163f4d0 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -10,7 +10,7 @@ lua5, perl, libmysqlclient, - postgresql, + libpq, sqlite, hiredis, enableLua ? true, @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { lua5 perl libmysqlclient - postgresql + libpq sqlite hiredis ]; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index bed6bcd27720..796d85a6d907 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -21,7 +21,7 @@ withLDAP ? true, openldap, withPgSQL ? false, - postgresql, + libpq, withMySQL ? false, libmysqlclient, withSQLite ? false, @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { libnsl pcre2 ] - ++ lib.optional withPgSQL postgresql + ++ lib.optional withPgSQL libpq ++ lib.optional withMySQL libmysqlclient ++ lib.optional withSQLite sqlite ++ lib.optional withLDAP openldap; diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index c5646a7b5b8b..a11ffc19070e 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -11,7 +11,7 @@ openssl, patchelf, mariadb-connector-c, - postgresql, + libpq, zlib, tzdata, # Databases @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { boost openssl systemd - ] ++ lib.optional withPostgresql postgresql; + ] ++ lib.optional withPostgresql libpq; nativeBuildInputs = [ cmake diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index c0ac7d46628b..c36ea2d16b5c 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -19,7 +19,7 @@ mysqlSupport ? false, libmysqlclient, postgresqlSupport ? false, - postgresql, + libpq, }: # ensure exactly one database type is selected @@ -55,7 +55,7 @@ import ./versions.nix ( ++ optional sqliteSupport sqlite ++ optional sshSupport libssh2 ++ optional mysqlSupport libmysqlclient - ++ optional postgresqlSupport postgresql; + ++ optional postgresqlSupport libpq; configureFlags = [ diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 9234354d4366..d3edb9d1b733 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -24,7 +24,7 @@ mysqlSupport ? false, libmysqlclient, postgresqlSupport ? false, - postgresql, + libpq, ipmiSupport ? false, openipmi, }: @@ -67,7 +67,7 @@ import ./versions.nix ( ++ optional snmpSupport net-snmp ++ optional sshSupport libssh2 ++ optional mysqlSupport libmysqlclient - ++ optional postgresqlSupport postgresql + ++ optional postgresqlSupport libpq ++ optional ipmiSupport openipmi; configureFlags = diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index 1d86bc472a36..6e3cedff3f21 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, pkgs, lib, node-pre-gyp, nodejs_18, pkg-config -, libjpeg, pixman, cairo, pango, which, postgresql }: +, libjpeg, pixman, cairo, pango, which, libpq }: let nodejs = nodejs_18; @@ -23,7 +23,7 @@ in myNodePackages.package.override { inherit version src; nativeBuildInputs = [ node-pre-gyp nodejs.pkgs.node-gyp-build pkg-config which ]; - buildInputs = [ libjpeg pixman cairo pango postgresql ]; + buildInputs = [ libjpeg pixman cairo pango libpq ]; postRebuild = '' # Build typescript stuff diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/servers/nominatim/default.nix index 55fd98d63667..afaf7d93b08e 100644 --- a/pkgs/servers/nominatim/default.nix +++ b/pkgs/servers/nominatim/default.nix @@ -13,7 +13,7 @@ pandoc, nlohmann_json, # Nominatim needs to be built with the same postgres version it will target - postgresql, + libpq, python3, php, lua, @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # python3Packages.pylint # We don't want to run pylint because the package could break on pylint bumps which is really annoying. # python3Packages.pytest # disabled since I can't get it to run tests anyway # python3Packages.behave # disabled since I can't get it to run tests anyway - postgresql + libpq ]; postPatch = '' diff --git a/pkgs/servers/sip/freeswitch/modules.nix b/pkgs/servers/sip/freeswitch/modules.nix index 12d71e6d749c..84ed7f1d2518 100644 --- a/pkgs/servers/sip/freeswitch/modules.nix +++ b/pkgs/servers/sip/freeswitch/modules.nix @@ -8,7 +8,7 @@ , curl , ffmpeg , libmysqlclient -, postgresql +, libpq , spandsp3 , sofia_sip , libks @@ -114,7 +114,7 @@ in databases = { mariadb = mk "databases/mod_mariadb" [ libmysqlclient ]; - pgsql = mk "databases/mod_pgsql" [ postgresql ]; + pgsql = mk "databases/mod_pgsql" [ libpq ]; }; dialplans = { diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index c964767ccf5f..cfff0f4a98b9 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -30,6 +30,8 @@ let ) ) versions; + libpq = self.callPackage ./libpq.nix { }; + in # variations without and with JIT -(mkAttributes false) // (mkAttributes true) +(mkAttributes false) // (mkAttributes true) // { inherit libpq; } diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix new file mode 100644 index 000000000000..0c064e45cf99 --- /dev/null +++ b/pkgs/servers/sql/postgresql/libpq.nix @@ -0,0 +1,146 @@ +{ + # utils + stdenv, + fetchurl, + lib, + + # runtime dependencies + openssl, + tzdata, + zlib, + + # build dependencies + bison, + flex, + perl, + pkg-config, + + # passthru / meta + postgresql, + + # GSSAPI + gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic, + libkrb5, + + # NLS + nlsSupport ? false, + gettext, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libpq"; + version = "17.2"; + + src = fetchurl { + url = "mirror://postgresql/source/v${finalAttrs.version}/postgresql-${finalAttrs.version}.tar.bz2"; + hash = "sha256-gu8nwK83UWldf2Ti2WNYMAX7tqDD32PQ5LQiEdcCEWQ="; + }; + + __structuredAttrs = true; + + hardeningEnable = lib.optionals (!stdenv.cc.isClang) [ "pie" ]; + + outputs = [ + "out" + "dev" + ]; + outputChecks.out = { + disallowedReferences = [ "dev" ]; + disallowedRequisites = [ + stdenv.cc + ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs)); + }; + + buildInputs = + [ + zlib + openssl + ] + ++ lib.optionals gssSupport [ libkrb5 ] + ++ lib.optionals nlsSupport [ gettext ]; + + nativeBuildInputs = [ + bison + flex + perl + pkg-config + ]; + + # causes random build failures + enableParallelBuilding = false; + + separateDebugInfo = true; + + buildFlags = [ + "submake-libpgport" + "submake-libpq" + ]; + + # libpgcommon.a and libpgport.a contain all paths normally returned by pg_config and are + # linked into all shared libraries. However, almost no binaries actually use those paths. + # The following flags will remove unused sections from all shared libraries - including + # those paths. This avoids a lot of circular dependency problems with different outputs, + # and allows splitting them cleanly. + env.CFLAGS = + "-fdata-sections -ffunction-sections" + + (if stdenv.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections"); + + configureFlags = + [ + "--enable-debug" + "--sysconfdir=/etc" + "--with-openssl" + "--with-system-tzdata=${tzdata}/share/zoneinfo" + "--without-icu" + "--without-perl" + "--without-readline" + ] + ++ lib.optionals gssSupport [ "--with-gssapi" ] + ++ lib.optionals nlsSupport [ "--enable-nls" ]; + + patches = lib.optionals stdenv.hostPlatform.isLinux [ + ./patches/socketdir-in-run-13+.patch + ]; + + installPhase = '' + runHook preInstall + + make -C src/bin/pg_config install + make -C src/common install + make -C src/include install + make -C src/interfaces/libpq install + make -C src/port install + + moveToOutput bin/pg_config "$dev" + moveToOutput "lib/*.a" "$dev" + + rm -rfv $out/share + rm -rfv $dev/lib/*_shlib.a + + runHook postInstall + ''; + + # PostgreSQL always builds both shared and static libs, so we delete those we don't want. + postInstall = + if stdenv.hostPlatform.isStatic then + '' + rm -rfv $out/lib/*.so* + touch $out/empty + '' + else + "rm -rfv $dev/lib/*.a"; + + doCheck = false; + + meta = { + inherit (postgresql.meta) + homepage + license + maintainers + platforms + ; + description = "C application programmer's interface to PostgreSQL"; + changelog = "https://www.postgresql.org/docs/release/${finalAttrs.version}/"; + pkgConfigModules = [ "libpq" ]; + }; +}) diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 6a8bd6f06daf..6f3b0548319e 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -4,7 +4,7 @@ rustPlatform, fetchFromGitHub, openssl, - postgresql, + libpq, libiconv, Security, SystemConfiguration, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { cargoHash = pinData.serverCargoHash; buildInputs = - [ postgresql ] + [ libpq ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 7e63b7565296..3cad735949a8 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, sqlite, - postgresql, + libpq, zlib, acl, ncurses, @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ - postgresql + libpq sqlite zlib ncurses @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sqlite3=${sqlite.dev}" - "--with-postgresql=${lib.getDev postgresql}" + "--with-postgresql=${lib.getDev libpq}" "--with-logdir=/var/log/bacula" "--with-working-dir=/var/lib/bacula" "--mandir=\${out}/share/man" diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 0180b9ddab77..2500e47f36cf 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -8,7 +8,7 @@ systemd ? null, ejabberd ? null, mariadb ? null, - postgresql ? null, + libpq ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, @@ -41,7 +41,7 @@ }: assert enableMySQLDatabase -> mariadb != null; -assert enablePostgreSQLDatabase -> postgresql != null; +assert enablePostgreSQLDatabase -> libpq != null; assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.isLinux systemd ++ lib.optional enableEjabberdDump ejabberd ++ lib.optional enableMySQLDatabase mariadb.out - ++ lib.optional enablePostgreSQLDatabase postgresql + ++ lib.optional enablePostgreSQLDatabase libpq ++ lib.optional enableSubversionRepository subversion ++ lib.optionals enableMongoDatabase [ mongodb diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index a7fe7db23777..20ee51f5fc42 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -13,7 +13,7 @@ SystemConfiguration, dbBackend ? "sqlite", libmysqlclient, - postgresql, + libpq, }: let @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ] ++ lib.optional (dbBackend == "mysql") libmysqlclient - ++ lib.optional (dbBackend == "postgresql") postgresql; + ++ lib.optional (dbBackend == "postgresql") libpq; buildFeatures = dbBackend; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 45b38f8e68f3..2a716b0ab3f2 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -19,6 +19,7 @@ gdk-pixbuf, liboping, libpcap, + libpq, libsigrok, libvirt, libxml2, @@ -31,7 +32,6 @@ openldap, openipmi, perl, - postgresql, protobufc, python3, rabbitmq-c, @@ -132,7 +132,7 @@ let perl.buildInputs = [ perl ]; pinba.buildInputs = [ protobufc ]; ping.buildInputs = [ liboping ]; - postgresql.buildInputs = [ postgresql ]; + postgresql.buildInputs = [ libpq ]; python.buildInputs = [ python3 ]; redis.buildInputs = [ hiredis ]; rrdcached.buildInputs = [ diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 3a4b1348e965..4231de8406c6 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -18,7 +18,7 @@ withMysql ? true, libmysqlclient, withPostgres ? true, - postgresql, + libpq, withDbi ? true, libdbi, withNetSnmp ? true, @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional withKrb5 libkrb5 ++ lib.optional withJemalloc jemalloc - ++ lib.optional withPostgres postgresql + ++ lib.optional withPostgres libpq ++ lib.optional withDbi libdbi ++ lib.optional withNetSnmp net-snmp ++ lib.optional withUuid libuuid diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix index c567b39b07d7..bf6867b5a9f0 100644 --- a/pkgs/tools/text/gawk/gawkextlib.nix +++ b/pkgs/tools/text/gawk/gawkextlib.nix @@ -20,7 +20,7 @@ glibcLocales, mpfr, more, - postgresql, + libpq, hiredis, expat, tre, @@ -165,7 +165,7 @@ let pgsql = buildExtension { inherit gawkextlib; name = "pgsql"; - extraBuildInputs = [ postgresql ]; + extraBuildInputs = [ libpq ]; }; redis = buildExtension { inherit gawkextlib; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ac7dbcaf39a..40a62065345e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1039,9 +1039,7 @@ with pkgs; systemd = pkgs.systemd; }; - nominatim = callPackage ../servers/nominatim { - postgresql = postgresql_14; - }; + nominatim = callPackage ../servers/nominatim { }; ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; @@ -11685,6 +11683,8 @@ with pkgs; postgresqlVersions = import ../servers/sql/postgresql pkgs; inherit (postgresqlVersions) + libpq + postgresql_13 postgresql_14 postgresql_15 diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d4314c3f9367..726fadf86573 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1540,7 +1540,7 @@ let posix-types = callPackage ../development/ocaml-modules/posix/types.nix { }; postgresql = callPackage ../development/ocaml-modules/postgresql { - inherit (pkgs) postgresql; + inherit (pkgs) libpq; }; pp = callPackage ../development/ocaml-modules/pp { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5dc84c34b3e0..fa54c92cf06d 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -20,6 +20,7 @@ libffi, libiconv, libkrb5, + libpq, libsodium, libxml2, libxslt, @@ -33,7 +34,6 @@ overrideSDK, pam, pcre2, - postgresql, bison, re2c, readline, @@ -351,7 +351,6 @@ lib.makeScope pkgs.newScope ( configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; internalDeps = [ php.extensions.pdo ]; - postPatch = '' sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 ''; @@ -635,7 +634,8 @@ lib.makeScope pkgs.newScope ( { name = "pdo_pgsql"; internalDeps = [ php.extensions.pdo ]; - configureFlags = [ "--with-pdo-pgsql=${lib.getDev postgresql}" ]; + buildInputs = [ libpq ]; + configureFlags = [ "--with-pdo-pgsql=${lib.getDev libpq}" ]; doCheck = false; } { @@ -647,8 +647,11 @@ lib.makeScope pkgs.newScope ( } { name = "pgsql"; - buildInputs = [ pcre2 ]; - configureFlags = [ "--with-pgsql=${lib.getDev postgresql}" ]; + buildInputs = [ + pcre2 + libpq + ]; + configureFlags = [ "--with-pgsql=${lib.getDev libpq}" ]; doCheck = false; } { From b12e9707e0bafae6f0c2d841caafc76bf9b4b16c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 12 Jan 2025 13:54:00 +0100 Subject: [PATCH 189/280] treewide: replace substituteAll with replaceVars (part 3) Driving #237216 forward. --- pkgs/by-name/ac/accountsservice/package.nix | 5 ++--- pkgs/by-name/al/alvr/package.nix | 5 ++--- pkgs/by-name/ap/appstream-glib/package.nix | 5 ++--- pkgs/by-name/cc/ccache/package.nix | 5 ++--- pkgs/by-name/cm/cmake/package.nix | 5 ++--- pkgs/by-name/fl/flatpak/package.nix | 11 ++++------- pkgs/by-name/fo/formatter/package.nix | 5 ++--- pkgs/by-name/gd/gdm/package.nix | 8 +++----- pkgs/by-name/gl/glib-networking/package.nix | 5 ++--- pkgs/by-name/gn/gnome-control-center/package.nix | 5 ++--- pkgs/by-name/gn/gnome-desktop/package.nix | 5 ++--- pkgs/by-name/gn/gnome-initial-setup/package.nix | 5 ++--- pkgs/by-name/gn/gnome-pomodoro/package.nix | 5 ++--- pkgs/by-name/gn/gnome-session/package.nix | 5 ++--- pkgs/by-name/gn/gnome-settings-daemon/package.nix | 5 ++--- pkgs/by-name/gn/gnome-settings-daemon46/package.nix | 5 ++--- pkgs/by-name/gn/gnome-shell-extensions/package.nix | 8 +++----- pkgs/by-name/gn/gnome-shell/package.nix | 5 ++--- pkgs/by-name/gn/gnome-software/package.nix | 5 ++--- pkgs/by-name/go/google-cloud-cpp/package.nix | 5 ++--- pkgs/by-name/gp/gparted/package.nix | 5 ++--- pkgs/by-name/gu/gusb/package.nix | 5 ++--- pkgs/by-name/gv/gvfs/package.nix | 5 ++--- pkgs/by-name/ha/hare/package.nix | 11 ++++------- pkgs/by-name/ha/haredo/package.nix | 5 ++--- pkgs/by-name/ho/howard-hinnant-date/package.nix | 5 ++--- pkgs/by-name/in/iniparser/package.nix | 5 ++--- pkgs/by-name/is/isc-cron/package.nix | 5 ++--- pkgs/by-name/jo/john/package.nix | 5 ++--- pkgs/by-name/ke/keepass/package.nix | 5 ++--- pkgs/by-name/la/lalrpop/package.nix | 5 ++--- pkgs/by-name/li/libosinfo/package.nix | 5 ++--- pkgs/by-name/me/metacity/package.nix | 5 ++--- pkgs/by-name/mi/minigalaxy/package.nix | 5 ++--- pkgs/by-name/mi/mirakurun/package.nix | 5 ++--- pkgs/by-name/mu/muffin/package.nix | 5 ++--- pkgs/by-name/mu/music-assistant/package.nix | 5 ++--- pkgs/by-name/na/nautilus-python/package.nix | 5 ++--- pkgs/by-name/nu/nut/package.nix | 5 ++--- pkgs/by-name/oc/octoprint/package.nix | 8 +++----- pkgs/by-name/on/onboard/package.nix | 5 ++--- pkgs/by-name/or/orca/package.nix | 5 ++--- pkgs/by-name/pa/patchPpdFilesHook/test.nix | 8 +++----- pkgs/by-name/pl/plymouth/package.nix | 5 ++--- pkgs/by-name/po/podman/package.nix | 5 ++--- pkgs/by-name/pr/pretix/plugins/passbook.nix | 5 ++--- pkgs/by-name/st/streamlink/package.nix | 5 ++--- pkgs/by-name/sw/sway-unwrapped/package.nix | 5 ++--- pkgs/by-name/sw/swayfx-unwrapped/package.nix | 5 ++--- pkgs/by-name/um/umockdev/package.nix | 5 ++--- pkgs/by-name/xs/xscreensaver/package.nix | 5 ++--- 51 files changed, 110 insertions(+), 169 deletions(-) diff --git a/pkgs/by-name/ac/accountsservice/package.nix b/pkgs/by-name/ac/accountsservice/package.nix index 6456657b7afa..c236ebf9c706 100644 --- a/pkgs/by-name/ac/accountsservice/package.nix +++ b/pkgs/by-name/ac/accountsservice/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, pkg-config, glib, shadow, @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { patches = [ # Hardcode dependency paths. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit shadow coreutils; }) diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix index 61186040a144..5b72149d2aad 100644 --- a/pkgs/by-name/al/alvr/package.nix +++ b/pkgs/by-name/al/alvr/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - substituteAll, + replaceVars, nix-update-script, pkg-config, autoAddDriverRunpath, @@ -59,8 +59,7 @@ rustPlatform.buildRustPackage rec { }; patches = [ - (substituteAll { - src = ./fix-finding-libs.patch; + (replaceVars ./fix-finding-libs.patch { ffmpeg = lib.getDev ffmpeg; x264 = lib.getDev x264; }) diff --git a/pkgs/by-name/ap/appstream-glib/package.nix b/pkgs/by-name/ap/appstream-glib/package.nix index 67f5f96c306e..1bee0504fcb8 100644 --- a/pkgs/by-name/ap/appstream-glib/package.nix +++ b/pkgs/by-name/ap/appstream-glib/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, docbook_xml_dtd_42, docbook_xsl, fontconfig, @@ -74,8 +74,7 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { pngquant = "${pngquant}/bin/pngquant"; }) ]; diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index 1bee50d60c43..1143798f411e 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, binutils, asciidoctor, cmake, @@ -54,8 +54,7 @@ stdenv.mkDerivation (finalAttrs: { # Darwin. # Additionally, when cross compiling, the correct target prefix # needs to be set. - (substituteAll { - src = ./fix-objdump-path.patch; + (replaceVars ./fix-objdump-path.patch { objdump = "${binutils.bintools}/bin/${binutils.targetPrefix}objdump"; }) ]; diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index cae5089ffdfc..0ab0ec7868cf 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, substituteAll +, replaceVars , buildPackages , bzip2 , curlMinimal @@ -75,8 +75,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff # On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path. ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) ( - substituteAll { - src = ./007-darwin-bsd-ps-abspath.diff; + replaceVars ./007-darwin-bsd-ps-abspath.diff { ps = lib.getExe ps; }) ++ [ diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 7d31297d22b2..68946e0fa536 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -46,7 +46,7 @@ python3, shared-mime-info, socat, - substituteAll, + replaceVars, systemd, testers, valgrind, @@ -84,8 +84,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Hardcode paths used by tests and change test runtime generation to use files from Nix store. # https://github.com/flatpak/flatpak/issues/1460 - (substituteAll { - src = ./fix-test-paths.patch; + (replaceVars ./fix-test-paths.patch { inherit coreutils gettext @@ -98,8 +97,7 @@ stdenv.mkDerivation (finalAttrs: { }) # Hardcode paths used by Flatpak itself. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { p11kit = "${p11-kit.bin}/bin/p11-kit"; }) @@ -235,8 +233,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - icon-validator-patch = substituteAll { - src = ./fix-icon-validation.patch; + icon-validator-patch = replaceVars ./fix-icon-validation.patch { inherit (builtins) storeDir; }; diff --git a/pkgs/by-name/fo/formatter/package.nix b/pkgs/by-name/fo/formatter/package.nix index 744a0499707a..634ca15c9c3e 100644 --- a/pkgs/by-name/fo/formatter/package.nix +++ b/pkgs/by-name/fo/formatter/package.nix @@ -9,7 +9,7 @@ pkg-config, pantheon, python3, - substituteAll, + replaceVars, glib, gtk3, dosfstools, @@ -33,8 +33,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { ext4 = "${e2fsprogs}/bin/mkfs.ext4"; exfat = "${exfat}/bin/mkfs.exfat"; fat = "${dosfstools}/bin/mkfs.fat"; diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index cdf66774135a..9dc9e6d439a1 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, fetchpatch, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -35,8 +35,7 @@ let - override = substituteAll { - src = ./org.gnome.login-screen.gschema.override; + override = replaceVars ./org.gnome.login-screen.gschema.override { icon = "${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg"; }; @@ -105,8 +104,7 @@ stdenv.mkDerivation (finalAttrs: { }) # Change hardcoded paths to nix store paths. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit coreutils plymouth diff --git a/pkgs/by-name/gl/glib-networking/package.nix b/pkgs/by-name/gl/glib-networking/package.nix index 9bdaac3c3b4c..7aa64f0b0acf 100644 --- a/pkgs/by-name/gl/glib-networking/package.nix +++ b/pkgs/by-name/gl/glib-networking/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchurl, - substituteAll, + replaceVars, meson, ninja, nixosTests, @@ -33,8 +33,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./hardcode-gsettings.patch; + (replaceVars ./hardcode-gsettings.patch { gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas; }) diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index 090250d0cd23..981cd76dcdbe 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -2,7 +2,7 @@ fetchurl, lib, stdenv, - substituteAll, + replaceVars, accountsservice, adwaita-icon-theme, colord, @@ -82,8 +82,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { gcm = gnome-color-manager; inherit glibc tzdata shadow; inherit cups networkmanagerapplet; diff --git a/pkgs/by-name/gn/gnome-desktop/package.nix b/pkgs/by-name/gn/gnome-desktop/package.nix index 2d533759f60e..a7b599ae12a5 100644 --- a/pkgs/by-name/gn/gnome-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-desktop/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, pkg-config, libxslt, ninja, @@ -44,8 +44,7 @@ stdenv.mkDerivation rec { }; patches = lib.optionals stdenv.hostPlatform.isLinux [ - (substituteAll { - src = ./bubblewrap-paths.patch; + (replaceVars ./bubblewrap-paths.patch { bubblewrap_bin = "${bubblewrap}/bin/bwrap"; inherit (builtins) storeDir; }) diff --git a/pkgs/by-name/gn/gnome-initial-setup/package.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix index 0d96d8c1b701..e93c679ec4de 100644 --- a/pkgs/by-name/gn/gnome-initial-setup/package.nix +++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchurl, - substituteAll, + replaceVars, dconf, gettext, meson, @@ -45,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./0001-fix-paths.patch; + (replaceVars ./0001-fix-paths.patch { inherit tzdata; tecla = gnome-tecla; }) diff --git a/pkgs/by-name/gn/gnome-pomodoro/package.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix index 6c7ee5e23431..1a8cfe51201d 100644 --- a/pkgs/by-name/gn/gnome-pomodoro/package.nix +++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { patches = [ # Our glib setup hooks moves GSettings schemas to a subdirectory to prevent conflicts. # We need to patch the build script so that the extension can find them. - (substituteAll { - src = ./fix-schema-path.patch; + (replaceVars ./fix-schema-path.patch { inherit pname version; }) ]; diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index 4b4967c263ee..47842a419a7b 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -2,7 +2,7 @@ fetchurl, lib, stdenv, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -47,8 +47,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { gsettings = "${glib.bin}/bin/gsettings"; dbusLaunch = "${dbus.lib}/bin/dbus-launch"; bash = "${bash}/bin/bash"; diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix index e07a354c20ba..dbeaeb1115c6 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - substituteAll, + replaceVars, buildPackages, fetchurl, meson, @@ -54,8 +54,7 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 ./add-gnome-session-ctl-option.patch - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit tzdata; }) ]; diff --git a/pkgs/by-name/gn/gnome-settings-daemon46/package.nix b/pkgs/by-name/gn/gnome-settings-daemon46/package.nix index d7b00a0a2ef9..31a4fdb73a1d 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon46/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon46/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - substituteAll, + replaceVars, fetchurl, meson, ninja, @@ -51,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 ./add-gnome-session-ctl-option.patch - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit tzdata; }) ]; diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index 81e5cd2c8a34..2bc4bda52d9f 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -10,7 +10,7 @@ glib, gnome, gnome-menus, - substituteAll, + replaceVars, }: stdenv.mkDerivation (finalAttrs: { @@ -23,12 +23,10 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./fix_gmenu.patch; + (replaceVars ./fix_gmenu.patch { gmenu_path = "${gnome-menus}/lib/girepository-1.0"; }) - (substituteAll { - src = ./fix_gtop.patch; + (replaceVars ./fix_gtop.patch { gtop_path = "${libgtop}/lib/girepository-1.0"; }) ]; diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index e0db6fa1d6f1..ca1e5b62cf03 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -1,7 +1,7 @@ { fetchurl, fetchpatch, - substituteAll, + replaceVars, lib, stdenv, docutils, @@ -84,8 +84,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Hardcode paths to various dependencies so that they can be found at runtime. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { glib_compile_schemas = "${glib.dev}/bin/glib-compile-schemas"; gsettings = "${glib.bin}/bin/gsettings"; tecla = "${lib.getBin gnome-tecla}/bin/tecla"; diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index d265ff11611d..7936fc9a164e 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, pkg-config, meson, ninja, @@ -56,8 +56,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit isocodes; }) ]; diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix index 83f55078d6a6..3b8a0fe9f0f4 100644 --- a/pkgs/by-name/go/google-cloud-cpp/package.nix +++ b/pkgs/by-name/go/google-cloud-cpp/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, c-ares, cmake, crc32c, @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./hardcode-googleapis-path.patch; + (replaceVars ./hardcode-googleapis-path.patch { url = googleapis; }) ]; diff --git a/pkgs/by-name/gp/gparted/package.nix b/pkgs/by-name/gp/gparted/package.nix index d5e5ffcc0ed7..2d5307de45f2 100644 --- a/pkgs/by-name/gp/gparted/package.nix +++ b/pkgs/by-name/gp/gparted/package.nix @@ -20,7 +20,7 @@ util-linux, polkit, wrapGAppsHook3, - substituteAll, + replaceVars, mtools, dosfstools, xhost, @@ -39,8 +39,7 @@ stdenv.mkDerivation rec { # however the binary won't be suid so it returns # an error preventing the program from detection patches = [ - (substituteAll { - src = ./polkit.patch; + (replaceVars ./polkit.patch { polkit_version = polkit.version; }) ]; diff --git a/pkgs/by-name/gu/gusb/package.nix b/pkgs/by-name/gu/gusb/package.nix index c13c40baed3d..bbc21fcc2104 100644 --- a/pkgs/by-name/gu/gusb/package.nix +++ b/pkgs/by-name/gu/gusb/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -46,8 +46,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-python-path.patch; + (replaceVars ./fix-python-path.patch { python = "${pythonEnv}/bin/python3"; }) ]; diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix index e70cccc2568b..7045b0f487b8 100644 --- a/pkgs/by-name/gv/gvfs/package.nix +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -5,7 +5,7 @@ meson, ninja, pkg-config, - substituteAll, + replaceVars, gettext, dbus, glib, @@ -55,8 +55,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./hardcode-ssh-path.patch; + (replaceVars ./hardcode-ssh-path.patch { ssh_program = "${lib.getBin openssh}/bin/ssh"; }) ]; diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix index 763d8638fd58..30472742a2a0 100644 --- a/pkgs/by-name/ha/hare/package.nix +++ b/pkgs/by-name/ha/hare/package.nix @@ -6,7 +6,7 @@ scdoc, tzdata, mailcap, - substituteAll, + replaceVars, callPackage, enableCrossCompilation ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit), pkgsCross, @@ -92,22 +92,19 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Replace FHS paths with nix store - (substituteAll { - src = ./001-tzdata.patch; + (replaceVars ./001-tzdata.patch { inherit tzdata; }) # Don't build haredoc since it uses the build `hare` bin, which breaks # cross-compilation. ./002-dont-build-haredoc.patch # Hardcode harec and qbe. - (substituteAll { - src = ./003-hardcode-qbe-and-harec.patch; + (replaceVars ./003-hardcode-qbe-and-harec.patch { harec_bin = lib.getExe harec; qbe_bin = lib.getExe qbe; }) # Use mailcap `/etc/mime.types` for Hare's mime module - (substituteAll { - src = ./004-use-mailcap-for-mimetypes.patch; + (replaceVars ./004-use-mailcap-for-mimetypes.patch { inherit mailcap; }) ]; diff --git a/pkgs/by-name/ha/haredo/package.nix b/pkgs/by-name/ha/haredo/package.nix index a6ef926c85b9..ee937f9a0c3c 100644 --- a/pkgs/by-name/ha/haredo/package.nix +++ b/pkgs/by-name/ha/haredo/package.nix @@ -7,7 +7,7 @@ nix-update-script, makeWrapper, bash, - substituteAll, + replaceVars, }: stdenv.mkDerivation (finalAttrs: { pname = "haredo"; @@ -27,8 +27,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Use nix store's bash instead of sh. `@bash@/bin/sh` is used, since haredo expects a posix shell. - (substituteAll { - src = ./001-use-nix-store-sh.patch; + (replaceVars ./001-use-nix-store-sh.patch { inherit bash; }) ]; diff --git a/pkgs/by-name/ho/howard-hinnant-date/package.nix b/pkgs/by-name/ho/howard-hinnant-date/package.nix index 0387bad95e0e..d4bc072db377 100644 --- a/pkgs/by-name/ho/howard-hinnant-date/package.nix +++ b/pkgs/by-name/ho/howard-hinnant-date/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, tzdata, fetchpatch, substituteAll }: +{ lib, stdenv, fetchFromGitHub, cmake, tzdata, fetchpatch, replaceVars }: stdenv.mkDerivation rec { pname = "howard-hinnant-date"; @@ -22,8 +22,7 @@ stdenv.mkDerivation rec { # Without this patch, this library will drop a `tzdata` directory into # `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it # searches for `zoneinfo` be the one from the `tzdata` package. - (substituteAll { - src = ./make-zoneinfo-available.diff; + (replaceVars ./make-zoneinfo-available.diff { inherit tzdata; }) ]; diff --git a/pkgs/by-name/in/iniparser/package.nix b/pkgs/by-name/in/iniparser/package.nix index b0bb4dce192f..ca36474af0d9 100644 --- a/pkgs/by-name/in/iniparser/package.nix +++ b/pkgs/by-name/in/iniparser/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitLab, fetchFromGitHub, - substituteAll, + replaceVars, symlinkJoin, cmake, doxygen, @@ -24,9 +24,8 @@ stdenv.mkDerivation (finalAttrs: { }; patches = lib.optionals finalAttrs.finalPackage.doCheck [ - (substituteAll { + (replaceVars ./remove-fetchcontent-usage.patch { # Do not let cmake's fetchContent download unity - src = ./remove-fetchcontent-usage.patch; unitySrc = symlinkJoin { name = "unity-with-iniparser-config"; paths = [ diff --git a/pkgs/by-name/is/isc-cron/package.nix b/pkgs/by-name/is/isc-cron/package.nix index 61633c6c9c88..94d25e516500 100644 --- a/pkgs/by-name/is/isc-cron/package.nix +++ b/pkgs/by-name/is/isc-cron/package.nix @@ -2,7 +2,7 @@ lib, fetchurl, stdenv, - substituteAll, + replaceVars, vim, sendmailPath ? "/usr/sbin/sendmail", }: @@ -17,8 +17,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./0000-nixpkgs-specific.diff; + (replaceVars ./0000-nixpkgs-specific.diff { inherit sendmailPath; viPath = lib.getExe' vim "vim"; defPath = lib.concatStringsSep ":" [ diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix index 5f27e61ec39f..7fb41a69d582 100644 --- a/pkgs/by-name/jo/john/package.nix +++ b/pkgs/by-name/jo/john/package.nix @@ -19,7 +19,7 @@ ocl-icd, # include non-free ClamAV unrar code enableUnfree ? false, - substituteAll, + replaceVars, makeWrapper, }: @@ -35,8 +35,7 @@ stdenv.mkDerivation rec { }; patches = lib.optionals withOpenCL [ - (substituteAll { - src = ./opencl.patch; + (replaceVars ./opencl.patch { ocl_icd = ocl-icd; }) ]; diff --git a/pkgs/by-name/ke/keepass/package.nix b/pkgs/by-name/ke/keepass/package.nix index fc3bd1ff7fe6..e7bfa51c4923 100644 --- a/pkgs/by-name/ke/keepass/package.nix +++ b/pkgs/by-name/ke/keepass/package.nix @@ -6,7 +6,7 @@ mono, makeWrapper, icoutils, - substituteAll, + replaceVars, xsel, xorg, xdotool, @@ -37,8 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ icoutils ]; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { xsel = "${xsel}/bin/xsel"; xprop = "${xorg.xprop}/bin/xprop"; xdotool = "${xdotool}/bin/xdotool"; diff --git a/pkgs/by-name/la/lalrpop/package.nix b/pkgs/by-name/la/lalrpop/package.nix index dc523c5967e6..c7c97c7880b9 100644 --- a/pkgs/by-name/la/lalrpop/package.nix +++ b/pkgs/by-name/la/lalrpop/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - substituteAll, + replaceVars, stdenv, }: @@ -20,8 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-zkPLas+fQQzm7LlWNpTooUR/e30KMS9OET6PMwQ2yAA="; patches = [ - (substituteAll { - src = ./use-correct-binary-path-in-tests.patch; + (replaceVars ./use-correct-binary-path-in-tests.patch { target_triple = stdenv.hostPlatform.rust.rustcTarget; }) ]; diff --git a/pkgs/by-name/li/libosinfo/package.nix b/pkgs/by-name/li/libosinfo/package.nix index 93cb538b5909..c48b1d2c739a 100644 --- a/pkgs/by-name/li/libosinfo/package.nix +++ b/pkgs/by-name/li/libosinfo/package.nix @@ -19,7 +19,7 @@ perl, hwdata, osinfo-db, - substituteAll, + replaceVars, vala ? null, }: @@ -61,8 +61,7 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./osinfo-db-data-dir.patch; + (replaceVars ./osinfo-db-data-dir.patch { osinfo_db_data_dir = "${osinfo-db}/share"; }) diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix index ecdf42ecbad6..8a7248287a8d 100644 --- a/pkgs/by-name/me/metacity/package.nix +++ b/pkgs/by-name/me/metacity/package.nix @@ -13,7 +13,7 @@ libstartup_notification, libxml2, pkg-config, - substituteAll, + replaceVars, wrapGAppsHook3, zenity, }: @@ -28,8 +28,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit zenity; }) ]; diff --git a/pkgs/by-name/mi/minigalaxy/package.nix b/pkgs/by-name/mi/minigalaxy/package.nix index 05ff14a6b82d..131bd375418b 100644 --- a/pkgs/by-name/mi/minigalaxy/package.nix +++ b/pkgs/by-name/mi/minigalaxy/package.nix @@ -8,7 +8,7 @@ libnotify, python3Packages, steam-run, - substituteAll, + replaceVars, unzip, webkitgtk_4_0, wrapGAppsHook3, @@ -26,8 +26,7 @@ python3Packages.buildPythonApplication rec { }; patches = [ - (substituteAll { - src = ./inject-launcher-steam-run.diff; + (replaceVars ./inject-launcher-steam-run.diff { steamrun = lib.getExe steam-run; }) ]; diff --git a/pkgs/by-name/mi/mirakurun/package.nix b/pkgs/by-name/mi/mirakurun/package.nix index c01ea18ba8c6..0ae8bc87856c 100644 --- a/pkgs/by-name/mi/mirakurun/package.nix +++ b/pkgs/by-name/mi/mirakurun/package.nix @@ -7,7 +7,7 @@ installShellFiles, makeWrapper, nodejs, - substituteAll, + replaceVars, v4l-utils, which, }: @@ -46,8 +46,7 @@ buildNpmPackage rec { nodejs which ] ++ lib.optionals stdenv.hostPlatform.isLinux [ v4l-utils ]; - crc32Patch = substituteAll { - src = ./fix-musl-detection.patch; + crc32Patch = replaceVars ./fix-musl-detection.patch { isMusl = if stdenv.hostPlatform.isMusl then "true" else "false"; }; in diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix index 69654afc27e3..ad233c8a85aa 100644 --- a/pkgs/by-name/mu/muffin/package.nix +++ b/pkgs/by-name/mu/muffin/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitHub, - substituteAll, + replaceVars, cairo, cinnamon-desktop, dbus, @@ -58,8 +58,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit zenity; }) ]; diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 20c46046506d..69c5e8566c7a 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, ffmpeg-headless, nixosTests, - substituteAll, + replaceVars, providers ? [ ], }: @@ -38,8 +38,7 @@ python.pkgs.buildPythonApplication rec { }; patches = [ - (substituteAll { - src = ./ffmpeg.patch; + (replaceVars ./ffmpeg.patch { ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg"; ffprobe = "${lib.getBin ffmpeg-headless}/bin/ffprobe"; }) diff --git a/pkgs/by-name/na/nautilus-python/package.nix b/pkgs/by-name/na/nautilus-python/package.nix index f501181da597..ccc6f2d23e5e 100644 --- a/pkgs/by-name/na/nautilus-python/package.nix +++ b/pkgs/by-name/na/nautilus-python/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - substituteAll, + replaceVars, fetchurl, meson, ninja, @@ -32,8 +32,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Make PyGObject’s gi library available. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [ python3.pkgs.pygobject3 ]; diff --git a/pkgs/by-name/nu/nut/package.nix b/pkgs/by-name/nu/nut/package.nix index 998549a84e96..bdb6a0f792ef 100644 --- a/pkgs/by-name/nu/nut/package.nix +++ b/pkgs/by-name/nu/nut/package.nix @@ -17,7 +17,7 @@ net-snmp, openssl, pkg-config, - substituteAll, + replaceVars, systemd, udev, gnused, @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { # trying to install directly into /etc/nut which predictably fails ./nutshutdown-conf-default.patch - (substituteAll { - src = ./hardcode-paths.patch; + (replaceVars ./hardcode-paths.patch { avahi = "${avahi}/lib"; freeipmi = "${freeipmi}/lib"; libgpiod = "${libgpiod_1}/lib"; diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix index e3fd3bc3bdee..4a9d9b5d02b7 100644 --- a/pkgs/by-name/oc/octoprint/package.nix +++ b/pkgs/by-name/oc/octoprint/package.nix @@ -6,7 +6,7 @@ fetchFromGitHub, fetchPypi, python3, - substituteAll, + replaceVars, nix-update-script, nixosTests, # To include additional plugins, pass them here as an overlay. @@ -194,14 +194,12 @@ let patches = [ # substitute pip and let it find out, that it can't write anywhere - (substituteAll { - src = ./pip-path.patch; + (replaceVars ./pip-path.patch { pip = "${self.pip}/bin/pip"; }) # hardcore path to ffmpeg and hide related settings - (substituteAll { - src = ./ffmpeg-path.patch; + (replaceVars ./ffmpeg-path.patch { ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; }) ]; diff --git a/pkgs/by-name/on/onboard/package.nix b/pkgs/by-name/on/onboard/package.nix index 57fcce1ca6ea..7a2e35306d84 100644 --- a/pkgs/by-name/on/onboard/package.nix +++ b/pkgs/by-name/on/onboard/package.nix @@ -3,7 +3,7 @@ fetchpatch, stdenv, lib, - substituteAll, + replaceVars, aspellWithDicts, at-spi2-core ? null, atspiSupport ? true, @@ -51,8 +51,7 @@ python3.pkgs.buildPythonApplication rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit mousetweaks; }) # Allow loading hunspell dictionaries installed in NixOS system path diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 2865233be1c6..4d20ca75d163 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -12,7 +12,7 @@ python3, gtk3, gnome, - substituteAll, + replaceVars, at-spi2-atk, at-spi2-core, dbus, @@ -39,8 +39,7 @@ python3.pkgs.buildPythonApplication rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { cat = "${coreutils}/bin/cat"; lsof = "${lsof}/bin/lsof"; pgrep = "${procps}/bin/pgrep"; diff --git a/pkgs/by-name/pa/patchPpdFilesHook/test.nix b/pkgs/by-name/pa/patchPpdFilesHook/test.nix index edb324ecdd8f..ae49114a296a 100644 --- a/pkgs/by-name/pa/patchPpdFilesHook/test.nix +++ b/pkgs/by-name/pa/patchPpdFilesHook/test.nix @@ -1,21 +1,19 @@ { - substituteAll, + replaceVars, diffutils, stdenv, patchPpdFilesHook, }: let - input = substituteAll { - src = ./test.ppd; + input = replaceVars ./test.ppd { keep = "cmp"; patch = "cmp"; pathkeep = "/bin/cmp"; pathpatch = "/bin/cmp"; }; - output = substituteAll { - src = ./test.ppd; + output = replaceVars ./test.ppd { keep = "cmp"; patch = "${diffutils}/bin/cmp"; pathkeep = "/bin/cmp"; diff --git a/pkgs/by-name/pl/plymouth/package.nix b/pkgs/by-name/pl/plymouth/package.nix index ae5e4ee2339c..27251284df3f 100644 --- a/pkgs/by-name/pl/plymouth/package.nix +++ b/pkgs/by-name/pl/plymouth/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitLab, writeText, - substituteAll, + replaceVars, meson, pkg-config, ninja, @@ -44,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: { # add support for loading plugins from /run to assist NixOS module ./add-runtime-plugin-path.patch # fix FHS hardcoded paths - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { fcmatch = "${fontconfig}/bin/fc-match"; }) ]; diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 3786188d9f0b..428c57edbd5a 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -19,7 +19,7 @@ makeWrapper, runtimeShell, symlinkJoin, - substituteAll, + replaceVars, extraPackages ? [ ], crun, runc, @@ -85,8 +85,7 @@ buildGoModule rec { }; patches = [ - (substituteAll { - src = ./hardcode-paths.patch; + (replaceVars ./hardcode-paths.patch { bin_path = helpersBin; }) diff --git a/pkgs/by-name/pr/pretix/plugins/passbook.nix b/pkgs/by-name/pr/pretix/plugins/passbook.nix index d5ca08315f18..d890a71f46ce 100644 --- a/pkgs/by-name/pr/pretix/plugins/passbook.nix +++ b/pkgs/by-name/pr/pretix/plugins/passbook.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, # build-system pretix-plugin-build, @@ -29,8 +29,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./passbook-openssl.patch; + (replaceVars ./passbook-openssl.patch { openssl = lib.getExe openssl; }) ]; diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix index 12bdb22405ec..af58119e5228 100644 --- a/pkgs/by-name/st/streamlink/package.nix +++ b/pkgs/by-name/st/streamlink/package.nix @@ -2,7 +2,7 @@ lib, python3Packages, fetchPypi, - substituteAll, + replaceVars, ffmpeg, }: @@ -17,8 +17,7 @@ python3Packages.buildPythonApplication rec { }; patches = [ - (substituteAll { - src = ./ffmpeg-path.patch; + (replaceVars ./ffmpeg-path.patch { ffmpeg = lib.getExe ffmpeg; }) ]; diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 5c92b8ac5848..482d8b8fb550 100644 --- a/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg +{ lib, stdenv, fetchFromGitHub, fetchpatch, replaceVars, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc , libGL, wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, gdk-pixbuf, librsvg @@ -26,8 +26,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./load-configuration-from-etc.patch - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit swaybg; }) diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix index f771a0101e24..0742dec1df1e 100644 --- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix +++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix @@ -4,7 +4,7 @@ stdenv, systemd, meson, - substituteAll, + replaceVars, swaybg, ninja, pkg-config, @@ -57,8 +57,7 @@ stdenv.mkDerivation (finalAttrs: { [ ./load-configuration-from-etc.patch - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit swaybg; }) ] diff --git a/pkgs/by-name/um/umockdev/package.nix b/pkgs/by-name/um/umockdev/package.nix index 99086e0f2788..0423783df48f 100644 --- a/pkgs/by-name/um/umockdev/package.nix +++ b/pkgs/by-name/um/umockdev/package.nix @@ -13,7 +13,7 @@ ninja, pkg-config, python3, - substituteAll, + replaceVars, systemdMinimal, usbutils, vala, @@ -44,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: { # Replace references to udevadm with an absolute paths, so programs using # umockdev will just work without having to provide it in their test environment # $PATH. - (substituteAll { - src = ./substitute-udevadm.patch; + (replaceVars ./substitute-udevadm.patch { udevadm = "${systemdMinimal}/bin/udevadm"; }) ]; diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix index f3528d816090..40c26029e8e7 100644 --- a/pkgs/by-name/xs/xscreensaver/package.nix +++ b/pkgs/by-name/xs/xscreensaver/package.nix @@ -29,7 +29,7 @@ forceInstallAllHacks ? true, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, nixosTests, - substituteAll, + replaceVars, wrapperPrefix ? "/run/wrappers/bin", }: @@ -83,8 +83,7 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = [ - (substituteAll { - src = ./xscreensaver-wrapper-prefix.patch; + (replaceVars ./xscreensaver-wrapper-prefix.patch { inherit wrapperPrefix; }) ]; From 3f8254ef7d477180f12dde9e0b96eda2a4258f43 Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Sun, 19 Jan 2025 15:29:40 +0100 Subject: [PATCH 190/280] lvm2: fix inclusion of nixosTests.lvm2 in tests --- pkgs/os-specific/linux/lvm2/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 379d1614878e..a4774e6c3362 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -24,6 +24,7 @@ enableMultipath ? false, multipath-tools, nixosTests, + recurseIntoAttrs, }: # configure: error: --enable-dmeventd requires --enable-cmdlib to be used as well @@ -181,7 +182,7 @@ stdenv.mkDerivation rec { passthru.tests = { installer = nixosTests.installer.lvm; - lvm2 = nixosTests.lvm2; + lvm2 = recurseIntoAttrs nixosTests.lvm2; }; meta = with lib; { From 16b5545f9f5156548019edbbf6908cb147acbbcc Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Tue, 17 Sep 2024 14:50:58 +0200 Subject: [PATCH 191/280] python312Packages.eth-typing: 5.0.1 -> 5.1.0 --- .../python-modules/eth-typing/default.nix | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 0bc0c8f69bd6..19d4101c83c3 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -1,40 +1,48 @@ { lib, - fetchFromGitHub, buildPythonPackage, - pythonOlder, - pytestCheckHook, - typing-extensions, + fetchFromGitHub, setuptools, + # dependencies + typing-extensions, + # nativeCheckInputs + pytestCheckHook, + pytest-xdist, }: buildPythonPackage rec { pname = "eth-typing"; - version = "5.0.1"; + version = "5.1.0"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "ethereum"; repo = "eth-typing"; tag = "v${version}"; - hash = "sha256-WFTx5u85Gp+jQPWS3BTk1Pky07C2fVAzwrG/c3hSRzM="; + hash = "sha256-IOWd6WFPAYO+VZwlMilRVHtudEjHt5p8Xu4WloFB/ww="; }; build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; - dependencies = [ typing-extensions ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ]; + pythonImportsCheck = [ "eth_typing" ]; - meta = with lib; { + disabledTests = [ + # side-effect: runs pip online check and is blocked by sandbox + "test_install_local_wheel" + ]; + + meta = { description = "Common type annotations for Ethereum Python packages"; homepage = "https://github.com/ethereum/eth-typing"; changelog = "https://github.com/ethereum/eth-typing/blob/v${version}/docs/release_notes.rst"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ siraben ]; }; } From 4ee019941b6efe7e69c98dae0a7744a0afda6961 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Tue, 17 Sep 2024 15:03:06 +0200 Subject: [PATCH 192/280] python312Packages.eth-utils: tidy code up --- .../python-modules/eth-utils/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index feb07cbac013..b170e2443b30 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -1,33 +1,33 @@ { lib, - fetchFromGitHub, buildPythonPackage, + fetchFromGitHub, + setuptools, + isPyPy, + # dependencies eth-hash, eth-typing, cytoolz, - hypothesis, - isPyPy, - pytestCheckHook, - pythonOlder, - setuptools, toolz, + # nativeCheckInputs + hypothesis, mypy, + pytestCheckHook, }: buildPythonPackage rec { pname = "eth-utils"; version = "5.1.0"; pyproject = true; - disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-utils"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-uPzg1gUEsulQL2u22R/REHWx1ZtbMxvcXf6UgWqkDF4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ @@ -39,8 +39,8 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - pytestCheckHook mypy + pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome; pythonImportsCheck = [ "eth_utils" ]; From 63b42ea0e745ec1066260cc7fecb54350da6158a Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Tue, 17 Sep 2024 14:43:17 +0200 Subject: [PATCH 193/280] python312Packages.eth-account: 0.9.0 -> 0.13.4 --- .../python-modules/eth-account/default.nix | 49 ++++++++++++++----- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix index 7be6722f233b..918100ec7f57 100644 --- a/pkgs/development/python-modules/eth-account/default.nix +++ b/pkgs/development/python-modules/eth-account/default.nix @@ -2,33 +2,42 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + # dependencies bitarray, + ckzg, eth-abi, eth-keyfile, eth-keys, eth-rlp, eth-utils, - websockets, hexbytes, - pythonOlder, rlp, + websockets, + # nativeCheckInputs + hypothesis, + pydantic, + pytestCheckHook, + pytest-xdist, }: buildPythonPackage rec { pname = "eth-account"; - version = "0.9.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "0.13.4"; + pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-account"; - rev = "v${version}"; - hash = "sha256-Ps/vzJv0W1+wy1mSJaqRNNU6CoCMchReHIocB9kPrGs="; + tag = "v${version}"; + hash = "sha256-Y55WCgWJd2AaDNKbyBe9oi1soT19RdUjQWy5884Pcq8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ bitarray + ckzg eth-abi eth-keyfile eth-keys @@ -39,15 +48,29 @@ buildPythonPackage rec { websockets ]; - # require buildinga npm project - doCheck = false; + nativeCheckInputs = [ + hypothesis + pydantic + pytestCheckHook + pytest-xdist + ]; + + disabledTests = [ + # requires local nodejs install + "test_messages_where_all_3_sigs_match" + "test_messages_where_eth_account_matches_ethers_but_not_metamask" + "test_messages_where_eth_account_matches_metamask_but_not_ethers" + # disable flaky fuzzing test + "test_compatibility" + ]; pythonImportsCheck = [ "eth_account" ]; - meta = with lib; { + meta = { description = "Account abstraction library for web3.py"; homepage = "https://github.com/ethereum/eth-account"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/ethereum/eth-account/blob/v${version}/docs/release_notes.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; }; } From 30acf4b8f0db2e3bac5a37feab120152024c4eb1 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Fri, 27 Sep 2024 04:25:42 +0200 Subject: [PATCH 194/280] python312Packages.eth-bloom: init at 3.1.0 --- .../python-modules/eth-bloom/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/eth-bloom/default.nix diff --git a/pkgs/development/python-modules/eth-bloom/default.nix b/pkgs/development/python-modules/eth-bloom/default.nix new file mode 100644 index 000000000000..8c2a84e35908 --- /dev/null +++ b/pkgs/development/python-modules/eth-bloom/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + # dependencies + eth-hash, + # nativeCheckInputs + hypothesis, + pytestCheckHook, + pytest-xdist, +}: + +buildPythonPackage rec { + pname = "eth-bloom"; + version = "3.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-bloom"; + tag = "v${version}"; + hash = "sha256-WrBLFICPyb+1bIitHZ172A1p1VYqLR75YfJ5/IBqDr8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ eth-hash ]; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + pytest-xdist + ] ++ eth-hash.optional-dependencies.pycryptodome; + + pythonImportsCheck = [ "eth_bloom" ]; + + disabledTests = [ + # not testable in nix build + "test_install_local_wheel" + ]; + + meta = { + description = "Implementation of the Ethereum bloom filter"; + homepage = "https://github.com/ethereum/eth-bloom"; + changelog = "https://github.com/ethereum/eth-bloom/blob/v${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77018732cb41..aea2fba97117 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4258,6 +4258,8 @@ self: super: with self; { eth-account = callPackage ../development/python-modules/eth-account { }; + eth-bloom = callPackage ../development/python-modules/eth-bloom { }; + eth-hash = callPackage ../development/python-modules/eth-hash { }; eth-keyfile = callPackage ../development/python-modules/eth-keyfile { }; From 956ce9ad733d507ada9fc4367ae47e1c1fbc18e8 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Tue, 17 Sep 2024 20:52:38 +0200 Subject: [PATCH 195/280] python312Packages.trie: init at 3.0.1 --- .../python-modules/trie/default.nix | 63 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/python-modules/trie/default.nix diff --git a/pkgs/development/python-modules/trie/default.nix b/pkgs/development/python-modules/trie/default.nix new file mode 100644 index 000000000000..261cc26df341 --- /dev/null +++ b/pkgs/development/python-modules/trie/default.nix @@ -0,0 +1,63 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + # dependencies + eth-hash, + eth-utils, + hexbytes, + rlp, + sortedcontainers, + # nativeCheckInputs + hypothesis, + pytestCheckHook, + pytest-xdist, +}: + +buildPythonPackage rec { + pname = "trie"; + version = "3.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "py-trie"; + tag = "v${version}"; + hash = "sha256-kG/5ijckiEOfB5y1c3Yqudqnb1MDbPD25YZZM+H13Lw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + eth-hash + eth-utils + hexbytes + rlp + sortedcontainers + ]; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + pytest-xdist + ] ++ eth-hash.optional-dependencies.pycryptodome; + + disabledTests = [ + # some core tests require fixture submodule and execution spec + "test_fixtures_exist" + "test_bin_trie_update_value" + "test_branch_updates" + ]; + disabledTestPaths = [ "tests/core/test_iter.py" ]; + + pythonImportsCheck = [ "trie" ]; + + meta = { + description = "Python library which implements the Ethereum Trie structure"; + homepage = "https://github.com/ethereum/py-trie"; + changelog = "https://github.com/ethereum/py-trie/blob/v${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aea2fba97117..048e8dba91fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16457,6 +16457,8 @@ self: super: with self; { trezor = callPackage ../development/python-modules/trezor { }; + trie = callPackage ../development/python-modules/trie { }; + trimesh = callPackage ../development/python-modules/trimesh { }; trino-python-client = callPackage ../development/python-modules/trino-python-client { }; From 6c7026adcaa00f24726d61df40317e7309ffe1ec Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Tue, 17 Sep 2024 21:48:59 +0200 Subject: [PATCH 196/280] python312Packages.py-evm: init at 0.10.1-beta.2 --- .../python-modules/py-evm/default.nix | 78 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/development/python-modules/py-evm/default.nix diff --git a/pkgs/development/python-modules/py-evm/default.nix b/pkgs/development/python-modules/py-evm/default.nix new file mode 100644 index 000000000000..73ae873bcfca --- /dev/null +++ b/pkgs/development/python-modules/py-evm/default.nix @@ -0,0 +1,78 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + # dependencies + cached-property, + ckzg, + eth-bloom, + eth-keys, + eth-typing, + eth-utils, + lru-dict, + pydantic, + py-ecc, + rlp, + trie, + # nativeCheckInputs + factory-boy, + hypothesis, + pytestCheckHook, + pytest-xdist, + eth-hash, +}: + +buildPythonPackage rec { + pname = "py-evm"; + version = "0.10.1-beta.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "py-evm"; + tag = "v${version}"; + hash = "sha256-2BWMen/6ZcL1/SgGP0XcrTC63+LEjZO7Ogb3anhavsE="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + cached-property + ckzg + eth-bloom + eth-keys + eth-typing + eth-utils + lru-dict + py-ecc + rlp + trie + ]; + + nativeCheckInputs = [ + factory-boy + hypothesis + pytestCheckHook + pytest-xdist + ] ++ eth-hash.optional-dependencies.pycryptodome; + + disabledTests = [ + # side-effect: runs pip online check and is blocked by sandbox + "test_install_local_wheel" + ]; + + disabledTestPaths = [ + # json-fixtures require fixture submodule and execution spec + "tests/json-fixtures" + ]; + + pythonImportsCheck = [ "eth" ]; + + meta = { + description = "A Python implementation of the Ethereum Virtual Machine."; + homepage = "https://github.com/ethereum/py-evm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 048e8dba91fc..abfaf70da0ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9476,6 +9476,8 @@ self: super: with self; { py-eth-sig-utils = callPackage ../development/python-modules/py-eth-sig-utils { }; + py-evm = callPackage ../development/python-modules/py-evm { }; + py-expression-eval = callPackage ../development/python-modules/py-expression-eval { }; py-improv-ble-client = callPackage ../development/python-modules/py-improv-ble-client { }; From 933ec31443591e97c492232100478a8507deee3b Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Tue, 17 Sep 2024 22:03:43 +0200 Subject: [PATCH 197/280] python312Packages.eth-tester: init at 0.12.0-beta.2 --- .../python-modules/eth-tester/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/eth-tester/default.nix diff --git a/pkgs/development/python-modules/eth-tester/default.nix b/pkgs/development/python-modules/eth-tester/default.nix new file mode 100644 index 000000000000..7d2210c5450b --- /dev/null +++ b/pkgs/development/python-modules/eth-tester/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + # dependencies + eth-abi, + eth-account, + eth-keys, + eth-utils, + pydantic, + rlp, + semantic-version, + # nativeCheckInputs + py-evm, + pytestCheckHook, + pytest-xdist, +}: + +buildPythonPackage rec { + pname = "eth-tester"; + version = "0.12.0-beta.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-tester"; + tag = "v${version}"; + hash = "sha256-ox7adsqD0MPZFcxBhino8cgwYYEWrBnD+ugPQOuOO2U="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + eth-abi + eth-account + eth-keys + eth-utils + pydantic + rlp + semantic-version + ]; + + nativeCheckInputs = [ + py-evm + pytestCheckHook + pytest-xdist + ]; + + pythonImportsCheck = [ "eth_tester" ]; + + meta = { + description = "Tool suite for testing ethereum applications"; + homepage = "https://github.com/ethereum/eth-tester"; + changelog = "https://github.com/ethereum/eth-tester/blob/v${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abfaf70da0ab..57e70a20c110 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4268,6 +4268,8 @@ self: super: with self; { eth-rlp = callPackage ../development/python-modules/eth-rlp { }; + eth-tester = callPackage ../development/python-modules/eth-tester { }; + eth-typing = callPackage ../development/python-modules/eth-typing { }; eth-utils = callPackage ../development/python-modules/eth-utils { }; From 563e494e12e418e2e9f521450537491ba862c93e Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Tue, 17 Sep 2024 22:26:44 +0200 Subject: [PATCH 198/280] python312Packages.pyunormalize: init at 16.0.0 --- .../python-modules/pyunormalize/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pyunormalize/default.nix diff --git a/pkgs/development/python-modules/pyunormalize/default.nix b/pkgs/development/python-modules/pyunormalize/default.nix new file mode 100644 index 000000000000..450eb8ebd4e2 --- /dev/null +++ b/pkgs/development/python-modules/pyunormalize/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + # nativeCheckInputs + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pyunormalize"; + version = "16.0.0"; + pyproject = true; + + # No tags on GitHub + src = fetchPypi { + inherit pname version; + hash = "sha256-Lh37tKEYFUrib3BxBCalKjZLkmyRkfdkYB9ajLEnYfc="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # The pypi archive does not contain the tests. + # NOTE: one should review this for each future update. + doCheck = false; + + pythonImportsCheck = [ "pyunormalize" ]; + + meta = { + description = "Unicode normalization forms (NFC, NFKC, NFD, NFKD) independent of the Python core Unicode database"; + homepage = "https://github.com/mlodewijck/pyunormalize"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57e70a20c110..59f2aaca1845 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10843,6 +10843,8 @@ self: super: with self; { pyunpack = callPackage ../development/python-modules/pyunpack { }; + pyunormalize = callPackage ../development/python-modules/pyunormalize { }; + pyutil = callPackage ../development/python-modules/pyutil { }; pyzbar = callPackage ../development/python-modules/pyzbar { }; From 3224a886d71c30fd43073b3cf45d6934b5efe485 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 18 Sep 2024 02:59:08 +0200 Subject: [PATCH 199/280] python312Packages.eth-hash: 0.5.2 -> 0.7.1 --- .../python-modules/eth-hash/default.nix | 55 +++++++++++-------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index 241a4260e43a..cfd6365f6b1d 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -1,41 +1,51 @@ { lib, - fetchFromGitHub, buildPythonPackage, - pythonAtLeast, - pythonOlder, + fetchFromGitHub, + setuptools, + isPyPy, + # nativeCheckInputs pytest, - safe-pysha3, + pytest-xdist, + # optional dependencies pycryptodome, + safe-pysha3, }: buildPythonPackage rec { pname = "eth-hash"; - version = "0.5.2"; - format = "setuptools"; - disabled = pythonOlder "3.5"; + version = "0.7.1"; + pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-hash"; - rev = "v${version}"; - hash = "sha256-6UN+kvLjjAtkmLgUaovjZC/6n3FZtXCwyXZH7ijQObU="; + tag = "v${version}"; + hash = "sha256-91jWZDqrd7ZZlM0D/3sDokJ26NiAQ3gdeBebTV1Lq8s="; }; - nativeCheckInputs = - [ pytest ] - ++ optional-dependencies.pycryptodome - # eth-hash can use either safe-pysha3 or pycryptodome; - # safe-pysha3 requires Python 3.9+ while pycryptodome does not. - # https://github.com/ethereum/eth-hash/issues/46#issuecomment-1314029211 - ++ lib.optional (pythonAtLeast "3.9") optional-dependencies.pysha3; + build-system = [ setuptools ]; + nativeCheckInputs = + [ + pytest + pytest-xdist + ] + ++ optional-dependencies.pycryptodome + # safe-pysha3 is not available on pypy + ++ lib.optional (!isPyPy) optional-dependencies.pysha3; + + # Backends need to be tested separatly and can not use hook checkPhase = '' - pytest tests/backends/pycryptodome/ + runHook preCheck + pytest tests/core tests/backends/pycryptodome '' - + lib.optionalString (pythonAtLeast "3.9") '' - pytest tests/backends/pysha3/ + + lib.optionalString (!isPyPy) '' + pytest tests/backends/pysha3 + '' + + '' + runHook postCheck ''; optional-dependencies = { @@ -43,10 +53,11 @@ buildPythonPackage rec { pysha3 = [ safe-pysha3 ]; }; - meta = with lib; { + meta = { description = "Ethereum hashing function keccak256"; homepage = "https://github.com/ethereum/eth-hash"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/ethereum/eth-hash/blob/v${version}/docs/release_notes.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; }; } From 757f4e6755ba1bccea2146423461e4ef47caa3c6 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 18 Sep 2024 03:06:01 +0200 Subject: [PATCH 200/280] python312Packages.eth-keys: 0.5.0 -> 0.6.0 --- .../python-modules/eth-keys/default.nix | 42 +++++++------------ 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index c64470a2c485..95965af550f0 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -1,37 +1,37 @@ { lib, - buildPythonPackage, fetchFromGitHub, + buildPythonPackage, setuptools, - asn1tools, - coincurve, - eth-hash, + # dependencies eth-typing, eth-utils, + # nativeCheckInputs + asn1tools, factory-boy, hypothesis, - isPyPy, pyasn1, pytestCheckHook, - pythonOlder, + coincurve, + eth-hash, + isPyPy, }: buildPythonPackage rec { pname = "eth-keys"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-keys"; - rev = "v${version}"; - hash = "sha256-vyyaLCG2uIHXX0t93DmFq8/u0rZL+nsBsH2gfgjziyo="; + tag = "v${version}"; + hash = "sha256-HyOfuzwldtqjjowW7HGdZ8RNMXNK3y2NrXUoeMlWJjs="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ eth-typing eth-utils ]; @@ -48,29 +48,17 @@ buildPythonPackage rec { ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3 ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome; - disabledTests = [ - # tests are broken - "test_compress_decompress_inversion" - "test_public_key_generation_is_equal" - "test_signing_is_equal" - "test_native_to_coincurve_recover" - "test_public_key_compression_is_equal" - "test_public_key_decompression_is_equal" - "test_signatures_with_high_s" - # timing sensitive - "test_encode_decode_pairings" - ]; - pythonImportsCheck = [ "eth_keys" ]; optional-dependencies = { coincurve = [ coincurve ]; }; - meta = with lib; { + meta = { description = "Common API for Ethereum key operations"; homepage = "https://github.com/ethereum/eth-keys"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/ethereum/eth-keys/blob/v${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; }; } From 5950ae0f2d7bbb6e7bfc53f83fd685e180b69f0b Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Fri, 27 Sep 2024 04:32:41 +0200 Subject: [PATCH 201/280] python312Packages.eth-keyfile: 0.8.0 -> 0.8.1 --- .../python-modules/eth-keyfile/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/eth-keyfile/default.nix b/pkgs/development/python-modules/eth-keyfile/default.nix index 8175b2cfe761..0d16bc1ff21a 100644 --- a/pkgs/development/python-modules/eth-keyfile/default.nix +++ b/pkgs/development/python-modules/eth-keyfile/default.nix @@ -3,30 +3,30 @@ buildPythonPackage, fetchFromGitHub, setuptools, + # dependencies eth-keys, eth-utils, pycryptodome, + # nativeCheckInputs pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "eth-keyfile"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-keyfile"; - rev = "v${version}"; + tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-797yhHuU9/lm96YKxl3SZ5IQAwDxDSYkLkiBdAHh0Uk="; + hash = "sha256-HufsN3aXdQErcQmnG2PZnEm5joqpy4f8IWNm3VrzJSY="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ eth-keys eth-utils pycryptodome @@ -36,10 +36,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "eth_keyfile" ]; - meta = with lib; { + meta = { description = "Tools for handling the encrypted keyfile format used to store private keys"; homepage = "https://github.com/ethereum/eth-keyfile"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/ethereum/eth-keyfile/blob/v${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; }; } From 1a400c9182f9182426173c1b9c60c41d4137a03f Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Tue, 17 Sep 2024 23:44:25 +0200 Subject: [PATCH 202/280] python312Packages.web3: 6.5.0 -> 7.6.1 --- .../python-modules/web3/default.nix | 61 +++++++++++++++---- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 08fc850f9e50..df894986b3ed 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -2,7 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, + # dependencies aiohttp, eth-abi, eth-account, @@ -14,22 +15,32 @@ jsonschema, lru-dict, protobuf, + pydantic, requests, + types-requests, websockets, + # nativeCheckInputs + eth-tester, + flaky, + hypothesis, + py-evm, + pytest-asyncio_0_21, + pytestCheckHook, + pytest-mock, + pytest-xdist, + pyunormalize, }: buildPythonPackage rec { pname = "web3"; - version = "6.5.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "7.6.1"; + pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "web3.py"; - rev = "v${version}"; - hash = "sha256-RNWCZQjcse415SSNkHhMWckDcBJGFZnjisckF7gbYY8="; + tag = "v${version}"; + hash = "sha256-rpXSkQtqUZiCLMF2XlElbsjFjJmX+3j/NdAU2oaPU54="; }; # Note: to reflect the extra_requires in main/setup.py. @@ -37,7 +48,9 @@ buildPythonPackage rec { ipfs = [ ipfshttpclient ]; }; - propagatedBuildInputs = + build-system = [ setuptools ]; + + dependencies = [ aiohttp eth-abi @@ -52,16 +65,38 @@ buildPythonPackage rec { jsonschema lru-dict protobuf + pydantic requests + types-requests websockets ]; - # TODO: package eth-tester required for tests - doCheck = false; + nativeCheckInputs = [ + eth-tester + flaky + hypothesis + py-evm + pytest-asyncio_0_21 + pytestCheckHook + pytest-mock + pytest-xdist + pyunormalize + ]; - postPatch = '' - substituteInPlace setup.py --replace "types-protobuf==3.19.13" "types-protobuf" - ''; + disabledTests = [ + # side-effect: runs pip online check and is blocked by sandbox + "test_install_local_wheel" + # not sure why they fail + "test_init_multiple_contracts_performance" + "test_async_init_multiple_contracts_performance" + ]; + + disabledTestPaths = [ + # requires geth library and binaries + "tests/integration/go_ethereum" + # requires local running beacon node + "tests/beacon" + ]; pythonImportsCheck = [ "web3" ]; From fe17c8b41d90399a8cb43ff645dd9a344cf81d19 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 19 Jan 2025 12:21:41 +0100 Subject: [PATCH 203/280] vulkan-loader: remove outdated patch --- pkgs/by-name/vu/vulkan-loader/package.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix index 96ad2fa8407e..a77160633993 100644 --- a/pkgs/by-name/vu/vulkan-loader/package.nix +++ b/pkgs/by-name/vu/vulkan-loader/package.nix @@ -27,16 +27,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-6GHZUiYL3gDWN61SaLiD/3xXSoQb1rx6U5eu1cl8ZwM="; }; - patches = - [ ./fix-pkgconfig.patch ] - ++ lib.optionals stdenv.hostPlatform.is32bit [ - # Backport patch to support 64-bit inodes on 32-bit systems - # FIXME: remove in next update - (fetchpatch { - url = "https://github.com/KhronosGroup/Vulkan-Loader/commit/ecd88b5c6b1e4c072c55c8652d76513d74c5ad4e.patch"; - hash = "sha256-Ea+v+RfmVl8fRbkr2ETM3/7R4vp+jw7hvTq2hnw4V/0="; - }) - ]; + patches = [ ./fix-pkgconfig.patch ]; nativeBuildInputs = [ cmake From d9f6cedba0b51eee5532a6ccb85aa0bf64c9c6ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Jan 2025 17:51:46 +0000 Subject: [PATCH 204/280] publicsuffix-list: 0-unstable-2024-12-24 -> 0-unstable-2025-01-16 --- pkgs/by-name/pu/publicsuffix-list/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index 9cd87b629e46..1345543b7f16 100644 --- a/pkgs/by-name/pu/publicsuffix-list/package.nix +++ b/pkgs/by-name/pu/publicsuffix-list/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "0-unstable-2024-12-24"; + version = "0-unstable-2025-01-16"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "f229d7f87051bb6197b315f42adae05cb68e33b5"; - hash = "sha256-6g9XHrBl1rrOnY9CRi0W64/dKOhIJYRr9zXVNgXXex0="; + rev = "4f2d3b20034a6c7a0ad4400716f1e0f752e2c737"; + hash = "sha256-1U+CS5ER4b/mI9Ox2gJQfEOVeDHBt1C3UbG5sDAs8Mk="; }; dontBuild = true; From 9a4a09bef671cf93cae1769b9070bdd74a805cf0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 19 Jan 2025 08:47:23 +0100 Subject: [PATCH 205/280] mailutils: 3.17 -> 3.18 --- pkgs/tools/networking/mailutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index a816357d64a4..d770fae131ab 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "mailutils"; - version = "3.17"; + version = "3.18"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-+km6zsN1Zv5S+IIh04cWc6Yzru4M2SPMOo5lu+8rhOk="; + hash = "sha256-VZBJyNhRYEFSipBsE52bt6YvHQXX5WF/qP4PIxoTFXc="; }; separateDebugInfo = true; From 21adffd6fcd0c6155be1b4b7f0518be2abbe032f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Jan 2025 22:54:48 +0000 Subject: [PATCH 206/280] pyright: 1.1.391 -> 1.1.392 --- pkgs/by-name/py/pyright/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 6017e0430f90..0a7dd4deefe3 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -7,13 +7,13 @@ }: let - version = "1.1.391"; + version = "1.1.392"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-QtdqMysK1vNqOFv2KQLlTGiCYwb1OWQ1jHITaiKv1hE="; + hash = "sha256-/Js9w6wxoJLqJxcRkpdwk2i9bR7jw/dtGkUvwxkv/qA="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -44,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-E/zWZnDJd+4HnXYqW1ONoP7Gm+Tmn+8x3y3PIeS3Z3k="; + npmDepsHash = "sha256-xGEX6Dvhhch0PWjO+LDQqTH3IRRfVbQPMXUjbL/KYpE="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -58,7 +58,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-1InoNbKMYNsaAAnlOMutnrwBjM1MroEvR5X9f5id/MA="; + npmDepsHash = "sha256-TK05a3Ys3Q8s/2c2HOjh1EdnL1jFttjdApggeZLQUzw="; postPatch = '' chmod +w ../../ From 5ff390289e135e883d93ba6c5e03ef159fe1db2c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 19 Jan 2025 21:44:48 +0100 Subject: [PATCH 207/280] cargo,clippy,rustfmt,rustc: 1.83.0 -> 1.84.0 --- .../compilers/rust/{1_83.nix => 1_84.nix} | 34 +++++++++---------- pkgs/top-level/all-packages.nix | 8 ++--- 2 files changed, 21 insertions(+), 21 deletions(-) rename pkgs/development/compilers/rust/{1_83.nix => 1_84.nix} (71%) diff --git a/pkgs/development/compilers/rust/1_83.nix b/pkgs/development/compilers/rust/1_84.nix similarity index 71% rename from pkgs/development/compilers/rust/1_83.nix rename to pkgs/development/compilers/rust/1_84.nix index 8232079a2adc..6b98d8817bcc 100644 --- a/pkgs/development/compilers/rust/1_83.nix +++ b/pkgs/development/compilers/rust/1_84.nix @@ -47,8 +47,8 @@ let in import ./default.nix { - rustcVersion = "1.83.0"; - rustcSha256 = "ci13O9Tqstgo1901tZ8LAX3fmpfuK0bBt/f6xciEHG4="; + rustcVersion = "1.84.0"; + rustcSha256 = "Fc7nOVsH/94CIGBFWzFANm7DoSy76o8e8v83GpzKUb8="; llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; llvmSharedForHost = llvmSharedFor pkgsBuildHost; @@ -106,26 +106,26 @@ import ./default.nix # Note: the version MUST be the same version that we are building. Upstream # ensures that each released compiler can compile itself: # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363 - bootstrapVersion = "1.83.0"; + bootstrapVersion = "1.84.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "cb4763e8e04a302486e06195917921f917b485d1138823b9ebae1e23abf55a99"; - x86_64-unknown-linux-gnu = "bd9d53d09d4b60826288336de19fb9c5c7592081e4e4520d6de2f65ee8d79087"; - x86_64-unknown-linux-musl = "d1d379e8bb545466f53f8a5821dfbc7129e8cab046c44c0a9ea089eeff1616e1"; - arm-unknown-linux-gnueabihf = "1ac6ebcb610226c7d81d52ef5158571567d5385a62a41ba73775e52c25666220"; - armv7-unknown-linux-gnueabihf = "747c685a4858f2814a7e493e5d2552ff4234ad41e724560c75738340947cf425"; - aarch64-unknown-linux-gnu = "ec70c500e2744f0db55bd495ef90534a31fd9c0d5f5a2d752182a59e439ddee3"; - aarch64-unknown-linux-musl = "b7aabedc3d6109e2b46e02e2925aafd8d0aa2d319390a257c170b6750ba683ce"; - x86_64-apple-darwin = "d878d4508e0bf2d699e4c8b9b8b9ccd30787859f60149c0934371c53a0fdf013"; - aarch64-apple-darwin = "a605f4e3732eb472dac524861ca8c7456a923e4b4c883b0c8ebfba7550238f41"; - powerpc64le-unknown-linux-gnu = "0bf705a288994d47975e10bd2a709d00e4caf6cc53b02a8847ad607cbc77e24a"; - riscv64gc-unknown-linux-gnu = "f4cb563530ad12daba059373a354cf0dcb53a88e5a5d24928778d2736a0e8c65"; - s390x-unknown-linux-gnu = "502010d6f40b1385c4b99cf74ff0436102efd155ec1e49bca4c02e8c68a4b142"; - x86_64-unknown-freebsd = "3b55ed8afe27032128622b14e4f4b59d66b3cc7ff64e6df7a06d5e224b3de2a1"; + i686-unknown-linux-gnu = "3f9fea653bc68139fa1476f9b00ec55a2637650960872029cfc91ea729d0fd82"; + x86_64-unknown-linux-gnu = "de2b041a6e62ec2c37c517eb58518f68fde5fc2f076218393ae06145d92a5682"; + x86_64-unknown-linux-musl = "0e98d242074f566f72bf48dfbd6c8457f6cbc02be7e8e8dac04347ad15ad3f41"; + arm-unknown-linux-gnueabihf = "e571a4e57e60360e0783cd9d4bcc10290394cfd312ede5e4fcc81aebd0625307"; + armv7-unknown-linux-gnueabihf = "b63040017c831aa607d18287d8af6548daca038e9bb95030e0e1f0d45c9c471f"; + aarch64-unknown-linux-gnu = "282d281cb389bdc2c0671c2a74eeda46e010a158810d2137c3a948ae6c713543"; + aarch64-unknown-linux-musl = "1055e2c6f8e3823f5213eb55eb77e63cf6b9bd6eb243897dae7259f4d8ab8c54"; + x86_64-apple-darwin = "eafe087277ad8d7473f978d0779b4504d5b8064a781784aebd3e33c2541a13ce"; + aarch64-apple-darwin = "506dfc14115d2efa96fad9fa542d67027525aa46882a8e1ffb41e891737b689b"; + powerpc64le-unknown-linux-gnu = "26a60519303194e245968b2d34d405a49e20bdb86b240ab230e973e03c283c86"; + riscv64gc-unknown-linux-gnu = "4534d86f55f1851c90097bfc03e38ab88ba6893940a7dcb6dce9139f0aa377fa"; + s390x-unknown-linux-gnu = "76099d34b8e5ae4d47e55e7bd472918cde2c2945b97dca926c739082c051ab2b"; + x86_64-unknown-freebsd = "b484de5908612b3ea132bdd76afde1c980c6bf70cf6f1b27e13d74b3729136b9"; }; - selectRustPackage = pkgs: pkgs.rust_1_83; + selectRustPackage = pkgs: pkgs.rust_1_84; } ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c74006b69f26..6799e630e961 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6604,11 +6604,11 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_83 = callPackage ../development/compilers/rust/1_83.nix { + rust_1_84 = callPackage ../development/compilers/rust/1_84.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_19 = llvmPackages_19.libllvm; }; - rust = rust_1_83; + rust = rust_1_84; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -6616,8 +6616,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_83 = rust_1_83.packages.stable; - rustPackages = rustPackages_1_83; + rustPackages_1_84 = rust_1_84.packages.stable; + rustPackages = rustPackages_1_84; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; From 7ab1e888334ddc2745b285e3df0b0efd5839d0f8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 20 Jan 2025 10:30:08 +0100 Subject: [PATCH 208/280] nixosTests.postgresql.*: fix eval The `libpq` attribute from `postgresqlVersions` doesn't have a `pkgs` attribute with extensions in it. Filtering for postgresql server packages only fixes the problem. Reported in https://github.com/NixOS/nixpkgs/pull/359659#issuecomment-2601045449 --- nixos/tests/postgresql/anonymizer.nix | 2 +- nixos/tests/postgresql/pgjwt.nix | 2 +- nixos/tests/postgresql/pgvecto-rs.nix | 2 +- nixos/tests/postgresql/postgresql-tls-client-cert.nix | 4 +++- nixos/tests/postgresql/postgresql-wal-receiver.nix | 4 +++- nixos/tests/postgresql/postgresql.nix | 4 +++- nixos/tests/postgresql/timescaledb.nix | 2 +- nixos/tests/postgresql/tsja.nix | 2 +- nixos/tests/postgresql/wal2json.nix | 2 +- 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix index b5bd1479890c..abbcd4890976 100644 --- a/nixos/tests/postgresql/anonymizer.nix +++ b/nixos/tests/postgresql/anonymizer.nix @@ -109,7 +109,7 @@ let in lib.recurseIntoAttrs ( lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: !p.pkgs.anonymizer.meta.broken) pkgs.postgresqlVersions + lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.anonymizer.meta.broken) pkgs.postgresqlVersions ) // { passthru.override = p: makeTestFor p; diff --git a/nixos/tests/postgresql/pgjwt.nix b/nixos/tests/postgresql/pgjwt.nix index 2feb41d3366e..27033a1383b1 100644 --- a/nixos/tests/postgresql/pgjwt.nix +++ b/nixos/tests/postgresql/pgjwt.nix @@ -50,7 +50,7 @@ let in lib.recurseIntoAttrs ( lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: !p.pkgs.pgjwt.meta.broken) pkgs.postgresqlVersions + lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.pgjwt.meta.broken) pkgs.postgresqlVersions ) // { passthru.override = p: makeTestFor p; diff --git a/nixos/tests/postgresql/pgvecto-rs.nix b/nixos/tests/postgresql/pgvecto-rs.nix index 93072a566dcf..98241ec48090 100644 --- a/nixos/tests/postgresql/pgvecto-rs.nix +++ b/nixos/tests/postgresql/pgvecto-rs.nix @@ -74,7 +74,7 @@ let in lib.recurseIntoAttrs ( lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: !p.pkgs.pgvecto-rs.meta.broken) pkgs.postgresqlVersions + lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.pgvecto-rs.meta.broken) pkgs.postgresqlVersions ) // { passthru.override = p: makeTestFor p; diff --git a/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/nixos/tests/postgresql/postgresql-tls-client-cert.nix index 0dcdaf98eaf7..0861416d6c40 100644 --- a/nixos/tests/postgresql/postgresql-tls-client-cert.nix +++ b/nixos/tests/postgresql/postgresql-tls-client-cert.nix @@ -129,7 +129,9 @@ let }; in lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) pkgs.postgresqlVersions + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (_: p: p ? pkgs) pkgs.postgresqlVersions + ) // { passthru.override = p: makeTestFor p; } diff --git a/nixos/tests/postgresql/postgresql-wal-receiver.nix b/nixos/tests/postgresql/postgresql-wal-receiver.nix index eb7671430c98..eee6c0c14de1 100644 --- a/nixos/tests/postgresql/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql/postgresql-wal-receiver.nix @@ -109,7 +109,9 @@ let }; in lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) pkgs.postgresqlVersions + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (_: p: p ? pkgs) pkgs.postgresqlVersions + ) // { passthru.override = p: makeTestFor p; } diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix index 40c8e1146dae..0aa56330ce01 100644 --- a/nixos/tests/postgresql/postgresql.nix +++ b/nixos/tests/postgresql/postgresql.nix @@ -263,7 +263,9 @@ let }; in lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) pkgs.postgresqlVersions + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (_: p: p ? pkgs) pkgs.postgresqlVersions + ) // { passthru.override = p: makeTestFor p; } diff --git a/nixos/tests/postgresql/timescaledb.nix b/nixos/tests/postgresql/timescaledb.nix index 864efd2b5718..acfe5ed7ecc6 100644 --- a/nixos/tests/postgresql/timescaledb.nix +++ b/nixos/tests/postgresql/timescaledb.nix @@ -93,7 +93,7 @@ in # NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.postgresql.timescaledb lib.dontRecurseIntoAttrs ( lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: !p.pkgs.timescaledb.meta.broken) pkgs.postgresqlVersions + lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.timescaledb.meta.broken) pkgs.postgresqlVersions ) // { passthru.override = p: makeTestFor p; diff --git a/nixos/tests/postgresql/tsja.nix b/nixos/tests/postgresql/tsja.nix index d2e5e37e6ce0..34437068ae67 100644 --- a/nixos/tests/postgresql/tsja.nix +++ b/nixos/tests/postgresql/tsja.nix @@ -43,7 +43,7 @@ let in lib.recurseIntoAttrs ( lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: !p.pkgs.tsja.meta.broken) pkgs.postgresqlVersions + lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.tsja.meta.broken) pkgs.postgresqlVersions ) // { passthru.override = p: makeTestFor p; diff --git a/nixos/tests/postgresql/wal2json.nix b/nixos/tests/postgresql/wal2json.nix index 174c8a8e50e8..644ade741d83 100644 --- a/nixos/tests/postgresql/wal2json.nix +++ b/nixos/tests/postgresql/wal2json.nix @@ -45,7 +45,7 @@ let in lib.recurseIntoAttrs ( lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: !p.pkgs.wal2json.meta.broken) pkgs.postgresqlVersions + lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.wal2json.meta.broken) pkgs.postgresqlVersions ) // { passthru.override = p: makeTestFor p; From 56b1e1c1b4db70c5cafc8cb1e687362f3ef3a62e Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 21 Jan 2025 15:21:25 +0100 Subject: [PATCH 209/280] boost: Fix compilation to 32-bit ARM with clang in downstream packages (#375322) Change-Id: I4eafd2adc9dbd2387e298829fe635dd667ab6ce4 --- pkgs/development/libraries/boost/generic.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 593c8b8deddf..152bc01e318a 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -289,6 +289,20 @@ stdenv.mkDerivation { EOF ''; + # Fix compilation to 32-bit ARM with clang in downstream packages + # https://github.com/ned14/outcome/pull/308 + # https://github.com/boostorg/json/pull/1064 + postPatch = lib.optionalString (lib.versionAtLeast version "1.87") '' + substituteInPlace \ + boost/outcome/outcome_gdb.h \ + boost/outcome/experimental/status-code/status_code.hpp \ + boost/json/detail/gdb_printers.hpp \ + boost/unordered/unordered_printers.hpp \ + boost/interprocess/interprocess_printers.hpp \ + libs/json/pretty_printers/generate-gdb-header.py \ + --replace-fail ",@progbits,1" ",%progbits,1" + ''; + env = { NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; # copyPkgconfigItems will substitute these in the pkg-config file From a9eac74572da24c4c1d670e1d69055c5603870d1 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 20 Jan 2025 12:48:12 +0100 Subject: [PATCH 210/280] nodejs_22: 22.12.0 -> 22.13.1 --- pkgs/development/web/nodejs/v22.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 2e4645af5590..78a842c395ad 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.12.0"; - sha256 = "fe1bc4be004dc12721ea2cb671b08a21de01c6976960ef8a1248798589679e16"; + version = "22.13.1"; + sha256 = "cfce282119390f7e0c2220410924428e90dadcb2df1744c0c4a0e7baae387cc2"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -19,16 +19,21 @@ buildNodejs { ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch - # Fix for https://github.com/NixOS/nixpkgs/issues/355919 # FIXME: remove after a minor point release (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1"; - hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU="; + url = "https://github.com/nodejs/node/commit/49acdc8748fe9fe83bc1b444e24c456dff00ecc5.patch?full_index=1"; + hash = "sha256-iK7bj4KswTeQ9I3jJ22ZPTsvCU8xeGGXEOo43dxg3Mk="; }) - # fixes test failure, remove when included in release (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1"; - hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8="; + url = "https://github.com/nodejs/node/commit/d0ff34f4b690ad49c86b6df8fd424f39d183e1a6.patch?full_index=1"; + hash = "sha256-ezcCrg7UwK091pqYxXJn4ay9smQwsrYeMO/NBE7VaM8="; + }) + # test-icu-env is failing on ICU 74.2 + # FIXME: remove once https://github.com/nodejs/node/pull/56661 is included in a next release + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/a364ec1d1cbbd5a6d20ee54d4f8648dd7592ebcd.patch?full_index=1"; + hash = "sha256-EL1NgCBzz5O1spwHgocLm5mkORAiqGFst0N6pc3JvFg="; + revert = true; }) ]; } From 54f6c33e9b4a4e1351d79e1916573b647b20cb33 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 21 Jan 2025 20:25:17 +0100 Subject: [PATCH 211/280] tzdata: add postgresql as passthru test Since tzdata updates repeatedly broke postgresql, let's make sure we find out before merge. --- pkgs/by-name/tz/tzdata/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/tz/tzdata/package.nix b/pkgs/by-name/tz/tzdata/package.nix index 497b7e99364e..00b44e0a59c6 100644 --- a/pkgs/by-name/tz/tzdata/package.nix +++ b/pkgs/by-name/tz/tzdata/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, buildPackages, + postgresql, }: stdenv.mkDerivation (finalAttrs: { @@ -82,6 +83,11 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./tzdata-setup-hook.sh; + # PostgreSQL is sensitive to tzdata updates, because the test-suite often breaks. + # Upstream provides patches very quickly, we just need to apply them until the next + # minor releases. + passthru.tests = postgresql; + meta = with lib; { homepage = "http://www.iana.org/time-zones"; description = "Database of current and historical time zones"; From 0238f9cf84e38af0ba9e6d6c5d7dee7f6088c559 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 21 Jan 2025 20:26:37 +0100 Subject: [PATCH 212/280] postgresql: fix build The recent tzdata update to 2025a broke postgres' test suite. Until the next minor releases come out, we'll apply upstream's commit to fix this as a patch. --- pkgs/servers/sql/postgresql/generic.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 09bf6c165e90..1ea97c93f425 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -299,6 +299,11 @@ let ./patches/paths-for-split-outputs.patch ./patches/paths-with-postgresql-suffix.patch + (fetchpatch { + url = "https://github.com/postgres/postgres/commit/8108674f0e5639baebcf03b54b7ccf9e9a8662a2.patch"; + hash = "sha256-EQJkDR0eb7QWCjyMzXMn+Vbcwx3MMdC83oN7XSVJP0U="; + }) + (substituteAll { src = ./patches/locale-binary-path.patch; locale = "${ From df2cf0d18e8f93024731ca377fd65378e6a42d86 Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Tue, 21 Jan 2025 20:59:55 +0100 Subject: [PATCH 213/280] lvm2: add a test for buildsFHSEnv compatibility Checks https://github.com/NixOS/nixpkgs/issues/369732 regressions --- pkgs/os-specific/linux/lvm2/common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index a4774e6c3362..9da06cc09236 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -24,6 +24,7 @@ enableMultipath ? false, multipath-tools, nixosTests, + buildFHSEnv, recurseIntoAttrs, }: @@ -183,6 +184,12 @@ stdenv.mkDerivation rec { passthru.tests = { installer = nixosTests.installer.lvm; lvm2 = recurseIntoAttrs nixosTests.lvm2; + + # https://github.com/NixOS/nixpkgs/issues/369732 + lvm2-fhs-env = buildFHSEnv { + name = "lvm2-fhs-env-test"; + targetPkgs = p: [ p.lvm2 ]; + }; }; meta = with lib; { From aa1405b6e792e6cb110c46a732ae53e445fc0eaf Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 3 Jan 2025 23:18:02 +0000 Subject: [PATCH 214/280] stdenv: add no-broken-symlinks hook --- .../setup-hooks/no-broken-symlinks.sh | 85 +++++++++++++++++++ pkgs/stdenv/generic/default.nix | 1 + 2 files changed, 86 insertions(+) create mode 100644 pkgs/build-support/setup-hooks/no-broken-symlinks.sh diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh new file mode 100644 index 000000000000..26f4838af5a8 --- /dev/null +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -0,0 +1,85 @@ +# shellcheck shell=bash +# symlinks are often created in postFixup +# don't use fixupOutputHooks, it is before postFixup +postFixupHooks+=(noBrokenSymlinksInAllOutputs) + +# A symlink is "dangling" if it points to a non-existent target. +# A symlink is "reflexive" if it points to itself. +# A symlink is considered "broken" if it is either dangling or reflexive. +noBrokenSymlinks() { + local -r output="${1:?}" + local path + local pathParent + local symlinkTarget + local errorMessage + local -i numDanglingSymlinks=0 + local -i numReflexiveSymlinks=0 + + # TODO(@connorbaker): This hook doesn't check for cycles in symlinks. + + if [[ ! -e $output ]]; then + nixWarnLog "skipping non-existent output $output" + return 0 + fi + nixInfoLog "running on $output" + + # NOTE: path is absolute because we're running `find` against an absolute path (`output`). + while IFS= read -r -d $'\0' path; do + pathParent="$(dirname "$path")" + symlinkTarget="$(readlink "$path")" + + # Canonicalize symlinkTarget to an absolute path. + if [[ $symlinkTarget == /* ]]; then + nixInfoLog "symlink $path points to absolute target $symlinkTarget" + else + nixInfoLog "symlink $path points to relative target $symlinkTarget" + symlinkTarget="$pathParent/$symlinkTarget" + + # Check to make sure the interpolated target doesn't escape the store path of `output`. + # If it does, Nix probably won't be able to resolve or track dependencies. + if [[ $symlinkTarget != "$output" && $symlinkTarget != "$output"/* ]]; then + nixErrorLog "symlink $path points to target $symlinkTarget, which escapes the current store path $output" + return 1 + fi + fi + + if [[ ! -e $symlinkTarget ]]; then + # symlinkTarget does not exist + errorMessage="the symlink $path points to a missing target $symlinkTarget" + if [[ -z ${allowDanglingSymlinks-} ]]; then + nixErrorLog "$errorMessage" + numDanglingSymlinks+=1 + else + nixInfoLog "$errorMessage" + fi + + elif [[ $path == "$symlinkTarget" ]]; then + # symlinkTarget is exists and is reflexive + errorMessage="the symlink $path is reflexive $symlinkTarget" + if [[ -z ${allowReflexiveSymlinks-} ]]; then + nixErrorLog "$errorMessage" + numReflexiveSymlinks+=1 + else + nixInfoLog "$errorMessage" + fi + + else + # symlinkTarget exists and is irreflexive + nixInfoLog "the symlink $path is irreflexive and points to a target which exists" + fi + done < <(find "$output" -type l -print0) + + if ((numDanglingSymlinks > 0 || numReflexiveSymlinks > 0)); then + nixErrorLog "found $numDanglingSymlinks dangling symlinks and $numReflexiveSymlinks reflexive symlinks" + return 1 + fi + return 0 +} + +noBrokenSymlinksInAllOutputs() { + if [[ -z ${dontCheckForBrokenSymlinks-} ]]; then + for output in $(getAllOutputNames); do + noBrokenSymlinks "${!output}" + done + fi +} diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index fe9843c6b120..57a58eb2ebe4 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -77,6 +77,7 @@ let ../../build-support/setup-hooks/move-sbin.sh ../../build-support/setup-hooks/move-systemd-user-units.sh ../../build-support/setup-hooks/multiple-outputs.sh + ../../build-support/setup-hooks/no-broken-symlinks.sh ../../build-support/setup-hooks/patch-shebangs.sh ../../build-support/setup-hooks/prune-libtool-files.sh ../../build-support/setup-hooks/reproducible-builds.sh From 0ad7c9ee1e2a33a981f81ede385c2f0fc595c6e3 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 17 Jan 2025 16:37:26 -0800 Subject: [PATCH 215/280] no-broken-symlinks: guard against double inclusions --- pkgs/build-support/setup-hooks/no-broken-symlinks.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh index 26f4838af5a8..8117da45d80d 100644 --- a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -1,4 +1,12 @@ # shellcheck shell=bash + +# Guard against double inclusion. +if (("${noBrokenSymlinksHookInstalled:-0}" > 0)); then + nixInfoLog "skipping because the hook has been propagated more than once" + return 0 +fi +declare -ig noBrokenSymlinksHookInstalled=1 + # symlinks are often created in postFixup # don't use fixupOutputHooks, it is before postFixup postFixupHooks+=(noBrokenSymlinksInAllOutputs) From 9b9badd9578d7a2306177f51c629c5be4a68dcc1 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 21 Jan 2025 13:39:44 -0800 Subject: [PATCH 216/280] no-broken-symlinks: check for reflexivity before dangling --- .../setup-hooks/no-broken-symlinks.sh | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh index 8117da45d80d..142a2fca720f 100644 --- a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -51,7 +51,17 @@ noBrokenSymlinks() { fi fi - if [[ ! -e $symlinkTarget ]]; then + if [[ $path == "$symlinkTarget" ]]; then + # symlinkTarget is reflexive + errorMessage="the symlink $path is reflexive $symlinkTarget" + if [[ -z ${allowReflexiveSymlinks-} ]]; then + nixErrorLog "$errorMessage" + numReflexiveSymlinks+=1 + else + nixInfoLog "$errorMessage" + fi + + elif [[ ! -e $symlinkTarget ]]; then # symlinkTarget does not exist errorMessage="the symlink $path points to a missing target $symlinkTarget" if [[ -z ${allowDanglingSymlinks-} ]]; then @@ -61,16 +71,6 @@ noBrokenSymlinks() { nixInfoLog "$errorMessage" fi - elif [[ $path == "$symlinkTarget" ]]; then - # symlinkTarget is exists and is reflexive - errorMessage="the symlink $path is reflexive $symlinkTarget" - if [[ -z ${allowReflexiveSymlinks-} ]]; then - nixErrorLog "$errorMessage" - numReflexiveSymlinks+=1 - else - nixInfoLog "$errorMessage" - fi - else # symlinkTarget exists and is irreflexive nixInfoLog "the symlink $path is irreflexive and points to a target which exists" From ba1297b0d3ef7ba992e0d5ffe2712bca71a3b0c2 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 21 Jan 2025 13:40:32 -0800 Subject: [PATCH 217/280] no-broken-symlinks: exit instead of returning 1 for cleaner log --- pkgs/build-support/setup-hooks/no-broken-symlinks.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh index 142a2fca720f..6711e0deace4 100644 --- a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -47,7 +47,7 @@ noBrokenSymlinks() { # If it does, Nix probably won't be able to resolve or track dependencies. if [[ $symlinkTarget != "$output" && $symlinkTarget != "$output"/* ]]; then nixErrorLog "symlink $path points to target $symlinkTarget, which escapes the current store path $output" - return 1 + exit 1 fi fi @@ -79,7 +79,7 @@ noBrokenSymlinks() { if ((numDanglingSymlinks > 0 || numReflexiveSymlinks > 0)); then nixErrorLog "found $numDanglingSymlinks dangling symlinks and $numReflexiveSymlinks reflexive symlinks" - return 1 + exit 1 fi return 0 } From 4e8e175c7c8edf9218d1f6ed870ff097dd240cb4 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 21 Jan 2025 13:55:57 -0800 Subject: [PATCH 218/280] doc: add stdenv entry for no-broken-symlinks.sh --- doc/stdenv/stdenv.chapter.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 853b56f3c510..dedeb8d45c92 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1371,6 +1371,14 @@ This setup hook moves any systemd user units installed in the `lib/` subdirector This hook only runs when compiling for Linux. +### `no-broken-symlinks.sh` {#no-broken-symlinks.sh} + +This setup hook checks for, reports, and (by default) fails builds when "broken" symlinks are found. A symlink is considered "broken" if it's dangling (the target doesn't exist) or reflexive (it refers to itself). + +By setting `allowDanglingSymlinks` or `allowReflexiveSymlinks` the hook can be configured to allow symlinks with non-existent targets or symlinks which are reflexive, respectively. + +This hook can be disabled entirely by setting `dontCheckForBrokenSymlinks`. + ### `set-source-date-epoch-to-latest.sh` {#set-source-date-epoch-to-latest.sh} This sets `SOURCE_DATE_EPOCH` to the modification time of the most recent file. From 229fdf0cf29b057503d2ba1c99d78650c209bd48 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 21 Jan 2025 16:29:28 -0800 Subject: [PATCH 219/280] test.stdenv.hooks.no-broken-symlinks: init --- pkgs/test/stdenv/hooks.nix | 1 + pkgs/test/stdenv/no-broken-symlinks.nix | 123 ++++++++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 pkgs/test/stdenv/no-broken-symlinks.nix diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index 6a419ab51e5d..83e82b77b24b 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -97,6 +97,7 @@ [[ -e $out/bin/foo ]] ''; }; + no-broken-symlinks = import ./no-broken-symlinks.nix { inherit stdenv lib pkgs; }; # TODO: add multiple-outputs patch-shebangs = import ./patch-shebangs.nix { inherit stdenv lib pkgs; }; prune-libtool-files = diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix new file mode 100644 index 000000000000..85963542a04a --- /dev/null +++ b/pkgs/test/stdenv/no-broken-symlinks.nix @@ -0,0 +1,123 @@ +{ + lib, + pkgs, + stdenv, +}: + +let + inherit (lib.strings) concatStringsSep; + inherit (pkgs) runCommand; + inherit (pkgs.testers) testBuildFailure; + + mkDanglingSymlink = '' + ln -sr "$out/dangling" "$out/dangling-symlink" + ''; + + mkReflexiveSymlink = '' + ln -sr "$out/reflexive-symlink" "$out/reflexive-symlink" + ''; + + mkValidSymlink = '' + touch "$out/valid" + ln -sr "$out/valid" "$out/valid-symlink" + ''; + + testBuilder = + { + name, + commands ? [ ], + derivationArgs ? { }, + }: + stdenv.mkDerivation ( + { + inherit name; + strictDeps = true; + dontUnpack = true; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + installPhase = + '' + mkdir -p "$out" + + '' + + concatStringsSep "\n" commands; + } + // derivationArgs + ); +in +{ + # Dangling symlinks (allowDanglingSymlinks) + fail-dangling-symlink = + runCommand "fail-dangling-symlink" + { + failed = testBuildFailure (testBuilder { + name = "fail-dangling-symlink-inner"; + commands = [ mkDanglingSymlink ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 1 dangling symlinks and 0 reflexive symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-dangling-symlink-allowed = testBuilder { + name = "pass-symlink-dangling-allowed"; + commands = [ mkDanglingSymlink ]; + derivationArgs.allowDanglingSymlinks = true; + }; + + # Reflexive symlinks (allowReflexiveSymlinks) + fail-reflexive-symlink = + runCommand "fail-reflexive-symlink" + { + failed = testBuildFailure (testBuilder { + name = "fail-reflexive-symlink-inner"; + commands = [ mkReflexiveSymlink ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 0 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-reflexive-symlink-allowed = testBuilder { + name = "pass-reflexive-symlink-allowed"; + commands = [ mkReflexiveSymlink ]; + derivationArgs.allowReflexiveSymlinks = true; + }; + + # Global (dontCheckForBrokenSymlinks) + fail-broken-symlinks = + runCommand "fail-broken-symlinks" + { + failed = testBuildFailure (testBuilder { + name = "fail-broken-symlinks-inner"; + commands = [ + mkDanglingSymlink + mkReflexiveSymlink + ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 1 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-broken-symlinks-allowed = testBuilder { + name = "fail-broken-symlinks-allowed"; + commands = [ + mkDanglingSymlink + mkReflexiveSymlink + ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + pass-valid-symlink = testBuilder { + name = "pass-valid-symlink"; + commands = [ mkValidSymlink ]; + }; +} From 4fc79e674c331edea85bd2209d56cdc7acb28859 Mon Sep 17 00:00:00 2001 From: duli Date: Mon, 20 Jan 2025 17:11:09 +0800 Subject: [PATCH 220/280] emacs: make cairo optional I noticed that libxft was missing from the buildInputs of make-emacs.nix. After a brief observation, I found that cairo and xft are mutually exclusive options, so I made cairo optional. When `withCairo = false;` will fallback to xft. --- pkgs/applications/editors/emacs/make-emacs.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 6ac71c07a33d..775fc03b4892 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -32,6 +32,7 @@ jansson, libXaw, libXcursor, + libXft, libXi, libXpm, libgccjit, @@ -69,6 +70,7 @@ withAcl ? false, withAlsaLib ? false, withAthena ? false, + withCairo ? withX, withCsrc ? true, withDbus ? stdenv.hostPlatform.isLinux, withGTK3 ? withPgtk && !noGui, @@ -333,7 +335,6 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals withX [ Xaw3d - cairo giflib libXaw libXpm @@ -342,6 +343,12 @@ mkDerivation (finalAttrs: { librsvg libtiff ] + ++ lib.optionals withCairo [ + cairo + ] + ++ lib.optionals (withX && !withCairo) [ + libXft + ] ++ lib.optionals withXinput2 [ libXi ] @@ -396,8 +403,8 @@ mkDerivation (finalAttrs: { else if withX then [ (lib.withFeatureAs true "x-toolkit" toolkit) - (lib.withFeature true "cairo") - (lib.withFeature true "xft") + (lib.withFeature withCairo "cairo") + (lib.withFeature (!withCairo) "xft") ] else if withPgtk then [ From 2373f4c21ca92c04375be651b1fbff40e9223758 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 22 Jan 2025 15:05:39 +0100 Subject: [PATCH 221/280] rust-cbindgen: switch to useFetchCargoVendor The previous cargo vendor hash was invalidated by recent updates to the rust infrastructure. --- pkgs/development/tools/rust/cbindgen/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 6dc834822d4a..b0210291e43e 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1GT+EgltLhveEACxhY+748L1HIIyQHbEs7wLKANFWr0="; }; - cargoHash = "sha256-VaM2+az881qePMqkQRxVxoXCgrgPC8LqSQNDst1bnkY="; + useFetchCargoVendor = true; + cargoHash = "sha256-k8n3adoqKp/RXkHybCKV2KlVnaoEhM6vF57BqeCDAP4="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; From 8269ffb01df6484e22dfa02097688eec4f305b82 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 22 Jan 2025 09:48:25 -0800 Subject: [PATCH 222/280] vim: 9.1.1006 -> 9.1.1046 Resolves GHSA-j3g9-wg22-v955. --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index eb6389124600..fc9aa5558d2a 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.1006"; + version = "9.1.1046"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-GIuy2mY7jzB5PNrpq8YYlasuaFR9Wj5ip2tDbXTR1nI="; + hash = "sha256-bH3p78fWUNQRhluUvqQ5uJ+PxNhz7T7wA/4zxUDH130="; }; enableParallelBuilding = true; From 51b2764e9fcd4ef768de7590ce796d619ef82cd2 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Wed, 22 Jan 2025 11:05:13 -0800 Subject: [PATCH 223/280] no-broken-symlinks: provide only dontCheckForBrokenSymlinks and test against absolute symlinks --- doc/stdenv/stdenv.chapter.md | 6 +- .../setup-hooks/no-broken-symlinks.sh | 28 +--- pkgs/test/stdenv/no-broken-symlinks.nix | 142 +++++++++++++----- 3 files changed, 115 insertions(+), 61 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index dedeb8d45c92..868a7543d9ad 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1375,9 +1375,11 @@ This hook only runs when compiling for Linux. This setup hook checks for, reports, and (by default) fails builds when "broken" symlinks are found. A symlink is considered "broken" if it's dangling (the target doesn't exist) or reflexive (it refers to itself). -By setting `allowDanglingSymlinks` or `allowReflexiveSymlinks` the hook can be configured to allow symlinks with non-existent targets or symlinks which are reflexive, respectively. +This hook can be disabled by setting `dontCheckForBrokenSymlinks`. -This hook can be disabled entirely by setting `dontCheckForBrokenSymlinks`. +::: {.note} +The check for reflexivity is direct and does not account for transitivity, so this hook will not prevent cycles in symlinks. +::: ### `set-source-date-epoch-to-latest.sh` {#set-source-date-epoch-to-latest.sh} diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh index 6711e0deace4..d622322a2747 100644 --- a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -19,11 +19,10 @@ noBrokenSymlinks() { local path local pathParent local symlinkTarget - local errorMessage local -i numDanglingSymlinks=0 local -i numReflexiveSymlinks=0 - # TODO(@connorbaker): This hook doesn't check for cycles in symlinks. + # NOTE(@connorbaker): This hook doesn't check for cycles in symlinks. if [[ ! -e $output ]]; then nixWarnLog "skipping non-existent output $output" @@ -52,28 +51,13 @@ noBrokenSymlinks() { fi if [[ $path == "$symlinkTarget" ]]; then - # symlinkTarget is reflexive - errorMessage="the symlink $path is reflexive $symlinkTarget" - if [[ -z ${allowReflexiveSymlinks-} ]]; then - nixErrorLog "$errorMessage" - numReflexiveSymlinks+=1 - else - nixInfoLog "$errorMessage" - fi - + nixErrorLog "the symlink $path is reflexive $symlinkTarget" + numReflexiveSymlinks+=1 elif [[ ! -e $symlinkTarget ]]; then - # symlinkTarget does not exist - errorMessage="the symlink $path points to a missing target $symlinkTarget" - if [[ -z ${allowDanglingSymlinks-} ]]; then - nixErrorLog "$errorMessage" - numDanglingSymlinks+=1 - else - nixInfoLog "$errorMessage" - fi - + nixErrorLog "the symlink $path points to a missing target $symlinkTarget" + numDanglingSymlinks+=1 else - # symlinkTarget exists and is irreflexive - nixInfoLog "the symlink $path is irreflexive and points to a target which exists" + nixDebugLog "the symlink $path is irreflexive and points to a target which exists" fi done < <(find "$output" -type l -print0) diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix index 85963542a04a..0eb0ef0f982e 100644 --- a/pkgs/test/stdenv/no-broken-symlinks.nix +++ b/pkgs/test/stdenv/no-broken-symlinks.nix @@ -9,17 +9,17 @@ let inherit (pkgs) runCommand; inherit (pkgs.testers) testBuildFailure; - mkDanglingSymlink = '' - ln -sr "$out/dangling" "$out/dangling-symlink" + mkDanglingSymlink = absolute: '' + ln -s${if absolute then "r" else ""} "$out/dangling" "$out/dangling-symlink" ''; - mkReflexiveSymlink = '' - ln -sr "$out/reflexive-symlink" "$out/reflexive-symlink" + mkReflexiveSymlink = absolute: '' + ln -s${if absolute then "r" else ""} "$out/reflexive-symlink" "$out/reflexive-symlink" ''; - mkValidSymlink = '' + mkValidSymlink = absolute: '' touch "$out/valid" - ln -sr "$out/valid" "$out/valid-symlink" + ln -s${if absolute then "r" else ""} "$out/valid" "$out/valid-symlink" ''; testBuilder = @@ -47,13 +47,12 @@ let ); in { - # Dangling symlinks (allowDanglingSymlinks) - fail-dangling-symlink = - runCommand "fail-dangling-symlink" + fail-dangling-symlink-relative = + runCommand "fail-dangling-symlink-relative" { failed = testBuildFailure (testBuilder { - name = "fail-dangling-symlink-inner"; - commands = [ mkDanglingSymlink ]; + name = "fail-dangling-symlink-relative-inner"; + commands = [ (mkDanglingSymlink false) ]; }); } '' @@ -62,19 +61,38 @@ in touch $out ''; - pass-dangling-symlink-allowed = testBuilder { - name = "pass-symlink-dangling-allowed"; - commands = [ mkDanglingSymlink ]; - derivationArgs.allowDanglingSymlinks = true; + pass-dangling-symlink-relative-allowed = testBuilder { + name = "pass-dangling-symlink-relative-allowed"; + commands = [ (mkDanglingSymlink false) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; }; - # Reflexive symlinks (allowReflexiveSymlinks) - fail-reflexive-symlink = - runCommand "fail-reflexive-symlink" + fail-dangling-symlink-absolute = + runCommand "fail-dangling-symlink-absolute" { failed = testBuildFailure (testBuilder { - name = "fail-reflexive-symlink-inner"; - commands = [ mkReflexiveSymlink ]; + name = "fail-dangling-symlink-absolute-inner"; + commands = [ (mkDanglingSymlink true) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 1 dangling symlinks and 0 reflexive symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-dangling-symlink-absolute-allowed = testBuilder { + name = "pass-dangling-symlink-absolute-allowed"; + commands = [ (mkDanglingSymlink true) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + fail-reflexive-symlink-relative = + runCommand "fail-reflexive-symlink-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-reflexive-symlink-relative-inner"; + commands = [ (mkReflexiveSymlink false) ]; }); } '' @@ -83,21 +101,40 @@ in touch $out ''; - pass-reflexive-symlink-allowed = testBuilder { - name = "pass-reflexive-symlink-allowed"; - commands = [ mkReflexiveSymlink ]; - derivationArgs.allowReflexiveSymlinks = true; + pass-reflexive-symlink-relative-allowed = testBuilder { + name = "pass-reflexive-symlink-relative-allowed"; + commands = [ (mkReflexiveSymlink false) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; }; - # Global (dontCheckForBrokenSymlinks) - fail-broken-symlinks = - runCommand "fail-broken-symlinks" + fail-reflexive-symlink-absolute = + runCommand "fail-reflexive-symlink-absolute" { failed = testBuildFailure (testBuilder { - name = "fail-broken-symlinks-inner"; + name = "fail-reflexive-symlink-absolute-inner"; + commands = [ (mkReflexiveSymlink true) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 0 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-reflexive-symlink-absolute-allowed = testBuilder { + name = "pass-reflexive-symlink-absolute-allowed"; + commands = [ (mkReflexiveSymlink true) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + fail-broken-symlinks-relative = + runCommand "fail-broken-symlinks-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-broken-symlinks-relative-inner"; commands = [ - mkDanglingSymlink - mkReflexiveSymlink + (mkDanglingSymlink false) + (mkReflexiveSymlink false) ]; }); } @@ -107,17 +144,48 @@ in touch $out ''; - pass-broken-symlinks-allowed = testBuilder { - name = "fail-broken-symlinks-allowed"; + pass-broken-symlinks-relative-allowed = testBuilder { + name = "pass-broken-symlinks-relative-allowed"; commands = [ - mkDanglingSymlink - mkReflexiveSymlink + (mkDanglingSymlink false) + (mkReflexiveSymlink false) ]; derivationArgs.dontCheckForBrokenSymlinks = true; }; - pass-valid-symlink = testBuilder { - name = "pass-valid-symlink"; - commands = [ mkValidSymlink ]; + fail-broken-symlinks-absolute = + runCommand "fail-broken-symlinks-absolute" + { + failed = testBuildFailure (testBuilder { + name = "fail-broken-symlinks-absolute-inner"; + commands = [ + (mkDanglingSymlink true) + (mkReflexiveSymlink true) + ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 1 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-broken-symlinks-absolute-allowed = testBuilder { + name = "pass-broken-symlinks-absolute-allowed"; + commands = [ + (mkDanglingSymlink true) + (mkReflexiveSymlink true) + ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + pass-valid-symlink-relative = testBuilder { + name = "pass-valid-symlink-relative"; + commands = [ (mkValidSymlink false) ]; + }; + + pass-valid-symlink-absolute = testBuilder { + name = "pass-valid-symlink-absolute"; + commands = [ (mkValidSymlink true) ]; }; } From 34539b291caac26d1c4f944682f54ea0affd37cf Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Wed, 22 Jan 2025 16:05:17 -0800 Subject: [PATCH 224/280] no-broken-symlinks: actually interpolate relative paths --- pkgs/build-support/setup-hooks/no-broken-symlinks.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh index d622322a2747..e4acaa1ec114 100644 --- a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -40,14 +40,9 @@ noBrokenSymlinks() { nixInfoLog "symlink $path points to absolute target $symlinkTarget" else nixInfoLog "symlink $path points to relative target $symlinkTarget" - symlinkTarget="$pathParent/$symlinkTarget" - - # Check to make sure the interpolated target doesn't escape the store path of `output`. - # If it does, Nix probably won't be able to resolve or track dependencies. - if [[ $symlinkTarget != "$output" && $symlinkTarget != "$output"/* ]]; then - nixErrorLog "symlink $path points to target $symlinkTarget, which escapes the current store path $output" - exit 1 - fi + # Use --no-symlinks to avoid dereferencing again and --canonicalize-missing to avoid existence + # checks at this step (which can lead to infinite recursion). + symlinkTarget="$(realpath --no-symlinks --canonicalize-missing "$pathParent/$symlinkTarget")" fi if [[ $path == "$symlinkTarget" ]]; then From 60749f9cdc9204dbecaa7ea56ff1fa584baee566 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 23 Jan 2025 04:11:44 +0000 Subject: [PATCH 225/280] stdenv: rename nixLogWithLevel to _nixLogWithLevel to indicate it is meant to be private --- pkgs/stdenv/generic/setup.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 19a836b80b05..3b99861009f6 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -72,7 +72,7 @@ nixLog() { # Identical to nixLog, but additionally prefixed by the logLevel. # NOTE: This function is only every meant to be called from the nix*Log family of functions. -nixLogWithLevel() { +_nixLogWithLevel() { # Return a value explicitly instead of the implicit return of the last command (result of the test). [[ -z ${NIX_LOG_FD-} || ${NIX_DEBUG:-0} -lt ${1:?} ]] && return 0 @@ -87,7 +87,7 @@ nixLogWithLevel() { 6) logLevel=DEBUG ;; 7) logLevel=VOMIT ;; *) - echo "nixLogWithLevel: called with invalid log level: ${1:?}" >&"$NIX_LOG_FD" + echo "_nixLogWithLevel: called with invalid log level: ${1:?}" >&"$NIX_LOG_FD" return 1 ;; esac @@ -107,49 +107,49 @@ nixLogWithLevel() { # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlError` in the Nix source. nixErrorLog() { - nixLogWithLevel 0 "$*" + _nixLogWithLevel 0 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlWarn` in the Nix source. nixWarnLog() { - nixLogWithLevel 1 "$*" + _nixLogWithLevel 1 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlNotice` in the Nix source. nixNoticeLog() { - nixLogWithLevel 2 "$*" + _nixLogWithLevel 2 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlInfo` in the Nix source. nixInfoLog() { - nixLogWithLevel 3 "$*" + _nixLogWithLevel 3 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlTalkative` in the Nix source. nixTalkativeLog() { - nixLogWithLevel 4 "$*" + _nixLogWithLevel 4 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlChatty` in the Nix source. nixChattyLog() { - nixLogWithLevel 5 "$*" + _nixLogWithLevel 5 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlDebug` in the Nix source. nixDebugLog() { - nixLogWithLevel 6 "$*" + _nixLogWithLevel 6 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlVomit` in the Nix source. nixVomitLog() { - nixLogWithLevel 7 "$*" + _nixLogWithLevel 7 "$*" } # Log a hook, to be run before the hook is actually called. From 8aa11323bb3b50e0cafba21511fd8d91158cffb3 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 23 Jan 2025 04:14:49 +0000 Subject: [PATCH 226/280] stdenv: add note in nix logging functions about not cluttering nix-shell --- pkgs/stdenv/generic/setup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 3b99861009f6..4198f41aadde 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -60,6 +60,7 @@ getAllOutputNames() { # the hook name if the caller was an implicit hook), then directed to $NIX_LOG_FD, if it's set. nixLog() { # Return a value explicitly instead of the implicit return of the last command (result of the test). + # NOTE: By requiring NIX_LOG_FD be set, we avoid dumping logging inside of nix-shell. [[ -z ${NIX_LOG_FD-} ]] && return 0 # Use the function name of the caller, unless it is _callImplicitHook, in which case use the name of the hook. @@ -74,6 +75,7 @@ nixLog() { # NOTE: This function is only every meant to be called from the nix*Log family of functions. _nixLogWithLevel() { # Return a value explicitly instead of the implicit return of the last command (result of the test). + # NOTE: By requiring NIX_LOG_FD be set, we avoid dumping logging inside of nix-shell. [[ -z ${NIX_LOG_FD-} || ${NIX_DEBUG:-0} -lt ${1:?} ]] && return 0 local logLevel From 3e3c1f8f39708ef71fed25bcf96a7a68e6884e3c Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 23 Jan 2025 11:58:03 +0300 Subject: [PATCH 227/280] libgbm: 24.3.3 -> 24.3.4 Don't revert to common src, because this makes tracking future updates easier. --- pkgs/development/libraries/mesa/gbm.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/gbm.nix b/pkgs/development/libraries/mesa/gbm.nix index 412f30fa150e..42d8f1b48b64 100644 --- a/pkgs/development/libraries/mesa/gbm.nix +++ b/pkgs/development/libraries/mesa/gbm.nix @@ -17,14 +17,17 @@ let in stdenv.mkDerivation rec { pname = "mesa-libgbm"; - version = "24.3.3"; + + # We don't use the versions from common.nix, because libgbm is a world rebuild, + # so the updates need to happen separately on staging. + version = "24.3.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-OThJ/txyJ6p879jG5qOXX6mL27t7Uz/tbr620iRMeIc="; + hash = "sha256-1RUHbTgcCxdDrWjqB0EG4Ny/nwdjQHHpyPauiW/yogU="; }; mesonAutoFeatures = "disabled"; From 63bff8c132d17b960f98d3878d10a410ec584472 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 23 Jan 2025 08:45:31 +0100 Subject: [PATCH 228/280] treewide: migrate to fetchCargoVendor, batch 1 Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. It should be possible to reproduce this diff. To do so, get the list of files changed by this commit, e.g. with git diff --name-only, then run the following two commands, each with that list of files as their standard input: xargs sed -i 's/^\(. *\)\(cargoHash\)\b/\1useFetchCargoVendor = true;\n\1cargoHash/' cut -d / -f 4 | xargs -n 1 nix-update --version=skip This will take a long time. It might be possible to parallelize it using xargs' -P option. I haven't tested it. --- pkgs/by-name/aa/aaa/package.nix | 3 ++- pkgs/by-name/aa/aarch64-esr-decoder/package.nix | 3 ++- pkgs/by-name/aa/aardvark-dns/package.nix | 3 ++- pkgs/by-name/ab/ab-av1/package.nix | 3 ++- pkgs/by-name/ab/aba/package.nix | 3 ++- pkgs/by-name/ac/action-validator/package.nix | 3 ++- pkgs/by-name/ad/ad/package.nix | 3 ++- pkgs/by-name/ad/adguardian/package.nix | 3 ++- pkgs/by-name/ad/adrs/package.nix | 3 ++- pkgs/by-name/af/afterburn/package.nix | 3 ++- pkgs/by-name/ag/agate/package.nix | 3 ++- pkgs/by-name/ag/agenix-cli/package.nix | 3 ++- pkgs/by-name/ai/aichat/package.nix | 3 ++- pkgs/by-name/ai/aiken/package.nix | 3 ++- pkgs/by-name/ai/airgorah/package.nix | 3 ++- pkgs/by-name/al/alacritty/package.nix | 3 ++- pkgs/by-name/al/alejandra/package.nix | 3 ++- pkgs/by-name/al/alexandria/package.nix | 3 ++- pkgs/by-name/al/alioth/package.nix | 3 ++- pkgs/by-name/am/amber-lang/package.nix | 3 ++- pkgs/by-name/am/amber-secret/package.nix | 3 ++- pkgs/by-name/am/amp/package.nix | 3 ++- pkgs/by-name/an/anewer/package.nix | 3 ++- pkgs/by-name/an/angle-grinder/package.nix | 3 ++- pkgs/by-name/an/ansi/package.nix | 3 ++- pkgs/by-name/an/anyrun/package.nix | 3 ++- pkgs/by-name/ap/apftool-rs/package.nix | 3 ++- pkgs/by-name/ap/aphorme/package.nix | 3 ++- pkgs/by-name/ar/argc/package.nix | 3 ++- pkgs/by-name/ar/argon/package.nix | 3 ++- pkgs/by-name/ar/arp-scan-rs/package.nix | 3 ++- pkgs/by-name/ar/artem/package.nix | 3 ++- pkgs/by-name/ar/arti/package.nix | 3 ++- pkgs/by-name/as/as-tree/package.nix | 3 ++- pkgs/by-name/as/asahi-bless/package.nix | 3 ++- pkgs/by-name/as/asahi-btsync/package.nix | 3 ++- pkgs/by-name/as/asahi-nvram/package.nix | 3 ++- pkgs/by-name/as/asahi-wifisync/package.nix | 3 ++- pkgs/by-name/as/asak/package.nix | 3 ++- pkgs/by-name/as/asciinema-agg/package.nix | 3 ++- pkgs/by-name/as/asciinema-scenario/package.nix | 3 ++- pkgs/by-name/as/asciinema_3/package.nix | 3 ++- pkgs/by-name/as/asfa/package.nix | 3 ++- pkgs/by-name/as/askalono/package.nix | 3 ++- pkgs/by-name/as/asm-lsp/package.nix | 3 ++- pkgs/by-name/as/ast-grep/package.nix | 3 ++- pkgs/by-name/at/atac/package.nix | 3 ++- pkgs/by-name/au/audion/package.nix | 3 ++- pkgs/by-name/au/august/package.nix | 3 ++- pkgs/by-name/au/authoscope/package.nix | 3 ++- pkgs/by-name/au/automatic-timezoned/package.nix | 3 ++- pkgs/by-name/au/autotiling-rs/package.nix | 3 ++- pkgs/by-name/av/av1an-unwrapped/package.nix | 3 ++- pkgs/by-name/av/avml/package.nix | 3 ++- pkgs/by-name/b3/b3sum/package.nix | 3 ++- pkgs/by-name/ba/backdown/package.nix | 3 ++- pkgs/by-name/ba/bacon/package.nix | 3 ++- pkgs/by-name/ba/bankstown-lv2/package.nix | 3 ++- pkgs/by-name/ba/bao/package.nix | 3 ++- pkgs/by-name/ba/bark/package.nix | 3 ++- pkgs/by-name/ba/bartib/package.nix | 3 ++- pkgs/by-name/ba/basilk/package.nix | 3 ++- pkgs/by-name/ba/bat/package.nix | 3 ++- pkgs/by-name/ba/batmon/package.nix | 3 ++- pkgs/by-name/ba/bato/package.nix | 3 ++- pkgs/by-name/bd/bdt/package.nix | 3 ++- pkgs/by-name/be/beancount-language-server/package.nix | 3 ++- pkgs/by-name/be/below/package.nix | 3 ++- pkgs/by-name/be/bend/package.nix | 3 ++- pkgs/by-name/bf/bfc/package.nix | 3 ++- pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix | 3 ++- pkgs/by-name/bi/bingrep/package.nix | 3 ++- pkgs/by-name/bi/binsider/package.nix | 3 ++- pkgs/by-name/bi/binwalk/package.nix | 3 ++- pkgs/by-name/bi/biodiff/package.nix | 3 ++- pkgs/by-name/bi/biome/package.nix | 3 ++- pkgs/by-name/bi/biscuit-cli/package.nix | 3 ++- pkgs/by-name/bk/bk/package.nix | 3 ++- pkgs/by-name/bk/bkt/package.nix | 3 ++- pkgs/by-name/bl/blflash/package.nix | 3 ++- pkgs/by-name/bl/bluetui/package.nix | 3 ++- pkgs/by-name/bo/boa/package.nix | 3 ++- pkgs/by-name/bo/boilr/package.nix | 3 ++- pkgs/by-name/bo/bonk/package.nix | 3 ++- pkgs/by-name/bo/book-summary/package.nix | 3 ++- pkgs/by-name/bo/bootc/package.nix | 3 ++- pkgs/by-name/bo/bootspec/package.nix | 3 ++- pkgs/by-name/bo/boringtun/package.nix | 3 ++- pkgs/by-name/bo/bottom-rs/package.nix | 3 ++- pkgs/by-name/bo/bottom/package.nix | 3 ++- pkgs/by-name/bo/boxbuddy/package.nix | 3 ++- pkgs/by-name/bo/boxxy/package.nix | 3 ++- pkgs/by-name/bp/bpftop/package.nix | 3 ++- pkgs/by-name/br/broot/package.nix | 3 ++- pkgs/by-name/bu/buckle/package.nix | 3 ++- pkgs/by-name/bu/bugstalker/package.nix | 3 ++- pkgs/by-name/bu/bukubrow/package.nix | 3 ++- pkgs/by-name/bu/bulloak/package.nix | 3 ++- pkgs/by-name/bu/bunbun/package.nix | 3 ++- pkgs/by-name/bu/bunyan-rs/package.nix | 3 ++- pkgs/by-name/c2/c2patool/package.nix | 3 ++- pkgs/by-name/ca/cached-nix-shell/package.nix | 3 ++- pkgs/by-name/ca/cairo-lang/package.nix | 3 ++- pkgs/by-name/ca/caligula/package.nix | 3 ++- pkgs/by-name/ca/capnproto-rust/package.nix | 3 ++- pkgs/by-name/ca/cargo-3ds/package.nix | 3 ++- pkgs/by-name/ca/cargo-about/package.nix | 3 ++- pkgs/by-name/ca/cargo-all-features/package.nix | 3 ++- pkgs/by-name/ca/cargo-aoc/package.nix | 3 ++- pkgs/by-name/ca/cargo-apk/package.nix | 3 ++- pkgs/by-name/ca/cargo-autoinherit/package.nix | 3 ++- pkgs/by-name/ca/cargo-benchcmp/package.nix | 3 ++- pkgs/by-name/ca/cargo-binstall/package.nix | 3 ++- pkgs/by-name/ca/cargo-binutils/package.nix | 3 ++- pkgs/by-name/ca/cargo-bisect-rustc/package.nix | 3 ++- pkgs/by-name/ca/cargo-bitbake/package.nix | 3 ++- pkgs/by-name/ca/cargo-bloat/package.nix | 3 ++- pkgs/by-name/ca/cargo-bolero/package.nix | 3 ++- pkgs/by-name/ca/cargo-bootimage/package.nix | 3 ++- pkgs/by-name/ca/cargo-bump/package.nix | 3 ++- pkgs/by-name/ca/cargo-bundle-licenses/package.nix | 3 ++- pkgs/by-name/ca/cargo-bundle/package.nix | 3 ++- pkgs/by-name/ca/cargo-careful/package.nix | 3 ++- pkgs/by-name/ca/cargo-chef/package.nix | 3 ++- pkgs/by-name/ca/cargo-component/package.nix | 3 ++- pkgs/by-name/ca/cargo-cranky/package.nix | 3 ++- pkgs/by-name/ca/cargo-criterion/package.nix | 3 ++- pkgs/by-name/ca/cargo-cross/package.nix | 3 ++- pkgs/by-name/ca/cargo-deadlinks/package.nix | 3 ++- pkgs/by-name/ca/cargo-deb/package.nix | 3 ++- pkgs/by-name/ca/cargo-deny/package.nix | 3 ++- pkgs/by-name/ca/cargo-depgraph/package.nix | 3 ++- pkgs/by-name/ca/cargo-diet/package.nix | 3 ++- pkgs/by-name/ca/cargo-dist/package.nix | 3 ++- pkgs/by-name/ca/cargo-docset/package.nix | 3 ++- pkgs/by-name/ca/cargo-duplicates/package.nix | 3 ++- pkgs/by-name/ca/cargo-expand/package.nix | 3 ++- pkgs/by-name/ca/cargo-feature/package.nix | 3 ++- pkgs/by-name/ca/cargo-features-manager/package.nix | 3 ++- pkgs/by-name/ca/cargo-fuzz/package.nix | 3 ++- pkgs/by-name/ca/cargo-geiger/package.nix | 3 ++- pkgs/by-name/ca/cargo-generate/package.nix | 3 ++- pkgs/by-name/ca/cargo-gra/package.nix | 3 ++- pkgs/by-name/ca/cargo-guppy/package.nix | 3 ++- pkgs/by-name/ca/cargo-hakari/package.nix | 3 ++- pkgs/by-name/ca/cargo-i18n/package.nix | 3 ++- pkgs/by-name/ca/cargo-info/package.nix | 3 ++- pkgs/by-name/ca/cargo-insta/package.nix | 3 ++- pkgs/by-name/ca/cargo-leptos/package.nix | 3 ++- pkgs/by-name/ca/cargo-license/package.nix | 3 ++- pkgs/by-name/ca/cargo-limit/package.nix | 3 ++- pkgs/by-name/ca/cargo-llvm-cov/package.nix | 3 ++- pkgs/by-name/ca/cargo-llvm-lines/package.nix | 3 ++- pkgs/by-name/ca/cargo-local-registry/package.nix | 3 ++- pkgs/by-name/ca/cargo-lock/package.nix | 3 ++- pkgs/by-name/ca/cargo-machete/package.nix | 3 ++- pkgs/by-name/ca/cargo-make/package.nix | 3 ++- pkgs/by-name/ca/cargo-mobile2/package.nix | 3 ++- pkgs/by-name/ca/cargo-modules/package.nix | 3 ++- pkgs/by-name/ca/cargo-mommy/package.nix | 3 ++- pkgs/by-name/ca/cargo-msrv/package.nix | 3 ++- pkgs/by-name/ca/cargo-mutants/package.nix | 3 ++- pkgs/by-name/ca/cargo-nextest/package.nix | 3 ++- pkgs/by-name/ca/cargo-pgo/package.nix | 3 ++- pkgs/by-name/ca/cargo-pio/package.nix | 3 ++- pkgs/by-name/ca/cargo-play/package.nix | 3 ++- pkgs/by-name/ca/cargo-public-api/package.nix | 3 ++- pkgs/by-name/ca/cargo-raze/package.nix | 3 ++- pkgs/by-name/ca/cargo-rdme/package.nix | 3 ++- pkgs/by-name/ca/cargo-readme/package.nix | 3 ++- pkgs/by-name/ca/cargo-release/package.nix | 3 ++- pkgs/by-name/ca/cargo-risczero/package.nix | 3 ++- pkgs/by-name/ca/cargo-rr/package.nix | 3 ++- pkgs/by-name/ca/cargo-run-bin/package.nix | 3 ++- pkgs/by-name/ca/cargo-semver-checks/package.nix | 3 ++- pkgs/by-name/ca/cargo-shear/package.nix | 3 ++- pkgs/by-name/ca/cargo-show-asm/package.nix | 3 ++- pkgs/by-name/ca/cargo-sort/package.nix | 3 ++- pkgs/by-name/ca/cargo-spellcheck/package.nix | 3 ++- pkgs/by-name/ca/cargo-supply-chain/package.nix | 3 ++- pkgs/by-name/ca/cargo-sweep/package.nix | 3 ++- pkgs/by-name/ca/cargo-swift/package.nix | 3 ++- pkgs/by-name/ca/cargo-sync-readme/package.nix | 3 ++- pkgs/by-name/ca/cargo-tally/package.nix | 3 ++- pkgs/by-name/ca/cargo-temp/package.nix | 3 ++- pkgs/by-name/ca/cargo-toml-lint/package.nix | 3 ++- pkgs/by-name/ca/cargo-typify/package.nix | 3 ++- pkgs/by-name/ca/cargo-ui/package.nix | 3 ++- pkgs/by-name/ca/cargo-unfmt/package.nix | 3 ++- pkgs/by-name/ca/cargo-unused-features/package.nix | 3 ++- pkgs/by-name/ca/cargo-update/package.nix | 3 ++- pkgs/by-name/ca/cargo-v5/package.nix | 3 ++- pkgs/by-name/ca/cargo-valgrind/package.nix | 3 ++- pkgs/by-name/ca/cargo-vibe/package.nix | 3 ++- pkgs/by-name/ca/cargo-wasi/package.nix | 3 ++- pkgs/by-name/ca/cargo-wipe/package.nix | 3 ++- pkgs/by-name/ca/cargo-wizard/package.nix | 3 ++- pkgs/by-name/ca/cargo-workspaces/package.nix | 3 ++- pkgs/by-name/ca/cargo-xbuild/package.nix | 3 ++- pkgs/by-name/ca/cargo-xwin/package.nix | 3 ++- pkgs/by-name/ca/cargo2junit/package.nix | 3 ++- pkgs/by-name/ca/cargonode/package.nix | 3 ++- pkgs/by-name/ca/carl/package.nix | 3 ++- pkgs/by-name/ca/castor/package.nix | 3 ++- pkgs/by-name/ca/catppuccin-catwalk/package.nix | 3 ++- pkgs/by-name/ca/catppuccin-whiskers/package.nix | 3 ++- pkgs/by-name/ca/cauwugo/package.nix | 3 ++- pkgs/by-name/cb/cbfmt/package.nix | 3 ++- pkgs/by-name/cd/cdwe/package.nix | 3 ++- pkgs/by-name/ce/cedar/package.nix | 3 ++- pkgs/by-name/ce/celeste/package.nix | 3 ++- pkgs/by-name/ce/centerpiece/package.nix | 3 ++- pkgs/by-name/cf/cfonts/package.nix | 3 ++- pkgs/by-name/cf/cfspeedtest/package.nix | 3 ++- pkgs/by-name/ch/checkpwn/package.nix | 3 ++- pkgs/by-name/ch/cherrybomb/package.nix | 3 ++- pkgs/by-name/ch/chess-tui/package.nix | 3 ++- pkgs/by-name/ch/chirpstack-concentratord/package.nix | 3 ++- pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix | 3 ++- pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix | 3 ++- pkgs/by-name/ch/choose/package.nix | 3 ++- pkgs/by-name/ci/cinny-desktop/package.nix | 3 ++- pkgs/by-name/ci/circom/package.nix | 3 ++- pkgs/by-name/ci/citron/package.nix | 3 ++- pkgs/by-name/cl/cl-wordle/package.nix | 3 ++- pkgs/by-name/cl/clang-tidy-sarif/package.nix | 3 ++- pkgs/by-name/cl/clapboard/package.nix | 3 ++- pkgs/by-name/cl/click/package.nix | 3 ++- pkgs/by-name/cl/clima/package.nix | 3 ++- pkgs/by-name/cl/clini/package.nix | 3 ++- pkgs/by-name/cl/clipcat/package.nix | 3 ++- pkgs/by-name/cl/clippy-sarif/package.nix | 3 ++- pkgs/by-name/cl/cloak/package.nix | 3 ++- pkgs/by-name/cl/cloneit/package.nix | 3 ++- pkgs/by-name/cm/cmd-wrapped/package.nix | 3 ++- pkgs/by-name/cn/cnsprcy/package.nix | 3 ++- pkgs/by-name/cn/cntr/package.nix | 3 ++- pkgs/by-name/co/code-minimap/package.nix | 3 ++- pkgs/by-name/co/codeberg-cli/package.nix | 3 ++- pkgs/by-name/co/codemov/package.nix | 3 ++- pkgs/by-name/co/codesnap/package.nix | 3 ++- pkgs/by-name/co/codevis/package.nix | 3 ++- pkgs/by-name/co/coinlive/package.nix | 3 ++- pkgs/by-name/co/colmena/package.nix | 3 ++- pkgs/by-name/co/colo/package.nix | 3 ++- pkgs/by-name/co/comet-gog/package.nix | 3 ++- pkgs/by-name/co/comma/package.nix | 3 ++- pkgs/by-name/co/commitlint-rs/package.nix | 3 ++- pkgs/by-name/co/commitmsgfmt/package.nix | 3 ++- pkgs/by-name/co/committed/package.nix | 3 ++- pkgs/by-name/co/comodoro/package.nix | 3 ++- pkgs/by-name/co/complgen/package.nix | 3 ++- pkgs/by-name/co/comrak/package.nix | 3 ++- pkgs/by-name/co/conceal/package.nix | 3 ++- pkgs/by-name/co/config-store/package.nix | 3 ++- pkgs/by-name/co/conserve/package.nix | 3 ++- pkgs/by-name/co/convco/package.nix | 3 ++- pkgs/by-name/co/cook-cli/package.nix | 3 ++- pkgs/by-name/co/copycat/package.nix | 3 ++- pkgs/by-name/co/cosmic-screenshot/package.nix | 3 ++- pkgs/by-name/co/cotp/package.nix | 3 ++- pkgs/by-name/co/couchbase-shell/package.nix | 3 ++- pkgs/by-name/cr/crab-hole/package.nix | 3 ++- pkgs/by-name/cr/crabz/package.nix | 3 ++- pkgs/by-name/cr/crate2nix/package.nix | 3 ++- pkgs/by-name/cr/crates-tui/package.nix | 3 ++- pkgs/by-name/cr/cringify/package.nix | 3 ++- pkgs/by-name/cr/critcmp/package.nix | 3 ++- pkgs/by-name/cs/csv-tui/package.nix | 3 ++- pkgs/by-name/cs/csv2parquet/package.nix | 3 ++- pkgs/by-name/cs/csv2svg/package.nix | 3 ++- pkgs/by-name/cs/csview/package.nix | 3 ++- pkgs/by-name/cs/csvlens/package.nix | 3 ++- pkgs/by-name/cw/cwe-client-cli/package.nix | 3 ++- pkgs/by-name/cy/cyme/package.nix | 3 ++- pkgs/by-name/cz/czkawka/package.nix | 3 ++- pkgs/by-name/da/dabet/package.nix | 3 ++- pkgs/by-name/da/daktilo/package.nix | 3 ++- pkgs/by-name/da/darklua/package.nix | 3 ++- pkgs/by-name/da/dash-mpd-cli/package.nix | 3 ++- pkgs/by-name/da/datafusion-cli/package.nix | 3 ++- pkgs/by-name/de/deadnix/package.nix | 3 ++- pkgs/by-name/de/delta/package.nix | 3 ++- pkgs/by-name/de/deploy-rs/package.nix | 3 ++- pkgs/by-name/de/deqp-runner/package.nix | 3 ++- pkgs/by-name/de/desed/package.nix | 3 ++- pkgs/by-name/de/desk-exec/package.nix | 3 ++- pkgs/by-name/de/devenv/package.nix | 3 ++- pkgs/by-name/de/dezoomify-rs/package.nix | 3 ++- pkgs/by-name/df/dfrs/package.nix | 3 ++- pkgs/by-name/di/diesel-cli-ext/package.nix | 3 ++- pkgs/by-name/di/diesel-cli/package.nix | 3 ++- pkgs/by-name/di/diffedit3/package.nix | 3 ++- pkgs/by-name/di/diffsitter/package.nix | 3 ++- pkgs/by-name/di/dioxus-cli/package.nix | 3 ++- pkgs/by-name/di/dipc/package.nix | 3 ++- pkgs/by-name/di/distant/package.nix | 3 ++- pkgs/by-name/di/diswall/package.nix | 3 ++- pkgs/by-name/dm/dmlive/package.nix | 3 ++- pkgs/by-name/dn/dnglab/package.nix | 3 ++- pkgs/by-name/do/docuum/package.nix | 3 ++- pkgs/by-name/do/dogedns/package.nix | 3 ++- pkgs/by-name/do/dotacat/package.nix | 3 ++- pkgs/by-name/do/dotenvy/package.nix | 3 ++- pkgs/by-name/do/dotslash/package.nix | 3 ++- pkgs/by-name/do/dotter/package.nix | 3 ++- pkgs/by-name/dp/dprint/package.nix | 3 ++- pkgs/by-name/dt/dtool/package.nix | 3 ++- pkgs/by-name/du/dua/package.nix | 3 ++- pkgs/by-name/du/dufs/package.nix | 3 ++- pkgs/by-name/du/dum/package.nix | 3 ++- pkgs/by-name/du/dumbpipe/package.nix | 3 ++- pkgs/by-name/du/dummyhttp/package.nix | 3 ++- pkgs/by-name/du/dupe-krill/package.nix | 3 ++- pkgs/by-name/du/dust/package.nix | 3 ++- pkgs/by-name/du/dutree/package.nix | 3 ++- pkgs/by-name/dy/dynisland/package.nix | 3 ++- pkgs/by-name/dy/dysk/package.nix | 3 ++- pkgs/by-name/ea/ea/package.nix | 3 ++- pkgs/by-name/ea/each/package.nix | 3 ++- pkgs/by-name/ea/ear2ctl/package.nix | 3 ++- pkgs/by-name/ea/earthlyls/package.nix | 3 ++- pkgs/by-name/ec/ecc/package.nix | 3 ++- pkgs/by-name/ef/effitask/package.nix | 3 ++- pkgs/by-name/ef/efmt/package.nix | 3 ++- pkgs/by-name/eg/ego/package.nix | 3 ++- pkgs/by-name/el/elan/package.nix | 3 ++- pkgs/by-name/el/elf-info/package.nix | 3 ++- pkgs/by-name/el/elf2nucleus/package.nix | 3 ++- pkgs/by-name/el/elf2uf2-rs/package.nix | 3 ++- pkgs/by-name/el/elfcat/package.nix | 3 ++- pkgs/by-name/el/elfx86exts/package.nix | 3 ++- pkgs/by-name/em/emacs-lsp-booster/package.nix | 3 ++- pkgs/by-name/em/emplace/package.nix | 3 ++- pkgs/by-name/en/engage/package.nix | 3 ++- pkgs/by-name/en/enkei/package.nix | 3 ++- pkgs/by-name/en/envfs/package.nix | 3 ++- pkgs/by-name/en/envio/package.nix | 3 ++- pkgs/by-name/er/erdtree/package.nix | 3 ++- pkgs/by-name/er/erg/package.nix | 3 ++- pkgs/by-name/es/esbuild-config/package.nix | 3 ++- pkgs/by-name/es/esp-generate/package.nix | 3 ++- pkgs/by-name/es/espflash/package.nix | 3 ++- pkgs/by-name/es/espup/package.nix | 3 ++- pkgs/by-name/ev/eva/package.nix | 3 ++- pkgs/by-name/ev/evil-helix/package.nix | 3 ++- pkgs/by-name/ev/evremap/package.nix | 3 ++- pkgs/by-name/ev/evscript/package.nix | 3 ++- pkgs/by-name/ev/evsieve/package.nix | 3 ++- pkgs/by-name/ev/evtx/package.nix | 3 ++- pkgs/by-name/ew/eww/package.nix | 3 ++- pkgs/by-name/ex/extest/package.nix | 3 ++- pkgs/by-name/ez/ezno/package.nix | 3 ++- pkgs/by-name/fa/faketty/package.nix | 3 ++- pkgs/by-name/fa/fanctl/package.nix | 3 ++- pkgs/by-name/fb/fblog/package.nix | 3 ++- pkgs/by-name/fc/fcast-client/package.nix | 3 ++- pkgs/by-name/fc/fcp/package.nix | 3 ++- pkgs/by-name/fd/fd/package.nix | 3 ++- pkgs/by-name/fe/fedimint/package.nix | 3 ++- pkgs/by-name/fe/felix-fm/package.nix | 3 ++- pkgs/by-name/fe/fend/package.nix | 3 ++- pkgs/by-name/fe/fernglas/package.nix | 3 ++- pkgs/by-name/ff/ff2mpv-rust/package.nix | 3 ++- pkgs/by-name/ff/ffizer/package.nix | 3 ++- pkgs/by-name/fh/fh/package.nix | 3 ++- pkgs/by-name/fi/fido2luks/package.nix | 3 ++- pkgs/by-name/fi/figma-agent/package.nix | 3 ++- pkgs/by-name/fi/findex/package.nix | 3 ++- pkgs/by-name/fi/fishnet/package.nix | 3 ++- pkgs/by-name/fj/fjo/package.nix | 3 ++- pkgs/by-name/fl/flaca/package.nix | 3 ++- pkgs/by-name/fl/flake-edit/package.nix | 3 ++- pkgs/by-name/fl/flavours/package.nix | 3 ++- pkgs/by-name/fl/flawz/package.nix | 3 ++- pkgs/by-name/fl/flip-link/package.nix | 3 ++- pkgs/by-name/fl/flirt/package.nix | 3 ++- pkgs/by-name/fl/flitter/package.nix | 3 ++- pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix | 3 ++- pkgs/by-name/fm/fm/package.nix | 3 ++- pkgs/by-name/fo/fontfor/package.nix | 3 ++- pkgs/by-name/fo/forgejo-cli/package.nix | 3 ++- pkgs/by-name/fo/formatjson5/package.nix | 3 ++- pkgs/by-name/fo/fortanix-sgx-tools/package.nix | 3 ++- pkgs/by-name/fo/fortune-kind/package.nix | 3 ++- pkgs/by-name/fo/foundry/package.nix | 3 ++- pkgs/by-name/fo/foxmarks/package.nix | 3 ++- pkgs/by-name/fr/frawk/package.nix | 3 ++- pkgs/by-name/fr/fre/package.nix | 3 ++- pkgs/by-name/fr/frece/package.nix | 3 ++- pkgs/by-name/fr/freenukum/package.nix | 3 ++- pkgs/by-name/fr/french-numbers/package.nix | 3 ++- pkgs/by-name/fs/fselect/package.nix | 3 ++- pkgs/by-name/fs/fsrx/package.nix | 3 ++- pkgs/by-name/fs/fst/package.nix | 3 ++- pkgs/by-name/fu/fuc/package.nix | 3 ++- pkgs/by-name/fu/function-runner/package.nix | 3 ++- pkgs/by-name/fu/functiontrace-server/package.nix | 3 ++- pkgs/by-name/fu/fundoc/package.nix | 3 ++- pkgs/by-name/fu/funzzy/package.nix | 3 ++- pkgs/by-name/fw/fw/package.nix | 3 ++- pkgs/by-name/g9/g933-utils/package.nix | 3 ++- pkgs/by-name/ga/galerio/package.nix | 3 ++- pkgs/by-name/ga/game-rs/package.nix | 3 ++- pkgs/by-name/ge/gen-license/package.nix | 3 ++- pkgs/by-name/ge/genact/package.nix | 3 ++- pkgs/by-name/ge/genemichaels/package.nix | 3 ++- pkgs/by-name/ge/geticons/package.nix | 3 ++- pkgs/by-name/ge/gex/package.nix | 3 ++- pkgs/by-name/gh/ghciwatch/package.nix | 3 ++- pkgs/by-name/gi/gimoji/package.nix | 3 ++- pkgs/by-name/gi/girouette/package.nix | 3 ++- pkgs/by-name/gi/git-agecrypt/package.nix | 3 ++- pkgs/by-name/gi/git-chain/package.nix | 3 ++- pkgs/by-name/gi/git-dive/package.nix | 3 ++- pkgs/by-name/gi/git-gamble/package.nix | 3 ++- pkgs/by-name/gi/git-gr/package.nix | 3 ++- pkgs/by-name/gi/git-graph/package.nix | 3 ++- pkgs/by-name/gi/git-igitt/package.nix | 3 ++- pkgs/by-name/gi/git-ignore/package.nix | 3 ++- pkgs/by-name/gi/git-instafix/package.nix | 3 ++- pkgs/by-name/gi/git-interactive-rebase-tool/package.nix | 3 ++- pkgs/by-name/gi/git-mit/package.nix | 3 ++- pkgs/by-name/gi/git-nomad/package.nix | 3 ++- pkgs/by-name/gi/git-prole/package.nix | 3 ++- pkgs/by-name/gi/git-series/package.nix | 3 ++- pkgs/by-name/gi/git-smash/package.nix | 3 ++- pkgs/by-name/gi/git-together/package.nix | 3 ++- pkgs/by-name/gi/git-upstream/package.nix | 3 ++- pkgs/by-name/gi/git-vanity-hash/package.nix | 3 ++- pkgs/by-name/gi/gitlab-ci-ls/package.nix | 3 ++- pkgs/by-name/gi/gitlab-clippy/package.nix | 3 ++- pkgs/by-name/gi/gitlab-timelogs/package.nix | 3 ++- pkgs/by-name/gi/gitnr/package.nix | 3 ++- pkgs/by-name/gi/gitprompt-rs/package.nix | 3 ++- pkgs/by-name/gi/gitrs/package.nix | 3 ++- pkgs/by-name/gi/gitu/package.nix | 3 ++- pkgs/by-name/gi/gitui/package.nix | 3 ++- pkgs/by-name/gl/glas/package.nix | 3 ++- pkgs/by-name/gl/glicol-cli/package.nix | 3 ++- pkgs/by-name/gl/glitter/package.nix | 3 ++- pkgs/by-name/gl/globe-cli/package.nix | 3 ++- pkgs/by-name/gl/glrnvim/package.nix | 3 ++- pkgs/by-name/gl/gluesql/package.nix | 3 ++- pkgs/by-name/gn/gnirehtet/package.nix | 3 ++- pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix | 3 ++- pkgs/by-name/gn/gnome-randr/package.nix | 3 ++- pkgs/by-name/go/gobang/package.nix | 3 ++- pkgs/by-name/go/gobble/package.nix | 3 ++- pkgs/by-name/go/gotify-desktop/package.nix | 3 ++- pkgs/by-name/go/govee2mqtt/package.nix | 3 ++- pkgs/by-name/gp/gpauth/package.nix | 3 ++- pkgs/by-name/gp/gpclient/package.nix | 3 ++- pkgs/by-name/gp/gping/package.nix | 3 ++- pkgs/by-name/gp/gptman/package.nix | 3 ++- pkgs/by-name/gp/gpustat/package.nix | 3 ++- pkgs/by-name/gq/gql/package.nix | 3 ++- pkgs/by-name/gr/grass-sass/package.nix | 3 ++- pkgs/by-name/gr/grcov/package.nix | 3 ++- pkgs/by-name/gr/gridlock/package.nix | 3 ++- pkgs/by-name/gr/grip-grab/package.nix | 3 ++- pkgs/by-name/gr/grpc-health-check/package.nix | 3 ++- pkgs/by-name/ha/hackgregator/package.nix | 3 ++- pkgs/by-name/ha/hadolint-sarif/package.nix | 3 ++- pkgs/by-name/ha/halp/package.nix | 3 ++- pkgs/by-name/ha/hamtransfer/package.nix | 3 ++- pkgs/by-name/ha/handlr-regex/package.nix | 3 ++- pkgs/by-name/ha/handlr/package.nix | 3 ++- pkgs/by-name/ha/hanko/package.nix | 3 ++- pkgs/by-name/ha/harmonia/package.nix | 3 ++- pkgs/by-name/ha/harper/package.nix | 3 ++- pkgs/by-name/ha/hatsu/package.nix | 3 ++- pkgs/by-name/ha/havn/package.nix | 3 ++- pkgs/by-name/ha/hayabusa/package.nix | 3 ++- pkgs/by-name/ha/hayagriva/package.nix | 3 ++- pkgs/by-name/ha/haylxon/package.nix | 3 ++- pkgs/by-name/hc/hck/package.nix | 3 ++- pkgs/by-name/he/heatseeker/package.nix | 3 ++- pkgs/by-name/he/hebbot/package.nix | 3 ++- pkgs/by-name/he/heh/package.nix | 3 ++- pkgs/by-name/he/heliocron/package.nix | 3 ++- pkgs/by-name/he/helix/package.nix | 3 ++- pkgs/by-name/he/hex/package.nix | 3 ++- pkgs/by-name/he/hexdino/package.nix | 3 ++- pkgs/by-name/he/hexpatch/package.nix | 3 ++- pkgs/by-name/he/hextazy/package.nix | 3 ++- pkgs/by-name/he/hexyl/package.nix | 3 ++- pkgs/by-name/he/heygpt/package.nix | 3 ++- pkgs/by-name/hi/hickory-dns/package.nix | 3 ++- pkgs/by-name/hi/highlight-assertions/package.nix | 3 ++- pkgs/by-name/hi/himalaya/package.nix | 3 ++- pkgs/by-name/hm/hmm/package.nix | 3 ++- pkgs/by-name/ho/hoard/package.nix | 3 ++- pkgs/by-name/ht/htb-toolkit/package.nix | 3 ++- pkgs/by-name/ht/htmx-lsp/package.nix | 3 ++- pkgs/by-name/ht/httm/package.nix | 3 ++- pkgs/by-name/ht/httplz/package.nix | 3 ++- pkgs/by-name/hu/hullcaster/package.nix | 3 ++- pkgs/by-name/hu/huniq/package.nix | 3 ++- pkgs/by-name/hu/hunt/package.nix | 3 ++- pkgs/by-name/hu/hurl/package.nix | 3 ++- pkgs/by-name/hv/hvm/package.nix | 3 ++- pkgs/by-name/hw/hwatch/package.nix | 3 ++- pkgs/by-name/hy/hydra-check/package.nix | 3 ++- pkgs/by-name/hy/hydra-cli/package.nix | 3 ++- pkgs/by-name/hy/hyperlink/package.nix | 3 ++- pkgs/by-name/hy/hyprdim/package.nix | 3 ++- pkgs/by-name/hy/hyprland-activewindow/package.nix | 3 ++- pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix | 3 ++- pkgs/by-name/hy/hyprland-monitor-attached/package.nix | 3 ++- pkgs/by-name/hy/hyprland-per-window-layout/package.nix | 3 ++- pkgs/by-name/hy/hyprland-workspaces/package.nix | 3 ++- pkgs/by-name/hy/hyprnome/package.nix | 3 ++- pkgs/by-name/hy/hyprsome/package.nix | 3 ++- pkgs/by-name/i3/i3-back/package.nix | 3 ++- pkgs/by-name/i3/i3-open-next-ws/package.nix | 3 ++- pkgs/by-name/i3/i3bar-river/package.nix | 3 ++- pkgs/by-name/ia/iamb/package.nix | 3 ++- pkgs/by-name/ia/ianny/package.nix | 3 ++- pkgs/by-name/ic/icnsify/package.nix | 3 ++- pkgs/by-name/ik/ikill/package.nix | 3 ++- pkgs/by-name/im/image-roll/package.nix | 3 ++- pkgs/by-name/im/impala/package.nix | 3 ++- pkgs/by-name/in/inferno/package.nix | 3 ++- pkgs/by-name/in/inhibridge/package.nix | 3 ++- pkgs/by-name/in/inko/package.nix | 3 ++- pkgs/by-name/in/inori/package.nix | 3 ++- pkgs/by-name/in/inputplug/package.nix | 3 ++- pkgs/by-name/in/intelli-shell/package.nix | 3 ++- pkgs/by-name/in/intentrace/package.nix | 3 ++- pkgs/by-name/in/intermodal/package.nix | 3 ++- pkgs/by-name/in/inv-sig-helper/package.nix | 3 ++- pkgs/by-name/ip/iperf3d/package.nix | 3 ++- pkgs/by-name/ir/iro/package.nix | 3 ++- pkgs/by-name/ir/iroh/package.nix | 3 ++- pkgs/by-name/ir/ironbar/package.nix | 3 ++- pkgs/by-name/ir/irust/package.nix | 3 ++- pkgs/by-name/iv/ivm/package.nix | 3 ++- pkgs/by-name/iw/iwqr/package.nix | 3 ++- pkgs/by-name/ja/jaq/package.nix | 3 ++- pkgs/by-name/ja/jay/package.nix | 3 ++- pkgs/by-name/je/jellyfin-rpc/package.nix | 3 ++- pkgs/by-name/je/jellyfin-tui/package.nix | 3 ++- pkgs/by-name/je/jen/package.nix | 3 ++- pkgs/by-name/jf/jf/package.nix | 3 ++- pkgs/by-name/jf/jfmt/package.nix | 3 ++- pkgs/by-name/ji/jikken/package.nix | 3 ++- pkgs/by-name/jn/jnv/package.nix | 3 ++- pkgs/by-name/jo/job-security/package.nix | 3 ++- pkgs/by-name/jo/josh/package.nix | 3 ++- pkgs/by-name/jo/joshuto/package.nix | 3 ++- pkgs/by-name/jo/jot/package.nix | 3 ++- pkgs/by-name/jo/jotdown/package.nix | 3 ++- pkgs/by-name/jo/journaldriver/package.nix | 3 ++- pkgs/by-name/jq/jql/package.nix | 3 ++- pkgs/by-name/ju/jujutsu/package.nix | 3 ++- pkgs/by-name/ju/just/package.nix | 3 ++- pkgs/by-name/jw/jwt-cli/package.nix | 3 ++- pkgs/by-name/jw/jwtinfo/package.nix | 3 ++- pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix | 3 ++- pkgs/by-name/ka/kakoune-lsp/package.nix | 3 ++- pkgs/by-name/ka/kalker/package.nix | 3 ++- pkgs/by-name/ka/kamp/package.nix | 3 ++- pkgs/by-name/ka/kanha/package.nix | 3 ++- pkgs/by-name/ka/kanidm-provision/package.nix | 3 ++- pkgs/by-name/ka/kaput-cli/package.nix | 3 ++- pkgs/by-name/ka/karlender/package.nix | 3 ++- pkgs/by-name/kb/kbt/package.nix | 3 ++- pkgs/by-name/kc/kclvm_cli/package.nix | 3 ++- pkgs/by-name/kd/kdlfmt/package.nix | 3 ++- pkgs/by-name/kd/kdotool/package.nix | 3 ++- pkgs/by-name/ke/keedump/package.nix | 3 ++- pkgs/by-name/ke/keepass-diff/package.nix | 3 ++- pkgs/by-name/ke/kepler/package.nix | 3 ++- pkgs/by-name/ke/kestrel/package.nix | 3 ++- pkgs/by-name/ke/keyscope/package.nix | 3 ++- pkgs/by-name/ki/kibi/package.nix | 3 ++- pkgs/by-name/ki/kickoff/package.nix | 3 ++- pkgs/by-name/ki/kickstart/package.nix | 3 ++- pkgs/by-name/ki/kitty-img/package.nix | 3 ++- pkgs/by-name/ki/kittycad-kcl-lsp/package.nix | 3 ++- pkgs/by-name/ki/kittysay/package.nix | 3 ++- pkgs/by-name/kl/klog-rs/package.nix | 3 ++- pkgs/by-name/km/kmon/package.nix | 3 ++- pkgs/by-name/ko/koji/package.nix | 3 ++- pkgs/by-name/ko/komac/package.nix | 3 ++- pkgs/by-name/ko/kondo/package.nix | 3 ++- pkgs/by-name/ko/kontroll/package.nix | 3 ++- pkgs/by-name/kr/krabby/package.nix | 3 ++- pkgs/by-name/kr/krankerl/package.nix | 3 ++- pkgs/by-name/kr/krapslog/package.nix | 3 ++- pkgs/by-name/kr/krun/package.nix | 3 ++- pkgs/by-name/kt/kty/package.nix | 3 ++- pkgs/by-name/ku/kubetui/package.nix | 3 ++- pkgs/by-name/kx/kx-aspe-cli/package.nix | 3 ++- pkgs/by-name/la/lalrpop/package.nix | 3 ++- pkgs/by-name/la/lan-mouse/package.nix | 3 ++- pkgs/by-name/la/lanzaboote-tool/package.nix | 3 ++- pkgs/by-name/la/lazycli/package.nix | 3 ++- pkgs/by-name/la/lazyjj/package.nix | 3 ++- pkgs/by-name/ld/ldproxy/package.nix | 3 ++- pkgs/by-name/le/leaf/package.nix | 3 ++- pkgs/by-name/le/leddy/package.nix | 3 ++- pkgs/by-name/le/leetcode-cli/package.nix | 3 ++- pkgs/by-name/le/leftwm-config/package.nix | 3 ++- pkgs/by-name/le/leftwm-theme/package.nix | 3 ++- pkgs/by-name/le/leftwm/package.nix | 3 ++- pkgs/by-name/le/legba/package.nix | 3 ++- pkgs/by-name/le/lemmeknow/package.nix | 3 ++- pkgs/by-name/le/lemmy-help/package.nix | 3 ++- pkgs/by-name/le/lemurs/package.nix | 3 ++- pkgs/by-name/le/leptosfmt/package.nix | 3 ++- pkgs/by-name/li/libetebase/package.nix | 3 ++- pkgs/by-name/li/librashader/package.nix | 3 ++- pkgs/by-name/li/license-cli/package.nix | 3 ++- pkgs/by-name/li/license-generator/package.nix | 3 ++- pkgs/by-name/li/licensure/package.nix | 3 ++- pkgs/by-name/li/lightningcss/package.nix | 3 ++- pkgs/by-name/li/limbo/package.nix | 3 ++- pkgs/by-name/li/live-server/package.nix | 3 ++- pkgs/by-name/ll/lla/package.nix | 3 ++- pkgs/by-name/ll/llm-ls/package.nix | 3 ++- pkgs/by-name/ll/lls/package.nix | 3 ++- pkgs/by-name/lo/loco-cli/package.nix | 3 ++- pkgs/by-name/lr/lrcget/package.nix | 3 ++- pkgs/by-name/ls/lscolors/package.nix | 3 ++- pkgs/by-name/ls/lsd/package.nix | 3 ++- pkgs/by-name/lu/ludtwig/package.nix | 3 ++- pkgs/by-name/lu/ludusavi/package.nix | 3 ++- pkgs/by-name/lu/luminous-ttv/package.nix | 3 ++- pkgs/by-name/lu/lunatic/package.nix | 3 ++- pkgs/by-name/lu/lune/package.nix | 3 ++- pkgs/by-name/lu/lurk/package.nix | 3 ++- pkgs/by-name/lu/lutgen/package.nix | 3 ++- pkgs/by-name/ma/maa-cli/package.nix | 3 ++- pkgs/by-name/ma/macchina/package.nix | 3 ++- pkgs/by-name/ma/macmon/package.nix | 3 ++- pkgs/by-name/ma/magic-wormhole-rs/package.nix | 3 ++- pkgs/by-name/ma/mago/package.nix | 3 ++- pkgs/by-name/ma/majima/package.nix | 3 ++- pkgs/by-name/ma/maker-panel/package.nix | 3 ++- pkgs/by-name/ma/makima/package.nix | 3 ++- pkgs/by-name/ma/managarr/package.nix | 3 ++- pkgs/by-name/ma/mandown/package.nix | 3 ++- pkgs/by-name/ma/manga-tui/package.nix | 3 ++- pkgs/by-name/ma/manix/package.nix | 3 ++- pkgs/by-name/ma/markuplinkchecker/package.nix | 3 ++- pkgs/by-name/ma/marmite/package.nix | 3 ++- pkgs/by-name/ma/mask/package.nix | 3 ++- pkgs/by-name/ma/masklint/package.nix | 3 ++- pkgs/by-name/ma/matrix-commander-rs/package.nix | 3 ++- pkgs/by-name/ma/matugen/package.nix | 3 ++- pkgs/by-name/ma/maturin/package.nix | 3 ++- pkgs/by-name/mc/mcfly-fzf/package.nix | 3 ++- pkgs/by-name/mc/mcfly/package.nix | 3 ++- pkgs/by-name/mc/mcumgr-client/package.nix | 3 ++- pkgs/by-name/md/md-tui/package.nix | 3 ++- pkgs/by-name/md/mdbook-alerts/package.nix | 3 ++- pkgs/by-name/md/mdbook-cmdrun/package.nix | 3 ++- pkgs/by-name/md/mdbook-d2/package.nix | 3 ++- pkgs/by-name/md/mdbook-emojicodes/package.nix | 3 ++- pkgs/by-name/md/mdbook-i18n-helpers/package.nix | 3 ++- pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix | 3 ++- pkgs/by-name/md/mdbook-man/package.nix | 3 ++- pkgs/by-name/md/mdbook-open-on-gh/package.nix | 3 ++- pkgs/by-name/md/mdbook-pagetoc/package.nix | 3 ++- pkgs/by-name/md/mdbook-variables/package.nix | 3 ++- pkgs/by-name/md/mdbook-yml-header/package.nix | 3 ++- pkgs/by-name/md/mdctags/package.nix | 3 ++- pkgs/by-name/md/mdevctl/package.nix | 3 ++- pkgs/by-name/md/mdsh/package.nix | 3 ++- pkgs/by-name/me/mekuteriya/package.nix | 3 ++- pkgs/by-name/me/meli/package.nix | 3 ++- pkgs/by-name/me/melody/package.nix | 3 ++- pkgs/by-name/me/meme-bingo-web/package.nix | 3 ++- pkgs/by-name/me/memtest_vulkan/package.nix | 3 ++- pkgs/by-name/me/meow/package.nix | 3 ++- pkgs/by-name/me/metadata/package.nix | 3 ++- pkgs/by-name/mi/microbin/package.nix | 3 ++- pkgs/by-name/mi/microfetch/package.nix | 3 ++- pkgs/by-name/mi/microserver/package.nix | 3 ++- pkgs/by-name/mi/minesweep-rs/package.nix | 3 ++- pkgs/by-name/mi/mini-calc/package.nix | 3 ++- pkgs/by-name/mi/minijinja/package.nix | 3 ++- pkgs/by-name/mi/miniserve/package.nix | 3 ++- pkgs/by-name/mi/mise/package.nix | 3 ++- pkgs/by-name/mi/mixxc/package.nix | 3 ++- pkgs/by-name/mm/mmtc/package.nix | 3 ++- pkgs/by-name/mo/mollysocket/package.nix | 3 ++- pkgs/by-name/mo/moon-phases/package.nix | 3 ++- pkgs/by-name/mo/moproxy/package.nix | 3 ++- pkgs/by-name/mo/morsel/package.nix | 3 ++- pkgs/by-name/mo/mountpoint-s3/package.nix | 3 ++- pkgs/by-name/mo/mouse-actions-gui/package.nix | 3 ++- pkgs/by-name/mo/mouse-actions/package.nix | 3 ++- pkgs/by-name/mo/movine/package.nix | 3 ++- pkgs/by-name/mo/moxide/package.nix | 3 ++- pkgs/by-name/mp/mpd-discord-rpc/package.nix | 3 ++- pkgs/by-name/mp/mpris-notifier/package.nix | 3 ++- pkgs/by-name/mp/mprocs/package.nix | 3 ++- pkgs/by-name/mp/mpv-subs-popout/package.nix | 3 ++- pkgs/by-name/mu/mus/package.nix | 3 ++- pkgs/by-name/mu/music-player/package.nix | 3 ++- pkgs/by-name/my/myxer/package.nix | 3 ++- pkgs/by-name/n2/n2/package.nix | 3 ++- pkgs/by-name/na/namaka/package.nix | 3 ++- pkgs/by-name/na/narrowlink/package.nix | 3 ++- pkgs/by-name/na/natls/package.nix | 3 ++- pkgs/by-name/na/navi/package.nix | 3 ++- pkgs/by-name/nb/nbtscanner/package.nix | 3 ++- pkgs/by-name/nc/ncgopher/package.nix | 3 ++- pkgs/by-name/nc/ncspot/package.nix | 3 ++- pkgs/by-name/nd/ndstrim/package.nix | 3 ++- pkgs/by-name/ne/nearcore/package.nix | 3 ++- pkgs/by-name/ne/neocmakelsp/package.nix | 3 ++- pkgs/by-name/ne/neovide/package.nix | 3 ++- pkgs/by-name/ne/neovim-gtk/package.nix | 3 ++- pkgs/by-name/ne/nerdfix/package.nix | 3 ++- pkgs/by-name/ne/netavark/package.nix | 3 ++- pkgs/by-name/ne/netbox2netshot/package.nix | 3 ++- pkgs/by-name/ne/nethoscope/package.nix | 3 ++- pkgs/by-name/ne/netop/package.nix | 3 ++- pkgs/by-name/ne/netscanner/package.nix | 3 ++- pkgs/by-name/ne/newsboat/package.nix | 3 ++- pkgs/by-name/nf/nflz/package.nix | 3 ++- pkgs/by-name/ng/ngrrram/package.nix | 3 ++- pkgs/by-name/nh/nh/package.nix | 3 ++- pkgs/by-name/ni/nickel/package.nix | 3 ++- pkgs/by-name/ni/nil/package.nix | 3 ++- pkgs/by-name/ni/nitrocli/package.nix | 3 ++- pkgs/by-name/ni/nix-btm/package.nix | 3 ++- pkgs/by-name/ni/nix-doc/package.nix | 3 ++- pkgs/by-name/ni/nix-forecast/package.nix | 3 ++- pkgs/by-name/ni/nix-health/package.nix | 3 ++- pkgs/by-name/ni/nix-inspect/package.nix | 3 ++- pkgs/by-name/ni/nix-janitor/package.nix | 3 ++- pkgs/by-name/ni/nix-ld/package.nix | 3 ++- pkgs/by-name/ni/nix-melt/package.nix | 3 ++- pkgs/by-name/ni/nix-query-tree-viewer/package.nix | 3 ++- pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix | 3 ++- pkgs/by-name/ni/nix-weather/package.nix | 3 ++- pkgs/by-name/ni/nix-web/package.nix | 3 ++- pkgs/by-name/ni/nix-your-shell/package.nix | 3 ++- pkgs/by-name/ni/nixdoc/package.nix | 3 ++- pkgs/by-name/ni/nixel/package.nix | 3 ++- pkgs/by-name/ni/nixpacks/package.nix | 3 ++- pkgs/by-name/ni/nixpkgs-fmt/package.nix | 3 ++- pkgs/by-name/ni/nixpkgs-lint-community/package.nix | 3 ++- pkgs/by-name/ni/nixseparatedebuginfod/package.nix | 3 ++- pkgs/by-name/ni/nixtract/package.nix | 3 ++- pkgs/by-name/nm/nm-file-secret-agent/package.nix | 3 ++- pkgs/by-name/no/nofi/package.nix | 3 ++- pkgs/by-name/no/nomino/package.nix | 3 ++- pkgs/by-name/no/noseyparker/package.nix | 3 ++- pkgs/by-name/no/nostr-rs-relay/package.nix | 3 ++- pkgs/by-name/no/nostui/package.nix | 3 ++- pkgs/by-name/no/notmuch-mailmover/package.nix | 3 ++- pkgs/by-name/no/novops/package.nix | 3 ++- pkgs/by-name/np/npins/package.nix | 3 ++- pkgs/by-name/nr/nrr/package.nix | 3 ++- pkgs/by-name/ns/nsh/package.nix | 3 ++- pkgs/by-name/ns/nsncd/package.nix | 3 ++- pkgs/by-name/nt/ntpd-rs/package.nix | 3 ++- pkgs/by-name/nu/nufmt/package.nix | 3 ++- pkgs/by-name/nu/numbat/package.nix | 3 ++- pkgs/by-name/nv/nvmetcfg/package.nix | 3 ++- pkgs/by-name/ob/obs-cmd/package.nix | 3 ++- pkgs/by-name/ob/obs-do/package.nix | 3 ++- pkgs/by-name/ob/obsidian-export/package.nix | 3 ++- pkgs/by-name/oc/oculante/package.nix | 3 ++- pkgs/by-name/og/ograc/package.nix | 3 ++- pkgs/by-name/oh/oha/package.nix | 3 ++- pkgs/by-name/ok/okolors/package.nix | 3 ++- pkgs/by-name/om/omekasy/package.nix | 3 ++- pkgs/by-name/on/onagre/package.nix | 3 ++- pkgs/by-name/on/onefetch/package.nix | 3 ++- pkgs/by-name/op/open-scq30/package.nix | 3 ++- pkgs/by-name/op/openapi-tui/package.nix | 3 ++- pkgs/by-name/op/openpgp-ca/package.nix | 3 ++- pkgs/by-name/op/openpgp-card-tools/package.nix | 3 ++- pkgs/by-name/op/openscad-lsp/package.nix | 3 ++- pkgs/by-name/or/oranda/package.nix | 3 ++- pkgs/by-name/or/ord/package.nix | 3 ++- pkgs/by-name/or/orogene/package.nix | 3 ++- pkgs/by-name/ot/otadump/package.nix | 3 ++- pkgs/by-name/ot/otree/package.nix | 3 ++- pkgs/by-name/ou/ouch/package.nix | 3 ++- pkgs/by-name/ou/outfly/package.nix | 3 ++- pkgs/by-name/ov/overskride/package.nix | 3 ++- pkgs/by-name/ow/owmods-cli/package.nix | 3 ++- pkgs/by-name/ow/owmods-gui/package.nix | 3 ++- pkgs/by-name/ox/ox/package.nix | 3 ++- pkgs/by-name/ox/oxipng/package.nix | 3 ++- pkgs/by-name/ox/oxker/package.nix | 3 ++- pkgs/by-name/ox/oxlint/package.nix | 3 ++- pkgs/by-name/pa/pace/package.nix | 3 ++- pkgs/by-name/pa/package-version-server/package.nix | 3 ++- pkgs/by-name/pa/packetry/package.nix | 3 ++- pkgs/by-name/pa/page/package.nix | 3 ++- pkgs/by-name/pa/paging-calculator/package.nix | 3 ++- pkgs/by-name/pa/pam_rssh/package.nix | 3 ++- pkgs/by-name/pa/panamax/package.nix | 3 ++- pkgs/by-name/pa/pandoc-katex/package.nix | 3 ++- pkgs/by-name/pa/paper-age/package.nix | 3 ++- pkgs/by-name/pa/parallel-disk-usage/package.nix | 3 ++- pkgs/by-name/pa/parinfer-rust-emacs/package.nix | 3 ++- pkgs/by-name/pa/paru/package.nix | 3 ++- pkgs/by-name/pa/passepartui/package.nix | 3 ++- pkgs/by-name/pa/passerine/package.nix | 3 ++- pkgs/by-name/pa/patchy/package.nix | 3 ++- pkgs/by-name/pa/patsh/package.nix | 3 ++- pkgs/by-name/pa/pazi/package.nix | 3 ++- pkgs/by-name/pb/pbpctrl/package.nix | 3 ++- pkgs/by-name/pe/peep/package.nix | 3 ++- pkgs/by-name/pe/pest-ide-tools/package.nix | 3 ++- pkgs/by-name/pf/pfetch-rs/package.nix | 3 ++- pkgs/by-name/pg/pgcat/package.nix | 3 ++- pkgs/by-name/ph/phraze/package.nix | 3 ++- pkgs/by-name/pi/piano-rs/package.nix | 3 ++- pkgs/by-name/pi/pict-rs/package.nix | 3 ++- pkgs/by-name/pi/pid1/package.nix | 3 ++- pkgs/by-name/pi/pijul/package.nix | 3 ++- pkgs/by-name/pi/pik/package.nix | 3 ++- pkgs/by-name/pi/pimsync/package.nix | 3 ++- pkgs/by-name/pi/pipe-rename/package.nix | 3 ++- pkgs/by-name/pi/pipes-rs/package.nix | 3 ++- pkgs/by-name/pi/pipr/package.nix | 3 ++- pkgs/by-name/pi/pixi-pack/package.nix | 3 ++- pkgs/by-name/pi/pizarra/package.nix | 3 ++- pkgs/by-name/pi/pizauth/package.nix | 3 ++- pkgs/by-name/pk/pkarr/package.nix | 3 ++- pkgs/by-name/pl/planus/package.nix | 3 ++- pkgs/by-name/pl/please/package.nix | 3 ++- pkgs/by-name/pl/pls/package.nix | 3 ++- pkgs/by-name/pn/pngquant/package.nix | 3 ++- pkgs/by-name/pn/pnpm-shell-completion/package.nix | 3 ++- pkgs/by-name/po/podlet/package.nix | 3 ++- pkgs/by-name/po/pokeget-rs/package.nix | 3 ++- pkgs/by-name/po/polylux2pdfpc/package.nix | 3 ++- pkgs/by-name/po/porsmo/package.nix | 3 ++- pkgs/by-name/po/postgres-lsp/package.nix | 3 ++- pkgs/by-name/po/pouf/package.nix | 3 ++- pkgs/by-name/pq/pqrs/package.nix | 3 ++- pkgs/by-name/pr/pr-tracker/package.nix | 3 ++- pkgs/by-name/pr/presenterm/package.nix | 3 ++- pkgs/by-name/pr/preserves-tools/package.nix | 3 ++- pkgs/by-name/pr/prettypst/package.nix | 3 ++- pkgs/by-name/pr/probe-rs-tools/package.nix | 3 ++- pkgs/by-name/pr/projectable/package.nix | 3 ++- pkgs/by-name/pr/proto/package.nix | 3 ++- pkgs/by-name/pr/protoc-gen-prost-crate/package.nix | 3 ++- pkgs/by-name/pr/protoc-gen-prost-serde/package.nix | 3 ++- pkgs/by-name/pr/protoc-gen-prost/package.nix | 3 ++- pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix | 3 ++- pkgs/by-name/pr/protoc-gen-rust/package.nix | 3 ++- pkgs/by-name/pr/protoc-gen-tonic/package.nix | 3 ++- pkgs/by-name/pr/protols/package.nix | 3 ++- pkgs/by-name/pr/protox/package.nix | 3 ++- pkgs/by-name/pr/proximity-sort/package.nix | 3 ++- pkgs/by-name/pr/prqlc/package.nix | 3 ++- pkgs/by-name/pr/prr/package.nix | 3 ++- pkgs/by-name/pr/prs/package.nix | 3 ++- pkgs/by-name/ps/psw/package.nix | 3 ++- pkgs/by-name/pt/ptags/package.nix | 3 ++- pkgs/by-name/pu/pulldown-cmark/package.nix | 3 ++- pkgs/by-name/pw/pw-volume/package.nix | 3 ++- pkgs/by-name/pw/pwalarmctl/package.nix | 3 ++- pkgs/by-name/pw/pwalarmd/package.nix | 3 ++- pkgs/by-name/py/python-launcher/package.nix | 3 ++- pkgs/by-name/qm/qmk_hid/package.nix | 3 ++- pkgs/by-name/qr/qrrs/package.nix | 3 ++- pkgs/by-name/qr/qrscan/package.nix | 3 ++- pkgs/by-name/qr/qrtool/package.nix | 3 ++- pkgs/by-name/r0/r0vm/package.nix | 3 ++- pkgs/by-name/ra/ra-multiplex/package.nix | 3 ++- pkgs/by-name/ra/radicle-httpd/package.nix | 3 ++- pkgs/by-name/ra/radicle-node/package.nix | 3 ++- pkgs/by-name/ra/radio-cli/package.nix | 3 ++- pkgs/by-name/ra/raffi/package.nix | 3 ++- pkgs/by-name/ra/rage/package.nix | 3 ++- pkgs/by-name/ra/railway/package.nix | 3 ++- pkgs/by-name/ra/rainfrog/package.nix | 3 ++- pkgs/by-name/ra/rana/package.nix | 3 ++- pkgs/by-name/ra/rates/package.nix | 3 ++- pkgs/by-name/ra/rathole/package.nix | 3 ++- pkgs/by-name/ra/ratman/package.nix | 3 ++- pkgs/by-name/ra/rav1e/package.nix | 3 ++- pkgs/by-name/ra/ravedude/package.nix | 3 ++- pkgs/by-name/rc/rcodesign/package.nix | 3 ++- pkgs/by-name/rc/rconc/package.nix | 3 ++- pkgs/by-name/rc/rcp/package.nix | 3 ++- pkgs/by-name/re/realm/package.nix | 3 ++- pkgs/by-name/re/reason-shell/package.nix | 3 ++- pkgs/by-name/re/redlib/package.nix | 3 ++- pkgs/by-name/re/refinery-cli/package.nix | 3 ++- pkgs/by-name/re/regenkfs/package.nix | 3 ++- pkgs/by-name/re/regex-cli/package.nix | 3 ++- pkgs/by-name/re/reindeer/package.nix | 3 ++- pkgs/by-name/re/remkrom/package.nix | 3 ++- pkgs/by-name/re/ren-find/package.nix | 3 ++- pkgs/by-name/re/rep-grep/package.nix | 3 ++- pkgs/by-name/re/repak/package.nix | 3 ++- pkgs/by-name/re/repgrep/package.nix | 3 ++- pkgs/by-name/re/rerun/package.nix | 3 ++- pkgs/by-name/re/rescrobbled/package.nix | 3 ++- pkgs/by-name/re/reshape/package.nix | 3 ++- pkgs/by-name/re/restic-integrity/package.nix | 3 ++- pkgs/by-name/re/restls/package.nix | 3 ++- pkgs/by-name/re/resvg/package.nix | 3 ++- pkgs/by-name/re/revpfw3/package.nix | 3 ++- pkgs/by-name/re/rewatch/package.nix | 3 ++- pkgs/by-name/rh/rhack/package.nix | 3 ++- pkgs/by-name/rh/rhai-doc/package.nix | 3 ++- pkgs/by-name/ri/riff/package.nix | 3 ++- pkgs/by-name/ri/riffdiff/package.nix | 3 ++- pkgs/by-name/ri/ringfairy/package.nix | 3 ++- pkgs/by-name/ri/rio/package.nix | 3 ++- pkgs/by-name/ri/rip2/package.nix | 3 ++- pkgs/by-name/ri/ripasso-cursive/package.nix | 3 ++- pkgs/by-name/ri/ripdrag/package.nix | 3 ++- pkgs/by-name/ri/ripgrep/package.nix | 3 ++- pkgs/by-name/ri/rippkgs/package.nix | 3 ++- pkgs/by-name/ri/ripsecrets/package.nix | 3 ++- pkgs/by-name/ri/ripunzip/package.nix | 3 ++- pkgs/by-name/ri/ristate/package.nix | 3 ++- pkgs/by-name/ri/river-bsp-layout/package.nix | 3 ++- pkgs/by-name/ri/river-filtile/package.nix | 3 ++- pkgs/by-name/ri/river-luatile/package.nix | 3 ++- pkgs/by-name/rk/rkvm/package.nix | 3 ++- pkgs/by-name/rl/rlaunch/package.nix | 3 ++- pkgs/by-name/rl/rlci/package.nix | 3 ++- pkgs/by-name/rm/rm-improved/package.nix | 3 ++- pkgs/by-name/rm/rmpc/package.nix | 3 ++- pkgs/by-name/rn/rnr/package.nix | 3 ++- pkgs/by-name/ro/rofi-obsidian/package.nix | 3 ++- pkgs/by-name/ro/rogcat/package.nix | 3 ++- pkgs/by-name/ro/rojo/package.nix | 3 ++- pkgs/by-name/ro/rops/package.nix | 3 ++- pkgs/by-name/ro/rot8/package.nix | 3 ++- pkgs/by-name/ro/rotonda/package.nix | 3 ++- pkgs/by-name/ro/router/package.nix | 3 ++- pkgs/by-name/ro/routinator/package.nix | 3 ++- pkgs/by-name/rp/rpg-cli/package.nix | 3 ++- pkgs/by-name/rp/rpm-sequoia/package.nix | 3 ++- pkgs/by-name/rq/rq/package.nix | 3 ++- pkgs/by-name/rq/rqbit/package.nix | 3 ++- pkgs/by-name/rs/rs-tftpd/package.nix | 3 ++- pkgs/by-name/rs/rsass/package.nix | 3 ++- pkgs/by-name/rs/rsbkb/package.nix | 3 ++- pkgs/by-name/rs/rsclock/package.nix | 3 ++- pkgs/by-name/rs/rshijack/package.nix | 3 ++- pkgs/by-name/rs/rsign2/package.nix | 3 ++- pkgs/by-name/rs/rslint/package.nix | 3 ++- pkgs/by-name/rs/rsonpath/package.nix | 3 ++- pkgs/by-name/rs/rsop/package.nix | 3 ++- pkgs/by-name/rt/rtss/package.nix | 3 ++- pkgs/by-name/ru/rucola/package.nix | 3 ++- pkgs/by-name/ru/rune-languageserver/package.nix | 3 ++- pkgs/by-name/ru/rune/package.nix | 3 ++- pkgs/by-name/ru/russ/package.nix | 3 ++- pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix | 3 ++- pkgs/by-name/ru/rust-audit-info/package.nix | 3 ++- pkgs/by-name/ru/rust-code-analysis/package.nix | 3 ++- pkgs/by-name/ru/rust-parallel/package.nix | 3 ++- pkgs/by-name/ru/rust-petname/package.nix | 3 ++- pkgs/by-name/ru/rust-script/package.nix | 3 ++- pkgs/by-name/ru/rust-traverse/package.nix | 3 ++- pkgs/by-name/ru/rustcat/package.nix | 3 ++- pkgs/by-name/ru/rustfinity/package.nix | 3 ++- pkgs/by-name/ru/rusti-cal/package.nix | 3 ++- pkgs/by-name/ru/rustic/package.nix | 3 ++- pkgs/by-name/ru/rustlings/package.nix | 3 ++- pkgs/by-name/ru/rustls-libssl/package.nix | 3 ++- pkgs/by-name/ru/rustmission/package.nix | 3 ++- pkgs/by-name/ru/rustus/package.nix | 3 ++- pkgs/by-name/ru/rusty-diceware/package.nix | 3 ++- pkgs/by-name/ru/rusty-man/package.nix | 3 ++- pkgs/by-name/ru/rusty-psn/package.nix | 3 ++- pkgs/by-name/ru/rustycli/package.nix | 3 ++- pkgs/by-name/ru/rustypaste-cli/package.nix | 3 ++- pkgs/by-name/ru/rustypaste/package.nix | 3 ++- pkgs/by-name/rw/rwalk/package.nix | 3 ++- pkgs/by-name/rw/rwedid/package.nix | 3 ++- pkgs/by-name/rw/rwpspread/package.nix | 3 ++- pkgs/by-name/rx/rx/package.nix | 3 ++- pkgs/by-name/sa/sad/package.nix | 3 ++- pkgs/by-name/sa/safe-rm/package.nix | 3 ++- pkgs/by-name/sa/safecloset/package.nix | 3 ++- pkgs/by-name/sa/sagoin/package.nix | 3 ++- pkgs/by-name/sa/sanctity/package.nix | 3 ++- pkgs/by-name/sa/sarif-fmt/package.nix | 3 ++- pkgs/by-name/sa/satty/package.nix | 3 ++- pkgs/by-name/sc/scaphandre/package.nix | 3 ++- pkgs/by-name/sc/sccache/package.nix | 3 ++- pkgs/by-name/sc/schemamap/package.nix | 3 ++- pkgs/by-name/sc/scooter/package.nix | 3 ++- pkgs/by-name/sc/scope-tui/package.nix | 3 ++- pkgs/by-name/sc/scraper/package.nix | 3 ++- pkgs/by-name/sc/screenly-cli/package.nix | 3 ++- pkgs/by-name/sc/scriptisto/package.nix | 3 ++- pkgs/by-name/sc/scryer-prolog/package.nix | 3 ++- pkgs/by-name/sd/sd-switch/package.nix | 3 ++- pkgs/by-name/sd/sd/package.nix | 3 ++- pkgs/by-name/se/sea-orm-cli/package.nix | 3 ++- pkgs/by-name/se/see-cat/package.nix | 3 ++- pkgs/by-name/se/seehecht/package.nix | 3 ++- pkgs/by-name/se/selene/package.nix | 3 ++- pkgs/by-name/se/selenium-manager/package.nix | 3 ++- pkgs/by-name/se/sendme/package.nix | 3 ++- pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix | 3 ++- pkgs/by-name/se/sequoia-sq/package.nix | 3 ++- pkgs/by-name/se/sequoia-sqop/package.nix | 3 ++- pkgs/by-name/se/sequoia-sqv/package.nix | 3 ++- pkgs/by-name/se/sequoia-wot/package.nix | 3 ++- pkgs/by-name/se/serie/package.nix | 3 ++- pkgs/by-name/se/serpl/package.nix | 3 ++- pkgs/by-name/sf/sfz/package.nix | 3 ++- pkgs/by-name/sg/sgxs-tools/package.nix | 3 ++- pkgs/by-name/sh/shadow-tls/package.nix | 3 ++- pkgs/by-name/sh/shellcheck-sarif/package.nix | 3 ++- pkgs/by-name/sh/shellclear/package.nix | 3 ++- pkgs/by-name/sh/shellharden/package.nix | 3 ++- pkgs/by-name/sh/shikane/package.nix | 3 ++- pkgs/by-name/sh/shisho/package.nix | 3 ++- pkgs/by-name/sh/shotgun/package.nix | 3 ++- pkgs/by-name/sh/shotman/package.nix | 3 ++- pkgs/by-name/sh/shpool/package.nix | 3 ++- pkgs/by-name/si/sic-image-cli/package.nix | 3 ++- pkgs/by-name/si/sig/package.nix | 3 ++- pkgs/by-name/si/sigi/package.nix | 3 ++- pkgs/by-name/si/siketyan-ghr/package.nix | 3 ++- pkgs/by-name/si/simple-http-server/package.nix | 3 ++- pkgs/by-name/si/sink-rotate/package.nix | 3 ++- pkgs/by-name/sk/skim/package.nix | 3 ++- pkgs/by-name/sl/slimevr/package.nix | 3 ++- pkgs/by-name/sl/slingshot/package.nix | 3 ++- pkgs/by-name/sl/slowlorust/package.nix | 3 ++- pkgs/by-name/sl/slumber/package.nix | 3 ++- pkgs/by-name/sm/smag/package.nix | 3 ++- pkgs/by-name/sm/smartcat/package.nix | 3 ++- pkgs/by-name/sn/sn0int/package.nix | 3 ++- pkgs/by-name/sn/snazy/package.nix | 3 ++- pkgs/by-name/sn/sniffglue/package.nix | 3 ++- pkgs/by-name/sn/sniffnet/package.nix | 3 ++- pkgs/by-name/sn/snpguest/package.nix | 3 ++- pkgs/by-name/sn/snphost/package.nix | 3 ++- pkgs/by-name/so/so/package.nix | 3 ++- pkgs/by-name/so/songrec/package.nix | 3 ++- pkgs/by-name/so/sonic-server/package.nix | 3 ++- pkgs/by-name/so/soteria/package.nix | 3 ++- pkgs/by-name/so/sozu/package.nix | 3 ++- pkgs/by-name/sp/spacer/package.nix | 3 ++- pkgs/by-name/sp/speakersafetyd/package.nix | 3 ++- pkgs/by-name/sp/specr-transpile/package.nix | 3 ++- pkgs/by-name/sp/speedtest-rs/package.nix | 3 ++- pkgs/by-name/sp/spl/package.nix | 3 ++- pkgs/by-name/sp/spotify-player/package.nix | 3 ++- pkgs/by-name/sp/spotifyd/package.nix | 3 ++- pkgs/by-name/sp/spytrap-adb/package.nix | 3 ++- pkgs/by-name/sq/sql-studio/package.nix | 3 ++- pkgs/by-name/sq/sqlpage/package.nix | 3 ++- pkgs/by-name/sq/sqruff/package.nix | 3 ++- pkgs/by-name/sr/srgn/package.nix | 3 ++- pkgs/by-name/sr/srisum/package.nix | 3 ++- pkgs/by-name/ss/sshs/package.nix | 3 ++- pkgs/by-name/ss/sss-cli/package.nix | 3 ++- pkgs/by-name/st/stalwart-mail/package.nix | 3 ++- pkgs/by-name/st/star-history/package.nix | 3 ++- pkgs/by-name/st/starlark-rust/package.nix | 3 ++- pkgs/by-name/st/starry/package.nix | 3 ++- pkgs/by-name/st/static-web-server/package.nix | 3 ++- pkgs/by-name/st/statix/package.nix | 3 ++- pkgs/by-name/st/steam-acf/package.nix | 3 ++- pkgs/by-name/st/steam-tui/package.nix | 3 ++- pkgs/by-name/st/steamguard-cli/package.nix | 3 ++- pkgs/by-name/st/stgit/package.nix | 3 ++- pkgs/by-name/st/strace-analyzer/package.nix | 3 ++- pkgs/by-name/st/stratovirt/package.nix | 3 ++- pkgs/by-name/st/stu/package.nix | 3 ++- pkgs/by-name/st/stylance-cli/package.nix | 3 ++- pkgs/by-name/st/stylua/package.nix | 3 ++- pkgs/by-name/su/sub-batch/package.nix | 3 ++- pkgs/by-name/su/subxt/package.nix | 3 ++- pkgs/by-name/su/sudachi-rs/package.nix | 3 ++- pkgs/by-name/su/sudo-rs/package.nix | 3 ++- pkgs/by-name/su/supergfxctl/package.nix | 3 ++- pkgs/by-name/su/supertag/package.nix | 3 ++- pkgs/by-name/su/surrealdb/package.nix | 3 ++- pkgs/by-name/sv/svd2rust/package.nix | 3 ++- pkgs/by-name/sv/svdtools/package.nix | 3 ++- pkgs/by-name/sv/svg2pdf/package.nix | 3 ++- pkgs/by-name/sv/svgbob/package.nix | 3 ++- pkgs/by-name/sv/svgcleaner/package.nix | 3 ++- pkgs/by-name/sv/svlint/package.nix | 3 ++- pkgs/by-name/sv/svls/package.nix | 3 ++- pkgs/by-name/sw/sway-easyfocus/package.nix | 3 ++- pkgs/by-name/sw/sway-new-workspace/package.nix | 3 ++- pkgs/by-name/sw/sway-overfocus/package.nix | 3 ++- pkgs/by-name/sw/sway-scratch/package.nix | 3 ++- pkgs/by-name/sw/swaycons/package.nix | 3 ++- pkgs/by-name/sw/swayest-workstyle/package.nix | 3 ++- pkgs/by-name/sw/swayr/package.nix | 3 ++- pkgs/by-name/sw/swayrbar/package.nix | 3 ++- pkgs/by-name/sw/swaysome/package.nix | 3 ++- pkgs/by-name/sw/swaywsr/package.nix | 3 ++- pkgs/by-name/sw/swc/package.nix | 3 ++- pkgs/by-name/sw/swim/package.nix | 3 ++- pkgs/by-name/sy/sydbox/package.nix | 3 ++- pkgs/by-name/sy/syndicate-server/package.nix | 3 ++- pkgs/by-name/sy/system76-keyboard-configurator/package.nix | 3 ++- pkgs/by-name/sy/system76-scheduler/package.nix | 3 ++- pkgs/by-name/sy/systemctl-tui/package.nix | 3 ++- pkgs/by-name/sy/systemfd/package.nix | 3 ++- pkgs/by-name/sy/systeroid/package.nix | 3 ++- pkgs/by-name/sz/szyszka/package.nix | 3 ++- pkgs/by-name/t-/t-rex/package.nix | 3 ++- pkgs/by-name/ta/tabiew/package.nix | 3 ++- pkgs/by-name/ta/tagref/package.nix | 3 ++- pkgs/by-name/ta/tailspin/package.nix | 3 ++- pkgs/by-name/ta/taizen/package.nix | 3 ++- pkgs/by-name/ta/talecast/package.nix | 3 ++- pkgs/by-name/ta/taler-depolymerization/package.nix | 3 ++- pkgs/by-name/ta/taplo/package.nix | 3 ++- pkgs/by-name/ta/tarssh/package.nix | 3 ++- pkgs/by-name/ta/taschenrechner/package.nix | 3 ++- pkgs/by-name/ta/task-keeper/package.nix | 3 ++- pkgs/by-name/ta/taskchampion-sync-server/package.nix | 3 ++- pkgs/by-name/ta/taskwarrior-tui/package.nix | 3 ++- pkgs/by-name/td/tdns-cli/package.nix | 3 ++- pkgs/by-name/te/tealdeer/package.nix | 3 ++- pkgs/by-name/te/teehee/package.nix | 3 ++- pkgs/by-name/te/teip/package.nix | 3 ++- pkgs/by-name/te/television/package.nix | 3 ++- pkgs/by-name/te/teller/package.nix | 3 ++- pkgs/by-name/te/tenere/package.nix | 3 ++- pkgs/by-name/te/tenki/package.nix | 3 ++- pkgs/by-name/te/tera-cli/package.nix | 3 ++- pkgs/by-name/te/tere/package.nix | 3 ++- pkgs/by-name/te/termimage/package.nix | 3 ++- pkgs/by-name/te/termscp/package.nix | 3 ++- pkgs/by-name/te/termsnap/package.nix | 3 ++- pkgs/by-name/te/termusic/package.nix | 3 ++- pkgs/by-name/te/textplots/package.nix | 3 ++- pkgs/by-name/th/the-way/package.nix | 3 ++- pkgs/by-name/th/theattyr/package.nix | 3 ++- pkgs/by-name/th/thokr/package.nix | 3 ++- pkgs/by-name/th/thud/package.nix | 3 ++- pkgs/by-name/th/thumbs/package.nix | 3 ++- pkgs/by-name/ti/tickrs/package.nix | 3 ++- pkgs/by-name/ti/tidy-viewer/package.nix | 3 ++- pkgs/by-name/ti/timewall/package.nix | 3 ++- pkgs/by-name/ti/tinty/package.nix | 3 ++- pkgs/by-name/ti/tiny-dfr/package.nix | 3 ++- pkgs/by-name/tl/tlrc/package.nix | 3 ++- pkgs/by-name/to/to-html/package.nix | 3 ++- pkgs/by-name/to/toast/package.nix | 3 ++- pkgs/by-name/to/toipe/package.nix | 3 ++- pkgs/by-name/to/tokio-console/package.nix | 3 ++- pkgs/by-name/to/toml-cli/package.nix | 3 ++- pkgs/by-name/to/toml2json/package.nix | 3 ++- pkgs/by-name/to/tomlq/package.nix | 3 ++- pkgs/by-name/to/topfew-rs/package.nix | 3 ++- pkgs/by-name/to/tox-node/package.nix | 3 ++- pkgs/by-name/tp/tp-auto-kbbl/package.nix | 3 ++- pkgs/by-name/tp/tpi/package.nix | 3 ++- pkgs/by-name/tp/tplay/package.nix | 3 ++- pkgs/by-name/tp/tpnote/package.nix | 3 ++- pkgs/by-name/tr/tracexec/package.nix | 3 ++- pkgs/by-name/tr/transmission-rss/package.nix | 3 ++- pkgs/by-name/tr/trashy/package.nix | 3 ++- pkgs/by-name/tr/tre-command/package.nix | 3 ++- pkgs/by-name/tr/treefmt1/package.nix | 3 ++- pkgs/by-name/tr/trippy/package.nix | 3 ++- pkgs/by-name/tr/trojan-rs/package.nix | 3 ++- pkgs/by-name/tr/trunk/package.nix | 3 ++- pkgs/by-name/tt/ttags/package.nix | 3 ++- pkgs/by-name/tt/ttdl/package.nix | 3 ++- pkgs/by-name/tt/ttfb/package.nix | 3 ++- pkgs/by-name/tt/ttyper/package.nix | 3 ++- pkgs/by-name/tt/ttysvr/package.nix | 3 ++- pkgs/by-name/tu/tuc/package.nix | 3 ++- pkgs/by-name/tu/tuckr/package.nix | 3 ++- pkgs/by-name/tu/tui-journal/package.nix | 3 ++- pkgs/by-name/tu/tuisky/package.nix | 3 ++- pkgs/by-name/tu/tun2proxy/package.nix | 3 ++- pkgs/by-name/tu/turnon/package.nix | 3 ++- pkgs/by-name/tu/turtle-build/package.nix | 3 ++- pkgs/by-name/tu/tuxedo-rs/package.nix | 3 ++- pkgs/by-name/tu/tuxmux/package.nix | 3 ++- pkgs/by-name/tv/tv/package.nix | 3 ++- pkgs/by-name/tw/twiggy/package.nix | 3 ++- pkgs/by-name/tw/twm/package.nix | 3 ++- pkgs/by-name/ty/tydra/package.nix | 3 ++- pkgs/by-name/ty/typeshare/package.nix | 3 ++- pkgs/by-name/ty/typical/package.nix | 3 ++- pkgs/by-name/ty/typos-lsp/package.nix | 3 ++- pkgs/by-name/ty/typos/package.nix | 3 ++- pkgs/by-name/ty/typst-live/package.nix | 3 ++- pkgs/by-name/tz/tzupdate/package.nix | 3 ++- pkgs/by-name/ua/uair/package.nix | 3 ++- pkgs/by-name/ud/udict/package.nix | 3 ++- pkgs/by-name/ud/udpt/package.nix | 3 ++- pkgs/by-name/ue/uefi-run/package.nix | 3 ++- pkgs/by-name/ue/uefisettings/package.nix | 3 ++- pkgs/by-name/ue/uesave/package.nix | 3 ++- pkgs/by-name/un/unbook/package.nix | 3 ++- pkgs/by-name/un/uni-sync/package.nix | 3 ++- pkgs/by-name/un/unison-fsmonitor/package.nix | 3 ++- pkgs/by-name/un/universal-android-debloater/package.nix | 3 ++- pkgs/by-name/un/unpfs/package.nix | 3 ++- pkgs/by-name/un/unused/package.nix | 3 ++- pkgs/by-name/un/unzrip/package.nix | 3 ++- pkgs/by-name/ur/urlencode/package.nix | 3 ++- pkgs/by-name/us/usage/package.nix | 3 ++- pkgs/by-name/us/userborn/package.nix | 3 ++- pkgs/by-name/uw/uwc/package.nix | 3 ++- pkgs/by-name/uw/uwuify/package.nix | 3 ++- pkgs/by-name/va/vale-ls/package.nix | 3 ++- pkgs/by-name/va/vault-tasks/package.nix | 3 ++- pkgs/by-name/ve/verco/package.nix | 3 ++- pkgs/by-name/ve/versatiles/package.nix | 3 ++- pkgs/by-name/ve/veryl/package.nix | 3 ++- pkgs/by-name/vh/vhdl-ls/package.nix | 3 ++- pkgs/by-name/vi/viddy/package.nix | 3 ++- pkgs/by-name/vi/vimcats/package.nix | 3 ++- pkgs/by-name/vi/vimv-rs/package.nix | 3 ++- pkgs/by-name/vi/virtiofsd/package.nix | 3 ++- pkgs/by-name/vi/viu/package.nix | 3 ++- pkgs/by-name/vi/vivid/package.nix | 3 ++- pkgs/by-name/vo/voidmap/package.nix | 3 ++- pkgs/by-name/vo/vopono/package.nix | 3 ++- pkgs/by-name/vu/vulkan-helper/package.nix | 3 ++- pkgs/by-name/wa/wallust/package.nix | 3 ++- pkgs/by-name/wa/wambo/package.nix | 3 ++- pkgs/by-name/wa/wapm/package.nix | 3 ++- pkgs/by-name/wa/wash-cli/package.nix | 3 ++- pkgs/by-name/wa/wasm-pack/package.nix | 3 ++- pkgs/by-name/wa/wasm-tools/package.nix | 3 ++- pkgs/by-name/wa/wasmer-pack/package.nix | 3 ++- pkgs/by-name/wa/wastebin/package.nix | 3 ++- pkgs/by-name/wa/watchlog/package.nix | 3 ++- pkgs/by-name/wa/watershot/package.nix | 3 ++- pkgs/by-name/wa/waycorner/package.nix | 3 ++- pkgs/by-name/wa/wayfreeze/package.nix | 3 ++- pkgs/by-name/wa/wayidle/package.nix | 3 ++- pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix | 3 ++- pkgs/by-name/wa/waylevel/package.nix | 3 ++- pkgs/by-name/wa/wayout/package.nix | 3 ++- pkgs/by-name/wa/wayshot/package.nix | 3 ++- pkgs/by-name/wc/wchisp/package.nix | 3 ++- pkgs/by-name/we/weaver/package.nix | 3 ++- pkgs/by-name/we/webdav-server-rs/package.nix | 3 ++- pkgs/by-name/we/websocat/package.nix | 3 ++- pkgs/by-name/we/weggli/package.nix | 3 ++- pkgs/by-name/wh/when-cli/package.nix | 3 ++- pkgs/by-name/wi/wiper/package.nix | 3 ++- pkgs/by-name/wi/wired/package.nix | 3 ++- pkgs/by-name/wi/wishbone-tool/package.nix | 3 ++- pkgs/by-name/wi/wit-bindgen/package.nix | 3 ++- pkgs/by-name/wi/wizer/package.nix | 3 ++- pkgs/by-name/wl/wl-clip-persist/package.nix | 3 ++- pkgs/by-name/wl/wl-clipboard-rs/package.nix | 3 ++- pkgs/by-name/wl/wl-crosshair/package.nix | 3 ++- pkgs/by-name/wl/wl-gammarelay-applet/package.nix | 3 ++- pkgs/by-name/wl/wl-screenrec/package.nix | 3 ++- pkgs/by-name/wl/wldash/package.nix | 3 ++- pkgs/by-name/wl/wleave/package.nix | 3 ++- pkgs/by-name/wl/wlink/package.nix | 3 ++- pkgs/by-name/wl/wlr-which-key/package.nix | 3 ++- pkgs/by-name/wl/wluma/package.nix | 3 ++- pkgs/by-name/wo/wofi-power-menu/package.nix | 3 ++- pkgs/by-name/wo/workshop-runner/package.nix | 3 ++- pkgs/by-name/wp/wpaperd/package.nix | 3 ++- pkgs/by-name/wr/writedisk/package.nix | 3 ++- pkgs/by-name/wt/wthrr/package.nix | 3 ++- pkgs/by-name/wt/wttrbar/package.nix | 3 ++- pkgs/by-name/wy/wyvern/package.nix | 3 ++- pkgs/by-name/x4/x4/package.nix | 3 ++- pkgs/by-name/xc/xcolor/package.nix | 3 ++- pkgs/by-name/xc/xcp/package.nix | 3 ++- pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix | 3 ++- pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix | 3 ++- pkgs/by-name/xe/xen-guest-agent/package.nix | 3 ++- pkgs/by-name/xh/xh/package.nix | 3 ++- pkgs/by-name/xi/xiu/package.nix | 3 ++- pkgs/by-name/xp/xplr/package.nix | 3 ++- pkgs/by-name/xq/xq/package.nix | 3 ++- pkgs/by-name/xw/xwayland-satellite/package.nix | 3 ++- pkgs/by-name/ya/yambar-hyprland-wses/package.nix | 3 ++- pkgs/by-name/ya/yara-x/package.nix | 3 ++- pkgs/by-name/ya/yazi-unwrapped/package.nix | 3 ++- pkgs/by-name/ye/yex-lang/package.nix | 3 ++- pkgs/by-name/yg/yggdrasil-jumper/package.nix | 3 ++- pkgs/by-name/yo/yofi/package.nix | 3 ++- pkgs/by-name/yo/youki/package.nix | 3 ++- pkgs/by-name/yt/ytui-music/package.nix | 3 ++- pkgs/by-name/zb/zbus-xmlgen/package.nix | 3 ++- pkgs/by-name/ze/zellij/package.nix | 3 ++- pkgs/by-name/ze/zenoh-backend-filesystem/package.nix | 3 ++- pkgs/by-name/ze/zenoh-backend-influxdb/package.nix | 3 ++- pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix | 3 ++- pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix | 3 ++- pkgs/by-name/ze/zenoh-plugin-webserver/package.nix | 3 ++- pkgs/by-name/ze/zenoh/package.nix | 3 ++- pkgs/by-name/ze/zeronsd/package.nix | 3 ++- pkgs/by-name/ze/zet/package.nix | 3 ++- pkgs/by-name/zi/zine/package.nix | 3 ++- pkgs/by-name/zi/zizmor/package.nix | 3 ++- pkgs/by-name/zk/zktree/package.nix | 3 ++- pkgs/by-name/zo/zola/package.nix | 3 ++- pkgs/by-name/zo/zoxide/package.nix | 3 ++- 1311 files changed, 2622 insertions(+), 1311 deletions(-) diff --git a/pkgs/by-name/aa/aaa/package.nix b/pkgs/by-name/aa/aaa/package.nix index 0085f924cfdb..75d47dde65c4 100644 --- a/pkgs/by-name/aa/aaa/package.nix +++ b/pkgs/by-name/aa/aaa/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw="; }; - cargoHash = "sha256-ugB0r9qiGRurc30GrJH4MKM6fWZ99+f1Gy7/1lSmrwU="; + useFetchCargoVendor = true; + cargoHash = "sha256-CHX+Ugy4ND36cpxNEFpnqid6ALHMPXmfXi+D4aktPRk="; meta = with lib; { description = "Terminal viewer for 3a format"; diff --git a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix index a15252bb3fdf..d54b303919c7 100644 --- a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix +++ b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-U9i5L3s4oQOIqlECSaKkHxS2Vzr6SY4tIUpvl3+oSl0="; }; - cargoHash = "sha256-BdxRvvU3AovlT7QloZ/LlkjRTVCWEsPUj4NkP4gBPsY="; + useFetchCargoVendor = true; + cargoHash = "sha256-LiNnTNpluQkomQhIOsAnUbbBftTgqgNdpT8heCrBayg="; meta = with lib; { description = "Utility for decoding aarch64 ESR register values"; diff --git a/pkgs/by-name/aa/aardvark-dns/package.nix b/pkgs/by-name/aa/aardvark-dns/package.nix index 2e7cf4ad42d1..efb858752c7f 100644 --- a/pkgs/by-name/aa/aardvark-dns/package.nix +++ b/pkgs/by-name/aa/aardvark-dns/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VXuTHc/t+5QidTqMptoQqircHTtYzeEXfFFII8jeOrI="; }; - cargoHash = "sha256-MHNIb1hNoL/62aUDNs0wd4086m3Zm4bnRp+VKXE4gJs="; + useFetchCargoVendor = true; + cargoHash = "sha256-ydvvV3w8VmfdSTXeJvMuN0oqkkZdWs6/9KocalRGWpg="; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index 26c04553d989..210c7537ccc9 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-I9XApll0/mvfhL/BLWoVwL0ffqa5r3dOBWYTHizJ0hc="; }; - cargoHash = "sha256-jTCAB4O+SePCaKivHwbfFJZKjlxZmzP4uLT5idKmiO4="; + useFetchCargoVendor = true; + cargoHash = "sha256-y+5rW3LruV1WeJXizbhHs01jkWrYsMXZkn1NG0Xz3bg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ab/aba/package.nix b/pkgs/by-name/ab/aba/package.nix index 39896b1322bf..71bb572f0a70 100644 --- a/pkgs/by-name/ab/aba/package.nix +++ b/pkgs/by-name/ab/aba/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-2zVQNchL4DFh2v2/kwupJTBSmXiKqlxzUMrP9TbfCMs="; }; - cargoHash = "sha256-YhSzbfcEIJjKWlyYq1lK70qt4f/Z71n7hgaaZ/D/U80="; + useFetchCargoVendor = true; + cargoHash = "sha256-U1f68DY+yV6Uxwk1Re0eSNCFWYrYKCN08hJAYcp4ksE="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/ac/action-validator/package.nix b/pkgs/by-name/ac/action-validator/package.nix index a82c792b1fca..8eb5e3aaf86b 100644 --- a/pkgs/by-name/ac/action-validator/package.nix +++ b/pkgs/by-name/ac/action-validator/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-mBY+J6JcIhV++tO6Dhw5JvYLSwoYZR3lB3l0KTjkcQM="; + useFetchCargoVendor = true; + cargoHash = "sha256-dy66ZkU9lIYGe9T3oR8m5cGcBQO5MF1KsLjfaHTtvlY="; meta = with lib; { description = "Tool to validate GitHub Action and Workflow YAML files"; diff --git a/pkgs/by-name/ad/ad/package.nix b/pkgs/by-name/ad/ad/package.nix index a1af89096e34..399258597de7 100644 --- a/pkgs/by-name/ad/ad/package.nix +++ b/pkgs/by-name/ad/ad/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c2oSQ81qCZbwUl4TqovDWm8TUqI6RdrQPvoP/FaTI/A="; }; - cargoHash = "sha256-VgzaAQy0z1JReMeRcX7LbbgKqrwTmnVecuLd1kyekHA="; + useFetchCargoVendor = true; + cargoHash = "sha256-WEU1pipIQmlvfIBUmXiGYDN45M/C7OJdf4nzFbNQhLc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ad/adguardian/package.nix b/pkgs/by-name/ad/adguardian/package.nix index 855ba2d459f4..10d98113e0c3 100644 --- a/pkgs/by-name/ad/adguardian/package.nix +++ b/pkgs/by-name/ad/adguardian/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WxrSmCwLnXXs5g/hN3xWE66P5n0RD/L9MJpf5N2iNtY="; }; - cargoHash = "sha256-IPkKiXuFN0KFlcrrSjLmML+O5zCrVRKEqdyV2xBsCsg="; + useFetchCargoVendor = true; + cargoHash = "sha256-yPDysaslL/7N60eZ/hqZl5ZXIsof/pvlgHYfW1mIWtI="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ad/adrs/package.nix b/pkgs/by-name/ad/adrs/package.nix index 5282a8a9dc8a..a64f07771437 100644 --- a/pkgs/by-name/ad/adrs/package.nix +++ b/pkgs/by-name/ad/adrs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-a1vxo2Zw2fvCJeGaatNqf2h74t7pvWppYS2l2gbCF5k="; }; - cargoHash = "sha256-eVADcCXf6hl9o9pApp3inU7kZAKA3k5mM3+vy7cq5u8="; + useFetchCargoVendor = true; + cargoHash = "sha256-VtMgvUifHddSncsKxtT5v44sDhihLgpbq38szvHVrVk="; meta = { description = "Command-line tool for managing Architectural Decision Records"; diff --git a/pkgs/by-name/af/afterburn/package.nix b/pkgs/by-name/af/afterburn/package.nix index 13388b785ce5..7d763191735f 100644 --- a/pkgs/by-name/af/afterburn/package.nix +++ b/pkgs/by-name/af/afterburn/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-j2eQUro0Rx1axBAaZDNICRrkygb4JAyxVAER/5BXXLY="; }; - cargoHash = "sha256-rk/lVoPdA9Uj/MorMchVlQQB9bYmNC90NqM6w9FXLoc="; + useFetchCargoVendor = true; + cargoHash = "sha256-xA5hp7a4DFMh8Xrh2ft94s6aNjORKtyCuNy4GgJbSsw="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix index 13bc3db35528..6d5e2c017a0a 100644 --- a/pkgs/by-name/ag/agate/package.nix +++ b/pkgs/by-name/ag/agate/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-w02vc89U0a1NmEqneHq0M5u+OKaFbTAVqJDFZgRp7l0="; }; - cargoHash = "sha256-CUEjumDmRf3uUejE5pg1aS1CbVByPSeb9HWRyXzC2YY="; + useFetchCargoVendor = true; + cargoHash = "sha256-xK2sEtHBYKi2aAt/Sc5qIFGAZns8Wdm24/dBCR73KmQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ag/agenix-cli/package.nix b/pkgs/by-name/ag/agenix-cli/package.nix index 82b547a4d467..9455a397cd2f 100644 --- a/pkgs/by-name/ag/agenix-cli/package.nix +++ b/pkgs/by-name/ag/agenix-cli/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0+QVY1sDhGF4hAN6m2FdKZgm9V1cuGGjY4aitRBnvKg="; }; - cargoHash = "sha256-TLCSLxrKLBge/DgyzvBSshssIiFOuc/4Dq0wY7u2hxI="; + useFetchCargoVendor = true; + cargoHash = "sha256-xpA9BTA7EK3Pw8EJOjIq1ulBAcX4yNhc4kqhxsoCbv0="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ai/aichat/package.nix b/pkgs/by-name/ai/aichat/package.nix index bb971c677d45..c6be1e3ad857 100644 --- a/pkgs/by-name/ai/aichat/package.nix +++ b/pkgs/by-name/ai/aichat/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Hqrwko/HZTHlKzXuqm835fpygOO9wsQx1XkJddH/EUc="; }; - cargoHash = "sha256-4CcwzaPIO+upISizpXHGYfKh9YD4foJAqx7TGgLCHZI="; + useFetchCargoVendor = true; + cargoHash = "sha256-dk0OulqKBktyznyLu5X3gI3BxZolXQi+9Sm3a+FLPvA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index 1d1cbb1d860e..a3fd09b6c233 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qM6rBBBwLUwB3g+jjT0R6z0473x929t2W8tOY663EcI="; }; - cargoHash = "sha256-rxxbmba189vcpNve5b7kfeFCZqF2fx9YNU78wgtGtKE="; + useFetchCargoVendor = true; + cargoHash = "sha256-bgf9iVqQ7HuUV+idlPxyuILmxjBi2ThihdeCLjhj8Hk="; buildInputs = [ openssl ] diff --git a/pkgs/by-name/ai/airgorah/package.nix b/pkgs/by-name/ai/airgorah/package.nix index 87beccf94e9d..9a0fa89264d1 100644 --- a/pkgs/by-name/ai/airgorah/package.nix +++ b/pkgs/by-name/ai/airgorah/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cIb40TKkk3gfy4dTP8WyZqQkRGj5nItaQ3NSfexCUOA="; }; - cargoHash = "sha256-sJFOpxBW6Z8ewfyhJuxZByJNgaEmezw15OQt9KjFaec="; + useFetchCargoVendor = true; + cargoHash = "sha256-3Les/A9fBBjU6NSVVEyXCbjrNSdaEgCl5pZ36ceRDQg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index 55fbae7aac2d..cef0cfb9ffc0 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -53,7 +53,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CAxf0ltvYXYTdjQmLQnRwRRJUBgABbHSB8DxfAbgBdo="; }; - cargoHash = "sha256-pVwPo9O3ortTtVzZn1p1grFGLBA2gVTOatdNFqNQ5zc="; + useFetchCargoVendor = true; + cargoHash = "sha256-5AIl/z9OHSBs0DRk4UD03Yrvb6Ib5FGJk9XCRCKsjTs="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/al/alejandra/package.nix b/pkgs/by-name/al/alejandra/package.nix index 5523681d706e..0c39e55ecce1 100644 --- a/pkgs/by-name/al/alejandra/package.nix +++ b/pkgs/by-name/al/alejandra/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g0SSfTWZ5mtMOpQic+eqq9sXMy1E/7yKxxfupZd9V4A="; }; - cargoHash = "sha256-s3932c/k9UTbJ79fBQBRDILN2VWNM1tNEV7cW4fQK74="; + useFetchCargoVendor = true; + cargoHash = "sha256-17HoU0GcJlTP254RqFX4gZxEflwJGSbBULA/rg0paUc="; passthru.tests = { version = testers.testVersion { package = alejandra; }; diff --git a/pkgs/by-name/al/alexandria/package.nix b/pkgs/by-name/al/alexandria/package.nix index 05f6a01aea7a..a97efd139000 100644 --- a/pkgs/by-name/al/alexandria/package.nix +++ b/pkgs/by-name/al/alexandria/package.nix @@ -37,7 +37,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6r9bEY7e1Eef/0/CJ26ITpFJcCVUEKLrFx+TNEomLPE="; }; - cargoHash = "sha256-AsR2BJuz4RdPX1lmORwn6nK+8cm2Xmm1EOsxYkWx3hc="; + useFetchCargoVendor = true; + cargoHash = "sha256-VX/G4dF9DhlGfifp4xf9xkXli7BHFtKY2+HaMHqqPiA="; env = { OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix index fa0fcad30e8e..72c325b8297f 100644 --- a/pkgs/by-name/al/alioth/package.nix +++ b/pkgs/by-name/al/alioth/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { # Checks use `debug_assert_eq!` checkType = "debug"; - cargoHash = "sha256-xxe+WZIXkEG7B+CX3WNGhPw4AmUQOY9w3DS+QP9hMX0="; + useFetchCargoVendor = true; + cargoHash = "sha256-kW76EBlpzeSmIhW5UsYjPYp5KeH2mPuf3aAiTSM06g4="; separateDebugInfo = true; diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix index 69f41081cc91..bb53891361e1 100644 --- a/pkgs/by-name/am/amber-lang/package.nix +++ b/pkgs/by-name/am/amber-lang/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wf0JNWNliDGNvlbWoatPqDKmVaBzHeCKOvJWuE9PnpQ="; }; - cargoHash = "sha256-6T4WcQkCMR8W67w0uhhN8W0FlLsrTUMa3/xRXDtW4Es="; + useFetchCargoVendor = true; + cargoHash = "sha256-OhrSK+bvdQP1bAcEbS2foHxY4BEYoJ9SQaE7Rj9od0Y="; preConfigure = '' substituteInPlace src/compiler.rs \ diff --git a/pkgs/by-name/am/amber-secret/package.nix b/pkgs/by-name/am/amber-secret/package.nix index d4d60e9669b9..c62940c467d1 100644 --- a/pkgs/by-name/am/amber-secret/package.nix +++ b/pkgs/by-name/am/amber-secret/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM="; }; - cargoHash = "sha256-DxTsbJ51TUMvc/NvsUYhRG9OxxEGrWfEPYCOYaG9PXo="; + useFetchCargoVendor = true; + cargoHash = "sha256-Gwj0rnbKWifja5NJwskcrFpPoK15HjSQHXolGbgV784="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix index 2d0890b63d67..584a398399d8 100644 --- a/pkgs/by-name/am/amp/package.nix +++ b/pkgs/by-name/am/amp/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./update_time_crate.patch ]; - cargoHash = "sha256-EYD1gQgkHemT/3VewdsU5kOGQKY3OjIHRiTSqSRNwtU="; + useFetchCargoVendor = true; + cargoHash = "sha256-4lYywaPTfoOHEYHy+h7HfWn+OaDdk166tQ8ZFx9XZK0="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/an/anewer/package.nix b/pkgs/by-name/an/anewer/package.nix index 8765b6e810af..4057fd3ab85d 100644 --- a/pkgs/by-name/an/anewer/package.nix +++ b/pkgs/by-name/an/anewer/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "181mi674354bddnq894yyq587w7skjh35vn61i41vfi6lqz5dy3d"; }; - cargoHash = "sha256-LJ0l5CZM5NqdbCZe4ELkYf9EkKyBxL/LrNmFy+JS6gM="; + useFetchCargoVendor = true; + cargoHash = "sha256-ojgm5LTOOhnGS7tUD1UUktviivp68u0c06gIJNhEO1E="; meta = with lib; { description = "Append lines from stdin to a file if they don't already exist in the file"; diff --git a/pkgs/by-name/an/angle-grinder/package.nix b/pkgs/by-name/an/angle-grinder/package.nix index 5f07a4c2c088..a67d4245733f 100644 --- a/pkgs/by-name/an/angle-grinder/package.nix +++ b/pkgs/by-name/an/angle-grinder/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-1SZho04qJcNi84ZkDmxoVkLx9VJX04QINZQ6ZEoCq+c="; }; - cargoHash = "sha256-+l0+zaZSPOk4gJLHZ9LFFbYlZ5vkS68Jg2dWPHSkzKw="; + useFetchCargoVendor = true; + cargoHash = "sha256-B7JFwFzE8ZvbTjCUZ6IEtjavPGkx3Nb9FMSPbNFqiuU="; passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/an/ansi/package.nix b/pkgs/by-name/an/ansi/package.nix index 20fc58b605d6..d7793812a0d3 100644 --- a/pkgs/by-name/an/ansi/package.nix +++ b/pkgs/by-name/an/ansi/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KGPlNXkF16VdoOb3tg3nsQRdtgU83z7ibPy965bvvDk="; }; - cargoHash = "sha256-Q46VKBrOsjqUeSruuK/Bur2L69JAGr3c+ianfPlfzi0="; + useFetchCargoVendor = true; + cargoHash = "sha256-r2dZ3io8YRWE1BJQ+gM5uwhz56RgvjHvgmARnHVsQCA="; meta = { description = "Quickly get ANSI escape sequences"; diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index 645cc1d42784..c9c9e269833d 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage { hash = "sha256-jU88Q9tP4vuvWYGQcmOdFwI9e2uMPVYJHbXdiklIH9o="; }; - cargoHash = "sha256-DtU5Jtx46M+aP1oSdZt+aJH5jqNdNU9G7klzwsVjcZU="; + useFetchCargoVendor = true; + cargoHash = "sha256-ouAeoSCmkvWgxAUA/VYITm9/XvxmN+TdyZgEGgBGdKI="; strictDeps = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/ap/apftool-rs/package.nix b/pkgs/by-name/ap/apftool-rs/package.nix index 101b0e09ab1f..260f7af595e1 100644 --- a/pkgs/by-name/ap/apftool-rs/package.nix +++ b/pkgs/by-name/ap/apftool-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0+eKxaLKZBRLdydXxUbifFfFncAbthUn7AB8QieWaXM="; }; - cargoHash = "sha256-6lYokd0jwpBWCQ+AbN6ptZYXGcy41GHPbnTELUjPbyA="; + useFetchCargoVendor = true; + cargoHash = "sha256-IJEEnNIW44kItB19U1lNGi1cHpVGaGHQZt2kgAJFkjU="; meta = { description = "About Tools for Rockchip image unpack tool"; diff --git a/pkgs/by-name/ap/aphorme/package.nix b/pkgs/by-name/ap/aphorme/package.nix index 865f714265c3..2f2b008aa8ca 100644 --- a/pkgs/by-name/ap/aphorme/package.nix +++ b/pkgs/by-name/ap/aphorme/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-p1ZIMMDyQWVzoeyHb3sbeV6XQwbIDoQwJU8ynI8hGUI="; }; - cargoHash = "sha256-aFoy5KTapx+5aIzvDwMfjxZQ6WKQtvX3h7rNX4LBeN8="; + useFetchCargoVendor = true; + cargoHash = "sha256-knxFQ9hBBc8zATwf4ntbbmT2a+33uYcqax8AAFsj/NM="; # No tests exist doCheck = false; diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix index 7b9f0cc589a1..051d4e83e0bd 100644 --- a/pkgs/by-name/ar/argc/package.nix +++ b/pkgs/by-name/ar/argc/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sviGDwxbCBsNY5viV7Qim6B/COd1Uz0Wj/6n/Ge+A50="; }; - cargoHash = "sha256-xGL2degbWauMi+BPGQgYvza6SiIRQxE4KZ0jMOMec7M="; + useFetchCargoVendor = true; + cargoHash = "sha256-uyUwmTDa1RcgQbc/6wMwRK6932CatuGMr0FPd2rAufk="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc; diff --git a/pkgs/by-name/ar/argon/package.nix b/pkgs/by-name/ar/argon/package.nix index 1219fc4fc2d3..f1c9a33ba2cf 100644 --- a/pkgs/by-name/ar/argon/package.nix +++ b/pkgs/by-name/ar/argon/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-msKrPLB+38PU7LEw92xEqFy6JxwMjttBaobIOhU7eWw="; }; - cargoHash = "sha256-yXhEgZYtYhrSpwPbL+yi9gaLVVV8sBlF8m3ADUC4kLk="; + useFetchCargoVendor = true; + cargoHash = "sha256-HOgwN/LwnHq+BxiniTFbBwCw0Qc6kxcH8GrAy/JggXo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ar/arp-scan-rs/package.nix b/pkgs/by-name/ar/arp-scan-rs/package.nix index 76cc1472edaf..946d12ae0189 100644 --- a/pkgs/by-name/ar/arp-scan-rs/package.nix +++ b/pkgs/by-name/ar/arp-scan-rs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CLxeT2olrxRCJ12IZ1PvLW7ZuX0HPsoNuFyxmGBhB8w="; }; - cargoHash = "sha256-+Ph5k3qaK4USggTnZqyOdH6oKv5Xr2/NeQ9C0Q6g5sQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-lPE/mx4LzSOG1YjGol1f77oox4voZzp9RqrKYZAMoX0="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ar/artem/package.nix b/pkgs/by-name/ar/artem/package.nix index a2fbf10f4dd6..a04e31e6b3f5 100644 --- a/pkgs/by-name/ar/artem/package.nix +++ b/pkgs/by-name/ar/artem/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-C3Co+hXstVN/WADIpzqr7f3muAgQL0Zbnz6VI1XNo4U="; }; - cargoHash = "sha256-QyFUxnq4BSULgpZxCu5+7TWfu6Gey0JFkOYSK+rL7l0="; + useFetchCargoVendor = true; + cargoHash = "sha256-OPcT2iMZPx1mXXtghznq65YQtfxsOV1etgqZMMLzkmo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix index 87e80ed49cff..37586e86a2ed 100644 --- a/pkgs/by-name/ar/arti/package.nix +++ b/pkgs/by-name/ar/arti/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vypPQjTr3FsAz1AyS1J67MF35+HzMLNu5B9wkkEI30A="; }; - cargoHash = "sha256-XhEHjF5M7KL5qzbaoFVZtRAb1uHoZwS7W7CLXb5gO+k="; + useFetchCargoVendor = true; + cargoHash = "sha256-brC8ZTB/+LAtNiG9/MGhPzzFcnaEBV/zU9lexZ56N/I="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/by-name/as/as-tree/package.nix b/pkgs/by-name/as/as-tree/package.nix index a3c1502a73ca..765edb91d100 100644 --- a/pkgs/by-name/as/as-tree/package.nix +++ b/pkgs/by-name/as/as-tree/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-80yB89sKIuv7V68p0jEsi2hRdz+5CzE+4R0joRzO7Dk="; }; - cargoHash = "sha256-BLEVPKO2YwcKuM/rUeMuyE38phOrbq0e8cjqh1qmJjM="; + useFetchCargoVendor = true; + cargoHash = "sha256-HTwzmfpp9HKBKvjYXUqVDv9GUHl+2K3LMBSy1+GfmNU="; meta = with lib; { description = "Print a list of paths as a tree of paths"; diff --git a/pkgs/by-name/as/asahi-bless/package.nix b/pkgs/by-name/as/asahi-bless/package.nix index 5d136975cc7d..93da168a18ad 100644 --- a/pkgs/by-name/as/asahi-bless/package.nix +++ b/pkgs/by-name/as/asahi-bless/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SNaA+CEuCBwo4c54qWGs5AdkBYb9IWY1cQ0dRd/noe8="; }; - cargoHash = "sha256-Ou6sZ0fjsiadNcsdyiqxRwg+JIXMA4oanIgyW6NrLwI="; + useFetchCargoVendor = true; + cargoHash = "sha256-nfSJ9RkzFAWlxlfoUKk8ZmIXDJXoSyHCGgRgMy9FDkw="; cargoDepsName = pname; meta = with lib; { diff --git a/pkgs/by-name/as/asahi-btsync/package.nix b/pkgs/by-name/as/asahi-btsync/package.nix index 1ee528638de1..3f18d185fde5 100644 --- a/pkgs/by-name/as/asahi-btsync/package.nix +++ b/pkgs/by-name/as/asahi-btsync/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jp05WcwY1cWh4mBQj+3jRCZoG32OhDvTB84hOAGemX8="; }; - cargoHash = "sha256-XsgWqdwb0DDsK6HkaoVGQB/mm1U1TVzJM5q/gt9GryA="; + useFetchCargoVendor = true; + cargoHash = "sha256-gGWhi0T7xDIsbzfw/KL3TSneLvQaiz/2xbpHeZt1i3I="; cargoDepsName = pname; meta = with lib; { diff --git a/pkgs/by-name/as/asahi-nvram/package.nix b/pkgs/by-name/as/asahi-nvram/package.nix index e3cc5b1569b4..4652d0919466 100644 --- a/pkgs/by-name/as/asahi-nvram/package.nix +++ b/pkgs/by-name/as/asahi-nvram/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zfUvPHAPrYhzgeiirGuqZaWnLBH0PHsqOUy2e972bWM="; }; - cargoHash = "sha256-FP4qCJyzCOGaPDijp18m5K1YO+Ki9oDwblP2Vh8GsO0="; + useFetchCargoVendor = true; + cargoHash = "sha256-NW/puo/Xoum7DjSQjBgilQcKbY3mAfVgXxUK6+1H1JI="; cargoDepsName = pname; meta = with lib; { diff --git a/pkgs/by-name/as/asahi-wifisync/package.nix b/pkgs/by-name/as/asahi-wifisync/package.nix index 23b3ac4f9fb8..75fec0be94e3 100644 --- a/pkgs/by-name/as/asahi-wifisync/package.nix +++ b/pkgs/by-name/as/asahi-wifisync/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wKd6rUUnegvl6cHODVQlllaOXuAGlmwx9gr73I/2l/c="; }; - cargoHash = "sha256-UF1T0uAFO/ydTWigYXOP9Ju1qgV1oBmJuXSq4faSzJM="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZxgRxQyDID3mBpr8dhHScctk14Pm9V51Gn24d24JyVk="; cargoDepsName = pname; meta = with lib; { diff --git a/pkgs/by-name/as/asak/package.nix b/pkgs/by-name/as/asak/package.nix index 4270ee0a7034..034d703ddf24 100644 --- a/pkgs/by-name/as/asak/package.nix +++ b/pkgs/by-name/as/asak/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7r05sVIHqBBOKwye2fr0pspo/uDqaYGjt5CpxqgqKzI="; }; - cargoHash = "sha256-lMqInjFnOfr/GPSfIf1yp2vQjdk9UYdkWA616P8p0FE="; + useFetchCargoVendor = true; + cargoHash = "sha256-XoTfymCXrvoToSY7jw+Pn8Wm6fskFzl4f55uiKnSsJ8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix index b27627071e3a..a79fa32aae9b 100644 --- a/pkgs/by-name/as/asciinema-agg/package.nix +++ b/pkgs/by-name/as/asciinema-agg/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { strictDeps = true; - cargoHash = "sha256-K472Qrsi2FIEOxFMi5CDgau2ODU0P3VDQEz/cwzmKiM="; + useFetchCargoVendor = true; + cargoHash = "sha256-KQ4g4hWy8FZH4nLiB0874r8FCINXJboZ4C1dAAPA8Gc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/by-name/as/asciinema-scenario/package.nix b/pkgs/by-name/as/asciinema-scenario/package.nix index dfa262916950..9ba865887ae0 100644 --- a/pkgs/by-name/as/asciinema-scenario/package.nix +++ b/pkgs/by-name/as/asciinema-scenario/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fnX5CIYLdFqi04PQPVIAYDGn+xXi016l8pPcIrYIhmQ="; }; - cargoHash = "sha256-8I3mPSJ5aXvQ88nh0SWyuTq9JSTktS2lQPrXlcvD66c="; + useFetchCargoVendor = true; + cargoHash = "sha256-D9CSw05OFaWvBzGSEQmH8ao6gY/0OhQQ5gFkL1TVeO4="; meta = with lib; { description = "Create asciinema videos from a text file"; diff --git a/pkgs/by-name/as/asciinema_3/package.nix b/pkgs/by-name/as/asciinema_3/package.nix index 90a871018c8a..2704facb09e3 100644 --- a/pkgs/by-name/as/asciinema_3/package.nix +++ b/pkgs/by-name/as/asciinema_3/package.nix @@ -19,7 +19,8 @@ let hash = "sha256-TYJ17uVj8v1u630MTb033h0X3aYRXY9d89GjAxG8muk="; }; - cargoHash = "sha256-CYDy0CedwG/ThTV+XOfOg8ncxF3tdTEGakmu4MXfiE4="; + useFetchCargoVendor = true; + cargoHash = "sha256-dgeHQs1IYD8m8gOtPEn+l0A2RbSmwTyzrbiusD3dUX0="; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/by-name/as/asfa/package.nix b/pkgs/by-name/as/asfa/package.nix index 4d60c0b1d5e8..1dd940c1a6fa 100644 --- a/pkgs/by-name/as/asfa/package.nix +++ b/pkgs/by-name/as/asfa/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { pname = "asfa"; inherit version src; - cargoHash = "sha256-pzCTqVUo3LEpR3hmTPKDwvgtUJZ+tsArbi0HDlY2Cy8="; + useFetchCargoVendor = true; + cargoHash = "sha256-1aSUH1F6W7+3YQOphmF9olYmPuH/OJ9eIW5j6Jebn+s="; outputs = [ "out" diff --git a/pkgs/by-name/as/askalono/package.nix b/pkgs/by-name/as/askalono/package.nix index 6995995515fe..22fe897f47b1 100644 --- a/pkgs/by-name/as/askalono/package.nix +++ b/pkgs/by-name/as/askalono/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LwyUaU4m9fk+mG8FBfkbj9nBvd8KokwlV7cE7EBwk0Q="; }; - cargoHash = "sha256-7yFdoXK9Nyg1uT0mtiXs6evOu1U1quxL7iMMMyxqxqk="; + useFetchCargoVendor = true; + cargoHash = "sha256-ug79p75Oa5lsd9COWO2aIx3jN7de1QZggMFiOPAN5kQ="; meta = with lib; { description = "Tool to detect open source licenses from texts"; diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 28b97237e0f9..9bbfa7d679e1 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; - cargoHash = "sha256-AtCnYOOtViMpg+rz8miuBZg1pENBPaf9kamSPaVUyiw="; + useFetchCargoVendor = true; + cargoHash = "sha256-EEWTW29GS/50fsPFYhz63m74+mqnvBfxFuH9C8+t7Ag="; # tests expect ~/.cache/asm-lsp to be writable preCheck = '' diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 8cd89f3f13cb..2c521e13b4a1 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-p7SJhkCoo4jBDyr+Z2+qxjUwWXWpVMuXd2/DDOM7Z/Q="; }; - cargoHash = "sha256-aCBEL+Jx4Kk7PWsxIgpdRdI7AnUAUEtRU4+JMxQ4Swk="; + useFetchCargoVendor = true; + cargoHash = "sha256-l2fvQqkyAsLGm+KStc2CaTeLrxvNmQgNFd79pLiCk/Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index 1b98cdaf61a7..f8c3d166079f 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RrtRflMTsbR/A2kb2kdwsE7zN43TzzvFkUPcmL4YGqs="; }; - cargoHash = "sha256-JlS+95/C2vMvFiCE4/hHWfkH1WL1hNSgUtyOeGDV8pY="; + useFetchCargoVendor = true; + cargoHash = "sha256-NxTWJ7uMblEIpumJhVCCek9UzJuqJeTrt5fLXYiITI4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/au/audion/package.nix b/pkgs/by-name/au/audion/package.nix index abb8be20f472..6edf94d93dc9 100644 --- a/pkgs/by-name/au/audion/package.nix +++ b/pkgs/by-name/au/audion/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NtAzh7n5bJXMt73L+FJU3vuNoNgga3wYXdZ2TY8AjIA="; }; - cargoHash = "sha256-0jPAidJu3f3exXkVCLowR1zHsZ3bctWu+O2mQmSwSpE="; + useFetchCargoVendor = true; + cargoHash = "sha256-kIrbHt6aAUgdF4Jx/aUOYpiBj1+pyFLCVak6R+JN2Ug="; meta = with lib; { description = "Ping the host continuously and write results to a file"; diff --git a/pkgs/by-name/au/august/package.nix b/pkgs/by-name/au/august/package.nix index f23ff2fb43f2..b3d2aee94851 100644 --- a/pkgs/by-name/au/august/package.nix +++ b/pkgs/by-name/au/august/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-58DZMoRH9PBbM4sok/XbUcwSXBeqUAmFZpffdMKQ+dE="; }; - cargoHash = "sha256-/GvBbsSL0dZ0xTystIpb8sk1nNg5hmP4yceCHlh7EQE="; + useFetchCargoVendor = true; + cargoHash = "sha256-E1M/Soaz4+Gyxizc4VReZlfJB5gxrSz2ue3WI9fcNJA="; postInstall = '' mv $out/bin/{august-cli,ag} diff --git a/pkgs/by-name/au/authoscope/package.nix b/pkgs/by-name/au/authoscope/package.nix index 3cd61f98fb21..d46c6117c8ae 100644 --- a/pkgs/by-name/au/authoscope/package.nix +++ b/pkgs/by-name/au/authoscope/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk="; }; - cargoHash = "sha256-rSHuKy86iJNLAKSVcb7fn7A/cc75EOc97jGI14EaC6k="; + useFetchCargoVendor = true; + cargoHash = "sha256-TagEeT6EgvFgdEc/M7dVn9vC1TmAA2zou5ZoWX46fOI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 18a7ff55a86c..7ead97cefb9c 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-8fgOhmjFXC0nMs7oTfJWbn1DOmOU9RtTgR+xmV/nZ9g="; }; - cargoHash = "sha256-4WytstmBjd0FCSxY4omrZZhcSq1xSPQKFz7S4jZukVA="; + useFetchCargoVendor = true; + cargoHash = "sha256-OimAHyx6UdNB6RIGa+LN5Xy63L7VbTj7lazZyUQXy1s="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/au/autotiling-rs/package.nix b/pkgs/by-name/au/autotiling-rs/package.nix index c7ba1ff24dc8..38d84f84d0c7 100644 --- a/pkgs/by-name/au/autotiling-rs/package.nix +++ b/pkgs/by-name/au/autotiling-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-LQbmF2M6pWa0QEbKF770x8TFLMGrJeq5HnXHvLrDDPA="; }; - cargoHash = "sha256-wot5GKBA2TBrA/jnWD0eypPRqUodmk/TJlYJMl3/gm4="; + useFetchCargoVendor = true; + cargoHash = "sha256-s2r8517RgcMq+6S2M+gTI7a+C4AhxIkDOHG0XjRI4rI="; meta = with lib; { description = "Autotiling for sway (and possibly i3)"; diff --git a/pkgs/by-name/av/av1an-unwrapped/package.nix b/pkgs/by-name/av/av1an-unwrapped/package.nix index e7ed15a35725..243656788b8c 100644 --- a/pkgs/by-name/av/av1an-unwrapped/package.nix +++ b/pkgs/by-name/av/av1an-unwrapped/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Mb5I+9IBwpfmK1w4LstNHI/qsJKlCuRxgSUiqpwUqF0="; }; - cargoHash = "sha256-IWcSaJoakXSPIdycWIikGSmOk+D4A3aMnJwuiKn8XNY="; + useFetchCargoVendor = true; + cargoHash = "sha256-nWvQINGtU6x3z5tzG+/0tawFi6Z+WwFKsw3egovKsTc="; nativeBuildInputs = [ nasm diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix index 61f1b9790302..af9052589340 100644 --- a/pkgs/by-name/av/avml/package.nix +++ b/pkgs/by-name/av/avml/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MIqQ5NRWAfXm7AblsKCrUiaYN5IGUo2jWJMJZL+w3V4="; }; - cargoHash = "sha256-gcpjrxnQDyO92OW6LZVc4x73TmTtQoaEYhmGmqhz8ng="; + useFetchCargoVendor = true; + cargoHash = "sha256-husTembzDsqjI617spK6aj2de+NaajKCNYDiV2Fd6XQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/b3/b3sum/package.nix b/pkgs/by-name/b3/b3sum/package.nix index 3260175dc8ae..93de50e805ed 100644 --- a/pkgs/by-name/b3/b3sum/package.nix +++ b/pkgs/by-name/b3/b3sum/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PgtQc8rwIbiHAue323POh15png7DerZbCuAKLi+jEYE="; }; - cargoHash = "sha256-OnD/QVOP3oUFeGW0YeFWW8hQ6SBapxxdAXATIBM+g2Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-4RD6GcBGUHMXS8BYs1NqpR3fVul2J3qh5E4MFnMbwoE="; meta = { description = "BLAKE3 cryptographic hash function"; diff --git a/pkgs/by-name/ba/backdown/package.nix b/pkgs/by-name/ba/backdown/package.nix index c309b9552e0b..412f7eee97e8 100644 --- a/pkgs/by-name/ba/backdown/package.nix +++ b/pkgs/by-name/ba/backdown/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3+XmMRZz3SHF1sL+/CUvu4uQ2scE4ACpcC0r4nWhdkM="; }; - cargoHash = "sha256-+SxXOpSBuVVdX2HmJ4vF45uf5bvRtPdwaXUb9kq+lK0="; + useFetchCargoVendor = true; + cargoHash = "sha256-qVE4MOFr0YO+9rAbfnz92h0KocaLu+v2u5ompwY/o6k="; meta = with lib; { description = "File deduplicator"; diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 1498df4f09bd..4820de696218 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IWjG1esLwiEnESmnDE5kpuMu+LFaNrIomgrZoktkA2Q="; }; - cargoHash = "sha256-IQ8vTr5Z17ylcOCQ+iqKP6+tawZXd+pMiYoSH5h7Zjg="; + useFetchCargoVendor = true; + cargoHash = "sha256-6oDvyq6rpIPBj6isKcdg+sv+9DTYJSMeYGQ3HO4w78A="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; diff --git a/pkgs/by-name/ba/bankstown-lv2/package.nix b/pkgs/by-name/ba/bankstown-lv2/package.nix index 6f36c19d1998..4ae21dc9ea9b 100644 --- a/pkgs/by-name/ba/bankstown-lv2/package.nix +++ b/pkgs/by-name/ba/bankstown-lv2/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IThXEY+mvT2MCw0PSWU/182xbUafd6dtm6hNjieLlKg="; }; - cargoHash = "sha256-yRzM4tcYc6mweTpLnnlCeKgP00L2wRgHamtUzK9Kstc="; + useFetchCargoVendor = true; + cargoHash = "sha256-eMN95QNnQtC7QDix9g3dwb9ZbtQuiVBj8+R+opFs0KI="; installPhase = '' export LIBDIR=$out/lib diff --git a/pkgs/by-name/ba/bao/package.nix b/pkgs/by-name/ba/bao/package.nix index 8e16ed6b720d..c0477ea969d2 100644 --- a/pkgs/by-name/ba/bao/package.nix +++ b/pkgs/by-name/ba/bao/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { ./test-exe.patch ]; - cargoHash = "sha256-mmhTG3WXVjIKtaz2xP9aYI9GQNTbx4l3c6UgKSMgQJU="; + useFetchCargoVendor = true; + cargoHash = "sha256-gJj+4NAtvSpAlX3q2GEQh1CgqKhw5vd6huPrV8NRsiE="; meta = { description = "Implementation of BLAKE3 verified streaming"; diff --git a/pkgs/by-name/ba/bark/package.nix b/pkgs/by-name/ba/bark/package.nix index e866b1a18a3b..67dadd7660d7 100644 --- a/pkgs/by-name/ba/bark/package.nix +++ b/pkgs/by-name/ba/bark/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage { rev = "2586b9fb58b496f8ef06f516c9cd3aace77521f7"; hash = "sha256-sGroae6uJhB9UIpFmvt520Zs9k0ir7H8pGkhKJmVWek="; }; - cargoHash = "sha256-OjlVn4fvKPm3UfqhKkv7cDuvK4mcLcQXPNPK+WScrMc="; + useFetchCargoVendor = true; + cargoHash = "sha256-WqJZoYpOQQGJGvND2R1o2nvK5P24z7YeJ9i26mai45M="; buildInputs = [ alsa-lib speexdsp ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ba/bartib/package.nix b/pkgs/by-name/ba/bartib/package.nix index 0727c86f2675..ec4c7e9ac701 100644 --- a/pkgs/by-name/ba/bartib/package.nix +++ b/pkgs/by-name/ba/bartib/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-eVLacxKD8seD8mxVN1D3HhKZkIDXsEsSisZnFbmhpSk="; }; - cargoHash = "sha256-s/oGv7/0LgNpdGu6dnvvbxDgFDvcvcHL01dSPxhMVWE="; + useFetchCargoVendor = true; + cargoHash = "sha256-OSnBcYeTH9UqAXGhT/seEfNBejbYj/FTiMwMbvY7Bf4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ba/basilk/package.nix b/pkgs/by-name/ba/basilk/package.nix index 449a089e3294..834ce074feb4 100644 --- a/pkgs/by-name/ba/basilk/package.nix +++ b/pkgs/by-name/ba/basilk/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b77vVf+WbDNzKwGaMJvgMEMCC41h5TXmg45OM9g4v+4="; }; - cargoHash = "sha256-ZYyRUqWbwAoNaGuCXJvqWTgUm5jNpihqvPe5SsfjEq4="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ak9ag/wInXtbnJRog4hHbyvMpDclWOSJ1gOIR+HwJ+8="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix index 9ed8d3b6943c..02a542c0f0b0 100644 --- a/pkgs/by-name/ba/bat/package.nix +++ b/pkgs/by-name/ba/bat/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-82IhLhw0TdaMh21phBxcUZ5JI5xOXb0DrwnBmPwyfAQ="; }; - cargoHash = "sha256-07D3N1xJnrTueI+7SpQPUnCzKOLJTldyyIG2mNfJzME="; + useFetchCargoVendor = true; + cargoHash = "sha256-EnEc+B62dK3q6in8yn5wdeVmBw8XMkP8YKpCN7lCPnc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ba/batmon/package.nix b/pkgs/by-name/ba/batmon/package.nix index 131fdd0af162..c9272a6e5364 100644 --- a/pkgs/by-name/ba/batmon/package.nix +++ b/pkgs/by-name/ba/batmon/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+kjDNQKlaoI5fQ5FqYF6IPCKeE92WKxIhVCKafqfE0o="; }; - cargoHash = "sha256-DJpWBset6SW7Ahg60+Tu1VpH34LcVOyrEs9suKyTE9g="; + useFetchCargoVendor = true; + cargoHash = "sha256-0SXb8jBAYKnNFguamSMosPE6gH9aUzydF16w3SLhOU4="; meta = with lib; { description = "Interactive batteries viewer"; diff --git a/pkgs/by-name/ba/bato/package.nix b/pkgs/by-name/ba/bato/package.nix index fd3a2ad5851d..2c840dd1075a 100644 --- a/pkgs/by-name/ba/bato/package.nix +++ b/pkgs/by-name/ba/bato/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-i2gw8vXiKutq26ACzkVXH3kED7jAngSv2mNo9P3qXnA="; }; - cargoHash = "sha256-cqrSyZjfBSfF015nwOcRy2rkE4XzFPxJCQZGrqZXLEA="; + useFetchCargoVendor = true; + cargoHash = "sha256-bGbLQaYfNLem47iMPsNeKm4pP3+Pij9SJ3Nq5VWX3hE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/bd/bdt/package.nix b/pkgs/by-name/bd/bdt/package.nix index 23f6b9fd5e41..7de21d583f67 100644 --- a/pkgs/by-name/bd/bdt/package.nix +++ b/pkgs/by-name/bd/bdt/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gUKsJwbpMPSO+KPqyJRodrRLjUpTh/y6C2xhrgvJFKk="; }; - cargoHash = "sha256-4KrFhchoIB2N89m7HrL0xj2Z+u/6/6Onxa2wIAX18Io="; + useFetchCargoVendor = true; + cargoHash = "sha256-TikWh0U56x3HKca5Dj68Z59mOgedv+K5r+y7/CcpWa8="; meta = with lib; { description = "boring data tool. A CLI tool to query parquet, json and avro files"; diff --git a/pkgs/by-name/be/beancount-language-server/package.nix b/pkgs/by-name/be/beancount-language-server/package.nix index 6645f183092a..f587dbb03bf6 100644 --- a/pkgs/by-name/be/beancount-language-server/package.nix +++ b/pkgs/by-name/be/beancount-language-server/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-U23e32Xfa0j+U/CrCZzKjipaA0Yv5szbtTHJWWL52K4="; }; - cargoHash = "sha256-OvhG+O+uHHf7e9p3vibrPt9fuGzEqG+l3GGfNwoqXBU="; + useFetchCargoVendor = true; + cargoHash = "sha256-aP/oYt0y7zJ9dyvOo4uWQ44J5qM6LxTo0jN1jIVSpUY="; doInstallCheck = true; postInstallCheck = '' diff --git a/pkgs/by-name/be/below/package.nix b/pkgs/by-name/be/below/package.nix index 4ae575272be0..9478efa68fd3 100644 --- a/pkgs/by-name/be/below/package.nix +++ b/pkgs/by-name/be/below/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-87Fdx3Jqi3dNWM5DZl+UYs031qn2DoiiWd3IysT/glQ="; }; - cargoHash = "sha256-y2fNypA0MrCdUI/K6QrZWw/5mkYafj2s6jrGHU2zGXw="; + useFetchCargoVendor = true; + cargoHash = "sha256-iRDe3zg7tfEYGLCRY6bJ6OdoT8ej0MB/vteCIf5xqNA="; prePatch = ''sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service''; postInstall = '' diff --git a/pkgs/by-name/be/bend/package.nix b/pkgs/by-name/be/bend/package.nix index c1e6470dfdcc..0a2a095bd384 100644 --- a/pkgs/by-name/be/bend/package.nix +++ b/pkgs/by-name/be/bend/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-j4YMdeSxIbhp7xT42L42/y0ZncFPKBkxTh0LgO/RjkY="; }; - cargoHash = "sha256-jPxPx/e6rv5REP+K1ZLg9ffJKKVNLqR/vd33xKs+Ut4="; + useFetchCargoVendor = true; + cargoHash = "sha256-mGpH08VMmqoxXm8EUPdsBvSW/CFyRPY4bfyr8JI1es0="; nativeBuildInputs = [ hvm diff --git a/pkgs/by-name/bf/bfc/package.nix b/pkgs/by-name/bf/bfc/package.nix index c22bb6526620..72a38083412d 100644 --- a/pkgs/by-name/bf/bfc/package.nix +++ b/pkgs/by-name/bf/bfc/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5pcvwCtXWEexvV3TS62dZ6Opg8ANP2L8B0Z8u/OQENU="; }; - cargoHash = "sha256-1w/jPBO1TZpa0ju+O/NxQ/oMyzIvYVoXpj+ZLcIpQoU="; + useFetchCargoVendor = true; + cargoHash = "sha256-S8Fy0PRSUftljcX34Sj8MmlPW7Oob2yayPUA1RRxf8E="; buildInputs = [ libxml2 diff --git a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix index 4e01e22af5e0..8b28fbb800bc 100644 --- a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix +++ b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rRKMIkeTBb16GF8DgQ36Vdx/1I6zuzpuL/jusFJ0OZw="; }; - cargoHash = "sha256-e6KuE6tlBfTfqTW4oyNIchB3/1tsl8CbR0x4ZUTKDVA="; + useFetchCargoVendor = true; + cargoHash = "sha256-vX4W2SaVhGEK+uw01dwezIDPAs3PDsJAPIcQwNpkL4c="; strictDeps = true; diff --git a/pkgs/by-name/bi/bingrep/package.nix b/pkgs/by-name/bi/bingrep/package.nix index 43a820f56d9a..e328ec4ff0af 100644 --- a/pkgs/by-name/bi/bingrep/package.nix +++ b/pkgs/by-name/bi/bingrep/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bHu3/f25U1QtRZv1z5OQSDMayOpLU6tbNaV00K55ZY8="; }; - cargoHash = "sha256-n49VmAJcD98LdkrUCW6ouihSXmSCsdBDvCe9l96G0ec="; + useFetchCargoVendor = true; + cargoHash = "sha256-cGDFbf8fUGbuxl8tOvKss5tqpBd1TY7TcwNzWwdw12A="; meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix index 644982af14fe..e1fdd004f087 100644 --- a/pkgs/by-name/bi/binsider/package.nix +++ b/pkgs/by-name/bi/binsider/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FNaYMp+vrFIziBzZ8//+ppq7kwRjBJypqsxg42XwdEs="; }; - cargoHash = "sha256-EGqoHMkBPIhKV/PozArQ62bH/Gqc92S6ZabTjmIbQeE="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZoZbhmUeC63IZ5kNuACfRaCsOicZNUAGYABSpCkUCXA="; buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux; diff --git a/pkgs/by-name/bi/binwalk/package.nix b/pkgs/by-name/bi/binwalk/package.nix index 6609c60d9235..538c23dcf9af 100644 --- a/pkgs/by-name/bi/binwalk/package.nix +++ b/pkgs/by-name/bi/binwalk/package.nix @@ -47,7 +47,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-em+jOnhCZH5EEJrhXTHmxiwpMcBr5oNU1+5IJ1H/oco="; }; - cargoHash = "sha256-7+2TdlfCHJHXn0+q74JhmY3/lC0WfCG2FFmQFQNf4k8="; + useFetchCargoVendor = true; + cargoHash = "sha256-cnJVeuvNNApEHqgZDcSgqkH3DKAr8+HkqXUH9defTCA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/bi/biodiff/package.nix b/pkgs/by-name/bi/biodiff/package.nix index 37d8fe6c9513..db5c85034295 100644 --- a/pkgs/by-name/bi/biodiff/package.nix +++ b/pkgs/by-name/bi/biodiff/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-LxkwhOxXkegdXLmtbNLIB6nOAeCbpvIwSXbTF6jBcHs="; + useFetchCargoVendor = true; + cargoHash = "sha256-1/FNMXzEQB4LM57+SccUjJ31rYB46DO8AQYQBn6B7zg="; buildInputs = [ wfa2-lib ]; diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index e96b039d82f8..d1ac2d0fec7c 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oK1tCPoTeUHvVdi+ym4J5xEj2NIi2zHQpNU1KUchQfY="; }; - cargoHash = "sha256-4vITbsXfgNFoeWMHz7a9Rk7FrsEZRe75nHiyHSMujEQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-lo4IAStdv1CW/cQYzRDLzDwsDqCwoo5xKen2Rti9kPU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/bi/biscuit-cli/package.nix b/pkgs/by-name/bi/biscuit-cli/package.nix index e043049d2a67..676c2008d152 100644 --- a/pkgs/by-name/bi/biscuit-cli/package.nix +++ b/pkgs/by-name/bi/biscuit-cli/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-BLDJ4Rzu48sAklbv021XSzmATRd+D01yGHqJt6kvjGw="; }; - cargoHash = "sha256-J5/3zk9ZjSuiZBKrogP+8sVZr+w9dYlROkRRJFPyVvs="; + useFetchCargoVendor = true; + cargoHash = "sha256-3rDsgEH6tTEnAc/+8Try/z3mMBOguOTbxfXs5QIMBf4="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bk/bk/package.nix b/pkgs/by-name/bk/bk/package.nix index 1e12d4403a44..54eb190890b4 100644 --- a/pkgs/by-name/bk/bk/package.nix +++ b/pkgs/by-name/bk/bk/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rSMvx/zUZqRRgj48TVVG7RwQT8e70m0kertRJysDY4Y="; }; - cargoHash = "sha256-pE5loMwNMdHL3GODiw3kVVHj374hf3+vIDEYTqvx5WI="; + useFetchCargoVendor = true; + cargoHash = "sha256-i62vUvR/iX0zKD29WsIvlcn49lcFvv2uN05oTexvPMc="; nativeBuildInputs = [ go-md2man diff --git a/pkgs/by-name/bk/bkt/package.nix b/pkgs/by-name/bk/bkt/package.nix index e9a27eebb2d1..2f6ea92f511f 100644 --- a/pkgs/by-name/bk/bkt/package.nix +++ b/pkgs/by-name/bk/bkt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-XQK7oZfutqCvFoGzMH5G5zoGvqB8YaXSdrwjS/SVTNU="; }; - cargoHash = "sha256-Pl+a+ZpxaguRloH8R7x4FmYpTwTUwFrYy7AS/5K3L+8="; + useFetchCargoVendor = true; + cargoHash = "sha256-4CY2A6mPTfGhqUh+nNg6eaTIVwA9ZtgH5jHQDGHnK4c="; meta = { description = "Subprocess caching utility"; diff --git a/pkgs/by-name/bl/blflash/package.nix b/pkgs/by-name/bl/blflash/package.nix index f11bd4829176..3371f727a374 100644 --- a/pkgs/by-name/bl/blflash/package.nix +++ b/pkgs/by-name/bl/blflash/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lv5bUbq5AnZVeR8V0A4pamY9ZIQAhLmvZEr+CRMPcj0="; }; - cargoHash = "sha256-NRBW2rGrtEmmxONTpCM1D+o5HtnLjp175Sq9+aCp7ZE="; + useFetchCargoVendor = true; + cargoHash = "sha256-9CTq/NFhc/pJ3CyvhidQxbWx5iHFbOZDPm3g7cz6uRU="; meta = with lib; { description = "Bl602 serial flasher written in Rust"; diff --git a/pkgs/by-name/bl/bluetui/package.nix b/pkgs/by-name/bl/bluetui/package.nix index f81641355086..4fd147ff5699 100644 --- a/pkgs/by-name/bl/bluetui/package.nix +++ b/pkgs/by-name/bl/bluetui/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JgxzpFpz/fyFZwyxTtAkG9XB5qkxj46lUnZ3mM44dHk="; }; - cargoHash = "sha256-5BBh0nkJB8Z/WkmJqi0Kb72HDPdAtjdjIprw9OEKNgo="; + useFetchCargoVendor = true; + cargoHash = "sha256-1+hMo5vzgqm9Dpx9ZqRpHfQTRZV2RmqslQNub1+LFnk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/bo/boa/package.nix b/pkgs/by-name/bo/boa/package.nix index 3c2e0c188bbd..e3a5a8430d3b 100644 --- a/pkgs/by-name/bo/boa/package.nix +++ b/pkgs/by-name/bo/boa/package.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-UIUXayJwTrWbLm1UKnIXy1Df8a7ZoBzdNm/uZ1+H+SQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-1/92dyuEV+Xib0znEAgQOOmbsyjK/f2lYsXuPahLuw4="; cargoBuildFlags = [ "--package" diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index 22d7c5930dd9..5cd51c8c4e45 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -47,7 +47,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { ./0001-update-time.patch ]; - cargoHash = "sha256-09vPP+kNrmk0nN3Bdn9T7QjvuZvJeqQ56lCQIFb+Zrs="; + useFetchCargoVendor = true; + cargoHash = "sha256-5FvlyJgYtqgJyxlfXWe9oBBkwIY+c8Fp/rHuNLJ1j7s="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/bo/bonk/package.nix b/pkgs/by-name/bo/bonk/package.nix index 7f281db1dd85..ab6d9c7e3748 100644 --- a/pkgs/by-name/bo/bonk/package.nix +++ b/pkgs/by-name/bo/bonk/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sAMIteNkGRqmE7BQD/TNC01K3eQQTLKuc0jcxHxtKF8="; }; - cargoHash = "sha256-/qBuIG5ETUWMv2iOGpW3/awuhZb35qsBAflNJv3xTUs="; + useFetchCargoVendor = true; + cargoHash = "sha256-tUq+7vTVA27iQLGLXa+WJT3BARKc/Hl+D961IAvoGxw="; meta = { description = "Blazingly fast touch alternative written in Rust"; diff --git a/pkgs/by-name/bo/book-summary/package.nix b/pkgs/by-name/bo/book-summary/package.nix index 70244b9907eb..1d8e5ce13beb 100644 --- a/pkgs/by-name/bo/book-summary/package.nix +++ b/pkgs/by-name/bo/book-summary/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dxM6bqgHp4IaG03NriHvoT3al2u5Sz/I5ajlgzpjG1c="; }; - cargoHash = "sha256-QwydecdQaxvh6vWZvO30zgvvgUT6T5dvGRSmcuTUJmc="; + useFetchCargoVendor = true; + cargoHash = "sha256-8waVWCyjulMrXRc1nXZsiP4tMg70VZJ4wbgCQUgpX4A="; meta = with lib; { description = "Book auto-summary for gitbook and mdBook"; diff --git a/pkgs/by-name/bo/bootc/package.nix b/pkgs/by-name/bo/bootc/package.nix index 407864291e4d..a2a7fa796bf3 100644 --- a/pkgs/by-name/bo/bootc/package.nix +++ b/pkgs/by-name/bo/bootc/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { pname = "bootc"; version = "1.1.2"; - cargoHash = "sha256-i8eYypTgm43Ib1HZ2e9WBLUyDAGCZPpvpzmjTS8d9e0="; + useFetchCargoVendor = true; + cargoHash = "sha256-/Sb2XtVguj5zpj/OTl90xFHFSaBeLgb8xIlNm4UrnRI="; doInstallCheck = true; src = fetchFromGitHub { diff --git a/pkgs/by-name/bo/bootspec/package.nix b/pkgs/by-name/bo/bootspec/package.nix index 1a01eb2b3a17..435e61950fba 100644 --- a/pkgs/by-name/bo/bootspec/package.nix +++ b/pkgs/by-name/bo/bootspec/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { ]; - cargoHash = "sha256-eGSKVHjPnHK7WyGkO5LIjocNGHawahYQR3H5Lgk1C9s="; + useFetchCargoVendor = true; + cargoHash = "sha256-65jk8UlXZgQoxuwRcGlMnI4e+LpCJuP2TaqK+Kn4GnQ="; meta = with lib; { description = "Implementation of RFC-0125's datatype and synthesis tooling"; diff --git a/pkgs/by-name/bo/boringtun/package.nix b/pkgs/by-name/bo/boringtun/package.nix index 1c9bb07062bf..3ce965de29f5 100644 --- a/pkgs/by-name/bo/boringtun/package.nix +++ b/pkgs/by-name/bo/boringtun/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-PY7yqBNR4CYh8Y/vk4TYxxJnnv0eig8sjXp4dR4CX04="; }; - cargoHash = "sha256-WFKlfuZGVU5KA57ZYjsIrIwE4B5TeaU5IKt9BNEnWyY="; + useFetchCargoVendor = true; + cargoHash = "sha256-9qvX6P/DquQDlt6wOzI5ZQXQzNil1cD7KiuegDXtrQ0="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/by-name/bo/bottom-rs/package.nix b/pkgs/by-name/bo/bottom-rs/package.nix index 46172fd039fd..7b153dcdd84b 100644 --- a/pkgs/by-name/bo/bottom-rs/package.nix +++ b/pkgs/by-name/bo/bottom-rs/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-R1zj+TFXoolonIFa1zJDd7CdrORfzAPlxJoJVYe9xdc="; }; - cargoHash = "sha256-7xD65ookkK09XwCBH6fXqmWRYlmvpwAocojBg/dHzUI="; + useFetchCargoVendor = true; + cargoHash = "sha256-ULMW/1kvq5GeMUMUTQprwcXwnRMDCbow8P6jNwSXHQ8="; meta = with lib; { description = "Fantastic (maybe) CLI for translating between bottom and human-readable text"; diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix index 9a19a12e500f..980e942d66e7 100644 --- a/pkgs/by-name/bo/bottom/package.nix +++ b/pkgs/by-name/bo/bottom/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hm0Xfd/iW+431HflvZErjzeZtSdXVb/ReoNIeETJ5Ik="; }; - cargoHash = "sha256-FQbJx6ijX8kE4qxT7OQ7FwxLKJB5/moTKhBK0bfvBas="; + useFetchCargoVendor = true; + cargoHash = "sha256-feMgkCP6e3HsOppTYLtVrRn/vbSLLRKV0hp85gqr4qM="; nativeBuildInputs = [ autoAddDriverRunpath diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index f1fc14620fcd..c5260fff2056 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wtAc5h3bm/X1aCPGjl30NaM7XR602q5NdlamUQvADDo="; }; - cargoHash = "sha256-oyxO92wXVN7kbIcTy5OAaqK/ySnetpkFwcop34ERpxs="; + useFetchCargoVendor = true; + cargoHash = "sha256-2ipLO2b/mEEwSl0PSCq6m9tBhhaiDj9mXXVO4pr/78c="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here diff --git a/pkgs/by-name/bo/boxxy/package.nix b/pkgs/by-name/bo/boxxy/package.nix index 03b2d1030ac7..a6084d3ede78 100644 --- a/pkgs/by-name/bo/boxxy/package.nix +++ b/pkgs/by-name/bo/boxxy/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6pb3yyC4/kpe8S67B3pzsSu3PfQyOWpiYi0JTBQk3lU="; }; - cargoHash = "sha256-PaH0WBBGK37T59RU4ofL0XjYX3cV5lR7WmCw+H/MeuA="; + useFetchCargoVendor = true; + cargoHash = "sha256-L6EL8iP8FnV2WDe4bkHG/P5Zz4S9TAiw3V+XQSTABrQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix index a72478079904..07164239cde7 100644 --- a/pkgs/by-name/bp/bpftop/package.nix +++ b/pkgs/by-name/bp/bpftop/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } { hash = "sha256-WH/oCnkBcvoouBbkAcyawfAuNR3VsTl5+ZATLpi9d4w="; }; - cargoHash = "sha256-H9HapuIyJJOSQIR9IvFZaQ+Nz9M0MH12JwbY8r2l+JY="; + useFetchCargoVendor = true; + cargoHash = "sha256-fXNu0u+YdT5UaKReT4WuQINKz/zFnwXS1r+xEH6g9FU="; buildInputs = [ elfutils diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 103289528cca..9d3a37a10bae 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cvrWcfQj5Pc2tyaQjhhTK9Ko240Bz6dbUe+OFLTz/+M="; }; - cargoHash = "sha256-EhcaIkaFPisRKagN8xDMmGrcH9vfMZcj/w53sDQcOp8="; + useFetchCargoVendor = true; + cargoHash = "sha256-k0H68lvciLjfRx2J1s1dKA8kijFkSBryoGWXCVAR6Ic="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/bu/buckle/package.nix b/pkgs/by-name/bu/buckle/package.nix index a4b96ce46927..dba26f270221 100644 --- a/pkgs/by-name/bu/buckle/package.nix +++ b/pkgs/by-name/bu/buckle/package.nix @@ -7,7 +7,8 @@ rustPlatform.buildRustPackage rec { pname = "buckle"; version = "1.1.0"; - cargoHash = "sha256-O90/Xo9WjLVGFEkh6S6IyvanceRBJHneEret6W8e5Yc="; + useFetchCargoVendor = true; + cargoHash = "sha256-2QUgyml4ebPLt0oXrdCNYIORvVyBKvsDfC+ZgsVn+cQ="; src = fetchFromGitHub { owner = "benbrittain"; diff --git a/pkgs/by-name/bu/bugstalker/package.nix b/pkgs/by-name/bu/bugstalker/package.nix index 9ac50950fb39..b1393ba65ae9 100644 --- a/pkgs/by-name/bu/bugstalker/package.nix +++ b/pkgs/by-name/bu/bugstalker/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JacRt+zNwL7hdpdh5h9Mxztqi47f5eUbcZyx6ct/5Bc="; }; - cargoHash = "sha256-ljT7Dl9553sfZBqTe6gT3iYPH+D1Jp9ZsyGVQGOekxw="; + useFetchCargoVendor = true; + cargoHash = "sha256-w599KFLbyxFQzxIk6s9obPv804TLreOCMj/eApeSk7A="; buildInputs = [ libunwind ]; diff --git a/pkgs/by-name/bu/bukubrow/package.nix b/pkgs/by-name/bu/bukubrow/package.nix index 92c3c56b8be6..4e1108669f03 100644 --- a/pkgs/by-name/bu/bukubrow/package.nix +++ b/pkgs/by-name/bu/bukubrow/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xz5Agsm+ATQXXgpPGN4EQ00i1t8qUlrviNHauVdCu4U="; }; - cargoHash = "sha256-mH76ODPKlKDEK9ckThPnL5Ar7p1l1gNd7zXfesLZlBM="; + useFetchCargoVendor = true; + cargoHash = "sha256-mCPJE9WW14NtahbMnDcE+0xXl5w25dzerPy3wv78l20="; buildInputs = [ sqlite ]; diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix index 36ee18ae8175..8319b0115871 100644 --- a/pkgs/by-name/bu/bulloak/package.nix +++ b/pkgs/by-name/bu/bulloak/package.nix @@ -40,7 +40,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OAjy8SXaD+2/C5jLNIezv/KdrPHlwJC5L1LwGhqBWQs="; }; - cargoHash = "sha256-lj/wmLu4cBjDjzMD8DlIz+6Rnag0h+zWiE7lfcTC7lY="; + useFetchCargoVendor = true; + cargoHash = "sha256-sdnpnKWKCJeBbooM0Qe/wccF1b3LLiTfZe4RdxbJYcs="; # tests run in CI on the source repo doCheck = false; diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix index e6e468db36ea..0a6b737335c5 100644 --- a/pkgs/by-name/bu/bunbun/package.nix +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3f/G0Vx1uXeH3QMDVUAHWi4Pf/B88/4F+4XywVsp3/4="; }; - cargoHash = "sha256-UEUK8GBkyzUv2J6uTjRdyoIiHVKLDYYj1aOnl+rgzmk="; + useFetchCargoVendor = true; + cargoHash = "sha256-2pgQB2myEnLvrU3ApNL/bwaVcGku+X/TjR6YBqXD7Xg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/bu/bunyan-rs/package.nix b/pkgs/by-name/bu/bunyan-rs/package.nix index ca07660a86c5..0b7f2a6f57a1 100644 --- a/pkgs/by-name/bu/bunyan-rs/package.nix +++ b/pkgs/by-name/bu/bunyan-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-dqhZIwxWBMXS2RgE8YynYrESVyAOIJ9ujAKcp2tDhvA="; }; - cargoHash = "sha256-sQ6f8BHGsPFPchFDjNlZimnu9i99SGYf5bYfM1/2Gac="; + useFetchCargoVendor = true; + cargoHash = "sha256-eLbfrlZWwPv1AFgwFz+IacLZrSl9/KU9zfTstwB8ol0="; meta = with lib; { description = "CLI to pretty print logs in bunyan format (Rust port of the original JavaScript bunyan CLI)"; diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 49e8dcbac954..827b70e9c65f 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3OaCsy6xt2Pc/Cqm3qbbpr7kiQiA2BM/LqIQnuw73MY="; }; - cargoHash = "sha256-sei1sOhR35tkNW4rObLC+0Y5upxNo6yjRMLNcro0tRY="; + useFetchCargoVendor = true; + cargoHash = "sha256-jod9wKuyhbY+/3NIEMZGoKIA1rT6Y4XoLKqYvzM5fAQ="; # use the non-vendored openssl env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ca/cached-nix-shell/package.nix b/pkgs/by-name/ca/cached-nix-shell/package.nix index 71256c2b1b5c..7deab6ea8cae 100644 --- a/pkgs/by-name/ca/cached-nix-shell/package.nix +++ b/pkgs/by-name/ca/cached-nix-shell/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LI/hecqeRg3eCzU2bASJA8VoG4nvrSeHSeaGYn7M/UI="; }; - cargoHash = "sha256-Jf0VRTGwdKxCwyb9hVKDQcdZsHHWaedrDbwq9MK1tn4="; + useFetchCargoVendor = true; + cargoHash = "sha256-Rl+PgNr29OAl6P/iUfkuFlQycyeYNmxUIIdigk7PgV4="; nativeBuildInputs = [ nix diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix index 21a2201d1a30..7bc31286d0e3 100644 --- a/pkgs/by-name/ca/cairo-lang/package.nix +++ b/pkgs/by-name/ca/cairo-lang/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zjgCOrTlIPN4aU0+FCohJmISPiwpppj3zO/7unVi/iU="; }; - cargoHash = "sha256-2qm2hL4M2xHidRYF9Fhxxn2IG22mPEBZW5yhu6wPVDY="; + useFetchCargoVendor = true; + cargoHash = "sha256-d9S8d0KLxoipH5nE0jyUaFAl/V8eSOvOwf2skrW5K5g="; # openssl crate requires perl during build process nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index b69bccb04fbf..5cb58eb82b24 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VwbVDfiGiVFefsxoQ1FBDHyYLp0sOKnnVZctklyO+Tw="; }; - cargoHash = "sha256-2/6RoDsVf+yI/X22hUV68U1VBrRkd5i9BsFMIMGnZXg="; + useFetchCargoVendor = true; + cargoHash = "sha256-kTVmwfUNDibYGsHGQvtZiBiHyyotkHMhTY/dvaATy8k="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix index 087dcf2745ac..b6e1ad69c832 100644 --- a/pkgs/by-name/ca/capnproto-rust/package.nix +++ b/pkgs/by-name/ca/capnproto-rust/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WVjXVLVoTCAtA8a6+zaX4itAaPCWb2c0trtSsxBopO4="; }; - cargoHash = "sha256-h9YArxHnY14T8eQCS4JVItjaCjv+2dorcOVBir7r6SY="; + useFetchCargoVendor = true; + cargoHash = "sha256-iV83AbXzxNZ78V8yLSfF9PebDGEw+9sbTP41krd7ujI="; postInstall = '' mkdir -p $out/include/capnp diff --git a/pkgs/by-name/ca/cargo-3ds/package.nix b/pkgs/by-name/ca/cargo-3ds/package.nix index 780a40e3d66b..3fa0edd168bd 100644 --- a/pkgs/by-name/ca/cargo-3ds/package.nix +++ b/pkgs/by-name/ca/cargo-3ds/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-G1XSpvE94gcamvyKKzGZgj5QSwkBNbYWYdZ17ScwW90="; }; - cargoHash = "sha256-Gt8TJ6VTvpqtpQuD4WYN45/gccfgnw13sKeMqHboTm8="; + useFetchCargoVendor = true; + cargoHash = "sha256-X2n7htrvRPLJkQKONz26hbgXmB8JYafdG1/a0LRGEgs="; # Integration tests do not run in Nix build environment due to needing to # create and build Cargo workspaces. diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix index 88bcb0529dad..2f1f78038bb1 100644 --- a/pkgs/by-name/ca/cargo-about/package.nix +++ b/pkgs/by-name/ca/cargo-about/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6jza0IHdX7vyjZt1lknoVhlu7RONF5SnTdn7EDsj2oo="; }; - cargoHash = "sha256-0qs1BDz5FIbqQCw4iw7TnetzlgNJIvJ1pJmoNN8h4qU="; + useFetchCargoVendor = true; + cargoHash = "sha256-MXUfldlAu+SezlNi0QbqKJ/ddJiKCrs4bi4ryG68EPU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-all-features/package.nix b/pkgs/by-name/ca/cargo-all-features/package.nix index 96d9942b5158..01560a45253a 100644 --- a/pkgs/by-name/ca/cargo-all-features/package.nix +++ b/pkgs/by-name/ca/cargo-all-features/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/w3Xd7PXUNtqzRYmUqJtth+GDuXSnsk1NiYCTYsHuAQ="; }; - cargoHash = "sha256-d69jj2FGptjndJG1tq3Fb/8F3kuFXN5otsYGhXYhhZg="; + useFetchCargoVendor = true; + cargoHash = "sha256-OgVeAuC36mP8rv4+XHsrOe7KKnpQ/u0M3g91NE0u98A="; meta = with lib; { description = "Cargo subcommand to build and test all feature flag combinations"; diff --git a/pkgs/by-name/ca/cargo-aoc/package.nix b/pkgs/by-name/ca/cargo-aoc/package.nix index d71415c26a68..35edbd666e5c 100644 --- a/pkgs/by-name/ca/cargo-aoc/package.nix +++ b/pkgs/by-name/ca/cargo-aoc/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5CjY91515GeLzmLJiGjfbBfIMPr32EA65X/rriKPWRY="; }; - cargoHash = "sha256-LhPsiO0Fnx9Tf+itaaVaO1XgqM00m+UQMlUJYY8isXY="; + useFetchCargoVendor = true; + cargoHash = "sha256-q0kpo6DNR+8129+vJSLoOC/bUYjlfaB77YTht6+kT00="; passthru = { tests.version = testers.testVersion { package = cargo-aoc; }; diff --git a/pkgs/by-name/ca/cargo-apk/package.nix b/pkgs/by-name/ca/cargo-apk/package.nix index 090b22ed4384..325ddb4439f6 100644 --- a/pkgs/by-name/ca/cargo-apk/package.nix +++ b/pkgs/by-name/ca/cargo-apk/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A="; }; - cargoHash = "sha256-rGn3MKbqIRWayarsgedIOhuTTl8lyRsRxn7BN5Id97w="; + useFetchCargoVendor = true; + cargoHash = "sha256-8qjj5rcaqXBIte8+r0llj33Saat85SqNljGRaS1E3q0="; meta = with lib; { description = "Tool for creating Android packages"; diff --git a/pkgs/by-name/ca/cargo-autoinherit/package.nix b/pkgs/by-name/ca/cargo-autoinherit/package.nix index dc462acbf208..290d2cd7c410 100644 --- a/pkgs/by-name/ca/cargo-autoinherit/package.nix +++ b/pkgs/by-name/ca/cargo-autoinherit/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ai2BqBfZlCOA1DIlzZerH71sbUMi6C65FRv5VDU0DPU="; }; - cargoHash = "sha256-bPbwUqw2IFwZTi7qFm1BQgGYBAb6OG8QSU8xTdx/1zM="; + useFetchCargoVendor = true; + cargoHash = "sha256-Yw9W7ewdDRVOEXy2GXBC+LoaWTJMDCADvbazUxg3ZoE="; meta = with lib; { description = "Automatically DRY up your Rust dependencies"; diff --git a/pkgs/by-name/ca/cargo-benchcmp/package.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix index d889310df580..98607fe755ff 100644 --- a/pkgs/by-name/ca/cargo-benchcmp/package.nix +++ b/pkgs/by-name/ca/cargo-benchcmp/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J8KFI0V/mOhUlYtVnFAQgPIpXL9/dLhOFxSly4bR00I="; }; - cargoHash = "sha256-2V9ILHnDsUI+x3f5o+V7p8rPUKf33PAkpyTabCPdd0g="; + useFetchCargoVendor = true; + cargoHash = "sha256-Dpn3MbU56zX4vibG0pw5LuQEwvC6Uqzse1GCRHWyAEw="; patches = [ # patch the binary path so tests can find the binary when `--target` is present diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index ac353879f7ec..8ac625a7ab28 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dKQRXEZfvONaWocvoaEQtENAyNvIUaqomckaSj7bUtM="; }; - cargoHash = "sha256-gN6aNPV6K8BUTUvTTKtTu54JFLwL1XSA0rA4EyKdovc="; + useFetchCargoVendor = true; + cargoHash = "sha256-fCjLcqqZX/H4uTw3/J7REGPPn3d9v2RLxNke+lq+wzg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-binutils/package.nix b/pkgs/by-name/ca/cargo-binutils/package.nix index 4fa0efde04af..5062f8730f8f 100644 --- a/pkgs/by-name/ca/cargo-binutils/package.nix +++ b/pkgs/by-name/ca/cargo-binutils/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tRh3+X6QCdkkJE1O60ZRkDBRbznGZ1aB1AOmcz0EINI="; }; - cargoHash = "sha256-lZJcsCg7e5ZmClnzKFjm/roXBIyhkPTzS7R6BTmcNIk="; + useFetchCargoVendor = true; + cargoHash = "sha256-QdW0HiVhKFuXj7hWZw1lkrFmvVIqbeMKRF2qnBX9wRI="; meta = with lib; { description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain"; diff --git a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix index 8a89387ca848..ada172ec6091 100644 --- a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix +++ b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix @@ -50,7 +50,8 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.SystemConfiguration ]; - cargoHash = "sha256-CgEs0cejquFRY3VN6CgbE23Gipg+LEuWp/jSIkITrjw="; + useFetchCargoVendor = true; + cargoHash = "sha256-SigRm2ZC7jH1iCEGRpka1G/e9kBEieFVU0YDBl2LfTM="; checkFlags = [ "--skip test_github" # requires internet diff --git a/pkgs/by-name/ca/cargo-bitbake/package.nix b/pkgs/by-name/ca/cargo-bitbake/package.nix index 3836e251003a..aa906df35c19 100644 --- a/pkgs/by-name/ca/cargo-bitbake/package.nix +++ b/pkgs/by-name/ca/cargo-bitbake/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-LYdQ0FLfCopY8kPTCmiW0Qyx6sHA4nlb+hK9hXezGLg="; + useFetchCargoVendor = true; + cargoHash = "sha256-drupV59sBuR6AZ7jVO2EJn62I6XX5vv3QR+Mu8cLklk="; meta = with lib; { description = "Cargo extension that can generate BitBake recipes utilizing the classes from meta-rust"; diff --git a/pkgs/by-name/ca/cargo-bloat/package.nix b/pkgs/by-name/ca/cargo-bloat/package.nix index 90e307891cc3..36e67fafb4d4 100644 --- a/pkgs/by-name/ca/cargo-bloat/package.nix +++ b/pkgs/by-name/ca/cargo-bloat/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-B71VX7cJe1giOLmk3cQE8Zxr7fKGyQkoXRuM+NzBcb8="; }; - cargoHash = "sha256-BBFLyMx1OPT2XAM6pofs2kV/3n3FrNu0Jkyr/Y3smnI="; + useFetchCargoVendor = true; + cargoHash = "sha256-8Omw8IsmoFYPBB6q1EAAbcBhTjBWfCChV2MhX9ImY8Y="; meta = with lib; { description = "Tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix index 4d18ec63ae60..221176d3a991 100644 --- a/pkgs/by-name/ca/cargo-bolero/package.nix +++ b/pkgs/by-name/ca/cargo-bolero/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ta0H6V7Zg/Jnu3973eYJXGwwQcqZnDTlsmWAHkQr2EA="; }; - cargoHash = "sha256-5F72vjEu0qrE3fYPbiw/UFUUnAZcEBcuhDkuqqCBbrM="; + useFetchCargoVendor = true; + cargoHash = "sha256-XndJm7nkOxY/4tJZIdv1HYxhsju667G1x8FSW1fb4BI="; buildInputs = [ libbfd diff --git a/pkgs/by-name/ca/cargo-bootimage/package.nix b/pkgs/by-name/ca/cargo-bootimage/package.nix index 5b7a44dc1df3..6d4d3e4673ca 100644 --- a/pkgs/by-name/ca/cargo-bootimage/package.nix +++ b/pkgs/by-name/ca/cargo-bootimage/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "12p18mk3l473is3ydv3zmn6s7ck8wgjwavllimcpja3yjilxm3zg"; }; - cargoHash = "sha256-XXiZ0qfAS+SXOsiRAU/xBDShpPOr18JSGQfLh3mNXQ4="; + useFetchCargoVendor = true; + cargoHash = "sha256-CkFJHW7yrIJi/KMGJgyhnLTMkrxnDwO3X4M1aml9cuM="; meta = with lib; { description = "Creates a bootable disk image from a Rust OS kernel"; diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix index 486d9096761e..af31e5f60aab 100644 --- a/pkgs/by-name/ca/cargo-bump/package.nix +++ b/pkgs/by-name/ca/cargo-bump/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PhA7uC2gJcBnUQPWgZC51p/KTSxSGld3m+dd6BhW6q8="; }; - cargoHash = "sha256-mp2y5q0GYfSlB5aPC6MY9Go8a2JAiPKtVYL9SewfloI="; + useFetchCargoVendor = true; + cargoHash = "sha256-5UyG/zGF+D5DOYWLiJPnGjAsr7e8xz+e4YUoZYerz80="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix index af8b90d28827..1bc576616050 100644 --- a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix +++ b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Rw5uwfUPTkIbiOQDohBRoAm0momljJRSYP+VmEOOw/k="; }; - cargoHash = "sha256-SfTt49J6D7RESo6iO3b/l0+Vu1dEW+PG0M2RIko2OJ4="; + useFetchCargoVendor = true; + cargoHash = "sha256-qG7pkgSMdWDlODPOaWHFhGkSyXP9kcrh/lK4CVGVOz8="; meta = with lib; { description = "Generate a THIRDPARTY file with all licenses in a cargo project"; diff --git a/pkgs/by-name/ca/cargo-bundle/package.nix b/pkgs/by-name/ca/cargo-bundle/package.nix index 213cc492d1b0..13c8f86603a9 100644 --- a/pkgs/by-name/ca/cargo-bundle/package.nix +++ b/pkgs/by-name/ca/cargo-bundle/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-n+c83pmCvFdNRAlcadmcZvYj+IRqUYeE8CJVWWYbWDQ="; }; - cargoHash = "sha256-Ea658jHomktmzXtU5wmd0bRX+i5n46hCvexYxYbjjUc="; + useFetchCargoVendor = true; + cargoHash = "sha256-g898Oelrk/ok52raTEDhgtQ9psc0PFHd/uNnk1QeXCs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-careful/package.nix b/pkgs/by-name/ca/cargo-careful/package.nix index 260b6d92c643..849ec6df3eb3 100644 --- a/pkgs/by-name/ca/cargo-careful/package.nix +++ b/pkgs/by-name/ca/cargo-careful/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pYfyqsS+bGwSP6YZAtI+8iMXdID/hrCiX+cuYoYiZmc="; }; - cargoHash = "sha256-C+bnoYMO0Pjdgn4Q2Qb2COllMK0hnRNBwGd828o3AKE="; + useFetchCargoVendor = true; + cargoHash = "sha256-hb3x2LKtDNAhMbRCB3kAwHloFTojGzQdXsMjxeJYB6k="; meta = with lib; { description = "Tool to execute Rust code carefully, with extra checking along the way"; diff --git a/pkgs/by-name/ca/cargo-chef/package.nix b/pkgs/by-name/ca/cargo-chef/package.nix index 9b29ab2b2b6a..37082715df1e 100644 --- a/pkgs/by-name/ca/cargo-chef/package.nix +++ b/pkgs/by-name/ca/cargo-chef/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zDVolVllWl0DM0AByglKhU8JQpkdcmyVGe1vYo+eamk="; }; - cargoHash = "sha256-RyPomJJbI67izQMuKf6fBSbM6Ar9Wm4oHYqnOnP/b8U="; + useFetchCargoVendor = true; + cargoHash = "sha256-3bjnAQLIO0hHjkRDym2oUzmiMd2gp5gN+iK8NxBC22Q="; meta = with lib; { description = "Cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix index 256b4c0ab1b4..9d052d9df626 100644 --- a/pkgs/by-name/ca/cargo-component/package.nix +++ b/pkgs/by-name/ca/cargo-component/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pW3hhcsMzKSWmUX8HwAtZCB+v9B4qXw6WUGODhPtW+Q="; }; - cargoHash = "sha256-knNtEBSJigamj1hE6wU4Hc/f3TUcFiufOUMLwsK6t+A="; + useFetchCargoVendor = true; + cargoHash = "sha256-Vnef3ApklZtN417dXhA+YWcsAeSTDSt6wA+7SjBKHm0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-cranky/package.nix b/pkgs/by-name/ca/cargo-cranky/package.nix index 168b9a979842..d99831848cb4 100644 --- a/pkgs/by-name/ca/cargo-cranky/package.nix +++ b/pkgs/by-name/ca/cargo-cranky/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3ARl3z+2nz05UaKf8ChN6mvPY2qMjUNxGnGJ1P0xkas="; }; - cargoHash = "sha256-jmyrtaJTdZlffC7i5k7z9BEsHAs1rPTCs2/jgq1Jt6Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-m9n2YyrMpuz/X/kvHgn+g4w9/Pg+n6VnnfwjaOnyPvY="; meta = with lib; { description = "Easy to configure wrapper for Rust's clippy"; diff --git a/pkgs/by-name/ca/cargo-criterion/package.nix b/pkgs/by-name/ca/cargo-criterion/package.nix index 96dda36ab067..2be8a159f0b5 100644 --- a/pkgs/by-name/ca/cargo-criterion/package.nix +++ b/pkgs/by-name/ca/cargo-criterion/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0="; }; - cargoHash = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08="; + useFetchCargoVendor = true; + cargoHash = "sha256-D0Exfm6NRRedncDAgC3MgfagzsM0Dsc7X0i9arYYOgc="; meta = with lib; { description = "Cargo extension for running Criterion.rs benchmarks"; diff --git a/pkgs/by-name/ca/cargo-cross/package.nix b/pkgs/by-name/ca/cargo-cross/package.nix index d62b6aa9c799..70ecd4445845 100644 --- a/pkgs/by-name/ca/cargo-cross/package.nix +++ b/pkgs/by-name/ca/cargo-cross/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38="; }; - cargoHash = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c="; + useFetchCargoVendor = true; + cargoHash = "sha256-omk9UqijrQQ49AYEQjJ+iTT1M0GW7gJD+oG8xAL243A="; checkFlags = [ "--skip=docker::shared::tests::directories::test_host" diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix index 67dda48c1ad5..150d3a9a1450 100644 --- a/pkgs/by-name/ca/cargo-deadlinks/package.nix +++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh"; }; - cargoHash = "sha256-Bs6WyeHBeZDWLSidoFBLaa2ZEr8oAQcr8JmHCtw34AE="; + useFetchCargoVendor = true; + cargoHash = "sha256-d5e5CpO/c6KrIQE8dJqXT19Qe0CRbIqgCDHNWz4TK8Q="; checkFlags = [ diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix index 0b2902163bd5..e2fea3d84ff7 100644 --- a/pkgs/by-name/ca/cargo-deb/package.nix +++ b/pkgs/by-name/ca/cargo-deb/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J3ChNrZUctDcs1bOCoDLTQtqTT9rWi24XK2fki8PYLw="; }; - cargoHash = "sha256-CjlMadj4/QhbSlCoZs3JRaplbY4XlcBFKR4ZXJLK+Uo="; + useFetchCargoVendor = true; + cargoHash = "sha256-H8nFZMy052omLGqiB1AQCZH10zLov42fD0AfEBw9teM="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix index d3c60645cbdf..5aea75824f0e 100644 --- a/pkgs/by-name/ca/cargo-deny/package.nix +++ b/pkgs/by-name/ca/cargo-deny/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DykyIZBlIS4vUrD491boYcUvwcxllnV1PUT+58eOljI="; }; - cargoHash = "sha256-ITtlBKBYXilaZtl4WJLSPoss77wezvNjwgj5FN8ll1w="; + useFetchCargoVendor = true; + cargoHash = "sha256-0MgQmyN9vOe7ttYzSmHJ5vS1ELSdJ2hdkgeMhSJNVTs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-depgraph/package.nix b/pkgs/by-name/ca/cargo-depgraph/package.nix index a1928b19e859..956aabcacd87 100644 --- a/pkgs/by-name/ca/cargo-depgraph/package.nix +++ b/pkgs/by-name/ca/cargo-depgraph/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yvcKRESX2W1oLmQvkl07iG8+I74qDKsaS3amM4pZU8s="; }; - cargoHash = "sha256-OJOw0V4u/bK4vw3bU2wKVeOqP205ehfZMKJ6qIpYDLU="; + useFetchCargoVendor = true; + cargoHash = "sha256-5GFYp1ZEkmag2GfzHRz3QDYaURzbDKY9yTSznkxddnE="; meta = with lib; { description = "Create dependency graphs for cargo projects using `cargo metadata` and graphviz"; diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix index 90448aa7adbb..a8310189dc1e 100644 --- a/pkgs/by-name/ca/cargo-diet/package.nix +++ b/pkgs/by-name/ca/cargo-diet/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SuJ1H/2YfSVVigdgLUd9veMClI7ZT7xkkyQ4PfXoQdQ="; }; - cargoHash = "sha256-MASftcn3WmB3M6bvmtnK3nlroE8nq9zdkleSEgzA5lk="; + useFetchCargoVendor = true; + cargoHash = "sha256-crdRRlRi3H8j/ojGH+oqmaeSS8ee8dUALorZPWE/j1Y="; meta = with lib; { description = "Help computing optimal include directives for your Cargo.toml manifest"; diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix index 5ea14429e007..d97e19fb6a5e 100644 --- a/pkgs/by-name/ca/cargo-dist/package.nix +++ b/pkgs/by-name/ca/cargo-dist/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0mKCwb7nvl8BRtQyweItkMT0PrKRGTvpB9Acgro7QSM="; }; - cargoHash = "sha256-D55UXup19R1fBAqzVSDWHH9ORQtWIf+o1UV36hODE4E="; + useFetchCargoVendor = true; + cargoHash = "sha256-Aoz+H817jeWkZt1NwcF5SVQsjbk4CRIhUQeq4A2nxM8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-docset/package.nix b/pkgs/by-name/ca/cargo-docset/package.nix index 1148261d034b..1bea594997f8 100644 --- a/pkgs/by-name/ca/cargo-docset/package.nix +++ b/pkgs/by-name/ca/cargo-docset/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-o2CSQiU9fEoS3eRmwphtYGZTwn3mstRm2Tlvval83+U="; }; - cargoHash = "sha256-YHrSvfHfQ7kbVeCOgggYf3E7gHq+RhVKZrzP8LqX5I0="; + useFetchCargoVendor = true; + cargoHash = "sha256-MHSvrZXh9RLuiLEc4IHPvtIKjdRjFhtmumPs4EuJtz0="; buildInputs = [ sqlite ]; diff --git a/pkgs/by-name/ca/cargo-duplicates/package.nix b/pkgs/by-name/ca/cargo-duplicates/package.nix index 30e5f66b9b6a..768867254ef3 100644 --- a/pkgs/by-name/ca/cargo-duplicates/package.nix +++ b/pkgs/by-name/ca/cargo-duplicates/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VGxBmzMtev+lXGhV9pMefpgX6nPlzMaPbXq5LMdIvrE="; }; - cargoHash = "sha256-xkPvbC/ot4U3gca57pEEze0jaQhUAZV1MEX0E6E1BmE="; + useFetchCargoVendor = true; + cargoHash = "sha256-F6ZQrK4pKpljIQEei3cvxPPnOSBu9cyoaUzz/aS+yQU="; nativeBuildInputs = [ curl diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 22368dfa43e2..883f152ee86f 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nbzQmZ8hAiU8K+/VHwbEniTsioCgQhbADIxV9tL3M1k="; }; - cargoHash = "sha256-sOxLRNGIHsUBNWWRUo2qyeewL06rU5paq4LbXpksMzg="; + useFetchCargoVendor = true; + cargoHash = "sha256-aLHeGAIVm6hY+sRymQjQf2WwiwkIDKl+GSvI/D6JOCo="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; diff --git a/pkgs/by-name/ca/cargo-feature/package.nix b/pkgs/by-name/ca/cargo-feature/package.nix index 3dda99f542f1..791fa5355f38 100644 --- a/pkgs/by-name/ca/cargo-feature/package.nix +++ b/pkgs/by-name/ca/cargo-feature/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-UPpqkz/PwoMaJan9itfldjyTmZmiMb6PzCyu9Vtjj1s="; }; - cargoHash = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU="; + useFetchCargoVendor = true; + cargoHash = "sha256-leciPTXFQ/O/KISBz4BV5KYIdld4UmiFE2yR8MoUVu0="; checkFlags = [ # The following tests require empty CARGO_BUILD_TARGET env variable, but we diff --git a/pkgs/by-name/ca/cargo-features-manager/package.nix b/pkgs/by-name/ca/cargo-features-manager/package.nix index 9291e14c0e91..6a6b75b46561 100644 --- a/pkgs/by-name/ca/cargo-features-manager/package.nix +++ b/pkgs/by-name/ca/cargo-features-manager/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NjXJCrLsX52M7CBg8wdgwlK3gaGiznfdRGz7BAbVVPk="; }; - cargoHash = "sha256-vCV5b4ljlDgwsYvxrPFe9rsfJjHHBCcM3QoZ4t8ZdRw="; + useFetchCargoVendor = true; + cargoHash = "sha256-1/bCyScvWQYeGZRitvksww4uvrzhifRBYcYPgGY2GRo="; meta = { description = "Command-line tool for managing Architectural Decision Records"; diff --git a/pkgs/by-name/ca/cargo-fuzz/package.nix b/pkgs/by-name/ca/cargo-fuzz/package.nix index bd30411f16d2..b238b5f05e47 100644 --- a/pkgs/by-name/ca/cargo-fuzz/package.nix +++ b/pkgs/by-name/ca/cargo-fuzz/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PC36O5+eB+yVLpz+EywBDGcMAtHl79FYwUo/l/JL8hM="; }; - cargoHash = "sha256-sfvepPpYtgA0TuUlu0CD50HX933AVQbUGzJBNAzFR94="; + useFetchCargoVendor = true; + cargoHash = "sha256-lyw7UJrGBL1+ATma3TWBpgjstSHGYMWAyTiq1nJNhgE="; doCheck = false; diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index 77c232c50da9..d65fb09b16f4 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { ./fix-build-with-rust-1.80.patch ]; - cargoHash = "sha256-511KeTykHw3xbnsuwIt2QmBK3mG9yK23z0yrS3eIY74="; + useFetchCargoVendor = true; + cargoHash = "sha256-n6RfulzrK9QebC1tgVVd/YnBc21Jf0OSfHApRO1c0ew="; patches = [ ./allow-warnings.patch diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix index ca5ed22f9580..a6a013570c64 100644 --- a/pkgs/by-name/ca/cargo-generate/package.nix +++ b/pkgs/by-name/ca/cargo-generate/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-iOZCSd6jF1OF7ScjpsMlvMjsFHyg6QJJ6qk0OxrARho="; }; - cargoHash = "sha256-ZLzJpD3bIuNtGl5kzhvpE07jtfEV+lgnTiPcFM7MHdE="; + useFetchCargoVendor = true; + cargoHash = "sha256-bYxUqgFiO0SuttVFvHIX+Dorno5n4jK+2ck89ngssBM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-gra/package.nix b/pkgs/by-name/ca/cargo-gra/package.nix index 631d8ea7c97c..1c68d1b237cd 100644 --- a/pkgs/by-name/ca/cargo-gra/package.nix +++ b/pkgs/by-name/ca/cargo-gra/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JbBcpp/E3WlQrwdxMsbSdmIEnDTQj/1XDwAWJsniRu0="; }; - cargoHash = "sha256-wfMiqWcEsL6/d6XFnEFm/lCbelU7BHC7JKdHREnynAU="; + useFetchCargoVendor = true; + cargoHash = "sha256-B32GCIlFngfubwZqxMneAO24hhJ1zOgW6gXMHzgr89A="; meta = { description = "gtk-rust-app cli for building flatpak apps with ease"; diff --git a/pkgs/by-name/ca/cargo-guppy/package.nix b/pkgs/by-name/ca/cargo-guppy/package.nix index 3b917cd6762c..c88d73685af7 100644 --- a/pkgs/by-name/ca/cargo-guppy/package.nix +++ b/pkgs/by-name/ca/cargo-guppy/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-LWU1yAD/f9w5m522vcKP9D2JusGkwzvfGSGstvFGUpk="; }; - cargoHash = "sha256-IyU5fJSFzef8P5v8ILufGcTP3+5Gm0PH4Cox2G5saHw="; + useFetchCargoVendor = true; + cargoHash = "sha256-nNbCQ/++gm2S+xFbE5t9U9gQR8E2fVWE4kh73wgbAwQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix index 34a6763e2d4b..17084a1ef913 100644 --- a/pkgs/by-name/ca/cargo-hakari/package.nix +++ b/pkgs/by-name/ca/cargo-hakari/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+IjtK4kSm2vThgIxDsBLpoh0j9cDhhEqI6Hr2BmC7hc="; }; - cargoHash = "sha256-xMgNk82U32AtMeZJ8v2M0faHLAPkXrdIJHwOJcqE9m8="; + useFetchCargoVendor = true; + cargoHash = "sha256-yAk0hMB3OEaaIuNqiJtl1K5P19pOGtiyt4cvU+Nb814="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ca/cargo-i18n/package.nix b/pkgs/by-name/ca/cargo-i18n/package.nix index 19f5dfb9691c..bf367aee4074 100644 --- a/pkgs/by-name/ca/cargo-i18n/package.nix +++ b/pkgs/by-name/ca/cargo-i18n/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-azwQlXsoCgNB/TjSBBE+taUR1POBJXaPnS5Sr+HVR90="; }; - cargoHash = "sha256-vN62QmCuhu7AjL6xSpBU6/ul4WgNLZbjWDCFyHj6rIM="; + useFetchCargoVendor = true; + cargoHash = "sha256-7rqfJ3l4qdVcmfMZgZpL8qomnytiOSqWtFFZFeB047I="; # Devendor gettext in the gettext-sys crate. The paths to the bin/lib/include folders have to be specified because # setting `GETTEXT_SYSTEM` only works on some platforms (i.e., not Darwin). diff --git a/pkgs/by-name/ca/cargo-info/package.nix b/pkgs/by-name/ca/cargo-info/package.nix index 2cb797cb2a32..a9f2a69a3a1d 100644 --- a/pkgs/by-name/ca/cargo-info/package.nix +++ b/pkgs/by-name/ca/cargo-info/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MrkYGUd1jsAqIVYWe7YDZaq7NPv/mHQqLS7GFrYYIo8="; }; - cargoHash = "sha256-yxftWLGIFt4QO1XKXpBcKnTEiL0x9RKGRCMEO/H1PEU="; + useFetchCargoVendor = true; + cargoHash = "sha256-C8BIgJeUPvFzf0LTBMZ3oyE0eWh5HH6aobhUAHBxxKU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix index a70f6b4e4585..5106c9d5ec0a 100644 --- a/pkgs/by-name/ca/cargo-insta/package.nix +++ b/pkgs/by-name/ca/cargo-insta/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eau5h75oZpxufTrf0fLHfr+3TIOFXB/kSgHX+o2GtiE="; }; - cargoHash = "sha256-OqM8SERSWHtbvW6SZfM7lOrQZu66uzsv5wiD3Iqaf3s="; + useFetchCargoVendor = true; + cargoHash = "sha256-bRxtkuNtCelcYJkWPMl8xkMuGcbGCxvdz5cCzPUk44k="; checkFlags = [ # Depends on `rustfmt` and does not matter for packaging. diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index 5979fbfc84e5..347cdd79e235 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vgYr6mMS2O4/102R+6iCW9IBziM1tIav569d36iIbl8="; }; - cargoHash = "sha256-Q3+tOpvzDqIn2M6Zrm1xK6TeTV4zrxK0PYgcIsEBIhE="; + useFetchCargoVendor = true; + cargoHash = "sha256-pKf6CN+AgcWLZzTRoupSJFD5s97mIimgWU9IhqQmpVo="; buildInputs = optionals isDarwin [ SystemConfiguration diff --git a/pkgs/by-name/ca/cargo-license/package.nix b/pkgs/by-name/ca/cargo-license/package.nix index 6fdbead5c0a3..cbdec8edaff9 100644 --- a/pkgs/by-name/ca/cargo-license/package.nix +++ b/pkgs/by-name/ca/cargo-license/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qwyWj0vPWQOZYib2ZZutX25a4wwnG1kFAiRCWqGyVms="; }; - cargoHash = "sha256-ifw/n7eejUWUqhieDLojuO3xgosn28NnjAKkq/ZSLEI="; + useFetchCargoVendor = true; + cargoHash = "sha256-6UMmYbLgMg+wLDsL63f5OvWbtHtDXo0mByz6OZp1lsw="; meta = with lib; { description = "Cargo subcommand to see license of dependencies"; diff --git a/pkgs/by-name/ca/cargo-limit/package.nix b/pkgs/by-name/ca/cargo-limit/package.nix index 5a05c6154755..b977ddefb39e 100644 --- a/pkgs/by-name/ca/cargo-limit/package.nix +++ b/pkgs/by-name/ca/cargo-limit/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk="; }; - cargoHash = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik="; + useFetchCargoVendor = true; + cargoHash = "sha256-+qXw4svnftjVL7STl1mPfJiYQQkmitHsNm1JT+0HSEk="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index 68721800f1fd..a2fc16b7021f 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -62,7 +62,8 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoHash = "sha256-kYKQ7ddgoSvarF0HG/yESu5cU87DUgYm9tDkem5a/gw="; + useFetchCargoVendor = true; + cargoHash = "sha256-Sr56iu51WjVi8qCqSRjix/e6NNvRmqIvAOlgSArF48I="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix index abecfad449aa..d732aee63845 100644 --- a/pkgs/by-name/ca/cargo-llvm-lines/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qKdxnISussiyp1ylahS7qOdMfOGwJnlbWrgEHf/L2y0="; }; - cargoHash = "sha256-IDFCzTAlC/ZYGwUSmmxyRmZy5belxvyfeWpTCPzJQ6o="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ppuc6Dx3Y4JJ8doEJPCbwnD1+dQSLRuPdWfab+3q2Ug="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix index 97ea6ccf8346..33851806f7ea 100644 --- a/pkgs/by-name/ca/cargo-local-registry/package.nix +++ b/pkgs/by-name/ca/cargo-local-registry/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hG6OSi0I7Y6KZacGR9MCC+e7YcDcvaVfR3LSOjqz23A="; }; - cargoHash = "sha256-lTtxCRK4J3dQ6fwjOwYvKa0ykr28guAwVN/J8pfLn9s="; + useFetchCargoVendor = true; + cargoHash = "sha256-YJWUur+Ydb3a8vmx4TL5rIsMisjnKb0m+a9O/zeTnC4="; nativeBuildInputs = [ curl diff --git a/pkgs/by-name/ca/cargo-lock/package.nix b/pkgs/by-name/ca/cargo-lock/package.nix index 8c1b74ccabc7..949d6ecfd317 100644 --- a/pkgs/by-name/ca/cargo-lock/package.nix +++ b/pkgs/by-name/ca/cargo-lock/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Ui/Z4syhSxemV1R815R+yytDwN2YJBcHGscUYUp/0zE="; }; - cargoHash = "sha256-5Hg0y723wjV13rdEExK2II7EPpzAR29ZCqVgOeuJpO0="; + useFetchCargoVendor = true; + cargoHash = "sha256-WdIKTTP5Z+rSq97BSdsx9Hqc46jEF0XjgeZ23BDSeRk="; buildFeatures = [ "cli" ]; diff --git a/pkgs/by-name/ca/cargo-machete/package.nix b/pkgs/by-name/ca/cargo-machete/package.nix index b595fd71550d..cdb71bf7e3d1 100644 --- a/pkgs/by-name/ca/cargo-machete/package.nix +++ b/pkgs/by-name/ca/cargo-machete/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qOWa2Q7B073b5UssRnUkk24+PkIzl+czWGCcORUc55w="; }; - cargoHash = "sha256-q5oC2leWjsCFrwJ9ITeEjxtnnvfDrGyyKNR4kAXBQ6Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-BD7GrVlfMNIqnR/4ncvwKwEu65sFh1jXaeAPTNJF7cw="; # tests require internet access doCheck = false; diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix index 4c9f177700a4..dd75cddd3f4f 100644 --- a/pkgs/by-name/ca/cargo-make/package.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yYZasrnfxpLf0z6GndLYhkIFfVNjTkx4zdfHYX6WyXk="; }; - cargoHash = "sha256-X4FhUqhf58wbl3A8nlXAqnYkkaXajxxqRyJn5K7BVqM="; + useFetchCargoVendor = true; + cargoHash = "sha256-DtNSP/S41wj4lfd8yE3t8dJOf0yX+ifuj+L6pB53yR8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix index 7907f9a5a16e..ad17ac53b517 100644 --- a/pkgs/by-name/ca/cargo-mobile2/package.nix +++ b/pkgs/by-name/ca/cargo-mobile2/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage { # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-vmoR5pA8CNf4eZpQgj0Wn1/FmId4hmpSi7FYxBY5O9M="; + useFetchCargoVendor = true; + cargoHash = "sha256-ay3mB3FahVCx43ZnLSRwk9QR8R7KROCZSf+zfVqQKTY="; preBuild = '' mkdir -p $out/share/ diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix index 2084275ec1ba..d96388b2d724 100644 --- a/pkgs/by-name/ca/cargo-modules/package.nix +++ b/pkgs/by-name/ca/cargo-modules/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-QVG/N+t6fify6I9uvLAqWLagmEnhd5i5Iz9HWdysmzk="; }; - cargoHash = "sha256-9SzM9jkAcnRctNedImoH+32hVAtPAkXLzxgmOo3Dcxc="; + useFetchCargoVendor = true; + cargoHash = "sha256-cML7wrKNSvV9hHCa47e9p7I4J/sYdF1GSLeVPKpCzb0="; checkFlags = [ "--skip=cfg_test::with_tests::smoke" diff --git a/pkgs/by-name/ca/cargo-mommy/package.nix b/pkgs/by-name/ca/cargo-mommy/package.nix index ca9e2e93f665..c257f8d67a9c 100644 --- a/pkgs/by-name/ca/cargo-mommy/package.nix +++ b/pkgs/by-name/ca/cargo-mommy/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2WR6xUYL/bLgZlI4ADbPAtdLq0y4MoVP8Loxdu/58Wc="; }; - cargoHash = "sha256-iQt6eTCcpzhFnrDkUmT4x7JX+Z7fWdW5ovbB/9Ui7Sw="; + useFetchCargoVendor = true; + cargoHash = "sha256-B0hPxw/8T5x6E0dwPIHoPChLx4K2ORvPEUDYHncZrPE="; meta = with lib; { description = "Cargo wrapper that encourages you after running commands"; diff --git a/pkgs/by-name/ca/cargo-msrv/package.nix b/pkgs/by-name/ca/cargo-msrv/package.nix index 4cd3c6b098fd..e15af37e47c0 100644 --- a/pkgs/by-name/ca/cargo-msrv/package.nix +++ b/pkgs/by-name/ca/cargo-msrv/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-cRdnx9K+EkVEKtPxQk+gXK6nkgkpWhpYij/5e7pFzMU="; }; - cargoHash = "sha256-Hs/bdDpJFQ0w+Ds2L5at06Sw3F+5bXu5HU798gR9/9Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-D35koQEqHsmXIBgXRCyI8Wyo2OVSuTFCjgm/JjO4VDo="; passthru = { updateScript = gitUpdater { diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix index d6b19f65452d..04ffbf2ff0d6 100644 --- a/pkgs/by-name/ca/cargo-mutants/package.nix +++ b/pkgs/by-name/ca/cargo-mutants/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JwRMXFXYXPg/grFqeGIcWpDPI5/wFIldx4ORE8ODyk8="; }; - cargoHash = "sha256-8sAyQ858brL6EFW8gRAPrlpSPW7lYrd4dFOyUDOnIaU="; + useFetchCargoVendor = true; + cargoHash = "sha256-K3O5o69ogkCFs6sjTPLLRq2CmBaH2eeFXBjvvwBBhQE="; # too many tests require internet access doCheck = false; diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index 275fa1d66478..3c204c58fed0 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J+84FZfrbv6jp2T9cYgodLZ+TgIAht+uJSVi5ULDGBU="; }; - cargoHash = "sha256-eq+COE9UWDTHZK6dlNqGuoJMUKCNyP5UpAcpk0qAUJI="; + useFetchCargoVendor = true; + cargoHash = "sha256-qyqhhAitl0u69JYX+qjN8OnTyF17VdjjkbioFyA/W8s="; cargoBuildFlags = [ "-p" "cargo-nextest" ]; cargoTestFlags = [ "-p" "cargo-nextest" ]; diff --git a/pkgs/by-name/ca/cargo-pgo/package.nix b/pkgs/by-name/ca/cargo-pgo/package.nix index 8ababffbe753..ebc211db6d0b 100644 --- a/pkgs/by-name/ca/cargo-pgo/package.nix +++ b/pkgs/by-name/ca/cargo-pgo/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yt9QAgpu667JkdNS7OiB/wB9BLXXpis0ZhWjYuETteU="; }; - cargoHash = "sha256-T49RfBInMZeTPT7HhZIwhfK48ORKDD14fcShC6lFApI="; + useFetchCargoVendor = true; + cargoHash = "sha256-IZcZqonOtpONjVt8NkwdEfSqPVjtjEV52cqclCnogN0="; # Integration tests do not run in Nix build environment due to needing to # create and build Cargo workspaces. diff --git a/pkgs/by-name/ca/cargo-pio/package.nix b/pkgs/by-name/ca/cargo-pio/package.nix index c5cc84ad31ec..87f61454344d 100644 --- a/pkgs/by-name/ca/cargo-pio/package.nix +++ b/pkgs/by-name/ca/cargo-pio/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YH2CPb3uBlPncd+KkP25xhCVvDB7HDxJuSqWOJ1LT3k="; }; - cargoHash = "sha256-41ZDe7yP4C9JcX5trcDxcqdgZ+SnhDIIq51hM0Viv9w="; + useFetchCargoVendor = true; + cargoHash = "sha256-/WBhgPyd5hR3DBYvV8pd7uZb6FeD3yiDe3wOKtyFRG8="; buildAndTestSubdir = "cargo-pio"; diff --git a/pkgs/by-name/ca/cargo-play/package.nix b/pkgs/by-name/ca/cargo-play/package.nix index 955e84ef6249..d66a00d2e777 100644 --- a/pkgs/by-name/ca/cargo-play/package.nix +++ b/pkgs/by-name/ca/cargo-play/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA="; }; - cargoHash = "sha256-I+keVi0fxUVttMHOGJQWVfIpHEQu/9aTbERa3qiHmnQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-kgdg2GZmFGMua3eYo30tpDTFBKncbaiONJf+ocfMaBk="; # these tests require internet access checkFlags = [ diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix index 8142273039bb..a7732dd110ff 100644 --- a/pkgs/by-name/ca/cargo-public-api/package.nix +++ b/pkgs/by-name/ca/cargo-public-api/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vQhKvL9vRUq7WqtJ25v12DuCzO90bgXLmwu2Mm1jbig="; }; - cargoHash = "sha256-Gm72Hr+bVmNwdFAIsAatTcF9Il6JG2i6dQPu1ZQy46o="; + useFetchCargoVendor = true; + cargoHash = "sha256-oYzHIohBKLj6PE8OJaKy/7RJG0YZZEFiT5xt77ekSDg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-raze/package.nix b/pkgs/by-name/ca/cargo-raze/package.nix index ca381ef562dd..b3e40543ed3f 100644 --- a/pkgs/by-name/ca/cargo-raze/package.nix +++ b/pkgs/by-name/ca/cargo-raze/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage { # See #310673 and #310125 for similar fixes cargoPatches = [ ./rustc-serialize-fix.patch ]; - cargoHash = "sha256-V8FkkWcXrYcDmhbdJztpbd4gBVbtbPY0NHS4pb/z8HM="; + useFetchCargoVendor = true; + cargoHash = "sha256-unx2XGi16aWvw5dceAuReMEMLGcO/JwYpx9Ewvrw3KE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix index c17780fc15ec..c57bc18292b3 100644 --- a/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/pkgs/by-name/ca/cargo-rdme/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-UqPvvqX+QHFiRil2XadiHyO1EMA51IAUGk6cNH3um54="; + useFetchCargoVendor = true; + cargoHash = "sha256-W800jepxDv6OjbcxRKphAnDU2OuBGGGSLELe8gAfTr8="; meta = with lib; { description = "Cargo command to create the README.md from your crate's documentation"; diff --git a/pkgs/by-name/ca/cargo-readme/package.nix b/pkgs/by-name/ca/cargo-readme/package.nix index 4dc684154999..2b5368085705 100644 --- a/pkgs/by-name/ca/cargo-readme/package.nix +++ b/pkgs/by-name/ca/cargo-readme/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs="; }; - cargoHash = "sha256-OEArMqOiT+PZ+zMRt9h0EzeP7ikFuOYR8mFGtm+xCkQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-24D+ZcMGZN175LZNcNW8F5IsStk4au4xB0ZFe95EjPk="; # disable doc tests cargoTestFlags = [ diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index a22a8fff2ccd..d703b0dbef36 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8WmmMyocWivWdVRqhG2VkIdvUe5vuFmxJDAqr5SNv8w="; }; - cargoHash = "sha256-XvE8AZjVoJfo1Zi9FYw3atxIGmG2wx0BRElavTeEJ/o="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZV7tEg1AkqfevHq01WJ1ZNuX+15xyOa1b6C6fiieizQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix index 38f4d6c5d4fc..adae9adde097 100644 --- a/pkgs/by-name/ca/cargo-risczero/package.nix +++ b/pkgs/by-name/ca/cargo-risczero/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { RECURSION_SRC_PATH = src-recursion; }; - cargoHash = "sha256-pNgnUtKn2w5rWbgDi0MHZCm9nYPgESL3g7EMaYwoSq4="; + useFetchCargoVendor = true; + cargoHash = "sha256-r2bs1MT2jBK4ATUKyRGLEAFCHNaGnnQ4jbQOKbQbldY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-rr/package.nix b/pkgs/by-name/ca/cargo-rr/package.nix index c49c4f3759b2..12e44e778b0e 100644 --- a/pkgs/by-name/ca/cargo-rr/package.nix +++ b/pkgs/by-name/ca/cargo-rr/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo="; }; - cargoHash = "sha256-P4r4XRolORdSGAsNg5RutZ2VVRR8rAfiBZNm+vIH3aM="; + useFetchCargoVendor = true; + cargoHash = "sha256-s3KZFntAb/q4oreJLDQ2Pnz+Oj8Ik36vYR2InY0BIBw="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-run-bin/package.nix b/pkgs/by-name/ca/cargo-run-bin/package.nix index df868de9952b..1e1218aa0957 100644 --- a/pkgs/by-name/ca/cargo-run-bin/package.nix +++ b/pkgs/by-name/ca/cargo-run-bin/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-79DJ6j2sai1dTdcXf0qD97TCNZuGRSUobLGahoApMss="; }; - cargoHash = "sha256-6ub82+1DJqPjxNuEuk1YwdL6auCtWZK3L09xQlgific="; + useFetchCargoVendor = true; + cargoHash = "sha256-UTdJQ/lnsYa85/xXkmgI/ByzKu3+DB3riQKGCVjF3to="; # multiple impurities in tests doCheck = false; diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix index f9bf755ec48c..2105a2fcdec3 100644 --- a/pkgs/by-name/ca/cargo-semver-checks/package.nix +++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IcKjiKFvkFvu8+LFCAmm39AGUaUdK8zhtNzzSb8VPE0="; }; - cargoHash = "sha256-QfJ7QnGKmbrGDwYtVyAJNNGoAukD97/tmCwAROvWBIg="; + useFetchCargoVendor = true; + cargoHash = "sha256-/o5Q0K1vYmj7WB6ahYm+urE7PRv6n4difi/poTXO0z8="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index da227d0b48cd..9b54021b8dbb 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-T05BSeVF67T7F6GMwsGDOYyiuz//0aTstTlGoOZndRM="; }; - cargoHash = "sha256-iV2hV57zuqnsDX0krtAADGvFo3YSCkiEm6+dNAz3W08="; + useFetchCargoVendor = true; + cargoHash = "sha256-qCTZeMFTnoD1S2jFLZvSZ2mwix6KoPsLREq5JrrdMEk="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix index e95d1ed9ef07..c29b00755de2 100644 --- a/pkgs/by-name/ca/cargo-show-asm/package.nix +++ b/pkgs/by-name/ca/cargo-show-asm/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MiODtrEE/arK5SiSs/YuFWBkSQkSUrPqUZcjFd+HNbg="; }; - cargoHash = "sha256-VUqANn4ykAYB4+7h3lHY2UvqduHJPd3P29wsxLpPXFg="; + useFetchCargoVendor = true; + cargoHash = "sha256-8PxjPjb/ewLIK/bS6IYy/NBJQZirXWKSiz2c/lzg8zU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ca/cargo-sort/package.nix b/pkgs/by-name/ca/cargo-sort/package.nix index 41aa18ab9de1..18f8cebb75e2 100644 --- a/pkgs/by-name/ca/cargo-sort/package.nix +++ b/pkgs/by-name/ca/cargo-sort/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-AUtue1xkhrhlF7PtqsCQ9rdhV0/0i85DWrp7YL9SAYk="; }; - cargoHash = "sha256-y6lLwk40hmFQKDU7sYz3+QQzdn5eGoEX7izmloK22dg="; + useFetchCargoVendor = true; + cargoHash = "sha256-yNHVhnJiawUrWncrIC8cAS25OYIZX7wVM9zMaupfTKM="; meta = with lib; { description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically"; diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix index c79eefb5086a..0a0e6ec2ffd6 100644 --- a/pkgs/by-name/ca/cargo-spellcheck/package.nix +++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NrtPV2bd9BuA1nnniIcth85gJQmFGy9LHdajqmW8j4Q="; }; - cargoHash = "sha256-mxx4G77ldPfVorNa1LGTcA0Idwmrcl8S/ze+UUoLHhI="; + useFetchCargoVendor = true; + cargoHash = "sha256-1bOEOZ1byVm9apCqR9zgESsgA9Z9TdFSondwzwOPfWI="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/ca/cargo-supply-chain/package.nix b/pkgs/by-name/ca/cargo-supply-chain/package.nix index 92d978d45f22..95431b78947f 100644 --- a/pkgs/by-name/ca/cargo-supply-chain/package.nix +++ b/pkgs/by-name/ca/cargo-supply-chain/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KjeYB9TFbuJ2KPaObeM0ADs5F8uJJ6/czMPQjBUgIk8="; }; - cargoHash = "sha256-Fx1C4X0dQqePqLa+X+4ZDrIMFKBQ6J50nBApYXcGbFM="; + useFetchCargoVendor = true; + cargoHash = "sha256-fsW3qTyFMcj/OTouOah1ZFskw075V8jBwhs02AxY7kU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ca/cargo-sweep/package.nix b/pkgs/by-name/ca/cargo-sweep/package.nix index 98b23c9d0e70..2f1950357504 100644 --- a/pkgs/by-name/ca/cargo-sweep/package.nix +++ b/pkgs/by-name/ca/cargo-sweep/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc="; }; - cargoHash = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro="; + useFetchCargoVendor = true; + cargoHash = "sha256-FCpCGp2WUTKTjvUewcOqLoNPlZDnOa4TsamSQNU1xxU="; checkFlags = [ # Requires a rustup toolchain to be installed. diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix index faef07415d80..a2ebd230797f 100644 --- a/pkgs/by-name/ca/cargo-swift/package.nix +++ b/pkgs/by-name/ca/cargo-swift/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T8cIZJwnA3bFMIEezMrh5LRXV1SRCAVLanQm7rmc0sU="; }; - cargoHash = "sha256-qm1xSmCOF/ZHhwbCaB0Df+Rcvrh2imMPSCS1Hxl0TaI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Zl5y2pHQIcLU5EDtmxsAv+/0n4DZ/qXwN4Prmm8Nd34="; meta = with lib; { description = "Cargo plugin to easily build Swift packages from Rust code"; diff --git a/pkgs/by-name/ca/cargo-sync-readme/package.nix b/pkgs/by-name/ca/cargo-sync-readme/package.nix index b705a61fb29d..13d89fb95ac0 100644 --- a/pkgs/by-name/ca/cargo-sync-readme/package.nix +++ b/pkgs/by-name/ca/cargo-sync-readme/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo="; }; - cargoHash = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c="; + useFetchCargoVendor = true; + cargoHash = "sha256-A1LZKENNOcgUz6eacUo9WCKIZWA7dJa0zuZrgzRr/Js="; meta = with lib; { description = "Cargo plugin that generates a Markdown section in your README based on your Rust documentation"; diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index 57a9cc9ff5ad..d6588dbedf31 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0f+23kQZzmUeAjettZ3iRTATiv73sGpI13TzZFTU150="; }; - cargoHash = "sha256-o4S13uvKYLUUmx6tHQpCm7U9AOtmg8P60NxdNsXy9Fc="; + useFetchCargoVendor = true; + cargoHash = "sha256-6wMkRLF3Hn6zu8UM629RoUY83wmSEYaYX5EMb9xBveQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix index c1381e0920f6..816b000c9432 100644 --- a/pkgs/by-name/ca/cargo-temp/package.nix +++ b/pkgs/by-name/ca/cargo-temp/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fy4bG+UoN/51hiveYecl3ciJPV1g8/fC2dTFnUJZqAY="; }; - cargoHash = "sha256-st8BLru9hp1qi784Zm4yVB8AJQfowF36201Yw8uQQ2k="; + useFetchCargoVendor = true; + cargoHash = "sha256-E7msh553ijldpVI2OJ6PL0Wp+Z4eLbv8Oexl7NtBdYc="; meta = with lib; { description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/pkgs/by-name/ca/cargo-toml-lint/package.nix b/pkgs/by-name/ca/cargo-toml-lint/package.nix index b518051e8e85..19b9758d1eee 100644 --- a/pkgs/by-name/ca/cargo-toml-lint/package.nix +++ b/pkgs/by-name/ca/cargo-toml-lint/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-U3y9gnFvkqJmyFqRAUQorJQY0iRzAE9UUXzFmgZIyaM="; }; - cargoHash = "sha256-ujdekIucqes2Wya4jwTMLstb8JMptbAlqYhgMxfp2gg="; + useFetchCargoVendor = true; + cargoHash = "sha256-ymf91oCLOY5vo1pncCT83j3k8wyLEwAl3/8lnAyPdzI="; meta = with lib; { description = "Simple linter for Cargo.toml manifests"; diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix index 40e30350f5e7..60d3394df4e6 100644 --- a/pkgs/by-name/ca/cargo-typify/package.nix +++ b/pkgs/by-name/ca/cargo-typify/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vokhWIY5iikTyADrqxp6DIq+tJ+xdFPebDFTddJnstA="; }; - cargoHash = "sha256-etlZqhtRCcCBeMC4lq6BjTD4TQyWEwJf1bLKjoIDR70="; + useFetchCargoVendor = true; + cargoHash = "sha256-1qxWFyA9xCnyDES27uj7gDc5Nf6qdikNkpuf/DP/NAU="; nativeBuildInputs = [ rustfmt diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix index f94d6478e704..65a41aa8ca91 100644 --- a/pkgs/by-name/ca/cargo-ui/package.nix +++ b/pkgs/by-name/ca/cargo-ui/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-M/ljgtTHMSc7rY/a8CpKGNuOSdVDwRt6+tzPPHdpKOw="; }; - cargoHash = "sha256-u3YqXQZCfveSBjxdWb+GC0IA9bpruAYQdxX1zanT3fw="; + useFetchCargoVendor = true; + cargoHash = "sha256-odcyKOveYCWQ35uh//s19Jtq7OqiUnkeqbh90VWHp9A="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-unfmt/package.nix b/pkgs/by-name/ca/cargo-unfmt/package.nix index e8163bb02488..3e03f18cc6a6 100644 --- a/pkgs/by-name/ca/cargo-unfmt/package.nix +++ b/pkgs/by-name/ca/cargo-unfmt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-nvn4nZkkNQQvzShwoxtFqHeyhXQPm2GJoTKBI+MkFgM="; }; - cargoHash = "sha256-mMeHTYCUIZR3jVvTxfyH4I9wGfUdCWcyn9djnksAY8k="; + useFetchCargoVendor = true; + cargoHash = "sha256-23mroUZFF4tPV92NhPlauGgTwLXsoxtE+Paqj5zsp7Q="; # Doc tests are broken on 0.3.3 doCheck = false; diff --git a/pkgs/by-name/ca/cargo-unused-features/package.nix b/pkgs/by-name/ca/cargo-unused-features/package.nix index a5d457c20eb7..c669ab159ed6 100644 --- a/pkgs/by-name/ca/cargo-unused-features/package.nix +++ b/pkgs/by-name/ca/cargo-unused-features/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gdwIbbQDw/DgBV9zY2Rk/oWjPv1SS/+oFnocsMo2Axo="; }; - cargoHash = "sha256-K9I7Eg43BS2SKq5zZ3eZrMkmuHAx09OX240sH0eGs+k="; + useFetchCargoVendor = true; + cargoHash = "sha256-IiS4d6knNKqoUkt0sRSJ+vNluqllS3mTsnphrafugIo="; nativeBuildInputs = [ curl.dev diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index 2b30adb1c6c8..42afbf23a748 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jLv/9Fvg+1HNIhfm0D/vvMR9J+Enztj9rXQE1kZITGI="; }; - cargoHash = "sha256-rwXpQkL6ysMBraLIMk2zQe0vmb9uuePWufBjRVzaBOA="; + useFetchCargoVendor = true; + cargoHash = "sha256-uoLs1CMNI0N0MpjTdpxDFubg6dgK57DVrxltF4HvG1k="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/cargo-v5/package.nix b/pkgs/by-name/ca/cargo-v5/package.nix index 59f5b3003e9b..942a5912a72e 100644 --- a/pkgs/by-name/ca/cargo-v5/package.nix +++ b/pkgs/by-name/ca/cargo-v5/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-bXzJvlhG/IJOu+D1iluJD3wDoiJXWzXYJ+ZUG6xMCeA="; }; - cargoHash = "sha256-OQ3XY8RzmjGZWFyTY3HY9AYb8qDHHeEAuWa+3WNOtRM="; + useFetchCargoVendor = true; + cargoHash = "sha256-nOcwHy+aji1LgR/VBZDRFDgM+b2ScpVE+H3W5HKEM5o="; buildFeatures = [ "full" ]; diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix index 3ac7053fd4c6..cadb8bc4cc51 100644 --- a/pkgs/by-name/ca/cargo-valgrind/package.nix +++ b/pkgs/by-name/ca/cargo-valgrind/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-yUCDKklkfK+2n+THH4QlHb+FpeWfObXpmp4VozsFiUM="; }; - cargoHash = "sha256-6vcTsernIVkemGhMBT9LMTsBsJ4u1Sd12BgIp4Zn3vg="; + useFetchCargoVendor = true; + cargoHash = "sha256-nTqdsi+5YmOzQ5DPn3jOfUXUUut9uo5xKyx/R2MjV1A="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-vibe/package.nix b/pkgs/by-name/ca/cargo-vibe/package.nix index 761e33f5caca..1c7ac2d9f2f7 100644 --- a/pkgs/by-name/ca/cargo-vibe/package.nix +++ b/pkgs/by-name/ca/cargo-vibe/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { rev = "a54d87b080ff7d8b3207f83f8f434b226572f0fe"; hash = "sha256-0IwxbMcRH+6WgrzpcU5zfRuKs80XY0mDBjDE9DBnOFk="; }; - cargoHash = "sha256-mvFp1yPHl+2K2K44G3KAmvPYsalN25kkE3V/2eq2iqs="; + useFetchCargoVendor = true; + cargoHash = "sha256-qQLBq3jV3Ii/8KDTNRPi0r2KnJDtFIJURNx9zTsGDMQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-wasi/package.nix b/pkgs/by-name/ca/cargo-wasi/package.nix index 2bbdfdeb40a5..ce9289c1a8cf 100644 --- a/pkgs/by-name/ca/cargo-wasi/package.nix +++ b/pkgs/by-name/ca/cargo-wasi/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fmQ23BtcBUPNcgZgvNq85iqdY6WRUhqwAp4aIobqMIw="; }; - cargoHash = "sha256-yXtxznUp2gECq2CvRByiFzbTjYtWvTheDjGoynJWb+o="; + useFetchCargoVendor = true; + cargoHash = "sha256-GTpFgoKtAH06xBJ5X6w37ApTVjBLX7S4asWOB4/mN4g="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-wipe/package.nix b/pkgs/by-name/ca/cargo-wipe/package.nix index 331cc9e18e60..fe6a8704c5c9 100644 --- a/pkgs/by-name/ca/cargo-wipe/package.nix +++ b/pkgs/by-name/ca/cargo-wipe/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xMYpZ6a8HdULblkfEqnqLjX8OVFJWx8MHDGNhuFzdTc="; }; - cargoHash = "sha256-/cne7uTGyxgTRONWMEE5dPbPDnCxf+ZnYzYXRAeHJyQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-6Od0xP0Sp3839WbvN0VVAIsY8I1LAsR62yzXtcCSXQY="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-wizard/package.nix b/pkgs/by-name/ca/cargo-wizard/package.nix index 6313415d9724..1096c2324439 100644 --- a/pkgs/by-name/ca/cargo-wizard/package.nix +++ b/pkgs/by-name/ca/cargo-wizard/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oFPSgjXZ+Kq59tV/7s6WPF6FHXENoZv8D245yyT0E9E="; }; - cargoHash = "sha256-wUMdWGUJR9dJ4XRlDFAvHwxCzLSb3WdRhrXt0kr2+Fc="; + useFetchCargoVendor = true; + cargoHash = "sha256-ClulQP+1/RLvOWWB3uKTCn2Sx3+TO25qRs456DWHKu0="; preCheck = '' export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType diff --git a/pkgs/by-name/ca/cargo-workspaces/package.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix index 3daa583e85f3..219553af4b60 100644 --- a/pkgs/by-name/ca/cargo-workspaces/package.nix +++ b/pkgs/by-name/ca/cargo-workspaces/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JqLKFVM/EnVAPF7erINpHdaaDG+g2nbB0iE/hB1gml8="; }; - cargoHash = "sha256-wFf6M99IJAZ7YlPBKUZA2mgAS/LNB128GIjDHxr4pMo="; + useFetchCargoVendor = true; + cargoHash = "sha256-EfTcbgvOQ2KgUpu4+QBUVTaz/ToH9FuMHlXMpJN1BK4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-xbuild/package.nix b/pkgs/by-name/ca/cargo-xbuild/package.nix index dec26b666cd7..973edf44d469 100644 --- a/pkgs/by-name/ca/cargo-xbuild/package.nix +++ b/pkgs/by-name/ca/cargo-xbuild/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-29rCjmzxxIjR5nBN2J3xxP+r8NnPIJV90FkSQQEBbo4="; }; - cargoHash = "sha256-tyPhKWDSDNxQy+vpWNS5VP5D8TkUR7MJSAlG8wZsDy4="; + useFetchCargoVendor = true; + cargoHash = "sha256-8ceL4Ntb+P+BvLqlnSxKcyZREckyWAKDhxR6prjaxHM="; meta = with lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 58a5aee9e936..5cdbbea67be7 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bzyEIBOa0yqjAYjWGw4Fbb8Cv3yCCfJ4vV0q600Rwyk="; }; - cargoHash = "sha256-uAQD1SUo8W5TtnZyprOFGztpOqvjPEDddA6CBPUN74g="; + useFetchCargoVendor = true; + cargoHash = "sha256-8V5F0uhuJlc2uJtebQoHJT/qRZPCT2gXjwpRFbzUezk="; meta = with lib; { description = "Cross compile Cargo project to Windows MSVC target with ease"; diff --git a/pkgs/by-name/ca/cargo2junit/package.nix b/pkgs/by-name/ca/cargo2junit/package.nix index f2aac9a19180..b10833d7f7b2 100644 --- a/pkgs/by-name/ca/cargo2junit/package.nix +++ b/pkgs/by-name/ca/cargo2junit/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { ./0001-update-time-rs.patch ]; - cargoHash = "sha256-ncRELlbT8Dy8huLgZrroRWohCLeN5cRjMWrIW4JNcCM="; + useFetchCargoVendor = true; + cargoHash = "sha256-FPCLy4mIuUeHMuYgYGTs/fn8tUf55LVWBwrrA5hiG2k="; meta = with lib; { description = "Converts cargo's json output (from stdin) to JUnit XML (to stdout)"; diff --git a/pkgs/by-name/ca/cargonode/package.nix b/pkgs/by-name/ca/cargonode/package.nix index f40f4401deff..b69be19d552f 100644 --- a/pkgs/by-name/ca/cargonode/package.nix +++ b/pkgs/by-name/ca/cargonode/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O5+wAM99m1rgQpwz36mkHEU/FvGnY6hBCKPMIGXCeCU="; }; - cargoHash = "sha256-ZmWpqASh//iCg8blpbso3fhhqJzeOmxLXA1zyUobmwU="; + useFetchCargoVendor = true; + cargoHash = "sha256-dYOdnyKdzL93kuSTUb+1vRqfDgkZLymaEZo9FUrR1JI="; checkFlags = [ # Skip test that requires network access diff --git a/pkgs/by-name/ca/carl/package.nix b/pkgs/by-name/ca/carl/package.nix index 2edda72c7951..c0e5ead27701 100644 --- a/pkgs/by-name/ca/carl/package.nix +++ b/pkgs/by-name/ca/carl/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { doCheck = false; - cargoHash = "sha256-nBl34szwEQX26MibfT10E55czYXN3/9W3y2z936KqTc="; + useFetchCargoVendor = true; + cargoHash = "sha256-kzHMjrLCiiMLMTSozKq5jMWq3rGb+xsXhZoOuod7qGE="; meta = { description = "cal(1) with more features and written in rust"; diff --git a/pkgs/by-name/ca/castor/package.nix b/pkgs/by-name/ca/castor/package.nix index 2acd9a42e435..6b7ac5ca9cb9 100644 --- a/pkgs/by-name/ca/castor/package.nix +++ b/pkgs/by-name/ca/castor/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-yYLDbxmUR86fdpbHQQTiHVUbicnOD75cl3Vhofw5qr0="; }; - cargoHash = "sha256-AHhKfy2AAcDBcknzNb8DAzm51RQqFQDuWN+Hp5731Yk="; + useFetchCargoVendor = true; + cargoHash = "sha256-6X3qZZ1iKXYtl59aGAnd4RzY/kBI4Q8zmX+JYMlKwJU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/catppuccin-catwalk/package.nix b/pkgs/by-name/ca/catppuccin-catwalk/package.nix index 676345b0b528..d27b15eb52e5 100644 --- a/pkgs/by-name/ca/catppuccin-catwalk/package.nix +++ b/pkgs/by-name/ca/catppuccin-catwalk/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Yj9xTQJ0eu3Ymi2R9fgYwBJO0V+4bN4MOxXCJGQ8NjU="; }; - cargoHash = "sha256-bx7AvzPoMJqPa+zcn139lH2zyF09EIz7FNHnh1g8wis="; + useFetchCargoVendor = true; + cargoHash = "sha256-stO8ejSC4UeEeMZZLIJ8Wabn7A6ZrWQlU5cZDSm2AVc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/pkgs/by-name/ca/catppuccin-whiskers/package.nix index 7838d626885a..f98af0a263a7 100644 --- a/pkgs/by-name/ca/catppuccin-whiskers/package.nix +++ b/pkgs/by-name/ca/catppuccin-whiskers/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-OLEXy9MCrPQu1KWICsYhe/ayVqxkYIFwyJoJhgiNDz4="; }; - cargoHash = "sha256-5FvW+ioeDi0kofDswyQpUC21wbEZM8TAeUEUemnNfnA="; + useFetchCargoVendor = true; + cargoHash = "sha256-CVg7kcOTRa8KfDwiJHQhTPQfK6g3jOMa4h/BCUo3ehw="; meta = { homepage = "https://github.com/catppuccin/whiskers"; diff --git a/pkgs/by-name/ca/cauwugo/package.nix b/pkgs/by-name/ca/cauwugo/package.nix index 45902062bc14..84689615aa40 100644 --- a/pkgs/by-name/ca/cauwugo/package.nix +++ b/pkgs/by-name/ca/cauwugo/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9gWUu2qbscKlbWZlRbOn+rrmizegkHxPnwnAmpaV1Ww="; }; - cargoHash = "sha256-dXlSBb3ey3dAiifrQ9Bbhscnm1QmcChiQbX1ic069V4="; + useFetchCargoVendor = true; + cargoHash = "sha256-05wx0lqgMIVTe6OQTCUQXmaPeGPw43wuEuuGUsGV4VM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cb/cbfmt/package.nix b/pkgs/by-name/cb/cbfmt/package.nix index 9f803cfbfd83..aae2dd2e1f8d 100644 --- a/pkgs/by-name/cb/cbfmt/package.nix +++ b/pkgs/by-name/cb/cbfmt/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/ZvL1ZHXcmE1n+hHvJeSqmnI9nSHJ+zM9lLNx0VQfIE="; }; - cargoHash = "sha256-6oZCpjQ8t/QLFhEtF7td8KGI/kFE04pg7OELutsrJKo="; + useFetchCargoVendor = true; + cargoHash = "sha256-C1FpwC1JsKOkS59xAcwqpmZ2g7rr+HHRdADURLs+9co="; passthru.tests.version = testers.testVersion { package = cbfmt; diff --git a/pkgs/by-name/cd/cdwe/package.nix b/pkgs/by-name/cd/cdwe/package.nix index 72d3479d4512..39c8935faedc 100644 --- a/pkgs/by-name/cd/cdwe/package.nix +++ b/pkgs/by-name/cd/cdwe/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6NWhx82BXhWhbI18k5gE3vEkw9v5gstE8ICJhtq68rM="; }; - cargoHash = "sha256-V2eWVoRtfjHLe2AypYekUFzMnuV8RYU9Pb7Q1U3fwp4="; + useFetchCargoVendor = true; + cargoHash = "sha256-pZpG98lwvggBU1TBb2JuSNLev5Jx8n5QjY902dJVn0Y="; meta = with lib; { description = "Configurable cd wrapper that lets you define your environment per directory"; diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix index 2b3e0708ca1b..a63b9e5bbcd5 100644 --- a/pkgs/by-name/ce/cedar/package.nix +++ b/pkgs/by-name/ce/cedar/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-p8idQx3HGO/ikL0pDTPXx5+rD2sRpXANqs/g51BL554="; }; - cargoHash = "sha256-GuXifjQkH8jV9mT3UYU6rUZB1qO5Xl9tvYJW7MjcW0U="; + useFetchCargoVendor = true; + cargoHash = "sha256-puVPSPPpKAlawN4OXrehIdqlJ6gmZxP/tiFzn1V/o4A="; passthru = { tests.version = testers.testVersion { package = cedar; }; diff --git a/pkgs/by-name/ce/celeste/package.nix b/pkgs/by-name/ce/celeste/package.nix index efb0b5458c9f..70597b7a6d16 100644 --- a/pkgs/by-name/ce/celeste/package.nix +++ b/pkgs/by-name/ce/celeste/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Yj2PvAlAkwLaSE27KnzEmiRAD5K/YVGbF4+N3uhDVT8="; }; - cargoHash = "sha256-nlYkFgm5r6nAbJvtrXW2VxzVYq1GrSs8bzHYWOglL1c="; + useFetchCargoVendor = true; + cargoHash = "sha256-OBGDnhpVLOPdYhofWfeaueklt7KBkLhM02JNvuvUQ2Q="; postPatch = '' pushd $cargoDepsCopy/librclone-sys diff --git a/pkgs/by-name/ce/centerpiece/package.nix b/pkgs/by-name/ce/centerpiece/package.nix index 867b4d6ddcb7..7e11eefbca64 100644 --- a/pkgs/by-name/ce/centerpiece/package.nix +++ b/pkgs/by-name/ce/centerpiece/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tZNwMPL1ITWVvoywojsd5j0GIVQt6pOKFLwi7jwqLKg="; }; - cargoHash = "sha256-d5qGuQ8EnIkE/PhI9t4JxtnNbvh3rse9NpowZ+ESZuU="; + useFetchCargoVendor = true; + cargoHash = "sha256-qwKn9NN7+F/S8ojObjWBU2y2wG0TNeYbYHiwou8AhnI="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/by-name/cf/cfonts/package.nix b/pkgs/by-name/cf/cfonts/package.nix index 2ec26c040b69..daea68ca4b49 100644 --- a/pkgs/by-name/cf/cfonts/package.nix +++ b/pkgs/by-name/cf/cfonts/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ixxDlHjx5Bi6Wl/kzJ/R7d+jgTDCAti25TV1RlXRPus="; }; - cargoHash = "sha256-NltvO5ACf8TsE9CgC1jAXx04/T/kHSZLxXJ4zhA5DGo="; + useFetchCargoVendor = true; + cargoHash = "sha256-eJM3CS3I++p6Pk/K8vkD/H/RAmD+eQJ+//It/Jn5dX4="; meta = with lib; { homepage = "https://github.com/dominikwilkowski/cfonts"; diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix index 5ab305fa5072..0bc3502945d4 100644 --- a/pkgs/by-name/cf/cfspeedtest/package.nix +++ b/pkgs/by-name/cf/cfspeedtest/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7FKUP6ZCIGmP/WX6lUwrUT7QEVo/LGJz46ZmqPeRTW8="; }; - cargoHash = "sha256-gckl2WHpuu7Gcubx/VEpHNW7jT76r9QHaAociQh+Zrc="; + useFetchCargoVendor = true; + cargoHash = "sha256-vp6+rdF6YVzeuAkLFnnkQFlc3gxqZn9MDGLIbiMpIwE="; meta = with lib; { description = "Unofficial CLI for speed.cloudflare.com"; diff --git a/pkgs/by-name/ch/checkpwn/package.nix b/pkgs/by-name/ch/checkpwn/package.nix index fa20d0753b49..a5147b3ae705 100644 --- a/pkgs/by-name/ch/checkpwn/package.nix +++ b/pkgs/by-name/ch/checkpwn/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-M0Jb+8rKn4KVuumNSsM6JEbSOoBOFy9mmXiCnUnDgak="; }; - cargoHash = "sha256-G+QWnGf+Zp94EHVnYM3Q/iEhEQMU2O/c4i5ya/dY7K4="; + useFetchCargoVendor = true; + cargoHash = "sha256-8ALu1Ij4o2fdsRWhlWu6rOIfHZjIIC+fHJ07XIbH66s="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ch/cherrybomb/package.nix b/pkgs/by-name/ch/cherrybomb/package.nix index 9ce60696a621..ea40863dd6b6 100644 --- a/pkgs/by-name/ch/cherrybomb/package.nix +++ b/pkgs/by-name/ch/cherrybomb/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MHKBP102U1Ug9wZm9x4+opZgG8f6Hx03FvoLV4qaDgY="; }; - cargoHash = "sha256-pj4+rG8XbrxVuNgnTVUTPmgrPBRSnoBnqFhOO/JGGWI="; + useFetchCargoVendor = true; + cargoHash = "sha256-j9CT2HHFY4ANWKvx8t/jgCc3aOiSEJlq8CHstjSc+O4="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ch/chess-tui/package.nix b/pkgs/by-name/ch/chess-tui/package.nix index 9dee8dd57e3f..e914e3c88cbc 100644 --- a/pkgs/by-name/ch/chess-tui/package.nix +++ b/pkgs/by-name/ch/chess-tui/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LtxaZ/7p/lqStoUmckVVaegQp02Ci3L46fMFEgledj4="; }; - cargoHash = "sha256-RUnT5b9pBcopTPT/1J48xZ4pfn3C0mIuYTDvgf3zvn0="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ydn/y7HF8VppEjkRy3ayibgxpcLc1NiHlR5oLi3D11A="; meta = with lib; { description = "Chess TUI implementation in rust"; diff --git a/pkgs/by-name/ch/chirpstack-concentratord/package.nix b/pkgs/by-name/ch/chirpstack-concentratord/package.nix index 3f80f674047a..1a0e38f1a932 100644 --- a/pkgs/by-name/ch/chirpstack-concentratord/package.nix +++ b/pkgs/by-name/ch/chirpstack-concentratord/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O5QevCYFZEJzZcLM3wh9b+RvbkFwLlvIcFhVbhVDOXU="; }; - cargoHash = "sha256-oRy8yGBRD/PGh+RtY9nk03oV6SRBGucRABwfgJbnuxM="; + useFetchCargoVendor = true; + cargoHash = "sha256-73BYFUbfiOaYtw4G+WNbiCGPR1L59PqGWhqsrOp06QU="; buildInputs = [ libloragw-2g4 diff --git a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix index 791e444c311b..16f2cf22ffa7 100644 --- a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix +++ b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jbu8O1Wag6KpN49VyXsYO8os95ctZjzuxKXoDMLyiKU="; }; - cargoHash = "sha256-1tAZjsjoVKUkrF0WAqxs9d+1w8/AqFGDfpFGAHvf+D0="; + useFetchCargoVendor = true; + cargoHash = "sha256-ks92eXKWWiEIhNhEMMN2VH970u64nBWLGObOda74c0o="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix index 4d15f04c6d89..6c07e39e421a 100644 --- a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix +++ b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Snj5nKyFsq8WJJNw1d8O/YX/dZ/tCTVBw5R8kXJvsa4="; }; - cargoHash = "sha256-7ugrIVT4SYrqPqF0CrLU+/Ep/p9H7/on3hkZ5JzY9AE="; + useFetchCargoVendor = true; + cargoHash = "sha256-ntY0Ze9MlbdRnmzA5AJN4Hjlhv18Iboj83gba8A4xHw="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/ch/choose/package.nix b/pkgs/by-name/ch/choose/package.nix index 179f53ad75b9..1a66ba73c6cc 100644 --- a/pkgs/by-name/ch/choose/package.nix +++ b/pkgs/by-name/ch/choose/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ojmib9yri/Yj1VSwwssbXv+ThnZjUXLTmOpfPGdGFaU="; }; - cargoHash = "sha256-PnY1yk9SvAvpsQ/QzTQuuBmvbEfd3yKcNcTU8LZVhsE="; + useFetchCargoVendor = true; + cargoHash = "sha256-SecWDujJu68K1LMQJQ55LeW51Ag/aCt1YKcdWeRp22c="; meta = with lib; { description = "Human-friendly and fast alternative to cut and (sometimes) awk"; diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 5109a12a6eba..b47901d00e9e 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/src-tauri"; - cargoHash = "sha256-0EIKozFwy7XihFRpjLZ3Am7h1wOU7ZGcHSoTnFnYzTU="; + useFetchCargoVendor = true; + cargoHash = "sha256-79MO2JaOBKVfiE7OLFR3kobnE2yH5g44mRt2TKIEfxA="; postPatch = let diff --git a/pkgs/by-name/ci/circom/package.nix b/pkgs/by-name/ci/circom/package.nix index e1ec6888dae5..fc49d0216e23 100644 --- a/pkgs/by-name/ci/circom/package.nix +++ b/pkgs/by-name/ci/circom/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Vwu2DAWIqzqgo6oXcQxvhn7ssGojQkRRw9sKk7qjREk="; }; - cargoHash = "sha256-Je6wKzmsie0W69epmhHu6J6YeKQe3kYwf+DzFQPe2b8="; + useFetchCargoVendor = true; + cargoHash = "sha256-64mKd3M5EpqWASTPz7cqNbDyh4be7xR4fudjcx029u8="; doCheck = false; meta = with lib; { diff --git a/pkgs/by-name/ci/citron/package.nix b/pkgs/by-name/ci/citron/package.nix index b04f6f2a7fe0..6cd78147595c 100644 --- a/pkgs/by-name/ci/citron/package.nix +++ b/pkgs/by-name/ci/citron/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6wJ4UfiwpV9zFuBR8SYj6eBiRqQitFs7wRe5R51Z3SA="; }; - cargoHash = "sha256-xTmhgE4iHydhZBMrHWqQUcS9KDlZAzW2CmPGpJr40Fw="; + useFetchCargoVendor = true; + cargoHash = "sha256-HEDkNzNCXKmBsI5fL8+UK4SHrU9eLde6Vfh4XhSrK+A="; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/cl/cl-wordle/package.nix b/pkgs/by-name/cl/cl-wordle/package.nix index 1c36860d2122..80ec161a6ad6 100644 --- a/pkgs/by-name/cl/cl-wordle/package.nix +++ b/pkgs/by-name/cl/cl-wordle/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-wFTvzAzboUFQg3fauIwIdRChK7rmLES92jK+8ff1D3s="; }; - cargoHash = "sha256-PtJbLpAUH44alupFY6wX++t/QsKknn5bXvnXzdYsd9o="; + useFetchCargoVendor = true; + cargoHash = "sha256-kkR49UwwkpZhKvBadPTUn0D/4sRVlVJowQ1+BqtBVOs="; meta = with lib; { description = "Wordle TUI in Rust"; diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix index 01a2c1bcfd5e..837185dd651a 100644 --- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix +++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rZnGueaqK7h8tWwwWacvFBvJwE1li2wN9iB4DJRHJ8U="; }; - cargoHash = "sha256-mELx6UGHV+qtL1G3+xvYUaUzZbfMy0dKgai6IqdbT+A="; + useFetchCargoVendor = true; + cargoHash = "sha256-dEOApNGFKoyYkaoJJqYnOxsntmYCfzSgTS2PQldI0oc="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/cl/clapboard/package.nix b/pkgs/by-name/cl/clapboard/package.nix index 7b8948a6bdc8..8a9cd8e3a770 100644 --- a/pkgs/by-name/cl/clapboard/package.nix +++ b/pkgs/by-name/cl/clapboard/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dXlUOIYgptYqUIIC7batc0TVQeP89i8vizwYSIUlzGA="; }; - cargoHash = "sha256-Ll2fpH0v3ZWizrl6Mip0gaPCHlQAdddh9F9bNXveb/0="; + useFetchCargoVendor = true; + cargoHash = "sha256-TcOu+wReDfQl6pbRJjB/mG7VY65pIyyvSBxbj6RhNlU="; meta = with lib; { description = "Wayland clipboard manager that will make you clap"; diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix index 5a6ae5cb1507..e1bd2d3d888a 100644 --- a/pkgs/by-name/cl/click/package.nix +++ b/pkgs/by-name/cl/click/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tYSbyDipZg6Qj/CWk1QVUT5AG8ncTt+5V1+ekpmsKXA="; }; - cargoHash = "sha256-fcJTxZX9mdF4oFl/Cn1egczRy+yhWt2zLKsdLKz6Q+s="; + useFetchCargoVendor = true; + cargoHash = "sha256-K9+SGpWcsOy0l8uj1z6AQggZq+M7wHARACFxsZ6vbUo="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/by-name/cl/clima/package.nix b/pkgs/by-name/cl/clima/package.nix index 6b41f6deda37..1e73159f8062 100644 --- a/pkgs/by-name/cl/clima/package.nix +++ b/pkgs/by-name/cl/clima/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CRnAxhkuCTyHR4uQofA51Dm3+YKqm3iwBkFNkbLTv1A="; }; - cargoHash = "sha256-jKY+Ta6lqMBUlqSViKk3W0CiO8oU+ucmleKDYRA54HQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-3BNDo5ksra1d8X6yQZYSlS2CSiZfkuTHkQtIC2ckbKE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/cl/clini/package.nix b/pkgs/by-name/cl/clini/package.nix index 65d94561a0a7..233eb0178b82 100644 --- a/pkgs/by-name/cl/clini/package.nix +++ b/pkgs/by-name/cl/clini/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+HnoYFRG7GGef5lV4CUsUzqPzFUzXDajprLu25SCMQo="; }; - cargoHash = "sha256-hOPj3c3WIISRqP/9Kpc/Yh9Z/wfAkHQ/731+BkWElIQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-N18/pCOdwcYA3Uu6+/HAdeqf2xXQcZoaWhOEPMncDKM="; meta = with lib; { description = "Simple tool to do basic modification of ini files"; diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index f2023b27d469..cd86574a23d7 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MqA/ELIX16H7dDPZkg9OmNO/df7Bui3an1CSj5kGWwM="; }; - cargoHash = "sha256-3KcXa4c4X9L9AeK64vD0DJY/kMS4qzWN+s6YEOF1xrQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pt7mChXZX95pedUmF8QaiG3OlJr0MlM8n5sR+kL+EH0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix index 149fd67f017c..27113c21094c 100644 --- a/pkgs/by-name/cl/clippy-sarif/package.nix +++ b/pkgs/by-name/cl/clippy-sarif/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J2QtM6lrkOXQO3ZARJWIgjkj0pLzmL9id5b2JNkGeiA="; }; - cargoHash = "sha256-ovmL60aFlScPOxJ/ea3jGCsJrW+0XbY0zN8RTnkKRDA="; + useFetchCargoVendor = true; + cargoHash = "sha256-ExH4asrM9MIW1/oslU64LnalEAvmTFuOmersrQM0Wjk="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/cl/cloak/package.nix b/pkgs/by-name/cl/cloak/package.nix index e4161bbdd437..152c4921a356 100644 --- a/pkgs/by-name/cl/cloak/package.nix +++ b/pkgs/by-name/cl/cloak/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Pd2aorsXdHB1bs609+S5s+WV5M1ql48yIKaoN8SEvsg="; }; - cargoHash = "sha256-m11A5fcJzWoDZglrr2Es1V5ZJNepEkGeIRVhexJ7jws="; + useFetchCargoVendor = true; + cargoHash = "sha256-PAZOenugZrKYIP7zzxozerjkauwg7VN0mAlex0WPttQ="; meta = with lib; { homepage = "https://github.com/evansmurithi/cloak"; diff --git a/pkgs/by-name/cl/cloneit/package.nix b/pkgs/by-name/cl/cloneit/package.nix index 844bbd22eff8..1ff7211bc0fa 100644 --- a/pkgs/by-name/cl/cloneit/package.nix +++ b/pkgs/by-name/cl/cloneit/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-RP0/kquAlSwRMeB6cjvS5JB9qfdkT8IKLVxaxrmzJ+0="; }; - cargoHash = "sha256-XXcqmDPEQUm4YBqY5+06X55ym3o3RqE7fNSiR4n+iyc="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZcowTGIl6RiP6qpP5LqgePCgII+qgEcebe5pq4ubv6o="; strictDeps = true; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/cm/cmd-wrapped/package.nix b/pkgs/by-name/cm/cmd-wrapped/package.nix index a3081227d976..41d40eb271be 100644 --- a/pkgs/by-name/cm/cmd-wrapped/package.nix +++ b/pkgs/by-name/cm/cmd-wrapped/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tIvwJo33Jz9cPq6o4Ytc3VqkxEaxt0W9Fd8CNp+7vAE="; }; - cargoHash = "sha256-pAlAWG9Dfqhhvl7uVvzr4nx481seIwwzBg+5SSsje84="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pv+LTHMLJh4LxKmvF6aJLZlDf97ZHI8gzn7vP+quNhc="; meta = with lib; { description = "Find out what the past year looks like in commandline"; diff --git a/pkgs/by-name/cn/cnsprcy/package.nix b/pkgs/by-name/cn/cnsprcy/package.nix index d4dcf267d5d7..58155980a149 100644 --- a/pkgs/by-name/cn/cnsprcy/package.nix +++ b/pkgs/by-name/cn/cnsprcy/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f+DauSU4bT3EljY8/ig7jLnUgyDPEo2NSBQcPN0iKx0="; }; - cargoHash = "sha256-e9+nMz/FCtd5pnHSHA1RenWzrgIHyCf5eEDO4xMxGHk="; + useFetchCargoVendor = true; + cargoHash = "sha256-lPTufjKOXMvPy+cP1UyVCTfRXkOmzZqDR6yraIgk+Dg="; RUSTC_BOOTSTRAP = true; diff --git a/pkgs/by-name/cn/cntr/package.nix b/pkgs/by-name/cn/cntr/package.nix index d4fab9658f54..38c9ddaa7283 100644 --- a/pkgs/by-name/cn/cntr/package.nix +++ b/pkgs/by-name/cn/cntr/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-A622DfygwZ8HVgSxmPINkuCsYFKQBAUdsnXQmB/LS8w="; }; - cargoHash = "sha256-LRX7NuNLyEnw+2kj1MG4JvSL2jzVFxH6tMAx4+cCeow="; + useFetchCargoVendor = true; + cargoHash = "sha256-WP8ecsNHLjIUeoEDXO3WbIKuXZu24A1WBKzAq0x1tek="; passthru.tests = nixosTests.cntr; diff --git a/pkgs/by-name/co/code-minimap/package.nix b/pkgs/by-name/co/code-minimap/package.nix index 749e2737b65a..dd15014d5e3c 100644 --- a/pkgs/by-name/co/code-minimap/package.nix +++ b/pkgs/by-name/co/code-minimap/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-unf7gFc/tQiUw3VqQ0KC96Srxn1E27WsmJviSggaCF4="; }; - cargoHash = "sha256-7RmYVg2mOGSdwvADXtbPupoRUUpyYUwYZFM7f24GxQU="; + useFetchCargoVendor = true; + cargoHash = "sha256-35qMpxROBnXfnTIAkCRUg7zRQTvSIIA2qGD0Vu9r488="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index 2dd1c341e53c..a2ef11f6fb43 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GFUBMriBHKWjgT10Vvpa8FMqB6CvksSPoFBBr3uwrrg="; }; - cargoHash = "sha256-dpK/FddoF6QMqIoUOwabELpfei0EBDjbTlmJCo/rlUk="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZOPfCrWlJXL+XipEngLSIqryEAou5A8mTtZgA5gabc4="; nativeBuildInputs = [ pkg-config installShellFiles diff --git a/pkgs/by-name/co/codemov/package.nix b/pkgs/by-name/co/codemov/package.nix index f66727980053..e1e6eaa8218d 100644 --- a/pkgs/by-name/co/codemov/package.nix +++ b/pkgs/by-name/co/codemov/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-nOqh8kXS5mx0AM4NvIcwvC0lAZRHsQwrxI0c+9PeroU="; }; - cargoHash = "sha256-whGTGJQIjdg/tIm5sZsBs0sbwiRuFIfgYvizmL+sQCE="; + useFetchCargoVendor = true; + cargoHash = "sha256-lelmkdbqKRjSkJIkF5TWJ6LyCTo2j11hZf9QxIPBoOo="; cargoPatches = [ # fix build with rust 1.80 by updating time crate version diff --git a/pkgs/by-name/co/codesnap/package.nix b/pkgs/by-name/co/codesnap/package.nix index a9552b9d3326..843a8ef21d4f 100644 --- a/pkgs/by-name/co/codesnap/package.nix +++ b/pkgs/by-name/co/codesnap/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-i6aKtNXoGMT2FuzsPGGb/V1e4X5WW72DeiSNBrnJCbA="; }; - cargoHash = "sha256-ckOvjgyhZytL5BL/nQGus3kG5S5UkshnA5sbo5wmWhk="; + useFetchCargoVendor = true; + cargoHash = "sha256-torktXGNPsz0hMppIgTYatudtPQ0OYW465En6LqTD3I="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/co/codevis/package.nix b/pkgs/by-name/co/codevis/package.nix index 10f390228c6b..9e910dfe4ab3 100644 --- a/pkgs/by-name/co/codevis/package.nix +++ b/pkgs/by-name/co/codevis/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LZ6NsoyEPUvgcVdbG7U2Vzuz/TLLraScvW97PocUNpU="; }; - cargoHash = "sha256-sQKZJVnRs4IcBKmmaQDoJYBQtnuZW4aEICr6Xa8Flnk="; + useFetchCargoVendor = true; + cargoHash = "sha256-BIUzuV7q/5GSAmjRfdL71dWC7TjBVaSL8UyWpTF2AxM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/co/coinlive/package.nix b/pkgs/by-name/co/coinlive/package.nix index 148c0ed2ebf5..f8c073ab8ce9 100644 --- a/pkgs/by-name/co/coinlive/package.nix +++ b/pkgs/by-name/co/coinlive/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs="; }; - cargoHash = "sha256-T1TgwnohUDvfpn6GXNP4xJGHM3aenMK+ORxE3z3PPA4="; + useFetchCargoVendor = true; + cargoHash = "sha256-OswilwabVfoKIeHxo7sxCvgGH5dRfyTmnKED+TcxSV8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/co/colmena/package.nix b/pkgs/by-name/co/colmena/package.nix index 9f6fd8f4425d..b888cf190d47 100644 --- a/pkgs/by-name/co/colmena/package.nix +++ b/pkgs/by-name/co/colmena/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ="; }; - cargoHash = "sha256-rk2atWWJIR95duUXxAiARegjeCyfAsqTDwEr5P0eIr8="; + useFetchCargoVendor = true; + cargoHash = "sha256-2OLApLD/04etEeTxv03p0cx8O4O51iGiBQTIG/iOIkU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/co/colo/package.nix b/pkgs/by-name/co/colo/package.nix index cd84c3f1cef8..460e8db873ea 100644 --- a/pkgs/by-name/co/colo/package.nix +++ b/pkgs/by-name/co/colo/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ocGzZR4gM2sInXccbHxh7Vf0kcZTZOnVW0KM6zp/pR8="; }; - cargoHash = "sha256-HjEYC7FUHpxNWy/nUVO65O3f/RdT9hYZc3TpcqP3SSM="; + useFetchCargoVendor = true; + cargoHash = "sha256-bAq1sDP/EG9TuUHHWLrp3JtW6S5nWgyyXQbiD63WPGk="; meta = { description = "Displays colors in various color spaces"; diff --git a/pkgs/by-name/co/comet-gog/package.nix b/pkgs/by-name/co/comet-gog/package.nix index 0de956c490f2..c5676da76151 100644 --- a/pkgs/by-name/co/comet-gog/package.nix +++ b/pkgs/by-name/co/comet-gog/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-eXPVImew1EOT1DcoeIVPhqQ2buqHnlpqT6A0eaqG7tI="; + useFetchCargoVendor = true; + cargoHash = "sha256-SvDE+QqaSK0+4XgB3bdmqOtwxBDTlf7yckTR8XjmMXc="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix index 36543e955e4e..572d67065d2c 100644 --- a/pkgs/by-name/co/comma/package.nix +++ b/pkgs/by-name/co/comma/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XXe0SSdH2JZLx0o+vHDtdlDRtVn7nouIngipbXhmhiQ="; }; - cargoHash = "sha256-poQDzC5DLkwLMwt5ieZCSyrQIKkuYq6hu6cj7lcDb4c="; + useFetchCargoVendor = true; + cargoHash = "sha256-vNXczPhCfoXHy5IT/ybuKEQ7I08eJJdP+6+iXfwWjdU="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/co/commitlint-rs/package.nix b/pkgs/by-name/co/commitlint-rs/package.nix index 7cad93859917..dd5bfc29dde7 100644 --- a/pkgs/by-name/co/commitlint-rs/package.nix +++ b/pkgs/by-name/co/commitlint-rs/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9az7AJ4NXmisRZiCFTdHQBVatgEIdRuKU6ZEKVHEgnQ="; }; - cargoHash = "sha256-6Ur4s8bMSQR9mfh6apsocle6KDIsQ6gzU5luXH7BP7M="; + useFetchCargoVendor = true; + cargoHash = "sha256-qTJ7/3jIqDXSu6H16YZJqtc/AqMIb4t7SulTtcVbKMI="; passthru = { tests.version = testers.testVersion { package = commitlint-rs; }; diff --git a/pkgs/by-name/co/commitmsgfmt/package.nix b/pkgs/by-name/co/commitmsgfmt/package.nix index 4cb72323ed1c..45ca63918896 100644 --- a/pkgs/by-name/co/commitmsgfmt/package.nix +++ b/pkgs/by-name/co/commitmsgfmt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-HEkPnTO1HeJg8gpHFSUTkEVBPWJ0OdfUhNn9iGfaDD4="; }; - cargoHash = "sha256-jTRB9ogFQGVC4C9xpGxsJYV3cnWydAJLMcjhzUPULTE="; + useFetchCargoVendor = true; + cargoHash = "sha256-cej+Jpp12QEaru1mecuXtIFDEnSBvTwpx0Vgp8s7jj8="; passthru.tests.version = testers.testVersion { package = commitmsgfmt; diff --git a/pkgs/by-name/co/committed/package.nix b/pkgs/by-name/co/committed/package.nix index 76dffacaac42..e8b54bb2f08f 100644 --- a/pkgs/by-name/co/committed/package.nix +++ b/pkgs/by-name/co/committed/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { tag = "v${version}"; hash = "sha256-dBNtzKqaaqJrKMNwamUY0DO9VCVqDyf45lT82nOn8UM="; }; - cargoHash = "sha256-F+6pTxgr/I3DcDGZsfDjLe0+5wj9Mu7nqghyOzSWlvc="; + useFetchCargoVendor = true; + cargoHash = "sha256-gWMS14945qa6pCe+Olg89gOaoZwRKsqJtG0jKe5/7e0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/co/comodoro/package.nix b/pkgs/by-name/co/comodoro/package.nix index 12fe8e3c0d7b..3b2ce0093d42 100644 --- a/pkgs/by-name/co/comodoro/package.nix +++ b/pkgs/by-name/co/comodoro/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Y9SuxqI8wvoF0+X6CLNDlSFCwlSU8R73NYF/LjACP18="; }; - cargoHash = "sha256-1WJIIsTzbChWqvdBSR/OpLC1iR8FgLmypJFQEtpalbw="; + useFetchCargoVendor = true; + cargoHash = "sha256-HzutYDphJdhNJ/jwyA5KVYr6fIutf73rYzKxrzVki9k="; nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles; diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix index 04a46666ea69..0965a7b60436 100644 --- a/pkgs/by-name/co/complgen/package.nix +++ b/pkgs/by-name/co/complgen/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-spyRH3zzuuGZeQ8iFTa+hc/b4nYSiNIMOEWmc8+jJO0="; }; - cargoHash = "sha256-ru6rqHqKXFMQUrYmxNHfobLRgx5ij7UvHzXwsaqciZU="; + useFetchCargoVendor = true; + cargoHash = "sha256-mLWgMoP1Is2Tm1Ygwn9VR99GjTthAY30IGmKA29nR/w="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index ab9607d63f49..d9a73f22361b 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-8LBMyCmt4HTYgprChfPSFZm6uQ7yFmJ0+srAUz785MA="; }; - cargoHash = "sha256-Z2LNFlHWS3IdjXlwdIizkjNFaPqTbMf0i6Y6jigKCzg="; + useFetchCargoVendor = true; + cargoHash = "sha256-vE7i5jcNl1Rx3znVGLCi8foQZDlXr5e1p1VEMKBBS8Y="; meta = with lib; { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/by-name/co/conceal/package.nix b/pkgs/by-name/co/conceal/package.nix index 1184aa2ac02d..53c261ac66f0 100644 --- a/pkgs/by-name/co/conceal/package.nix +++ b/pkgs/by-name/co/conceal/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-BYLDSRgBba6SoGsL/NTV/OTG1/V9RSr8lisj42JqBRM="; }; - cargoHash = "sha256-loaKXnbhH6n6Bt58RQZdS/lxNguw+GIdB6uLcRZhVtg="; + useFetchCargoVendor = true; + cargoHash = "sha256-yCHN7N+hRrWfuCEBA6gh2S/rRP+ZkHCjFBGGY9/LTb4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/co/config-store/package.nix b/pkgs/by-name/co/config-store/package.nix index af50410e378d..c6e00d47e954 100644 --- a/pkgs/by-name/co/config-store/package.nix +++ b/pkgs/by-name/co/config-store/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dmFIB9tVI5/hnI+VKeawFzKi6UJrRis0tpeQE5a5dGU="; }; - cargoHash = "sha256-tEhk6vDan5uaP1vvKanB+juKsGJndrJPP67kudds24s="; + useFetchCargoVendor = true; + cargoHash = "sha256-3KguaKy+4t7txqKEoWhIMvAjtRgVgO7vEGfVlxJp3Ts="; meta = { description = "Simple key-value store designed to be used from shell scripts written in Rust"; diff --git a/pkgs/by-name/co/conserve/package.nix b/pkgs/by-name/co/conserve/package.nix index c5f459db1b45..2095e4091881 100644 --- a/pkgs/by-name/co/conserve/package.nix +++ b/pkgs/by-name/co/conserve/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rdZTx0wFFtWt3EcpvWHY6m+8TEHEj53vhVpdRp5wbos="; }; - cargoHash = "sha256-IP9x3n5RdI+TKOhMBWEfw9P2CROcC0SmEsmMVaXjiDE="; + useFetchCargoVendor = true; + cargoHash = "sha256-r14ApN9kGWIyeNlbqrb+vOvvmH2n+O5ovvtSVNTMASo="; buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index 8e76730abb15..75ed5c2a19d6 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-s0rcSekJLe99oxi6JD8VL1S6nqQTUFTn5pdgxnknbaY="; }; - cargoHash = "sha256-oQBCPfwlMJ0hLZskv+KUNVBHH550yAUI1jY40Eah3Bc="; + useFetchCargoVendor = true; + cargoHash = "sha256-ClkpGHN2me+R3jX7S5hFR1FlsXGhHZ/y6iIGK08Mdfc="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index 5990e30bfe5a..6d83b52f11fa 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3gLVsk6GCxOG24Md7E9fk28Vnc4kVDdwyZUD/GtSwFE="; }; - cargoHash = "sha256-6lnURuE1cgNAniHl5ozXo1W3cLYYje7er+ZhvZDKdVg="; + useFetchCargoVendor = true; + cargoHash = "sha256-EoTCKpH8G3SsXkhQVsr9aX4Cupm+fzPtXHpoM1knqss="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix index 16eec28ab4fd..2e69ec74adfe 100644 --- a/pkgs/by-name/co/copycat/package.nix +++ b/pkgs/by-name/co/copycat/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0pqC6fxuvqOPuO10Em63tFguc3VJNnniPCHM6TcFDN0="; }; - cargoHash = "sha256-oNX1MUpOjRG02FHOU7zpktLAYKu/1+R2d96jC/VA0co="; + useFetchCargoVendor = true; + cargoHash = "sha256-unZB49VOCNnvKhRyry682JaYYzaUTr0qvJZtcFlh4J8="; buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk_11_0.frameworks.AppKit diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index dc7313e88129..42270051eebe 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/sGYF+XWmPraNGlBVUcN/nokDB9JwWViEAL9gVH3ZaI="; }; - cargoHash = "sha256-E03MeHSEjVAlKiqW7UQh0cZ5UHKfMtXVwUynpUHexbs="; + useFetchCargoVendor = true; + cargoHash = "sha256-1r0Uwcf4kpHCgWqrUYZELsVXGDzbtbmu/WFeX53fBiQ="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cotp/package.nix b/pkgs/by-name/co/cotp/package.nix index fb625cf570a7..69535aef9427 100644 --- a/pkgs/by-name/co/cotp/package.nix +++ b/pkgs/by-name/co/cotp/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5wVIjh16AYwrzjbPgvjsQhihu/vwdQfzU2kZS6eSTWs="; }; - cargoHash = "sha256-DMswC+Qp6w7Dcp5YYV4EGWUylv/ouG0ukAdCdDnOA/8="; + useFetchCargoVendor = true; + cargoHash = "sha256-6VdlXQymOFZgMksGRQ7f9ZGrzKblYlQAoBFUhi4wuM0="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; diff --git a/pkgs/by-name/co/couchbase-shell/package.nix b/pkgs/by-name/co/couchbase-shell/package.nix index 1b610b641b28..72b5cd448b85 100644 --- a/pkgs/by-name/co/couchbase-shell/package.nix +++ b/pkgs/by-name/co/couchbase-shell/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ksAyi7yMz56de1lA2LYVNdsn02GNrcJVoRLcK1zFppE="; }; - cargoHash = "sha256-efy1M4Q9dBfEq0YYUKn4y1Rz/dPbBYLapcPXJLI9X+Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-8AnnZNXp/D8lUCohgrLzqJ+7gwucC3OBh1TK3dYKp4Y="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/cr/crab-hole/package.nix b/pkgs/by-name/cr/crab-hole/package.nix index 1bc7c1ac38ae..e056da8b0f08 100644 --- a/pkgs/by-name/cr/crab-hole/package.nix +++ b/pkgs/by-name/cr/crab-hole/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HJQpzUdvjGhZnH5+qlgaekDpqSUmOhR30VPzg1lZIl0="; }; - cargoHash = "sha256-6g5l4sQv8OsOLJZ/Vl3RLU8k/zx3Bj13STonsY2+lf0="; + useFetchCargoVendor = true; + cargoHash = "sha256-eAVsursZ19H9xyuiClQmGcqh343JP5eKfBkxXrXlM3I="; meta = { description = "Pi-Hole clone written in Rust using Hickory DNS"; diff --git a/pkgs/by-name/cr/crabz/package.nix b/pkgs/by-name/cr/crabz/package.nix index 245e14ae4397..21d84e636b8f 100644 --- a/pkgs/by-name/cr/crabz/package.nix +++ b/pkgs/by-name/cr/crabz/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-GJHxo4WD/XMudwxOHdNwY1M+b/DFJMpU0uD3sOvO5YU="; }; - cargoHash = "sha256-T+Sdzts7gzkG2EFcKrkVDUIq2V34PBdW3oyxMUcCWaI="; + useFetchCargoVendor = true; + cargoHash = "sha256-JzzDkbDVL6az6b/s640KikSNJCwv8hf0aFcmGnvYQu4="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cr/crate2nix/package.nix b/pkgs/by-name/cr/crate2nix/package.nix index 8016d2db2fe2..274b70ac4321 100644 --- a/pkgs/by-name/cr/crate2nix/package.nix +++ b/pkgs/by-name/cr/crate2nix/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/crate2nix"; - cargoHash = "sha256-nQ1VUCFMmpWZWvKFbyJFIZUJ24N9ZPY8JCHWju385NE="; + useFetchCargoVendor = true; + cargoHash = "sha256-Du6RAe4Ax3KK90h6pQEtF75Wdniz+IqF2/TXHA9Ytbw="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix index e3a1a9e2f83a..35d448d97937 100644 --- a/pkgs/by-name/cr/crates-tui/package.nix +++ b/pkgs/by-name/cr/crates-tui/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-yAMVl+3DP9NCjHc9X0qOd6zlJvaY3kcvnVBSS8JHtgU="; }; - cargoHash = "sha256-d79NgOGdxkg6zRpnBlievmPEVWIkY8gYLWdTMpGSPqo="; + useFetchCargoVendor = true; + cargoHash = "sha256-/w3M5I9IOO2e37dnL8iE3LY5z1N07RkD3mMGJrswVMI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/cr/cringify/package.nix b/pkgs/by-name/cr/cringify/package.nix index bdd28b3c0233..e85ecbe82e3c 100644 --- a/pkgs/by-name/cr/cringify/package.nix +++ b/pkgs/by-name/cr/cringify/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-U0tKYFRZToMALSeItn9yia7Dl7omETDTkuRlWJ8EZEo="; }; - cargoHash = "sha256-OQXGn6m6VdSlxaCPRonjvEo/GOpsEiZkqL12UdoLu0Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-VUMVul3P2GRwihTilVpcEb+A5pJaHxlzkwa3uq+pHtY="; postPatch = '' # Upstream doesn't set the version string itself diff --git a/pkgs/by-name/cr/critcmp/package.nix b/pkgs/by-name/cr/critcmp/package.nix index b15754fdf12e..5c85eaa6b4ee 100644 --- a/pkgs/by-name/cr/critcmp/package.nix +++ b/pkgs/by-name/cr/critcmp/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cf78R9siH0RFbx+vXTs71VblpsQokL6Uo32N3X4lV2I="; }; - cargoHash = "sha256-yzWa+/08tG8h+5V8XBc3k8GDivS6SHW6zVb+ug1sbE0="; + useFetchCargoVendor = true; + cargoHash = "sha256-wpfv6mebFPvL+9UkggRRH3fPOeGslORzxtN0q/KKOsw="; meta = with lib; { description = "Command line tool for comparing benchmarks run by Criterion"; diff --git a/pkgs/by-name/cs/csv-tui/package.nix b/pkgs/by-name/cs/csv-tui/package.nix index a56c08e4ec8f..d851ee8aed69 100644 --- a/pkgs/by-name/cs/csv-tui/package.nix +++ b/pkgs/by-name/cs/csv-tui/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T8T9fW4E/wigktSomoc+xPkVqX5T3OnTmL4XIT5YXe8="; }; - cargoHash = "sha256-WDUw539G15rf2X1NWLRCHIxMqyuxthEy8Cbn5XgIFCk="; + useFetchCargoVendor = true; + cargoHash = "sha256-bc/7wt7P7v5VJv2Jh/ct9/N4xHdVWshRl+maD2LBSG0="; meta = { description = "Terminal based csv editor which is designed to be memory efficient but still useful"; diff --git a/pkgs/by-name/cs/csv2parquet/package.nix b/pkgs/by-name/cs/csv2parquet/package.nix index 8261242f2da2..de277fc5e93b 100644 --- a/pkgs/by-name/cs/csv2parquet/package.nix +++ b/pkgs/by-name/cs/csv2parquet/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-499DC0kLvvP5Oq2WYRb9BIppTdfm41u8hwrPU8b66Zw="; }; - cargoHash = "sha256-GoUmr1NArOyGx1A9E9K/Od0xXR2YxZqBcBdYFumgIJU="; + useFetchCargoVendor = true; + cargoHash = "sha256-hZ4qdaR3dvcBBvZqfMQVk4hryhxfeAszv56WPNVhQiY="; meta = with lib; { description = "Convert CSV files to Apache Parquet"; diff --git a/pkgs/by-name/cs/csv2svg/package.nix b/pkgs/by-name/cs/csv2svg/package.nix index d9c56f76bb68..8d8ecd52019d 100644 --- a/pkgs/by-name/cs/csv2svg/package.nix +++ b/pkgs/by-name/cs/csv2svg/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3VebLFkeJLK97jqoPXt4Wt6QTR0Zyu+eQV9oaLBSeHE="; }; - cargoHash = "sha256-EIsKb9BzM+H3BO7OpoTmvIvGd578gYSq5vU18BejT0s="; + useFetchCargoVendor = true; + cargoHash = "sha256-RwpRxSD/oRAYD1udrHt3fy/SrrNUTVdGf+CdzQnJZ2U="; meta = with lib; { description = "Take a csv as input and outputs svg"; diff --git a/pkgs/by-name/cs/csview/package.nix b/pkgs/by-name/cs/csview/package.nix index 69d015ebd974..f304ab26ac0e 100644 --- a/pkgs/by-name/cs/csview/package.nix +++ b/pkgs/by-name/cs/csview/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-JFuqaGwCSfEIncBgLu6gGaOvAC5vojKFjruWcuSghS0="; }; - cargoHash = "sha256-mH1YpuYahdHFS+1cK9dryHbUqjewdbkNGxRBUOd2Hws="; + useFetchCargoVendor = true; + cargoHash = "sha256-CXIfE1EsNwm4vsybQSdfKewBYpzBh+uQu1jYAm8DDtI="; meta = with lib; { description = "High performance csv viewer with cjk/emoji support"; diff --git a/pkgs/by-name/cs/csvlens/package.nix b/pkgs/by-name/cs/csvlens/package.nix index 6e3c4ae66e2a..b5842124d09e 100644 --- a/pkgs/by-name/cs/csvlens/package.nix +++ b/pkgs/by-name/cs/csvlens/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.AppKit ]; - cargoHash = "sha256-PhAEVTlrTF5tj08x8B2vvfEtJadqWtC9rZT8qr0UXB4="; + useFetchCargoVendor = true; + cargoHash = "sha256-nfw8mMauOTDCBh9O2ye96p8WXDFta4DXXb9kJVz7f3E="; meta = with lib; { description = "Command line csv viewer"; diff --git a/pkgs/by-name/cw/cwe-client-cli/package.nix b/pkgs/by-name/cw/cwe-client-cli/package.nix index c7ec89733fa8..19bed845691f 100644 --- a/pkgs/by-name/cw/cwe-client-cli/package.nix +++ b/pkgs/by-name/cw/cwe-client-cli/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { dbus openssl_3 ]; - cargoHash = "sha256-VgbNwqDVcORWJB5QjH39gZZtW1n2Me9FxVUhb4vIg1A="; + useFetchCargoVendor = true; + cargoHash = "sha256-ctcsO7HRs3wWcOFW+ewQbKGCSEBlVzT/enAEjFIAaPU="; meta = { description = "Simple command line client for CWE"; diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index b524e843dfcc..19e9ed29a3fb 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4lnW6p7MaAZdvyXddIoB8TuEQSCmBYOwyvOA1r2ZKxk="; }; - cargoHash = "sha256-sg6nIIiHUXHLnvn25kKWqqa8WV86D/arl4t3EUByQBQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-eUBhMI/ff99SEU76yYvCzEvyLHtQqXgk/bHqmxPQlnc="; nativeBuildInputs = [ diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index ca60c04af919..479ad23f4358 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -36,7 +36,8 @@ let hash = "sha256-Uxko2TRIjqQvd7n9C+P7oMUrm3YY5j7TVzvijEjDwOM="; }; - cargoHash = "sha256-DR2JU+QcGWliNoRMjSjJns7FsicpNAX5gTariFuQ/dw="; + useFetchCargoVendor = true; + cargoHash = "sha256-lYS/G3mHNqKcI6XRAtESzgBiUHnNfV0ct0W6E75a7J4="; nativeBuildInputs = [ gobject-introspection diff --git a/pkgs/by-name/da/dabet/package.nix b/pkgs/by-name/da/dabet/package.nix index 617be31860bf..fd05978c9685 100644 --- a/pkgs/by-name/da/dabet/package.nix +++ b/pkgs/by-name/da/dabet/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BYE+GGwf84zENf+lPS98OzZQbXxd7kykWL+B3guyVNI="; }; - cargoHash = "sha256-kguQmCXP5+E6e8CSKP18faa93VKToU2pcQixDOBrd+8="; + useFetchCargoVendor = true; + cargoHash = "sha256-2ixdugxgc6lyLd06BeXxlrSqpVGJJ9SkFKwnAsol7V4="; meta = with lib; { description = "Print the duration between two times"; diff --git a/pkgs/by-name/da/daktilo/package.nix b/pkgs/by-name/da/daktilo/package.nix index 7a9d8a0243bf..dde3104c7622 100644 --- a/pkgs/by-name/da/daktilo/package.nix +++ b/pkgs/by-name/da/daktilo/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gIBWonJGX6IpxyBeMulcfQEExsG1GrBVQLZbBBA1ruc="; }; - cargoHash = "sha256-lBlzXTkhsEboTby5tH7WfsvZxUwtw7sLYVJRozjI1D4="; + useFetchCargoVendor = true; + cargoHash = "sha256-MV2XvBtVQyxu2PVCgE+5C9EBec11JwYgyeoyg29C7Ig="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix index cc634b7980ce..e7c34ce4687a 100644 --- a/pkgs/by-name/da/darklua/package.nix +++ b/pkgs/by-name/da/darklua/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OLx3J8E9PYXgWbQncWoezyptrbFYcw3xmXzYAn7IUFw="; }; - cargoHash = "sha256-bG5bjtA5a1gSabH9nqfYg/gdt2jfddlbPY3P6HEhQ2s="; + useFetchCargoVendor = true; + cargoHash = "sha256-t3uLi4ywqXeLNMxueljCIo4fYdDVB17iVUcyqXsydrY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index cef1ca6e116f..3d936718a372 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -37,7 +37,8 @@ rustPlatform.buildRustPackage rec { ./use-shaka-by-default.patch ]; - cargoHash = "sha256-R54Np08hYpDoidsHr3rmhpX/QZZkZHGcCSoKk6nw9R8="; + useFetchCargoVendor = true; + cargoHash = "sha256-yXLA/JVD/4jbeVWOhs74Rdlc/drFFjQ52x5IMwUg4jY="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix index 50e114fbd983..5f36327b125e 100644 --- a/pkgs/by-name/da/datafusion-cli/package.nix +++ b/pkgs/by-name/da/datafusion-cli/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/datafusion-cli"; - cargoHash = "sha256-jqL/o4vSTJfQEFurtmNoi8pNzCLslhqlNKISm8dp6hs="; + useFetchCargoVendor = true; + cargoHash = "sha256-hRnVwFhqPq7NiwRPeXzrhv/n58QHEIS9YgXZAFbvn6M="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/de/deadnix/package.nix b/pkgs/by-name/de/deadnix/package.nix index a15e628d04e5..3382c7264172 100644 --- a/pkgs/by-name/de/deadnix/package.nix +++ b/pkgs/by-name/de/deadnix/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xaaXGzTd+t1GjD2KpiS/c8acv6bXufv/lTN+ACRGVJw="; }; - cargoHash = "sha256-14onbdsactPJ27GTzG+culsdnwHvGdDXwBD9ZMq192Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-unp5W2vatSS58O+nEAVsVBN99hgYRVc1OkD2vVandw0="; meta = with lib; { description = "Find and remove unused code in .nix source files"; diff --git a/pkgs/by-name/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix index 1275c94df002..9ad0a6215929 100644 --- a/pkgs/by-name/de/delta/package.nix +++ b/pkgs/by-name/de/delta/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fJSKGa935kwLG8WYmT9Ncg2ozpSNMzUJx0WLo1gtVAA="; }; - cargoHash = "sha256-DIWzRVTADfAZdFckhh2lIfOD13h7GP3KIOQHf/oBHgc="; + useFetchCargoVendor = true; + cargoHash = "sha256-qF55A1CENoHu3LBtNRc/n2PKYxMls7pdn2d56Mp18Qs="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/de/deploy-rs/package.nix b/pkgs/by-name/de/deploy-rs/package.nix index a4b85ff3dce9..f5f9e30197a2 100644 --- a/pkgs/by-name/de/deploy-rs/package.nix +++ b/pkgs/by-name/de/deploy-rs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY="; }; - cargoHash = "sha256-lsW810bktMzHZIbuN3pz9N+IUcjNtE5J2AuB/G6pGWI="; + useFetchCargoVendor = true; + cargoHash = "sha256-e+Exc0lEamAieZ7QHJBYvmnmM/9YHdLRD3La4U5FRMo="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/de/deqp-runner/package.nix b/pkgs/by-name/de/deqp-runner/package.nix index b8daa3098022..ad8557f463ca 100644 --- a/pkgs/by-name/de/deqp-runner/package.nix +++ b/pkgs/by-name/de/deqp-runner/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5ngyONV7X3JyU0Kd7VE8XGgsAMb9OCSrZuAuFIbQjgs="; }; - cargoHash = "sha256-xLtKrzjDwBxsg9YNlLQdteAkhuS1rpUbyMWdMwFTrf4="; + useFetchCargoVendor = true; + cargoHash = "sha256-rVYRbaj+9nFVyo9Zjdmd5t7CoFfxtntXIW2bWp2L7DE="; meta = with lib; { description = "VK-GL-CTS/dEQP wrapper program to parallelize it across CPUs and report results against a baseline"; diff --git a/pkgs/by-name/de/desed/package.nix b/pkgs/by-name/de/desed/package.nix index aa7e2b957763..a78ec7a73f42 100644 --- a/pkgs/by-name/de/desed/package.nix +++ b/pkgs/by-name/de/desed/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aKkOs8IhnHjoJkXq9ryGn9fN0AmZyVTHbD/Vano+Erw="; }; - cargoHash = "sha256-3bkNirrvBOqIOhxD5xf3XsdaUMWFVT/lnN3gmZQIB9I="; + useFetchCargoVendor = true; + cargoHash = "sha256-1vNs+viEPqmfA8AtFQaGcQwlLAbIBMHd8uMFmqm60eg="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/de/desk-exec/package.nix b/pkgs/by-name/de/desk-exec/package.nix index d5b0535f5045..e0e2793ed9a9 100644 --- a/pkgs/by-name/de/desk-exec/package.nix +++ b/pkgs/by-name/de/desk-exec/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bJLdd07IAf+ba++vtS0iSmeQSGygwSVNry2bHTDAgjE="; }; - cargoHash = "sha256-pK1WDtGkpPZgFwEm59TqoH7EkKPQivNuvsiOG0dbum4="; + useFetchCargoVendor = true; + cargoHash = "sha256-lwc+zth4qCynErG3ldUnu/lX4NfZfxn+XDzJA/kp7S4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 3c90266f3e87..61290c125be6 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -40,7 +40,8 @@ rustPlatform.buildRustPackage { hash = "sha256-FhlknassIb3rKEucqnfFAzgny1ANmenJcTyRaXYwbA0="; }; - cargoHash = "sha256-dJ8A2kVXkpJcRvMLE/IawFUZNJqok/IRixTRGtLsE3w="; + useFetchCargoVendor = true; + cargoHash = "sha256-8FuRxs4wRdMT/0ZGD1Cj12f0igzlAx3G5OW4IhB9hYk="; buildAndTestSubdir = "devenv"; diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix index f426eeaafc4a..fa273a1b4040 100644 --- a/pkgs/by-name/de/dezoomify-rs/package.nix +++ b/pkgs/by-name/de/dezoomify-rs/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uo0QTaAAbNYMidlWBauW+3hdd0snEWH+I5KQL6Vxgug="; }; - cargoHash = "sha256-0T5zvd78l3ghop/KoIgXYoGssVV9F+ppJV2pWyLnwxo="; + useFetchCargoVendor = true; + cargoHash = "sha256-v5hlG/VnRyU4lR84IXal5GmrAyfxJTjmwzRKRcfaSIY="; checkFlags = [ # Tests failing due to networking errors in Nix build environment diff --git a/pkgs/by-name/df/dfrs/package.nix b/pkgs/by-name/df/dfrs/package.nix index a834ac374055..72327549992f 100644 --- a/pkgs/by-name/df/dfrs/package.nix +++ b/pkgs/by-name/df/dfrs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "01h00328kbw83q11yrsvcly69p0hql3kw49b4jx6gwkrdm8c2amk"; }; - cargoHash = "sha256-KaSBdpgIjMZoX8ejD5hNYtgZLb952t8th4f5Mh6x9bU="; + useFetchCargoVendor = true; + cargoHash = "sha256-U6z0YMHRmjGobLYdyBaMWJam9mDrHUQEOv5MjOpNfHU="; meta = with lib; { description = "Display file system space usage using graphs and colors"; diff --git a/pkgs/by-name/di/diesel-cli-ext/package.nix b/pkgs/by-name/di/diesel-cli-ext/package.nix index a4d09dac4df3..880a80fa678b 100644 --- a/pkgs/by-name/di/diesel-cli-ext/package.nix +++ b/pkgs/by-name/di/diesel-cli-ext/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5AIzMxEcxL/vYWx3D/meA///Zo+1210HUMEE4dFBhkc="; }; - cargoHash = "sha256-Ya7RL3TuQjKkEkggK/ANChtVZRuTaooM+lE3KBZnvYU="; + useFetchCargoVendor = true; + cargoHash = "sha256-AvoyJPh59fZPDcOtIZ4UFUgW83szBC3HOOlkxA3VFgE="; meta = with lib; { description = "Provides different tools for projects using the diesel_cli"; diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index b2dbe6730cef..2a46df08ac50 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -35,7 +35,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jKTQxlmpTlb0eITwNbnYfONknGhHsO/nzdup04ikEB0="; }; - cargoHash = "sha256-+QbCPHczxCkDOFo/PDFTK0xReCWoz8AiLNwXA3aG9N0="; + useFetchCargoVendor = true; + cargoHash = "sha256-mMXLivUWH5LIdFbAxgkha8oEYZFt0eUVCxtyPlBPpVI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix index 49a94fbb9ea0..15da490898e1 100644 --- a/pkgs/by-name/di/diffedit3/package.nix +++ b/pkgs/by-name/di/diffedit3/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zBdLz8O2WCR8SN0UXUAaEdIpmmL+LIaGt44STBw6nyU="; }; - cargoHash = "sha256-jZTXM+2Gd4N9D4Pj2KsuQ2MFPuWJdHg30u/5BlM3HEE="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ao2agqYChyrcrRVOjzKvPHYwmYGabQUVZAUaVBpAFJM="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/di/diffsitter/package.nix b/pkgs/by-name/di/diffsitter/package.nix index db0d041d4ca7..81461c2a1f8c 100644 --- a/pkgs/by-name/di/diffsitter/package.nix +++ b/pkgs/by-name/di/diffsitter/package.nix @@ -43,7 +43,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = false; }; - cargoHash = "sha256-VbdV4dftCxxKLJr9TEuCe9tvSGbc62AUwlDZdaNRNhw="; + useFetchCargoVendor = true; + cargoHash = "sha256-YgVsWiINzEsmUMAi6ttEtXutwNDJA2viXnV5rGdSSxU="; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix index 3d90245ae7f0..a2b858cab97b 100644 --- a/pkgs/by-name/di/dioxus-cli/package.nix +++ b/pkgs/by-name/di/dioxus-cli/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0Kg2/+S8EuMYZQaK4Ao+mbS7K48VhVWjPL+LnoVJMSw="; }; - cargoHash = "sha256-RMo6q/GSAV1bCMWtR+wu9xGKCgz/Ie6t/8oirBly/LQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-uD3AHHY3edpqyQ8gnsTtxQsen8UzyVIbArSvpMa+B+8="; buildFeatures = [ "optimizations" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/dipc/package.nix b/pkgs/by-name/di/dipc/package.nix index 1c4668143531..fcb6274b1d6c 100644 --- a/pkgs/by-name/di/dipc/package.nix +++ b/pkgs/by-name/di/dipc/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RXEC8bwdnUOaDmYIb7ci/JD+vi16tBn55FRsUmwaRzk="; }; - cargoHash = "sha256-XQ85T64K1NLdSOtAFr0XluvFNTaHzoWKxoQtBQ+uSKQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-1vjVuAawuquPqem1as6xIv/ZJCzjgC4k0uyPSlrvpeg="; meta = with lib; { description = "Convert your favorite images and wallpapers with your favorite color palettes/themes"; diff --git a/pkgs/by-name/di/distant/package.nix b/pkgs/by-name/di/distant/package.nix index f9e1f8947b03..b6e1d8452b0f 100644 --- a/pkgs/by-name/di/distant/package.nix +++ b/pkgs/by-name/di/distant/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DcnleJUAeYg3GSLZljC3gO9ihiFz04dzT/ddMnypr48="; }; - cargoHash = "sha256-7MNNdm4b9u5YNX04nBtKcrw+phUlpzIXo0tJVfcgb40="; + useFetchCargoVendor = true; + cargoHash = "sha256-HEyPfkusgk8JEYAzIS8Zj5EU0MK4wt4amlsJqBEG/Kc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix index 1edb44b59f1d..5d491178bd3b 100644 --- a/pkgs/by-name/di/diswall/package.nix +++ b/pkgs/by-name/di/diswall/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-aHX3hr5T7kOyQ3S97rE3JOgNQgbtMSiZWdLxfiRSGt8="; + useFetchCargoVendor = true; + cargoHash = "sha256-I4jfeOtK+ho2jksGHgQqHE+L6UzS240t+7v3/Eb/xAs="; doCheck = false; diff --git a/pkgs/by-name/dm/dmlive/package.nix b/pkgs/by-name/dm/dmlive/package.nix index 1f6714afff20..3df691355b8e 100644 --- a/pkgs/by-name/dm/dmlive/package.nix +++ b/pkgs/by-name/dm/dmlive/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-M7IZ2UzusWovyhigyUXasmSEz4J79gnFyivHVUqfUKg="; }; - cargoHash = "sha256-d3vI2iv2Db1XZQc3uaNfkUpDyNKPvHkb/0zEwRTOWZ0="; + useFetchCargoVendor = true; + cargoHash = "sha256-eHbnAOMWfGSVYrLqhfoZ4tXHy6GXKzB7sHN8ZQwE//0="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/dn/dnglab/package.nix b/pkgs/by-name/dn/dnglab/package.nix index cf228bbb41e5..f7e023281c3e 100644 --- a/pkgs/by-name/dn/dnglab/package.nix +++ b/pkgs/by-name/dn/dnglab/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-k0tKNtVDzE5vVi/953aEQihh+5BsVneqauTr9WRFFrY="; }; - cargoHash = "sha256-6qJFNfgWh3i1CpuM/QdLksVAFz4XIV8uT5oz5BZ3U30="; + useFetchCargoVendor = true; + cargoHash = "sha256-PsTv7OG1dHxPvid2gTA/8KZwWc6/g2XB1UvhQpvTStE="; postInstall = '' rm $out/bin/benchmark $out/bin/identify diff --git a/pkgs/by-name/do/docuum/package.nix b/pkgs/by-name/do/docuum/package.nix index 820217861601..1ce408dfdabc 100644 --- a/pkgs/by-name/do/docuum/package.nix +++ b/pkgs/by-name/do/docuum/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nWd6h39jU1eZWPFMxhxActsmrs9k0TDMlealuzTa+o0="; }; - cargoHash = "sha256-uoQ1qUII6TSZsosAdNfs2CREVuN2kuT9Bmi5vuDT/rY="; + useFetchCargoVendor = true; + cargoHash = "sha256-ce8mthEWvZ+U2+lU3gGrq1YBzbkiqUGJV5JUsZ+HhBg="; checkFlags = [ # fails, no idea why diff --git a/pkgs/by-name/do/dogedns/package.nix b/pkgs/by-name/do/dogedns/package.nix index 613b098cda5b..caa8234c1917 100644 --- a/pkgs/by-name/do/dogedns/package.nix +++ b/pkgs/by-name/do/dogedns/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3wOka+MKSy2x3100eF0d9A5Jc0qFSNCiLsisHO1Uldc="; }; - cargoHash = "sha256-hRtHjyOeIGx7ulXZiyY7EWXVQiF2vzFP1Gf+lTpe2GQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-9Qm93Hmxutmg3oCXSVrCUAYA2W4gXR/LPC5zZ34x5jQ="; patches = [ # remove date info to make the build reproducible diff --git a/pkgs/by-name/do/dotacat/package.nix b/pkgs/by-name/do/dotacat/package.nix index da6ab11c5548..984909f1625e 100644 --- a/pkgs/by-name/do/dotacat/package.nix +++ b/pkgs/by-name/do/dotacat/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { hash = "sha256-y+u9PO01W+IzBatGHZpgOD7cRKjdeuy4/VX7/V9cu3Q="; }; - cargoHash = "sha256-ilvsqwvfQejo453veSZ5VMP8XhL7NryrDh+rYJkXk30="; + useFetchCargoVendor = true; + cargoHash = "sha256-Q8jhbSfVY/8SsB8OZpOsSYZ5sRI3FjzIev3LYYpyXeM="; meta = with lib; { description = "Like lolcat, but fast"; diff --git a/pkgs/by-name/do/dotenvy/package.nix b/pkgs/by-name/do/dotenvy/package.nix index 97b4b1a4a42f..a39519d7ff9a 100644 --- a/pkgs/by-name/do/dotenvy/package.nix +++ b/pkgs/by-name/do/dotenvy/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-virK/TpYBmwTf5UCQCqC/df8iKYAzPBfsQ1nQkFKF2Y="; }; - cargoHash = "sha256-qjFTv15FSvgYgQ4nTEIo0KUqaCbg6E+W5B2B5BH6sp4="; + useFetchCargoVendor = true; + cargoHash = "sha256-eDmSPl1wsEriOtesv0KpLlpdeJPSQzbwh+QeZcFzDbc="; cargoBuildFlags = [ "--bin=dotenvy" diff --git a/pkgs/by-name/do/dotslash/package.nix b/pkgs/by-name/do/dotslash/package.nix index 8fe0c96c8187..4a66a96a2fb7 100644 --- a/pkgs/by-name/do/dotslash/package.nix +++ b/pkgs/by-name/do/dotslash/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EcYDMuAVSCzpHgekSQsQfv/PNDj0jB7Ht9LRgm+tgd0="; }; - cargoHash = "sha256-w2P1J2TDtGqrJYQWTrkaF41iTRDttB1pdfF11sCbHCA="; + useFetchCargoVendor = true; + cargoHash = "sha256-q4VWfJaoHAtUK5xfVklShfHOxuSaTRqmKIt8RdXa8eI="; doCheck = false; # http tests passthru = { diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix index 68d55ffba40d..87339d21f6f9 100644 --- a/pkgs/by-name/do/dotter/package.nix +++ b/pkgs/by-name/do/dotter/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7YExvmuliTL9oagXNUtZ7ZOPyELcS+igK1tXdhG0kQk="; }; - cargoHash = "sha256-LEOORHD0j+HVl/fB9Q2xVZ2AxZKsPE5SeOS1ZsKwTSo="; + useFetchCargoVendor = true; + cargoHash = "sha256-UBZZu8D1fbNOn2obviP+/Qw+E/OoNKRA4NXzqCqghGs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index c517147ff949..29d59be5f19a 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Zem37oHku90c7PDV8ep/7FN128eGRUvfIvRsaXa7X9g="; }; - cargoHash = "sha256-vlG+0cQMUev8iEgut9l1bCDpS85bRWsNWZyJJXcgSlw="; + useFetchCargoVendor = true; + cargoHash = "sha256-sSxtqg4VQhY84F8GZ0mbXzmsN2VFrr77z95LEly1ROo="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles diff --git a/pkgs/by-name/dt/dtool/package.nix b/pkgs/by-name/dt/dtool/package.nix index 64d526e51249..3d154e94567f 100644 --- a/pkgs/by-name/dt/dtool/package.nix +++ b/pkgs/by-name/dt/dtool/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-m4H+ANwEbK6vGW3oIVZqnqvMiAKxNJf2TLIGh/G6AU4="; }; - cargoHash = "sha256-o5Xvc0tnoUgfp5k7EqVuEH9Zyo3C+A+mVqPhMtZCYKw="; + useFetchCargoVendor = true; + cargoHash = "sha256-C0H5cIMMfUPJ2iJCUs1jEu3Ln8CdDgbgstMnH/f9FRY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index 1d3b37858e90..510d9387369e 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-h4Z0Gb4lf/KXrBxU6gEGcRvuhqjUABsggcv/A+AFclo="; + useFetchCargoVendor = true; + cargoHash = "sha256-I8Is6jjBgxcqHkLrA/hesa7z3rrDVK6sjyw2/mQoRVs="; checkFlags = [ # Skip interactive tests diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix index 27809dd4b825..b62086b95b52 100644 --- a/pkgs/by-name/du/dufs/package.nix +++ b/pkgs/by-name/du/dufs/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KkuP9UE9VT9aJ50QH1Y/2f+t0tLOMyNovxCaLq0Jz0s="; }; - cargoHash = "sha256-KyFE8TpbkSZQE3CL7jbvSE3JDWjnyqhiWXO7LZ4ZpgI="; + useFetchCargoVendor = true; + cargoHash = "sha256-OQyMai0METXLSFl09eIk1xnL9QV5cEEiRNVEz1dHg+c="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/du/dum/package.nix b/pkgs/by-name/du/dum/package.nix index bac564b9e068..cc6d5abd190e 100644 --- a/pkgs/by-name/du/dum/package.nix +++ b/pkgs/by-name/du/dum/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-rkdQb4TI7lfWE4REJYsIJwMcmM/78jjgQrd0ZvKJxk8="; }; - cargoHash = "sha256-rcb2Z+wl9neAGyH1DFrjboSCkD9JIKGwjJqAvU9Fitw="; + useFetchCargoVendor = true; + cargoHash = "sha256-CpVci0nw/6Y6uyQX6iRV9E7uXzdZ2fzYIelYxsc+tI0="; meta = with lib; { description = "Npm scripts runner written in Rust"; diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index 7b68daf34923..a23dceac960a 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZIPvdlE/oBmtdTpWm5GU53wGGYWCc74a9w5Kqpi8tBg="; }; - cargoHash = "sha256-pyVmBGqdWrZ+4Ycg0Cf6sMC6mzPA6/pHMn49/OPYZ/Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-D9HBJXn68jdY8ocSNUNNQHJy21H3z4KccyzTECTYYx0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix index fc394a85fca1..f07a24780f5c 100644 --- a/pkgs/by-name/du/dummyhttp/package.nix +++ b/pkgs/by-name/du/dummyhttp/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LgOIL4kg3cH0Eo+Z+RGwxZTPzCNSGAdKT7N8tZWHSQQ="; }; - cargoHash = "sha256-bw0VlPHjNZkpLVJZrB3aaQGkwvQpkJGIn+hi0yn2M4s="; + useFetchCargoVendor = true; + cargoHash = "sha256-IDvl3qCTUO0KWaAVsF1sTf9lFhVITY6EZgllfw4U/Ho="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/du/dupe-krill/package.nix b/pkgs/by-name/du/dupe-krill/package.nix index 1f9b2349ada1..cd70105b0300 100644 --- a/pkgs/by-name/du/dupe-krill/package.nix +++ b/pkgs/by-name/du/dupe-krill/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ze9OQHNtujzn2rY24bmFUkz5AYsjoMrwqm4jyQoF53Y="; }; - cargoHash = "sha256-9/TSmw0XEnEURgrT6Oy3nqnNkmXUHLr0InlKyg4m9sQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-OMXxMWMQIYXe41sxM+KQRMRicH61dIXUe51zdXn8ZYM="; meta = with lib; { description = "Fast file deduplicator"; diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index 556fed65a9c9..b6cd2bbe1b09 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-o9ynFkdx6a8kHS06NQN7BzWrOIxvdVwnUHmxt4cnmQU="; + useFetchCargoVendor = true; + cargoHash = "sha256-ED4gVlvlTKsa6ghD/m4w2HVSxATd4SNl5a6nZ3hqMn0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/du/dutree/package.nix b/pkgs/by-name/du/dutree/package.nix index 741a579a1283..564d438f00bf 100644 --- a/pkgs/by-name/du/dutree/package.nix +++ b/pkgs/by-name/du/dutree/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-/E+4yJEhZbERy4vOqn0Ruv3zOcd2FA+q41qZ0Tvg4T0="; + useFetchCargoVendor = true; + cargoHash = "sha256-P3h7C6hXKhYBaf0CKlsB+4tnfj/1Aw1iFSlvMNGbSYI="; meta = with lib; { description = "Tool to analyze file system usage written in Rust"; diff --git a/pkgs/by-name/dy/dynisland/package.nix b/pkgs/by-name/dy/dynisland/package.nix index e494d58b9aba..3096cb8f0047 100644 --- a/pkgs/by-name/dy/dynisland/package.nix +++ b/pkgs/by-name/dy/dynisland/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-p67h67fRNcfiQyhCUY5Y11xTTqQbl0Ngx1EhYfaSJmw="; + useFetchCargoVendor = true; + cargoHash = "sha256-91dQG0NvEL28gHxn6zk3vLODNft8C5ymkLddMT+PB0Q="; buildFeatures = [ "completions" ]; diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix index fe97fc2aac4d..4425ee65be01 100644 --- a/pkgs/by-name/dy/dysk/package.nix +++ b/pkgs/by-name/dy/dysk/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VJFcdxwj+038d9oj178e0uGQQyKF9JbDytxDmit2tiA="; }; - cargoHash = "sha256-QE7gHHKNKqyMmqovzGR3zKgE7SEzGFkc2mYkBG6V6j0="; + useFetchCargoVendor = true; + cargoHash = "sha256-vVU10Mj+dRIAOREQiGIO0S+mDBeLtM5v0KjmmoCn3/g="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ea/ea/package.nix b/pkgs/by-name/ea/ea/package.nix index 21b1ba0c7bf4..7c4a649f2ab9 100644 --- a/pkgs/by-name/ea/ea/package.nix +++ b/pkgs/by-name/ea/ea/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-/MkLWAbEr14CYdqSwJP1vNYxK7pAmMLdhiV61UQEbME="; + useFetchCargoVendor = true; + cargoHash = "sha256-Sv+bwqb9FmcBk3XUu0QLJr6hyV6JUnVzL7RXh0pbe2s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ea/each/package.nix b/pkgs/by-name/ea/each/package.nix index f4d4de5f4ab7..d40f62c78003 100644 --- a/pkgs/by-name/ea/each/package.nix +++ b/pkgs/by-name/ea/each/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-5Aa/uHWrU4bpWd28Uddnuhmi6guHy09W9AU8sAfea6I="; }; - cargoHash = "sha256-sH9rraPNAIlW2KQVaZfYa10c1HHQpDgedY1+9e94RLE="; + useFetchCargoVendor = true; + cargoHash = "sha256-TfAT36/JeBjBxymnX1gIyCEPZcxTW4fPVIOhHF3z9wA="; meta = with lib; { description = " A better way of working with structured data on the command line"; diff --git a/pkgs/by-name/ea/ear2ctl/package.nix b/pkgs/by-name/ea/ear2ctl/package.nix index 24f7b4649690..bf26ad7ad8e2 100644 --- a/pkgs/by-name/ea/ear2ctl/package.nix +++ b/pkgs/by-name/ea/ear2ctl/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xaxl4opLMw9KEDpmNcgR1fBGUqO4BP5a/U52Kz+GAvc="; }; - cargoHash = "sha256-ax+/lvdEOjLnwE3Gvji7aaeF9KXjoOXdlTvxYDo8wGI="; + useFetchCargoVendor = true; + cargoHash = "sha256-2yMq1Ag0cUXMBMjpkdqYxkKMXQiZ5536cmwoaCrpFgI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix index 07bb178a341e..da1c33c626e0 100644 --- a/pkgs/by-name/ea/earthlyls/package.nix +++ b/pkgs/by-name/ea/earthlyls/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wn+6Aa4xTC5o4S+N7snB/vlyw0i23XkmaXUmrhfXuaA="; }; - cargoHash = "sha256-eKBNZiFvIBuNPqDzMOa6J0UR4CIgi9OUowRaFSgi7Fg="; + useFetchCargoVendor = true; + cargoHash = "sha256-Xc1m5WpZEKBP8fGtrQmwHFdqxdQ6wZzgSihSmXnLOhE="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix index 0c71830775e3..147d3944581f 100644 --- a/pkgs/by-name/ec/ecc/package.nix +++ b/pkgs/by-name/ec/ecc/package.nix @@ -65,7 +65,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/compiler/cmd"; - cargoHash = "sha256-t8sPwAha90SMC/SJqZngXD9hpoaWh9e91X/kuHN4G7o="; + useFetchCargoVendor = true; + cargoHash = "sha256-iYceYwRqnYA6KxCQxOieR8JZ6TQlIL+OSzAjyr4Cu/g="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ef/effitask/package.nix b/pkgs/by-name/ef/effitask/package.nix index 4e28dcc89da9..41ea16fdbf39 100644 --- a/pkgs/by-name/ef/effitask/package.nix +++ b/pkgs/by-name/ef/effitask/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6BA/TCCqVh5rtgGkUgk8nIqUzozipC5rrkbXMDWYpdQ="; }; - cargoHash = "sha256-ScqDNfWMFT8a1HOPjpw4J8EBrVSusIkOYReYeArZvZ8="; + useFetchCargoVendor = true; + cargoHash = "sha256-j9WCzsh6aitmJeeyLDm0YrZHEAZlCNfGWANM/nmuncw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ef/efmt/package.nix b/pkgs/by-name/ef/efmt/package.nix index 61d7edeffb5b..9674dfc73c62 100644 --- a/pkgs/by-name/ef/efmt/package.nix +++ b/pkgs/by-name/ef/efmt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3CL9NcwDsAs6fHUWA/ibkwqOW0Ur4glpHVZTrfLQUXs="; }; - cargoHash = "sha256-hEJb1SOQ3daY2otroCds8zitoodSjRyRTyR7GwF8dgk="; + useFetchCargoVendor = true; + cargoHash = "sha256-5cGnbIF2HrpYhoMvcLHRj3O5L2vP5O5nvtJ0hUf6yTY="; meta = { description = "Erlang code formatter"; diff --git a/pkgs/by-name/eg/ego/package.nix b/pkgs/by-name/eg/ego/package.nix index afc427fd2e57..f9fd2574c322 100644 --- a/pkgs/by-name/eg/ego/package.nix +++ b/pkgs/by-name/eg/ego/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeBinaryWrapper ]; - cargoHash = "sha256-3leKejQ8kxamjwQPH1vg2I1CYc3r8k3pYfTWpOkqq8I="; + useFetchCargoVendor = true; + cargoHash = "sha256-GwWDH3np/YKUx7BLmKxUui2CXLYbHjivWC1av9jaccA="; # requires access to /root checkFlags = [ diff --git a/pkgs/by-name/el/elan/package.nix b/pkgs/by-name/el/elan/package.nix index 486f75b9fcc0..fce3851159ad 100644 --- a/pkgs/by-name/el/elan/package.nix +++ b/pkgs/by-name/el/elan/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7cwpHMyhpTxYXjZM4xbDK+epvA2kBf7jelvMaPGP1kU="; }; - cargoHash = "sha256-ON5d7ryMKEhkx6dV760msr+y/+4hIwssXUE5Ocaq2W0="; + useFetchCargoVendor = true; + cargoHash = "sha256-5JsLG5uwdIqjjPHGnemnM8odcnAMSadKYRECbKF7FSY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/el/elf-info/package.nix b/pkgs/by-name/el/elf-info/package.nix index 98c46ecbfefc..776a386483f6 100644 --- a/pkgs/by-name/el/elf-info/package.nix +++ b/pkgs/by-name/el/elf-info/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wbFVuoarOoxV9FqmuHJ9eZlG4rRqy1rsnuqbGorC2Rk="; }; - cargoHash = "sha256-r4GcJhQn9x5c2hbL+813mS3HbIg8OwNDsMg/fHQoL9Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-JSCdMGScpeA5q6++veuQ8li3qVTuB0XdJ1yacsqgBDg="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/el/elf2nucleus/package.nix b/pkgs/by-name/el/elf2nucleus/package.nix index 0712d63f0b73..835aab1b2fd0 100644 --- a/pkgs/by-name/el/elf2nucleus/package.nix +++ b/pkgs/by-name/el/elf2nucleus/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FAIOtGfGow+0DrPPEBEfvaiinNZLQlGWKJ4DkMj63OA="; }; - cargoHash = "sha256-IeQnI6WTzxSI/VzoHtVukZtB1jX98wzLOT01NMLD5wQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-Xw+heCEwQePyU2gElpG8PTIUZA7y+Onx+2AX2NZzDGs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix index b10158311d34..f97f0f330aa5 100644 --- a/pkgs/by-name/el/elf2uf2-rs/package.nix +++ b/pkgs/by-name/el/elf2uf2-rs/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7RS2OC00tjsSBYFvg0/FQf1HN515FdrmCoKhJBu4fvI="; }; - cargoHash = "sha256-oz2XVqDWmv/8HLrIFL+xJinZNUdoWk4KVHDPZr2v+Ls="; + useFetchCargoVendor = true; + cargoHash = "sha256-OiZGM/cfGwJA3uCg5sf3eo99BJXFoSzL/2k8AioQeyM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/el/elfcat/package.nix b/pkgs/by-name/el/elfcat/package.nix index fcee39e0c21c..7cc8c8d0ec1f 100644 --- a/pkgs/by-name/el/elfcat/package.nix +++ b/pkgs/by-name/el/elfcat/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NzFKNCCPWBj/fhaEJF34nyeyvLMeQwIcQgTlYc6mgYo="; }; - cargoHash = "sha256-Dc+SuLwbLFcNSr9RiNSc7dgisBOvOUEIDR8dFAkC/O0="; + useFetchCargoVendor = true; + cargoHash = "sha256-CwK+xc77QADjQyrCI6NIrZ2A/DgnNfs57p9wdKJQZ4w="; meta = with lib; { description = "ELF visualizer, generates HTML files from ELF binaries"; diff --git a/pkgs/by-name/el/elfx86exts/package.nix b/pkgs/by-name/el/elfx86exts/package.nix index 0f4aa3e75662..96c3a597cca5 100644 --- a/pkgs/by-name/el/elfx86exts/package.nix +++ b/pkgs/by-name/el/elfx86exts/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xNmaKGbMN92CPIQQRbdmeePk5Wt9XcIsB/2vbk5NJzg="; }; - cargoHash = "sha256-NH7QK8a+ndhZGlLa3gWlnQdBQil1pi2AAi5TtFgkVf0="; + useFetchCargoVendor = true; + cargoHash = "sha256-FB2mEI1ZXR0f1+eRcEc8hzlTQZNygU4R5L6qyEl6tLw="; meta = with lib; { description = "Decode x86 binaries and print out which instruction set extensions they use"; diff --git a/pkgs/by-name/em/emacs-lsp-booster/package.nix b/pkgs/by-name/em/emacs-lsp-booster/package.nix index a901b2ade753..f81a4fcfc8c2 100644 --- a/pkgs/by-name/em/emacs-lsp-booster/package.nix +++ b/pkgs/by-name/em/emacs-lsp-booster/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uP/xJfXQtk8oaG5Zk+dw+C2fVFdjpUZTDASFuj1+eYs="; }; - cargoHash = "sha256-CvIJ56QrIzQULFeXYQXTpX9PoGx1/DWtgwzfJ+mljEI="; + useFetchCargoVendor = true; + cargoHash = "sha256-BR0IELLzm+9coaiLXQn+Rw6VLyiFEAk/nkO08qPwAac="; nativeCheckInputs = [ emacs ]; # tests/bytecode_test diff --git a/pkgs/by-name/em/emplace/package.nix b/pkgs/by-name/em/emplace/package.nix index 947c9adc08af..935d4f5ae5a2 100644 --- a/pkgs/by-name/em/emplace/package.nix +++ b/pkgs/by-name/em/emplace/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-0BYAJOHymBVAssNfU5nPYTSvPbLEDCKoRVovIm6evUQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-nBpM8i4jlxtnaonOx71DWjbLS8tYznJkoR2JI/B25LM="; meta = { description = "Mirror installed software on multiple machines"; diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix index 1f05fdd5f990..11a07f9c2432 100644 --- a/pkgs/by-name/en/engage/package.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-niXh63xTpXSp9Wqwfi8hUBKJSClOUSvB+TPCTaqHfZk="; }; - cargoHash = "sha256-CKe0nb5JHi5+1UlVOl01Q3qSXQLlpEBdat/IzRKfaz0="; + useFetchCargoVendor = true; + cargoHash = "sha256-0r5MIoitmFxUODxzi0FBLsUpdGrG1pY8Lo+gy7HeJU8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/en/enkei/package.nix b/pkgs/by-name/en/enkei/package.nix index e2abf1870afe..c6a7fd761164 100644 --- a/pkgs/by-name/en/enkei/package.nix +++ b/pkgs/by-name/en/enkei/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-COU2JtiJcPRA3Jno0qLEIVgimYBWfn5Pgc1OMImsJtI="; }; - cargoHash = "sha256-nf9JM5FfXBNEKzZrfu3jphupL9PdoQLVpqGoZ/X9p5E="; + useFetchCargoVendor = true; + cargoHash = "sha256-4LgJP3xtN009rf12hOZvmqXK6iz7yn0Y4zwVSo+qEZQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/en/envfs/package.nix b/pkgs/by-name/en/envfs/package.nix index 69d6a67bc48f..6dd4a3472547 100644 --- a/pkgs/by-name/en/envfs/package.nix +++ b/pkgs/by-name/en/envfs/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { rev = version; hash = "sha256-kOfnKguvJQHW/AfQOetxVefjoEj7ec5ew6fumhOwP08="; }; - cargoHash = "sha256-isx4jBsA3HX6124R3qtwTqH5fLTAP7xdQD5bTzCAybo="; + useFetchCargoVendor = true; + cargoHash = "sha256-VvdvYxNBzwJJy09npC30VaOzOU9Fwi++qon9Od4juHE="; passthru.tests = { envfs = nixosTests.envfs; diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix index c723ba7dc996..51a774a31ff8 100644 --- a/pkgs/by-name/en/envio/package.nix +++ b/pkgs/by-name/en/envio/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-je0DBoBIayFK//Aija5bnO/2z+hxNWgVkwOgxMyq5s4="; }; - cargoHash = "sha256-L7GgPocj32zAfR27dgKK7/OM106cATdCqufSvG3MFYQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-stb5BZ77yBUjP6p3yfdgtN6fkE7wWU6A+sPAmc8YZD0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/er/erdtree/package.nix b/pkgs/by-name/er/erdtree/package.nix index bb9844855c7b..cb52a6dabcc4 100644 --- a/pkgs/by-name/er/erdtree/package.nix +++ b/pkgs/by-name/er/erdtree/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rm3j1exvdlJtMXgFeRmzr3YU/sLpQFL3PCa8kLVlinM="; }; - cargoHash = "sha256-rHrdGL/2diBwsWJyg7gaa6UmcUdvGhUPhLNESSBvDDg="; + useFetchCargoVendor = true; + cargoHash = "sha256-qmSkMoTAwZz7Bn+r67tmh0SLvkM1EFAkySjLFzFFBv4="; meta = with lib; { description = "File-tree visualizer and disk usage analyzer"; diff --git a/pkgs/by-name/er/erg/package.nix b/pkgs/by-name/er/erg/package.nix index e1e9b7bc12f2..8cb5db03324c 100644 --- a/pkgs/by-name/er/erg/package.nix +++ b/pkgs/by-name/er/erg/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-w41HLMWbWYsK+gCFhCCzu5QfHHU5jqNVcKBUvHnvpX4="; }; - cargoHash = "sha256-zTmU4d1B+T3aERIPcENcEYvtcN6V2Z+N8gxpZeWXwao="; + useFetchCargoVendor = true; + cargoHash = "sha256-xwJDnV2O1xpOsCZA2yb4coc/gtV5cBZh3R7lk1b1DDg="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/es/esbuild-config/package.nix b/pkgs/by-name/es/esbuild-config/package.nix index 1944523f8187..2edcf890a7af 100644 --- a/pkgs/by-name/es/esbuild-config/package.nix +++ b/pkgs/by-name/es/esbuild-config/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-u3LgecKfgPSN5xMyqBjeAn4/XswM3iEGbZ+JGrVF1Co="; }; - cargoHash = "sha256-Z7uYOjMNxsEmsEXDOIr1zIq4nCgHvHIqpRnRH037b8g="; + useFetchCargoVendor = true; + cargoHash = "sha256-OQ7zlcWVu3sS/u0B+Ew6VUS4zxntKU2LF63ZcPRUKW0="; meta = with lib; { description = "Config files for esbuild"; diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix index 7186214a890d..bd0b5372e44c 100644 --- a/pkgs/by-name/es/esp-generate/package.nix +++ b/pkgs/by-name/es/esp-generate/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-o8b30xCkHWdfGhI+8KXVj1U8xJtt7YsRcKBL6FxUVW8="; }; - cargoHash = "sha256-oppQG3YqiTe0feuvIrKkSCYLBRgNIGOOQ31/pCSJaPY="; + useFetchCargoVendor = true; + cargoHash = "sha256-eTXSVeFzlQHBPWPRgt//uvtsPal4KeD2Rk7Sevkx/LE="; meta = { description = "Template generation tool to create no_std applications targeting Espressif's chips"; diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix index 30974ff77b20..f365a2c54794 100644 --- a/pkgs/by-name/es/espflash/package.nix +++ b/pkgs/by-name/es/espflash/package.nix @@ -43,7 +43,8 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-04bBLTpsQNDP0ExvAOjwp3beOktC8rQqFtfEu6d+DWY="; + useFetchCargoVendor = true; + cargoHash = "sha256-WEPSXgHR7wA2zWbc8ogVxDRtXcmR20R14Qwo2VqPLrQ="; checkFlags = [ "--skip cli::monitor::external_processors" ]; diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix index b1dbd36970b7..a73ac72a6278 100644 --- a/pkgs/by-name/es/espup/package.nix +++ b/pkgs/by-name/es/espup/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LMzVxLwl24bw1o+OYiNcxm+KrnDyrg8tjkWhwsYYKzs="; }; - cargoHash = "sha256-gl/Qdzt9vuSvijnJU5MqgC8gtVALp4+zR7dxKioKzDU="; + useFetchCargoVendor = true; + cargoHash = "sha256-4ModbVBymWLCtLlX6SBSWm8M2ZdcqakRqB+uHRQPArM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ev/eva/package.nix b/pkgs/by-name/ev/eva/package.nix index 7509a4e9ff69..82f865814887 100644 --- a/pkgs/by-name/ev/eva/package.nix +++ b/pkgs/by-name/ev/eva/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eX2d9h6zNbheS68j3lyhJW05JZmQN2I2MdcmiZB8Mec="; }; - cargoHash = "sha256-gnym2sedyzQzubOtj64Yoh+sKT+sa60w/Z72hby7Pms="; + useFetchCargoVendor = true; + cargoHash = "sha256-7vhhm2qAaSwBjbYfDER9bnC3OOOun4brn7Ft4mO6jfI="; meta = with lib; { description = "Calculator REPL, similar to bc"; diff --git a/pkgs/by-name/ev/evil-helix/package.nix b/pkgs/by-name/ev/evil-helix/package.nix index c34b1167462d..baf6501a9f3d 100644 --- a/pkgs/by-name/ev/evil-helix/package.nix +++ b/pkgs/by-name/ev/evil-helix/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Otp68+SbW51/MqVejPrbYzeRu4wAiYsNkDQQTZScW1Q="; }; - cargoHash = "sha256-84OfCXdwoo8SUwXrgm98DIcmmBIxHxZGOJ/ZPxJuyjY="; + useFetchCargoVendor = true; + cargoHash = "sha256-epI/Xvw0mgc1IoDXpACws7Lsbkj1Xdk7conzJlUqRxY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ev/evremap/package.nix b/pkgs/by-name/ev/evremap/package.nix index 8771aac00093..4137c5c17f61 100644 --- a/pkgs/by-name/ev/evremap/package.nix +++ b/pkgs/by-name/ev/evremap/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-aAAnlGlSFPOK3h8UuAOlFyrKTEuzbyh613IiPE7xWaA="; }; - cargoHash = "sha256-uFej58+51+JX36K1Rr1ZmBe7rHojOjmTO2VWINS6MvU="; + useFetchCargoVendor = true; + cargoHash = "sha256-3KXvRbPHM78IGe7Hl8AEHCmK0onroQycyTfOm942e9Y="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevdev ]; diff --git a/pkgs/by-name/ev/evscript/package.nix b/pkgs/by-name/ev/evscript/package.nix index 803e2e06585f..5c463b1f9815 100644 --- a/pkgs/by-name/ev/evscript/package.nix +++ b/pkgs/by-name/ev/evscript/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lCXDDLovUb5aSOPTyVJL25v1JT1BGrrUlUR0Mu0XX4Q="; }; - cargoHash = "sha256-KcQZnGFtev4ckhtQ7CNB773fAsExZ9EQl9e4Jf4beGo="; + useFetchCargoVendor = true; + cargoHash = "sha256-L0qwHWxMf/Nd0B2FWLIpKLgrs2LRyTOwuG/7keMI2zE="; meta = with lib; { homepage = "https://codeberg.org/valpackett/evscript"; diff --git a/pkgs/by-name/ev/evsieve/package.nix b/pkgs/by-name/ev/evsieve/package.nix index a727b941b6b5..ca2324cbfc7a 100644 --- a/pkgs/by-name/ev/evsieve/package.nix +++ b/pkgs/by-name/ev/evsieve/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-UV5m8DmFtkCU/DoBJNBCdvhU/jYtU5+WnnhKwxZNl9g="; }; - cargoHash = "sha256-Bug25xK3YYQ3YjrUXlgWaVUPn87V3N/8XikqwYL/sUg="; + useFetchCargoVendor = true; + cargoHash = "sha256-rOqjB/ZakXhuKgN3auEOGzV+9bDX30TTZWD8nt3b+pE="; buildInputs = [ libevdev ]; diff --git a/pkgs/by-name/ev/evtx/package.nix b/pkgs/by-name/ev/evtx/package.nix index 3eb8b9c23e81..4fa8950c121e 100644 --- a/pkgs/by-name/ev/evtx/package.nix +++ b/pkgs/by-name/ev/evtx/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ljEuFsLOwydLbx1DprJdBTL3cjFkhmuwr34da8LzG88="; }; - cargoHash = "sha256-PZTB53DbUlyACS2wWmgVUQVz6EXb02GUogO3ClY678I="; + useFetchCargoVendor = true; + cargoHash = "sha256-SbWKDC2vfsOQfZERHdzQ3BE1ks9/a+5BJU4X3TPBxXw="; postPatch = '' # CLI tests will fail in the sandbox diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 0d45e0045708..561957237ab7 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DbXsiqMyZKNSFmL5aEJwJr+cPnz8qaWe5lNDoovOX/g="; }; - cargoHash = "sha256-hS8uNqT37z/89Q5pqfWKm/wijgMyrU8uDT5exn0NZNU="; + useFetchCargoVendor = true; + cargoHash = "sha256-JBX6jyqzkbqnpA/P2BJ04UHTU6lWbMUcD2uMUJPblvc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ex/extest/package.nix b/pkgs/by-name/ex/extest/package.nix index f6c2699282fd..229cd97a66e3 100644 --- a/pkgs/by-name/ex/extest/package.nix +++ b/pkgs/by-name/ex/extest/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qdTF4n3uhkl3WFT+7bAlwCjxBx3ggTN6i3WzFg+8Jrw="; }; - cargoHash = "sha256-JZPiTzr9KaaqiXKhsGOYmYMtjNzPQzKhqyfSlbeqME8="; + useFetchCargoVendor = true; + cargoHash = "sha256-82jG4tHqc5FQFGp4NANk2oJjiHc0+ekVdbdWlqjzaj8="; meta = with lib; { description = "X11 XTEST reimplementation primarily for Steam Controller on Wayland"; diff --git a/pkgs/by-name/ez/ezno/package.nix b/pkgs/by-name/ez/ezno/package.nix index 5ee1c9f44e97..9c04adecdb0a 100644 --- a/pkgs/by-name/ez/ezno/package.nix +++ b/pkgs/by-name/ez/ezno/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0yLEpNkl7KjBEGxNONtfMjVlWMSKGZ6TbYJMsCeQ3ms="; }; - cargoHash = "sha256-noMfKx6BsmWhAVI4r8LlC961Uwogv1JGMYSrNGlLGPQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-v4lgHx+sR58CshZJCUYrtaW4EDFBUKFPJJ6V+eyf5Bc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/fa/faketty/package.nix b/pkgs/by-name/fa/faketty/package.nix index c9a816ee7980..2aa920deff31 100644 --- a/pkgs/by-name/fa/faketty/package.nix +++ b/pkgs/by-name/fa/faketty/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b6rHyg1rHMihmJ1okH11uDvOsqNydfK/c1cAgP6Tvx0="; }; - cargoHash = "sha256-LeTZkGhr1yTPG6OoukRB2+pcEAZKtjd9b60MLBi0Xl8="; + useFetchCargoVendor = true; + cargoHash = "sha256-POxCsGcM2P/fP/yEHuNFDz90H2qbKHgnuMowZS1hn7A="; postPatch = '' patchShebangs tests/test.sh diff --git a/pkgs/by-name/fa/fanctl/package.nix b/pkgs/by-name/fa/fanctl/package.nix index e7d622abd8bf..fac77d9c2fab 100644 --- a/pkgs/by-name/fa/fanctl/package.nix +++ b/pkgs/by-name/fa/fanctl/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw="; }; - cargoHash = "sha256-tj00DXQEqC/8+3uzTMWcph+1fNTTVZLSJbV/5lLFkFs="; + useFetchCargoVendor = true; + cargoHash = "sha256-CfONnF5gUnfPVmLSNzsk6xYEv70CnJfI3Gi9vCkrAcE="; meta = with lib; { description = "Replacement for fancontrol with more fine-grained control interface in its config file"; diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix index b7210b0d33dc..d2cb866f3cee 100644 --- a/pkgs/by-name/fb/fblog/package.nix +++ b/pkgs/by-name/fb/fblog/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YOHLw8YCgOGB1Nn2tD+EnicKd/tiMk07OWv+49btbpw="; }; - cargoHash = "sha256-+rhrvZ8EOYAFSvAvGyUwlDCWXVqgXPdmugBbrn12yLg="; + useFetchCargoVendor = true; + cargoHash = "sha256-rMpqf3UE/vEiLkocEwVjSCYrJKrUufUjZ9ldlBY86yI="; meta = with lib; { description = "Small command-line JSON log viewer"; diff --git a/pkgs/by-name/fc/fcast-client/package.nix b/pkgs/by-name/fc/fcast-client/package.nix index bd6cb675a3f4..46166d927bea 100644 --- a/pkgs/by-name/fc/fcast-client/package.nix +++ b/pkgs/by-name/fc/fcast-client/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "${src.name}/clients/terminal"; - cargoHash = "sha256-VVG7AbwbbgCANMcFYNAIF76MQr7Fkmq5HXPxL3MnEhI="; + useFetchCargoVendor = true; + cargoHash = "sha256-yzsAe+fr1yX8RBJPtXSr/R7W0iJpeF3JW3E4ius+8nU="; meta = { description = "FCast Client Terminal, a terminal open-source media streaming client"; diff --git a/pkgs/by-name/fc/fcp/package.nix b/pkgs/by-name/fc/fcp/package.nix index f65403bcb469..b8c6fe2e380c 100644 --- a/pkgs/by-name/fc/fcp/package.nix +++ b/pkgs/by-name/fc/fcp/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { ./0001-update-Cargo.lock.patch ]; - cargoHash = "sha256-wFXvaARflHsT1xz3muC/BPRmhnXEEIk2pBsu87E7Wo8="; + useFetchCargoVendor = true; + cargoHash = "sha256-WcbrHAgFTP5OtLI+T0d0BoIxG0MBJzPgjjgCWL2nPus="; nativeBuildInputs = [ expect ]; diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix index dd055f18f70d..13c16bcff36a 100644 --- a/pkgs/by-name/fd/fd/package.nix +++ b/pkgs/by-name/fd/fd/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-B+lOohoPH7UkRxRNTzSVt0SDrqEwh4hIvBF3uWliDEI="; }; - cargoHash = "sha256-H8xkm1cGJUaSgLUfN/vlxsWg5UMClvFhp9pjM0byQPs="; + useFetchCargoVendor = true; + cargoHash = "sha256-0LzraGDujLMs60/Ytq2hcG/3RYbo8sJkurYVhRpa2D8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index af1db2d92aec..593a79070073 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0MM5xpxBam95vSepDvVtpt/997XyC8aOqDiyPykHRRc="; }; - cargoHash = "sha256-y0vD4LrFv9bclCuA1xiFciO+lNY/MFw4aMk4/0USibA="; + useFetchCargoVendor = true; + cargoHash = "sha256-mSj8B9Ma9Zoz5SYmVj2yW0ZK6dqaMgq+nNPPFG0aIrY="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix index 664464e8e836..92f4f6a8289e 100644 --- a/pkgs/by-name/fe/felix-fm/package.nix +++ b/pkgs/by-name/fe/felix-fm/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PcC0lZ41qTVE4V3VdwBq83qYfEJO3RJouuS2+bpcBfo="; }; - cargoHash = "sha256-4tvk7H2CrTx9m1f0PLnNv+LWg6oIGTUfirRhIaz2lHo="; + useFetchCargoVendor = true; + cargoHash = "sha256-RFv1/LZ3PSNKkd7C1pzIsHPEubt47ThOrTOvjCdPb8M="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fe/fend/package.nix b/pkgs/by-name/fe/fend/package.nix index e2abc19aafc7..3099793d8755 100644 --- a/pkgs/by-name/fe/fend/package.nix +++ b/pkgs/by-name/fe/fend/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yRNfkP6DgXK1pLq50D9dMbbJaOX4ouQACJrfP5XrAJs="; }; - cargoHash = "sha256-y2H1BghzVvU/1WtAa4Yy2G9liKNbnyaufn5HbApwERA="; + useFetchCargoVendor = true; + cargoHash = "sha256-A/NqG5hrtTmbC3cpiRr16hQ6qyqfRhbrMGtB8KFcr1o="; nativeBuildInputs = [ pandoc diff --git a/pkgs/by-name/fe/fernglas/package.nix b/pkgs/by-name/fe/fernglas/package.nix index 62854f49e2d2..d11fd51fe809 100644 --- a/pkgs/by-name/fe/fernglas/package.nix +++ b/pkgs/by-name/fe/fernglas/package.nix @@ -37,7 +37,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FlbOBX/+/LLmoqMJLvu59XuHYmiohIhDc1VjkZu4Wzo="; }; - cargoHash = "sha256-ls9HvwtbpOwzQbi/+9IbgXurZp0LjQKGZcDuLZlX+Vk="; + useFetchCargoVendor = true; + cargoHash = "sha256-aY5/dIplV8yWaQ2IdWxxC7T1DoKeRjsN5eT+UxsaA1E="; offlineCache = fetchYarnDeps { yarnLock = src + "/frontend/yarn.lock"; diff --git a/pkgs/by-name/ff/ff2mpv-rust/package.nix b/pkgs/by-name/ff/ff2mpv-rust/package.nix index a5848b4ef93c..ea6ac7218fcc 100644 --- a/pkgs/by-name/ff/ff2mpv-rust/package.nix +++ b/pkgs/by-name/ff/ff2mpv-rust/package.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hAhHfNiHzrzACrijpVkzpXqrqGYKI3HIJZtUuTrRIcQ="; }; - cargoHash = "sha256-EKmysiq1NTv1aQ1DZGS8bziY4lRr+KssBgXa8MO76Ac="; + useFetchCargoVendor = true; + cargoHash = "sha256-/OvkUyknboMaUVj1N1lTq1jx6b+MK7aFeEbaHnoP6Xg="; postInstall = '' $out/bin/ff2mpv-rust manifest > manifest.json diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix index 2fb4315f66c3..81edec825164 100644 --- a/pkgs/by-name/ff/ffizer/package.nix +++ b/pkgs/by-name/ff/ffizer/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZX6Zv6ioAO33Cc5WCVBgJWlOmNvbVgckMylRnphpOdw="; }; - cargoHash = "sha256-4fZLL4vQxAeyqQssmEd1C72fzMXCGHtUPCGpaVupy6Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-JbCRD2P2jt2f+c2BUnb512p5ulein0guzgx4gj3SeVU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix index b2f7e55e74b6..4788d83bd1f4 100644 --- a/pkgs/by-name/fh/fh/package.nix +++ b/pkgs/by-name/fh/fh/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EepDB25iZ8li+fGwhqOqg7XipFBishv4SvcDE2FE+is="; }; - cargoHash = "sha256-lXcz0sX96Sjtrh4vmBSDJh1A1bCoxRyKcOj1ap1q+ng="; + useFetchCargoVendor = true; + cargoHash = "sha256-HfA0I1HZDwuTpyrWKAWcceamHw2flDA/35+bpkwFxm4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fi/fido2luks/package.nix b/pkgs/by-name/fi/fido2luks/package.nix index c19f7381a3bd..028052f1ea43 100644 --- a/pkgs/by-name/fi/fido2luks/package.nix +++ b/pkgs/by-name/fi/fido2luks/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ cryptsetup ]; - cargoHash = "sha256-BcwcgQzNH1p9pOVbelaGTN7bKqDgvxD4Red2JeavpJQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-WJXrT1jLytFkJ0gTE/4GYmfMqgqAyVFKi0SdyYGI/ug="; meta = { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; diff --git a/pkgs/by-name/fi/figma-agent/package.nix b/pkgs/by-name/fi/figma-agent/package.nix index 3c2137433c71..a342a7e56348 100644 --- a/pkgs/by-name/fi/figma-agent/package.nix +++ b/pkgs/by-name/fi/figma-agent/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { ./0001-update-time.patch ]; - cargoHash = "sha256-4X1sFgvrJuBeEPbcxrAt6tClOG63kwJ6eUzIRIv8tBs="; + useFetchCargoVendor = true; + cargoHash = "sha256-4OAce76XCLlngC7BrX8eiQlHo+Mi2Tfrb9t1Rc/gSFA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fi/findex/package.nix b/pkgs/by-name/fi/findex/package.nix index 3823e28c302e..11da0a804933 100644 --- a/pkgs/by-name/fi/findex/package.nix +++ b/pkgs/by-name/fi/findex/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IpgmeH5oREstud0nw4i2xYeZcJYG6eCWyw3hhid/DfU="; }; - cargoHash = "sha256-wsqsPh1kevkIz235qnkLkp47CnCh6qi56sZP95Upymc="; + useFetchCargoVendor = true; + cargoHash = "sha256-gTuw5UIdyyg7QmpjU4fIPy1oF67uFq2j+M0spIPCG+0="; postPatch = '' # failing rust documentation tests and faulty quotes "`README.md`" diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix index faf4a244057f..9f10e4ca6081 100644 --- a/pkgs/by-name/fi/fishnet/package.nix +++ b/pkgs/by-name/fi/fishnet/package.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { cp -v '${nnueSmall}' 'Fairy-Stockfish/src/${nnueSmallFile}' ''; - cargoHash = "sha256-HuVEg8uJ1WbXzYaXCPBobmxhbhk+X8D/xFcM2wE8Lh0="; + useFetchCargoVendor = true; + cargoHash = "sha256-aUSppXw0UDqCDX7YX+sYNEcmiABXDn0nrow0H9UjpaA="; passthru.tests.version = testers.testVersion { package = fishnet; diff --git a/pkgs/by-name/fj/fjo/package.nix b/pkgs/by-name/fj/fjo/package.nix index d843a8947a43..8283c7dbc07d 100644 --- a/pkgs/by-name/fj/fjo/package.nix +++ b/pkgs/by-name/fj/fjo/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KjH78yqfZoN24TBYyFZuxf7z9poRov0uFYQ8+eq9p/o="; }; - cargoHash = "sha256-2G/TdajAqKiSoTL5FnukfS/eHkTNaGOj9EFpKsdb02k="; + useFetchCargoVendor = true; + cargoHash = "sha256-iF2hIeRnyYYyyg45c1E3NIR9m7oonY18JlGvFSXy/Lc="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fl/flaca/package.nix b/pkgs/by-name/fl/flaca/package.nix index 4cdfaa4b7061..afc0f2322382 100644 --- a/pkgs/by-name/fl/flaca/package.nix +++ b/pkgs/by-name/fl/flaca/package.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - cargoHash = "sha256-n8GDe8OVmHYgBaSp9Zb7Z/F2orDAR6d82Tikrd0y6Ts="; + useFetchCargoVendor = true; + cargoHash = "sha256-3NGW1GEwksu9Al/qOg3rfnFcfSyICTgKlPW10Y8q80Y="; meta = with lib; { description = "CLI tool to losslessly compress JPEG and PNG images"; diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix index cfe799a143e9..a7bd5e5bad07 100644 --- a/pkgs/by-name/fl/flake-edit/package.nix +++ b/pkgs/by-name/fl/flake-edit/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dNTvAYBVZLeDlC1bsaonwojE7+1CD16/sCxtQVvT9WE="; }; - cargoHash = "sha256-ipLjbfnNqrUUD40awRnE8URX5pHhG4SwUM9JedoBM8Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-tp2tafuzo7lQQiSFvTe3MwRHXLTl+t/lYpEHF5aKO3o="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fl/flavours/package.nix b/pkgs/by-name/fl/flavours/package.nix index 3ec6115596c0..1d10b4a00563 100644 --- a/pkgs/by-name/fl/flavours/package.nix +++ b/pkgs/by-name/fl/flavours/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - cargoHash = "sha256-aimPeGIE5jP0pdrqwnzUzBqW0jz9+kcfpLdCN0r30xU="; + useFetchCargoVendor = true; + cargoHash = "sha256-9/2kiLuIyErwZ1O9457WkYbwlsbPY3P8wlH2hW0W1xU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/fl/flawz/package.nix b/pkgs/by-name/fl/flawz/package.nix index db579a6b0f76..be3025166951 100644 --- a/pkgs/by-name/fl/flawz/package.nix +++ b/pkgs/by-name/fl/flawz/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7p/BUXrElJutUcRMu+LxdsMxA6lCDnaci0fDaKGsawI="; }; - cargoHash = "sha256-jVAMnU2NnL/2Hri6NxSUkIfQ/bJ5wMZ+oFOTMPrFE0M="; + useFetchCargoVendor = true; + cargoHash = "sha256-X2RyavcPOQzuAt347KxfmNtO4YsFdncwUcBWtMfxaRU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix index e97969c57c2a..d315c16469f3 100644 --- a/pkgs/by-name/fl/flip-link/package.nix +++ b/pkgs/by-name/fl/flip-link/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Nw43I8EIlNGPptsLVxFBapFp6qdFoUOEicHc9FTcm2g="; }; - cargoHash = "sha256-OxmRIJ2LtAz+Paxzy1ppxnLliMocKbiJXf/io8mGPNQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-LYIgMKXaXN5gh+MvHf03za7qPJ8N8Ww7ykWB5TYOqkw="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/fl/flirt/package.nix b/pkgs/by-name/fl/flirt/package.nix index 2169efd63c7d..f0f80a9ddcd9 100644 --- a/pkgs/by-name/fl/flirt/package.nix +++ b/pkgs/by-name/fl/flirt/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xhNo85xwcVI4qliHU4/uNEvS7rW5avKOv8fMfRrvqD0="; }; - cargoHash = "sha256-9DmTSx1sKINnvJv3px8UKaa5j8AUnJiYB1lwnBR+xn8="; + useFetchCargoVendor = true; + cargoHash = "sha256-Nu4sOjwF/MlsoCmgUEGEqMIW+aSD9PuiFBQMnfQRL8Q="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fl/flitter/package.nix b/pkgs/by-name/fl/flitter/package.nix index 19efe2c399fc..05dee0723c00 100644 --- a/pkgs/by-name/fl/flitter/package.nix +++ b/pkgs/by-name/fl/flitter/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-8e13kSQEjzzf+j4uTrocVioZjJ6lAz+80dLfWwjPb9o="; }; - cargoHash = "sha256-NpUSWoOUhSgbzeCkXEgn4P387bada6fv/M8aZYe8CoU="; + useFetchCargoVendor = true; + cargoHash = "sha256-nhFTXjOXy9QxsASlZHC4jXAJ/Xw65g1l3JczOYvq3dc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix index 8c6146706d35..4065332ca941 100644 --- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix +++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-MDQFHQQWEStBwrwlGti5bY5HwACcrLrSR9Zs9DxTz/A="; + useFetchCargoVendor = true; + cargoHash = "sha256-4/Tmj0FFBLhGKbabE+kcoHqBX7rmlg3ps3oZ/hwuir8="; cargoBuildFlags = "--package flutter_rust_bridge_codegen"; cargoTestFlags = "--package flutter_rust_bridge_codegen"; diff --git a/pkgs/by-name/fm/fm/package.nix b/pkgs/by-name/fm/fm/package.nix index 7ec86ea86cc9..3e26d999a7eb 100644 --- a/pkgs/by-name/fm/fm/package.nix +++ b/pkgs/by-name/fm/fm/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-fCufqCy5H5Up6V15sOz8SJrixth7OQ7tc4yIymmfq1M="; }; - cargoHash = "sha256-E/mT+e17Qse4aPCY5Tuvih+ZMDnUqwvEBY0N70kciMs="; + useFetchCargoVendor = true; + cargoHash = "sha256-5B5TIFsfg7fWF5OEq0xVfkIUm1nlkvGfupr5qUtaiwA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fo/fontfor/package.nix b/pkgs/by-name/fo/fontfor/package.nix index d2a574780937..165b36aab0a5 100644 --- a/pkgs/by-name/fo/fontfor/package.nix +++ b/pkgs/by-name/fo/fontfor/package.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoHash = "sha256-9Ac2NuUFfluXN4NOT645gszGApBIsFxQiTZDf8PHbvo="; + useFetchCargoVendor = true; + cargoHash = "sha256-TOoNfGYQTr5UZeyasslJU9GRIAnH3p2a9UIFz8IJv7A="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix index 2d9d5c7632a8..9d6b7cc7b90e 100644 --- a/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/pkgs/by-name/fo/forgejo-cli/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage { hash = "sha256-rHyPncAARIPakkv2/CD1/aF2G5AS9bb3T2x8QCQWl5o="; }; - cargoHash = "sha256-kIOEUDJg7/08L9c/qt7NrT8U+xN3Ya5PBWPWmWj0Yx8="; + useFetchCargoVendor = true; + cargoHash = "sha256-PkKinAZrZ+v1/eygiPis4F7EJnmjYfeQFPKfGpza0yA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fo/formatjson5/package.nix b/pkgs/by-name/fo/formatjson5/package.nix index c82393ab490e..9e238c142287 100644 --- a/pkgs/by-name/fo/formatjson5/package.nix +++ b/pkgs/by-name/fo/formatjson5/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-zPgaZPDyNVPmBXz6QwOYnmh/sbJ8aPST8znLMfIWejk="; + useFetchCargoVendor = true; + cargoHash = "sha256-1CSt9dPVHdOqfQXio7/eXiDLWt+iOe6Qj+VtWblwSDE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix index 138b07aa255a..2a3da5f97053 100644 --- a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix +++ b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { inherit pname version; hash = "sha256-F0lZG1neAPVvyOxUtDPv0t7o+ZC+aQRtpFeq55QwcmE="; }; - cargoHash = "sha256-jYfsmPwhvt+ccUr4Vwq5q1YzNlxA+Vnpxd4KpWZrYo8="; + useFetchCargoVendor = true; + cargoHash = "sha256-FNMNHn1M0JzsgFqxXLUU3sEn7VB+YHVsWQCYVSxbUEg="; meta = { description = "Tools for building and running enclaves for the Fortanix SGX ABI"; homepage = "https://github.com/fortanix/rust-sgx"; diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index 295dde7c6805..1469d6233642 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Tpg0Jq2EhkwQuz5ZOtv6Rb5YESSlmzLoJPTxYJNNgac="; }; - cargoHash = "sha256-hxbvsAQsZWUAgj8QAlcxqBA5YagLO3/vz9lQGJMHUjw="; + useFetchCargoVendor = true; + cargoHash = "sha256-Kp3pv9amEz9oFMDhz0IZDmhpsok5VgrvJZfwSPyz2X0="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index 41a2a451d270..e4165faabc7e 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SdxcNbe8/dNZ4JcxKksWmDBAvQorpC8ePvQgnyeKgxU="; }; - cargoHash = "sha256-PQbp9jZZB/dsyKAlckZwl8xOpXks3anqUm+Ld7IhMFI="; + useFetchCargoVendor = true; + cargoHash = "sha256-5URvuHnpaceRbMqzTA+NRvpp/WLdf+zfmYhIMPiOhNk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; diff --git a/pkgs/by-name/fo/foxmarks/package.nix b/pkgs/by-name/fo/foxmarks/package.nix index 289719b3c2a2..0975258a6035 100644 --- a/pkgs/by-name/fo/foxmarks/package.nix +++ b/pkgs/by-name/fo/foxmarks/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tkmmu6A7vqK4yO9zHjVEeACaOHP3+hJQLBK7p/Svn7Q="; }; - cargoHash = "sha256-m3JtibgNHsZScxziNEu1ycslJocBXRbtloMWE0G5ZyM="; + useFetchCargoVendor = true; + cargoHash = "sha256-/B8T5OZMKQIj92PWWehzkO3iiI/lr5gl6jwXeglN9EU="; buildInputs = [ sqlite ]; diff --git a/pkgs/by-name/fr/frawk/package.nix b/pkgs/by-name/fr/frawk/package.nix index 57f3a44fbfd9..6e81d990cd9c 100644 --- a/pkgs/by-name/fr/frawk/package.nix +++ b/pkgs/by-name/fr/frawk/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wPnMJDx3aF1Slx5pjLfii366pgNU3FJBdznQLuUboYA="; }; - cargoHash = "sha256-Xk+iH90Nb2koCdGmVSiRl8Nq26LlFdJBuKmvcbgnkgs="; + useFetchCargoVendor = true; + cargoHash = "sha256-VraFR3Mp4mPh+39hw88R0q1p5iNkcQzvhRVNPwSxzU0="; buildInputs = [ libxml2 diff --git a/pkgs/by-name/fr/fre/package.nix b/pkgs/by-name/fr/fre/package.nix index b2679d2a5362..ddf57d3fd792 100644 --- a/pkgs/by-name/fr/fre/package.nix +++ b/pkgs/by-name/fr/fre/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cYqEPohqUmewvBUoGJQfa4ATxw2uny5+nUKtNzrxK38="; }; - cargoHash = "sha256-BEIrjHsIrNkFEEjCrTKwsJL9hptmVOI8x3ZWoo9ZUvQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-07qKG4ju2UOkTcgWAl2U0uqQZyiosK1UH/M2BvwMAaU="; meta = with lib; { description = "CLI tool for tracking your most-used directories and files"; diff --git a/pkgs/by-name/fr/frece/package.nix b/pkgs/by-name/fr/frece/package.nix index dc1e97dd756d..806c1496418b 100644 --- a/pkgs/by-name/fr/frece/package.nix +++ b/pkgs/by-name/fr/frece/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-CAiIqT5KuzrqbV9FVK3nZUe8MDs2KDdsKplJMI7rN9w="; }; - cargoHash = "sha256-eLN917L6l0vUWlAn3ROKrRdtyqaaMKjBQD2tEGWECUU="; + useFetchCargoVendor = true; + cargoHash = "sha256-4d1bgkwzC0jFD21Yb8mbnLXTqXTRsJPsMPidSRY4GVw="; meta = with lib; { description = "Maintain a database sorted by frecency (frequency + recency)"; diff --git a/pkgs/by-name/fr/freenukum/package.nix b/pkgs/by-name/fr/freenukum/package.nix index 19a787fe4fcf..92d77091b6b2 100644 --- a/pkgs/by-name/fr/freenukum/package.nix +++ b/pkgs/by-name/fr/freenukum/package.nix @@ -41,7 +41,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0="; }; - cargoHash = "sha256-8RfiObWDqZJg+sjjDBk+sRoS5CiECIdNPH79T+O8e8M="; + useFetchCargoVendor = true; + cargoHash = "sha256-lQZ9Z/1tbL7BeLmGxJXNUvrXsOGtgzGXNt6WYGezxi0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fr/french-numbers/package.nix b/pkgs/by-name/fr/french-numbers/package.nix index 48649d4e57a4..75628e6ffcc9 100644 --- a/pkgs/by-name/fr/french-numbers/package.nix +++ b/pkgs/by-name/fr/french-numbers/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6mcqT0RZddHlzjyZzx0JGTfCRcQ2UQ3Qlmk0VVNzsnI="; }; - cargoHash = "sha256-YmG+4837j7g3iK/nsP2P+WVcOqaPxKiS0jhcxkpEGXw="; + useFetchCargoVendor = true; + cargoHash = "sha256-HtgJsvl+BkvTapGxi7B/0QMEUolOw4gGndj4/9w7Z4Y="; cargoBuildFlags = [ "--features=cli" ]; diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix index 283f6a192066..8ecc5151b288 100644 --- a/pkgs/by-name/fs/fselect/package.nix +++ b/pkgs/by-name/fs/fselect/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-gEiKv1YbNNWexNfzUULbe0fT0ueJ9TJojhBHp31i6OY="; }; - cargoHash = "sha256-eqzqIyQHHklxo3aojCvY06TUPSqChoz6yZ2zzpgRNqs="; + useFetchCargoVendor = true; + cargoHash = "sha256-/FBEv1jDlYrx06Ia/lF3Vcjnl5nWg0aEQefY67kh9Bw="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/fs/fsrx/package.nix b/pkgs/by-name/fs/fsrx/package.nix index fb2e67ef7115..1e276064b9ef 100644 --- a/pkgs/by-name/fs/fsrx/package.nix +++ b/pkgs/by-name/fs/fsrx/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA="; }; - cargoHash = "sha256-bRStmz2sJnhCKpvoQfc/ZP9B2ZdNHYNEHd+wZErdS1Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-hOE05t3gjul7uOt14vr5hAmGHTPgxJk7EOKJhZ4XgCo="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/fs/fst/package.nix b/pkgs/by-name/fs/fst/package.nix index 33c819f881c1..9e16b78a479b 100644 --- a/pkgs/by-name/fs/fst/package.nix +++ b/pkgs/by-name/fs/fst/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-x2rvLMOhatMWU2u5GAdpYy2uuwZLi3apoE6aaTF+M1g="; }; - cargoHash = "sha256-yTbEaw+BbjVks3j7/b75kGoUjVftLaVYvYIdI/bbfdk="; + useFetchCargoVendor = true; + cargoHash = "sha256-zO2RYJpTyFFEQ+xZH4HU0CPaeiy6G3uq/qOwPawYSkk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/by-name/fu/fuc/package.nix b/pkgs/by-name/fu/fuc/package.nix index 771e7e861fed..8783a634fc47 100644 --- a/pkgs/by-name/fu/fuc/package.nix +++ b/pkgs/by-name/fu/fuc/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZEiMyX85woPOKaMtw8qqrUXUhY8Ewm71I25inUMH1GQ="; }; - cargoHash = "sha256-7xPZFZ+vWi6HbaHeIWEnOfQkHsLIMsHq+RuuDOWwusQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-hNF/WCLkuUDigDpTIVOrza0JNiRSnZeYJDjLqHlHBnw="; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/fu/function-runner/package.nix b/pkgs/by-name/fu/function-runner/package.nix index 2224285d3b5e..79bb6935028f 100644 --- a/pkgs/by-name/fu/function-runner/package.nix +++ b/pkgs/by-name/fu/function-runner/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-i1RxK5NlKNV0mVm4vio557pM2claBTHTo8vmaNQPEvw="; }; - cargoHash = "sha256-tOKNGXT3eyUBQnQSD6lsAzYK8rMKU7dCBsZhQYCSw7Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-97svZUTKcmC6EfY8yYDs2GrwpgRDj4dicDRzAza3cSY="; meta = with lib; { description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix index 2a3a889ee6e8..b406745ceb3c 100644 --- a/pkgs/by-name/fu/functiontrace-server/package.nix +++ b/pkgs/by-name/fu/functiontrace-server/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-p6ypMfg99ohQCyPB2O0wXbGmPvD2K9V3EnFDd5dC6js="; }; - cargoHash = "sha256-3tLjW7yiS1dNsV81KUZbfN2pvYT9kqiC62nWFid2NH8="; + useFetchCargoVendor = true; + cargoHash = "sha256-sPleuZV7eXlQjKqeHCIlRwu1FzneBh460yAElnxi6Do="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/fu/fundoc/package.nix b/pkgs/by-name/fu/fundoc/package.nix index 8b7893681579..218c966793cf 100644 --- a/pkgs/by-name/fu/fundoc/package.nix +++ b/pkgs/by-name/fu/fundoc/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-yapFUkG2JfGb3N3iVEDpQunOyRnbNTs+q3zQ23B23/s="; + useFetchCargoVendor = true; + cargoHash = "sha256-17PzGHSwruHPRKjyiHWBMqHANR5ulb+/J5UoVsOrbyc="; meta = with lib; { description = "Language agnostic documentation generator"; diff --git a/pkgs/by-name/fu/funzzy/package.nix b/pkgs/by-name/fu/funzzy/package.nix index 26b56805aa66..64b5ae43073b 100644 --- a/pkgs/by-name/fu/funzzy/package.nix +++ b/pkgs/by-name/fu/funzzy/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3EHZvgHlM3ldX6SEyqGf6MZIrDFOLXbKTZnJNczT570="; }; - cargoHash = "sha256-DJGpNuRb0bFdXBV/p3enyTvZgJIQOaNy3kijxuLFl1g="; + useFetchCargoVendor = true; + cargoHash = "sha256-n9UHyr7W4hrN0+2dsYAYqkP/uzBv74p5XHU0g2MReJY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix index ddc3b28bf655..a74114dda328 100644 --- a/pkgs/by-name/fw/fw/package.nix +++ b/pkgs/by-name/fw/fw/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fG1N/3Er7BvXOJTMGooaIMa5I9iNwnH+1om2jcWkI68="; }; - cargoHash = "sha256-1d2uX/A1HZAmAI3d0iet1NkG0IFuJpVnhWxpY0jVVUI="; + useFetchCargoVendor = true; + cargoHash = "sha256-wO0JoSsXHw5wJjh3N2P+ZQnld8pVQ4Pr8RduqqHFZtQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/g9/g933-utils/package.nix b/pkgs/by-name/g9/g933-utils/package.nix index 0d19b3b3382c..8340e2693d48 100644 --- a/pkgs/by-name/g9/g933-utils/package.nix +++ b/pkgs/by-name/g9/g933-utils/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-kGLMRqZHzRuXQNTjIuLz8JPC1c/ZK38msfkTIVnaomg="; }; - cargoHash = "sha256-FBX5hrS8tNWN83XX+x+s/mYyvO1h6V63bXCx7y0R8bY="; + useFetchCargoVendor = true; + cargoHash = "sha256-xjn9EHYa8LJnj3GCZuug4IznxNCLzb9dtEnoQHRcdh8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/ga/galerio/package.nix b/pkgs/by-name/ga/galerio/package.nix index 1801ebd412b5..eab5e1f4ba95 100644 --- a/pkgs/by-name/ga/galerio/package.nix +++ b/pkgs/by-name/ga/galerio/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JR/YfMUs5IHBRr3uYqHXLNcr23YHyDvgH2y/1ip+2Y8="; }; - cargoHash = "sha256-nYaCN09LP/2MfNRY8oZKtjzFCBFCeRF1IZ2ZBmbHg7I="; + useFetchCargoVendor = true; + cargoHash = "sha256-jXUAjK/fqBaXaehcbFZU02w9/MTHluqKjtWGoAJa7ks="; meta = with lib; { description = " A simple generator for self-contained HTML flexbox galleries"; diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix index d4cc3b2aa8eb..2c22af0be73b 100644 --- a/pkgs/by-name/ga/game-rs/package.nix +++ b/pkgs/by-name/ga/game-rs/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FuZl2yNre5jNSfHqF3tjiGwg5mRKbYer2FOPpLy0OrA="; }; - cargoHash = "sha256-fNC8Aff09nTSbtxZg5qEKtvFyKFLRVjaokWiZihZCgM="; + useFetchCargoVendor = true; + cargoHash = "sha256-klgcHNZ0vwy2iOYpwbdR37++WLAPx1ARNadfYTTqePw="; buildFeatures = [ "nixos" ]; diff --git a/pkgs/by-name/ge/gen-license/package.nix b/pkgs/by-name/ge/gen-license/package.nix index 86ded78e0309..d55dda6ebc21 100644 --- a/pkgs/by-name/ge/gen-license/package.nix +++ b/pkgs/by-name/ge/gen-license/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VOmt8JXd2+ykhkhupv/I4RfXz9P0eEesW3JGAoXStUI="; }; - cargoHash = "sha256-TEsWACxEs4eJ8rO4RnKJWpwT1KcDoBEGftHSJt4YXVw="; + useFetchCargoVendor = true; + cargoHash = "sha256-xXzUobB8RMyJOC4lKayE+6SKC7NW1dNWGUUH3i1TaW0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ge/genact/package.nix b/pkgs/by-name/ge/genact/package.nix index e7763ee219c4..b39b47eb741b 100644 --- a/pkgs/by-name/ge/genact/package.nix +++ b/pkgs/by-name/ge/genact/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Rn9kJWutWKPj9cLu2ZJKITmC+I8/ikhCAoIp00Yg6ZA="; }; - cargoHash = "sha256-kmXtwS5pCLEq5dbNHtWYGzDKjOUlVlr5xippVd2wl8k="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ttg9stfiIYCXk35+GWdGOzQrM/aYZPZK+e9y+zw1ZXQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix index 0decad7a3c83..dd41285c3a6b 100644 --- a/pkgs/by-name/ge/genemichaels/package.nix +++ b/pkgs/by-name/ge/genemichaels/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pzGTKswETm7RR0up1eSWC+X633rsVmEAJ3DYM8z6paQ="; }; - cargoHash = "sha256-FjggpBTzxj9AOJjUq5PmbuE/ImmTMpxN0se9uxRy4KQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-J7uibeoIKLC3jo5TstzC8udK+miAA52321eapOHVzbM="; cargoBuildFlags = [ "--package ${pname}" ]; # cargoTestFlags is not used because genemichaels is tightly coupled to the diff --git a/pkgs/by-name/ge/geticons/package.nix b/pkgs/by-name/ge/geticons/package.nix index 59dbc3470872..35b194e561b6 100644 --- a/pkgs/by-name/ge/geticons/package.nix +++ b/pkgs/by-name/ge/geticons/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HEnUfOLeRTi2dRRqjDPVwVVHo/GN9wE28x5qv3qOpCY="; }; - cargoHash = "sha256-Znwni7uMnG9cpZbztUMY1j73K+XrDLv5zyNEZDoxWg4="; + useFetchCargoVendor = true; + cargoHash = "sha256-V3e3boIzn76irAfn9fF9MycPRAWorUUSD/CUZhgKv0E="; passthru.updateScript = gitUpdater { }; meta = with lib; { diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix index b23169f058e2..2003ac6fc200 100644 --- a/pkgs/by-name/ge/gex/package.nix +++ b/pkgs/by-name/ge/gex/package.nix @@ -40,7 +40,8 @@ rustPlatform.buildRustPackage rec { ./patch-libgit2.patch ]; - cargoHash = "sha256-GEQ4Zv14Dzo9mt1YIDmXEBHLPD6G0/O1ggmUTnSYD+k="; + useFetchCargoVendor = true; + cargoHash = "sha256-LCmc0yYuy51r2wHEzsJMfssCElG1AbnLLWYYnbk0Ddw="; meta = with lib; { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix index 35744412eddd..71eab2df206d 100644 --- a/pkgs/by-name/gh/ghciwatch/package.nix +++ b/pkgs/by-name/gh/ghciwatch/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jHjUpLSu1+rshZ37ZyXjh5Q4WrFkqZUk8gxErN+vpQM="; }; - cargoHash = "sha256-TiMqWF+MJseK5KMj+G4j66gJ0mQdW+VKglgBq2qPd6A="; + useFetchCargoVendor = true; + cargoHash = "sha256-sTlAyU9qRI+v5tsyoW4bWvqWvR8/ksDoYpy4pQXU0Xw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/gi/gimoji/package.nix b/pkgs/by-name/gi/gimoji/package.nix index 5d070b9fb9ab..ea4c142d369e 100644 --- a/pkgs/by-name/gi/gimoji/package.nix +++ b/pkgs/by-name/gi/gimoji/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-X1IiDnnRXiZBL/JBDfioKc/724TnVKaEjZLrNwX5SoA="; }; - cargoHash = "sha256-4B+IRYnqwIqkxjRjlxER8O414Zd/8Are4fu1OxA+dWI="; + useFetchCargoVendor = true; + cargoHash = "sha256-vAhHCNsViYyNSKeSGUL2oIp8bp5UCm8HReyDuoFvfqs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/by-name/gi/girouette/package.nix b/pkgs/by-name/gi/girouette/package.nix index 26b926f381af..36092e7bb808 100644 --- a/pkgs/by-name/gi/girouette/package.nix +++ b/pkgs/by-name/gi/girouette/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CROd44lCCXlWF8X/9HyjtTjSlCUFkyke+BjkD4uUqXo="; }; - cargoHash = "sha256-AkagcIewHGPBYrITzI1YNPSJIN13bViDU6tbC+IeakY="; + useFetchCargoVendor = true; + cargoHash = "sha256-1jRm8tKL6QTBaCjFgt+NKQjdGjJIURTb3rs1SrrKwr4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/git-agecrypt/package.nix b/pkgs/by-name/gi/git-agecrypt/package.nix index e2a2c502031e..5136e112ffee 100644 --- a/pkgs/by-name/gi/git-agecrypt/package.nix +++ b/pkgs/by-name/gi/git-agecrypt/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-cmnBW/691mmLHq8tWpD3+zwCf7Wph5fcVdSxQGxqd1k="; }; - cargoHash = "sha256-FmlJeWMIIyTsg3TTLUia14et+aTgFCTkOr1J5dp0SGY="; + useFetchCargoVendor = true; + cargoHash = "sha256-71puTOjuV3egkip8pbiYbKxfhoZYtnirp4NrgiXR13I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/git-chain/package.nix b/pkgs/by-name/gi/git-chain/package.nix index 4916ef8eacbf..9514b00610f9 100644 --- a/pkgs/by-name/gi/git-chain/package.nix +++ b/pkgs/by-name/gi/git-chain/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-hRBymc4wmmniD4IwmgxSw1EIkT6omoqdrnwr+Eaa/yg="; }; - cargoHash = "sha256-nx7HRQd9HD9OcK41XiaC4m52atTWTPeGFVX7df2wv+0="; + useFetchCargoVendor = true; + cargoHash = "sha256-0Ur80eIKQIsM5vyIt+9YpFufHTk97+T+KXoAkJE90Ag="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/git-dive/package.nix b/pkgs/by-name/gi/git-dive/package.nix index b730a025af0c..f98afaf57f86 100644 --- a/pkgs/by-name/gi/git-dive/package.nix +++ b/pkgs/by-name/gi/git-dive/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sy2qNFn8JLE173HVWfFXBx21jcx4kpFMwi9a0m38lso="; }; - cargoHash = "sha256-Z3TgVunC/qNzUe0X9xIg3fTFXFk2w9yDA+EskSCg0Qo="; + useFetchCargoVendor = true; + cargoHash = "sha256-qRF111ofiM8SNUjQfpDg75OPpJnP7fOqM8Ih3NQUdGY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/git-gamble/package.nix b/pkgs/by-name/gi/git-gamble/package.nix index 943c075a00d1..228bc39b6bf5 100644 --- a/pkgs/by-name/gi/git-gamble/package.nix +++ b/pkgs/by-name/gi/git-gamble/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { pname = "git-gamble"; inherit version src; - cargoHash = "sha256-vrzcNdLY2PkyZ1eLwOiONRHVAolbTDxytEgi09WkDZQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-t58vf/xhJi5HV9lBWvXzKMZ8I2stjTAmCOrdLWPerGI="; nativeCheckInputs = [ gitMinimal ]; preCheck = '' diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix index 46113ce2a757..c778dd82857b 100644 --- a/pkgs/by-name/gi/git-gr/package.nix +++ b/pkgs/by-name/gi/git-gr/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage { buildFeatures = [ "clap_mangen" ]; - cargoHash = "sha256-oukVU3YZMI2Z6HqIrEe2npmCj9PtwQUT6VOPkklM0Ig="; + useFetchCargoVendor = true; + cargoHash = "sha256-5YHE1NVUcZ5NeOl3Z87l3PVsmlkswhnT83Oi9loJjdM="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/gi/git-graph/package.nix b/pkgs/by-name/gi/git-graph/package.nix index a20fdcc54166..2d4f938f98a3 100644 --- a/pkgs/by-name/gi/git-graph/package.nix +++ b/pkgs/by-name/gi/git-graph/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xYUpLujePO1MS0c25UJX5rRdmPzkaFgF5zJonzQOJqM="; }; - cargoHash = "sha256-y5tVjWj/LczblkL793878vzDG0Gtj3kIo2jZlRA6GJE="; + useFetchCargoVendor = true; + cargoHash = "sha256-tN70YyhVkLD5OiYNm64vbY5NtKAG2sFp4Ry6vFpXvtE="; meta = with lib; { description = "Command line tool to show clear git graphs arranged for your branching model"; diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix index 65ee35a5e763..e8937ae98db9 100644 --- a/pkgs/by-name/gi/git-igitt/package.nix +++ b/pkgs/by-name/gi/git-igitt/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage { hash = "sha256-JXEWnekL9Mtw0S3rI5aeO1HB9kJ7bRJDJ6EJ4ATlFeQ="; }; - cargoHash = "sha256-5UgcgM/WuyApNFCd8YBodx9crJP3+Bygu9nSBJqPCaQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-ndxxkYMFHAX6uourCyUpvJYcZCXQ5X2CMX4jTJmNRiQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/git-ignore/package.nix b/pkgs/by-name/gi/git-ignore/package.nix index b418e4ded43d..cdea4dec381c 100644 --- a/pkgs/by-name/gi/git-ignore/package.nix +++ b/pkgs/by-name/gi/git-ignore/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KIdhsbD9v2kCM2C/kSJCleyniEz4Bw7UxBsF762fnJs="; }; - cargoHash = "sha256-UicChl0wD2GSCCHAqF4/FKVq15g9qusNOnNJJW2B/nw="; + useFetchCargoVendor = true; + cargoHash = "sha256-Zdy6bUgpaDBiAavSlAAH7LyYbNm7UU1qz0wAnVXQzpY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/gi/git-instafix/package.nix b/pkgs/by-name/gi/git-instafix/package.nix index 90abdb11e819..240927c7a8c0 100644 --- a/pkgs/by-name/gi/git-instafix/package.nix +++ b/pkgs/by-name/gi/git-instafix/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Uz+KQ8cQT3v97EtmbAv2II30dUrFD0hMo/GhnqcdBOs="; }; - cargoHash = "sha256-12UkZyyu4KH3dcCadr8UhK8DTtVjcsjYzt7kiNLpUqU="; + useFetchCargoVendor = true; + cargoHash = "sha256-B0XTk0KxA60AuaS6eO3zF/eA/cTcLwA31ipG4VjvO8Q="; buildInputs = [ libgit2 ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix index 6a8db4bcd889..09d705cd9eb6 100644 --- a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix +++ b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NlnESZua4OP7rhMoER/VgBST9THqISQ0LCG1ZakNTqs="; }; - cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-WTg1o2iF5/UOVIqKFqGbC28B4HrKJWM0+XCHgaA1lc4="; # Compilation during tests fails if this env var is not set. preCheck = "export GIRT_BUILD_GIT_HASH=${version}"; diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix index eb3f5d93ea0e..f065a7964fa3 100644 --- a/pkgs/by-name/gi/git-mit/package.nix +++ b/pkgs/by-name/gi/git-mit/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage { hash = "sha256-+7rl4wxVQq4bLBsnLSeJD+1kkRuf7FCi81pXGrNNOPI="; }; - cargoHash = "sha256-44Eo3ewjJj+JLnGfqm3Zb4v4qKklC23pFyJSGcKE8q8="; + useFetchCargoVendor = true; + cargoHash = "sha256-sdAs8zJlmTqapWJNDck9YUHIiXhi0Ji6smejE5jEQXQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/git-nomad/package.nix b/pkgs/by-name/gi/git-nomad/package.nix index 34e2b95c9ba2..6138288312f5 100644 --- a/pkgs/by-name/gi/git-nomad/package.nix +++ b/pkgs/by-name/gi/git-nomad/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-G/i+mCKZSe8tPMuCLzymkU9SGyFNHY74cGhcC4ru0/k="; }; - cargoHash = "sha256-DEGYOPUr3tWDak1J0EkY2yjaLlXjKRH+9puC/oDJacg="; + useFetchCargoVendor = true; + cargoHash = "sha256-WfmHQ9HXEGfAKQXPMJFNeuOYA0NbmwWdntZjP/YHWCw="; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix index 72b4446e4251..dcb17af0894b 100644 --- a/pkgs/by-name/gi/git-prole/package.nix +++ b/pkgs/by-name/gi/git-prole/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-QwLkByC8gdAnt6geZS285ErdH8nfV3vsWjMF4hTzq9Y="; }; - cargoHash = "sha256-K4gIvK0qxMJh9SXF9JZFacDKv6TwvDQe8JVX2rtq/hU="; + useFetchCargoVendor = true; + cargoHash = "sha256-qghc8HtJfpTYXAwC2xjq8lLlCu419Ttnu/AYapkAulI="; nativeCheckInputs = [ git diff --git a/pkgs/by-name/gi/git-series/package.nix b/pkgs/by-name/gi/git-series/package.nix index 86277614bc4c..3eb3b357a559 100644 --- a/pkgs/by-name/gi/git-series/package.nix +++ b/pkgs/by-name/gi/git-series/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage { hash = "sha256-DtOR7+vX7efNzYMRJwJTj5cXlFHQwzcS0Gp2feVdea4="; }; - cargoHash = "sha256-D83mfaH4iKagGjdX+YhCzva99+dCneHeWPNnkzZB/k0="; + useFetchCargoVendor = true; + cargoHash = "sha256-hFiNK0MQmCPciflMwwR4gzU0Z+Q1WkPJrd4Hs33W8kw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/git-smash/package.nix b/pkgs/by-name/gi/git-smash/package.nix index 028b177eaed8..d11c61bb1666 100644 --- a/pkgs/by-name/gi/git-smash/package.nix +++ b/pkgs/by-name/gi/git-smash/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NyNYEF5g0O9xNhq+CoDPhQXZ+ISiY4DsShpjk5nP0N8="; }; - cargoHash = "sha256-omITZMBWzYlHHim/IXNa1rtiwHqpgLJ5G9z15YvDRi0="; + useFetchCargoVendor = true; + cargoHash = "sha256-YuSaSYr5W4zN7WnWjq7UClQtqx8AnaswOqlOq2WsZ6o="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix index ce1532cd61aa..2ecb8afd8129 100644 --- a/pkgs/by-name/gi/git-together/package.nix +++ b/pkgs/by-name/gi/git-together/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; - cargoHash = "sha256-mIkhXVuSgcsQf4be7NT0R8rkN9tdgim41gqjbq3ndPA="; + useFetchCargoVendor = true; + cargoHash = "sha256-5LKKjHzIlXw0bUmF7GDCVW0cptCxohq6CNPIrMZKorM="; meta = with lib; { changelog = "https://github.com/kejadlen/git-together/releases/tag/${src.rev}"; diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix index 0f80ba1665c5..9c930fa1e6d3 100644 --- a/pkgs/by-name/gi/git-upstream/package.nix +++ b/pkgs/by-name/gi/git-upstream/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-GnsqZSztDLXMO4T16nfcOKMKXap88CJzJ5nObzGwhMA="; }; - cargoHash = "sha256-a12C/fpeo0ZJ0MFQlKHVZER9dVrXF95YI1i8MwCTCJo="; + useFetchCargoVendor = true; + cargoHash = "sha256-DzRiRUCsTslldnSNByaCr5eQGKxyTSifL2duZnMTmNk="; meta = { homepage = "https://github.com/9999years/git-upstream"; diff --git a/pkgs/by-name/gi/git-vanity-hash/package.nix b/pkgs/by-name/gi/git-vanity-hash/package.nix index 55332c6c7287..9e6f9e9ab8cd 100644 --- a/pkgs/by-name/gi/git-vanity-hash/package.nix +++ b/pkgs/by-name/gi/git-vanity-hash/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { hash = "sha256-1z4jbtzUB3SH79dDXAITf7Vup1YZdTLHBieSrhrvSXc="; }; - cargoHash = "sha256-+SQ0HpURBjnnwH1Ue7IUReOtI4LxVPK9AGSAihs0qsc="; + useFetchCargoVendor = true; + cargoHash = "sha256-aHqH7SQBIe0oqD3MegWvAR3UvzRBm2X92lP931nVVtA="; postInstall = '' mkdir -p $out/share/doc/git-vanity-hash diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix index 11eaa3d06239..e9354148650d 100644 --- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HpFdebG4pRa+g2ycOOfnWgN/+DcYdPHAN/RHBHN6S8A="; }; - cargoHash = "sha256-CS3MkCumqHmTcRf/YJr/M8s7BoGos/ixXm97BCCXBvw="; + useFetchCargoVendor = true; + cargoHash = "sha256-b1G4r1z87IX3oWgVBMD9Z2+Ii3iSIL65TZWrX7wjXD0="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/by-name/gi/gitlab-clippy/package.nix b/pkgs/by-name/gi/gitlab-clippy/package.nix index 37aa54ff81eb..99cf4bcc279f 100644 --- a/pkgs/by-name/gi/gitlab-clippy/package.nix +++ b/pkgs/by-name/gi/gitlab-clippy/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { rev = version; hash = "sha256-d7SmlAWIV4SngJhIvlud90ZUSF55FWIrzFpkfSXIy2Y="; }; - cargoHash = "sha256-ztPbI+ncMNMKnIxUksxgz8GHQpLZ7SVWdC4QJWh18Wk="; + useFetchCargoVendor = true; + cargoHash = "sha256-O3Pey0XwZITePTiVHrG5EVZpIp96sRWjUf1vzZ/JnCw="; # TODO re-add theses tests once they get fixed in upstream checkFlags = [ diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix index c64664000b99..925b13b71b61 100644 --- a/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { iconv ]; - cargoHash = "sha256-MYqrA4uYgiuDJkUuXITpaJ0P555dTUmmQwJcPju9HwY="; + useFetchCargoVendor = true; + cargoHash = "sha256-qSIRcf0HpRg1Eu12L6UcJajHBgjJgfhsHmF1oV1h8HM="; meta = { description = " CLI utility to support you with your time logs in GitLab"; diff --git a/pkgs/by-name/gi/gitnr/package.nix b/pkgs/by-name/gi/gitnr/package.nix index 312810b72a1c..867bc19a9bd8 100644 --- a/pkgs/by-name/gi/gitnr/package.nix +++ b/pkgs/by-name/gi/gitnr/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9vx+bGfYuJuafZUY2ZT4SAgrNcSXuMe1kHH/lrpItvM="; }; - cargoHash = "sha256-ZvF8X+IT7mrKaUaNS4NhYzX9P3hkhNNH/ActxG/6YZE="; + useFetchCargoVendor = true; + cargoHash = "sha256-DlYV92ZbkeUieVmyaxVuCslkwAgWrULu4HerLFXZZtE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/gitprompt-rs/package.nix b/pkgs/by-name/gi/gitprompt-rs/package.nix index 03443767451d..888167b3b2bd 100644 --- a/pkgs/by-name/gi/gitprompt-rs/package.nix +++ b/pkgs/by-name/gi/gitprompt-rs/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-U0ylhgD86lbXvt6jMLaEQdL/zbcbXnfrA72FMEzBkN0="; }; - cargoHash = "sha256-N0ROUFdTA8umiUcZuKkANPCPHCPKIyNOLHRWta/253s="; + useFetchCargoVendor = true; + cargoHash = "sha256-1ihTH/Ft9/8wjRRR0Mt3m8AUYvUEARzdr+R77LjSxzY="; postPatch = '' substituteInPlace src/main.rs \ diff --git a/pkgs/by-name/gi/gitrs/package.nix b/pkgs/by-name/gi/gitrs/package.nix index bec55dbbca68..ad626a77f805 100644 --- a/pkgs/by-name/gi/gitrs/package.nix +++ b/pkgs/by-name/gi/gitrs/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+43XJroPNWmdUC6FDL84rZWrJm5fzuUXfpDkAMyVQQg="; }; - cargoHash = "sha256-2TXm1JTs0Xkid91A5tdi6Kokm0K1NOPmlocwFXv48uw="; + useFetchCargoVendor = true; + cargoHash = "sha256-uDDk1wztXdINPSVF6MvDy+lHIClMLp13HZSTpIgLypM="; nativeBuildInputs = [ pkg-config # for openssl diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index ab3210699161..bf4f69637d31 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/g+hjQQhu771yqLhx4THaNCJKShXB7RoxiS9bQDUijU="; }; - cargoHash = "sha256-cK7TjrP2KW3w7UFr+6pUIjeesPaJKs4lXorw98zwuD4="; + useFetchCargoVendor = true; + cargoHash = "sha256-e9LaVNpApHAShkqt2TawRLWVQ7IoE9hoXlMyMRmpeCY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix index 2a36ce429223..f1db72724190 100644 --- a/pkgs/by-name/gi/gitui/package.nix +++ b/pkgs/by-name/gi/gitui/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage { hash = "sha256-jKJ1XnF6S7clyFGN2o3bHnYpC4ckl/lNXscmf6GRLbI="; }; - cargoHash = "sha256-T00TqxR2EWnDkZo3MUQhiG0oAUf1PgpkUMZLt7f4FH0="; + useFetchCargoVendor = true; + cargoHash = "sha256-Le/dD8bTd5boz1IeEq4ItJZYC3MRW8uiT/3Zy1yv5L0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gl/glas/package.nix b/pkgs/by-name/gl/glas/package.nix index 589d649fa46d..45f7ae6715ff 100644 --- a/pkgs/by-name/gl/glas/package.nix +++ b/pkgs/by-name/gl/glas/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jMpFxzosaCedwsJ8URlR3Gd/mnlgSBEfA3oIymmEPFU="; }; - cargoHash = "sha256-zESRtefoObpUsu4RfTsqJAyBNylouXffpNK3W/X+w9M="; + useFetchCargoVendor = true; + cargoHash = "sha256-uPCWHLqko361S/ThtWOP/XN1QFSHXv0dpYR3xweHqe0="; doInstallCheck = true; postInstallCheck = '' diff --git a/pkgs/by-name/gl/glicol-cli/package.nix b/pkgs/by-name/gl/glicol-cli/package.nix index 09eb57499dc6..3bb374b47600 100644 --- a/pkgs/by-name/gl/glicol-cli/package.nix +++ b/pkgs/by-name/gl/glicol-cli/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-v90FfF4vP5UPy8VnQFvYMKiCrledgNMpWbJR59Cv6a0="; }; - cargoHash = "sha256-fJ18SwVMotepUvdNPQumFWoOaotDzGTerb+Iy+qq5w0="; + useFetchCargoVendor = true; + cargoHash = "sha256-u6H+4cikI/jmcKpA2Ty2DjZF8wLiNylFMInA6sdNl0k="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gl/glitter/package.nix b/pkgs/by-name/gl/glitter/package.nix index 70d7fee9cb71..8f506e24bd07 100644 --- a/pkgs/by-name/gl/glitter/package.nix +++ b/pkgs/by-name/gl/glitter/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dImQLC7owPf2EB5COO5vjN3a6k7gJ88D2hMSUW2/wn4="; }; - cargoHash = "sha256-7JQcY3HCG3UQ0Mfz/+ZZ0axGEpQoH410FT72tjHW7EE="; + useFetchCargoVendor = true; + cargoHash = "sha256-gHwweWKRnRJRfVMxnIFkafbN9Sl+UTnnYRQF7QD3nCc="; nativeCheckInputs = [ gitMinimal diff --git a/pkgs/by-name/gl/globe-cli/package.nix b/pkgs/by-name/gl/globe-cli/package.nix index db414184d716..9efec8d3fdb7 100644 --- a/pkgs/by-name/gl/globe-cli/package.nix +++ b/pkgs/by-name/gl/globe-cli/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Np1f/mSMIMZU3hE0Fur8bOHhOH3rZyroGiVAqfiIs7g="; }; - cargoHash = "sha256-qoCOYk7hyjMx07l48IkxE6zsG58NkF72E3OvoZHz5d0="; + useFetchCargoVendor = true; + cargoHash = "sha256-pcmxtkj3+sS0TytQjrfQLc6qm2JUxtp82VNyvybl9vU="; meta = with lib; { description = "Display an interactive ASCII globe in your terminal"; diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix index 44d73439fe3b..fc2de8e52d78 100644 --- a/pkgs/by-name/gl/glrnvim/package.nix +++ b/pkgs/by-name/gl/glrnvim/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-n3t3s3fzmBGXRDydYxNJ13itKul8dyLNW6HP8Di4hY0="; }; - cargoHash = "sha256-cHEse+pXwgPTL8GJyY4s1mhWXGTY8Fnn2rFpA5SNerY="; + useFetchCargoVendor = true; + cargoHash = "sha256-oE1HXmJbKHegubqhsovat1ce/4rjdKGGTnmDdbRBo/k="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/gl/gluesql/package.nix b/pkgs/by-name/gl/gluesql/package.nix index 66f7297d5b87..b619ebd527ae 100644 --- a/pkgs/by-name/gl/gluesql/package.nix +++ b/pkgs/by-name/gl/gluesql/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-z2fpyPJfyPtO13Ly7XRmMW3rp6G3jNLsMMFz83Wmr0E="; }; - cargoHash = "sha256-xInwN/wZpHD3/vKcA+oYL9tmSD7P7/L8ZZOXZq0gkac="; + useFetchCargoVendor = true; + cargoHash = "sha256-QITNkSB/IneKj0w12FCKV1Y0vRAlOfENs8BpFbDpK2M="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gn/gnirehtet/package.nix b/pkgs/by-name/gn/gnirehtet/package.nix index ca194413ef0a..15024ae92ece 100644 --- a/pkgs/by-name/gn/gnirehtet/package.nix +++ b/pkgs/by-name/gn/gnirehtet/package.nix @@ -38,7 +38,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/relay-rust"; - cargoHash = "sha256-3oVWFMFzYsuCec1wxZiHXW6O45qbdL1npqYrg/m4SPc="; + useFetchCargoVendor = true; + cargoHash = "sha256-xfRTGGlL1/Bq04aGWJSGgkoTGKYiiUAdkHu4zJS3x/U="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix b/pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix index 48d4fea990ef..d55a6956e81d 100644 --- a/pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix +++ b/pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-VQjjLK2gnxbf7CzRjNrS/562fBGVAFMTxj6F71hOXrU="; }; - cargoHash = "sha256-P7hrSTb8XE/rCAGflbZwrqpQGxWnXFREqXSmZmIMAGU="; + useFetchCargoVendor = true; + cargoHash = "sha256-eqkdiNww0CBZ0ZfoirZSvpL7i/4b1XjN3NZFPOGkPko="; meta = with lib; { description = "Helper tool to watch GNOME Pomodoro timer"; diff --git a/pkgs/by-name/gn/gnome-randr/package.nix b/pkgs/by-name/gn/gnome-randr/package.nix index 4cd09ee2bcea..a17379b98ea3 100644 --- a/pkgs/by-name/gn/gnome-randr/package.nix +++ b/pkgs/by-name/gn/gnome-randr/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-mciHgBEOCFjRA4MSoEdP7bIag0KE+zRbk4wOkB2PAn0="; }; - cargoHash = "sha256-rk8/sg5rSNS741QOWoAGIloqph+ZdBjl/xUaFl0A3Bs="; + useFetchCargoVendor = true; + cargoHash = "sha256-FnJU/KtZrSXBEf7gjvlME52by3Fj7DwxmxUL4xXNBmk="; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix index aaefff5aa3b8..12f6e8f38c7e 100644 --- a/pkgs/by-name/go/gobang/package.nix +++ b/pkgs/by-name/go/gobang/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { cargoPatches = [ ./update-sqlx.patch ]; - cargoHash = "sha256-3A3bf7iq1acsWttKmcJmxWM74B0qUIcROBAkjDZFKxE="; + useFetchCargoVendor = true; + cargoHash = "sha256-K9oo0QrqcPNdV7WMlgSCVc+7AVfoyDkovvJLqKJPvTQ="; buildInputs = with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/go/gobble/package.nix b/pkgs/by-name/go/gobble/package.nix index 856971174890..20db5f4eef0e 100644 --- a/pkgs/by-name/go/gobble/package.nix +++ b/pkgs/by-name/go/gobble/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g4154Axvjp9jbE0lvMeNGM+v2UxkAsZqt9kPv5bhVK8="; }; - cargoHash = "sha256-5xsMLOYTKQc1bHHQsk9L4rHMVNBFOzIMxD+1qaMaNbQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-DnIZTeRyxhmVK2uB21ScPiEyL4k9kAWfVoLNIAM9P68="; buildInputs = [ xorg.libxcb ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/gotify-desktop/package.nix b/pkgs/by-name/go/gotify-desktop/package.nix index 9abc5bc183f7..5c3cc59e8ae8 100644 --- a/pkgs/by-name/go/gotify-desktop/package.nix +++ b/pkgs/by-name/go/gotify-desktop/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ISK1sI7NkXJBtuCkl5g8ffrGv5dYgzmpsmPTZmDAaMI="; }; - cargoHash = "sha256-QK2rzC9l+CiDv1+0NzR2x5B/5BYiY8KkLC2jxBdjXMU="; + useFetchCargoVendor = true; + cargoHash = "sha256-/YcKYLNFUHCCnOyvpdogsJ5auJVow3R/SM6xri5nmYg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/go/govee2mqtt/package.nix b/pkgs/by-name/go/govee2mqtt/package.nix index 1f4ef40510be..82f8151452d5 100644 --- a/pkgs/by-name/go/govee2mqtt/package.nix +++ b/pkgs/by-name/go/govee2mqtt/package.nix @@ -35,7 +35,8 @@ rustPlatform.buildRustPackage rec { --replace '"assets"' '"${placeholder "out"}/share/govee2mqtt/assets"' ''; - cargoHash = "sha256-wApf+H5T7HPkCGQwv8ePoDnStUn04oVvv3eIJ8aKVUw="; + useFetchCargoVendor = true; + cargoHash = "sha256-RJqAhAhrMHLunJwTtvUIBNO45xUWY251KXyX0RLruwk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index 09ed36ed54f1..2fd26d1dd832 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { }; buildAndTestSubdir = "apps/gpauth"; - cargoHash = "sha256-bZhLSKoki9aLEG+jmieCUitvR5mIfntzi+XcMJqyv3s="; + useFetchCargoVendor = true; + cargoHash = "sha256-8LSGuRnWRWeaY6t25GdZ2y4hGIJ+mP3UBXRjcvPuD6U="; nativeBuildInputs = [ perl diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix index 083aebeed74b..ba983f8d7ab0 100644 --- a/pkgs/by-name/gp/gpclient/package.nix +++ b/pkgs/by-name/gp/gpclient/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { inherit (gpauth) version src meta; buildAndTestSubdir = "apps/gpclient"; - cargoHash = "sha256-aanC0iwitvpKWCZSyaGVIkrWo/Hi1gjS19t3PfW+w4U="; + useFetchCargoVendor = true; + cargoHash = "sha256-8LSGuRnWRWeaY6t25GdZ2y4hGIJ+mP3UBXRjcvPuD6U="; nativeBuildInputs = [ perl diff --git a/pkgs/by-name/gp/gping/package.nix b/pkgs/by-name/gp/gping/package.nix index 62c36d0b1db7..5f07ef97c6b5 100644 --- a/pkgs/by-name/gp/gping/package.nix +++ b/pkgs/by-name/gp/gping/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RTjYgsi3PmmPufdTcxZr+Laipa32Kkq1M1eHSAJVWZQ="; }; - cargoHash = "sha256-c1GCF7Nztv7EpnPGPMRKdAQmeauy6OfI97e0nZWXe7E="; + useFetchCargoVendor = true; + cargoHash = "sha256-b7GsaAaCYz3ohE4BUHlvexJ41L0OhbcWkBo61X4FKzQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gp/gptman/package.nix b/pkgs/by-name/gp/gptman/package.nix index 5e227166226e..4b22c0a6c016 100644 --- a/pkgs/by-name/gp/gptman/package.nix +++ b/pkgs/by-name/gp/gptman/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ebV61EilGggix6JSN/MW4Ka0itkSpvikLDSO005TTYY="; }; - cargoHash = "sha256-P+qez0oVsHBiaBYban2o8MRvF8ElLf5zb+p+tYunWWA="; + useFetchCargoVendor = true; + cargoHash = "sha256-v27tKdBPrtRwpNZRjyv8N7BpxOz6ZgFHaa5pe51YrTI="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/gp/gpustat/package.nix b/pkgs/by-name/gp/gpustat/package.nix index 8942b854d26d..40e8417b2d58 100644 --- a/pkgs/by-name/gp/gpustat/package.nix +++ b/pkgs/by-name/gp/gpustat/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg="; }; - cargoHash = "sha256-po/pEMZEtySZnz7l2FI7Wqbmp2CiWBijchKGkqlIMPU="; + useFetchCargoVendor = true; + cargoHash = "sha256-8uD4zc33CeImvMW0mOTqws4S2xXQ3Ff9nPxocof0Xm4="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix index df4da88f86bc..396f60c54a03 100644 --- a/pkgs/by-name/gq/gql/package.nix +++ b/pkgs/by-name/gq/gql/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3aIZZvOmmGOa1+QHz7VrhLeEcyHSbsUMdD3PAqPpXVY="; }; - cargoHash = "sha256-IHh+7BdIZZOUyjJPHpuoUDfZDHUYoVQaMYjq1CCoxfM="; + useFetchCargoVendor = true; + cargoHash = "sha256-cAX6AEQlEmPqG7TxD8tzQ5/KSE4VOWaoTA2ZHQwdKRs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gr/grass-sass/package.nix b/pkgs/by-name/gr/grass-sass/package.nix index 058afa2d1130..753be458a8ae 100644 --- a/pkgs/by-name/gr/grass-sass/package.nix +++ b/pkgs/by-name/gr/grass-sass/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uk4XLF0QsH9Nhz73PmdSpwhxPdCh+DlNNqtbJtLWgNI="; }; - cargoHash = "sha256-Vnbda4dkCIRheqKq4umLhn2LCO7lkJQUuPrkExj9708="; + useFetchCargoVendor = true; + cargoHash = "sha256-2wJBYTOfaPBm+24ABl1cOs4W7UsRPYn70PSFDRRMCyU="; # tests require rust nightly doCheck = false; diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix index 927f30b77d6a..6fcb3d75affb 100644 --- a/pkgs/by-name/gr/grcov/package.nix +++ b/pkgs/by-name/gr/grcov/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { ./0001-update-time-rs.patch ]; - cargoHash = "sha256-zbraeXyuXgif46tRFQpEZVZ6bInrgKbrqRArmjFIgU8="; + useFetchCargoVendor = true; + cargoHash = "sha256-WOVIlUBPiZyBFfl3hwfN63jSxd3vysRY9VKUqk0lCc8="; # tests do not find grcov path correctly checkFlags = diff --git a/pkgs/by-name/gr/gridlock/package.nix b/pkgs/by-name/gr/gridlock/package.nix index 78a1c4877f97..fc65506c631e 100644 --- a/pkgs/by-name/gr/gridlock/package.nix +++ b/pkgs/by-name/gr/gridlock/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { hash = "sha256-I4NGfgNX79ZhWXDeUDJyDzP2GxcNhHhazVmmmPlz5js="; }; - cargoHash = "sha256-qz77c2IZGaWsinfkVTWqfEeBEtHng6W738jBwJAkrl4="; + useFetchCargoVendor = true; + cargoHash = "sha256-CflDi1sjPBX+FOj74DWYKcg0O8Q7bnCFhzEnCrRi0g8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gr/grip-grab/package.nix b/pkgs/by-name/gr/grip-grab/package.nix index 93564a6c03a5..3c7bff4d3f76 100644 --- a/pkgs/by-name/gr/grip-grab/package.nix +++ b/pkgs/by-name/gr/grip-grab/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-e7duLL4tjW+11jXUqU6sqoKTAPGkH81iDCfjtNcnd4I="; }; - cargoHash = "sha256-g7YdNNN6YJiW8sQa1KMj5evVbLPObRXrKM5HoG87Kxc="; + useFetchCargoVendor = true; + cargoHash = "sha256-i/wqlM4hoDPa9dmbSU5VVCYA4UdI5fI3EPadOj+/+LE="; doCheck = false; diff --git a/pkgs/by-name/gr/grpc-health-check/package.nix b/pkgs/by-name/gr/grpc-health-check/package.nix index 1d2f915c553a..addabeb57fb5 100644 --- a/pkgs/by-name/gr/grpc-health-check/package.nix +++ b/pkgs/by-name/gr/grpc-health-check/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-nKut9c1HHIacdRcmvlXe0GrtkgCWN6sxJ4ImO0CIDdo="; }; - cargoHash = "sha256-lz+815iE+oXBQ3PfqBO0QBpZY6x1SNR7OU7BjkRszzI="; + useFetchCargoVendor = true; + cargoHash = "sha256-NdwQ9gctO0Thaes2T5E9lo6dZ00+FoA3IO553g+NJh0="; nativeBuildInputs = [ protobuf ]; # tests fail diff --git a/pkgs/by-name/ha/hackgregator/package.nix b/pkgs/by-name/ha/hackgregator/package.nix index d914a9fc9fa9..21653e4697c6 100644 --- a/pkgs/by-name/ha/hackgregator/package.nix +++ b/pkgs/by-name/ha/hackgregator/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { hash = "sha256-RE0x4YWquWAcQzxGk9zdNjEp1pijrBtjV1EMBu9c5cs="; }; - cargoHash = "sha256-OPlYFUhAFRHqXS2vad0QYlhcwyyxdxi1kjpTxVlgyxs="; + useFetchCargoVendor = true; + cargoHash = "sha256-XI0dpW0BQoTgw7rCNTA3Imo5tU1eMqLvIHyqQD3sC6Q="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix index e5ba0c0747d5..02baea0f720c 100644 --- a/pkgs/by-name/ha/hadolint-sarif/package.nix +++ b/pkgs/by-name/ha/hadolint-sarif/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HPGVqAk1bXzeblTc4AnCLsHB60CKFV8ImO+MFqM10YI="; }; - cargoHash = "sha256-546mYNUn4Q9v95MBNdg7VWiLssWPwPYuW5YhTkKBFbI="; + useFetchCargoVendor = true; + cargoHash = "sha256-1nl5Myr8o1gyvkpsdMVLjZqnLkULOmxUOT0NmVe+0Oo="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ha/halp/package.nix b/pkgs/by-name/ha/halp/package.nix index e45c82332060..d90f793c3a7f 100644 --- a/pkgs/by-name/ha/halp/package.nix +++ b/pkgs/by-name/ha/halp/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SeBponGeQWKjbiS4GL8YA7y92BqLL+ja6ZSKAI3CeRM="; }; - cargoHash = "sha256-/mzbLsIc0PW5yx/m9eq3IWYM6i1MKvmOY+17/Bwjguk="; + useFetchCargoVendor = true; + cargoHash = "sha256-q+vfc0EQtGU8YsY11oun/F0OPffsjvB336y3qnerIDY="; patches = [ # patch tests to point to the correct target directory diff --git a/pkgs/by-name/ha/hamtransfer/package.nix b/pkgs/by-name/ha/hamtransfer/package.nix index dc284589c610..a8e25c4c5e7c 100644 --- a/pkgs/by-name/ha/hamtransfer/package.nix +++ b/pkgs/by-name/ha/hamtransfer/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-yZwbFjs+mnTbU+75dwRhVjvXXoHQuzgE9GlliUQZV1s="; }; - cargoHash = "sha256-lFzsURGhEcuTL6dHt4/l54eT3mD7H8tsW/+unisdjKY="; + useFetchCargoVendor = true; + cargoHash = "sha256-/fsK8zgoq819vdHTK9GwzzgyP1ZNhQ78yKai5783XS8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ha/handlr-regex/package.nix b/pkgs/by-name/ha/handlr-regex/package.nix index c29ea891ff5f..a998a60698b5 100644 --- a/pkgs/by-name/ha/handlr-regex/package.nix +++ b/pkgs/by-name/ha/handlr-regex/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xjrETTBHqekdPn2NwpGVoRoU8mf0F4jZN2yt0k8ypRA="; }; - cargoHash = "sha256-V/daNs2vk2N6N5eUq1haxxuNyGMBLLBSmBx0JozaN5A="; + useFetchCargoVendor = true; + cargoHash = "sha256-D7l+Xeohxe0D3gNcRUHLmpBfjz3zuD2tZd7HeKAnKF4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ha/handlr/package.nix b/pkgs/by-name/ha/handlr/package.nix index 5b69d273faa9..069a6998b00a 100644 --- a/pkgs/by-name/ha/handlr/package.nix +++ b/pkgs/by-name/ha/handlr/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-wENhlUBwfNg/r7yMKa1cQI1fbFw+qowwK8EdO912Yys="; }; - cargoHash = "sha256-30fSOzWq1CoIabPWGWndi/SaCN/ckxjlbtzuwV8rk6M="; + useFetchCargoVendor = true; + cargoHash = "sha256-/Kk2vuFkgtHarLrjqc5PkRZL2pV1Y7Gb02mWwtaVpDI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ha/hanko/package.nix b/pkgs/by-name/ha/hanko/package.nix index 3cc546a630ad..14ad1edaaf8d 100644 --- a/pkgs/by-name/ha/hanko/package.nix +++ b/pkgs/by-name/ha/hanko/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { tag = "v${version}"; hash = "sha256-gytnUta/sNa8vJMvVS/DMwRc4R/8rmOnEfBKEjRpfGs="; }; - cargoHash = "sha256-rlKFS1ppUoyZ1X2PeG8tEB44Ysqi7kCLqR+ECVIdPjs="; + useFetchCargoVendor = true; + cargoHash = "sha256-UHA7NI/LtyY8ucj+PavKdqym8o5HtGUD7+60UYnGohM="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/harmonia/package.nix b/pkgs/by-name/ha/harmonia/package.nix index 96204a03086c..3bb020bb09fb 100644 --- a/pkgs/by-name/ha/harmonia/package.nix +++ b/pkgs/by-name/ha/harmonia/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tqkTzUdwnTfVuCrcFag7YKgGkiR9srR45e4v0XMXVCY="; }; - cargoHash = "sha256-iZbIuYSC/RLmYEhBu46EEzN+WG2RoUJbZegedXkh+Rg="; + useFetchCargoVendor = true; + cargoHash = "sha256-3l+mRucDFc49Y96e2m5uixKvRSkrRaBWgJhPMIxuZvo="; doCheck = false; diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index fb1a1f105cb7..bb9870b4c977 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lpaE1yb9Yt1AVpZWBnvDOjTpVeKdTlXDnqNDrF0fCZ8="; }; - cargoHash = "sha256-2SFgtEA9dUM1KDgNpZXNVRLHzDCd/AZ4GqzkI8ULRf4="; + useFetchCargoVendor = true; + cargoHash = "sha256-7XXNNVATIrpUdse1JfIlHazx2DxkuDBtGgdJuF+D6jI="; meta = { description = "Grammar Checker for Developers"; diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix index e6c1ce16b416..f4bf3cb6a40a 100644 --- a/pkgs/by-name/ha/hatsu/package.nix +++ b/pkgs/by-name/ha/hatsu/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lIuaG7xfBQ1r3SkgSsXj1Ph9apxwP3oI42uunMh+ijU="; }; - cargoHash = "sha256-0pZ7g0HxceIYlflxeGnAs+SFSaSVNySbZxwK/ihRIAg="; + useFetchCargoVendor = true; + cargoHash = "sha256-gja8bVsnumJ0R3sN1WBV6WXAWjO9v/K+uBpNO1cTgRs="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index 99f0e8ccbe4e..99acd92a8293 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-G6nhWcrnMYysIHSocIeQsBGG51D1ozZPF/LGsDNG/+k="; }; - cargoHash = "sha256-xlaf6S4JeFmSuBOxykTXZlP2dXg4R/5RY7HsJi3/7PU="; + useFetchCargoVendor = true; + cargoHash = "sha256-LQAE/fgq2ixSrveTAKyd5zh1bl6znLhij04DD5wOTqw="; checkFlags = [ # Skip tests that require network access diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix index 830cb388e9ae..807f27e719e8 100644 --- a/pkgs/by-name/ha/hayabusa/package.nix +++ b/pkgs/by-name/ha/hayabusa/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-e2zoVIhxcE9cUypi8Uzz3YZe2JvIaEVuWOGpqHVtxn8="; }; - cargoHash = "sha256-aoticMTrKZkRtjVXgdiBfyXJN3YcwBpM3yt07BBd3do="; + useFetchCargoVendor = true; + cargoHash = "sha256-wWJIZRiDK32uGroIG36QvRSvPw18nFGfp7OI7VNhCWE="; enableParallelBuilding = true; diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix index cb89cc09a5bf..eca6966b8087 100644 --- a/pkgs/by-name/ha/hayagriva/package.nix +++ b/pkgs/by-name/ha/hayagriva/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-B0q5jwJVDpxywTuSspsfDameDfEkok5oTz/Oty9LkOI="; }; - cargoHash = "sha256-N+3W4x5p5qas47uwVT0NrJNe9udE+0rQLx/ypo1pbR4="; + useFetchCargoVendor = true; + cargoHash = "sha256-1YCmPGxDDnZmty8vMDUec45ZYXZbFA8GAT6UJQxa/4M="; buildFeatures = [ "cli" ]; diff --git a/pkgs/by-name/ha/haylxon/package.nix b/pkgs/by-name/ha/haylxon/package.nix index 5f8f71f4114f..3d965efa3743 100644 --- a/pkgs/by-name/ha/haylxon/package.nix +++ b/pkgs/by-name/ha/haylxon/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zAqYaPtbXqC1YFzCL8EwE1HhuSqVl5lAfnAftwBvnoE="; }; - cargoHash = "sha256-6vVsm4gdcFCxKvvmOi3wlHkFoZp8CG+u50NfxIZqCl8="; + useFetchCargoVendor = true; + cargoHash = "sha256-cKYHC8qz81P4xtehGQIvNH/g/pa90IJQbKz0RM9tjws="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/hc/hck/package.nix b/pkgs/by-name/hc/hck/package.nix index d2117342228c..4a6a27a691c9 100644 --- a/pkgs/by-name/hc/hck/package.nix +++ b/pkgs/by-name/hc/hck/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-QodwSirWCMQqimzUEcpH7lnCc2k4WIZiqww+kqI1zoU="; }; - cargoHash = "sha256-AUOaWtchrjFw/gpU9C3H0nu0NLmldV4xzwM/EcY+CWk="; + useFetchCargoVendor = true; + cargoHash = "sha256-TxYLfTw/CpU+bFfXYCpRfSk7b/aSNkcUvNaA1EGIFGc="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/he/heatseeker/package.nix b/pkgs/by-name/he/heatseeker/package.nix index 10d1772dad59..7843e5f8660e 100644 --- a/pkgs/by-name/he/heatseeker/package.nix +++ b/pkgs/by-name/he/heatseeker/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-SU5HLAFA7IHnVhsmVtxskteeKKIEvvVSqHIeEk5BkfA="; }; - cargoHash = "sha256-RHD2/Uvj8NWpZ+xK16xTN5K/hDWYhwHnu2E5NslGFQI="; + useFetchCargoVendor = true; + cargoHash = "sha256-1DquXOdtSGXSU9bYzSW1J3ElpUIYB71NVBcGxnREy/k="; # https://github.com/rschmitt/heatseeker/issues/42 # I've suggested using `/usr/bin/env stty`, but doing that isn't quite as simple diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix index 76517fdf22c0..f93de6fc5dd9 100644 --- a/pkgs/by-name/he/hebbot/package.nix +++ b/pkgs/by-name/he/hebbot/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-y+KpxiEzVAggFoPvTOy0IEmAo2V6mOpM0VzEScUOtsM="; }; - cargoHash = "sha256-7AEWQIUHpeK4aNFzzU10YeJErD0fJ6yQSHwFe4utOFo="; + useFetchCargoVendor = true; + cargoHash = "sha256-xRTl6Z6sn44yaEIFxG2vVKlbruDmOS2CdPZeVmWYOoA="; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/heh/package.nix b/pkgs/by-name/he/heh/package.nix index 0817f2173961..f38a1d4232a7 100644 --- a/pkgs/by-name/he/heh/package.nix +++ b/pkgs/by-name/he/heh/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w="; }; - cargoHash = "sha256-rLZgKLL28/ZrXzHVI6m4YeV2mk4E9W58HjTzRl2bMOw="; + useFetchCargoVendor = true; + cargoHash = "sha256-Sk/eL5Pza9L8GLBxqL9SqMT7KDWZenMjV+sGYaWUnzo="; meta = with lib; { description = "Cross-platform terminal UI used for modifying file data in hex or ASCII"; diff --git a/pkgs/by-name/he/heliocron/package.nix b/pkgs/by-name/he/heliocron/package.nix index 00ca02f3c5b3..f0bf7a9e693f 100644 --- a/pkgs/by-name/he/heliocron/package.nix +++ b/pkgs/by-name/he/heliocron/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5rzFz29Bpy2GR6bEt2DdCq9RtpdcY3SK/KnZrBrHUvk="; }; - cargoHash = "sha256-RjYE2TBvHnBgiwJi/Ys+wAmJoMHJuimcD07FOqwkcis="; + useFetchCargoVendor = true; + cargoHash = "sha256-as1rMyLqK0Z+UrO6B7Fzn2nNQM0xRrLoEPd2WlANxe8="; meta = { description = "Execute tasks relative to sunset, sunrise and other solar events"; diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix index a2657bfa83eb..311ae27ba67f 100644 --- a/pkgs/by-name/he/helix/package.nix +++ b/pkgs/by-name/he/helix/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { stripRoot = false; }; - cargoHash = "sha256-PVUzRl8yu2ha2El904WQo+EzvjGb3bXp+BAtZNlxAkE="; + useFetchCargoVendor = true; + cargoHash = "sha256-JZwURUMUnwc3tzAsN7NJCE8106c/4VgZtHHA3e/BsXs="; nativeBuildInputs = [ git diff --git a/pkgs/by-name/he/hex/package.nix b/pkgs/by-name/he/hex/package.nix index 202ea5c3dee9..b85d1d3836e8 100644 --- a/pkgs/by-name/he/hex/package.nix +++ b/pkgs/by-name/he/hex/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YctXDhCMJvDQLPsuhzdyYDUIlFE2vKltNtrFFeE7YE8="; }; - cargoHash = "sha256-Nlha9Zn0qaQhpN2ivbBvpIPxCN2I7BtJJULb6sYdpdo="; + useFetchCargoVendor = true; + cargoHash = "sha256-3lrNZyQVP+gswbF+pqQmVIHg3bjiJ22y87PtTHDwIXs="; passthru.tests.version = testers.testVersion { package = hex; diff --git a/pkgs/by-name/he/hexdino/package.nix b/pkgs/by-name/he/hexdino/package.nix index 0db1b3aa6eb3..0463ae92a94a 100644 --- a/pkgs/by-name/he/hexdino/package.nix +++ b/pkgs/by-name/he/hexdino/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-glbyftCJiP0/5trW7DOcVCU2q4ZH3zFK96eyGuYR8eY="; }; - cargoHash = "sha256-nldA8gDMj0iO+HgatiuMqzR6ZCjbxFsTp5pDGbFKA1k="; + useFetchCargoVendor = true; + cargoHash = "sha256-NfVtNoTDGx3MGOe+bUOCgjSs8ZTfxMSCTp09sXOfUPs="; meta = with lib; { description = "Hex editor with vim like keybindings written in Rust"; diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix index 867cdce43851..1e633897f8ad 100644 --- a/pkgs/by-name/he/hexpatch/package.nix +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DRuknqj4E+G4ChN5CH5N4Zrl3btSo1HdqiRPfLC5YTE="; }; - cargoHash = "sha256-5yZ+eJUjUUNCmJtFYRSzvdjZ7tnyjCO+lgwdDHluSGg="; + useFetchCargoVendor = true; + cargoHash = "sha256-tBOsFbJUi+xxYx+nEKBbwN8i0GDmGSjuJY05ghC6Rl0="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix index eb17fd568766..54d2d39dba45 100644 --- a/pkgs/by-name/he/hextazy/package.nix +++ b/pkgs/by-name/he/hextazy/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-j8KY8OTYG+Hl86OppbMyAFBSA89TO7hc8mcNgTGTlgM="; }; - cargoHash = "sha256-Ue7ukYkpNkoD9IRy/EWMsB5kMzwWny8onVNeN+3WWgQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-JPY1mge4aqO/QERCXYk+HzONjDJHi5og6lwQ68nUxqE="; meta = { description = "TUI hexeditor in Rust with colored bytes"; diff --git a/pkgs/by-name/he/hexyl/package.nix b/pkgs/by-name/he/hexyl/package.nix index 5b5b080415f6..a7b90f7a33c2 100644 --- a/pkgs/by-name/he/hexyl/package.nix +++ b/pkgs/by-name/he/hexyl/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TmFvv+jzOSM8kKCxBbUoDsUjKRPTplhWheVfIjS5nsY="; }; - cargoHash = "sha256-nfz5tpqJSPJvYDvzsl0tQHv0olLOi1d1PTo3lFDmIkI="; + useFetchCargoVendor = true; + cargoHash = "sha256-QjQoGtLF5BAxWFiLZZYCpwrYCdiVfvG/lAukCNZGsec="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/he/heygpt/package.nix b/pkgs/by-name/he/heygpt/package.nix index 8bd481458f30..dd3557c2ec60 100644 --- a/pkgs/by-name/he/heygpt/package.nix +++ b/pkgs/by-name/he/heygpt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oP0yIdYytXSsbZ2pNaZ8Rrak1qJsudTe/oP6dGncGUM="; }; - cargoHash = "sha256-yKHAZpELuUD7wlM3Mi7XvxbKgdU1QxD9hsvIFcj3twE="; + useFetchCargoVendor = true; + cargoHash = "sha256-z5Y/dhDEAd6JcWItlGyH+kDxHxIiyJw0KrjiTDT+Fwc="; nativeBuildInputs = [ openssl ]; diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index b845aeaa85f6..1e243b12a868 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yLhTQIu9C1ikm0TtoEPLSt7ZWqJXn4YE2Lrx38sSJtE="; }; - cargoHash = "sha256-j6J47b0CWbw4glOYam7VXt3IjPCdYY1y/U1d4Ho82uE="; + useFetchCargoVendor = true; + cargoHash = "sha256-HQit/1umI6+3O9m/Lrsykb72EtLbgM9HXbiMhXU/dr0="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/hi/highlight-assertions/package.nix b/pkgs/by-name/hi/highlight-assertions/package.nix index d8a0ca72988b..de32d33cb50f 100644 --- a/pkgs/by-name/hi/highlight-assertions/package.nix +++ b/pkgs/by-name/hi/highlight-assertions/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-7r8tBJ6JFGUGUsTivzlO23hHiXISajjn2WF12mmbmMg="; }; - cargoHash = "sha256-E2TNwCry7JOWy50+iLM9d+Tx4lIO6hkBtaHVLV8bDuo="; + useFetchCargoVendor = true; + cargoHash = "sha256-egrxcnDVKKgk1sL5WNMIR2FPwQbjjMy20VWizcTBEtM="; # requires nightly features RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/hi/himalaya/package.nix b/pkgs/by-name/hi/himalaya/package.nix index 026da8cff774..1368b9da32d6 100644 --- a/pkgs/by-name/hi/himalaya/package.nix +++ b/pkgs/by-name/hi/himalaya/package.nix @@ -19,7 +19,8 @@ let version = "1.1.0"; hash = "sha256-gdrhzyhxRHZkALB3SG/aWOdA5iMYkel3Cjk5VBy3E4M="; - cargoHash = "sha256-MLPXcPA90YZY55jwC7XUZ6KVJf4Pn8w19iT5E2HqZV0="; + useFetchCargoVendor = true; + cargoHash = "sha256-1KtS/lzVUEDiDCo3b8RFDYeTMsbHk2tIdniFZfoTxYk="; noDefaultFeatures = lib.warnIf (args ? buildNoDefaultFeatures) diff --git a/pkgs/by-name/hm/hmm/package.nix b/pkgs/by-name/hm/hmm/package.nix index da9fd42f19e2..9a749f166e8d 100644 --- a/pkgs/by-name/hm/hmm/package.nix +++ b/pkgs/by-name/hm/hmm/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WPePzqZ2iGeJ7kzTj8eg7q1JEjw91WY7gViJJ46SLRY="; }; - cargoHash = "sha256-CQnM7pFnk4LcstKllhbeohbrggKV6MBQy03oq7DEkP4="; + useFetchCargoVendor = true; + cargoHash = "sha256-wyuV+jWY7w4VDn314yRkqmeqgRijPb+XgmUiy73U3Zc="; nativeCheckInputs = [ perl diff --git a/pkgs/by-name/ho/hoard/package.nix b/pkgs/by-name/ho/hoard/package.nix index b84f583f5d47..52d8badc95fb 100644 --- a/pkgs/by-name/ho/hoard/package.nix +++ b/pkgs/by-name/ho/hoard/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c9iSbxkHwLOeATkO7kzTyLD0VAwZUzCvw5c4FyuR5/E="; }; - cargoHash = "sha256-4EeeD1ySR4M1i2aaKJP/BNSn+t1l8ingiv2ZImFFn1A="; + useFetchCargoVendor = true; + cargoHash = "sha256-+XZL0a7/9Ic6cmym3ctwmGMu4xjGPCA2E7OrBj7Bfvw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index a7955e3963fb..015ac2db396c 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage { hash = "sha256-o91p/m06pm9qoYZZVh+qHulqHO2G7xVJQPpEvRsq+8Q="; }; - cargoHash = "sha256-vTUiagI0eTrADr6zCMI5btLRvXgZSaohldg4jYmjfyA="; + useFetchCargoVendor = true; + cargoHash = "sha256-TQsqZhgmbHqNFgUddtRRKYkob0L40dJiSq8FxKnpPEE="; # Patch to disable prompt change of the shell when a target machine is run. Needed due to Nix declarative nature patches = [ diff --git a/pkgs/by-name/ht/htmx-lsp/package.nix b/pkgs/by-name/ht/htmx-lsp/package.nix index 49835f6a679c..74e67231ee8e 100644 --- a/pkgs/by-name/ht/htmx-lsp/package.nix +++ b/pkgs/by-name/ht/htmx-lsp/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CvQ+vgo3+qUOj0SS6/NrapzXkP98tpiZbGhRHJxEqeo="; }; - cargoHash = "sha256-qKiFUnNUOBakfK3Vplr/bLR+4L/vIViHJYgw9+RoRZQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-EQHNFiyQ7TwY4LldMFOTX0epilU76LPOiHQIIUsNhS8="; meta = with lib; { description = "Language server implementation for htmx"; diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index 5125b66b1b69..e331867f49bb 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g+UUiFgOTuSNymg3OcIsoTqWA/OOZzwFCUQ7YxW1AzE="; }; - cargoHash = "sha256-+ygXGSnhs9N7oHGqVA7Bo3JIgR8TZpY9y4tkBd4vZy8="; + useFetchCargoVendor = true; + cargoHash = "sha256-IUcuVeyoCsaQHg/08CTqEySmIh7v2fr7LDJCiYiq+FQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ht/httplz/package.nix b/pkgs/by-name/ht/httplz/package.nix index 25296b51cc5a..391b4f400bc9 100644 --- a/pkgs/by-name/ht/httplz/package.nix +++ b/pkgs/by-name/ht/httplz/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uxEMgSrcxMZD/3GQuH9S/oYtMUPzgMR61ZzLcb65zXU="; }; - cargoHash = "sha256-8cH8QrnkfPF0Di7+Ns/P/8cFe0jej/v7m4fkkfTFdvs="; + useFetchCargoVendor = true; + cargoHash = "sha256-DXSHaiiIRdyrlX4UYPFD3aTAv65k3x/PU2VW047odH0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/hu/hullcaster/package.nix b/pkgs/by-name/hu/hullcaster/package.nix index ec7d11575aec..268556d544bb 100644 --- a/pkgs/by-name/hu/hullcaster/package.nix +++ b/pkgs/by-name/hu/hullcaster/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TaELX/xMxm7OTmVnvkgEmdhnVrIlxSNqlE73+I5qxCc="; }; - cargoHash = "sha256-FeIZu/9yEk8U4a1AhqHyJBhpTP453km33FemwfhZckc="; + useFetchCargoVendor = true; + cargoHash = "sha256-jso9ofchUjpsck0qJN3rfFVM1Y6C8APmhwNzapU7Mug="; # work around error: Could not create filepath: /homeless-shelter/.local/share checkFlags = [ diff --git a/pkgs/by-name/hu/huniq/package.nix b/pkgs/by-name/hu/huniq/package.nix index 6118aae67e09..739b1e1ef0f6 100644 --- a/pkgs/by-name/hu/huniq/package.nix +++ b/pkgs/by-name/hu/huniq/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5GvHM05qY/Jj1mPYwn88Zybn6Nn5nJIaw0XP8iCcrwE="; }; - cargoHash = "sha256-pwDaLHJbVpZe7dAtd5/ytyHZkUHjCcNjtw3q7HF1qVQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-pE2LmoUUrIiKECte97AO2i5Ef22/qZwby/EDxTUr0x4="; meta = with lib; { description = "Command line utility to remove duplicates from the given input"; diff --git a/pkgs/by-name/hu/hunt/package.nix b/pkgs/by-name/hu/hunt/package.nix index bebad941e132..6c4c255ea472 100644 --- a/pkgs/by-name/hu/hunt/package.nix +++ b/pkgs/by-name/hu/hunt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-aNU4Ik033+kl9ZPHFzaAXZ6Hs+b7m5s0lpr1oovmWm0="; }; - cargoHash = "sha256-6sr0PU/Gb3CZ+RzvnEcu/v/F3PMyednCEk5wPSvwgmQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-rf/aBxuiv6c0cUJcFTCYoQPIEwCfhQQZqVSk0BxSzfQ="; meta = with lib; { description = "Simplified Find command made with Rust"; diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix index 4a49b8b29e87..c32fe9858337 100644 --- a/pkgs/by-name/hu/hurl/package.nix +++ b/pkgs/by-name/hu/hurl/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zrZWYnXUuzf2cS3n56/hWDvyXVM4Y/34SOlMPrtAhJo="; }; - cargoHash = "sha256-IuxTuIU9/6BpAXXunJ1Jjz3FPYRVPFNQhBqVAzMjNro="; + useFetchCargoVendor = true; + cargoHash = "sha256-sq0m6wkryfmthkPHMY0ZOXNhdNKnnsPLa/6tTsuWCS0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/hv/hvm/package.nix b/pkgs/by-name/hv/hvm/package.nix index bdbdbc74c342..071fbdf149b9 100644 --- a/pkgs/by-name/hv/hvm/package.nix +++ b/pkgs/by-name/hv/hvm/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+Cx+2v4JrQflDBaNZ9Fu8734Zr4rrgtnojUS4dkx7Ck="; }; - cargoHash = "sha256-crVEtMzjg9T0oiS13URevPuRYqod4d2Ylb1IWRPVpa8="; + useFetchCargoVendor = true; + cargoHash = "sha256-HpQQLFb9vUAGIEKrkGKOfUUNALYGnKCR3/HqA+qvamw="; meta = with lib; { description = "Massively parallel, optimal functional runtime in Rust"; diff --git a/pkgs/by-name/hw/hwatch/package.nix b/pkgs/by-name/hw/hwatch/package.nix index 513e0b726be9..4456f31856c8 100644 --- a/pkgs/by-name/hw/hwatch/package.nix +++ b/pkgs/by-name/hw/hwatch/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-E1IxeraZTHY+FDnOhyjygFyqOIwVEvnKuPuuNZvvL7o="; }; - cargoHash = "sha256-by5sAFk3PunlTbkPWYiAn6jIAPnjNTVD2pwkUJVRiOI="; + useFetchCargoVendor = true; + cargoHash = "sha256-gM9KLf2kEY48M8nQrSdBoqdU9ssQj4sH/hma3/+3JTw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/hy/hydra-check/package.nix b/pkgs/by-name/hy/hydra-check/package.nix index 11bd4c99373f..5117884adce1 100644 --- a/pkgs/by-name/hy/hydra-check/package.nix +++ b/pkgs/by-name/hy/hydra-check/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-QdCXToHNymOdlTyQjk9eo7LTznGKB+3pIOgjjaGoTXg="; }; - cargoHash = "sha256-iqFUMok36G1qSUbfY7WD6etY0dtfro3F7mLoOELzxbs="; + useFetchCargoVendor = true; + cargoHash = "sha256-zjpsMuwOdDm4St8M0h4yoJhTirgANJ6s5hfbayyq/uE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/hy/hydra-cli/package.nix b/pkgs/by-name/hy/hydra-cli/package.nix index bed0297be54e..0f171a6b81e6 100644 --- a/pkgs/by-name/hy/hydra-cli/package.nix +++ b/pkgs/by-name/hy/hydra-cli/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/hydra-cli"; - cargoHash = "sha256-WokdTMNA7MrbFcKNeFIRU2Tw6LyM80plDoZPX1v/hrc="; + useFetchCargoVendor = true; + cargoHash = "sha256-JnfonNdy87Ol6j8x3270RrVv/13vNLEa1n+/aeEbc7U="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/hy/hyperlink/package.nix b/pkgs/by-name/hy/hyperlink/package.nix index 04e699a6f3d3..602d34cf8465 100644 --- a/pkgs/by-name/hy/hyperlink/package.nix +++ b/pkgs/by-name/hy/hyperlink/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sx1OW056s40uhwwgGtNKiPkKSUy7/ZzSYGnjc0UKh/E="; }; - cargoHash = "sha256-4UEq9m5SWqmnzc++DjIeSq4ckTKgoxdt+8MekxiYGPE="; + useFetchCargoVendor = true; + cargoHash = "sha256-2/i+YllfS1ZC+nzmjBMJLjcq6Q+upFX2Wc+jmBO4zp0="; meta = with lib; { description = "Very fast link checker for CI"; diff --git a/pkgs/by-name/hy/hyprdim/package.nix b/pkgs/by-name/hy/hyprdim/package.nix index f0ea46e36b56..e2ee3d908230 100644 --- a/pkgs/by-name/hy/hyprdim/package.nix +++ b/pkgs/by-name/hy/hyprdim/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+nzIDtRLVA6CgCtbyeR+TU5euSZQb7wi2187IxLrAmQ="; }; - cargoHash = "sha256-UhlwVZ70t6CSQ4ZoXk0OdUqEVeOVMp+TmOSX5iyNNVI="; + useFetchCargoVendor = true; + cargoHash = "sha256-4EMzl0KGpDBGfHpHVx+7YwEti+DLUjPEipkRmzK+dyM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/hy/hyprland-activewindow/package.nix b/pkgs/by-name/hy/hyprland-activewindow/package.nix index 8086a4a132d3..cd501f14cedb 100644 --- a/pkgs/by-name/hy/hyprland-activewindow/package.nix +++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oH3BsS0KqnNdYe7HWHlfRSiUJx+vC3IveN+mcEgwZLs="; }; - cargoHash = "sha256-B9ZOz4U6tvUfFzI5pOuhazTZJH89jpxwRc+tbfNEZAk="; + useFetchCargoVendor = true; + cargoHash = "sha256-mvmjXzHyCegZhZYVod7Hb7Ot0Vwen78fujMCRvWv/uA="; meta = with lib; { description = "Multi-monitor-aware Hyprland workspace widget helper"; diff --git a/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix index 78ee30be5862..5afd37faa418 100644 --- a/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix +++ b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oXVKee3YAMXtVJBqJGt1SpH0KFzvIB278EN69A2OeXY="; }; - cargoHash = "sha256-Ub7jU9c0I/w4h1DBFvimP7SjkabkP9EF+qtHAPtdPFI="; + useFetchCargoVendor = true; + cargoHash = "sha256-zkv8Eb4k3Hu4PSQKOZTEu0dNFLeoKq03uY5S7G8fo4U="; doCheck = false; diff --git a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix index faea98dbef69..6e3c3426903b 100644 --- a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix +++ b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+bgOOm1B513COcWdUIJ/+GREQH5CR8/RNOcZVkjO2hI="; }; - cargoHash = "sha256-vQfDsP2Tc+Kj95wXIzPTlf6kRdBgdio0QkM9EJRjZjE="; + useFetchCargoVendor = true; + cargoHash = "sha256-pBg5R7k3xEE1EoSdLO4jmibTnGE+ndZnkWeMO+UXN6Q="; meta = with lib; { description = "Automatically run a script when a monitor connects (or disconnects) in Hyprland"; diff --git a/pkgs/by-name/hy/hyprland-per-window-layout/package.nix b/pkgs/by-name/hy/hyprland-per-window-layout/package.nix index f9c12a0c4926..ea7cf4f5dc3f 100644 --- a/pkgs/by-name/hy/hyprland-per-window-layout/package.nix +++ b/pkgs/by-name/hy/hyprland-per-window-layout/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Bwdh+Cy5LTRSBDfk4r28FmPRUEHYI++nKRhS9eSSbyg="; }; - cargoHash = "sha256-GX8Xo/1TwP/y+T1ErIjk+SriXyLpb1JDddYwod8DoxM="; + useFetchCargoVendor = true; + cargoHash = "sha256-QXT7utSEF5S5MWAng4fKMoloUJovxLT8oLUK9dJEb/0="; meta = with lib; { description = "Per window keyboard layout (language) for Hyprland wayland compositor"; diff --git a/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix index 3ec41e8b9c48..7a4b12d06f41 100644 --- a/pkgs/by-name/hy/hyprland-workspaces/package.nix +++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-a5P99aSqhlZqClXAoaUNv/jmuM5duLDf+OzMeKGwDVI="; }; - cargoHash = "sha256-LkAENnk1H1p8g7KKtkkh1aBtjXyM5scOtTROUaXwJhw="; + useFetchCargoVendor = true; + cargoHash = "sha256-UoL1b+T4z2hAl7GOga68qwAyCtm+Xo+AbyORmwvsqkw="; meta = with lib; { description = "Multi-monitor aware Hyprland workspace widget"; diff --git a/pkgs/by-name/hy/hyprnome/package.nix b/pkgs/by-name/hy/hyprnome/package.nix index 0df623c839e2..e9027f1bea35 100644 --- a/pkgs/by-name/hy/hyprnome/package.nix +++ b/pkgs/by-name/hy/hyprnome/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GZn7qS1J6QSanWdy17sMBbwJ77iMij2jKRgPdrjt6tM="; }; - cargoHash = "sha256-oxIZTp5ZJRUjXLpMw2nOnPHYHhHN03HWFRhBZ82Ac10="; + useFetchCargoVendor = true; + cargoHash = "sha256-qCexb8D0iN3BWOz5L45mR5n9x0nqAh8MHHTp9QTHSOg="; # Upstream has 'missing_docs = "deny"', which trips up test builds for 0.3.1 release. # Let's just treat lints as warnings. diff --git a/pkgs/by-name/hy/hyprsome/package.nix b/pkgs/by-name/hy/hyprsome/package.nix index a7bf15ee4f3b..6e49f61b6e5c 100644 --- a/pkgs/by-name/hy/hyprsome/package.nix +++ b/pkgs/by-name/hy/hyprsome/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-JiOV9c23yOhaVW2NHgs8rjM8l9qt181Tigf5sCnPep8="; }; - cargoHash = "sha256-Jqx77/PDWEJ+NPJN2R6n4w9nVPXQoHeuVfYKUB3i9Lg="; + useFetchCargoVendor = true; + cargoHash = "sha256-7q0PiY3y/+436/hPQ8wq2ry+BfPAbJAbnlJCrwN52Mw="; meta = { description = "Awesome-like workspaces for Hyprland"; diff --git a/pkgs/by-name/i3/i3-back/package.nix b/pkgs/by-name/i3/i3-back/package.nix index 5a165dda6079..722d750002d3 100644 --- a/pkgs/by-name/i3/i3-back/package.nix +++ b/pkgs/by-name/i3/i3-back/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { # The tool needs a nightly compiler. RUSTC_BOOTSTRAP = 1; - cargoHash = "sha256-Ot8f/58bAlpDSB11l14paCx2yjVoAYaHVIXaOzT1z/c="; + useFetchCargoVendor = true; + cargoHash = "sha256-o/um/Ugm3GfDz1daBKxoDD7ailUu6QJ0rj5jcKWB0lM="; passthru.tests.version = testers.testVersion { package = i3-back; }; diff --git a/pkgs/by-name/i3/i3-open-next-ws/package.nix b/pkgs/by-name/i3/i3-open-next-ws/package.nix index aa4e601596e1..9802a3a16684 100644 --- a/pkgs/by-name/i3/i3-open-next-ws/package.nix +++ b/pkgs/by-name/i3/i3-open-next-ws/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { inherit pname version; hash = "sha256-eYHCm8jEv6Ll6/h1kcYHNxWGnVWI41ZB96Jec9oZFsY="; }; - cargoHash = "sha256-9U0bYCbkvcZJOCd4jZog4bSJkP1ntmAFjWm7lJDdcuo="; + useFetchCargoVendor = true; + cargoHash = "sha256-ND80SweURwVbqxcYwgvnk186BjhISr8Pz0B8BVf0DMY="; meta = { description = "Workspace management utility for i3 and sway, that picks the first unused workspace automagically"; diff --git a/pkgs/by-name/i3/i3bar-river/package.nix b/pkgs/by-name/i3/i3bar-river/package.nix index 533ef5638d3d..b43e766ee9f6 100644 --- a/pkgs/by-name/i3/i3bar-river/package.nix +++ b/pkgs/by-name/i3/i3bar-river/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0ux0woVp9HVCJf/oND2AKHj30eNC/w1WDnlPafLTgxM="; }; - cargoHash = "sha256-mp3nmkNodHyDD2fUGhsohAGyw+y/+xxI62w8OKVQkFs="; + useFetchCargoVendor = true; + cargoHash = "sha256-dwOinrHvk0MRKlbn62MEfmcyXNf+ZfYzVNtv7teRsV4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ]; diff --git a/pkgs/by-name/ia/iamb/package.nix b/pkgs/by-name/ia/iamb/package.nix index e0baeeb050cb..8ae9bc6787bf 100644 --- a/pkgs/by-name/ia/iamb/package.nix +++ b/pkgs/by-name/ia/iamb/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cjBSWUBgfwdLnpneJ5XW2TdOFkNc+Rc/wyUp9arZzwg="; }; - cargoHash = "sha256-a5y8nNFixOxJPNDOzvFFRqVrY2jsirCud2ZJJ8OvRhQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-fAre0jrpJ63adcg4AKCYzdQtCsd0MMMcWA0RsoHo6ig="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ia/ianny/package.nix b/pkgs/by-name/ia/ianny/package.nix index 2c56c8b0e77c..27d4899ee101 100644 --- a/pkgs/by-name/ia/ianny/package.nix +++ b/pkgs/by-name/ia/ianny/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-F8Uc2BsQ5f7yaUXXDhLvyyYKUDAuvP9cCR2h3vblr0g="; }; - cargoHash = "sha256-b3B1LMa3gIL2xF9GL7jLXagesC9FEQHb8drocgx2MqY="; + useFetchCargoVendor = true; + cargoHash = "sha256-QqdcOftbVt/yNzmvvy6AI66oTZvTgWHfY3Q/ikWGaLM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus.dev ]; diff --git a/pkgs/by-name/ic/icnsify/package.nix b/pkgs/by-name/ic/icnsify/package.nix index a1017f14a439..0b8b94925133 100644 --- a/pkgs/by-name/ic/icnsify/package.nix +++ b/pkgs/by-name/ic/icnsify/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-v8jwN29S6ZTt2XkPpZM+lJugbP9ClzPhqu52mdwdP00="; }; - cargoHash = "sha256-5wgioCOKvZ0J/t5v/Ic3unAA5h5Bt6MuCUzFJP7Dusw="; + useFetchCargoVendor = true; + cargoHash = "sha256-EDnwoDqQkb3G6/3/ib0p2Zh3dbMbeXozjEaNtYoCj4s="; meta = { description = "Convert PNGs to .icns"; diff --git a/pkgs/by-name/ik/ikill/package.nix b/pkgs/by-name/ik/ikill/package.nix index 602aa141527e..5399dce37303 100644 --- a/pkgs/by-name/ik/ikill/package.nix +++ b/pkgs/by-name/ik/ikill/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-hOQBBwxkVnTkAZJi84qArwAo54fMC0zS+IeYMV04kUs="; }; - cargoHash = "sha256-zKa2FP0lBS2XjgPWfyPZ60aHyeAe0uNIFbmuX4Uo1rA="; + useFetchCargoVendor = true; + cargoHash = "sha256-Xbl9cQKWxtwNQqWW41mQrVAsvMLUkTb0irDLD/XstMI="; meta = with lib; { description = "Interactively kill running processes"; diff --git a/pkgs/by-name/im/image-roll/package.nix b/pkgs/by-name/im/image-roll/package.nix index 747f1cbd8cd8..8698289f3fef 100644 --- a/pkgs/by-name/im/image-roll/package.nix +++ b/pkgs/by-name/im/image-roll/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-CC40TU38bJFnbJl2EHqeB9RBvbVUrBmRdZVS2GxqGu4="; }; - cargoHash = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk="; + useFetchCargoVendor = true; + cargoHash = "sha256-oKJknLKkoutPU85gbgi+369fczLghDuvT+t7R0nHwOI="; nativeBuildInputs = [ glib diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix index 28312ea0b064..e18039349a03 100644 --- a/pkgs/by-name/im/impala/package.nix +++ b/pkgs/by-name/im/impala/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NPNzvqnuYXrHCOLN0kZwtzPiKVdl6UFnb/S/XtG+sEY="; }; - cargoHash = "sha256-3mRWXUWyMgeaGOFvZXUeZmlD607zCz8a2d3O+MzhhNo="; + useFetchCargoVendor = true; + cargoHash = "sha256-TILQKCBq6oji9u78sfEzoqYhKmtah5Q5x0JOVMNqzTk="; meta = { description = "TUI for managing wifi"; diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix index f5fee0f21189..584fba231d77 100644 --- a/pkgs/by-name/in/inferno/package.nix +++ b/pkgs/by-name/in/inferno/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-L2Mq8y5v0n4OP8nZLeB0A8+UBr0snEDjTDZAGZQTxuo="; + useFetchCargoVendor = true; + cargoHash = "sha256-hm10LAyvlrME2lYSRs/ji2Tt+Z5f8MTFSL3h7Aulaas="; # skip flaky tests checkFlags = [ diff --git a/pkgs/by-name/in/inhibridge/package.nix b/pkgs/by-name/in/inhibridge/package.nix index 2f9c47f7e5c8..bc38f63fa349 100644 --- a/pkgs/by-name/in/inhibridge/package.nix +++ b/pkgs/by-name/in/inhibridge/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cKVw3Gd4Ml8BeXjZqTN6ToeRzO9PI+Sn45gpltlRuWM="; }; - cargoHash = "sha256-uKSbxAsGUR2nYfdtiTR/bgPBQunqYLzx3+CmszNilPQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-bW0+oZJO4JFgDuLl5f7iVorSyN/ro+BRSTX0j15Oqb4="; meta = with lib; { homepage = "https://codeberg.org/Scrumplex/inhibridge"; diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix index 4cc7902c4bdc..86569b6d3ca1 100644 --- a/pkgs/by-name/in/inko/package.nix +++ b/pkgs/by-name/in/inko/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Iojv8pTyILYpLFnoTlgUGmlfWWH0DgsGBRxzd3oRNwA="; }; - cargoHash = "sha256-PaZD7wwcami6EWvOHLislNkwQhCZItN9XZkPSExwo0U="; + useFetchCargoVendor = true; + cargoHash = "sha256-BTfg3uPLvbeKPgb7qF9WFYLzUCZ6AVRk9I0T2hxuVqU="; buildInputs = [ libffi diff --git a/pkgs/by-name/in/inori/package.nix b/pkgs/by-name/in/inori/package.nix index b7d7d87bf482..c755bf45617c 100644 --- a/pkgs/by-name/in/inori/package.nix +++ b/pkgs/by-name/in/inori/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yd1kIlPepVbeTEFzjxTDWEh8o4m6dh/ya9GitqYHHT8="; }; - cargoHash = "sha256-mmzJXIl0wfcyEaYc2wZfA22ZEbTQXG5LVqxEQ4+x76M="; + useFetchCargoVendor = true; + cargoHash = "sha256-qGlDelNYIBbNzeD0AEYh8JrsrfpZGyfXX5mGi+ds2JI="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/in/inputplug/package.nix b/pkgs/by-name/in/inputplug/package.nix index d2441969cc62..89aea6027517 100644 --- a/pkgs/by-name/in/inputplug/package.nix +++ b/pkgs/by-name/in/inputplug/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libbsd ]; - cargoHash = "sha256-W6LvdjR3jTf08X75wPWloLx7FUYTpboB3E5f0g75M5g="; + useFetchCargoVendor = true; + cargoHash = "sha256-+GbbCAdEkxhyQoe8g4me2jlsuHx4R5vibd2PQLmqNM4="; postInstall = '' installManPage inputplug.1 diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix index c700d066e61b..e2fec783cb76 100644 --- a/pkgs/by-name/in/intelli-shell/package.nix +++ b/pkgs/by-name/in/intelli-shell/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-D7hB1vKi54L7hU3TqTvzxXIr6XohfYLUTidR6wFJmfo="; }; - cargoHash = "sha256-OAQpOxPWg27kIeM37S5SEGFHMwJPvTGREtG9rd6+lDM="; + useFetchCargoVendor = true; + cargoHash = "sha256-vzmUmznY5uqPhaTzfT0KR+k2nvPmB0Jm9/N4lgzEe2E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix index e1e3139ee44e..06098f6caefd 100644 --- a/pkgs/by-name/in/intentrace/package.nix +++ b/pkgs/by-name/in/intentrace/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-ZcGZK4GX78ls3nHb7SBKszmZXMAbCxS4osW3MLqgnHQ="; }; - cargoHash = "sha256-LkLSPFCfQxBb5DJZ67I7xPxzIYqTzKccyLW0S65/MLU="; + useFetchCargoVendor = true; + cargoHash = "sha256-Z3T4mupwUqOSP+iAmy7Ps1EZlyV9cDvnfXBZwH1NFaA="; meta = { description = "Prettified Linux syscall tracing tool (like strace)"; diff --git a/pkgs/by-name/in/intermodal/package.nix b/pkgs/by-name/in/intermodal/package.nix index 569300715afd..e14149dc2912 100644 --- a/pkgs/by-name/in/intermodal/package.nix +++ b/pkgs/by-name/in/intermodal/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-N3TumAwHcHDuVyY4t6FPNOO28D7xX5jheCTodfn71/Q="; }; - cargoHash = "sha256-k34psGOs6G+B/msmLSDHLNxnjO1yyE4OY6aQU8bt+is="; + useFetchCargoVendor = true; + cargoHash = "sha256-NqbsDi47AhYw4hNcoWfXNUnc7WjC1en7mbyCJvhYdR4="; # include_hidden test tries to use `chflags` on darwin checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/in/inv-sig-helper/package.nix b/pkgs/by-name/in/inv-sig-helper/package.nix index a00f7224e718..4cc603dfc42f 100644 --- a/pkgs/by-name/in/inv-sig-helper/package.nix +++ b/pkgs/by-name/in/inv-sig-helper/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Q+u09WWBwWLcLLW9XwkaYDxM3xoQmeJzi37mrdDGvRc="; }; - cargoHash = "sha256-qMBztc2N8HWJrrzyzY2KCW9pyv0hK6QJ8tqNdNkhTzE="; + useFetchCargoVendor = true; + cargoHash = "sha256-4SuddTLbENm9D+v/DB86hJ7LNchbcwm5on3aAtUiVcc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ip/iperf3d/package.nix b/pkgs/by-name/ip/iperf3d/package.nix index 53e343c6d4b7..69c34cde83b5 100644 --- a/pkgs/by-name/ip/iperf3d/package.nix +++ b/pkgs/by-name/ip/iperf3d/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/iperf3d --prefix PATH : ${iperf3}/bin ''; - cargoHash = "sha256-3mJBn70sSoDL9GNxgEZqA8S4GrY+DjnYY9Cc5Xe1GFQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-eijsPyoe3/+yR5kRmzk0dH62gTAFFURTVT8wN6Iy0HI="; meta = with lib; { description = "Iperf3 client and server wrapper for dynamic server ports"; diff --git a/pkgs/by-name/ir/iro/package.nix b/pkgs/by-name/ir/iro/package.nix index 6b55a4a56410..a800a05b1f76 100644 --- a/pkgs/by-name/ir/iro/package.nix +++ b/pkgs/by-name/ir/iro/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-hGGrEGG1LyzfUCEnV7ahhRO0GrLk28xDWZEFqUHk1rE="; }; - cargoHash = "sha256-ZP0YO+5juxFGc2rtvNBvknlTJBrtr8HiuN6/kKW1WNU="; + useFetchCargoVendor = true; + cargoHash = "sha256-7QAhgUI6Pu0iqE6JyfYI4x3O/XTDb8B1Sy3hw9EVMYo="; meta = { description = "CLI tool to convet Hex color code or RGB to color code, RGB, HSL and color name"; diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix index eb17a3e5de5e..d02c8615d45b 100644 --- a/pkgs/by-name/ir/iroh/package.nix +++ b/pkgs/by-name/ir/iroh/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9aRb1kMIo/DZOt1pYzXa8dfb3BlhVJ0kvS036jqGcHw="; }; - cargoHash = "sha256-QHysE7TBd619iVUEWmk7OhT4Y6SHmTXUnBkokmbaKRE="; + useFetchCargoVendor = true; + cargoHash = "sha256-yOYGCm8Fs5FxA3bdgHKJoBxS1v5sEJIx9OH4JcQ57gM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index c10e8ce9d678..076c44fcb4f1 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-UtBO1XaghmzKv9qfhfoLi4ke+mf+Mtgh4f4UpCeEVDg="; }; - cargoHash = "sha256-PIesf/wqz8jrc7WbPBvku4MOTAbNq6m4VhYSKoStvY8="; + useFetchCargoVendor = true; + cargoHash = "sha256-l+Y/ntuqaasDL0cEHSwscFxAs1jC0bm9oTU0J/K60AY="; buildInputs = [ diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix index 2df1c45e7a4e..0bdd63b1c0a9 100644 --- a/pkgs/by-name/ir/irust/package.nix +++ b/pkgs/by-name/ir/irust/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-moYHi+hkL2I3jm3eBfaXuK4Zz84Pq2X50V5lKyIMecM="; }; - cargoHash = "sha256-Ecz4JulISoDMrRloqbOP1T+mwoWDV+COwJR/+0fPNXc="; + useFetchCargoVendor = true; + cargoHash = "sha256-NUivVSIbyLCU5VP1F6VETMRwDNzuIUvoCI/bbJSxX1g="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/iv/ivm/package.nix b/pkgs/by-name/iv/ivm/package.nix index 10f917de3fb7..24259d902f6d 100644 --- a/pkgs/by-name/iv/ivm/package.nix +++ b/pkgs/by-name/iv/ivm/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-z0oo1JUZbX3iT8N9+14NcqUzalpARImcbtUiQYS4djA="; }; - cargoHash = "sha256-EP3fS4lAGOaXJXAM22ZCn4+9Ah8TM1+wvNerKCKByo0="; + useFetchCargoVendor = true; + cargoHash = "sha256-NiZGSg0EU3yw5YS4eq/AJt/9AcdqwKEJAaWBmF5NwWw="; buildInputs = [ (lib.getLib stdenv.cc.cc) diff --git a/pkgs/by-name/iw/iwqr/package.nix b/pkgs/by-name/iw/iwqr/package.nix index 5609c70d4c3b..1e35aee9e8ff 100644 --- a/pkgs/by-name/iw/iwqr/package.nix +++ b/pkgs/by-name/iw/iwqr/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-z9CjCJvi6MlZGghZKx13gGSKwUnECAf0cr9P2ABskh0="; }; - cargoHash = "sha256-EFen2x/+a5xLsDmodNCkuGBR7+Oy2fdXcxzANLcWWZs="; + useFetchCargoVendor = true; + cargoHash = "sha256-wnthAp/oV6W7G/a5JXYwzni+qGzDiVefIjRamkJ5jQc="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix index 395d20d30792..c08b12ff3798 100644 --- a/pkgs/by-name/ja/jaq/package.nix +++ b/pkgs/by-name/ja/jaq/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J+48TWGio6KplqYFJM25LGIuf+yAyE7NMqgPUPgpTeY="; }; - cargoHash = "sha256-9N24D4fKsy/n+f5uTNkbQNgW+BgGkdEvgitvqbnOcGs="; + useFetchCargoVendor = true; + cargoHash = "sha256-hgbRDsm9qghvUpKaFMr7keHEk9TUYRVZnnWouky/Zm8="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix index bba163a48873..a33f6d89b58c 100644 --- a/pkgs/by-name/ja/jay/package.nix +++ b/pkgs/by-name/ja/jay/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-VAg59hmI38hJzkh/Vtv6LjrqQFLaq7rIGtk9sfQe1TA="; }; - cargoHash = "sha256-qYyuVNYhsHjR4uGdQq83Ih5TMBdlKmG0l4MxDa9wgD8="; + useFetchCargoVendor = true; + cargoHash = "sha256-1Jf0uZYxk7I6dn+eFtohBoZtOJatvFEYom4A0dZbKYQ="; SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; diff --git a/pkgs/by-name/je/jellyfin-rpc/package.nix b/pkgs/by-name/je/jellyfin-rpc/package.nix index c26315d4ad3c..43b0f9b2291c 100644 --- a/pkgs/by-name/je/jellyfin-rpc/package.nix +++ b/pkgs/by-name/je/jellyfin-rpc/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sr82lTOr6RUvYD0CVZMyyRAFjai1oLnRWIszuu7/jE0="; }; - cargoHash = "sha256-KHbYM7aWgch+DWF46DpFCCt7JoKR0sasuFO3xPOytWA="; + useFetchCargoVendor = true; + cargoHash = "sha256-fpd+KYKrKy6zS2YeNaUX5J+wtfzAiq7tMXRKSlZ9r7U="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix index ee29759af978..81ff07f89847 100644 --- a/pkgs/by-name/je/jellyfin-tui/package.nix +++ b/pkgs/by-name/je/jellyfin-tui/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dME3oM3k5TGjN8S/93Crt3vw8+KjZWivkVzg+eqwfe4="; }; - cargoHash = "sha256-DFwEcKPc5c+xYas/gI3dHGRW8r4B8GBRXiI9VjdMrpw="; + useFetchCargoVendor = true; + cargoHash = "sha256-dvf0VQTOfGtE5B+xFM3jtwO0A/3WO6HN0u5mA/1bpGo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index decc88434dd8..818724a409bb 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-Y81YqrzJSar0BxhQb7Vm/cZ9E6krlyZesXPY+j37IHA="; + useFetchCargoVendor = true; + cargoHash = "sha256-qYEnKFC1Y24TEY0dXa9N7QNvxhHULq+vd4Wej/RK8HQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/jf/jf/package.nix b/pkgs/by-name/jf/jf/package.nix index 973c8c5d0d19..067d548d06f6 100644 --- a/pkgs/by-name/jf/jf/package.nix +++ b/pkgs/by-name/jf/jf/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-A29OvGdG6PyeKMf5RarEOrfnNSmXhXri0AlECHWep6M="; }; - cargoHash = "sha256-jZmFUvg6R15oL13OYKkirsepoJwOKCeXdKMcqhPEhNU="; + useFetchCargoVendor = true; + cargoHash = "sha256-NU5D7VMQtlOFzr+LqODvDzVw56wFClcBxKo1h8zfgfY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix index 7f1cf16f64f8..e440594a62cb 100644 --- a/pkgs/by-name/jf/jfmt/package.nix +++ b/pkgs/by-name/jf/jfmt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80="; }; - cargoHash = "sha256-u/v3P7iPdBJU/0wlSNBq/cjnM3XOnoVfUjrrmo4sTAA="; + useFetchCargoVendor = true; + cargoHash = "sha256-skLK+jYeR0FPxD1fVswiOWyKpzu5/qL5mk69bLEmxic="; meta = with lib; { description = "CLI utility to format json files"; diff --git a/pkgs/by-name/ji/jikken/package.nix b/pkgs/by-name/ji/jikken/package.nix index 5ecdae5157b0..c75aaddbe037 100644 --- a/pkgs/by-name/ji/jikken/package.nix +++ b/pkgs/by-name/ji/jikken/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WJxrCCDe39RYwHb+zbr7ugFsFsP5Uc/arw3s6USQoN4="; }; - cargoHash = "sha256-vyByA05rcGd8/O9PKcIlUF8tq2UkomryW1nFsfqQNlk="; + useFetchCargoVendor = true; + cargoHash = "sha256-8GulTGiXMgG0ysrRwv5CbS3AKCM3FpieNiJW2pZnEx4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index 5ebe8de37333..3bb0a3a5f2c7 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ouWtMos4g9uIFEFeukgq8VgcxlSCzJnSYFNdNmOD5C8="; }; - cargoHash = "sha256-+/Xk5bb8GpyeKZii5rG/qboIxUqOyxwCSUCL9jtGHys="; + useFetchCargoVendor = true; + cargoHash = "sha256-83xZy8LAe1IE58WAsM6loIxV7pO9n9pgMpjCHrWkHwc="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/jo/job-security/package.nix b/pkgs/by-name/jo/job-security/package.nix index 74d6e8379f36..dfb096fb51c3 100644 --- a/pkgs/by-name/jo/job-security/package.nix +++ b/pkgs/by-name/jo/job-security/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KPnLVKz10SuVcG0CCFWxWnjhf9gHHPCRZw6AW9/gAmk="; }; - cargoHash = "sha256-YwlI+Z3Zry3i3amz3DufvKzSS1Hrp2kPG76aH5tMJ2g="; + useFetchCargoVendor = true; + cargoHash = "sha256-g+n0C8tkEuixbRo48cMOYPXcYt+Ur1TP6fFTYlI4fVg="; meta = { description = "Job control from anywhere"; diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix index 3eec0b767282..cfb33fa796bb 100644 --- a/pkgs/by-name/jo/josh/package.nix +++ b/pkgs/by-name/jo/josh/package.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage { hash = "sha256-6rfNEWNeC0T/OXhCReaV5npcJjQoH6XhsZzHXGnnxOo="; }; - cargoHash = "sha256-tK/5qNvN1zs6DM7dXNc1nPhbUOt5lPqRpbie6h2d7Y0="; + useFetchCargoVendor = true; + cargoHash = "sha256-Kb0EKWae1sldDg+F3ccoztI3zbQ/BJjy+4ojnqiqKA4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/jo/joshuto/package.nix b/pkgs/by-name/jo/joshuto/package.nix index 7fa114ede299..fb923caea595 100644 --- a/pkgs/by-name/jo/joshuto/package.nix +++ b/pkgs/by-name/jo/joshuto/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T5NfPPl8bAp3pcY1A7Dm37wC3+xrtYdoGEe4QOYgwUw="; }; - cargoHash = "sha256-YNdO4b4MegG3JVRFBt71RDXmPXYyksDtI0P740zxLso="; + useFetchCargoVendor = true; + cargoHash = "sha256-By7vwdNocNDQAbeD6CUcp0OOlqs5oZ2WLdE4VHSh3cI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/jo/jot/package.nix b/pkgs/by-name/jo/jot/package.nix index 7859858ff8ca..b6a7d69780af 100644 --- a/pkgs/by-name/jo/jot/package.nix +++ b/pkgs/by-name/jo/jot/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Z8szd6ArwbGiHw7SeAah0LrrzUbcQYygX7IcPUYNxvM="; }; - cargoHash = "sha256-x61lOwMOOLD3RTdy3Ji+c7zcA1PCn09u75MyrPX/NbE="; + useFetchCargoVendor = true; + cargoHash = "sha256-B3CkXoSShZTnT3OlVaqRBbGIaOKiqri6AuYVrUHB6NQ="; meta = with lib; { description = "Rapid note management for the terminal"; diff --git a/pkgs/by-name/jo/jotdown/package.nix b/pkgs/by-name/jo/jotdown/package.nix index fdae96437bc4..7f9579cf8578 100644 --- a/pkgs/by-name/jo/jotdown/package.nix +++ b/pkgs/by-name/jo/jotdown/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1s0J6TF/iDSqKUF4/sgq2irSPENjinftPFZnMgE8Dn8="; }; - cargoHash = "sha256-gsrwC7X1pnr9ZQDqq0SnNxYHFdRI9VRuIQtA1s7Yz7A="; + useFetchCargoVendor = true; + cargoHash = "sha256-SGmlNpauPk2qSIIdP0hfGUplCV9ZvyHhZss8XXuxfHg="; meta = with lib; { description = "Minimal Djot CLI"; diff --git a/pkgs/by-name/jo/journaldriver/package.nix b/pkgs/by-name/jo/journaldriver/package.nix index f78d2a60fb8d..7c35b17a672c 100644 --- a/pkgs/by-name/jo/journaldriver/package.nix +++ b/pkgs/by-name/jo/journaldriver/package.nix @@ -10,7 +10,8 @@ rustPlatform.buildRustPackage rec { pname = "journaldriver"; version = "5656.0.0"; - cargoHash = "sha256-uNzgH9UM2DuC+dBn5N9tC1/AosUP6C+RkGLOh6c+u0s="; + useFetchCargoVendor = true; + cargoHash = "sha256-ycnmLHKWRwKbdY1LZJ+BSwGfXfYJCWbbbFcqfBj3y/Y="; src = fetchgit { url = "https://code.tvl.fyi/depot.git:/ops/journaldriver.git"; diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix index 6e90f9a10309..81fd1324ed4b 100644 --- a/pkgs/by-name/jq/jql/package.nix +++ b/pkgs/by-name/jq/jql/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-acvLzxjj+HxVE/BWiWezeghDiP4VNNAzeFEs+u+b5iA="; }; - cargoHash = "sha256-BNrCzXqmS9fJfhPbt1fLSgUTL2cgsfcnjEtns2umFMs="; + useFetchCargoVendor = true; + cargoHash = "sha256-O0WefEbtjBQp1JUV4lxPHN5aT+qo8mNxHsegSjVCgJU="; meta = with lib; { description = "JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index c096701c143e..2ed77e026942 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -35,7 +35,8 @@ rustPlatform.buildRustPackage { hash = "sha256-5J1ZfPNyniUK5D3Pt1aKuJ+/8vad3JPxCztBRY591N8="; }; - cargoHash = "sha256-kuZ1zvb6H5QWjJSUYMq5tEywsQMC6187YJPUT1r4S5o="; + useFetchCargoVendor = true; + cargoHash = "sha256-NmffqayPfRZhNCihEsjKhoVi5KeMCNbmsGAzC/oKcHs="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 287ebd2909a4..8cae7091df95 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -36,7 +36,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jIc8+SFAcH2TsY12+txwlMoJmpDdDpC0H+UrjYH61Lk="; }; - cargoHash = "sha256-JHLkjMy5b1spJrAqFCCzqgnlYTAKA1Z9Tx4w1WWuiAI="; + useFetchCargoVendor = true; + cargoHash = "sha256-AijW/7JfGOWLTzZCOAWx2ELU3/fhCST4fkzR52torDA="; nativeBuildInputs = lib.optionals (installShellCompletions || installManPages) [ installShellFiles ] diff --git a/pkgs/by-name/jw/jwt-cli/package.nix b/pkgs/by-name/jw/jwt-cli/package.nix index 0b73b4485d27..426027419fe7 100644 --- a/pkgs/by-name/jw/jwt-cli/package.nix +++ b/pkgs/by-name/jw/jwt-cli/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2pYCNLopvIHcKiN4qewQCdkGWHYQ6vQVCaApxGsRG9E="; }; - cargoHash = "sha256-M/9b+iPufq0S7P2PdPYIDS1to5WAtJbS3O/+NfO3sbY="; + useFetchCargoVendor = true; + cargoHash = "sha256-lp2I5+zvFM46TmejtNn/qgVlAaL+xL9slZHduccO/5Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/jw/jwtinfo/package.nix b/pkgs/by-name/jw/jwtinfo/package.nix index ad26d3b9ae99..75de488a9ef7 100644 --- a/pkgs/by-name/jw/jwtinfo/package.nix +++ b/pkgs/by-name/jw/jwtinfo/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-FDN9K7KnMro2BluHB7I0HTDdT9YXxi8UcOoBhKx/5dA="; }; - cargoHash = "sha256-iGvwuLiF8yGb4IxBxGH0M79SlNqZ5lpsXTNiVT7VGrU="; + useFetchCargoVendor = true; + cargoHash = "sha256-pRlnZAFsEBGz0yYfcZ0SCiH2om8URQ4J3+c01pBT7ag="; meta = { description = "Command-line tool to get information about JWTs"; diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix index b15e544e2224..0c9bd4266e6b 100644 --- a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix +++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vQZ+zQgwIw5ZBdIuMDD37rIdhe+WpNBmq0TciXBNiSU="; }; - cargoHash = "sha256-bDxQEbUyeNUqYRaWV2kBL60ZFGtA4s+kwmgz6y88MAw="; + useFetchCargoVendor = true; + cargoHash = "sha256-dcq25kDS+dFC4eBX6EWANWpeJjwR4q1mQP/2PKPIOsc="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 8d381086b50f..953e166f4f85 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ]; - cargoHash = "sha256-6qXdZ1EtYdne0zs5usLXkZm2qYl1gwpTki0cvip+FkE="; + useFetchCargoVendor = true; + cargoHash = "sha256-EQ6xB4He8cjJxg7tmJzqXmAITa5q9iq+ZokV0EyaUE0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices diff --git a/pkgs/by-name/ka/kalker/package.nix b/pkgs/by-name/ka/kalker/package.nix index 3b6721205d4c..dd3d6f217f41 100644 --- a/pkgs/by-name/ka/kalker/package.nix +++ b/pkgs/by-name/ka/kalker/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fFeHL+Q1Y0J3rOgbFA952rjae/OQgHTznDI0Kya1KMQ="; }; - cargoHash = "sha256-hgtSDPQRrqhQALqzVW8z9xXqIv+v5/Sbs6McrUCKiaU="; + useFetchCargoVendor = true; + cargoHash = "sha256-IYxgh6ni3BFnocHGKwKUqgSC2xUjn0b/4pBqRC5iY8U="; buildInputs = [ gmp diff --git a/pkgs/by-name/ka/kamp/package.nix b/pkgs/by-name/ka/kamp/package.nix index 4ac465dbc505..06e3f97a0338 100644 --- a/pkgs/by-name/ka/kamp/package.nix +++ b/pkgs/by-name/ka/kamp/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JZe8z6OYJ+I0+dcq+sCoQPzlz6eB4z98jWj8MDXdODY="; }; - cargoHash = "sha256-+NiDSg7FJrtcNm/V0kn2kNQMJqOamE7Yl0sK/FSUYgA="; + useFetchCargoVendor = true; + cargoHash = "sha256-QGTa2emaz3Nzoe3UuvbKCoopOoKD29RSWPG5wvPe+RE="; postInstall = '' install scripts/* -Dt $out/bin diff --git a/pkgs/by-name/ka/kanha/package.nix b/pkgs/by-name/ka/kanha/package.nix index 583671f38433..1e42a8430dd8 100644 --- a/pkgs/by-name/ka/kanha/package.nix +++ b/pkgs/by-name/ka/kanha/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ftTmYCkra3x/oDgGJ2WSf6yLeKXkwLJXhjuBdv7fVLY="; }; - cargoHash = "sha256-kjHLc+qWo5dB4qbdlIWzk/pjpghRaDcX/7kkjEM219c="; + useFetchCargoVendor = true; + cargoHash = "sha256-bO37UYApe1CbwcfG8j/1UPu6DlYqlGPLsh0epxh8x3M="; buildInputs = [ openssl ] diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix index 63d7e85ba8a8..1169e8b9bbeb 100644 --- a/pkgs/by-name/ka/kanidm-provision/package.nix +++ b/pkgs/by-name/ka/kanidm-provision/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pgPjkj0nMb5j3EvyJTTDpfmh0WigAcMzoleF5EOqBAM="; }; - cargoHash = "sha256-tQ3uVsy5Dw4c4CbSeASv1TWkqxVYjl/Cjkr00OQEo9c="; + useFetchCargoVendor = true; + cargoHash = "sha256-kbctfPhEF1PdVLjE62GyLDzjOnZxH/kOWUS4x2vd/+8="; meta = with lib; { description = "A small utility to help with kanidm provisioning"; diff --git a/pkgs/by-name/ka/kaput-cli/package.nix b/pkgs/by-name/ka/kaput-cli/package.nix index 8f36d2e56144..fb7cf1cc0c11 100644 --- a/pkgs/by-name/ka/kaput-cli/package.nix +++ b/pkgs/by-name/ka/kaput-cli/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sy8k9L9rmiRFzvhLc+hYl9OqmmP8INLxMNRjAx7/V8g="; }; - cargoHash = "sha256-fnTcCVppI5wIzwG2fA8LjpC1+gTAhdRkWv/EQXUok0c="; + useFetchCargoVendor = true; + cargoHash = "sha256-yb56rrPlTuc7O4fF9NPNB2djCfq3fLu2hD4gUjRHvqM="; env = { OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ka/karlender/package.nix b/pkgs/by-name/ka/karlender/package.nix index 57330777073a..1f19473dc82a 100644 --- a/pkgs/by-name/ka/karlender/package.nix +++ b/pkgs/by-name/ka/karlender/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PwXSJq4uBtgIA2aQ5AZawEMmHoVS2Z9haVHyJ2oyXUs="; }; - cargoHash = "sha256-R/oQvyZCcTImOA8FB5bECTj5VGFElImoQwIRX75PtOs="; + useFetchCargoVendor = true; + cargoHash = "sha256-senSpsmScj1IFXLfvmsllmRNB6FzrALGnQeG7IHw9es="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/kb/kbt/package.nix b/pkgs/by-name/kb/kbt/package.nix index 6a7abdc80877..d100621bff69 100644 --- a/pkgs/by-name/kb/kbt/package.nix +++ b/pkgs/by-name/kb/kbt/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ROCZDa5eyGF9yE+zdZ4snzdz8+jk+H6ZnqsnCe8JtJw="; }; - cargoHash = "sha256-6zD9WRPWEt0ubppaMRTOusy0zm3z6SGB/5/kMxcJ/Ag="; + useFetchCargoVendor = true; + cargoHash = "sha256-wG1uB/oOUUAQVpGXe7sTqt9tLmFoLrOAmeat/d1xOM8="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index 239f0d829103..4d350cebdf48 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "${src.name}/cli"; - cargoHash = "sha256-nZktEEp0BYusNJL7w9WhX6JK1LCmyi7dI659I9IR+Wo="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZhrjxHqwWwcVkCVkJJnVm2CZLfRlrI2383ejgI+B2KQ="; cargoPatches = [ ./cargo_lock.patch ]; buildInputs = diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index 74f650074bdf..70245a070619 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XqcexHeXXVfNoIu0h0Ooxlkm/FaDh/ctkH3cod1mlwY="; }; - cargoHash = "sha256-ZlaILIVG3gLVFGqv1cozDtbHcL+dxUJXq/DvuJ077O8="; + useFetchCargoVendor = true; + cargoHash = "sha256-ptsymAtW4hn0ureox1i+GObIWyhPuSqT3GcKUBKnXC4="; meta = { description = "Formatter for kdl documents"; diff --git a/pkgs/by-name/kd/kdotool/package.nix b/pkgs/by-name/kd/kdotool/package.nix index 2e34402ccaef..af34ec89ce41 100644 --- a/pkgs/by-name/kd/kdotool/package.nix +++ b/pkgs/by-name/kd/kdotool/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ogdZziNV4b3h9LiEyWFrD/I/I4k8Z5rNFTNjQpWBQtg="; }; - cargoHash = "sha256-pL5vLfNWsZi75mI5K/PYVmgHTPCyIKpQY0YU2CJABN8="; + useFetchCargoVendor = true; + cargoHash = "sha256-eA74jvXVPtiE6K+OMJg99wM2q0DwxSHVJ5YZ9h37b/A="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/ke/keedump/package.nix b/pkgs/by-name/ke/keedump/package.nix index 3389d2ec9c77..f8820753b397 100644 --- a/pkgs/by-name/ke/keedump/package.nix +++ b/pkgs/by-name/ke/keedump/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-V7wQZoUnISELuzjSUz+CJ77XJvlnGBK2n4U4pKlk+xI="; }; - cargoHash = "sha256-b5jRWmyCvKCDn1fIXTtLCI1Ckr+Ttt7erDbZs4U2TcE="; + useFetchCargoVendor = true; + cargoHash = "sha256-ogfLMkTzGwYADDfn05IOXiOSJzk5iN2GJ6kaT9L9sqM="; meta = with lib; { description = "PoC KeePass master password dumper"; diff --git a/pkgs/by-name/ke/keepass-diff/package.nix b/pkgs/by-name/ke/keepass-diff/package.nix index 49da2f97203b..c8ccc8420420 100644 --- a/pkgs/by-name/ke/keepass-diff/package.nix +++ b/pkgs/by-name/ke/keepass-diff/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CqLH5Dosp26YfqgOVcZilfo5svAEv+pAbi1zebGMnb4="; }; - cargoHash = "sha256-+kgb9hbCH4Nt80nobTeDrC+LVp1r6EbzUs+t6zlIhtU="; + useFetchCargoVendor = true; + cargoHash = "sha256-QjcXeLLIvegzETIu3xbZQ+o2WYxR6xkALVOOWYWhGUo="; meta = with lib; { description = "CLI-tool to diff Keepass (.kdbx) files"; diff --git a/pkgs/by-name/ke/kepler/package.nix b/pkgs/by-name/ke/kepler/package.nix index 7c276f5a1731..6cf6cb302cfd 100644 --- a/pkgs/by-name/ke/kepler/package.nix +++ b/pkgs/by-name/ke/kepler/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jmQ88flSMrS0CB7GNj1Ee60HZgroDKTwLk0i/kg6gVM="; }; - cargoHash = "sha256-+WLb4DsAW6tnO0KdtD9zMnYCEb1t0onZqFhnqhbIStU="; + useFetchCargoVendor = true; + cargoHash = "sha256-5ORjyzCkX3j62pL4S8CqSXExZUjTIO0db99oIuczEY0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ke/kestrel/package.nix b/pkgs/by-name/ke/kestrel/package.nix index ea7e50e76948..85ee8fbd1a9b 100644 --- a/pkgs/by-name/ke/kestrel/package.nix +++ b/pkgs/by-name/ke/kestrel/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bKQBOk9yUqgnufRyyqXatsRHpesbM49rAkz0dD5XE80="; }; - cargoHash = "sha256-R5TRF4yvjQalsj1UA2kiLBuTOhqIbbHW6lvf1ixvJG4="; + useFetchCargoVendor = true; + cargoHash = "sha256-cwEHxbRFdOLmQy0FS4U6g785szMWISe6vkXvtj4VwPs="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ke/keyscope/package.nix b/pkgs/by-name/ke/keyscope/package.nix index 35cc09b98f71..9165234eea67 100644 --- a/pkgs/by-name/ke/keyscope/package.nix +++ b/pkgs/by-name/ke/keyscope/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2DhKiQixhTCQD/SYIQa+o1kzEsslu6wAReuWr0rTrH8="; }; - cargoHash = "sha256-01Q5qCH0VIdO9dpcZxp8wbSjeON9N2C+0qa/2CvMHrc="; + useFetchCargoVendor = true; + cargoHash = "sha256-f4r0zZTkVDfycrGqRCaBQrncpAm0NP6XYkj3w7fzQeY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ki/kibi/package.nix b/pkgs/by-name/ki/kibi/package.nix index 3ebac1f709b6..0f88f8f83657 100644 --- a/pkgs/by-name/ki/kibi/package.nix +++ b/pkgs/by-name/ki/kibi/package.nix @@ -9,7 +9,8 @@ rustPlatform.buildRustPackage rec { pname = "kibi"; version = "0.2.2"; - cargoHash = "sha256-ebUCkcUACganeq5U0XU4VIGClKDZGhUw6K3WBgTUUUw="; + useFetchCargoVendor = true; + cargoHash = "sha256-7SOkREsGiolT5LxLAbjZe3aAYBT/AlhlOXDlDmoei9w="; src = fetchFromGitHub { owner = "ilai-deutel"; diff --git a/pkgs/by-name/ki/kickoff/package.nix b/pkgs/by-name/ki/kickoff/package.nix index eb19c1801c04..0f105329bfbf 100644 --- a/pkgs/by-name/ki/kickoff/package.nix +++ b/pkgs/by-name/ki/kickoff/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-q/+Ik8L58LxOllpEosYyvD38RJb+NIQHslYpgGSwjKc="; }; - cargoHash = "sha256-8LSz/YeqdbtFXpWq2MMhEI9+8mxsLdE4LUyQHcgLkZY="; + useFetchCargoVendor = true; + cargoHash = "sha256-iTTwclBbmOALjMnT89w6k8Ix8HKTbBOxKHVgePbbXkA="; libPath = lib.makeLibraryPath [ wayland diff --git a/pkgs/by-name/ki/kickstart/package.nix b/pkgs/by-name/ki/kickstart/package.nix index c02ed94dfab6..aa91fbfe5288 100644 --- a/pkgs/by-name/ki/kickstart/package.nix +++ b/pkgs/by-name/ki/kickstart/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4POxv6fIrp+wKb9V+6Y2YPx3FXp3hpnkq+62H9TwGII="; }; - cargoHash = "sha256-wMy3c4iqHOWmbJNCdy4/2XVgyF6lcAxSs3pAaD53JAg="; + useFetchCargoVendor = true; + cargoHash = "sha256-J9sGXJbGbO9UgZfgqxqzbiJz9j6WMpq3qC2ys7OJnII="; checkFlags = [ # remote access diff --git a/pkgs/by-name/ki/kitty-img/package.nix b/pkgs/by-name/ki/kitty-img/package.nix index f349600c7c98..e4bdd7549eb3 100644 --- a/pkgs/by-name/ki/kitty-img/package.nix +++ b/pkgs/by-name/ki/kitty-img/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5thx4ADmJE29bxN+ZO3hF0jhgXK+boqt8oj4Sygl5SU="; }; - cargoHash = "sha256-Ai1Esw83V3jbPDDQyNh8bTNLQBYBonIDkWP3AFgN78U="; + useFetchCargoVendor = true; + cargoHash = "sha256-KSNl/SpqcgMaKbkBfNtR7M8+B1clPauYi7NlP+f5Pd0="; meta = with lib; { description = "Print images inline in kitty"; diff --git a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix index e2e66c04d55f..25fbc1d49302 100644 --- a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix +++ b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3j7xiTrhDPBNTg53y2KyLpk8m4DrJbZWYkdIm5sxEfs="; }; - cargoHash = "sha256-t7YnOnls0PZM2iTmmkBFt1WmFvqiY4eS8LBf0tvinJg="; + useFetchCargoVendor = true; + cargoHash = "sha256-Hab3DlLU2PRaZCBA2BM5FlpDkpXIfIFxys6uPCDUrnc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ki/kittysay/package.nix b/pkgs/by-name/ki/kittysay/package.nix index 8938909aafe7..7ab11b806168 100644 --- a/pkgs/by-name/ki/kittysay/package.nix +++ b/pkgs/by-name/ki/kittysay/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-ZYHrDBJ8cTqJAh2KUGSCsS1bY/emHRodPxZX2vxAhDs="; }; - cargoHash = "sha256-F0WAtpAjBwL5YfzGtPgn7WTL6lgx3bjZFBQdDpjCr3I="; + useFetchCargoVendor = true; + cargoHash = "sha256-LIAXlOArm5V7Kbm82GDRs3XvMTgKjuOL2C+fQfEDwb4="; meta = { description = "Cowsay, but with a cute kitty :3"; diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix index dbb48308f5c9..db26a02c5e8c 100644 --- a/pkgs/by-name/kl/klog-rs/package.nix +++ b/pkgs/by-name/kl/klog-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { rev = version; hash = "sha256-AlXyCDjs5xFqM0TmaBGfzvYn/ZDWAgBzLV/mDPQHflI="; }; - cargoHash = "sha256-rJrOCDtWdvrvvQxC49g1wkW9/CrAGkGJQUuPZ2a6+bw="; + useFetchCargoVendor = true; + cargoHash = "sha256-A9QhOFsjEXljsugakJ0s7XdAPF447JIFaQGfDGDVp1E="; checkFlags = [ # this integration test depends on a running kubernetes cluster "--skip=k8s::tests::test_get_pod_list" diff --git a/pkgs/by-name/km/kmon/package.nix b/pkgs/by-name/km/kmon/package.nix index ffb02cedfabb..846a3b45999c 100644 --- a/pkgs/by-name/km/kmon/package.nix +++ b/pkgs/by-name/km/kmon/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-DzbbeVZifuxgmIu3yNv6EI7Jyh8MA0/oSaR5IEPNUN8="; }; - cargoHash = "sha256-ykY0QGK3fUqzxgX8HNmi6J50kM+iTRj3SS7p4mNEOBg="; + useFetchCargoVendor = true; + cargoHash = "sha256-B1sxbifMTnr6tLZCAuxVlQPL5oKCUL0wtw3/wOyfyyw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ko/koji/package.nix b/pkgs/by-name/ko/koji/package.nix index 92fe3802fbae..fb3729958667 100644 --- a/pkgs/by-name/ko/koji/package.nix +++ b/pkgs/by-name/ko/koji/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2kBjHX7izo4loJ8oyPjE9FtCvUODC3Sm4T8ETIdeGZM="; }; - cargoHash = "sha256-owppYDt0YdWoDvfmzVfiIPjLgTAT9eTI1LpRr4Y3XQA="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZHti7nMfHiYur1kjxj+ySIF4/l0UU9q2urabUWZyk6E="; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 8ad3d7339b5b..ce8c5ef50045 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage { pname = "komac"; - cargoHash = "sha256-IM+swMrLoHeY/sk9w6CB66IGCNNioVJzNyKKtXimN5g="; + useFetchCargoVendor = true; + cargoHash = "sha256-UBVjZyHv+qLdDFD01BnrlMMGpWN8QwmkXqrntIVm6rA="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/kondo/package.nix b/pkgs/by-name/ko/kondo/package.nix index b3332634be47..572131ae4786 100644 --- a/pkgs/by-name/ko/kondo/package.nix +++ b/pkgs/by-name/ko/kondo/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OqOmOujnyLTqwzNvLWudQi+xa5v37JTtyUXaItnpnfs="; }; - cargoHash = "sha256-WF4GHj/5VYrTUh1E3t29zbpSLjJ6g7RWVpLYqg9msZg="; + useFetchCargoVendor = true; + cargoHash = "sha256-jmN7mtQ3CXfyeYrYD+JBE6ppln8+VJRBzygmczo8M04="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ko/kontroll/package.nix b/pkgs/by-name/ko/kontroll/package.nix index ff169a1c86a0..a2113c918648 100644 --- a/pkgs/by-name/ko/kontroll/package.nix +++ b/pkgs/by-name/ko/kontroll/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-k7Twbjl8umk3PeIv3ivCLdhZFgTTV8WdfIAoGAD/pEk="; }; - cargoHash = "sha256-931PmSvcXTjxdIQUCSxLwFnaHgRrFzA/v6yYTvkjNoQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-maryIYWZdDaGe9IC+hCSNH7IhZ6r7nWlD6ws5n1U6Xo="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/kr/krabby/package.nix b/pkgs/by-name/kr/krabby/package.nix index 331f2a8f1522..f9cb35ffa9e0 100644 --- a/pkgs/by-name/kr/krabby/package.nix +++ b/pkgs/by-name/kr/krabby/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BmTx2kpnibTVuutAIrpFTTOGpO6WzITb6SXwUKuMtYY="; }; - cargoHash = "sha256-gZzjx4JWe3CcG8wuQRTYjyEvvhCyUBXHQSw5sYhih9o="; + useFetchCargoVendor = true; + cargoHash = "sha256-Al9Ym+8HdunACRNMn6a3nrzoWVw1nAdRJmHqP3ch4lw="; meta = with lib; { description = "Print pokemon sprites in your terminal"; diff --git a/pkgs/by-name/kr/krankerl/package.nix b/pkgs/by-name/kr/krankerl/package.nix index 85054c9d539c..03a78ec3eb71 100644 --- a/pkgs/by-name/kr/krankerl/package.nix +++ b/pkgs/by-name/kr/krankerl/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-fFtjQFkNB5vn9nlFJI6nRdqxB9PmOGl3ySZ5LG2tgPg="; }; - cargoHash = "sha256-0V2ftZmuKXRhOFWCroYOxQqW3NFh9Uuwcg0CM1sFlcQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-tu+PJeGm8u5TSuoPBhaO4k6PkmI9JduuLlaQjvBv05E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/kr/krapslog/package.nix b/pkgs/by-name/kr/krapslog/package.nix index 8f2e65728754..ceef566a4169 100644 --- a/pkgs/by-name/kr/krapslog/package.nix +++ b/pkgs/by-name/kr/krapslog/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-wRziLNMwLZBCn330FNC9x6loCCyuC+31Kh51ZI/j1Cc="; }; - cargoHash = "sha256-5jhEcwOdzLqzxQsEBqo4d5ecsg/vhiKuVjGYIwFzihE="; + useFetchCargoVendor = true; + cargoHash = "sha256-Mv0wTuTWCsBGjlr4BhLezBOCtgQ0qq2kwLcZxU1nREM="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/kr/krun/package.nix b/pkgs/by-name/kr/krun/package.nix index d7f6462e8810..216c92e86b9b 100644 --- a/pkgs/by-name/kr/krun/package.nix +++ b/pkgs/by-name/kr/krun/package.nix @@ -34,7 +34,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-NahnigxJaY2QwWnySCRrnf3JyqZ+7jRA1CpE7ON0OOE="; + useFetchCargoVendor = true; + cargoHash = "sha256-5zrwxyzt9ZEdUNUMnCaFUVpaO53RAabVdtib9LG6Q1s="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/kt/kty/package.nix b/pkgs/by-name/kt/kty/package.nix index 72255bcc3f67..cd197e43bec0 100644 --- a/pkgs/by-name/kt/kty/package.nix +++ b/pkgs/by-name/kt/kty/package.nix @@ -38,7 +38,8 @@ rustPlatform.buildRustPackage rec { ] ); - cargoHash = "sha256-mhXi4YgYT2NfIjtESjvSP5TMOl3UH3CJFwKlJriZ0/4="; + useFetchCargoVendor = true; + cargoHash = "sha256-nJ+nof2YhyLrNuLVy69kYj5tw+aG4IJm6nVxHkczbko="; meta = { homepage = "https://kty.dev/"; diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix index f37eae5c351a..2e56ba7fafed 100644 --- a/pkgs/by-name/ku/kubetui/package.nix +++ b/pkgs/by-name/ku/kubetui/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { frameworks.AppKit ] ); - cargoHash = "sha256-rS4P4CJ1V1Bq4lsprYEWhff9b1EqQ/6ytyjJs9DCrY0="; + useFetchCargoVendor = true; + cargoHash = "sha256-bRznReljcnRRn2PsOukFHV634CkBByJZxJVyGL4f/10="; meta = { homepage = "https://github.com/sarub0b0/kubetui"; diff --git a/pkgs/by-name/kx/kx-aspe-cli/package.nix b/pkgs/by-name/kx/kx-aspe-cli/package.nix index 55cb5b2dff67..a3c686f5d0ed 100644 --- a/pkgs/by-name/kx/kx-aspe-cli/package.nix +++ b/pkgs/by-name/kx/kx-aspe-cli/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; - cargoHash = "sha256-ZZwb5WHKFMAP5yPT1DDi+nWy7rjM/UI6ahagNqTDDMM="; + useFetchCargoVendor = true; + cargoHash = "sha256-wOg81NvChOLPiCyhJ5dGn5sRskevpf0QdKwmgZa2/1s="; meta = { homepage = "https://codeberg.org/keyoxide/kx-aspe-cli"; diff --git a/pkgs/by-name/la/lalrpop/package.nix b/pkgs/by-name/la/lalrpop/package.nix index c7c97c7880b9..35c040efdf89 100644 --- a/pkgs/by-name/la/lalrpop/package.nix +++ b/pkgs/by-name/la/lalrpop/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cFwBck+bdOjhF6rQQj03MOO+XCsrII5c4Xvhsw12ETA="; }; - cargoHash = "sha256-zkPLas+fQQzm7LlWNpTooUR/e30KMS9OET6PMwQ2yAA="; + useFetchCargoVendor = true; + cargoHash = "sha256-c0xota0APLm/xQSH2Orn0PgCKuhUVhXEtzNge/GeYo0="; patches = [ (replaceVars ./use-correct-binary-path-in-tests.patch { diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix index 3fb188f666fb..a32cc9cc4956 100644 --- a/pkgs/by-name/la/lan-mouse/package.nix +++ b/pkgs/by-name/la/lan-mouse/package.nix @@ -47,7 +47,8 @@ rustPlatform.buildRustPackage rec { libXtst ]; - cargoHash = "sha256-RP3Jw0b2h8KJlVdd8X/AkkmGdRlIfG2tkPtUKohDxvA="; + useFetchCargoVendor = true; + cargoHash = "sha256-+UXRBYfbkb114mwDGj36oG5ZT3TQtcEzsbyZvtWTMxM="; meta = { description = "Software KVM switch for sharing a mouse and keyboard with multiple hosts through the network"; diff --git a/pkgs/by-name/la/lanzaboote-tool/package.nix b/pkgs/by-name/la/lanzaboote-tool/package.nix index c13a0b8974df..3a87faf77cc5 100644 --- a/pkgs/by-name/la/lanzaboote-tool/package.nix +++ b/pkgs/by-name/la/lanzaboote-tool/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "${src.name}/rust/tool"; - cargoHash = "sha256-g4WzqfH6DZVUuNb0jV3MFdm3h7zy2bQ6d3agrXesWgc="; + useFetchCargoVendor = true; + cargoHash = "sha256-HnTsu46P3HRYo2d1DeaP6hqn+pVW3J4IM+CneckSFoM="; env.TEST_SYSTEMD = systemd; doCheck = lib.meta.availableOn stdenv.hostPlatform systemd; diff --git a/pkgs/by-name/la/lazycli/package.nix b/pkgs/by-name/la/lazycli/package.nix index 80c8f4bbac3e..066a44a0d4ff 100644 --- a/pkgs/by-name/la/lazycli/package.nix +++ b/pkgs/by-name/la/lazycli/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1qq167hc7pp9l0m40ysphfljakmm8hjjnhpldvb0kbc825h0z8z5"; }; - cargoHash = "sha256-1BIUXepR7ppEkTLDOCZz9RBv+RazNMXnCnH1rvzVFgs="; + useFetchCargoVendor = true; + cargoHash = "sha256-L6qY1yu+8L7DajX//Yov0KgI2bR8yipSzbZC2c+LZZs="; checkFlags = [ # currently broken: https://github.com/jesseduffield/lazycli/pull/20 diff --git a/pkgs/by-name/la/lazyjj/package.nix b/pkgs/by-name/la/lazyjj/package.nix index b45a4665cdde..3191cd25390a 100644 --- a/pkgs/by-name/la/lazyjj/package.nix +++ b/pkgs/by-name/la/lazyjj/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-iT6kRzD+w7cb7ZjMt7NfkqwFJOzbt6kxc5vDjI7By84="; }; - cargoHash = "sha256-y7yIgM4pIvqsX7LuLU/6P/9oNxsJrg/o/4CqqJ8uitU="; + useFetchCargoVendor = true; + cargoHash = "sha256-48BuZUPY3VH5QmwiNtGVg4BHBvpiBr+Bg98WWfseH0I="; postInstall = '' wrapProgram $out/bin/lazyjj \ diff --git a/pkgs/by-name/ld/ldproxy/package.nix b/pkgs/by-name/ld/ldproxy/package.nix index ac1f62c4132d..a1816eccef18 100644 --- a/pkgs/by-name/ld/ldproxy/package.nix +++ b/pkgs/by-name/ld/ldproxy/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YH2CPb3uBlPncd+KkP25xhCVvDB7HDxJuSqWOJ1LT3k="; }; - cargoHash = "sha256-HobX/aBn10KPpUKRSLt2IvfFVW7YpOu5tX4zNSCz6tw="; + useFetchCargoVendor = true; + cargoHash = "sha256-/WBhgPyd5hR3DBYvV8pd7uZb6FeD3yiDe3wOKtyFRG8="; # However we are only interested in building the specific crate located at `/ldproxy` # cf: https://github.com/esp-rs/embuild/tree/v0.31.4/ldproxy diff --git a/pkgs/by-name/le/leaf/package.nix b/pkgs/by-name/le/leaf/package.nix index a37a9b1c9c37..31cac3531b68 100644 --- a/pkgs/by-name/le/leaf/package.nix +++ b/pkgs/by-name/le/leaf/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-y0NO9YcOO7T7Cqc+/WeactwBAkeUqdCca87afOlO1Bk="; }; - cargoHash = "sha256-2I0XusAI98WLzGcwEorPmtcK3VkpwpkIn0JKwn3gT1c="; + useFetchCargoVendor = true; + cargoHash = "sha256-RQ9fQfYfpsFAA5CzR3ICLIEYb00qzUsWAQKSrK/488g="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/le/leddy/package.nix b/pkgs/by-name/le/leddy/package.nix index b78b5a3b79ec..136539e906de 100644 --- a/pkgs/by-name/le/leddy/package.nix +++ b/pkgs/by-name/le/leddy/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { rev = "fd259425980df17bd761006a1ccef93e23bfdad6"; hash = "sha256-7t+E47odtayw26AnhtkxIWr0TxDwruEjP3Af3ajmVAA="; }; - cargoHash = "sha256-99qPo5Nsu8pLMT5EIpQ/+F0o/00Y5gQ9T0z5+gxUcww="; + useFetchCargoVendor = true; + cargoHash = "sha256-ezl9/vKDPJNYH1U4H/7OtE0g3iWIS+tDapJDhaKT+l0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/le/leetcode-cli/package.nix b/pkgs/by-name/le/leetcode-cli/package.nix index d1d1442bd5b5..71c66932a942 100644 --- a/pkgs/by-name/le/leetcode-cli/package.nix +++ b/pkgs/by-name/le/leetcode-cli/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Jc0akHj2DHbkF7sjslOwdeI1piW2gnhoalBz18lpQdQ="; }; - cargoHash = "sha256-t3u82bjO1Qv32TwpZNCaaEqOVajXIgM7VBNQ4UjMcl8="; + useFetchCargoVendor = true; + cargoHash = "sha256-rr/8rbgjGr1npkimJK8rpZcsRFP0ACx+a1x0ITI71G0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/le/leftwm-config/package.nix b/pkgs/by-name/le/leftwm-config/package.nix index 90c91a261e0d..9f54248e6c95 100644 --- a/pkgs/by-name/le/leftwm-config/package.nix +++ b/pkgs/by-name/le/leftwm-config/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-wyb/26EyNyBJeTDUvnMxlMiQjaCGBES8t4VteNY1I/A="; }; - cargoHash = "sha256-U3mgbG9h2cDqr0aqxbI2CJUOweIoDXDxmsWg0zxolSo="; + useFetchCargoVendor = true; + cargoHash = "sha256-FiM51ZV61aCFWHyNIudQl1B7X5ov0SXyWIVE4am1Vmw="; meta = { description = "Little satellite utility for LeftWM"; diff --git a/pkgs/by-name/le/leftwm-theme/package.nix b/pkgs/by-name/le/leftwm-theme/package.nix index c10601a0f1f9..10d5563819a4 100644 --- a/pkgs/by-name/le/leftwm-theme/package.nix +++ b/pkgs/by-name/le/leftwm-theme/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-cV4tY1qKNluSSGf+WwKFK3iVE7cMevafl6qQvhy1flE="; }; - cargoHash = "sha256-VEQn1LFXiZCVR2WgOFoHo18d3cdIoq9/zNjg8GMs0j8="; + useFetchCargoVendor = true; + cargoHash = "sha256-v3PHMaXJCEBiCd+78b/BXRooZC4Py82gDcvA/efNJ7w="; checkFlags = [ # direct writing /tmp diff --git a/pkgs/by-name/le/leftwm/package.nix b/pkgs/by-name/le/leftwm/package.nix index 561aaa43e2d4..d847009d37f2 100644 --- a/pkgs/by-name/le/leftwm/package.nix +++ b/pkgs/by-name/le/leftwm/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3voGKM6MKisc+ZVdZ5sCrs3XVfeRayozIk4SXNjw820="; }; - cargoHash = "sha256-w8qgNXxd6tZ1eMpQQqDoax76zYxTVHgVAlchQaRnMCc="; + useFetchCargoVendor = true; + cargoHash = "sha256-i0rMgV1rV9k7j25zoJc1hHXTpTPfDMSOMciJOvInO34="; buildInputs = rpathLibs; diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix index cffadf09ab9d..99e1862dd5f9 100644 --- a/pkgs/by-name/le/legba/package.nix +++ b/pkgs/by-name/le/legba/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ioH/dy+d20p81iLLIcer+1fVib60TJ5Ezr6UlsL+F9g="; }; - cargoHash = "sha256-UaaB4d7sfHm+KJI05x/TYeEd8pTePJaFBMW7t7ShSqg="; + useFetchCargoVendor = true; + cargoHash = "sha256-eIgi6+f7ss/5AB3llEfrS75twejFzReS4i7fdbGWrCk="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/le/lemmeknow/package.nix b/pkgs/by-name/le/lemmeknow/package.nix index cae3664637b2..516f15f75143 100644 --- a/pkgs/by-name/le/lemmeknow/package.nix +++ b/pkgs/by-name/le/lemmeknow/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Q82tP4xNWAooFjHeJCFmuULnWlFbgca/9Y2lm8rVXKs="; }; - cargoHash = "sha256-slV9RxdFCEx1El7hngWGv+5CqDSQsU2ACF2nWQLOTU0="; + useFetchCargoVendor = true; + cargoHash = "sha256-65PPIYfwVO8O4K8yr499vRQScpAREiBZ8O0rrDMCXB8="; meta = with lib; { description = "Tool to identify anything"; diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix index 3af2ba09ccae..5e4d0d09e11e 100644 --- a/pkgs/by-name/le/lemmy-help/package.nix +++ b/pkgs/by-name/le/lemmy-help/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "cli" ]; - cargoHash = "sha256-BCwpiBPvnLgbpOaXgUK2EDXnT8d4jo7aqgM6uwl80eg="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZuLbdsZadEkY5M4LoHBn6gnKYklVbXpRa60EocYUH+A="; meta = with lib; { description = "CLI for generating vim help docs from emmylua comments"; diff --git a/pkgs/by-name/le/lemurs/package.nix b/pkgs/by-name/le/lemurs/package.nix index e2526f322509..f4a8fc3bf30d 100644 --- a/pkgs/by-name/le/lemurs/package.nix +++ b/pkgs/by-name/le/lemurs/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { ./0001-fix-static-lifetime-string.patch ]; - cargoHash = "sha256-uuHPJe+1VsnLRGbHtgTMrib6Tk359cwTDVfvtHnDToo="; + useFetchCargoVendor = true; + cargoHash = "sha256-FybaQ9xd5Unvo8gpSC8DzVKrXyVquHcJarzu0GaG8fw="; buildInputs = [ linux-pam diff --git a/pkgs/by-name/le/leptosfmt/package.nix b/pkgs/by-name/le/leptosfmt/package.nix index 5b89af49bd71..64c24e1c676a 100644 --- a/pkgs/by-name/le/leptosfmt/package.nix +++ b/pkgs/by-name/le/leptosfmt/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-zj81fXjDM648Y8mIb6QMmAh/ck9GGEypzuJIBWZ32r8="; + useFetchCargoVendor = true; + cargoHash = "sha256-u0PtqWcQdt3vjoarqyiLZa8g5I+GWXPuHW6a/EtbB7o="; meta = with lib; { description = "Formatter for the leptos view! macro"; diff --git a/pkgs/by-name/li/libetebase/package.nix b/pkgs/by-name/li/libetebase/package.nix index 67ec18801a04..ea55fa8a3de9 100644 --- a/pkgs/by-name/li/libetebase/package.nix +++ b/pkgs/by-name/li/libetebase/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cXuOKfyMdk+YzDi0G8i44dyBRf4Ez5+AlCKG43BTSSU="; }; - cargoHash = "sha256-GUNj5GrY04CXnej3WDKZmW4EeJhoCl2blHSDfEkQKtE="; + useFetchCargoVendor = true; + cargoHash = "sha256-XPXjWhJlWW5ukZ8uN72fxW5r0gyS405puXiBtXUpqsM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/li/librashader/package.nix b/pkgs/by-name/li/librashader/package.nix index f840a949dcc0..325f42adabdb 100644 --- a/pkgs/by-name/li/librashader/package.nix +++ b/pkgs/by-name/li/librashader/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { ./patches/fix-optional-dep-syntax.patch ]; - cargoHash = "sha256-eUZOFdbOPs81LAMEV4i6eYRN8NYVcnmble/L+ptx2EA="; + useFetchCargoVendor = true; + cargoHash = "sha256-9rwrbCt/obrKlRDWzzc1hm6ywHubz5x6Ujm2JMso0vg="; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/li/license-cli/package.nix b/pkgs/by-name/li/license-cli/package.nix index c91618db40cc..05a28999d4bd 100644 --- a/pkgs/by-name/li/license-cli/package.nix +++ b/pkgs/by-name/li/license-cli/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OGS26mE5rjxlZOaBWhYc7C8aM3Lq2xX0f31LgckjJF8="; }; - cargoHash = "sha256-Zj9t/e6QhiOxU8mlVRBKEbviSTKXM4WQ3lqtoCcMbMI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Jvg3XndPyQ9TYejJaO7GAI9RwLAOWB0uapA+6WIKAkI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/li/license-generator/package.nix b/pkgs/by-name/li/license-generator/package.nix index f2f4af2b5f27..080be50b2837 100644 --- a/pkgs/by-name/li/license-generator/package.nix +++ b/pkgs/by-name/li/license-generator/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jp7NQfDh512oThZbLj0NbqcH7rxV2R0kDv1wsiTNf/M="; }; - cargoHash = "sha256-pjH+i7uG3++NLIZ9y+wg4r+TutmZF2+uO501pdPApQs="; + useFetchCargoVendor = true; + cargoHash = "sha256-GP1Xr+M7mDXFB1fVdTq3VPPQR9QU43iQlJNW9MqcLB0="; meta = with lib; { description = "Command-line tool for generating license files"; diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix index cea8db5fcb2b..d38039d1cf39 100644 --- a/pkgs/by-name/li/licensure/package.nix +++ b/pkgs/by-name/li/licensure/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YPdVVHJ/ldILGbg95x7D06chG8Q6a+NnTAimuvBScpE="; }; - cargoHash = "sha256-Vam66mHnDuyVfrbi897DCDmoF812YeGG0KtSYzHrteY="; + useFetchCargoVendor = true; + cargoHash = "sha256-+lZ70D62je+vCExN77LQqNiIqJFUO8FUjyOZbdfbM/c="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/li/lightningcss/package.nix b/pkgs/by-name/li/lightningcss/package.nix index 909d7c1e01b2..447eb3911c3c 100644 --- a/pkgs/by-name/li/lightningcss/package.nix +++ b/pkgs/by-name/li/lightningcss/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xnsTYOjnfcaPHlLpf83efD3w5cjqyFV5bCV89zG1GaA="; }; - cargoHash = "sha256-cip1ZhHR39PE6ZX8PhGJ3oXCkR5LE/OWyjMqiG+lHvY="; + useFetchCargoVendor = true; + cargoHash = "sha256-/q4XX/tN7scv0W04NexYLuOvKc09f1w+Je5UEN9Tv9g="; patches = [ # Backport fix for build error for lightningcss-napi diff --git a/pkgs/by-name/li/limbo/package.nix b/pkgs/by-name/li/limbo/package.nix index 1a11ba77ee68..9146a29a2d43 100644 --- a/pkgs/by-name/li/limbo/package.nix +++ b/pkgs/by-name/li/limbo/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Lmtvn7hWdrqumtTpiYK0sTsESeKo4Mfao32K0DfHmrc="; }; - cargoHash = "sha256-hOKTN41yqMPh/Zo8jVRiOSL331py9QRzLhkTL2Jz0yI="; + useFetchCargoVendor = true; + cargoHash = "sha256-wmo2ZUtFGylH1z2R+SwMOWSsq0lGn9nkMwtvI9sZn5U="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix index 68b3bc24530c..d7fbe21b77ef 100644 --- a/pkgs/by-name/li/live-server/package.nix +++ b/pkgs/by-name/li/live-server/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9NULpK48svCMTx1OeivS+LHVGUGFObg4pBr/V0yIuwM="; }; - cargoHash = "sha256-QB03sXAGNHu+Yc/UYcmOqYBS/LNbKSoT9PZa11prNtA="; + useFetchCargoVendor = true; + cargoHash = "sha256-f+NePPvuXq20CcKK0pz2MbvWEYQbN29nFc+PmH1pWY4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index eba0f6a127e2..5896c4336bcc 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ makeBinaryWrapper ]; - cargoHash = "sha256-U0peFuyWZ0RP1Chtj7WY646fIQ8Q+HB2gtnhTO3hhiM="; + useFetchCargoVendor = true; + cargoHash = "sha256-aX8nm/V0ug2g40QeFU9AWxjuFAnW+gYTR8RC5CV7wRQ="; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/by-name/ll/llm-ls/package.nix b/pkgs/by-name/ll/llm-ls/package.nix index cd3014c3182e..ce2c39be80b1 100644 --- a/pkgs/by-name/ll/llm-ls/package.nix +++ b/pkgs/by-name/ll/llm-ls/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4gXasfMqlrrP8II+FiV/qGfO7a9qFkDQMiax7yEua5E="; }) ]; - cargoHash = "sha256-m/w9aJZCCh1rgnHlkGQD/pUDoWn2/WRVt5X4pFx9nC4="; + useFetchCargoVendor = true; + cargoHash = "sha256-qiYspv2KcvzxVshVpAMlSqFDqbbiutpLyWMz+QSIVmQ="; buildAndTestSubdir = "crates/llm-ls"; diff --git a/pkgs/by-name/ll/lls/package.nix b/pkgs/by-name/ll/lls/package.nix index 91733f7d2488..6e3a56ebfd35 100644 --- a/pkgs/by-name/ll/lls/package.nix +++ b/pkgs/by-name/ll/lls/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f2f09ptMBZfBY1jjOEc8ElAoEj4LKXXSdXLlYLf8Z3M="; }; - cargoHash = "sha256-LS0azaKBFWW86R4XO5BkCHMEG2UwgkVQIwLELxewiu0="; + useFetchCargoVendor = true; + cargoHash = "sha256-Hc6roJJ5xbqdCAsZIf0V2Z8KPm+t7AQ5Q9It1ynWqhw="; meta = with lib; { description = "Tool to list listening sockets"; diff --git a/pkgs/by-name/lo/loco-cli/package.nix b/pkgs/by-name/lo/loco-cli/package.nix index 453877f87782..c8e1e34ab927 100644 --- a/pkgs/by-name/lo/loco-cli/package.nix +++ b/pkgs/by-name/lo/loco-cli/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AhL+k5XEf8m1pyOECTlPwALUG/ELJeACfV2kulxlzaA="; }; - cargoHash = "sha256-BtunTti1cPbG1Qiv39tLdbXHM413UzsCckyqL5CJEUA="; + useFetchCargoVendor = true; + cargoHash = "sha256-TwsnEkD6SVgyvtJHgG0Da+6K/bbDwnM8b4CMhba+ej8="; #Skip trycmd integration tests checkFlags = [ "--skip=cli_tests" ]; diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix index a0a980af632a..f450a198e6d4 100644 --- a/pkgs/by-name/lr/lrcget/package.nix +++ b/pkgs/by-name/lr/lrcget/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/src-tauri"; - cargoHash = "sha256-xGOUR4DWVi5Sx9AEnvIeeRaF2kb5YAv1BBruAk712L8="; + useFetchCargoVendor = true; + cargoHash = "sha256-KeJbhsIOLcHCNKU9xaYGK+WJBXk3wqTmcNV5S/6Z5eA="; frontend = buildNpmPackage { inherit version src; diff --git a/pkgs/by-name/ls/lscolors/package.nix b/pkgs/by-name/ls/lscolors/package.nix index 63532efb5e04..2f7441b9cff4 100644 --- a/pkgs/by-name/ls/lscolors/package.nix +++ b/pkgs/by-name/ls/lscolors/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EUUPVSpHc9tN1Hi7917hJ2psTZq5nnGw6PBeApvlVtw="; }; - cargoHash = "sha256-1wAHd0WrJfjxDyGRAJjXGFY9ZBFlBOQFr2+cxoTufW0="; + useFetchCargoVendor = true; + cargoHash = "sha256-WsbzlL+RbR8Hnrsbgr7gFpBlo3RBKcNYPbOsZWygyrI="; buildFeatures = [ "nu-ansi-term" ]; diff --git a/pkgs/by-name/ls/lsd/package.nix b/pkgs/by-name/ls/lsd/package.nix index e2b4bb682e63..815aa15620cb 100644 --- a/pkgs/by-name/ls/lsd/package.nix +++ b/pkgs/by-name/ls/lsd/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LlMcBMb40yN+rlvGVsh7JaC3j9sF60YxitQQXe1q/oI="; }; - cargoHash = "sha256-yyXFtMyiMq6TaN9/7+BaBERHgubeA8SJGOr08Mn3RnY="; + useFetchCargoVendor = true; + cargoHash = "sha256-yOJKXfPtzaYF012YCyW3m+9ffag4En4ZfTaiVh/85dM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix index 4d159cb6c44a..9e035452c1f0 100644 --- a/pkgs/by-name/lu/ludtwig/package.nix +++ b/pkgs/by-name/lu/ludtwig/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { checkType = "debug"; - cargoHash = "sha256-czofgV5a9aQoLn4JaBUbytY/aHfgJv3Q8RU2j+fbXo8="; + useFetchCargoVendor = true; + cargoHash = "sha256-oS4YepJWqmbjAhitHOCBUrLEyVo3UpZ8UNOESuG4C2M="; meta = with lib; { description = "Linter / Formatter for Twig template files which respects HTML and your time"; diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix index c99457baae23..8fdddc8ebf4e 100644 --- a/pkgs/by-name/lu/ludusavi/package.nix +++ b/pkgs/by-name/lu/ludusavi/package.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-N2dDi47Z2PifMNlYE6Lk1nHxfpvwoL6h2QkUPthlh4A="; }; - cargoHash = "sha256-ERMCZikUWWt5QpArAzXjhuZKVVFMP/cPA+pkjNwCWiA="; + useFetchCargoVendor = true; + cargoHash = "sha256-kKyH+JAydoaPvuhHxkC18Io4CWbyjhVcuu9+CBOvEwg="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/lu/luminous-ttv/package.nix b/pkgs/by-name/lu/luminous-ttv/package.nix index 284c28a7205a..9d1fe61b0449 100644 --- a/pkgs/by-name/lu/luminous-ttv/package.nix +++ b/pkgs/by-name/lu/luminous-ttv/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pT+hiREKdzw9MKv28QpLK6LmHvnRci26f0DlcXns2rA="; }; - cargoHash = "sha256-sUSXcVv93Sn6qNPNsbPvKXSZYkTdrOQifpSPBWjfqy8="; + useFetchCargoVendor = true; + cargoHash = "sha256-A5fUATbOuwSt0n1KV/+bbd65mDwWhllGraf2RrBTK6s="; meta = { description = "Rust server to retrieve and relay a playlist for Twitch livestreams/VODs"; diff --git a/pkgs/by-name/lu/lunatic/package.nix b/pkgs/by-name/lu/lunatic/package.nix index 66eb7425bf61..d5d809c2067b 100644 --- a/pkgs/by-name/lu/lunatic/package.nix +++ b/pkgs/by-name/lu/lunatic/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uMMssZaPDZn3bOtQIho+GvUCPmzRllv7eJ+SJuKaYtg="; }; - cargoHash = "sha256-ALjlQsxmZVREyi3ZGMJMv/38kkMjYh+hTSr/0avYJVs="; + useFetchCargoVendor = true; + cargoHash = "sha256-SzfM4hQW9vTTRqCAEn/EPv9mK9WlXYRFUW8pA/Gfw04="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix index 698bc92994e2..a332011e2ff9 100644 --- a/pkgs/by-name/lu/lune/package.nix +++ b/pkgs/by-name/lu/lune/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-yTpklksOV+AFuW3Bc0L6sbAiJsQ+mseF1yz37FcWt1k="; + useFetchCargoVendor = true; + cargoHash = "sha256-oOz7r/5NTzdNbVvO2erWlWR0f0fH7HWBo9LVkZN65pU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lu/lurk/package.nix b/pkgs/by-name/lu/lurk/package.nix index daa459636fb5..582d909b5202 100644 --- a/pkgs/by-name/lu/lurk/package.nix +++ b/pkgs/by-name/lu/lurk/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KiM5w0YPxEpJ4cR/8YfhWlTrffqf5Ak1eu0yxgOmqUs="; }; - cargoHash = "sha256-wccehO+zHKINMk9q7vZjUUl7puB6NzcYdl+meA5Bh/c="; + useFetchCargoVendor = true; + cargoHash = "sha256-N8jAmD9IpR+HALWpqp7y/wp75JVb4zgzoLT5oJ06njY="; postPatch = '' substituteInPlace src/lib.rs \ diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix index 151b01cb7bda..4d096143fbfc 100644 --- a/pkgs/by-name/lu/lutgen/package.nix +++ b/pkgs/by-name/lu/lutgen/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jmMVeDDVb/TuxulDYj+8y4Kl42EJTAWb3tAsanfWduE="; }; - cargoHash = "sha256-cT999TukdiKmmNUpK7SE1uiuNoLhmjdtz/2cYXFC6dk="; + useFetchCargoVendor = true; + cargoHash = "sha256-BEh8Wl0X1wv53w/Zu0PHwh8oGtCvIJe60aVqLbiH1Hs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index 68217973b082..af78399c810a 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -44,7 +44,8 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = true; buildFeatures = [ "git2" ]; - cargoHash = "sha256-w34+3zRn4ZGA2aZZ3+lZqo4/QcDSpmt1HNb+gZtAavI="; + useFetchCargoVendor = true; + cargoHash = "sha256-EbJi0/0ahEUOgRhW51ddw8ZQiwl0ilEvb5ssFaQA2AA="; # maa-cli would only seach libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix index 9dd78e6b1df9..f9ba9770e89e 100644 --- a/pkgs/by-name/ma/macchina/package.nix +++ b/pkgs/by-name/ma/macchina/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GZO9xGc3KGdq2WdA10m/XV8cNAlQjUZFUVu1CzidJ5c="; }; - cargoHash = "sha256-BIyr/EaOjKDT5+4RFs3xz7zqAG1gblUqr2f+vl7B6Zo="; + useFetchCargoVendor = true; + cargoHash = "sha256-B3dylFOMQ1a1DfemfQFFlLVKCmB+ipUMV45iDh8fSqY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ma/macmon/package.nix b/pkgs/by-name/ma/macmon/package.nix index a32b017c0523..2123287ba177 100644 --- a/pkgs/by-name/ma/macmon/package.nix +++ b/pkgs/by-name/ma/macmon/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Uc+UjlCeG7W++l7d/3tSkIVbUi8IbNn3A5fqyshG+xE="; }; - cargoHash = "sha256-mE6PGWjaCFpqVoE1zISOqwt6o5SakjJM4sPRtU90lPA="; + useFetchCargoVendor = true; + cargoHash = "sha256-erKN6wR/W48QF1FbUkzjo6xaN1GVbAelruzxf4NS07o="; meta = { homepage = "https://github.com/vladkens/macmon"; diff --git a/pkgs/by-name/ma/magic-wormhole-rs/package.nix b/pkgs/by-name/ma/magic-wormhole-rs/package.nix index 71e22bd68f4e..9e6207a4c5b4 100644 --- a/pkgs/by-name/ma/magic-wormhole-rs/package.nix +++ b/pkgs/by-name/ma/magic-wormhole-rs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-wah3Mkw3oFUx4rD6OkLvYyHsz6Z8pFFPhKlc0D7gIQA="; }; - cargoHash = "sha256-iAwlaEfegM2uo728kUhh7GhfponqmZ48ri6iUyRVRUI="; + useFetchCargoVendor = true; + cargoHash = "sha256-qQAedjOHXYTu1K5fvoXWonXsJBSlBD4M8r3DGLSw7pI="; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libxcb ]; diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index 3af113acb926..51350e112414 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-QSb+5wlv8uFT2wTeJyfsz+vE4Kegqgi7Dqyl1KZU//U="; }; - cargoHash = "sha256-7ElDEhWZLFuqzZjeh7TdrLy1++bmdS7CLRwyOLzaJ18="; + useFetchCargoVendor = true; + cargoHash = "sha256-XpLVe7ln3ZYs8HGE/52xI7op9ZGa4S5u419gE3nVgz0="; env = { # Get openssl-sys to use pkg-config diff --git a/pkgs/by-name/ma/majima/package.nix b/pkgs/by-name/ma/majima/package.nix index 94d8b949d510..69b3d37a5e5a 100644 --- a/pkgs/by-name/ma/majima/package.nix +++ b/pkgs/by-name/ma/majima/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage { hash = "sha256-P5E0Wiy3mNPRCQ/bsIW4fG7LnPSPRXmW7pnbgl0/lBQ="; }; - cargoHash = "sha256-sblSlmXkiJkVGbrMU6HgtvYnAd48SlUOgDwB6ASMFsQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-bb3rg7vWRBSOPf0LM7avQQNlMjLiLFRtrGIfJbFWtHI="; meta = { description = "Generate random usernames quickly and in various formats"; diff --git a/pkgs/by-name/ma/maker-panel/package.nix b/pkgs/by-name/ma/maker-panel/package.nix index 3726f823f65d..2bbf17a417ca 100644 --- a/pkgs/by-name/ma/maker-panel/package.nix +++ b/pkgs/by-name/ma/maker-panel/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0dlsy0c46781sb652kp80pvga7pzx6xla64axir92fcgg8k803bi"; }; - cargoHash = "sha256-Ygya/9keRyIQyjrO6medtcXww9LMG3ne6I/8q35lJPo="; + useFetchCargoVendor = true; + cargoHash = "sha256-H4eKZlay0IZ8vAclGruDAyh7Vd6kCvGLxJ5y/cuF+F4="; cargoPatches = [ ./update-gerber-types-to-0.3.patch ]; diff --git a/pkgs/by-name/ma/makima/package.nix b/pkgs/by-name/ma/makima/package.nix index 171d0d1a09ff..9540668604be 100644 --- a/pkgs/by-name/ma/makima/package.nix +++ b/pkgs/by-name/ma/makima/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kC0GJ1K7DMfkYxaYog5y1y0DMfFjZ7iD7pGQQE67N9o="; }; - cargoHash = "sha256-70gkCv9YHeHj1Hj9gLTvHTRULEJJwezaqSECWbgPIc4="; + useFetchCargoVendor = true; + cargoHash = "sha256-d9MUH8cORFaxgAKV/Mgq3tiNuoAJ2YTcbgvwPTOIlkw="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/ma/managarr/package.nix b/pkgs/by-name/ma/managarr/package.nix index 715ec001e6b1..5198e3659ad5 100644 --- a/pkgs/by-name/ma/managarr/package.nix +++ b/pkgs/by-name/ma/managarr/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OxGFubtMsGnR8cWDKkeAgryY095uydA3LzE5SS0dspQ="; }; - cargoHash = "sha256-bws4LwpJGfq0hCA2Fq51uCMvr0arbayppq1jvDrILZI="; + useFetchCargoVendor = true; + cargoHash = "sha256-oJN9jhcMu2kFZZ2kW7mrf7bZNb/9cauSemZjQe4Myz0="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/ma/mandown/package.nix b/pkgs/by-name/ma/mandown/package.nix index a007ef0dd74d..7ddb65f63491 100644 --- a/pkgs/by-name/ma/mandown/package.nix +++ b/pkgs/by-name/ma/mandown/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TgOxRd8s2Vb4pNVPmFt2E5VnRHIEt6YlnTNyr91l6P8="; }; - cargoHash = "sha256-eHKivxnbOk3K2JEVIVHhaEds6Gr2TcYUnFuallHRV/0="; + useFetchCargoVendor = true; + cargoHash = "sha256-a2RfwS45B2PrId4kxIx1Ko+tjED4ZU+WziOxa79q2/E="; meta = with lib; { description = "Markdown to groff (man page) converter"; diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix index 81fddfde4874..e83565373a99 100644 --- a/pkgs/by-name/ma/manga-tui/package.nix +++ b/pkgs/by-name/ma/manga-tui/package.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage { ./0001-fix-remove-flaky-test.patch ]; - cargoHash = "sha256-IufJPCvUEWR5p4PrFlaiQPW9wyIFj/Pd/JHki69L6Es="; + useFetchCargoVendor = true; + cargoHash = "sha256-6qydjT4aSbh4uk+BpOzgZt1wctKkuDINvAPNtVbWH0k="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ma/manix/package.nix b/pkgs/by-name/ma/manix/package.nix index c3ea02a3e5b2..278ddec52a45 100644 --- a/pkgs/by-name/ma/manix/package.nix +++ b/pkgs/by-name/ma/manix/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b/3NvY+puffiQFCQuhRMe81x2wm3vR01MR3iwe/gJkw="; }; - cargoHash = "sha256-45cb0yO/ypGLcvEgPOkN6Py99yqK09xnCmMOLOOYYSA="; + useFetchCargoVendor = true; + cargoHash = "sha256-6KkZg8MXQIewhwdLE8NiqllJifa0uvebU1/MqeE/bdI="; meta = with lib; { description = "Fast CLI documentation searcher for Nix"; diff --git a/pkgs/by-name/ma/markuplinkchecker/package.nix b/pkgs/by-name/ma/markuplinkchecker/package.nix index 85aa7aa76d0d..1104883f9ee6 100644 --- a/pkgs/by-name/ma/markuplinkchecker/package.nix +++ b/pkgs/by-name/ma/markuplinkchecker/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Nh+P5+dvl2gBQuvo0iKjsJgz/2OYQqAWSIJBzE7yO6I="; }; - cargoHash = "sha256-1WB8J3AMK4DVHrrrdwV7nFmNJfiIndC2k2VQXzKxEy8="; + useFetchCargoVendor = true; + cargoHash = "sha256-CVfp87b/oTfZ3uXySTqrPnXDDRSSupXRUBJLzT3ZWDY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ma/marmite/package.nix b/pkgs/by-name/ma/marmite/package.nix index 64d16f9e5224..2edbd8f7dc10 100644 --- a/pkgs/by-name/ma/marmite/package.nix +++ b/pkgs/by-name/ma/marmite/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AblitYe7YDUc2Tg2P7j+wnOjMAhDtieDsbq6B6x+uMs="; }; - cargoHash = "sha256-u8sJS9hvIao+af7IA4vE0eUSx0xmI1Kb5NXyZBrOCIw="; + useFetchCargoVendor = true; + cargoHash = "sha256-gVFyhWVtj9zU0FEGeN+BI0hvz0qSH5dCz1/d/i9wCyo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix index 11a7008927f8..207f91077480 100644 --- a/pkgs/by-name/ma/mask/package.nix +++ b/pkgs/by-name/ma/mask/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xGD23pso5iS+9dmfTMNtR6YqUqKnzJTzMl+OnRGpL3g="; }; - cargoHash = "sha256-bhf6+nUxg4yIQIjiQYFdtPPF1crFVsofHdEsIOpiH2Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-JaYr6J3NOwVIHzGO4wLkke5O/T/9WUDENPgLP5Fwyhg="; # tests require mask to be installed doCheck = false; diff --git a/pkgs/by-name/ma/masklint/package.nix b/pkgs/by-name/ma/masklint/package.nix index 64f8bace2d8c..d950ca90fd4d 100644 --- a/pkgs/by-name/ma/masklint/package.nix +++ b/pkgs/by-name/ma/masklint/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Dku2pDUCblopHtoj6viUqHVpVH5GDApp+QLjor38j7g="; }; - cargoHash = "sha256-dbcz66t9fLhFjFkDMQ6VJmKa/lI/x2J7sHbguamA4Pw="; + useFetchCargoVendor = true; + cargoHash = "sha256-TDk7hEZ628iUnKI0LMBtsSAVNF6BGukHwB8kh70eo4U="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ma/matrix-commander-rs/package.nix b/pkgs/by-name/ma/matrix-commander-rs/package.nix index 5c11998b73b5..1248862513b4 100644 --- a/pkgs/by-name/ma/matrix-commander-rs/package.nix +++ b/pkgs/by-name/ma/matrix-commander-rs/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eEkSdr6qHLUBp4natvq7uMbcqxDOTJAE1vEPWLE3KKM="; }; - cargoHash = "sha256-lMS034ZwalVaxKflRIFYGuG01lYTOpj1qgPskk47NE4="; + useFetchCargoVendor = true; + cargoHash = "sha256-I7g3yNjq1i7YXv6S7PPZnOQ0Y5665dNayz7XEQl/WAE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index 5b654005f96c..298bfef974dd 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+UibbVz5CTisKMms/5VXGe39FYr56qzaEtX4TWQPkjk="; }; - cargoHash = "sha256-/SUbmgdCy+3qpmu+cpNV+D/39jZ4jOzxgXegCHk9pHc="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZCH8ka740X/yRbn4Mbno63jZifPMEaDABsftS3juDTo="; meta = { description = "Material you color generation tool"; diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 1ac5f00e81ad..24f40f987082 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Ix1UTVYJRPTii/LqJQto+und+BrSAIZeHlTA6biysm0="; }; - cargoHash = "sha256-xC0zCDGE0AynMUc5qSkgOYB3JqOWDlc8oz4yi6cGCJs="; + useFetchCargoVendor = true; + cargoHash = "sha256-vgMzl3Kx1OqHSkVdykgwoMn+XNrjg93OmVgDc6I7AV0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/mc/mcfly-fzf/package.nix b/pkgs/by-name/mc/mcfly-fzf/package.nix index aee4dcebb9ed..c7dcfc4192ac 100644 --- a/pkgs/by-name/mc/mcfly-fzf/package.nix +++ b/pkgs/by-name/mc/mcfly-fzf/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { substituteInPlace shell/mcfly-fzf.fish --replace '(command -v mcfly-fzf)' '${placeholder "out"}/bin/mcfly-fzf' ''; - cargoHash = "sha256-xMXM56ulfKAY2HwRTXTG9h3garxDeu+zthMKSve5seQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-xHYOhq/vDmjP7RfgRR15Isj7rg/nIV9tz9XznHBENig="; meta = with lib; { homepage = "https://github.com/bnprks/mcfly-fzf"; diff --git a/pkgs/by-name/mc/mcfly/package.nix b/pkgs/by-name/mc/mcfly/package.nix index 79fb360942af..f36f43ddcbc8 100644 --- a/pkgs/by-name/mc/mcfly/package.nix +++ b/pkgs/by-name/mc/mcfly/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoHash = "sha256-c+LOmUUt8t1x5Pp8yGHSeLcJNs/lJzq29KMX/i7Cscs="; + useFetchCargoVendor = true; + cargoHash = "sha256-+ko1ltt3a5rst4qbIMUeiq0/0Vmqf0cHt6wv8GSmC70="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/pkgs/by-name/mc/mcumgr-client/package.nix b/pkgs/by-name/mc/mcumgr-client/package.nix index db03704cbf26..21b12fc2501b 100644 --- a/pkgs/by-name/mc/mcumgr-client/package.nix +++ b/pkgs/by-name/mc/mcumgr-client/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-P5ykIVdWAxuCblMe7kzjswEca/+MsqpizCGUHIpR4qc="; }; - cargoHash = "sha256-9jlthe7YQJogcjGv+TOk+O2YW3Xrq6h9tTjXdKHG99k="; + useFetchCargoVendor = true; + cargoHash = "sha256-+n+Z/o+DvP2ltos8DP8nTyKbn/Zr3ln6cLyKJ+yWm1M="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index 50ad13dac0a5..5956ad70637a 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O+EIhh83nIYE2GWaThkDLIVsYsg62g/6ksS+1fKm4AY="; }; - cargoHash = "sha256-fcAXIXnXwRc6vpKiOdkXg4MsTuzI636b7cD7lgDBUT8="; + useFetchCargoVendor = true; + cargoHash = "sha256-h0ikwdGmyBsCJvILJTlDd9x0DXYwblfBcK2wuWHmjYA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/md/mdbook-alerts/package.nix b/pkgs/by-name/md/mdbook-alerts/package.nix index 2428174893e2..22fde5a1ee22 100644 --- a/pkgs/by-name/md/mdbook-alerts/package.nix +++ b/pkgs/by-name/md/mdbook-alerts/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MZS9TESITj3tzdaXYu5S2QUCW7cZuTpH1skFKeVi/sQ="; }; - cargoHash = "sha256-twAIr1GVkvo4ZC7iwgKY4L1CklGVvGqd/eQf8toncDE="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZL8M9Ces8qs8ClayjJTt5FvlG+WcRpJLuZBNATEbLtQ="; meta = { description = "Preprocessor for mdbook to support the inclusion of Markdown alerts"; diff --git a/pkgs/by-name/md/mdbook-cmdrun/package.nix b/pkgs/by-name/md/mdbook-cmdrun/package.nix index 17971b1b1c83..c9000721e383 100644 --- a/pkgs/by-name/md/mdbook-cmdrun/package.nix +++ b/pkgs/by-name/md/mdbook-cmdrun/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { util-linux # used by tests/regression/shell/input.md ]; - cargoHash = "sha256-gT3DyQRJWn1HuR6fXeqk8aUPb+jmC+V1McdDN2JGXuI="; + useFetchCargoVendor = true; + cargoHash = "sha256-C3Rg+WXHBA7KyUDFdhBz4mOm8CFH/f7UVA8KOLs9ClE="; meta = with lib; { description = "mdbook preprocessor to run arbitrary commands"; diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index 8b8a032654df..5129da5484b6 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5/vChjSYMlCcieA10jncoXZw9Gpeol+Am7mUo78Zqho="; }; - cargoHash = "sha256-lZ92vvRYXEBMx6ka8RP1wXctf73QNp5rNE8n7O96AEc="; + useFetchCargoVendor = true; + cargoHash = "sha256-MxeSgSwBOQ5Eb/2mPtacNNX8MBSToon31egrbfxZjZg="; doCheck = false; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/md/mdbook-emojicodes/package.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix index 5e0021e38c63..e8c39c0a0000 100644 --- a/pkgs/by-name/md/mdbook-emojicodes/package.nix +++ b/pkgs/by-name/md/mdbook-emojicodes/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dlvfY2AMBvTl0j9YaT+u4CeWQGGihFD8AZaAK4/hUWU="; }; - cargoHash = "sha256-SkvAtV613+ARk79dB2zRKoLjPgdzoEKQa3JrRw9qBkA="; + useFetchCargoVendor = true; + cargoHash = "sha256-+VVkrXvsqtizeVhfuO0U8ADfSkmovpT7DVwrz7QljU0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix index 937710be66f8..c790d9bff40b 100644 --- a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix +++ b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FdguzuYpMl6i1dvoPNE1Bk+GTmeTrqLUY/sVRsbETtU="; }; - cargoHash = "sha256-sPRylKXTSkVkhDvpAvHuYIr9TSi1ustIs1HTwEIbk/w="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZBGMfJA2diPvvoIXPosUs4ngXU9/GMGa4GAlKIjwm8s="; meta = with lib; { description = "Helpers for a mdbook i18n workflow based on Gettext"; diff --git a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix index 39ef19686f9e..5a20db414d6e 100644 --- a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix +++ b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3BxIhJK0YWZBEbbNwMKixo1icEn+QKJwoskgIEaZcGQ="; }; - cargoHash = "sha256-9jIB80vtskpR3/QYhaA0JFw6IhIsS9VnCnJtE5RfDRk="; + useFetchCargoVendor = true; + cargoHash = "sha256-vOP/XvoHwJd34f+NGGCFJkEbefbbJjFcGTOFaCn9dj8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/md/mdbook-man/package.nix b/pkgs/by-name/md/mdbook-man/package.nix index c50808f95c3f..3b7eba9cf207 100644 --- a/pkgs/by-name/md/mdbook-man/package.nix +++ b/pkgs/by-name/md/mdbook-man/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ssAk60jnwYzAjseL26/3FaDv1vBAylgdE+vLhWZ8It4="; }; - cargoHash = "sha256-cR86eFhP9Swh+Ff8FNbAfWpWMkliOAyPwDQ6lRvU+nk="; + useFetchCargoVendor = true; + cargoHash = "sha256-+CD7+pYAoKRmkMZPpEru6lug9sBakrL0rLXs78e3tqk="; meta = with lib; { description = "Generate manual pages from mdBooks"; diff --git a/pkgs/by-name/md/mdbook-open-on-gh/package.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix index 35f0e774edce..9ebc091fb1e5 100644 --- a/pkgs/by-name/md/mdbook-open-on-gh/package.nix +++ b/pkgs/by-name/md/mdbook-open-on-gh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-73738Vei7rQ67LQIOrHPGOtsBnHClaXClRWDmA5pP58="; }; - cargoHash = "sha256-TQBjgQaoI88xGdhkffNWRH6aZ99WWbkkpiPu4LqBD3g="; + useFetchCargoVendor = true; + cargoHash = "sha256-6BR/xXo5pBv7n5beqgY9kEe24o/lZl1sit0uumSEbe8="; meta = with lib; { description = "mdbook preprocessor to add a open-on-github link on every page"; diff --git a/pkgs/by-name/md/mdbook-pagetoc/package.nix b/pkgs/by-name/md/mdbook-pagetoc/package.nix index 7342770a8194..b61c9e9ea060 100644 --- a/pkgs/by-name/md/mdbook-pagetoc/package.nix +++ b/pkgs/by-name/md/mdbook-pagetoc/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-A8J3cKSA//NGIVK3uE43YH3ph9DHGFlg7uOo10j2Kh8="; }; - cargoHash = "sha256-FvDvPXA4/dxVOIt1LwesBrWEsjdYcrhHescQVAiggBA="; + useFetchCargoVendor = true; + cargoHash = "sha256-e0J3dcBLoDIvmdUxUY/OKivtIHIhRyAw/tpVWV0TgrE="; meta = with lib; { description = "Table of contents for mdbook (in sidebar)"; diff --git a/pkgs/by-name/md/mdbook-variables/package.nix b/pkgs/by-name/md/mdbook-variables/package.nix index dc085dad9068..eefa0f16adcb 100644 --- a/pkgs/by-name/md/mdbook-variables/package.nix +++ b/pkgs/by-name/md/mdbook-variables/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-whvRCV1g2avKegfQpMgYi+E6ETxT2tQqVS2SWRpAqF8="; }; - cargoHash = "sha256-uw1oWIoKi6qsObI4SkEiHwEj9QoxE9jufu9O+ZKM8DI="; + useFetchCargoVendor = true; + cargoHash = "sha256-WLHXeYNfALa7GfFAHEO9PAlFKB2lbDefgAYCn6G0U6Y="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/md/mdbook-yml-header/package.nix b/pkgs/by-name/md/mdbook-yml-header/package.nix index e1323e598b2c..8f0c53294ef6 100644 --- a/pkgs/by-name/md/mdbook-yml-header/package.nix +++ b/pkgs/by-name/md/mdbook-yml-header/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-qRAqZUKOiXTh4cJjczBQ9zAL6voaDvko7elfE6eB2jA="; }; - cargoHash = "sha256-cn+R36koBSEp+wKtCQJK/L+mxeb8sHkZu8kWYRigIvw="; + useFetchCargoVendor = true; + cargoHash = "sha256-C8M2Y7igeDmi337GXWmLcwNTGr1/CTHWWTuMPDtkqxs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/md/mdctags/package.nix b/pkgs/by-name/md/mdctags/package.nix index a3a7705280ed..6cb4845813fb 100644 --- a/pkgs/by-name/md/mdctags/package.nix +++ b/pkgs/by-name/md/mdctags/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { sha256 = "14gryhgh9czlkfk75ml0620c6v8r74i6h3ykkkmc7gx2z8h1jxrb"; }; - cargoHash = "sha256-L0x8VKBqTOB6hUWumz91Q5Krofx7DLxLDQnHvi/Lq80="; + useFetchCargoVendor = true; + cargoHash = "sha256-xg9tBBo3Al8x0HkgRnfdZybcjaHsNMv/Ot3NwGiHkBg="; meta = { description = "tags for markdown file"; diff --git a/pkgs/by-name/md/mdevctl/package.nix b/pkgs/by-name/md/mdevctl/package.nix index 5e10a5fd188e..616293be2e46 100644 --- a/pkgs/by-name/md/mdevctl/package.nix +++ b/pkgs/by-name/md/mdevctl/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4K4NW3DOTtzZJ7Gg0mnRPr88YeqEjTtKX+C4P8i923E="; }; - cargoHash = "sha256-hCqNy32uPLsKfUJqiG2DRcXfqdvlp4bCutQmt+FieXc="; + useFetchCargoVendor = true; + cargoHash = "sha256-xfrW7WiKBM9Hz49he/42z9gBrwZ3sKGH/u105hcyln0="; nativeBuildInputs = [ docutils diff --git a/pkgs/by-name/md/mdsh/package.nix b/pkgs/by-name/md/mdsh/package.nix index 557e5ddf1c33..4b3ddd7acfc2 100644 --- a/pkgs/by-name/md/mdsh/package.nix +++ b/pkgs/by-name/md/mdsh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vN8nFhbZgJIhFuFET9IOmdxT7uBKq/9X+TO9lZsDw6g="; }; - cargoHash = "sha256-0D1RSUJw7fszc9d4nrp+zCzr9l0xF4Ed8DbK5/O5bEY="; + useFetchCargoVendor = true; + cargoHash = "sha256-kNe0WzW/9kcocRHR1FMKKIMnyZceqzShWQ9Cf7mAx0c="; meta = with lib; { description = "Markdown shell pre-processor"; diff --git a/pkgs/by-name/me/mekuteriya/package.nix b/pkgs/by-name/me/mekuteriya/package.nix index 43864d2560c5..a00375d5e0a5 100644 --- a/pkgs/by-name/me/mekuteriya/package.nix +++ b/pkgs/by-name/me/mekuteriya/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bWp2UNrhCHY2DQWusGS9L9/jI2r23F34yLpuE6nuOD0="; }; - cargoHash = "sha256-WkrlQbNTP3lNEtlnAMrTd9lBo2Q4dECqtV29kmV8F7A="; + useFetchCargoVendor = true; + cargoHash = "sha256-YIsM2IVtV1jG/JzCR9gQPqnKhtxJYdCWdTw4FlK3Y9w="; meta = { description = "Ethiopian Calendar CLI"; diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix index 7640e4813d6c..502f15ad6978 100644 --- a/pkgs/by-name/me/meli/package.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -36,7 +36,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MGnCX/6pnKNxDEqCcVWTl/fteMypk+N2PrJYRMP0sL0="; }; - cargoHash = "sha256-w0fxh3c54Hcczc9NW8heewrRFx7UZnQqAHiQWZ43wKw="; + useFetchCargoVendor = true; + cargoHash = "sha256-OyOLAw3HzXY85Jwolh4Wqjmm6au6wRwGq5WkicOt5eg="; # Needed to get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/me/melody/package.nix b/pkgs/by-name/me/melody/package.nix index 6d77b73350e8..5aa585646083 100644 --- a/pkgs/by-name/me/melody/package.nix +++ b/pkgs/by-name/me/melody/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-u+d16jc7GqT2aK2HzP+OXFUBkVodwcW+20sKqmxzYhk="; }; - cargoHash = "sha256-UpKv7hLPdsitZGgIegy7ZGEQcxGHGIHj2H4Ac7mG+xY="; + useFetchCargoVendor = true; + cargoHash = "sha256-TNW36FLK1E6uoDICfGN5ZmTX8V9ndSqyif7tbBqvqDI="; meta = with lib; { description = "Language that compiles to regular expressions"; diff --git a/pkgs/by-name/me/meme-bingo-web/package.nix b/pkgs/by-name/me/meme-bingo-web/package.nix index 7a8c7c945e6f..8652e82b041d 100644 --- a/pkgs/by-name/me/meme-bingo-web/package.nix +++ b/pkgs/by-name/me/meme-bingo-web/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AKY0EjeoOnliRN3XSnlCgzCvnWOkZPQz/9QIcr8+hQM="; }; - cargoHash = "sha256-/+9fxIk3EQxG3PzQLRsYcwBHDZaOtWUsAYGa7t1jLHY="; + useFetchCargoVendor = true; + cargoHash = "sha256-5GpNVcnwWjxYgIXGoFkuf5CFD46kxxQwb3t0/i/2nFM="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/me/memtest_vulkan/package.nix b/pkgs/by-name/me/memtest_vulkan/package.nix index e030646ce8b4..2b699d306fe7 100644 --- a/pkgs/by-name/me/memtest_vulkan/package.nix +++ b/pkgs/by-name/me/memtest_vulkan/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8tmQtycK7D5bol9v5VL8VkROZbSCndHo+uBvqqFTZjw="; }; - cargoHash = "sha256-8x8bS0LcvoxoSBWbGdkKzhxDi/9VNab26eidv8YK9dg="; + useFetchCargoVendor = true; + cargoHash = "sha256-q47UUCD3JYzkVsJa5+E1vTbCgnEQ9Mo5eLgO2lmdnQ4="; # It doesn't discover this on its own :/ # https://github.com/GpuZelenograd/memtest_vulkan/issues/36 diff --git a/pkgs/by-name/me/meow/package.nix b/pkgs/by-name/me/meow/package.nix index d5573f60c972..d8198f7ff418 100644 --- a/pkgs/by-name/me/meow/package.nix +++ b/pkgs/by-name/me/meow/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-iskpT0CU/cGp+8myWaVmdw/uC0VoP8Sv+qbjpDDKS3o="; }; - cargoHash = "sha256-/XzXgbmgJ1EN3cQmgWNMUpYtNWRlwJ0mvaQWCsP3FMk="; + useFetchCargoVendor = true; + cargoHash = "sha256-c+Nz3PH5a5CAG4HaIEz7U+b4rp6sgAuo+/uRL70/Tbs="; postInstall = '' mv $out/bin/meow-cli $out/bin/meow diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix index 97130d30758b..1e24670f019d 100644 --- a/pkgs/by-name/me/metadata/package.nix +++ b/pkgs/by-name/me/metadata/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ugirYg3l+zIfKAqp2smLgG99mX9tsy9rmGe6lFAwx5o="; }; - cargoHash = "sha256-OMm39sgbq2wTRJTVoCf5imJe3hmf+Djq9w9tzKBrkIM="; + useFetchCargoVendor = true; + cargoHash = "sha256-CqPRhfhTAEXTXRAJ9T5gQZx5jAQmJXYPbfQmyXkO6Sk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mi/microbin/package.nix b/pkgs/by-name/mi/microbin/package.nix index 4a1012f0f049..2f5d08158f94 100644 --- a/pkgs/by-name/mi/microbin/package.nix +++ b/pkgs/by-name/mi/microbin/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fsRpqSYDsuV0M6Xar2GVoyTgCPT39dcKJ6eW4YXCkQ0="; }; - cargoHash = "sha256-7GSgyh2aJ2f8pozoh/0Yxzbk8Wg3JYuqSy/34ywAc2s="; + useFetchCargoVendor = true; + cargoHash = "sha256-cQyb9KpmdJ2DB395Ce24JX8YcMLQn3fmeYZUo72L38s="; patches = [ # Prefix some URLs with args.public_path_as_str() by PeterUpfold diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 710eb41325fb..76b17d664ebd 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SY7Eln0Hwj0VWqzzYfqsVpAMES+SCiZkLgNZR3a8d7A="; }; - cargoHash = "sha256-a9iPTMPviHqXanqB7k2ecdkSJ2RwSErj8BWeqNUPiAo="; + useFetchCargoVendor = true; + cargoHash = "sha256-fHIQK1zsYuKj2ps6tmzqGwX8woiuIQx0yiyWdMf2Fnw="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/microserver/package.nix b/pkgs/by-name/mi/microserver/package.nix index bc2c3d5b1708..84f46fd49e25 100644 --- a/pkgs/by-name/mi/microserver/package.nix +++ b/pkgs/by-name/mi/microserver/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-VgzOdJ1JLe0acjRYvaysCPox5acFmc4VD2f6HZWxT8M="; }; - cargoHash = "sha256-JGsMtlWuww1rYE4w6i2VlyD6gGHqnLehLDZmW57R+Fo="; + useFetchCargoVendor = true; + cargoHash = "sha256-IPJJ9kv7gf5l7Y2JLCLjkNFao42h/VmkTd3LF5BCMLU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security ] diff --git a/pkgs/by-name/mi/minesweep-rs/package.nix b/pkgs/by-name/mi/minesweep-rs/package.nix index f4c2974862c9..ea46c368651b 100644 --- a/pkgs/by-name/mi/minesweep-rs/package.nix +++ b/pkgs/by-name/mi/minesweep-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FzMCqsPBcbblItRzfnY43glY4We9jk0eBxjG0SZnau8="; }; - cargoHash = "sha256-VjIn4k/OuxsXLJ2LOk43LKHo0PrPyMigNOO2VVYZQYw="; + useFetchCargoVendor = true; + cargoHash = "sha256-HO0eO6Ip508AIALS50exP2btLd3jUhM+giHQpMdsAVA="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix index 866b51827e9b..ffdbed969b55 100644 --- a/pkgs/by-name/mi/mini-calc/package.nix +++ b/pkgs/by-name/mi/mini-calc/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-A5nD1SuV2p2o+WRTHr9tqhyqfeZMiGWi9QUXFSSM7C0="; }; - cargoHash = "sha256-tL9KQq8r+oDJK5PuHw0H2TV+gEt9yuNOEjyBe7SH0FU="; + useFetchCargoVendor = true; + cargoHash = "sha256-TFAt0JcPX8EKTSwyxF5efYJC5LbSPBr2f9L4DaQ1ebI="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index b18dded161e7..b5d60fee652f 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6jPTbtB7n85oGHYgOqZgBF5QyQGJwyZ3zyY+XLfU9y0="; }; - cargoHash = "sha256-z5mGDJWiWoJ6F+Ln6UZiw+CthI7JHpVldX0j7Qf43Y0="; + useFetchCargoVendor = true; + cargoHash = "sha256-V+ByJGJZFc1MEsSQkfO7P+08qDaTw0I2ye+4wwYrw4M="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 02ec7705fe66..d85fd90783b0 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U="; }; - cargoHash = "sha256-/BBue4YfpFk/tId2GV9sstEdgNuy3QnieINGnx45ydU="; + useFetchCargoVendor = true; + cargoHash = "sha256-SosRbtk5gBcOVropy+HVFFmLLexu29GjchC6zFweiYw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index b3882597b015..99d54ea27b94 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eMKrRrthV37ndsF47jjNxigsJ5WDsCDCit9J88l5dHE="; }; - cargoHash = "sha256-Mh7vyIVkQ0N1dYD4KVue0eiBm+z0JFPt89qYpu+wVd0="; + useFetchCargoVendor = true; + cargoHash = "sha256-0ME2NyN9kKoaIfiuTDyQcE6AS70uGmUVyrXYXqJGUZk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mi/mixxc/package.nix b/pkgs/by-name/mi/mixxc/package.nix index 876217fab41e..6e82627ee64e 100644 --- a/pkgs/by-name/mi/mixxc/package.nix +++ b/pkgs/by-name/mi/mixxc/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9ZQjNhmQKMfEJsMMpUBI8C6ebfl9UI4yBt6f331tFXU="; }; - cargoHash = "sha256-EmASy5AHPECyV0mRQV9wjqdDSfFzfMTiL0Hf3/9gR8g="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ng4Vbk00m66qdm0lMaQ5Ab56x3kZKq8NsCDMTPVnQ3c="; cargoBuildFlags = [ "--locked" ]; diff --git a/pkgs/by-name/mm/mmtc/package.nix b/pkgs/by-name/mm/mmtc/package.nix index 8485728b8b79..e8670e21a58a 100644 --- a/pkgs/by-name/mm/mmtc/package.nix +++ b/pkgs/by-name/mm/mmtc/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4="; }; - cargoHash = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8="; + useFetchCargoVendor = true; + cargoHash = "sha256-TpAl7lMaQGSH9oMNqYIxnajsfh1HAdyU2suSFRfWYPs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/mo/mollysocket/package.nix b/pkgs/by-name/mo/mollysocket/package.nix index 431c246fe468..aede71ab8bc2 100644 --- a/pkgs/by-name/mo/mollysocket/package.nix +++ b/pkgs/by-name/mo/mollysocket/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-F80XRQn3h1Y6dE8PVLGMTY29yZomrwqFAsm7h8euHw8="; }; - cargoHash = "sha256-ZHS/EJBhT1H5MvuqdPtmf95ctuLft4qVsZzPVeJBR5k="; + useFetchCargoVendor = true; + cargoHash = "sha256-BgmgxNxyuEXKLO9yoymJ0PUfL6/YSegGk8OMPjup/zo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mo/moon-phases/package.nix b/pkgs/by-name/mo/moon-phases/package.nix index 77cd0a73af7c..2ace48150108 100644 --- a/pkgs/by-name/mo/moon-phases/package.nix +++ b/pkgs/by-name/mo/moon-phases/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8ZdtM246aqc49Q3ygMGk51LIzRA8RIdlaistbKUj3yY="; }; - cargoHash = "sha256-5JKM+GnigkpuX4qeGQAjDz/X48ZxXtCfYVwGco13YRM="; + useFetchCargoVendor = true; + cargoHash = "sha256-8Ada1KBGO1q61dg+4NMJ1Sbipr3ATSP5PO14oQ/QWGs="; meta = with lib; { description = "Command-line/WM bar tool to display the moon phase at a certain date"; diff --git a/pkgs/by-name/mo/moproxy/package.nix b/pkgs/by-name/mo/moproxy/package.nix index 354f230ba6b2..32a35d159f7d 100644 --- a/pkgs/by-name/mo/moproxy/package.nix +++ b/pkgs/by-name/mo/moproxy/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Rqno+cg44IWBJbKWUP6BnxzwCjuNhFo9nBF6u2jlyA4="; }; - cargoHash = "sha256-EunlvI7I6d93wb3hxgxsyAXkzxRlDu0fq9qqjnbzzWg="; + useFetchCargoVendor = true; + cargoHash = "sha256-SJHsXck2f9xJZ4GmOkISjdfqxlF4LCAH9WYjqSqFFkE="; preBuild = let diff --git a/pkgs/by-name/mo/morsel/package.nix b/pkgs/by-name/mo/morsel/package.nix index b4b02d686d5b..b6dabc4b4029 100644 --- a/pkgs/by-name/mo/morsel/package.nix +++ b/pkgs/by-name/mo/morsel/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bb+88GIyd92kHJAs25mJ9vmq0Ha2q0fdHnpTXhX2BFE="; }; - cargoHash = "sha256-XRl71n+rV6MTQMz957K5/25SX9HvYVW6qAuHTdfRLLs="; + useFetchCargoVendor = true; + cargoHash = "sha256-3rwYD49yq3apKOGBSWvTm5m98ImbtTKqRb2cSgjWmFA="; meta = with lib; { description = "Command line tool to translate morse code input to text in real time"; diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index 09021f766264..57d07f942159 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-Uj6/ZDRaYq99gTwHqAX2c21LecC3LLkJXgCDQ+xEytE="; + useFetchCargoVendor = true; + cargoHash = "sha256-6g2bDRBgdEhh3rq+ndrhN0ovyJDprAyC8cWvmeWcw2A="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix index 0c2468c0ff1e..5fbec12b2293 100644 --- a/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -58,7 +58,8 @@ rustPlatform.buildRustPackage rec { cargoRoot = "src-tauri"; buildAndTestSubdir = cargoRoot; - cargoHash = "sha256-H8TMpYFJWp227jPA5H2ZhSqTMiT/U6pT6eLyjibuoLU="; + useFetchCargoVendor = true; + cargoHash = "sha256-G5PQWPcPOVhq11BQIplbB3mLAGFCVm+vQ4eM4/5MFwI="; postInstall = '' install -Dm644 ${./80-mouse-actions.rules} $out/etc/udev/rules.d/80-mouse-actions.rules diff --git a/pkgs/by-name/mo/mouse-actions/package.nix b/pkgs/by-name/mo/mouse-actions/package.nix index fb95726bd657..0af970b8bc82 100644 --- a/pkgs/by-name/mo/mouse-actions/package.nix +++ b/pkgs/by-name/mo/mouse-actions/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-44F4CdsDHuN2FuijnpfmoFy4a/eAbYOoBYijl9mOctg="; }; - cargoHash = "sha256-N7BaEvQyKtM8hkDJJTlFKzfq01KMiGZ0fuXHcKctfLc="; + useFetchCargoVendor = true; + cargoHash = "sha256-3ylJSb6ItIkOl5Unhnm5aL83mQvWIM0PUg+1lMtUbPY="; buildInputs = [ libX11 diff --git a/pkgs/by-name/mo/movine/package.nix b/pkgs/by-name/mo/movine/package.nix index 60e9df62baef..34f8a00ce89c 100644 --- a/pkgs/by-name/mo/movine/package.nix +++ b/pkgs/by-name/mo/movine/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wa2GfV2Y8oX8G+1LbWnb2KH/+QbUYL9GXgOOVHpzbN8="; }; - cargoHash = "sha256-brM6QObhl9W5SZ+79Kv9oNxnglO24BUgjPSQy9jV1/Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-sdyx2W9VUp1cBl19fFL2JDS+uS12zaC50yYzHaLOnHs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mo/moxide/package.nix b/pkgs/by-name/mo/moxide/package.nix index 2d2ac506f0fa..6be01477afd5 100644 --- a/pkgs/by-name/mo/moxide/package.nix +++ b/pkgs/by-name/mo/moxide/package.nix @@ -7,7 +7,8 @@ rustPlatform.buildRustPackage rec { pname = "moxide"; version = "0.1.0"; - cargoHash = "sha256-MqJ3lxnzvvmNXEMgx0su8vRDXAZbNtPuuphNzjeMN+w="; + useFetchCargoVendor = true; + cargoHash = "sha256-xCiONML/3Rj6C4kPctwAFW5P+1IUZSNY966KWrXt2Fg="; src = fetchFromGitHub { owner = "dlurak"; repo = "moxide"; diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix index 8235b426864e..83890dd7458b 100644 --- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix +++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WiHMXazNKyt5N7WmkftZYEHeQi+l9qoU2yr6jRHfjdE="; }; - cargoHash = "sha256-DnOv9YJpr777p1GVhe8LS5uAUs6Dr/gRLoJarFx5avw="; + useFetchCargoVendor = true; + cargoHash = "sha256-v6YQS+Te0bIzSr3q4QaEcXbUjiTCKELxCdqBlbjLI3E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mp/mpris-notifier/package.nix b/pkgs/by-name/mp/mpris-notifier/package.nix index feaca1f895b3..57229cd55644 100644 --- a/pkgs/by-name/mp/mpris-notifier/package.nix +++ b/pkgs/by-name/mp/mpris-notifier/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-X9d410ijZZcHvf8+f6DgnMl8ETGeY/fN13Gpz6q3BBA="; }; - cargoHash = "sha256-f8BCnjgv7OLWQ/2X3dTUuAarCl+u+4CRARSQsO+09zE="; + useFetchCargoVendor = true; + cargoHash = "sha256-sugXNwlOZEfnORij64eWyFVMHBU3fbVJr3+wnOchJKY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix index 730053cb8681..87e773853f24 100644 --- a/pkgs/by-name/mp/mprocs/package.nix +++ b/pkgs/by-name/mp/mprocs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bNA+P6Mnhxi6YH5gAUwvAPN7STUvwDnU/r/ZBYwzgrw="; }; - cargoHash = "sha256-1S2KD4N6HAAOIyXWHGwItNIDj3iyh4A9LBXQTxWb0kI="; + useFetchCargoVendor = true; + cargoHash = "sha256-UnrwAff7Eer5Bpn2CTL2XOyM8J2Z2xofcH6d9eTr2yQ="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/mp/mpv-subs-popout/package.nix b/pkgs/by-name/mp/mpv-subs-popout/package.nix index a3420eb2e3c9..9f1d5d11fdea 100644 --- a/pkgs/by-name/mp/mpv-subs-popout/package.nix +++ b/pkgs/by-name/mp/mpv-subs-popout/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Z8IWiYKitkbEFdjca5G6P0I6j4Fg2fIHco6fD90UoBw="; }; - cargoHash = "sha256-vWDrbT1qZVU/N+V24Egq4cAoqysfX1hjQc+D9M5ViEE="; + useFetchCargoVendor = true; + cargoHash = "sha256-n7e3VrnueU7Lsj/FwM0aC9ThTqUlq27SS3RKugduwEA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mu/mus/package.nix b/pkgs/by-name/mu/mus/package.nix index 9c92f2933730..9ea5ae317ec8 100644 --- a/pkgs/by-name/mu/mus/package.nix +++ b/pkgs/by-name/mu/mus/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yvMV+lhU9Wtwrhw0RKRUNFNznvZP0zcnT6jqPaqzhUs="; }; - cargoHash = "sha256-K9B8y9pOHcAOrUCmCB0zW2wy81DTF3K97gPYmAiKwAM="; + useFetchCargoVendor = true; + cargoHash = "sha256-1ruRKqHW5/MH4THRAozofAROZT6zE3JFKGluuWWa1ms="; meta = with lib; { description = "Pretty good mpd client"; diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix index 3ff1da09e451..74b80a8b36cb 100644 --- a/pkgs/by-name/mu/music-player/package.nix +++ b/pkgs/by-name/mu/music-player/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BG0MU6IdFQX+C4BxTZlq5I7a4BQmUTvwAQALw5/UPBE="; }; - cargoHash = "sha256-t/jdVTdmaJk8Sb43XEuVCKa4kSR+ZrIEmMQKWeVpB70="; + useFetchCargoVendor = true; + cargoHash = "sha256-gWLlsXFrovApYCSlo/jBxPZ7nlBCuGVeh28/Ir12MDo="; nativeBuildInputs = [ diff --git a/pkgs/by-name/my/myxer/package.nix b/pkgs/by-name/my/myxer/package.nix index 73dbad4c7930..d1212b43900e 100644 --- a/pkgs/by-name/my/myxer/package.nix +++ b/pkgs/by-name/my/myxer/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c5SHjnhWLp0jMdmDlupMTA0hWphub5DFY1vOI6NW8E0="; }; - cargoHash = "sha256-IH+SLIHO/wu+przH+mgOEnH9m+iAE5s/BJhh0UUHR/0="; + useFetchCargoVendor = true; + cargoHash = "sha256-ETwbNxAxm3m73FSTSZPF1eoheZ2o9/3GrEIOTeh2XDk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/n2/n2/package.nix b/pkgs/by-name/n2/n2/package.nix index c9293a57aa47..a5ee26abfe02 100644 --- a/pkgs/by-name/n2/n2/package.nix +++ b/pkgs/by-name/n2/n2/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-svJPcriSrqloJlr7pIp/k84O712l4ZEPlSr58GPANXY="; }; - cargoHash = "sha256-jrIo0N3o2fYe3NgNG33shkMd0rJxi5evtidCL9BcfVc="; + useFetchCargoVendor = true; + cargoHash = "sha256-bVvtTsaLnsmfzv2wMFx81a2ef91pj8XGtXhj8X9WFlc="; meta = with lib; { homepage = "https://github.com/evmar/n2"; diff --git a/pkgs/by-name/na/namaka/package.nix b/pkgs/by-name/na/namaka/package.nix index 276379144812..4fc7b64d756d 100644 --- a/pkgs/by-name/na/namaka/package.nix +++ b/pkgs/by-name/na/namaka/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1ka+5B90UAt7D5kkT9dOExGLJjtLM8dqLeBdFRoeuWg="; }; - cargoHash = "sha256-Wo87OjHVKS2w0LeBvYEoV9eoKm8giqV/P9/mh6DueJ0="; + useFetchCargoVendor = true; + cargoHash = "sha256-0Hblz7Ri7QxWXDz9z235cNUYb0W/2IPA7E4AreisY9c="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/na/narrowlink/package.nix b/pkgs/by-name/na/narrowlink/package.nix index f0e5a58b4c18..66168b2e7cd8 100644 --- a/pkgs/by-name/na/narrowlink/package.nix +++ b/pkgs/by-name/na/narrowlink/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O66eihqSxwvrUfJj+VMrs7Vfndz2LPKQEnH7BDljvUg="; }; - cargoHash = "sha256-LqPfgnN1J/OMAPsaBg9c5YSPbEDhOOOSujLthwIK79U="; + useFetchCargoVendor = true; + cargoHash = "sha256-NjL5A+HEz7WDsTcwAGj1g+Brs4JYsU1kl0OZfTfoBN0="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/na/natls/package.nix b/pkgs/by-name/na/natls/package.nix index c728826b5bc5..eb0165a542ee 100644 --- a/pkgs/by-name/na/natls/package.nix +++ b/pkgs/by-name/na/natls/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-4x92r6V9AvEO88gFofPTUt+mS7ZhmptDn/8O4pizSRg="; }; - cargoHash = "sha256-Am4HmfmhskKxcp1iWod5z3caHwsdo31qCaVi0UxTXAg="; + useFetchCargoVendor = true; + cargoHash = "sha256-mfmG2VzBc9bRAjAF2a46JA6fzeXViVkTFUJYEIV44qo="; meta = with lib; { description = "'ls' replacement you never knew you needed"; diff --git a/pkgs/by-name/na/navi/package.nix b/pkgs/by-name/na/navi/package.nix index 78ad846cf2d6..dfb6fc823e6d 100644 --- a/pkgs/by-name/na/navi/package.nix +++ b/pkgs/by-name/na/navi/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pqBTrHBvsuosyQqCnSiI3+pOe2J6XeIQ8dai+kTVFjc="; }; - cargoHash = "sha256-dx13p+kEyqhyaF8ejJLWsgW3IpEvS9nlIHhjxOpp4d8="; + useFetchCargoVendor = true; + cargoHash = "sha256-KbtP7zJJDBRy0ZSka8/4G0ftXB8r7//hgUzgT6E7fP8="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/nb/nbtscanner/package.nix b/pkgs/by-name/nb/nbtscanner/package.nix index 30571eb14581..08efb59bdf36 100644 --- a/pkgs/by-name/nb/nbtscanner/package.nix +++ b/pkgs/by-name/nb/nbtscanner/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lnTTutOc829COwfNhBkSK8UpiNnGsm7Da53b+eSBt1Q="; }; - cargoHash = "sha256-NffNQXKJ+b1w7Ar2M6UDev/AxruDEf8IGQ+mNdvU6e4="; + useFetchCargoVendor = true; + cargoHash = "sha256-/gVJJegPIUe0Mv7+0tCP/vWrMbImtY3tb+lELnn1ur0="; cargoPatches = [ ./Cargo.lock.patch diff --git a/pkgs/by-name/nc/ncgopher/package.nix b/pkgs/by-name/nc/ncgopher/package.nix index 95f12be4bb1c..50deded81024 100644 --- a/pkgs/by-name/nc/ncgopher/package.nix +++ b/pkgs/by-name/nc/ncgopher/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-KrvTwcIeINIBkia6PTnKXp4jFd6GEMBh/xbn0Ot/wmE="; }; - cargoHash = "sha256-Zft/ip+/uJbUIqCDDEa4hchmZZiYWGdaVnzWC74FgU8="; + useFetchCargoVendor = true; + cargoHash = "sha256-QhkYyvoWMGtLH5HhpOJ3JsBIWeZN/CllcXwNW+iM3WI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix index 49fe958b8538..2254b272e7af 100644 --- a/pkgs/by-name/nc/ncspot/package.nix +++ b/pkgs/by-name/nc/ncspot/package.nix @@ -43,7 +43,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-h3Mp67AKuzzeO6l7jN6yrQAHpYSsaOp1Y+qJoamK82U="; }; - cargoHash = "sha256-uWnW4Ov5MoDh3xkmTsNSin9WI0SJAoDGa+n8IMNvo4Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-HxEd6A+e1N62LyoVPEDuq7xYEhQTjKYlif27rZTrXBQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; diff --git a/pkgs/by-name/nd/ndstrim/package.nix b/pkgs/by-name/nd/ndstrim/package.nix index 92926263622e..130f7f3dbc44 100644 --- a/pkgs/by-name/nd/ndstrim/package.nix +++ b/pkgs/by-name/nd/ndstrim/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-k5SlsIWHEZaYwk5cmLb1QMs3lk0VGGwiGd1TSQJC3Ss="; + useFetchCargoVendor = true; + cargoHash = "sha256-wRMMWeZDk9Xt3263pq20Qioy1x8egiPhuoPxmpNTq8M="; # TODO: remove this after upstream merge above patch. # Without the workaround below the build results in the following error: diff --git a/pkgs/by-name/ne/nearcore/package.nix b/pkgs/by-name/ne/nearcore/package.nix index e23315a141a7..9fb5bdee0651 100644 --- a/pkgs/by-name/ne/nearcore/package.nix +++ b/pkgs/by-name/ne/nearcore/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-VjvHCiWjsx5Y7xxqck/O9gSNrL8mxCTosLwLqC85ywY="; }; - cargoHash = "sha256-5Gs1sAzjuUO3IkwMX1NeA/Sbax0qtwvulyT66AQaNjs="; + useFetchCargoVendor = true; + cargoHash = "sha256-3MvUn6CJ3skVctTIYhib8G+UVOB/VXokwlTnseGJAGU="; cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ]; postPatch = '' diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix index ec13603654f6..395f39376148 100644 --- a/pkgs/by-name/ne/neocmakelsp/package.nix +++ b/pkgs/by-name/ne/neocmakelsp/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TCzW8QPSCGufLQanwcvgA5YsTV/QqDs7NKgOMPOgGho="; }; - cargoHash = "sha256-oRt4af7KqPIckzZ8FhCNjkVC/j2PdprFL91K/qUWV3g="; + useFetchCargoVendor = true; + cargoHash = "sha256-tuXeVgmYRfzEf3chWz9ovqkzpq5qaERyNibAmzqdJVo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index 4b7e510ed65d..13b96170b704 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -35,7 +35,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { hash = "sha256-4fdC/wChsCICLd69ZjK7IaCH7gDmXvfKllCnRNsdqYI="; }; - cargoHash = "sha256-CqnT9FEDzEMSais4dJg7zYVoSPNvIA09hmI0JE2YZIg="; + useFetchCargoVendor = true; + cargoHash = "sha256-k3eblWIlOaGJHUSgxxsU2aFR504M+8XTXP16kt2fXbY="; SKIA_SOURCE_DIR = let diff --git a/pkgs/by-name/ne/neovim-gtk/package.nix b/pkgs/by-name/ne/neovim-gtk/package.nix index 66257fd5949b..44ec67d0fb25 100644 --- a/pkgs/by-name/ne/neovim-gtk/package.nix +++ b/pkgs/by-name/ne/neovim-gtk/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I="; }; - cargoHash = "sha256-9eZwCOP4xQtFOieqVRBAdXZrXmzdnae6PexGJ/eCyYc="; + useFetchCargoVendor = true; + cargoHash = "sha256-93cKoyLNSLDmm9PnJzn0x6VONPqiCA3wcLwYgdOLIg8="; nativeBuildInputs = [ wrapGAppsHook4 diff --git a/pkgs/by-name/ne/nerdfix/package.nix b/pkgs/by-name/ne/nerdfix/package.nix index 852b392c7581..e9839908d630 100644 --- a/pkgs/by-name/ne/nerdfix/package.nix +++ b/pkgs/by-name/ne/nerdfix/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Mp8QFzMQXJEFIzkrmiW/wxMy/+WC4VqbPtWzE92z9Gc="; }; - cargoHash = "sha256-g3Y9yGvWoXPcthDX2/nfWVmNW5mJYILgrJc+Oy+M2fk="; + useFetchCargoVendor = true; + cargoHash = "sha256-8EchpubKnixlvAyM2iSf4fE5wowJHT6/mDHIvLPnEok="; meta = with lib; { description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project"; diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix index 0439a2ca7598..bd43bfb612eb 100644 --- a/pkgs/by-name/ne/netavark/package.nix +++ b/pkgs/by-name/ne/netavark/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Vz2/Y8o6fiVdLElgytUqLfa1oK/kyu1+dks4aiDHMAY="; }; - cargoHash = "sha256-8qDeOY4yfDE7YX06W3QKSOws+F53XM8M3dclEbYMRsI="; + useFetchCargoVendor = true; + cargoHash = "sha256-OrqhGTHd6gi6nMqvM/znQSwNoN5VSBRzcdgY3LbpYWU="; nativeBuildInputs = [ installShellFiles mandown protobuf go-md2man ]; diff --git a/pkgs/by-name/ne/netbox2netshot/package.nix b/pkgs/by-name/ne/netbox2netshot/package.nix index 24095209c794..0f15acef6e90 100644 --- a/pkgs/by-name/ne/netbox2netshot/package.nix +++ b/pkgs/by-name/ne/netbox2netshot/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zi/on31uYSW3XhIZzKMkxIj0QZxUzoOcpRR8w5LFH90="; }; - cargoHash = "sha256-qMIGCE3YsV+ZihqBpayrxddsSkmFPldgYNHnAK5semA="; + useFetchCargoVendor = true; + cargoHash = "sha256-/tvRITLa6O0zNM5eNORN2eaDUrrT/ds87phzFz2WcX8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ne/nethoscope/package.nix b/pkgs/by-name/ne/nethoscope/package.nix index 18d284443d7c..a7bc672c2338 100644 --- a/pkgs/by-name/ne/nethoscope/package.nix +++ b/pkgs/by-name/ne/nethoscope/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-v7GO+d4b0N3heN10+WSUJEpcShKmx4BPR1FyZoELWzc="; }; - cargoHash = "sha256-0yLMscmjHeU8dRDzx3kgniCRsekg9ZJWdN13hyqJgDI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Psu47S39/46ksv7YUU/Ppq3IB70tL2D5ZjaPdpOrrdM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ne/netop/package.nix b/pkgs/by-name/ne/netop/package.nix index db2d00f6a654..623d95c21be9 100644 --- a/pkgs/by-name/ne/netop/package.nix +++ b/pkgs/by-name/ne/netop/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ]; LIBPCAP_VER = libpcap.version; - cargoHash = "sha256-5vbv4w17DdaTKuF3vQOfv74I8hp2Zpsp40ZlF08qWlc="; + useFetchCargoVendor = true; + cargoHash = "sha256-WGwtRMARwRvcUflN3JYL32aib+IG1Q0j0D9BEfaiME4="; meta = with lib; { changelog = "https://github.com/ZingerLittleBee/netop/raw/v${version}/CHANGELOG.md"; diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index 433fda790091..4db8023245b9 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-/8UhnJ4ZPaJ+CQPCeKr1uH0Iw6A4/DARiSukK6+ZZeY="; }; - cargoHash = "sha256-u6Q9QPyOSMc356fkO4XVWUL0GGN1c2CoKhVvt1P30AU="; + useFetchCargoVendor = true; + cargoHash = "sha256-i+btU1ovqPGzhXi8IPZonSAdlpcbMPrWSbL7COKou9M="; postFixup = '' wrapProgram $out/bin/netscanner \ diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix index 951682cc3e74..f18b062be097 100644 --- a/pkgs/by-name/ne/newsboat/package.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RekP88qZ4VaH5JG190BbVrBHnoUr+UVWvFmdPeyY8Yw="; }; - cargoHash = "sha256-mripE0oeMLn9svhKH/dcH7VKYHGyZKfrDcoBdL+QcDQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-yIRw/WMdkuaZEzA0J1bvMzf+9JOLqc6S7lWJIfih4Gw="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/nf/nflz/package.nix b/pkgs/by-name/nf/nflz/package.nix index 47811ee95c84..63bae29393a4 100644 --- a/pkgs/by-name/nf/nflz/package.nix +++ b/pkgs/by-name/nf/nflz/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c9+79zrIU/M1Rh+DiaLJzbrNSa4IKrYk1gP0dsabUiw="; }; - cargoHash = "sha256-+SOoZFVJ6mASRKufQE4JmHGKR5rbBgg1PmCrI6dvvko="; + useFetchCargoVendor = true; + cargoHash = "sha256-aw3p0Lr/gWC1yDpVCXVibj4eU7ZFCQDy8kHtE6d6Yjg="; # Tests do not work in the package published on crates.io, since the folder # with test resources is not packaged. diff --git a/pkgs/by-name/ng/ngrrram/package.nix b/pkgs/by-name/ng/ngrrram/package.nix index 2ae07b76cac7..606de9acdaec 100644 --- a/pkgs/by-name/ng/ngrrram/package.nix +++ b/pkgs/by-name/ng/ngrrram/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-65cbNsGQZSpxKV0lq/Z7TK7CODPTqayOiPStukFbo44="; }; - cargoHash = "sha256-CWk3ixajgDI1oOOZ4qBZw5jq1xlJtxa6sAQu+fyk4rI="; + useFetchCargoVendor = true; + cargoHash = "sha256-SCfDXMz8SLmUk8VhbF6Gs4zis01Fhn4OX5amqLXaFV8="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index a4db4e5d6c82..aeef324f1a0b 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -53,7 +53,8 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-HfPzoAai6wK5IqNQY7yFVXatMcia9z0I84QNmNzHRoc="; + useFetchCargoVendor = true; + cargoHash = "sha256-Csh8M5BquAD2vUYIu0nNWSvznTZxno1WxvkEhBVN+9c="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 5ff143157c87..888fc9e5a764 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oOcVbAWNj0iVC3128QF4lKYfZbasqegwIfzv7qD8fDs="; }; - cargoHash = "sha256-y5ZV6aLXzFZg41ZHGSSL6t+BN30EBHKzXuT6478hQUY="; + useFetchCargoVendor = true; + cargoHash = "sha256-q0qcnpZkOr3AhdOO8p7einogeSDafh277eT7/yU2+YQ="; cargoBuildFlags = [ "-p nickel-lang-cli" diff --git a/pkgs/by-name/ni/nil/package.nix b/pkgs/by-name/ni/nil/package.nix index 553b48eb8b2a..9d9a59704211 100644 --- a/pkgs/by-name/ni/nil/package.nix +++ b/pkgs/by-name/ni/nil/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DqsN/VkYVr4M0PVRQKXPPOTaind5miYZURIYqM4MxYM="; }; - cargoHash = "sha256-E4wmVunaX5SeBlXaLEpzMZ+IY0YVeJ1NORPo9msHr6M="; + useFetchCargoVendor = true; + cargoHash = "sha256-7TR/xTc66WpPszJDrpisVvHXl2+FGrUOskZAkGyY04Q="; nativeBuildInputs = [ (lib.getBin nixVersions.latest) diff --git a/pkgs/by-name/ni/nitrocli/package.nix b/pkgs/by-name/ni/nitrocli/package.nix index 3d16e5744a56..5d826e68c9cf 100644 --- a/pkgs/by-name/ni/nitrocli/package.nix +++ b/pkgs/by-name/ni/nitrocli/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-j1gvh/CmRhPTeesMIK5FtaqUW7c8hN3ub+kQ2NM3dNM="; }; - cargoHash = "sha256-loCVYe4vdalo2AvoMo9th/V9xXulaq6HlPOw3idbqEw="; + useFetchCargoVendor = true; + cargoHash = "sha256-lWFleq9uxoshPMx2mYULCyEar72ZjGfgf0HlRoYfG/M="; # tests require a connected Nitrokey device doCheck = false; diff --git a/pkgs/by-name/ni/nix-btm/package.nix b/pkgs/by-name/ni/nix-btm/package.nix index 657e768d9db7..742da2fb0a68 100644 --- a/pkgs/by-name/ni/nix-btm/package.nix +++ b/pkgs/by-name/ni/nix-btm/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f8XFWlx+gwhF/OD8+tPcLGV/v0QnsDWOcqpY3Js+FAo="; }; - cargoHash = "sha256-qUZ3zJjQrteFQerBKFH/+Ys0uOzvI7DH9rCaVtseJMM="; + useFetchCargoVendor = true; + cargoHash = "sha256-zMQw3Q9t6JSMDt7xHMGTgAu9LW6MhG+Rrjpp5IEs/qQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/ni/nix-doc/package.nix b/pkgs/by-name/ni/nix-doc/package.nix index d938688022a8..121bef315ea2 100644 --- a/pkgs/by-name/ni/nix-doc/package.nix +++ b/pkgs/by-name/ni/nix-doc/package.nix @@ -57,7 +57,8 @@ rustPlatform.buildRustPackage rec { RUSTFLAGS = "-C relro-level=partial"; }; - cargoHash = "sha256-CHagzXTG9AfrFd3WmHanQ+YddMgmVxSuB8vK98A1Mlw="; + useFetchCargoVendor = true; + cargoHash = "sha256-EC+Wps6u1qXpv7ByM3NkRVCKRKCaBtC1o2vK8cKqzyU="; meta = with lib; { description = "Interactive Nix documentation tool"; diff --git a/pkgs/by-name/ni/nix-forecast/package.nix b/pkgs/by-name/ni/nix-forecast/package.nix index dd509a5de072..1465c6ce423d 100644 --- a/pkgs/by-name/ni/nix-forecast/package.nix +++ b/pkgs/by-name/ni/nix-forecast/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kNSH2QbryNAfZXILQzMk9MHDzX4420KyQJOKW0Xrl7c="; }; - cargoHash = "sha256-C5KPOwGD8jFqRuN6h1G6yO4lkl7t+RMzAE45r5d5lI0="; + useFetchCargoVendor = true; + cargoHash = "sha256-M4gMvF7v1uxBPh8it0DWSSSgWeES/QXSApeCFW+0dlI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ni/nix-health/package.nix b/pkgs/by-name/ni/nix-health/package.nix index 8d366d221f9f..26f390b09201 100644 --- a/pkgs/by-name/ni/nix-health/package.nix +++ b/pkgs/by-name/ni/nix-health/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/I6LdcH61wgJOEv51J1jkWlD8BlSAaRR1e7gc5H9bQI="; }; - cargoHash = "sha256-mqJA5Fv/sYj6ZkE73emtaHvg9hdT/5lN0kM3sl+GRCo="; + useFetchCargoVendor = true; + cargoHash = "sha256-3DE/NwPdi//7xaoV2SVgF5l3ndrEYraoyg5NLJzvzBI="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/by-name/ni/nix-inspect/package.nix b/pkgs/by-name/ni/nix-inspect/package.nix index 808da85fb582..23bb5ef92326 100644 --- a/pkgs/by-name/ni/nix-inspect/package.nix +++ b/pkgs/by-name/ni/nix-inspect/package.nix @@ -56,7 +56,8 @@ rustPlatform.buildRustPackage { pname = "nix-inspect"; version = "0.1.2"; - cargoHash = "sha256-/0CrHqOL4B0Rx0ZbUpW54FiisfpW6UU4uk6wctfCX5c="; + useFetchCargoVendor = true; + cargoHash = "sha256-3FTlbWSA0SKCfunQDdXu9g2aQAdAIfOTq5qJbzrRPjc="; buildInputs = [ workerPackage ]; diff --git a/pkgs/by-name/ni/nix-janitor/package.nix b/pkgs/by-name/ni/nix-janitor/package.nix index 8fc36ac0c9ed..ec649c3a1239 100644 --- a/pkgs/by-name/ni/nix-janitor/package.nix +++ b/pkgs/by-name/ni/nix-janitor/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MRhTkxPl0tlObbXO7/0cD2pbd9/uQCeRKV3DStGvZMQ="; }; - cargoHash = "sha256-XFO4ec++lT04JpwqGtD3kWX4vmgmeBPSULxZENddYm0="; + useFetchCargoVendor = true; + cargoHash = "sha256-t4TZkwWIp/VYj4tMd5CdYuAQt3GquMRZ3wyAK3oic5k="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix index 3d47e68637d2..b7b517f1976b 100644 --- a/pkgs/by-name/ni/nix-ld/package.nix +++ b/pkgs/by-name/ni/nix-ld/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { patches = [ ./rust-1.83.patch ]; - cargoHash = "sha256-GOngDGRzWVuzGTX5xNb/nv5dJ6is6cH8K6kHTX3OoXE="; + useFetchCargoVendor = true; + cargoHash = "sha256-2CFdUZbKFl7cf6dik6XextuGG2vLM9oNS8rIyzLnfM4="; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/by-name/ni/nix-melt/package.nix b/pkgs/by-name/ni/nix-melt/package.nix index 31e1a0f0e72c..667e2076cf58 100644 --- a/pkgs/by-name/ni/nix-melt/package.nix +++ b/pkgs/by-name/ni/nix-melt/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jx7g9GOFAjOlJyNsGOUTLh2qWII9u0prOoBEvNPmdj8="; }; - cargoHash = "sha256-CVMQPnSwGErZnf5/iAcVy37VlJjZdO/BkO3C/rlpl/w="; + useFetchCargoVendor = true; + cargoHash = "sha256-OTKK0d4yCTiK5GTw+LKagutRbok/zKqLkeOtInJ2L64="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix index 391735a27836..e4db051de234 100644 --- a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix +++ b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { gtk3 ]; - cargoHash = "sha256-NSLBIvgo5EdCvZq52d+UbAa7K4uOST++2zbhO9DW38E="; + useFetchCargoVendor = true; + cargoHash = "sha256-6TdPYN42PMOE5zL8nBRVdndjWhvU+7y0yNWtJybvkf0="; meta = with lib; { description = "GTK viewer for the output of `nix store --query --tree`"; diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix index 3cb661703114..6a92ed47aba7 100644 --- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix +++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-NCxPLsBJX4Dp8LcWrjVrocqDBvWc587DF3WPXZg1uFY="; + useFetchCargoVendor = true; + cargoHash = "sha256-9DwED8X/RHjBCInm+VbzoeVSb28U+XIE2IjNAGon6+E="; env = { SYSTEMD_VERITYSETUP_PATH = "${systemd}/lib/systemd/systemd-veritysetup"; diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix index 02f31ee19739..961ea4afe735 100644 --- a/pkgs/by-name/ni/nix-weather/package.nix +++ b/pkgs/by-name/ni/nix-weather/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-15FUA4fszbAVXop3IyOHfxroyTt9/SkWZsSTUh9RtwY="; }; - cargoHash = "sha256-vMeljXNWfFRyeQ4ZQ/Qe1vcW5bg5Y14aEH5HgEwOX3Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-IkwCa+MioL2F3fiUYm3HQOeO2yb+58YQzM9YJ2oILj4="; cargoExtraArgs = "-p nix-weather"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix index 443ab1f3d5ae..2511a260b279 100644 --- a/pkgs/by-name/ni/nix-web/package.nix +++ b/pkgs/by-name/ni/nix-web/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { rev = "nix-web-v${version}"; hash = "sha256-lAk2VfhclHswsctA0RQgEj5oEX1fowh8TCaKykGEioY="; }; - cargoHash = "sha256-romL/RALr/pmwUA8/SN4AOwc+Vndspd1Yrqs0AHPYRY="; + useFetchCargoVendor = true; + cargoHash = "sha256-PfbDod1vQDnWqbhRgXbOvidxGWIXIe7XIgqiLVbovh0="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix index ed007d20a686..bda305c30d35 100644 --- a/pkgs/by-name/ni/nix-your-shell/package.nix +++ b/pkgs/by-name/ni/nix-your-shell/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c="; }; - cargoHash = "sha256-2NgN2/dr48ogkcjOq6UE4jDQBeewceWzdpRlXqi744s="; + useFetchCargoVendor = true; + cargoHash = "sha256-zQpK13iudyWDZbpAN8zm9kKmz8qy3yt8JxT4lwq4YF0="; meta = { mainProgram = "nix-your-shell"; diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix index 685848d2b63f..d30ea60b721e 100644 --- a/pkgs/by-name/ni/nixdoc/package.nix +++ b/pkgs/by-name/ni/nixdoc/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0tMGTKcuvyDE5281nGCvZKYJKIEAU01G6vV8Fnt/1ZQ="; }; - cargoHash = "sha256-5KV2VDsPmSgrdZIqCuQ5gjgCVs/Ki6uG6GTwjmtKLlQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-Xqwytw6dRL/bZutnZxQchSfWCzjACw2/UAr4YW5fz44="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; diff --git a/pkgs/by-name/ni/nixel/package.nix b/pkgs/by-name/ni/nixel/package.nix index fcbfbb5b98d0..26a307674af7 100644 --- a/pkgs/by-name/ni/nixel/package.nix +++ b/pkgs/by-name/ni/nixel/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-dQ3wzBTjteqk9rju+FMAO+ydimnGu24Y2DEDLX/P+1A="; }; - cargoHash = "sha256-1OsHs0W3ji9Kgpv7nGY9XyGxJ4c0faN2VuFLsdwkgKY="; + useFetchCargoVendor = true; + cargoHash = "sha256-X/O1Lg1llyRz+d5MC1xO4qKU1+mDIlZhgj6qQ9kLH4k="; # Package requires a non reproducible submodule # https://github.com/kamadorueda/nixel/blob/2873bd84bf4fc540d0ae8af062e109cc9ad40454/.gitmodules#L7 diff --git a/pkgs/by-name/ni/nixpacks/package.nix b/pkgs/by-name/ni/nixpacks/package.nix index 146330eaf0d1..d3e7c81af054 100644 --- a/pkgs/by-name/ni/nixpacks/package.nix +++ b/pkgs/by-name/ni/nixpacks/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-t9eC7WdPGROLW+j/2O4rV2n16hA9/+rHHyB8E5LLUnE="; }; - cargoHash = "sha256-HGAhXhThcxCmjJt4Xu3qU5LSBNKvC3rztWVQoiB7GQs="; + useFetchCargoVendor = true; + cargoHash = "sha256-496hDZQorc5lnbg07Wps1I9dtxwxq5EGH4hly5tfUQ8="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/by-name/ni/nixpkgs-fmt/package.nix b/pkgs/by-name/ni/nixpkgs-fmt/package.nix index 16f62c125354..6bb9c313edd3 100644 --- a/pkgs/by-name/ni/nixpkgs-fmt/package.nix +++ b/pkgs/by-name/ni/nixpkgs-fmt/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6Ut4/ix915EoaPCewoG3KhKBA+OaggpDqnx2nvKxEpQ="; }; - cargoHash = "sha256-yIwCBm46sgrpTt45uCyyS7M6V0ReGUXVu7tyrjdNqeQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-aookq6n8/dMz+REDwtSghhzcUf66D3O9SKJKx3q7lsI="; meta = with lib; { description = "Nix code formatter for nixpkgs"; diff --git a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix index 10fdb18ec7c7..9aafd778ad9d 100644 --- a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix +++ b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-o1VWM46lEJ9m49s/ekZWf8DkCeeWm4J3PQtt8tVXHbg="; }; - cargoHash = "sha256-LWtBO0Ai5cOtnfZElBrHZ7sDdp3ddfcCRdTA/EEDPfE="; + useFetchCargoVendor = true; + cargoHash = "sha256-wK2ZMqxgSLGhM7TsztFkZHB2+WnT+8Tjd3UrFdIvGpI="; meta = with lib; { description = "Fast semantic linter for Nix using tree-sitter"; diff --git a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix index 6015405f3ec6..10fa7221513a 100644 --- a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix +++ b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sVQ6UgQvSTEIxXPxISeTI9tqAdJlxQpLxq1h4I31r6k="; }; - cargoHash = "sha256-abHczsRzWDST6ji7yi/Iox1o8QHGjt5T7/KDwsYGYMk="; + useFetchCargoVendor = true; + cargoHash = "sha256-vaCmRr1hXF0BSg/dl3LYyd7c1MdPKIv6KgDgGEzqqJQ="; # tests need a working nix install with access to the internet doCheck = false; diff --git a/pkgs/by-name/ni/nixtract/package.nix b/pkgs/by-name/ni/nixtract/package.nix index 2885a13f300d..13139e54b6db 100644 --- a/pkgs/by-name/ni/nixtract/package.nix +++ b/pkgs/by-name/ni/nixtract/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-36ciPNSlB1LU+UXP8MLakrBRRqbyiVFN8Jp/JbCe1OY="; }; - cargoHash = "sha256-fawBRIVcOhtDxxRYCf+HWYadoSB/ENKguTbS0M4odVU="; + useFetchCargoVendor = true; + cargoHash = "sha256-vG661ZXL87FiMy8yLOI7cagvunhzJhAsBR+VF6RfBxU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/nm/nm-file-secret-agent/package.nix b/pkgs/by-name/nm/nm-file-secret-agent/package.nix index beef2962e903..b37f4af43985 100644 --- a/pkgs/by-name/nm/nm-file-secret-agent/package.nix +++ b/pkgs/by-name/nm/nm-file-secret-agent/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-5L4bhf6nsINZD+oINC1f71P2cebPG7bzDYtlsU8UMMk="; }; - cargoHash = "sha256-SlYz55hc9HEueN7AYVpqadxQjI0hERcdQSJ7rEPnbVE="; + useFetchCargoVendor = true; + cargoHash = "sha256-o8uqdDx3N/12Uvap0gl02lrNyzyBZxDOEmuueoRLVag="; buildInputs = [ dbus ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/no/nofi/package.nix b/pkgs/by-name/no/nofi/package.nix index 4c1cba5dfeac..3cbf7a61c329 100644 --- a/pkgs/by-name/no/nofi/package.nix +++ b/pkgs/by-name/no/nofi/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hQYIcyNCxb8qVpseNsmjyPxlwbMxDpXeZ+H1vpv62rQ="; }; - cargoHash = "sha256-0TYIycuy2LIhixVvH++U8CbmfQugc+0TF8DTiViWSbE="; + useFetchCargoVendor = true; + cargoHash = "sha256-dWqMwS0TgspZqlpi8hhwtA7sbqGunw0FIqjJXOTiFKA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix index 6ef8f5bb7869..78bddcbd4d9a 100644 --- a/pkgs/by-name/no/nomino/package.nix +++ b/pkgs/by-name/no/nomino/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/5rKlPRo3+BsqPgHJ0M/JDGwA0c4rAiOd7gGClPfxMg="; }; - cargoHash = "sha256-LaLMa66paTW9Wubus3phc7IgDW54sJFSf4VHnJHGq3o="; + useFetchCargoVendor = true; + cargoHash = "sha256-lHDMOOvdtjPPXfz/ducTqXFAO/1zCJZKwKGRdEHDhmg="; meta = with lib; { description = "Batch rename utility for developers"; diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index adb032933e26..9bacdc764222 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HRuqeKV0Y8kf/KBSHIK25Xrpr7tJODQQa4BoqxiulzU="; }; - cargoHash = "sha256-/EeKoR4IHNwQj8Ohs46U2BYJWkutJ1XWhW6xsR+k7Yg="; + useFetchCargoVendor = true; + cargoHash = "sha256-s1LEB8ZctvUtj85iRjl5egFngcvHtqSq+6lzEcRRz10="; nativeCheckInputs = [ git diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix index a1ddcc3b2725..ba8f7dbcf3cd 100644 --- a/pkgs/by-name/no/nostr-rs-relay/package.nix +++ b/pkgs/by-name/no/nostr-rs-relay/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MS5jgUh9aLAFr4Nnf3Wid+ki0PTfsyob3r16/EXYZ7E="; }; - cargoHash = "sha256-nKW3mnD/PgDU+WBBwO0SYfNmLYl5T2k4qwPo79DbJpk="; + useFetchCargoVendor = true; + cargoHash = "sha256-hrq9EEUot9painlXVGjIh+NMlrH4iRQ28U3PLGnvYsw="; buildInputs = [ openssl.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix index 364d5154007e..6c32f8c19c94 100644 --- a/pkgs/by-name/no/nostui/package.nix +++ b/pkgs/by-name/no/nostui/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { "--skip=widgets::text_note::tests::test_created_at" ]; - cargoHash = "sha256-8ciA1FoGdnU+GWRcYJc8zU2FpUgGwTZSZynvAi1luYo="; + useFetchCargoVendor = true; + cargoHash = "sha256-tway75ZAP2cGdpn79VpuRd0q/h+ovDvkih1LKitM/EU="; meta = with lib; { homepage = "https://github.com/akiomik/nostui"; diff --git a/pkgs/by-name/no/notmuch-mailmover/package.nix b/pkgs/by-name/no/notmuch-mailmover/package.nix index 73e5ea5e6632..d705c2ac7f0d 100644 --- a/pkgs/by-name/no/notmuch-mailmover/package.nix +++ b/pkgs/by-name/no/notmuch-mailmover/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-v70R6CgN4RzG6L8LUg3ZvW895+G4eU8HZ0TI+jRxZ10="; }; - cargoHash = "sha256-ys8fupS78yxgFBPCCB2JbGADNSEefrEEEGBgzWcLCnI="; + useFetchCargoVendor = true; + cargoHash = "sha256-aMSYXquyDwPBa4xL7wOSu/Ou1saPG5ZDXhLB4dAnomo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix index 9d488a5e61af..9e4cbcd72a11 100644 --- a/pkgs/by-name/no/novops/package.nix +++ b/pkgs/by-name/no/novops/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bpv8Ybrsb2CAV8Qxj69F2E/mekYsOuAiZWuDNHDtxw0="; }; - cargoHash = "sha256-5NKgGX4j2hQuP9/9OnABLXcWuTPMAfvX0oquoSXeEIE="; + useFetchCargoVendor = true; + cargoHash = "sha256-w5jBCVoLm0zzLMa7COHsQbHq+TlJZCnabNZyO8nlTKk="; buildInputs = [ diff --git a/pkgs/by-name/np/npins/package.nix b/pkgs/by-name/np/npins/package.nix index 9d0ab7526f7c..f54fbe449bcb 100644 --- a/pkgs/by-name/np/npins/package.nix +++ b/pkgs/by-name/np/npins/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { version = src.version; src = passthru.mkSource sources.npins; - cargoHash = "sha256-YwMypBl+P1ygf4zUbkZlq4zPrOzf+lPOz2FLg2/xI3k="; + useFetchCargoVendor = true; + cargoHash = "sha256-RUtWpZYaydXzF7gcROiIr04K7+Usq9iHAQwnv3ELqLI="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index 0c7aa77aca1d..019e202ac77a 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nzM16rZ3+JrmRmeE1dSZPj3P1KmN+Cv7QkkgOadeqx8="; }; - cargoHash = "sha256-F2JlUErplSRQwSAEavQPNDMcXYc2waeYwjGuzmZq8sc="; + useFetchCargoVendor = true; + cargoHash = "sha256-uz9sxnHRmcW7BimlpJQgxegYPI+eYCMxC356YDieb4g="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/ns/nsh/package.nix b/pkgs/by-name/ns/nsh/package.nix index 17560c92118e..6f797649857c 100644 --- a/pkgs/by-name/ns/nsh/package.nix +++ b/pkgs/by-name/ns/nsh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1479wv8h5l2b0cwp27vpybq50nyvszhjxmn76n2bz3fchr0lrcbp"; }; - cargoHash = "sha256-47Nis3ygGAS8Zi+FiWAXNZxWsT0gkPSleSVpWz3Jss8="; + useFetchCargoVendor = true; + cargoHash = "sha256-kbHNFVu5OIg/eKefhsYRGvlXFduB0aBVflPV9hkM4Ec="; doCheck = false; diff --git a/pkgs/by-name/ns/nsncd/package.nix b/pkgs/by-name/ns/nsncd/package.nix index 43f19cf6f729..a39f21e3d9ec 100644 --- a/pkgs/by-name/ns/nsncd/package.nix +++ b/pkgs/by-name/ns/nsncd/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { hash = "sha256-0cFCX5pKvYv6yr4+X5kXGz8clNi/LYndFtHaxSmHN+I="; }; - cargoHash = "sha256-1n+yCjuJ7kQkd68AOCVz5MWWe1qItaceT1rDlLi1Vqo="; + useFetchCargoVendor = true; + cargoHash = "sha256-9M8Y0WwXFlrpRleSQPYDpnjNnxKGvrtO6Istl9qM30M="; checkFlags = [ # Relies on the test environment to be able to resolve "localhost" diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index f2207383f2b3..7387291ebe32 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-usLtf4qwKkn+lEYSQWCa1ap9h/52YYMVFDkpFJVD00k="; }; - cargoHash = "sha256-ZB18YbCdJpuu7qTXdHgs2IgDCoc3Hs/aDn4dzXmKI8c="; + useFetchCargoVendor = true; + cargoHash = "sha256-Zm7uRdgX9zgLeVdcSdp3z+NjyD9HB0GHX37qjgjSatI="; nativeBuildInputs = [ pandoc diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index adba5f328ec3..5c5ccfecb46d 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { rustPlatform.bindgenHook ]; - cargoHash = "sha256-MHZlXmHAYIiaB6Isutqjrh45jppRzTZRSE3VqzpFBBA="; + useFetchCargoVendor = true; + cargoHash = "sha256-zS4g/uMh1eOoPo/RZfanL6afCEU5cnyzHrIqkvuQVrg="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index da0e75d1a3a6..c578c921403d 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5XsrOAvBrmCG6k7YRwGZZtBP/o1jVVtBBTrwIT5CDX8="; }; - cargoHash = "sha256-RMON7JThY6Ad1QHQFiNbTb2PUsfviR2t+55k1ZtlOd8="; + useFetchCargoVendor = true; + cargoHash = "sha256-GYdg4LkGyKfu22C++ZkwkTGR11++hrX2Wnvb7Skn8NY="; env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules"; diff --git a/pkgs/by-name/nv/nvmetcfg/package.nix b/pkgs/by-name/nv/nvmetcfg/package.nix index 0c2e29e8a6e0..3de6a040a0fc 100644 --- a/pkgs/by-name/nv/nvmetcfg/package.nix +++ b/pkgs/by-name/nv/nvmetcfg/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LoQTcHM6czzQ5ZwXcklFXf/7WlRsoJTF61UhQ56aleQ="; }; - cargoHash = "sha256-yZ4UAx95f/cjeObBtzpiYtwDjgOgkKnD64yGe6ouVGw="; + useFetchCargoVendor = true; + cargoHash = "sha256-c/6tz68ZI42RgD2N4WZI3nzFo2J5gjk8UoPlelQaxIo="; passthru.tests = { inherit (nixosTests) nvmetcfg; diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index 01cb27a34680..c8f23e69ce30 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+unUjGPDUSVGXyf91+mnPrLAslTpDxsCCmSnT34s7S0="; }; - cargoHash = "sha256-zEd8LUNZOspcrA90qJur6V2Dt/+9XJWvwBBjjFAPAg8="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZKHm6N7y5FbDFiK2QfQ+9siexgzrdLpBs5Xikh1SRLo="; meta = with lib; { description = "Minimal CLI to control OBS Studio via obs-websocket"; diff --git a/pkgs/by-name/ob/obs-do/package.nix b/pkgs/by-name/ob/obs-do/package.nix index 5cee77568677..960ecf5b5195 100644 --- a/pkgs/by-name/ob/obs-do/package.nix +++ b/pkgs/by-name/ob/obs-do/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-t6m/PX4GMCFH9wFrOaU/dcrbKitUXQlOcU7aUyJPpxA="; }; - cargoHash = "sha256-GZsTDG5lS6XpVT6mobMOCKsJ4iXAVW2NIsm4s+v52SU="; + useFetchCargoVendor = true; + cargoHash = "sha256-gy/r8s4LF6LDeI+hz0ddAOTcaDh8Uvz9vF4Eg/+1q1Q="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ob/obsidian-export/package.nix b/pkgs/by-name/ob/obsidian-export/package.nix index 93d6f4a3e7b3..158dc0bf3658 100644 --- a/pkgs/by-name/ob/obsidian-export/package.nix +++ b/pkgs/by-name/ob/obsidian-export/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-r5G2XVV2F/Bt29gxuTZKX+KxH6RFa1hJNH3gSTi7yCU="; }; - cargoHash = "sha256-lkqoMFasHpfhmVd3dlYd/TKIBIDzqMbsxfigpeJq0w8="; + useFetchCargoVendor = true; + cargoHash = "sha256-d9CL29lc3IMpXZa7hGC17UhEJnZPZuRiy0DqWtgyjV8="; meta = { changelog = "https://github.com/zoni/obsidian-export/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index 643cddcf2aca..afd8837688f6 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6jow0ektqmEcwFEaJgPqhJPs8LlYmPRLE+zqk1T4wDk="; }; - cargoHash = "sha256-0e4FoWhZwq6as0JYHGj1zoAOSr71ztqtWJEY3QXDs9s="; + useFetchCargoVendor = true; + cargoHash = "sha256-MQ9nTWRYONZP6ZrMVrwKqbyTpWeyQNzFFcnNzwj1z8M="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/og/ograc/package.nix b/pkgs/by-name/og/ograc/package.nix index aed6c9a232bb..48a395f646cd 100644 --- a/pkgs/by-name/og/ograc/package.nix +++ b/pkgs/by-name/og/ograc/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage { rev = "d09b3102ff7a364bf2593589327a16a473bd4f25"; hash = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo="; }; - cargoHash = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA="; + useFetchCargoVendor = true; + cargoHash = "sha256-rWU8rOGLUrSkXLkHib8qkkiOZvuGbSJ4knFrHuD+R44="; meta = with lib; { description = "like cargo, but backwards"; diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 9c58e8eff375..e5424bc1a606 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-P710b6Bs3O4pNrusoXLmIfYzmAB+BzXCuSX9k7KOWno="; }; - cargoHash = "sha256-k4nG95cPntlMYnICYSDIgXPgD8vBCk4q5/XO4ykJyZU="; + useFetchCargoVendor = true; + cargoHash = "sha256-YVEeyMplGwDDqEpyVQzEBWUshQYfqcRclNqjEocTo0A="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config diff --git a/pkgs/by-name/ok/okolors/package.nix b/pkgs/by-name/ok/okolors/package.nix index 91f972e8cb25..38af371921c0 100644 --- a/pkgs/by-name/ok/okolors/package.nix +++ b/pkgs/by-name/ok/okolors/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-U7rLynXZGHCeZjaXoXx2IRDgUFv7zOKfb4BPgDROzBc="; }; - cargoHash = "sha256-xRCxpmIocvkg1ErYVqBLHb/jXV2eWeWHg4IO/QsnnF0="; + useFetchCargoVendor = true; + cargoHash = "sha256-3wZeRPG2VrpPlqRVmkrMskqzM6NGZoSGbgGBTJzKCgQ="; meta = with lib; { description = "Generate a color palette from an image using k-means clustering in the Oklab color space"; diff --git a/pkgs/by-name/om/omekasy/package.nix b/pkgs/by-name/om/omekasy/package.nix index ec2b53644c2f..313366cca936 100644 --- a/pkgs/by-name/om/omekasy/package.nix +++ b/pkgs/by-name/om/omekasy/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wI+xN6pyNoP4xknjHHDydHq275Gb1nyp7YtqmABlTBA="; }; - cargoHash = "sha256-6CU2ff4o7Y3CmZSf/xs2SSGco2mu4oRLJYIciCld8zo="; + useFetchCargoVendor = true; + cargoHash = "sha256-Bhxj77E/HXvAmTO3S7DW6ZGOk9lqpZMwGv7DN58skP0="; buildNoDefaultFeatures = stdenv.targetPlatform.isWasi; diff --git a/pkgs/by-name/on/onagre/package.nix b/pkgs/by-name/on/onagre/package.nix index 1be4320b6652..df0eb8279079 100644 --- a/pkgs/by-name/on/onagre/package.nix +++ b/pkgs/by-name/on/onagre/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yVkK3B7/ul0sOxPE3z2qkY/CnsZPQYqTpd64Wo/GXZI="; }; - cargoHash = "sha256-ZjS4g0lwWTJwwXpdKHxmEXIS/GQ6eo888nPhq0v+y9I="; + useFetchCargoVendor = true; + cargoHash = "sha256-JsTBzkznFYiSOq41aptNa5akXTdkqJj3FwoHuvUlgpE="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix index 114bcb499242..317abd42f406 100644 --- a/pkgs/by-name/on/onefetch/package.nix +++ b/pkgs/by-name/on/onefetch/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lQxv2gwZOGtxJrXjxvjBnbl225ppSs3cVNCfePFeqEE="; }; - cargoHash = "sha256-jDyEZaP1R1c5K+d9BQSVqy/rCEAXIrVA/68vQweSIF4="; + useFetchCargoVendor = true; + cargoHash = "sha256-s1xA7UHArHeGaXrGQmqn9pKvtSW175ci4ipQEmKQQ5s="; cargoPatches = [ # enable pkg-config feature of zstd diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index 9973336ca7ab..7ae098af1898 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -52,7 +52,8 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Foundation ]; - cargoHash = "sha256-YBJd43xOCumQbrvzfV/+F63McYzHg1bGI3icgGzGZrQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-3K+/CpTGWSjCRa2vOEcDvLIiZMdntugIqnzkXF4wkng="; INSTALL_PREFIX = placeholder "out"; diff --git a/pkgs/by-name/op/openapi-tui/package.nix b/pkgs/by-name/op/openapi-tui/package.nix index ec88d90d8a47..22e898f46e1b 100644 --- a/pkgs/by-name/op/openapi-tui/package.nix +++ b/pkgs/by-name/op/openapi-tui/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EUWL16cHgPF88CoCD9sqnxLOlmWoe1tu5ps01AYwwzc="; }; - cargoHash = "sha256-sINwuMgBbc/Xn73Gy+Wwb0QtIHGGB02fVyz/K/tg5Ys="; + useFetchCargoVendor = true; + cargoHash = "sha256-JlfsWR0NAvGBljxlBuyIT1vffvXaGkf6AVW70/c+JBs="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/op/openpgp-ca/package.nix b/pkgs/by-name/op/openpgp-ca/package.nix index 46c07f2be79b..7b5e0bffc3d2 100644 --- a/pkgs/by-name/op/openpgp-ca/package.nix +++ b/pkgs/by-name/op/openpgp-ca/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-71SApct2yQV3ueWDlZv7ScK1s0nWWS57cPCvoMutlLA="; }; - cargoHash = "sha256-L0Z+Oxov0y+PipdXz8/3Y0MKYhr/lNYurphc9s0K+Dg="; + useFetchCargoVendor = true; + cargoHash = "sha256-uftsBw8ZegnaoFel/wEqCMhVxiGR13jKbKqVSm+23T4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index 331b787bb2fd..c3d6c09fb924 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sR+jBCSuDH4YdJz3YuvA4EE36RHV3m/xU8hIEXXsqKo="; }; - cargoHash = "sha256-G5+lVK41hbzy/Ltc0EKoUfqF0M1OYu679jyVjYKJmn0="; + useFetchCargoVendor = true; + cargoHash = "sha256-WFh6blk0sdpDVBsiQVXtXzVQBjAKJ2995PQ4voqxm+A="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/op/openscad-lsp/package.nix b/pkgs/by-name/op/openscad-lsp/package.nix index e28f9fd4c07d..931a9b38e62e 100644 --- a/pkgs/by-name/op/openscad-lsp/package.nix +++ b/pkgs/by-name/op/openscad-lsp/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IPTBWX0kKmusijg4xAvS1Ysi9WydFaUWx/BkZbMvgJk="; }; - cargoHash = "sha256-AQpjamyHienqB501lruxk56N6r8joocWrJ5srsm5baY="; + useFetchCargoVendor = true; + cargoHash = "sha256-qHwtLZUM9FrzDmg9prVtSf19KtEp8cZO/7XoXtZb5IQ="; # no tests exist doCheck = false; diff --git a/pkgs/by-name/or/oranda/package.nix b/pkgs/by-name/or/oranda/package.nix index 1e920f19fcce..5cf56cc1bf9c 100644 --- a/pkgs/by-name/or/oranda/package.nix +++ b/pkgs/by-name/or/oranda/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FVd8NQVtzlZsDY40ZMJDdaX+6Q5jUxZHUq2v+kDFVOk="; }; - cargoHash = "sha256-48qDAgHf1tGUwhQWqEi4LQQmSi9PplTlgjVd7/yxZZc="; + useFetchCargoVendor = true; + cargoHash = "sha256-wPYgAbaoUVJoZT1nRCBsPziszkAubImZEKGrC2RAkEA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index 84e988e18b92..e6cb2d85ddfb 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-95da/aoBhrQ/GaM4fojFufs6+OI2KLF6SGsSw6qtYUc="; }; - cargoHash = "sha256-yATfAPBA96ozqhdekklFCgHr9Oj2YIKws/m4hc70i6E="; + useFetchCargoVendor = true; + cargoHash = "sha256-PGC3R+iy3evp7BtEpyXDPvi6mlB7CGtd8uzfpkmHzMU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/or/orogene/package.nix b/pkgs/by-name/or/orogene/package.nix index a5ac15d26a2b..510b0c67dcae 100644 --- a/pkgs/by-name/or/orogene/package.nix +++ b/pkgs/by-name/or/orogene/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-I9uh8jV1hH5R/UHM3mz2/ZA7QY4O9gW5qXlVSfao0ZM="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ju3nRevwJZfnoSqEIERkfMyg6Dy8ky53qf1ZXuAOjsw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ot/otadump/package.nix b/pkgs/by-name/ot/otadump/package.nix index 2567cf28ee8a..e1d5dcdbab23 100644 --- a/pkgs/by-name/ot/otadump/package.nix +++ b/pkgs/by-name/ot/otadump/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { doCheck = false; # There are no tests - cargoHash = "sha256-lTzEgy9mevkmefvTZT9hEBHN5I+kXVqTev5+sy/JoaE="; + useFetchCargoVendor = true; + cargoHash = "sha256-6L1FJWEaDBqpJvj9uGjYuAqqDoQlkVwOWfbG46Amkkw="; meta = { description = "Command-line tool to extract partitions from Android OTA files"; diff --git a/pkgs/by-name/ot/otree/package.nix b/pkgs/by-name/ot/otree/package.nix index f7da368c0a71..dfe72757daa4 100644 --- a/pkgs/by-name/ot/otree/package.nix +++ b/pkgs/by-name/ot/otree/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WvoiTu6erNI5Cb9PSoHgL6+coIGWLe46pJVXBZHOLTE="; }; - cargoHash = "sha256-2eFGTpI4yevcxtgtGH+AufMDqsuhOH9CiyXUpjtdTDE="; + useFetchCargoVendor = true; + cargoHash = "sha256-tgw1R1UmXAHcrQFsY4i4efGCXQW3m0PVYdFSK2q+NUk="; meta = { description = "Command line tool to view objects (json/yaml/toml) in TUI tree widget"; diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix index ea27974a5a86..86267edd9f50 100644 --- a/pkgs/by-name/ou/ouch/package.nix +++ b/pkgs/by-name/ou/ouch/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WO1fetu39fcLGcrbzFh+toHpnyxWuDVHtmjuH203hzQ="; }; - cargoHash = "sha256-OdAu7fStTJCF1JGJG9TRE1Qosy6yjKsWq01MYpbXZcg="; + useFetchCargoVendor = true; + cargoHash = "sha256-LBigtb8kYAgPb4X+L0a/mzPLPEUk5aEHigZuI4Y8N+k="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ou/outfly/package.nix b/pkgs/by-name/ou/outfly/package.nix index 27137a9591fd..d16ccdcb2f47 100644 --- a/pkgs/by-name/ou/outfly/package.nix +++ b/pkgs/by-name/ou/outfly/package.nix @@ -49,7 +49,8 @@ rustPlatform.buildRustPackage rec { --add-rpath ${lib.makeLibraryPath runtimeInputs} ''; - cargoHash = "sha256-Hs7IxDildYzDYMUjv7fN1cUArKNehX2al++g/DoZ7rk="; + useFetchCargoVendor = true; + cargoHash = "sha256-5t6PPlfV/INqb4knz1Bv6dqw47RxUmVO0DSlQNUIQL4="; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix index 80603bb4ef9d..7b76d5fd1630 100644 --- a/pkgs/by-name/ov/overskride/package.nix +++ b/pkgs/by-name/ov/overskride/package.nix @@ -36,7 +36,8 @@ rustPlatform.buildRustPackage { hash = "sha256-SqaPhub/HwZz7uBg/kevH8LvPDVLgRd/Rvi03ivNrRc="; }; - cargoHash = "sha256-jSTCCPNPKPNVr3h8uZ21dP8Z7shbX+QmoWM/jk1qjfg="; + useFetchCargoVendor = true; + cargoHash = "sha256-Axeywo7Ryig84rS/6MXl2v9Pe3yzdivq7/l/mfi5mOA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index a11401d34778..ca671056e352 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rTANG+yHE8YfWYUyELoKgj4El+1ZW6vI9NkgADD40pw="; }; - cargoHash = "sha256-qiimnkUDiFoz/68GYi0QTuYYBjowC01c3GSxUIMjNT4="; + useFetchCargoVendor = true; + cargoHash = "sha256-Y57EGKl/wJnZ/eTlKL984GlxMWTq/ZUT5Rns/MEGOCE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ow/owmods-gui/package.nix b/pkgs/by-name/ow/owmods-gui/package.nix index 28e477cbf2e8..ec7538af48ee 100644 --- a/pkgs/by-name/ow/owmods-gui/package.nix +++ b/pkgs/by-name/ow/owmods-gui/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rTANG+yHE8YfWYUyELoKgj4El+1ZW6vI9NkgADD40pw="; }; - cargoHash = "sha256-rFkh2G7kFuQI7nlZIwaqvt7x9bKLqmWU21YwZu2+wUA="; + useFetchCargoVendor = true; + cargoHash = "sha256-Y57EGKl/wJnZ/eTlKL984GlxMWTq/ZUT5Rns/MEGOCE="; buildFeatures = [ "tauri/custom-protocol" diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix index 06b57513a983..f48bbdc33874 100644 --- a/pkgs/by-name/ox/ox/package.nix +++ b/pkgs/by-name/ox/ox/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kTCdq3C0OUQS3tQRwEJ0+MTHZ8j2nnUARjdbmfH6ed4="; }; - cargoHash = "sha256-GiKSkpXEngQtnGW8zjy2RWQOG1b/xQrYRSLHsndkooo="; + useFetchCargoVendor = true; + cargoHash = "sha256-1d5gGqEn6kBCXqAnwHAe7rnvaGG2wVODrxeQt+k6iJs="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index 572977337e4c..4b871410d89a 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kzN4YNsFqv/KUxpHao++oqc90Us6VllyFYkpdVUigD0="; }; - cargoHash = "sha256-4PCLtBJliK3uteL8EVKLBVR2YZW1gwQOiSLQok+rqug="; + useFetchCargoVendor = true; + cargoHash = "sha256-4c9YcIQRZsbDJvl8P9Pkd3atTVM+RbQ/4BMb7rE84po="; doCheck = !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix index 47764d1191b2..10ddd96d4f2d 100644 --- a/pkgs/by-name/ox/oxker/package.nix +++ b/pkgs/by-name/ox/oxker/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XY3LwDagxSi1yeAfqhnbtNRBqJxp0BkhaYZM/T59tGw="; }; - cargoHash = "sha256-SeNrVw1m0B9CV31Pa41YinviWbEdiw50sdcrQpndiCI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Z14XLNvu7lcTD5DjaN7+raswnw7A+jyA/ZjFq6b3Vqk="; meta = with lib; { description = "Simple tui to view & control docker containers"; diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index a4a9daa5d8f7..36b0257de968 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cH3Sosfmx0eOWWOjglcB3puiK0XKbO0wua45/YMZe+0="; }; - cargoHash = "sha256-Yfk5DGOo3GLHzqJYCFrlLB7soHFI+zBRR93daVOgrmk="; + useFetchCargoVendor = true; + cargoHash = "sha256-T03nFJChCTSfP+9+LnXMzngAqAaTATq9tTfpylR9QWY="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/pa/pace/package.nix b/pkgs/by-name/pa/pace/package.nix index 1a92a2b2eaf9..0c0ec89ac85d 100644 --- a/pkgs/by-name/pa/pace/package.nix +++ b/pkgs/by-name/pa/pace/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-gyyf4GGHIEdiAWvzKbaOApFikoh3RLWBCZUfJ0MjbIE="; }; - cargoHash = "sha256-D7jxju2R0S5wAsK7Gd8W32t/KKFaDjLHNZ2X/OEuPtk="; + useFetchCargoVendor = true; + cargoHash = "sha256-BuAVwILZCU6+/IBesyK4ZiefNmju49aFPyTcUUT1se8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pa/package-version-server/package.nix b/pkgs/by-name/pa/package-version-server/package.nix index 575cb7af1f20..b5d56ee08cdd 100644 --- a/pkgs/by-name/pa/package-version-server/package.nix +++ b/pkgs/by-name/pa/package-version-server/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/YyJ8+tKrNKVrN+F/oHgtExBBRatIIOvWr9mAyTHA3E="; }; - cargoHash = "sha256-aO6d7NcWZtLMH2/2jcsD8vpDO+C2exMwxrLVFH3bsP0="; + useFetchCargoVendor = true; + cargoHash = "sha256-/t1GPdb/zXe0pKeG/A4FKjKFFZ0zy2nT2PV8nxenKXc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix index f01731991eb2..5b1f603127af 100644 --- a/pkgs/by-name/pa/packetry/package.nix +++ b/pkgs/by-name/pa/packetry/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eDVom0kAL1QwO8BtrJS76VTvxtKs7CP6Ob5BWlE6wOM="; }; - cargoHash = "sha256-xz9PdVVB1u6s/anPBRonWS1kMN+4kfkK/gaOlF9Z3yk="; + useFetchCargoVendor = true; + cargoHash = "sha256-he+Y2vBCw5lmYe5x6myIxMKRIohBCLDQ/B1EV+4pKGs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pa/page/package.nix b/pkgs/by-name/pa/page/package.nix index a469b20a2a4b..4f7fa2f24d19 100644 --- a/pkgs/by-name/pa/page/package.nix +++ b/pkgs/by-name/pa/page/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uNdtgx9/9+KOfQvHiKNrT8NFWtR2tfJuI2bMwywBC/4="; }; - cargoHash = "sha256-ctYQMBAdSUfEek2vcCa3gnI9N6ZG9b+VvtAzT20jlXY="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZoLYnXU1y+7AcbxUlcY9MPGZuuxzG8d5Im2/uSlCoaw="; cargoPatches = [ # Cargo.lock is outdated. diff --git a/pkgs/by-name/pa/paging-calculator/package.nix b/pkgs/by-name/pa/paging-calculator/package.nix index 4fd53549deac..fc9ccd517c70 100644 --- a/pkgs/by-name/pa/paging-calculator/package.nix +++ b/pkgs/by-name/pa/paging-calculator/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mTHBARrcq8cJxzh80v/fGr5vACAMyy/DhN8zpQTV0jM="; }; - cargoHash = "sha256-oQQA+AGsuMKaFhoZRuv3BASCLJwfgbrdK+2noxBLm7k="; + useFetchCargoVendor = true; + cargoHash = "sha256-v4dlZYlmKhCBPp9Yll/5nuLtJd54EAh+jTw4BVuYRB0="; meta = { description = "CLI utility that helps calculating page table indices from a virtual address"; diff --git a/pkgs/by-name/pa/pam_rssh/package.nix b/pkgs/by-name/pa/pam_rssh/package.nix index a67ec6ddedf4..a3168a587419 100644 --- a/pkgs/by-name/pa/pam_rssh/package.nix +++ b/pkgs/by-name/pa/pam_rssh/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-QZ1Cs3TZab9wf8l4Fe95LFZhHB6q1uq7JRzEVUMKQSI="; + useFetchCargoVendor = true; + cargoHash = "sha256-4DoMRtyT2t4degi8oOyVTStb0AU0P/7XeYk15JLRrqg="; postPatch = '' substituteInPlace src/auth_keys.rs \ diff --git a/pkgs/by-name/pa/panamax/package.nix b/pkgs/by-name/pa/panamax/package.nix index 759a2d83d5ab..7834c46fc2e7 100644 --- a/pkgs/by-name/pa/panamax/package.nix +++ b/pkgs/by-name/pa/panamax/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g="; }; - cargoHash = "sha256-doEBlUVmXxbuPkDgliWr+LfG5KAMVEGpvLyQpoCzSTc="; + useFetchCargoVendor = true; + cargoHash = "sha256-QjzmB9nKL2TfDNi7lOVaFSEfKiDSuYWnrmqeesrhuyQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pa/pandoc-katex/package.nix b/pkgs/by-name/pa/pandoc-katex/package.nix index fe92876f1c42..f9c08c864eef 100644 --- a/pkgs/by-name/pa/pandoc-katex/package.nix +++ b/pkgs/by-name/pa/pandoc-katex/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2a3WJTNIMqWnTlHB+2U/6ifuoecbOlTP6e7YjD/UvPM="; }; - cargoHash = "sha256-Qf+QYOIBmSgax7p5K32SkaDT0MoKUY4TkxLbf/ZbM+U="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ve8s+LLjJiP/I+A/X23CnGiRsbfz5sxFr6kySAgYTyE="; meta = with lib; { description = "Pandoc filter to render math equations using KaTeX"; diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix index 0db8af43493c..c1a59f48b72d 100644 --- a/pkgs/by-name/pa/paper-age/package.nix +++ b/pkgs/by-name/pa/paper-age/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xoxrNNlpDFXuQwltZ52SkGe0z6+B4h1Jy4XRtvQDiAg="; }; - cargoHash = "sha256-FmtExP4M6MiKNlekNZZRGs6Y/AY+OQrHC7dmkxkyPQQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-FO69bmUhP6S3MRbVZllxmpn1GuM8fplciAka46Dz2Yg="; meta = with lib; { description = "Easy and secure paper backups of secrets"; diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix index 196efc10c641..65121006cb25 100644 --- a/pkgs/by-name/pa/parallel-disk-usage/package.nix +++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0SK7v5xKMPuukyYKaGk13PE3WygHginjnyoatkA5xFQ="; }; - cargoHash = "sha256-T/TjiqBZJINgiuTLWD+JBCUDEQBs2b/hvZn9E2uxkYc="; + useFetchCargoVendor = true; + cargoHash = "sha256-mmR5avrzqkOvitLrc3XP+1Z7TbLeSGifDP7c3MwghO4="; meta = with lib; { description = "Highly parallelized, blazing fast directory tree analyzer"; diff --git a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix index 1fc1d263a9e9..161ca4cd6107 100644 --- a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix +++ b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JYKFfbfpkvBRxYUDw2d6DD1mO27OKzdquSOhBk0lXr0="; }; - cargoHash = "sha256-E3x/Jy21qP1onABRmbrq51ZKrlqwiWIwSaqOCh28lKw="; + useFetchCargoVendor = true; + cargoHash = "sha256-NUoBaaoPDpt19Avxyl6G9mmbcinm24aAvq6Z9Orb9a8="; meta = with lib; { description = "Emacs centric fork of parinfer-rust"; diff --git a/pkgs/by-name/pa/paru/package.nix b/pkgs/by-name/pa/paru/package.nix index 03441cf1ac62..8f8780a8a548 100644 --- a/pkgs/by-name/pa/paru/package.nix +++ b/pkgs/by-name/pa/paru/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { ./cargo-lock.patch ]; - cargoHash = "sha256-z8hYZu/3RV99hOTpnv4ExgXymhzuITDcGjJhcHLWcH8="; + useFetchCargoVendor = true; + cargoHash = "sha256-3tKoL2I6DHrRodhWFOi3mSxk2P5SxCush/Hz9Dpyo3U="; nativeBuildInputs = [ gettext diff --git a/pkgs/by-name/pa/passepartui/package.nix b/pkgs/by-name/pa/passepartui/package.nix index 0beae15c4a6b..1eb4ad58d642 100644 --- a/pkgs/by-name/pa/passepartui/package.nix +++ b/pkgs/by-name/pa/passepartui/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/rYdOurPlpGKCMAXTAhoWRn4NU3usPpJmef3f8V8EQA="; }; - cargoHash = "sha256-8TmrsRbFC1TyoiUNVVTEdvDLj0BIJmqM00OoPLpaoFQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-XcPc1TAADShoLXPvwVXex9wBwq4kJ3/5EZ5spF451aQ="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pa/passerine/package.nix b/pkgs/by-name/pa/passerine/package.nix index 44aa5146ae73..f9b14596e41e 100644 --- a/pkgs/by-name/pa/passerine/package.nix +++ b/pkgs/by-name/pa/passerine/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TrbcULIJ9+DgQ4QsLYD5okxHoIusGJDw1PqJQwq1zu0="; }; - cargoHash = "sha256-A+sOT0rloAktDdVXe2HEPK25euh9T7c0rXybZmZpqC0="; + useFetchCargoVendor = true; + cargoHash = "sha256-PCSwhq4VXd/Hvvcfd2gZskXVD106Zw5PVCgMdlapWRs="; meta = with lib; { description = "Small extensible programming language designed for concise expression with little code"; diff --git a/pkgs/by-name/pa/patchy/package.nix b/pkgs/by-name/pa/patchy/package.nix index bdc1092408f5..bd5e0888335b 100644 --- a/pkgs/by-name/pa/patchy/package.nix +++ b/pkgs/by-name/pa/patchy/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { tag = "v${version}"; hash = "sha256-Npb+qcguxZAvWggJC5NtxCeUCU/nOtjCbK5gfkDTkfw="; }; - cargoHash = "sha256-vtKIDmfKSSZjorIGQ13OYrdmzabS5//j2/n7kJC9O7k="; + useFetchCargoVendor = true; + cargoHash = "sha256-+0hgG+PcxZQGgen969cnQcaGW47tDVGCCoiK/31YI0M="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/pa/patsh/package.nix b/pkgs/by-name/pa/patsh/package.nix index 7ab0e0e13e11..3e850dece1b7 100644 --- a/pkgs/by-name/pa/patsh/package.nix +++ b/pkgs/by-name/pa/patsh/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-d2Br4RAlKO7Bpse8sFbIDCIYd2fYvby0ar9oIbQS2jc="; }; - cargoHash = "sha256-hAWMm3YjwTB8ajn3QeXEOJYmPzbbitdwyO4k/IyhlOI="; + useFetchCargoVendor = true; + cargoHash = "sha256-wJDWJFutOvAVou4IpAunrHnUgYmodDliqrmPUai8pVo="; nativeCheckInputs = [ custom ]; diff --git a/pkgs/by-name/pa/pazi/package.nix b/pkgs/by-name/pa/pazi/package.nix index 375527a267df..f3534864c9e5 100644 --- a/pkgs/by-name/pa/pazi/package.nix +++ b/pkgs/by-name/pa/pazi/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-7ChHYcyzRPFkZ+zh9lBOHcOizDvJf2cp9ULoI7Ofmqk="; + useFetchCargoVendor = true; + cargoHash = "sha256-/r/nRQ/7KyUmJK19F557AcxXEXa85E/CE6+YFU6DdR4="; postInstall = '' installManPage packaging/man/pazi.1 diff --git a/pkgs/by-name/pb/pbpctrl/package.nix b/pkgs/by-name/pb/pbpctrl/package.nix index 7090d712f7cb..588744dcd489 100644 --- a/pkgs/by-name/pb/pbpctrl/package.nix +++ b/pkgs/by-name/pb/pbpctrl/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-u5I3Hs00JDPRBwThYTEmNiZj/zPVfHyyrt4E68d13do="; }; - cargoHash = "sha256-W59TRrFSm/IrStH9YitoG6nLs9pesDmL9+/DHnty3nw="; + useFetchCargoVendor = true; + cargoHash = "sha256-0kh9bwiTVWuDviDw6IY5EGj+2k2WsyCCeo+r7CdBftE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pe/peep/package.nix b/pkgs/by-name/pe/peep/package.nix index 4287847d56e3..d09c3c892c29 100644 --- a/pkgs/by-name/pe/peep/package.nix +++ b/pkgs/by-name/pe/peep/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6Y7ZI0kIPE7uMMOkXgm75JMEec090xZPBJFJr9DaswA="; }; - cargoHash = "sha256-CDWa03H8vWfhx2dwZU5rAV3fSwAGqCIPcvl+lTG4npE="; + useFetchCargoVendor = true; + cargoHash = "sha256-9VybBzW+saOjtQiyGu2pKHm94yCPw35Y56mhayCeW/c="; meta = with lib; { description = "CLI text viewer tool that works like less command on small pane within the terminal window"; diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix index 8856bd46bb9d..a06b35650757 100644 --- a/pkgs/by-name/pe/pest-ide-tools/package.nix +++ b/pkgs/by-name/pe/pest-ide-tools/package.nix @@ -10,7 +10,8 @@ rustPlatform.buildRustPackage rec { pname = "pest-ide-tools"; version = "0.3.11"; - cargoHash = "sha256-ZD8UQbkk5JhkanBkzo+c86DZE4aD44ma5cN97aKx97U="; + useFetchCargoVendor = true; + cargoHash = "sha256-wLdVIAwrnAk8IRp4RhO3XgfYtNw2S07uAHB1mokZ2lk="; src = fetchFromGitHub { owner = "pest-parser"; diff --git a/pkgs/by-name/pf/pfetch-rs/package.nix b/pkgs/by-name/pf/pfetch-rs/package.nix index ca6c07214773..1b50063a7770 100644 --- a/pkgs/by-name/pf/pfetch-rs/package.nix +++ b/pkgs/by-name/pf/pfetch-rs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Kgoo8piv4pNqzw9zQSEj7POSK6l+0KMvaNbvMp+bpF8="; }; - cargoHash = "sha256-24t2T+YkhDfGrYbT1VWYxA20//q6ElbvVCPY7VsLXRA="; + useFetchCargoVendor = true; + cargoHash = "sha256-36MjBzSzEOVaSnd6dTqYnV+Pi+5EDoUskkYsvYMGrgg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/by-name/pg/pgcat/package.nix b/pkgs/by-name/pg/pgcat/package.nix index 525380e46f24..159acd4ca1e7 100644 --- a/pkgs/by-name/pg/pgcat/package.nix +++ b/pkgs/by-name/pg/pgcat/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DHXUhAAOmPSt4aVp93I1y69of+MEboXJBZH50mzQTm8="; }; - cargoHash = "sha256-QqwUEbWKSUuxzYjWpVpQuKZDiNib1gM2eZJ4y7XIzXY="; + useFetchCargoVendor = true; + cargoHash = "sha256-6x/IPFncfOPxautW7gVUh5LG0hK4h6T4QL7B82Moi6o="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix index e03be9e7f442..7de85d35c7e7 100644 --- a/pkgs/by-name/ph/phraze/package.nix +++ b/pkgs/by-name/ph/phraze/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { doCheck = true; - cargoHash = "sha256-OFD3wSKQ3BCQfTCy5fjVxRJufvTVO97qLhKq6jwatfQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-vlxV9EfBkB42x5bBAaIOJbFDD2s27VhX9YD8IUHiZtI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pi/piano-rs/package.nix b/pkgs/by-name/pi/piano-rs/package.nix index 70feb3ba5cb0..2a8bc67d8f3e 100644 --- a/pkgs/by-name/pi/piano-rs/package.nix +++ b/pkgs/by-name/pi/piano-rs/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qZeH9xXQPIOJ87mvLahnJB3DuEgLX0EAXPvECgxNlq0="; }; - cargoHash = "sha256-vDqfWXeQVEnMWMjhAG/A0afff7dWMoQejDZjcVlYBMQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-ygRyYFLNBCLnRhmO6DoK8fwvy/Y9jrOjWChzxc3CRPo="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/pi/pict-rs/package.nix b/pkgs/by-name/pi/pict-rs/package.nix index 0a2a2e2dda10..b36051cd5e42 100644 --- a/pkgs/by-name/pi/pict-rs/package.nix +++ b/pkgs/by-name/pi/pict-rs/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-q0h+H3260CSpZemVuyaiwSHDi8yKXUX8Df9ih3IzAWo="; }; - cargoHash = "sha256-lMnJyiKhO7fGrjHkyZjheN0w7GgVs7Jnszw1KXo7vTg="; + useFetchCargoVendor = true; + cargoHash = "sha256-JJB5d9N2/tu2SYudNNguQGocQdyFAMvBea/Q3V7pYOw="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/by-name/pi/pid1/package.nix b/pkgs/by-name/pi/pid1/package.nix index c8ed12bf13fe..58880b79418b 100644 --- a/pkgs/by-name/pi/pid1/package.nix +++ b/pkgs/by-name/pi/pid1/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2dnQj3AQxedyq1YvHKt+lVXNEtuB5sMRSCqX9YeifzI="; }; - cargoHash = "sha256-/KK9U1dgCLglgn/MJ7+sov4EEnY/nluEsz0ooMp6ggI="; + useFetchCargoVendor = true; + cargoHash = "sha256-ldHtmbLoSFVxb0B3Oj21UOFNSXwu8xAPhpE8jBqOwr4="; meta = with lib; { description = "Signal handling and zombie reaping for PID1 process"; diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix index 4abc01cfdf72..6e2e45eac3b0 100644 --- a/pkgs/by-name/pi/pijul/package.nix +++ b/pkgs/by-name/pi/pijul/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jy0mzgLw9iWuoWe2ictMTL3cHnjJ5kzs6TAK+pdm28g="; }; - cargoHash = "sha256-iXGvb4qmZK7Sjbf/Jkyzj+nhpZFV3ngjtJfz6x/8z2s="; + useFetchCargoVendor = true; + cargoHash = "sha256-d2IlBtR3j6SF8AAagUQftCOqTqN70rDMlHkA9byxXyk="; doCheck = false; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index d9badfa3d18c..9997cb2909f6 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6nIJ2uayWTwcrGJd7nJQFZ84+QE3R6k/2y9mxdILCEU="; }; - cargoHash = "sha256-geOAhnAg1JefM06rG4nc5aUY7It7c7U5aELpFiFOW4w="; + useFetchCargoVendor = true; + cargoHash = "sha256-7dXT3vFifZMCnkNQQ1st0wCwkhSaDvs8IscEN4ugDjs="; passthru.tests.version = testers.testVersion { package = pik; }; diff --git a/pkgs/by-name/pi/pimsync/package.nix b/pkgs/by-name/pi/pimsync/package.nix index 16834e8a6c2b..2f5f3a6fc543 100644 --- a/pkgs/by-name/pi/pimsync/package.nix +++ b/pkgs/by-name/pi/pimsync/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-upOCrpbveSSFrhdHDkTOmja4MLmsgtuoDHMsgXyulWI="; }; - cargoHash = "sha256-QRgyHzIjdI8+OzvM+3sfuxTNMVCdGxrMvQpCnot9iUM="; + useFetchCargoVendor = true; + cargoHash = "sha256-i9t/6z1UJFppv3y7anB+df+UldGP2TynYKKIUAZff5Y="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pi/pipe-rename/package.nix b/pkgs/by-name/pi/pipe-rename/package.nix index 556b3947a60c..b6b0979d1c0b 100644 --- a/pkgs/by-name/pi/pipe-rename/package.nix +++ b/pkgs/by-name/pi/pipe-rename/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-av/ig76O7t3dB4Irfi3yqyL30nkJJCzs5EayWRbpOI0="; }; - cargoHash = "sha256-3p6Bf9UfCb5uc5rp/yuXixcDkuXfTiboLl8TI0O52hE="; + useFetchCargoVendor = true; + cargoHash = "sha256-0+m11mPR/s45MeY90WM3vmnGk6Xb0j2DJnZrEZ/EX1g="; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/by-name/pi/pipes-rs/package.nix b/pkgs/by-name/pi/pipes-rs/package.nix index dcdd1af1a809..9f1dee272b65 100644 --- a/pkgs/by-name/pi/pipes-rs/package.nix +++ b/pkgs/by-name/pi/pipes-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NrBmkA7sV1RhfG9KEqQNMR5s0l2u66b7KK0toDjQIps="; }; - cargoHash = "sha256-cOLPkmUwNdaexgauULraBVVx6mznI9GXhHV3mSEhL0g="; + useFetchCargoVendor = true; + cargoHash = "sha256-0up9S3+NjBV8zsvsyVANvITisMSBXsab6jFwt19gnQk="; doInstallCheck = true; diff --git a/pkgs/by-name/pi/pipr/package.nix b/pkgs/by-name/pi/pipr/package.nix index 4dfa47b0cf27..c32df6e13e6d 100644 --- a/pkgs/by-name/pi/pipr/package.nix +++ b/pkgs/by-name/pi/pipr/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6jtUNhib6iveuZ7qUKK7AllyMKFpZ8OUUaIieFqseY8="; }; - cargoHash = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI="; + useFetchCargoVendor = true; + cargoHash = "sha256-SRIv/dZcyKm2E7c5/LtMCDnh+SDqPhJ01GZtkj0RgA0="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix index ce217df96ebc..b0dd0001fc7c 100644 --- a/pkgs/by-name/pi/pixi-pack/package.nix +++ b/pkgs/by-name/pi/pixi-pack/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gzP/01pck14cMN0PopoCO27dxncWz4yIZFAzXU+4IQ0="; }; - cargoHash = "sha256-2kr4mFqG8IuRR3XiiGFlEX70c4NIcdF0NICwyrdjhcs="; + useFetchCargoVendor = true; + cargoHash = "sha256-dTpwlE/o7YzLWfJSEOgHfI64l9XNLt3gC1GE4IhL66o="; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/pi/pizarra/package.nix b/pkgs/by-name/pi/pizarra/package.nix index 241208d47967..5cb6f80b00a8 100644 --- a/pkgs/by-name/pi/pizarra/package.nix +++ b/pkgs/by-name/pi/pizarra/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw="; }; - cargoHash = "sha256-btvMUKADGHlXLmeKF1K9Js44SljZ0MejGId8aDwPhVU="; + useFetchCargoVendor = true; + cargoHash = "sha256-b1sMO5BF3js1WxUM80kowyb+6bpXiUKoTgg0QtKaXJY="; nativeBuildInputs = [ wrapGAppsHook3 diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix index 81c9aa0cdafe..a78392586b73 100644 --- a/pkgs/by-name/pi/pizauth/package.nix +++ b/pkgs/by-name/pi/pizauth/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-x3LdutVrQFrkXvbGPVzBV7Y8P9okKgv2rh2YdnDXvsc="; }; - cargoHash = "sha256-moRr8usrFHE8YPQnsmeKoDZPAk94qRm9cHzHBLXtGFM="; + useFetchCargoVendor = true; + cargoHash = "sha256-5xrPCGvWHceZYPycQdH1wwOH6tmJxHBshOE5866YiKg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix index afdc01723f22..3ddc577400bb 100644 --- a/pkgs/by-name/pk/pkarr/package.nix +++ b/pkgs/by-name/pk/pkarr/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zJe/hCdGVqs2TTwxnceGVXt0ZFRheSRYzjSRHytYXks="; }; - cargoHash = "sha256-qRHxXlUDIpjhd/XeObnmEnjYk3SoiC56LWJUiut0BwY="; + useFetchCargoVendor = true; + cargoHash = "sha256-y20vVO714WPcB2aYzo0LBuJhy224bsHA7O9Dj00ViWE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/pl/planus/package.nix b/pkgs/by-name/pl/planus/package.nix index b0bde1b7caac..97fabbdd7c2b 100644 --- a/pkgs/by-name/pl/planus/package.nix +++ b/pkgs/by-name/pl/planus/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HbnuLu1yCpwouDVBH/vcFVLDMZWeqHH6qHFJoTbaS9Y="; }; - cargoHash = "sha256-AJtQrImQlxnp1RbbOZHAJsvlhm39OlC5WyvD5jybMAY="; + useFetchCargoVendor = true; + cargoHash = "sha256-0xKx3VO4bquC3syBhCf4h3CRWSmhhRk2kCEJeC1ZTTc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/pl/please/package.nix b/pkgs/by-name/pl/please/package.nix index f3616493419e..7c998388080c 100644 --- a/pkgs/by-name/pl/please/package.nix +++ b/pkgs/by-name/pl/please/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bQ91uCDA2HKuiBmHZ9QP4V6tM6c7hRvECqXzfC6EEnI="; }; - cargoHash = "sha256-PheqGFkXd5lQLMfrmH+TS0jfHdGPym/pTSh5Y2ZIHqw="; + useFetchCargoVendor = true; + cargoHash = "sha256-iKRLq2G0XYZFM/k0V6GVtx/Pl4rdfGaD4EVN34FLlOg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pl/pls/package.nix b/pkgs/by-name/pl/pls/package.nix index b4a0b9a5f50f..85ff1558f446 100644 --- a/pkgs/by-name/pl/pls/package.nix +++ b/pkgs/by-name/pl/pls/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gJufm2krZSTdBbbfZ+355M9e3MJQbDEpSPf0EbZEayQ="; }; - cargoHash = "sha256-cDAHzK3pgpn5zEFdLBltf1e28yFFkXOzcF+nvDb8aWI="; + useFetchCargoVendor = true; + cargoHash = "sha256-q6tLSq9MkWOT+XUmtv123C9VwncJ7ljTnaGEZOZqLjk="; meta = { changelog = "https://github.com/pls-rs/pls/releases/tag/${src.rev}"; diff --git a/pkgs/by-name/pn/pngquant/package.nix b/pkgs/by-name/pn/pngquant/package.nix index 42c8ada5f087..2c70fa3032e4 100644 --- a/pkgs/by-name/pn/pngquant/package.nix +++ b/pkgs/by-name/pn/pngquant/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-mZpg6BRpsvEiMsS6ZJzVYg6wXHLb3Cf72sK1yzTF8y4="; + useFetchCargoVendor = true; + cargoHash = "sha256-W+/y79KkSVHqBybouUazGVfTQAuelXvn6EXtu+TW7j4="; cargoPatches = [ # https://github.com/kornelski/pngquant/issues/347 ./add-Cargo.lock.patch diff --git a/pkgs/by-name/pn/pnpm-shell-completion/package.nix b/pkgs/by-name/pn/pnpm-shell-completion/package.nix index 3ec44b2e175d..305abd2a1bfd 100644 --- a/pkgs/by-name/pn/pnpm-shell-completion/package.nix +++ b/pkgs/by-name/pn/pnpm-shell-completion/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bc2ZVHQF+lSAmhy/fvdiVfg9uzPPcXYrtiNChjkjHtA="; }; - cargoHash = "sha256-pGACCT96pTG4ZcJZtSWCup7Iejf6r3RvQ+4tMOwiShw="; + useFetchCargoVendor = true; + cargoHash = "sha256-JL9bWVHmdSktOEF70WMOmZKdZwO/gNDp0GPDMYteR1E="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/po/podlet/package.nix b/pkgs/by-name/po/podlet/package.nix index caa0147b5941..c23733bf3e76 100644 --- a/pkgs/by-name/po/podlet/package.nix +++ b/pkgs/by-name/po/podlet/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-STkYCaXBoQSmFKpMdsKzqFGXHh9s0jeGi5K2itj8jmc="; }; - cargoHash = "sha256-G+X9b4PAQ+1TkzGIs1g+qz7HYjwPJ/CvaHMiOAn3dV8="; + useFetchCargoVendor = true; + cargoHash = "sha256-FeYGNyBtMCiufeX9Eik3QXPxqOGEW/ZbvwFn50mTag8="; meta = { description = "Generate Podman Quadlet files from a Podman command, compose file, or existing object"; diff --git a/pkgs/by-name/po/pokeget-rs/package.nix b/pkgs/by-name/po/pokeget-rs/package.nix index 3f07917681f7..21d894a17250 100644 --- a/pkgs/by-name/po/pokeget-rs/package.nix +++ b/pkgs/by-name/po/pokeget-rs/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-VYF2uhgxUFH/VAy/ttQOULRFFiPRf0D+0WfGlQyYDGc="; + useFetchCargoVendor = true; + cargoHash = "sha256-nP5NPBnqEaGo1QvhdMHSPtDjJqOxF+TodvqmMgTfQ8M="; meta = with lib; { description = "Better rust version of pokeget"; diff --git a/pkgs/by-name/po/polylux2pdfpc/package.nix b/pkgs/by-name/po/polylux2pdfpc/package.nix index a080b2b123e6..0e95e56ca816 100644 --- a/pkgs/by-name/po/polylux2pdfpc/package.nix +++ b/pkgs/by-name/po/polylux2pdfpc/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "${src.name}/${dirname}"; - cargoHash = "sha256-vmCaQxPkzz1ZVmtX7L3VeQb3kWhVqyPoQ1NrTSiJN9Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-9nA18f+Dwps45M/OIY0jtx7QgyJDTVUsPndFdNBKHCQ="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/po/porsmo/package.nix b/pkgs/by-name/po/porsmo/package.nix index d67b7782867a..21dba217b326 100644 --- a/pkgs/by-name/po/porsmo/package.nix +++ b/pkgs/by-name/po/porsmo/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bYPUSrGJKoNLFkIiGuXraYoaYn/HKSP8IiH3gtyWfmw="; }; - cargoHash = "sha256-EVo8iewKs4D7H2GP/T5oFO6LlTSzuIUqEdpwgjCKtJ8="; + useFetchCargoVendor = true; + cargoHash = "sha256-zkeQY0YNcKfyaWHmv1N61dBggsvFzz1fgkjXkyYK3Lg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-lsp/package.nix index b2927a6600cf..538ba40addef 100644 --- a/pkgs/by-name/po/postgres-lsp/package.nix +++ b/pkgs/by-name/po/postgres-lsp/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-UEcHlkbYMA6xETMryWXsDHyAZYtLncRJn2jA6tvw7gQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-9T3bm/TSjnFeF8iE4338I44espnFq6l36yOq8YFPaPQ="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/po/pouf/package.nix b/pkgs/by-name/po/pouf/package.nix index 3aea1c0749a8..780120135f6f 100644 --- a/pkgs/by-name/po/pouf/package.nix +++ b/pkgs/by-name/po/pouf/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tW86b9a7u1jyfmHjwjs+5DaUujRZH+VhGQsj0CBj0yk="; }; - cargoHash = "sha256-rVJAaeg27SdM8cTx12rKLIGEYtXUhLHXUYpT78oVNlo="; + useFetchCargoVendor = true; + cargoHash = "sha256-cgRf8zpl2hOhaGew4dwzuwdy0+7wSvMtYN3llVi3uYw="; postInstall = "make PREFIX=$out copy-data"; diff --git a/pkgs/by-name/pq/pqrs/package.nix b/pkgs/by-name/pq/pqrs/package.nix index 7f26f0e1c96b..24f68672f396 100644 --- a/pkgs/by-name/pq/pqrs/package.nix +++ b/pkgs/by-name/pq/pqrs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0oSSoGZga0OGAKUNsLmKkUl8N1l0pVi4KIqrKJbeVVU="; }; - cargoHash = "sha256-w0WD+EtVGFMGpS4a2DJrLdbunwF2yiONKQwdcQG2EB0="; + useFetchCargoVendor = true; + cargoHash = "sha256-P3yTmECj0K0mjWUiWlQCwuQVbnbVR1xFV5cE8Uo3U90="; meta = with lib; { description = "CLI tool to inspect Parquet files"; diff --git a/pkgs/by-name/pr/pr-tracker/package.nix b/pkgs/by-name/pr/pr-tracker/package.nix index e146ca3ac199..0f96f9dfcdbb 100644 --- a/pkgs/by-name/pr/pr-tracker/package.nix +++ b/pkgs/by-name/pr/pr-tracker/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O+dtGxVhn3hW+vFQzEt7kQRTnZgc1R938BJ6pAkIW4E="; }; - cargoHash = "sha256-t+jiOr5pjJNMpaOLYKlk194b2njT1XWKKlPQtKsUu3E="; + useFetchCargoVendor = true; + cargoHash = "sha256-4RCgu6t8qbOfTpl3rX35f/fqyMWGBbsnw1TYhhLnxZ4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index 4778bfd3fe30..ba4049418334 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { libsixel ]; - cargoHash = "sha256-IC72l1xbH/AdCHdcgY8ODv6+YZUmT5NYVisP9oIMpGA="; + useFetchCargoVendor = true; + cargoHash = "sha256-akIgYZUOu5QcjLFPSUxaunvfrVseEGQGm9yyaCI2cPg="; # Crashes at runtime on darwin with: # Library not loaded: .../out/lib/libsixel.1.dylib diff --git a/pkgs/by-name/pr/preserves-tools/package.nix b/pkgs/by-name/pr/preserves-tools/package.nix index 9ea3dfb2de90..7ea5b3790610 100644 --- a/pkgs/by-name/pr/preserves-tools/package.nix +++ b/pkgs/by-name/pr/preserves-tools/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Uyh5mXCypX3TDxxJtnTe6lBoVI8aqdG56ywn7htDGUY="; }; - cargoHash = "sha256-rDo/jA4b+GV90SKM82JcGTX1pcAQUeBrLvGwU/geGOw="; + useFetchCargoVendor = true; + cargoHash = "sha256-m07/fNuF78+PtG/trXZq9gllmKTt0w5BSMsq2UTKBbY="; nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/pr/prettypst/package.nix b/pkgs/by-name/pr/prettypst/package.nix index dc48d89c9295..c71a5eac7f4b 100644 --- a/pkgs/by-name/pr/prettypst/package.nix +++ b/pkgs/by-name/pr/prettypst/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CVvcrytEG2q6kPiGBMfy/oQCD63Gm2AenvLUhCUx6fw="; }; - cargoHash = "sha256-zUeCthQ2fQ1P0gxN5XXg6a+Op8JFMrzU02Mh0mpwv30="; + useFetchCargoVendor = true; + cargoHash = "sha256-NxCc5DGbeHJ3M2V4h/u0lvzEkSbFU+rMcSnu+kJ0rXM="; meta = { changelog = "https://github.com/antonWetzel/prettypst/blob/${src.rev}/changelog.md"; diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix index 92ee8e57a77d..be2490502562 100644 --- a/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cVRa5idgAi6UoQkEFvhFd27Mp9AVkfzEuGnWrThm9+Q="; }; - cargoHash = "sha256-Z2oDuSqUpGM3iw3za77+W8mMb79GutM4s6LFeAgRgPA="; + useFetchCargoVendor = true; + cargoHash = "sha256-HTYpSm6Q/ZLQRxD1a9Xky3tFOadp8iJnPXAhwjcxfnM="; buildAndTestSubdir = pname; diff --git a/pkgs/by-name/pr/projectable/package.nix b/pkgs/by-name/pr/projectable/package.nix index efd4e42b36f3..ac77fa1afde1 100644 --- a/pkgs/by-name/pr/projectable/package.nix +++ b/pkgs/by-name/pr/projectable/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yN4OA3glRCzjk87tTadwlhytMoh6FM/ke37BsX4rStQ="; }; - cargoHash = "sha256-GGoL681Lv3sXnao2WfhLy4VMgtJFFttzn68lArQO1Uc="; + useFetchCargoVendor = true; + cargoHash = "sha256-3ZRdh2EeUBy5FqzBWYEsGO1oaw279b5oOmEqO9HZ+VE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 2a67ab55c137..a6da7fc4ca7f 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-K/mpwSzZuaNx3vbEJD0mYzFUylB6bUhYRhW81BcXin4="; }; - cargoHash = "sha256-Zq8PTXc9mEFbswTUUiBmguuzIZVRN41aBiW37Jr7WWM="; + useFetchCargoVendor = true; + cargoHash = "sha256-C8dfHszuD5OFbLDfA196a4NwMlLNaoXu4SE2pEu4pNQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix index 3679c10de1d0..dcce71734367 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9rIFDZbI6XGDsNzFMnMYY4loJxojdz6vnQKAz9eDAyQ="; }; - cargoHash = "sha256-uAygKDdm+0SEDFBQcaoYTRMRgnodiO/kL1sGbRmdJKE="; + useFetchCargoVendor = true; + cargoHash = "sha256-DjxoORk/DNXQ7ht7L4lxzMfst1i3m/cT7sqn2HoRN9U="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix index 098bec2f7890..28fb50388cb0 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RQlNVGa6BRIqIGodqNN3eGl//hkUWrq7GpTGpRBCDgE="; }; - cargoHash = "sha256-ZQOlDqDUd1nZi+2iFKCUq4Gnc9HGcLblIGY2cdQyGM0="; + useFetchCargoVendor = true; + cargoHash = "sha256-OWSXA3S3o5eqM3pg2MPxx3HrCma778YJaPFOJq7S5zY="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/protoc-gen-prost/package.nix b/pkgs/by-name/pr/protoc-gen-prost/package.nix index 8429f8ba27c1..e5ef28f2f25e 100644 --- a/pkgs/by-name/pr/protoc-gen-prost/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Bz5/LyKludw0Tz3r+xr4DMRdMSz/nRzjs7Q66z1PrTU="; }; - cargoHash = "sha256-X6yEJBgW9XzCNSxEQYj6LdPjbCPyh4SnKwdA/+sNNeg="; + useFetchCargoVendor = true; + cargoHash = "sha256-alzrgiOx9zTR9mgmtvcqpj9SxSz7Zz3mmZOX6vfAFeE="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix b/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix index 53fbba4b1313..066f97c2c820 100644 --- a/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix +++ b/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gt+Qa68N5EkqhCAvU2ISvVPT9vYPXMySad4DCyTVHkQ="; }; - cargoHash = "sha256-08xEPc1GaRIYLbIlSRpfBvSQcs16vduJ7v/NDg7Awfs="; + useFetchCargoVendor = true; + cargoHash = "sha256-7PTe7popLS0zYYKv+K4629GkNG1wR/fhGi14a/4pkS0="; meta = with lib; { description = "Protobuf plugin for generating Rust code for gRPC"; diff --git a/pkgs/by-name/pr/protoc-gen-rust/package.nix b/pkgs/by-name/pr/protoc-gen-rust/package.nix index d103460cee90..378754aee68c 100644 --- a/pkgs/by-name/pr/protoc-gen-rust/package.nix +++ b/pkgs/by-name/pr/protoc-gen-rust/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yGZ4auZHGtcsN6n4/FEzabsSXproyhNTJHIwujt7ijg="; }; - cargoHash = "sha256-RO3kVYkvHw8kwLaRfANtGtz88knjJ8HtmU3i0xgIDMY="; + useFetchCargoVendor = true; + cargoHash = "sha256-cj+/X3soc//lMOmBjfjQT+QhY/EWP92gChiDQ7b2fsM="; cargoBuildFlags = [ "--bin" diff --git a/pkgs/by-name/pr/protoc-gen-tonic/package.nix b/pkgs/by-name/pr/protoc-gen-tonic/package.nix index 0e3334885ef4..dd809bc8994f 100644 --- a/pkgs/by-name/pr/protoc-gen-tonic/package.nix +++ b/pkgs/by-name/pr/protoc-gen-tonic/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-H7YQ8y6YA8kjR9bhHfBOYu0OEFc8ezqXkqC6jGScs3s="; }; - cargoHash = "sha256-eYX3w/rSi/kuH6gyWCWT4on7pKedPKnl9pht1jXNwpg="; + useFetchCargoVendor = true; + cargoHash = "sha256-ihEHLFCC5jNpFIIvBUFCxKvpjY/OhOH5UgbvuQMFv3s="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/protols/package.nix b/pkgs/by-name/pr/protols/package.nix index b81ee3878352..7344735dfeb2 100644 --- a/pkgs/by-name/pr/protols/package.nix +++ b/pkgs/by-name/pr/protols/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MsQFGbUWymGYXLABWsDlSXAWBwxw0P9de/txrxdf/Lw="; }; - cargoHash = "sha256-BTCcAv7JlyDDG90rKwr2lmEHyxxLFEvZzUGS2DVxqmc="; + useFetchCargoVendor = true; + cargoHash = "sha256-eO35LukqPFooGFCluLhQacvqlVtreJH/XdnlBYwImbw="; meta = { description = "Protocol Buffers language server written in Rust"; diff --git a/pkgs/by-name/pr/protox/package.nix b/pkgs/by-name/pr/protox/package.nix index 5821c574c747..480ed5d4c0ff 100644 --- a/pkgs/by-name/pr/protox/package.nix +++ b/pkgs/by-name/pr/protox/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-U9+7k7dQ6YFfsKMfFMg34g42qLvn+mcSRlAAys3eXNo="; }; - cargoHash = "sha256-sNOw19gxj+cEctxhXNWI8u15VJYlN8nSNl6Ha9sB/eE="; + useFetchCargoVendor = true; + cargoHash = "sha256-Hfo7Yj2ttO5Yj1YfksjgN5RVUocSsS23I+p+0whpzX4="; buildFeatures = [ "bin" ]; diff --git a/pkgs/by-name/pr/proximity-sort/package.nix b/pkgs/by-name/pr/proximity-sort/package.nix index fff76ceda568..38c24ff597e3 100644 --- a/pkgs/by-name/pr/proximity-sort/package.nix +++ b/pkgs/by-name/pr/proximity-sort/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MRLQvspv6kjirljhAkk1KT+hPA4hdjA1b7RL9eEyglQ="; }; - cargoHash = "sha256-0hP6qa8d5CaqtBHCWBJ8UjtVJc6Z0GmL8DvdTWDMM8g="; + useFetchCargoVendor = true; + cargoHash = "sha256-rlxNvIYtVdWth5ZEdbmxOf3GKXIBpHnGDcSO883Ldjg="; meta = with lib; { description = "Simple command-line utility for sorting inputs by proximity to a path argument"; diff --git a/pkgs/by-name/pr/prqlc/package.nix b/pkgs/by-name/pr/prqlc/package.nix index c940bf1d4d5a..4505c402723f 100644 --- a/pkgs/by-name/pr/prqlc/package.nix +++ b/pkgs/by-name/pr/prqlc/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DuuWeXuqOKpC4NbaQ6xhYxzZLtxOMzqDl7eOd9zTIuY="; }; - cargoHash = "sha256-ZOlbKmSHAcgYMYbeyyljltf56WbP5dK7ezpmgSA3CyQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-o9uApvAXsLuwVCYf0iZGBDz5wi3pS5P6ZX33tgTz0TA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pr/prr/package.nix b/pkgs/by-name/pr/prr/package.nix index dc818bfc5afc..6b804b6c4779 100644 --- a/pkgs/by-name/pr/prr/package.nix +++ b/pkgs/by-name/pr/prr/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-siQZ3rDKv2lnn1bmisRsexWwfvmMhK+z4GZGPsrfPgc="; }; - cargoHash = "sha256-vCZjgmBYO+I6MZLCOMp50bWEeHwLbZsxSz5gRmBykvI="; + useFetchCargoVendor = true; + cargoHash = "sha256-VIJFr1HpXMC2DXt79Yb1DuLYSbo9g6zsXaNDTXjtlR4="; buildInputs = [ openssl ] diff --git a/pkgs/by-name/pr/prs/package.nix b/pkgs/by-name/pr/prs/package.nix index 38924b4faf58..ebbc6eb94cfd 100644 --- a/pkgs/by-name/pr/prs/package.nix +++ b/pkgs/by-name/pr/prs/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-W5wNmZWjSsM6Xe50fCpa/aGsJ8PDyh2INs1Oj86et04="; }; - cargoHash = "sha256-T57RqIzurpYLHyeFhvqxmC+DoB6zUf+iTu1YkMmwtp8="; + useFetchCargoVendor = true; + cargoHash = "sha256-IRWOY+FudPH2AEUTplwUWKK431x+CRkVF3VXxVWFKeI="; nativeBuildInputs = [ gpgme diff --git a/pkgs/by-name/ps/psw/package.nix b/pkgs/by-name/ps/psw/package.nix index 4a6d36aae7ce..8a1ddc79eb77 100644 --- a/pkgs/by-name/ps/psw/package.nix +++ b/pkgs/by-name/ps/psw/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Rf6vpVgenTzb42/aGqItuxUodl61eNyUPlry7rgLPbI="; }; - cargoHash = "sha256-+0eMhOteNK3QTnG0HB3/TYDFmPTztdQ0h3RKBTN0J/o="; + useFetchCargoVendor = true; + cargoHash = "sha256-dfHcyGQYkjEAhrNRlD5BTbMwaZaO/E0KwqZJ8TjelGw="; meta = with lib; { description = "Command line tool to write random bytes to stdout"; diff --git a/pkgs/by-name/pt/ptags/package.nix b/pkgs/by-name/pt/ptags/package.nix index be54ec6bda0c..00ed0da95640 100644 --- a/pkgs/by-name/pt/ptags/package.nix +++ b/pkgs/by-name/pt/ptags/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bxp38zWufqS6PZqhw8X5HR5zMRcwH58MuZaJmDRuiys="; }; - cargoHash = "sha256-Se4q4G3hzXIHHSY2YxeRHxU6+wnqR9bfrIQSOagFYZE="; + useFetchCargoVendor = true; + cargoHash = "sha256-zzbGyfuzJXB/Rf/cm4JTVfjx2rWz1iTnELokie6qBrw="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pu/pulldown-cmark/package.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix index f6cf4bc23c14..75b63ccfd216 100644 --- a/pkgs/by-name/pu/pulldown-cmark/package.nix +++ b/pkgs/by-name/pu/pulldown-cmark/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dsSt0JC3e1IItyY16tosxD83XUdttHVIT40QsW9iUFU="; }; - cargoHash = "sha256-siYwv14AzoQnub+Xcb3UCdEnCIOYremqNve5xyMhixc="; + useFetchCargoVendor = true; + cargoHash = "sha256-5AXEXuw3aKT8ghzEclwZYSOQvKcy90OvZbAVVkNJq1U="; meta = { description = "Pull parser for CommonMark written in Rust"; diff --git a/pkgs/by-name/pw/pw-volume/package.nix b/pkgs/by-name/pw/pw-volume/package.nix index 5ebb94322d39..8a835028e0a8 100644 --- a/pkgs/by-name/pw/pw-volume/package.nix +++ b/pkgs/by-name/pw/pw-volume/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-r/6AAZKZgPYUGic/Dag7OT5RtH+RKgEkJVWxsO5VGZ0="; }; - cargoHash = "sha256-srwbrMBUJz/Xi+Hk2GY9oo4rcTfKl/r146YWSSx6dew="; + useFetchCargoVendor = true; + cargoHash = "sha256-MQ21pM8aSA/OnxGPVSEVVM6yF0CeX1T0VYN27tqZru8="; meta = with lib; { description = "Basic interface to PipeWire volume controls"; diff --git a/pkgs/by-name/pw/pwalarmctl/package.nix b/pkgs/by-name/pw/pwalarmctl/package.nix index 8e30f53f98c6..4c6c03e3e6e6 100644 --- a/pkgs/by-name/pw/pwalarmctl/package.nix +++ b/pkgs/by-name/pw/pwalarmctl/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xoC1PtDQjkvoWb9x8A43ITo6xyYOv9hxH2pxiZBBvKI="; }; - cargoHash = "sha256-OvTGpekiy6j7un+jF4t9tauzi4RndIyPwJRHTOtt4GM="; + useFetchCargoVendor = true; + cargoHash = "sha256-wD6djP2FQgJNL9EryRrv6NrEex0bnqDJmfYw+S2x508="; preBuild = '' cargo check diff --git a/pkgs/by-name/pw/pwalarmd/package.nix b/pkgs/by-name/pw/pwalarmd/package.nix index 77c3043f73d8..07c6354d4a1a 100644 --- a/pkgs/by-name/pw/pwalarmd/package.nix +++ b/pkgs/by-name/pw/pwalarmd/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xoC1PtDQjkvoWb9x8A43ITo6xyYOv9hxH2pxiZBBvKI="; }; - cargoHash = "sha256-cRAFnmgvzWLFAjB7H1rU4FdxMwm0J6d76kdFPoXpPMw="; + useFetchCargoVendor = true; + cargoHash = "sha256-wD6djP2FQgJNL9EryRrv6NrEex0bnqDJmfYw+S2x508="; meta = { description = "Background CLI-based alarm system for *nix"; diff --git a/pkgs/by-name/py/python-launcher/package.nix b/pkgs/by-name/py/python-launcher/package.nix index ebdc31a1ebf7..fec6d426f4b7 100644 --- a/pkgs/by-name/py/python-launcher/package.nix +++ b/pkgs/by-name/py/python-launcher/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-wRKTBvLLo0Vvvh1GtF9hOnUHNpOeX950y1U+8JYBGoE="; }; - cargoHash = "sha256-+FtfL5jAGJrpnZaJDnDMvWC0D3Af0L466v9nqJkb+uA="; + useFetchCargoVendor = true; + cargoHash = "sha256-rWawf1YYeTWKPaZwua/f4BNo56z3mkCBU4jyZIFNqP4="; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/by-name/qm/qmk_hid/package.nix b/pkgs/by-name/qm/qmk_hid/package.nix index 248728345153..2b2e525cc93e 100644 --- a/pkgs/by-name/qm/qmk_hid/package.nix +++ b/pkgs/by-name/qm/qmk_hid/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wJi7FQrvMbdTwvbbjBnzmxupMbEuM8TeZ0JIK5ulQKI="; }; - cargoHash = "sha256-X8pBv4dFiiLDKDjyW3XpVOdzq5c5/4GcRL6jnJ8Rf1A="; + useFetchCargoVendor = true; + cargoHash = "sha256-ytg4pgPzl9dKyCWgRRVRg1noNRvBhBnWNf9bmNcHnjY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/qr/qrrs/package.nix b/pkgs/by-name/qr/qrrs/package.nix index 4b43473a3cf2..462cce869a48 100644 --- a/pkgs/by-name/qr/qrrs/package.nix +++ b/pkgs/by-name/qr/qrrs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-L8sqvLbh85b8Ds9EvXNkyGVXm8BF3ejFd8ZH7QoxJdU="; }; - cargoHash = "sha256-RLxQ7tG5e3q4vqYJU0eNvvcEnnyNc9R9at0/ACLYJiY="; + useFetchCargoVendor = true; + cargoHash = "sha256-/aRr5UeGKGt+H9+C9MWcpMriPeIVEwp7xnigrUvMUiw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/qr/qrscan/package.nix b/pkgs/by-name/qr/qrscan/package.nix index 4bcb3bb0eeaa..9a96f7f3e52c 100644 --- a/pkgs/by-name/qr/qrscan/package.nix +++ b/pkgs/by-name/qr/qrscan/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-P40IwFRtEQp6BGRgmt1x3UXtAKtWaMjR3kqhYq+p7wQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-hBDB/Cp8JTk9hF3qDBCb7LicUZdpXHm2i2dsuw5geO4="; checkFlags = [ # requires filesystem write access diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index e8e437468391..13829d105463 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vgAkhEbU/Wm2rUEMqRx4WGSgLI7nZ5+OrGUc91l6+7M="; }; - cargoHash = "sha256-VIZB+O1xvlPPTBAHwRZNCTlc3q7l3VXtNaG5zUCzKi4="; + useFetchCargoVendor = true; + cargoHash = "sha256-6UeQ1Gs/jA7rHNGnPE5V9rebbsfOR5GrSNOO2FLSra8="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix index 0e2b23d719dc..2620a8d0057d 100644 --- a/pkgs/by-name/r0/r0vm/package.nix +++ b/pkgs/by-name/r0/r0vm/package.nix @@ -36,7 +36,8 @@ rustPlatform.buildRustPackage rec { doCheck = false; - cargoHash = "sha256-WLd/cUiaIR04CIOaf9JwFmAY4fU9yH2QHDuT3Q54Gvg="; + useFetchCargoVendor = true; + cargoHash = "sha256-7vN3HRBCzvXT5Xoj+ciCiy+OQ0bC8s4C5360W+1Uld0="; postPatch = let diff --git a/pkgs/by-name/ra/ra-multiplex/package.nix b/pkgs/by-name/ra/ra-multiplex/package.nix index 0281268ad64a..65dfc7fe37a4 100644 --- a/pkgs/by-name/ra/ra-multiplex/package.nix +++ b/pkgs/by-name/ra/ra-multiplex/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aBrn9g+MGXLAsOmHqw1Tt6NPFGJTyYv/L9UI/vQU4i8="; }; - cargoHash = "sha256-Z5KK+tFkQjnZkU1wNT0Xk1ERjYcQT8MNGDBK53u36hE="; + useFetchCargoVendor = true; + cargoHash = "sha256-NVE/ROk6x1R0D5eyOzz1gYPvgG0lX5L2tCuZGIS9kzs="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index 3cc50a87bf12..ef91784614e2 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "${src.name}/radicle-httpd"; - cargoHash = "sha256-LmUZCu10RsuA8Lu3FjWcV8MzjX5FxBCV6+4zG0GEN2c="; + useFetchCargoVendor = true; + cargoHash = "sha256-YE72rhJXPcsonpOQLs/gZn5RE3DkSAGhWtYvg4jQ2D8="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 1100939c8e7a..236a1a5f57ba 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -26,7 +26,8 @@ rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}"; hash = "sha256-M4oz9tWjI/eqV4Gz1b512MEmvsZ5u3R9y6P9VeeH9CA="; }; - cargoHash = "sha256-QhTolHEzhdIkM5dn1o2CdbFy7JLCLHxd+IwcWl7MLQo="; + useFetchCargoVendor = true; + cargoHash = "sha256-SzwBQxTqQafHDtH8+OWkAMDnKh3AH0PeSMBWpHprQWM="; patches = [ ./61865b5b5ad715e2b812087947281f0add9aa05e.patch diff --git a/pkgs/by-name/ra/radio-cli/package.nix b/pkgs/by-name/ra/radio-cli/package.nix index ccc444553ec8..b1ac0abe6754 100644 --- a/pkgs/by-name/ra/radio-cli/package.nix +++ b/pkgs/by-name/ra/radio-cli/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XN0IzU7+V0zUUXfOygWrZXQX09IEpVo2Rhwfv+Lny/E="; }; - cargoHash = "sha256-XCzDNUZpyfu4gJr1lUx1/VbLkEv3OnJvYku0eEJbK5s="; + useFetchCargoVendor = true; + cargoHash = "sha256-RZRddbXpMA1iQs5/4OwffoBrAh0oc/yFueGmvZDxRMA="; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix index 50063adcd2a3..a746eba72a87 100644 --- a/pkgs/by-name/ra/raffi/package.nix +++ b/pkgs/by-name/ra/raffi/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-97gZZp2taX800Izhya4mYzS4PtCNCBbRnrn6cm1w8zY="; }; - cargoHash = "sha256-5QMRdyu6TUKLO8qvIJiABkvhUWHHOnGlKu5BGluM6PI="; + useFetchCargoVendor = true; + cargoHash = "sha256-1n0JQdeExszuGFbpkBRT44eMov/x3BrIeofObdPNNdU="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix index 35b74c1e6e64..d02eb0b2a5ed 100644 --- a/pkgs/by-name/ra/rage/package.nix +++ b/pkgs/by-name/ra/rage/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aZs1iqfpsiMuhxXNqRatpKD99eDBCsWHk4OPpnnaB70="; }; - cargoHash = "sha256-2cbW5GexETIjDzKjeYB7my3Q7Ev5fRrWh8eaBYZLmGM="; + useFetchCargoVendor = true; + cargoHash = "sha256-GdvqkB/jHAGUbzhOLPkIX664JJH3WrZZtv+/E/PhTR8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 22edd7647034..748133fca0ae 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AFcgONdWHHIK4/3zON6PRJaTXEXiE/0/Ha2rZpABiyw="; }; - cargoHash = "sha256-kyjEACPrHWeAbpzi/7Lq+8Fvw/ClBGN6Jn2hebert/g="; + useFetchCargoVendor = true; + cargoHash = "sha256-5+iUvAUqQZKm5uLYyVN+2Uoz/4htdgowDJZPY47AkOA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index b9a3177deeb1..c2a1e7c32ee6 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { hash = "sha256-gtiwkgNyqq+KMATkzaLOjPB6jcjVAM2qq6zwZ1WGkPE="; }; - cargoHash = "sha256-u0BmDtOIlYfHEAiDp+BnY1/ne3tKwmy/Cem6+5CX3GE="; + useFetchCargoVendor = true; + cargoHash = "sha256-7LhCNlbO9MTz2SxxQozdyvxG1uBum9oXaUjXXFS0USs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/ra/rana/package.nix b/pkgs/by-name/ra/rana/package.nix index b64214298fe1..95ad02e5a2bb 100644 --- a/pkgs/by-name/ra/rana/package.nix +++ b/pkgs/by-name/ra/rana/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gzyjOCGh45zEJvc0xFkp8gAH9Kxwfc2oPeMzbrTjnk8="; }; - cargoHash = "sha256-+3QbqAGQzGT4yuGPHmT2BJkcnNmwhLTpQERTl4Ri2bk="; + useFetchCargoVendor = true; + cargoHash = "sha256-YOit8z1GAUmPz56M5jXA2EdyN5Pbo7517W3PNXgQnDs="; meta = { description = "Nostr public key mining tool"; diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix index 2137d1a5f36a..a30a46e727c2 100644 --- a/pkgs/by-name/ra/rates/package.nix +++ b/pkgs/by-name/ra/rates/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zw2YLTrvqbGKR8Dg5W+kJTDKIfro+MNyjHXfZMXZhaw="; }; - cargoHash = "sha256-5EcTeMfa1GNp1q60qSgEi/I3298hXUD1Vc1K55XGW4I="; + useFetchCargoVendor = true; + cargoHash = "sha256-qfuCA1kAEbYIYI274lNrEKZNhltQP71CwtsjBr0REJs="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/ra/rathole/package.nix b/pkgs/by-name/ra/rathole/package.nix index 19754ba11cdb..e58c023ee090 100644 --- a/pkgs/by-name/ra/rathole/package.nix +++ b/pkgs/by-name/ra/rathole/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-C0/G4JOZ4pTAvcKZhRHsGvlLlwAyWBQ0rMScLvaLSuA="; }; - cargoHash = "sha256-zlwIgzqpoEgYqZe4Gv8owJQ3m7UFgPA5joRMiyq+T/M="; + useFetchCargoVendor = true; + cargoHash = "sha256-IgPDe8kuWzJ6nF2DceUbN7fw0eGkoYhu1IGMdlSMFos="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/ratman/package.nix b/pkgs/by-name/ra/ratman/package.nix index 9541f42714fd..a32edc2c195b 100644 --- a/pkgs/by-name/ra/ratman/package.nix +++ b/pkgs/by-name/ra/ratman/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ZZ7idZ67xvQFmQJqIFU/l77YU+yDQOqNthX5NR/l4k8="; }; - cargoHash = "sha256-Nsux0QblBtzlhLEgfKYvkQrOz8+oVd2pqT3CL8TnQEc="; + useFetchCargoVendor = true; + cargoHash = "sha256-YfELSorpW5qWKrkW+oHwMarTo5oZcBRp13wzmFnacg4="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix index 523b8e1de6a0..5abb1bd0b88b 100644 --- a/pkgs/by-name/ra/rav1e/package.nix +++ b/pkgs/by-name/ra/rav1e/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Db7qb7HBAy6lniIiN07iEzURmbfNtuhmgJRv7OUagUM="; }; - cargoHash = "sha256-VyQ6n2kIJ7OjK6Xlf0T0GNsBvgESRETzKZDZzAn8ZuY="; + useFetchCargoVendor = true; + cargoHash = "sha256-sJO40DN/Zfchg9J/7wTmO/RS88Zb6fIJ7nX4VNGe/eA="; nativeBuildInputs = [ cargo-c diff --git a/pkgs/by-name/ra/ravedude/package.nix b/pkgs/by-name/ra/ravedude/package.nix index 2ee907a4a4fb..ede59484a5fb 100644 --- a/pkgs/by-name/ra/ravedude/package.nix +++ b/pkgs/by-name/ra/ravedude/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AvnojcWQ4dQKk6B1Tjhkb4jfL6BJDsbeEo4tlgbOp84="; }; - cargoHash = "sha256-HeFmQsgr6uHrWi6s5sMQ6n63a44Msarb5p0+wUzKFkE="; + useFetchCargoVendor = true; + cargoHash = "sha256-tvHKRIKrKK9tCIhz/1DQkNaeTi+uBRKc8LAq7JucuPE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix index daeac80b396e..cfddacffc9dd 100644 --- a/pkgs/by-name/rc/rcodesign/package.nix +++ b/pkgs/by-name/rc/rcodesign/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NyO0HkldXh94Y16E+SX1VE/OOx0zgO6VYoRLJrEQUm0="; }; - cargoHash = "sha256-loWN0Pc46sr2/ZZCz2Uqf2AeGUP67EzGFQsPVLAKsfo="; + useFetchCargoVendor = true; + cargoHash = "sha256-KJsTOviCFZ/1eNJLM4+QmK8h6laxN1POl7YMJyu9/g8="; cargoBuildFlags = [ # Only build the binary we want diff --git a/pkgs/by-name/rc/rconc/package.nix b/pkgs/by-name/rc/rconc/package.nix index 59dfbd99fbc7..682374608cff 100644 --- a/pkgs/by-name/rc/rconc/package.nix +++ b/pkgs/by-name/rc/rconc/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6Bff9NnG1ZEQhntzH5Iq0XEbJBKdwcb0BOn8nCkeWTY="; }; - cargoHash = "sha256-rSN/wm52ZhJ8JUEUC51Xv5eIpwvOR3LvTdFjGl64VVk="; + useFetchCargoVendor = true; + cargoHash = "sha256-fkGSIPaq3SvbA9iP10sVb7gtBxo7XmHw+fz0Gt8AMXo="; meta = with lib; { description = "Simple cross-platform RCON client written in rust"; diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index e845f1350728..f6d630ae31af 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { ] ); - cargoHash = "sha256-loS55mQUVbIm+5VcQnPf6olERNTm3dbnQu5SPXe6a8I="; + useFetchCargoVendor = true; + cargoHash = "sha256-izJRaxJhLvk064JB3hlzN50V7ZWmv/X1pbL0lRCZV60="; RUSTFLAGS = "--cfg tokio_unstable"; diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix index b40e45af22a7..b32356df4cb7 100644 --- a/pkgs/by-name/re/realm/package.nix +++ b/pkgs/by-name/re/realm/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vkLGfSDRYqvoqyVM/CWGJjpvXXPisEZxUSjLZGjNzno="; }; - cargoHash = "sha256-SrTymeGERDO42/S3m5ErwtB15KslPzdmcn3KlrVNVIc="; + useFetchCargoVendor = true; + cargoHash = "sha256-Oe64l16uYdU6NvTl7XrEm6dAtRFngI9yHC4fe4hpTNA="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/re/reason-shell/package.nix b/pkgs/by-name/re/reason-shell/package.nix index a5bedae0d98b..9a3dc6692732 100644 --- a/pkgs/by-name/re/reason-shell/package.nix +++ b/pkgs/by-name/re/reason-shell/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oytRquZJgb1sfpZil1bSGwIIvm+5N4mkVmIMzWyzDco="; }; - cargoHash = "sha256-4AEuFSM2dY6UjjIFRU8ipkRMoEb2LjnOr3H6rZrLokE="; + useFetchCargoVendor = true; + cargoHash = "sha256-LXVP8cAbPCPCE3DNBX2znyFn/E/cN2civX0qT0B5FVw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index a921ac29033b..c13778255085 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lFvlrVFzMk6igH/h/3TZnkl8SooanVyIRYbSyleb2OU="; }; - cargoHash = "sha256-BorE3wcT8eCgIatHyNr3p9ewj7cX8yYer0vPEuBYPj4="; + useFetchCargoVendor = true; + cargoHash = "sha256-cqYPxDhIPA45A29Kl3XlF1gd9/EzlyqyFHH69lAju2A="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/re/refinery-cli/package.nix b/pkgs/by-name/re/refinery-cli/package.nix index 25a017a85bf1..cedd6767ce95 100644 --- a/pkgs/by-name/re/refinery-cli/package.nix +++ b/pkgs/by-name/re/refinery-cli/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { # https://github.com/NixOS/nixpkgs/issues/332957 cargoPatches = [ ./time-crate.patch ]; - cargoHash = "sha256-RGhcI0TiZWKkzXpiozGLIulQ6YpzWt6lRCPMTTLZDfE="; + useFetchCargoVendor = true; + cargoHash = "sha256-gcPVbKcPkV0H+BpErTokvLKFxpSXhxNoptxOeuhH1FU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/regenkfs/package.nix b/pkgs/by-name/re/regenkfs/package.nix index 4279b9cb5885..1729a13c26b7 100644 --- a/pkgs/by-name/re/regenkfs/package.nix +++ b/pkgs/by-name/re/regenkfs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-zkwOpMNPGstn/y1l1s8blUKpBebY4Ta9hiPYxVLvG6Y="; }; - cargoHash = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-H8ORNdIVwmtNfuxbyyf5F35tGLNUXwrTFE2CVgkxr0M="; buildFeatures = [ "c-undef" ]; diff --git a/pkgs/by-name/re/regex-cli/package.nix b/pkgs/by-name/re/regex-cli/package.nix index f9b15784b209..465581d19f76 100644 --- a/pkgs/by-name/re/regex-cli/package.nix +++ b/pkgs/by-name/re/regex-cli/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lHjChrjjqO7pApj7OA8BM2XvmU3iS+kEMPYSfb/C61U="; }; - cargoHash = "sha256-5uxy2iAIUh60QjEPtkOP7A86ha4CY5+1QgzdIsEKPIs="; + useFetchCargoVendor = true; + cargoHash = "sha256-9KLvVgmUun8tuAfxYMvAa5qpeXiOKe9JndZ81PmPpjA="; meta = with lib; { description = "Command line tool for debugging, ad hoc benchmarking and generating regular expressions"; diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index b115c57a6a75..7e54738dad51 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3Wa10eLlvOXw8DZAwQiCTGFOcUEsHvYhl6OTEYsCdZ8="; }; - cargoHash = "sha256-UI70YLTR/+fKh+4wD2hZJyuzN4ZNUCkrhyf9CRepetA="; + useFetchCargoVendor = true; + cargoHash = "sha256-e82lNKymXDDLvtfwLNVkM32uZ4Du4tzEkaINPAdmcOg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/remkrom/package.nix b/pkgs/by-name/re/remkrom/package.nix index a89fa590c20d..530f2937046f 100644 --- a/pkgs/by-name/re/remkrom/package.nix +++ b/pkgs/by-name/re/remkrom/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-DhfNfV9bd0p5dLXKgrVLyugQHK+RHsepeg0tGq5J6cI="; }; - cargoHash = "sha256-JUyIbg1SxQ7pdqypGv7Kz2MM0ZwL3M9YJekO9oSftLM="; + useFetchCargoVendor = true; + cargoHash = "sha256-H+SZ+aUQReFJiN2MQHxaI0/bM1sXaSFVlIhedCKBQ0M="; meta = with lib; { description = "Reimplementation of mkrom in Rust"; diff --git a/pkgs/by-name/re/ren-find/package.nix b/pkgs/by-name/re/ren-find/package.nix index 7f1fef94380b..47cae71b89a2 100644 --- a/pkgs/by-name/re/ren-find/package.nix +++ b/pkgs/by-name/re/ren-find/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zVIt6Xp+Mvym6gySvHIZJt1QgzKVP/wbTGTubWk6kzI="; }; - cargoHash = "sha256-pUy8850v4m9P5OuL15qxmDDQYYyae9HFXRbg3b4f3Lw="; + useFetchCargoVendor = true; + cargoHash = "sha256-lSeO/GaJPZ8zosOIJRXVIEuPXaBg1GBvKBIuXtu1xZg="; meta = with lib; { description = "Command-line utility that takes find-formatted lines and batch renames them"; diff --git a/pkgs/by-name/re/rep-grep/package.nix b/pkgs/by-name/re/rep-grep/package.nix index 332a3ec50528..a3503d4fc3cc 100644 --- a/pkgs/by-name/re/rep-grep/package.nix +++ b/pkgs/by-name/re/rep-grep/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/dH+mNtNHaYFndVhoqmz4Sc3HeemoQt1HGD98mb9Qhw="; }; - cargoHash = "sha256-ch+RMLc+xogL0gkrnw+n+bmUVIcixdPTaNPHPuJ0/EI="; + useFetchCargoVendor = true; + cargoHash = "sha256-t4tfQaFq4EV4ZWeU+IestSFiSAIeVQslTZhLbpKVoO4="; meta = with lib; { description = "Command-line utility that takes grep-formatted lines and performs a find-and-replace on them"; diff --git a/pkgs/by-name/re/repak/package.nix b/pkgs/by-name/re/repak/package.nix index ce51cfe574a2..cdce16444aa5 100644 --- a/pkgs/by-name/re/repak/package.nix +++ b/pkgs/by-name/re/repak/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nl05EsR52YFSR9Id3zFynhrBIvaqVwUOdjPlSp19Gcc="; }; - cargoHash = "sha256-4RA3Nv4Wes3etrnZSnHRjJ3ukA6stJXDj3ftaCxGwuY="; + useFetchCargoVendor = true; + cargoHash = "sha256-i0pBd0ZiMIEFGZgvBgVNCfqPHE6E3Rt5pAHHVj1epLs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/re/repgrep/package.nix b/pkgs/by-name/re/repgrep/package.nix index fdb2a6e02902..b4d44b79b16e 100644 --- a/pkgs/by-name/re/repgrep/package.nix +++ b/pkgs/by-name/re/repgrep/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6ba7EJUts0Ni9EA3ENlK+a2FaPo7JohtCyqwR9DdL1E="; }; - cargoHash = "sha256-XEjKTZ3qaiLWbm2wF+V97u9tGXDq/oTm249ubUE9n94="; + useFetchCargoVendor = true; + cargoHash = "sha256-K0HSVmVB7IGIqf+omM83fqJRKNOoMf4a1ZtsDmGR9us="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index fccc14ce3ce3..8f4c099e28e7 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -44,7 +44,8 @@ rustPlatform.buildRustPackage rec { --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"' ''; - cargoHash = "sha256-d68dNAAGY+a0DpL82S/qntu2XOsoVqHpfU2L9NcoJQc="; + useFetchCargoVendor = true; + cargoHash = "sha256-IHsHvr50rhS4CH+27613OVBFC2oI37xvhKLjZY36oo8="; cargoBuildFlags = [ "--package rerun-cli" ]; cargoTestFlags = [ "--package rerun-cli" ]; diff --git a/pkgs/by-name/re/rescrobbled/package.nix b/pkgs/by-name/re/rescrobbled/package.nix index d9d41f806ae2..4eda8adb4469 100644 --- a/pkgs/by-name/re/rescrobbled/package.nix +++ b/pkgs/by-name/re/rescrobbled/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1E+SeKjHCah+IFn2QLAyyv7jgEcZ1gtkh8iHgiVBuz4="; }; - cargoHash = "sha256-ZJbyYFvGTuXt1aqhGOATcDRrkTk7SorWXkN81sUoDdo="; + useFetchCargoVendor = true; + cargoHash = "sha256-oXj3pMT7lBcj/cNa6FY8ehr9TVSRUwqW3B4g5VeyH2w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/reshape/package.nix b/pkgs/by-name/re/reshape/package.nix index 1bc023ed1a51..6b44a65c5030 100644 --- a/pkgs/by-name/re/reshape/package.nix +++ b/pkgs/by-name/re/reshape/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wv2gKyXCEH+tnZkUUAisMbuseth3dsFiJujH8VO1ii4="; }; - cargoHash = "sha256-VTJ3FNhVLgxo/VVBhk1yF9UUktLXcbrEkYwoyoWFhXA="; + useFetchCargoVendor = true; + cargoHash = "sha256-lK54SEayI015f2AQ6h4zadgkECLp4jCeJO7enBG0LeM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/re/restic-integrity/package.nix b/pkgs/by-name/re/restic-integrity/package.nix index 0d4be3d8410c..172bdbb6e6e7 100644 --- a/pkgs/by-name/re/restic-integrity/package.nix +++ b/pkgs/by-name/re/restic-integrity/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Nii+rdz51+Acd+lZVpBispeFfVE8buxEGHvK2zMKbOM="; }; - cargoHash = "sha256-ua2YQdevf1MalqeNvAAgtlESwN5gA+N3FCQUiKd0wMM="; + useFetchCargoVendor = true; + cargoHash = "sha256-Hnr003TbG0y/Ry4yOAs6t6rhc5yEJkc+TDAuxGePb0Y="; meta = with lib; { description = "CLI tool to check the integrity of a restic repository without unlocking it"; diff --git a/pkgs/by-name/re/restls/package.nix b/pkgs/by-name/re/restls/package.nix index 80a430d7cada..ab12a55c7004 100644 --- a/pkgs/by-name/re/restls/package.nix +++ b/pkgs/by-name/re/restls/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nlQdBwxHVbpOmb9Wq+ap2i4KI1zJYT3SEqvedDbVH8Q="; }; - cargoHash = "sha256-KtNLLtStZ7SNndcPxWfNPA2duoXFVePrbNQFPUz2xFg="; + useFetchCargoVendor = true; + cargoHash = "sha256-hub64iZNVw/BJjibtDnJ3boIU27DEbYSlMLhFFVJ9ps="; meta = with lib; { homepage = "https://github.com/3andne/restls"; diff --git a/pkgs/by-name/re/resvg/package.nix b/pkgs/by-name/re/resvg/package.nix index 97b3817ef7c5..a73d32e0aa1c 100644 --- a/pkgs/by-name/re/resvg/package.nix +++ b/pkgs/by-name/re/resvg/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XjWkzTdsnQZfBjf61dgGt/a7973ZljJG1rnCk0iGk6Y="; }; - cargoHash = "sha256-HmMAYtL0qoUrtLRKrYx6VZsc0bVRS+DhIFweLbz9l+w="; + useFetchCargoVendor = true; + cargoHash = "sha256-NHXcBKSuyL0bIriEOr1nuTnz4vra1bIYcNOGmnN5HnQ="; cargoBuildFlags = [ "--package=resvg" diff --git a/pkgs/by-name/re/revpfw3/package.nix b/pkgs/by-name/re/revpfw3/package.nix index 25c90f818f00..a32b19c985e7 100644 --- a/pkgs/by-name/re/revpfw3/package.nix +++ b/pkgs/by-name/re/revpfw3/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7MnYTY/7PWu+VvxABtSLUnJ4FPzd9QCfrUBcSxcXUso="; }; - cargoHash = "sha256-D+9269WRCvpohyhrl6wkzalV7wPsJE38hSviTU2CNyg="; + useFetchCargoVendor = true; + cargoHash = "sha256-2tpaTVCJJ0c4SyBQU2FjGvCYbdNLXxwIXv8O0+Uibrs="; meta = { description = "Reverse proxy to bypass the need for port forwarding"; diff --git a/pkgs/by-name/re/rewatch/package.nix b/pkgs/by-name/re/rewatch/package.nix index e0ee1ebfc76b..89f5e42417c1 100644 --- a/pkgs/by-name/re/rewatch/package.nix +++ b/pkgs/by-name/re/rewatch/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-y+0tBwGa7Fjrnd3O7CwZjapgXJojfgXBZyqAW3cz1Zk="; }; - cargoHash = "sha256-cZTA50gm7o+vBaRNjpZI0LQkXaHIukVTBXoYMUubZgw="; + useFetchCargoVendor = true; + cargoHash = "sha256-pre5FKsMyHHCUuHO0LZrMhMlhXJ9U21EllVMUUg4aJU="; doCheck = true; diff --git a/pkgs/by-name/rh/rhack/package.nix b/pkgs/by-name/rh/rhack/package.nix index ce2b518dc904..d2a271f48c32 100644 --- a/pkgs/by-name/rh/rhack/package.nix +++ b/pkgs/by-name/rh/rhack/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "088ynf65szaa86pxwwasn3wwi00z5pn7i8w9gh5dyn983z4d8237"; }; - cargoHash = "sha256-HmBh2qbO/HuNPfHKifq41IB5ResnGka2iaAsnwppm9s="; + useFetchCargoVendor = true; + cargoHash = "sha256-84dVBNvo45zG7s/tMY3O0Zv69CdcvjZCZX8siie6QnI="; meta = with lib; { description = "Temporary edit external crates that your project depends on"; diff --git a/pkgs/by-name/rh/rhai-doc/package.nix b/pkgs/by-name/rh/rhai-doc/package.nix index 50d2580a21ce..aa8793f859ee 100644 --- a/pkgs/by-name/rh/rhai-doc/package.nix +++ b/pkgs/by-name/rh/rhai-doc/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GZq5C8Q95OHKftEkps4Y6X6sAc4pzSfSq3ELUW/kPWI="; }; - cargoHash = "sha256-dJMqaDQVSrvZPwjPFixgqRRzxPJW/f1nO+81kHwGmYU="; + useFetchCargoVendor = true; + cargoHash = "sha256-Lk/vbYxBcK676qusl6mWO38RAkCuiyHwZLcJpcHrdO4="; meta = with lib; { description = "Tool to auto-generate documentation for Rhai source code"; diff --git a/pkgs/by-name/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix index 9bec268b41e6..cc90a0b2e612 100644 --- a/pkgs/by-name/ri/riff/package.nix +++ b/pkgs/by-name/ri/riff/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ThHkEvu+lWojHmEgcrwdZDPROfxznB7vv78msyZf90A="; }; - cargoHash = "sha256-knA08KqjtI2FZUbllfVETxDqi/r4Gf3VuLE17JujTzc="; + useFetchCargoVendor = true; + cargoHash = "sha256-JghCYYDf2keV9UFU5m+qDIIb7+V0aPwVzR41J01pXcI="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix index 68791985d8a6..de377885a5ce 100644 --- a/pkgs/by-name/ri/riffdiff/package.nix +++ b/pkgs/by-name/ri/riffdiff/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KJ+2MdhBW0og6uj9eTUsoKcpenQj7tp3fZzgCNfdrqI="; }; - cargoHash = "sha256-RN//dB53Jy6fGJeUHHM7jdJrPhnbfjKiJ5TFFOtcbFI="; + useFetchCargoVendor = true; + cargoHash = "sha256-0D/jJsPjxDqD5xjqET+Y4iXAvNzOu1c3meaFkXVtSDw="; passthru = { tests.version = testers.testVersion { package = riffdiff; }; diff --git a/pkgs/by-name/ri/ringfairy/package.nix b/pkgs/by-name/ri/ringfairy/package.nix index 3610062207dc..ffb18c0c6fd1 100644 --- a/pkgs/by-name/ri/ringfairy/package.nix +++ b/pkgs/by-name/ri/ringfairy/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-1soTvSjoBSIQBUK21COSmw8EKYcMUBjNs+FNs3jzy/E="; }; - cargoHash = "sha256-cmW+y57AAK1NNBJ6xE2EvHsSoKddLWgdtnAmSjzAN0k="; + useFetchCargoVendor = true; + cargoHash = "sha256-yoZH1GeQWiv9xQGFb1GRKbPpOKxoXhbLMXtkoiG6zS8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix index 5ee001893664..575193953869 100644 --- a/pkgs/by-name/ri/rio/package.nix +++ b/pkgs/by-name/ri/rio/package.nix @@ -62,7 +62,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dH/r6Bumis8WOM/c/FAvFD2QYuMeHWOMQuU6zLWrlaM="; }; - cargoHash = "sha256-ERB8l5WCgk6oLLWcI99mfGrWIQvsHH4bhaaCS3VqQTs="; + useFetchCargoVendor = true; + cargoHash = "sha256-zE99cP6m6gWViAfiF9nlnSn2iLxBNoMyl5fWdmc1r7s="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix index ab354bbc64c5..eaef967b9c07 100644 --- a/pkgs/by-name/ri/rip2/package.nix +++ b/pkgs/by-name/ri/rip2/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OZsiAh0sQygLdVdA1QxCf7FTvP5CrlDNeOQLv2G2X3U="; }; - cargoHash = "sha256-9wbHXgjOWyQS8JOMQQTVetMacdjWD9C4NBWxUpcjbdg="; + useFetchCargoVendor = true; + cargoHash = "sha256-/wZ77PWUQgmDymdggUzdTHG2z5ej4fQryzhWshU7XuQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index 445f08998c75..aaa619b7ff65 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-j98X/+UTea4lCtFfMpClnfcKlvxm4DpOujLc0xc3VUY="; }; - cargoHash = "sha256-dP8H4OOgtQEBEJxpbaR3KnXFtgBdX4r+dCpBJjBK1MM="; + useFetchCargoVendor = true; + cargoHash = "sha256-4/87+SOUXLoOxd3a4Kptxa98mh/BWlEhK55uu7+Jrec="; patches = [ ./fix-tests.patch diff --git a/pkgs/by-name/ri/ripdrag/package.nix b/pkgs/by-name/ri/ripdrag/package.nix index ff254fbbc758..88634d3fb09a 100644 --- a/pkgs/by-name/ri/ripdrag/package.nix +++ b/pkgs/by-name/ri/ripdrag/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aK/1f56sHspohbYO0z2Hf1NDJsN8Dbf1NoL/QadbVSY="; }; - cargoHash = "sha256-9POXKvbt1Xr1wKYHhfLb14puKorLIlT1ckzEVd6eWa0="; + useFetchCargoVendor = true; + cargoHash = "sha256-w6gy149pbzRmN3XnRqMZuxAsKGXUglQpn/7g9L8+rZU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix index 43d4bbc66e85..9e71238f0095 100644 --- a/pkgs/by-name/ri/ripgrep/package.nix +++ b/pkgs/by-name/ri/ripgrep/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg="; }; - cargoHash = "sha256-b+iA8iTYWlczBpNq9eyHrWG8LMU4WPBzaU6pQRht+yE="; + useFetchCargoVendor = true; + cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional withPCRE2 pkg-config; buildInputs = lib.optional withPCRE2 pcre2; diff --git a/pkgs/by-name/ri/rippkgs/package.nix b/pkgs/by-name/ri/rippkgs/package.nix index 16025b2e159c..c06b60497acd 100644 --- a/pkgs/by-name/ri/rippkgs/package.nix +++ b/pkgs/by-name/ri/rippkgs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-k50q78ycjrFVFTDstTdOLF8aJjsUpQ3lFRbFD1nL8xM="; }; - cargoHash = "sha256-EQvIJXIQ6UrevNkhqMZddUde+6iNBcBTOaanimZNkaA="; + useFetchCargoVendor = true; + cargoHash = "sha256-RW7FBg5aLaNVFDEM4IvpS5gnb2luqWH2ya/7gKKOp4A="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ri/ripsecrets/package.nix b/pkgs/by-name/ri/ripsecrets/package.nix index c5450449ed2b..51a089d2ee6d 100644 --- a/pkgs/by-name/ri/ripsecrets/package.nix +++ b/pkgs/by-name/ri/ripsecrets/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MyFeSEZAG99g1Uh8KVA7CSZZVXUOF2qYJ0o1YviiPp4="; }; - cargoHash = "sha256-BKq1ttf8ctXvIbhKxHwCpjeiRKqSyN5+kP2k4CV511I="; + useFetchCargoVendor = true; + cargoHash = "sha256-e11kd+W8M8y5rC328Ycf2NB4wPdAQ++RcprrYaoM3t0="; meta = with lib; { description = "Command-line tool to prevent committing secret keys into your source code"; diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix index 5071f03953dd..4e174b4dda04 100644 --- a/pkgs/by-name/ri/ripunzip/package.nix +++ b/pkgs/by-name/ri/ripunzip/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O9R7SmhKQ6VB9TWbLsQmK/0tDWhJ1QWIPwW7VtibqAk="; }; - cargoHash = "sha256-1ZHAbJIWRQh876rshMYeuCz7UMlwdqrScO0eIkGjZao="; + useFetchCargoVendor = true; + cargoHash = "sha256-LceInjbsZR/DjZpA4mqGrfsIC+e4soehPTAQNdWFwrw="; buildInputs = [ openssl ] diff --git a/pkgs/by-name/ri/ristate/package.nix b/pkgs/by-name/ri/ristate/package.nix index cce06401a2ae..34015139accb 100644 --- a/pkgs/by-name/ri/ristate/package.nix +++ b/pkgs/by-name/ri/ristate/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CH9DZ/7Bhbe6qKg1Nbj1rA9SzIsqVlBJg51XxAh0XnY="; }; - cargoHash = "sha256-HTfRWvE3m7XZhZDj5bEkrQI3pD6GNiKd2gJtMjRQ8Rw="; + useFetchCargoVendor = true; + cargoHash = "sha256-kzy0U2ZdmEr/F1edQDM3S30ETXaVUXrSoUA+8v486O0="; meta = with lib; { description = "River-status client written in Rust"; diff --git a/pkgs/by-name/ri/river-bsp-layout/package.nix b/pkgs/by-name/ri/river-bsp-layout/package.nix index a5c64c60fe6a..3610c51667f2 100644 --- a/pkgs/by-name/ri/river-bsp-layout/package.nix +++ b/pkgs/by-name/ri/river-bsp-layout/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LRVZPAS4V5PtrqyOkKUfrZuwLqPZbLoyjn2DPxCFE2o="; }; - cargoHash = "sha256-CtVyRwfIS8R48LUecKXoak+HHB5yNZ5RgguIWOhyFA8="; + useFetchCargoVendor = true; + cargoHash = "sha256-tLMZQb05UPYVHH7b1+qtxalaLRMAWEDJ1Nkm9UqoApg="; meta = { homepage = "https://github.com/areif-dev/river-bsp-layout"; diff --git a/pkgs/by-name/ri/river-filtile/package.nix b/pkgs/by-name/ri/river-filtile/package.nix index 06f4b4007ca5..daffc075e6e8 100644 --- a/pkgs/by-name/ri/river-filtile/package.nix +++ b/pkgs/by-name/ri/river-filtile/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wBU4CX6KGnTvrBsXvFAlRrvDqvHHbAlVkDqTCJx90G8="; }; - cargoHash = "sha256-W5e19gzkZZjTTSZdww2x7M0LnR/gClQxMeAiDITO3HY="; + useFetchCargoVendor = true; + cargoHash = "sha256-dmRUcjlmnheCG5drEcJIZbo7haDiu7Qphs6T92V8v/o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ri/river-luatile/package.nix b/pkgs/by-name/ri/river-luatile/package.nix index d10b3c3bde50..41b382c58203 100644 --- a/pkgs/by-name/ri/river-luatile/package.nix +++ b/pkgs/by-name/ri/river-luatile/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8/qHoNFoGH1nSdTwBkaQk+yyvJtrXADTA39gUAMeSv8="; }; - cargoHash = "sha256-bXPxj8bNI8ZqYFl8XEHdNLqe0meYrlY2ovP3DKLGaqM="; + useFetchCargoVendor = true; + cargoHash = "sha256-KQO6JN+ed+gxTTBGoJYhVUrpHJkuXf1dHrUzcF5FNaY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rk/rkvm/package.nix b/pkgs/by-name/rk/rkvm/package.nix index 08c516c28af0..8a65b5771bcb 100644 --- a/pkgs/by-name/rk/rkvm/package.nix +++ b/pkgs/by-name/rk/rkvm/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pGCoNmGOeV7ND4kcRjlJZbEMnmKQhlCtyjMoWIwVZrM="; }; - cargoHash = "sha256-aq8Ky29jXY0cW5s0E4NDs29DY8RIA0Fvy2R72WPAYsk="; + useFetchCargoVendor = true; + cargoHash = "sha256-2vioqALLeLFFmdZPwdTXCWJJkpQMWdi7KQ7mxO0Sviw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rl/rlaunch/package.nix b/pkgs/by-name/rl/rlaunch/package.nix index 0d454daa41ed..b9330e9f042d 100644 --- a/pkgs/by-name/rl/rlaunch/package.nix +++ b/pkgs/by-name/rl/rlaunch/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PyCR/ob947W+6T56y1se74aNy1avJDb2ELyv2aGf1og="; }; - cargoHash = "sha256-/a1SjGDcauOy1vmXvmWBZmag8G+T2au+Z7b0y1Vj3C8="; + useFetchCargoVendor = true; + cargoHash = "sha256-5mj20MN0FUNa2xawocNhh2C1jX0yN2QNnKYvJi88b0M="; # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. postFixup = '' diff --git a/pkgs/by-name/rl/rlci/package.nix b/pkgs/by-name/rl/rlci/package.nix index 97d49889cb1b..ea2378ba6c68 100644 --- a/pkgs/by-name/rl/rlci/package.nix +++ b/pkgs/by-name/rl/rlci/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+Hd1Ymm2LKnHUKoUlfN6D6pwebxgwJQHgqwMHXXtP6Y="; }; - cargoHash = "sha256-7Q6WSEiVLzRsyHNECbPhWN9prrN0A/nSJDtZWi09zzg="; + useFetchCargoVendor = true; + cargoHash = "sha256-ckHwg7jEXZV0hjZFeR5dbqrt9APcyRV95LikwCFw/fM="; meta = with lib; { description = "Lambda calculus interpreter"; diff --git a/pkgs/by-name/rm/rm-improved/package.nix b/pkgs/by-name/rm/rm-improved/package.nix index b9f7f30138a2..ea353c78a134 100644 --- a/pkgs/by-name/rm/rm-improved/package.nix +++ b/pkgs/by-name/rm/rm-improved/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jbXmGPrb9PhmCSUFVcCqg8HjntS2mrYeNuaMsU+zIFI="; }; - cargoHash = "sha256-05ebuPa8N+hz5BnqAdOCL6dnBqVsB9VN4HxfwL99gK0="; + useFetchCargoVendor = true; + cargoHash = "sha256-jfrQkwJ6PcBs5W5F9x7Nt5xPP5f2G6MSb2AISu+g3gE="; cargoPatches = [ # Cargo.lock out-of-date diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix index 25876498160a..4be8297ac6ba 100644 --- a/pkgs/by-name/rm/rmpc/package.nix +++ b/pkgs/by-name/rm/rmpc/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IgkYUl1ccwzFgooqZGxmpJFzACEz3wmblostPsTnzSQ="; }; - cargoHash = "sha256-dNmHgPjZL+33kgA04+KQj42LrSXAFVQukml1Wy/HpHQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-s8aXDDERy4IxUrXVEFMGny5B5HGE8xsi6I+b/HCHc6w="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/rn/rnr/package.nix b/pkgs/by-name/rn/rnr/package.nix index cc9d7683f96b..42148d011fa8 100644 --- a/pkgs/by-name/rn/rnr/package.nix +++ b/pkgs/by-name/rn/rnr/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-g/PnvOZzlWzEHf3vvYANeJ2ogQ/6duNzhlKpKMBoBFU="; }; - cargoHash = "sha256-+oDRNBQ03MknhcTpZFKt0ipJY43LPOKbGF014rrs6dw="; + useFetchCargoVendor = true; + cargoHash = "sha256-jIgt6ZRo3mQrhiQVN8vsj0wB4cP1unnHpZGyFjTDT3k="; meta = with lib; { description = "Command-line tool to batch rename files and directories"; diff --git a/pkgs/by-name/ro/rofi-obsidian/package.nix b/pkgs/by-name/ro/rofi-obsidian/package.nix index ba5da2770749..fa3bc53eea5d 100644 --- a/pkgs/by-name/ro/rofi-obsidian/package.nix +++ b/pkgs/by-name/ro/rofi-obsidian/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage { hash = "sha256-EQ7OGW5FTgfuJ/xJzOhl1eb3XNORUfs0efP17A6yp7g="; }; - cargoHash = "sha256-hAiBSAvnMRchH49bku2oPhoCK3+bcWiZW4YbcMuAiqU="; + useFetchCargoVendor = true; + cargoHash = "sha256-+PJ8KpkdJmxJ0hhoecg9m5vqhgi73FmHfwZVBU4UF4w="; meta = { description = "Launch your Obsidian vaults from the comfort of rofi"; diff --git a/pkgs/by-name/ro/rogcat/package.nix b/pkgs/by-name/ro/rogcat/package.nix index f1f61fffe0a1..0380dc04a84d 100644 --- a/pkgs/by-name/ro/rogcat/package.nix +++ b/pkgs/by-name/ro/rogcat/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nXKvepuiBDIGo8Gga5tbbT/mnC6z+HipV5XYtlrURRU="; }; - cargoHash = "sha256-a+B9bMuKhmt3ka9p7a/O6JggiAxMzm9C5PdbFZD1KP0="; + useFetchCargoVendor = true; + cargoHash = "sha256-cl09j96UfLvga4cJBSd1he9nfW3taQMY2e+UPltNQMI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index 9f2cc09443f5..20181d00888f 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-J5297V6cHyWZYRyTTKM0V71QoHdHidtQCoAbQ2IoJrc="; + useFetchCargoVendor = true; + cargoHash = "sha256-AUtTk98izmFgMK7xpwaObzc+lFB9OjjgdCdXtwTS6JQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ro/rops/package.nix b/pkgs/by-name/ro/rops/package.nix index e8887a93d241..1e3e599ababf 100644 --- a/pkgs/by-name/ro/rops/package.nix +++ b/pkgs/by-name/ro/rops/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-532rV7ISNy8vbqq8yW9FdIqj5Ei/HJKZoEocM7Vwvg8="; }; - cargoHash = "sha256-7+SAaIw2B+Viu3lBN+yQq5VDEC9o4THQ1LRiQ8QmnaU="; + useFetchCargoVendor = true; + cargoHash = "sha256-HVYMC6NgkK5FPFetvxRUOHZ/Pn2uMYlF1VQJQXpNh9g="; # will true when tests is fixed from source. doCheck = false; diff --git a/pkgs/by-name/ro/rot8/package.nix b/pkgs/by-name/ro/rot8/package.nix index 01ee4f820847..e4066b0d85ca 100644 --- a/pkgs/by-name/ro/rot8/package.nix +++ b/pkgs/by-name/ro/rot8/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dHx3vFY0ztyTIlzUi22TYphPD5hvgfHrWaaeoGxnvW0="; }; - cargoHash = "sha256-KDg6Ggnm6Cl/1fXqNcc7/jRFJ6KTLVGveJ6Fs3NLlHE="; + useFetchCargoVendor = true; + cargoHash = "sha256-MZz8IZDux9VEDDLQjkT96smNsygY1vYG2QBw3Q09hqw="; meta = with lib; { description = "screen rotation daemon for X11 and wlroots"; diff --git a/pkgs/by-name/ro/rotonda/package.nix b/pkgs/by-name/ro/rotonda/package.nix index b5b6af2b74a6..a2112114b08d 100644 --- a/pkgs/by-name/ro/rotonda/package.nix +++ b/pkgs/by-name/ro/rotonda/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - cargoHash = "sha256-/9ge2FcCc1t2MP32juMa7yHyeOqhk9e5b5LEgjKryYc="; + useFetchCargoVendor = true; + cargoHash = "sha256-gzIoqUrlONKn0JEu/F8zEQrG8gLbFPofFWJTkOfpoAU="; meta = { description = "Rotonda - composable, programmable BGP Engine"; diff --git a/pkgs/by-name/ro/router/package.nix b/pkgs/by-name/ro/router/package.nix index 40eac67fdb64..53a408ce32ed 100644 --- a/pkgs/by-name/ro/router/package.nix +++ b/pkgs/by-name/ro/router/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4l9nTbtF8hy2x1fdRhmMKcYxTD6wWKXIfihLTWdtm7U="; }; - cargoHash = "sha256-zeMUw/OLPXM1uARrUeva90DLgpD5qFDhVKWgP/c3w7g="; + useFetchCargoVendor = true; + cargoHash = "sha256-1AKYOv7kT60H8x1qmtPqR4Wxq1DxSCDzt+Uv7MRUeaw="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix index 63b88774c790..9274c65d6402 100644 --- a/pkgs/by-name/ro/routinator/package.nix +++ b/pkgs/by-name/ro/routinator/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SUcAhXIPgYGFkUIgSrUJrxwWQvkkmWG/d12hv8+PQI0="; }; - cargoHash = "sha256-1JxAbQPCQqDVry3wGIdY4q18rzCXlJ7Dnc8LIvhkW1g="; + useFetchCargoVendor = true; + cargoHash = "sha256-Fmt6xlYEk9r1You12pF9Jlmb/eThS9ekPkQZBlMOIaw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/rp/rpg-cli/package.nix b/pkgs/by-name/rp/rpg-cli/package.nix index 7484ba694e2c..f684d99c2ea7 100644 --- a/pkgs/by-name/rp/rpg-cli/package.nix +++ b/pkgs/by-name/rp/rpg-cli/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xNkM8qN9vg/WGRR/96aCQRVjIbSdSs2845l6oE6+tzg="; }; - cargoHash = "sha256-AiNyyLEpVhNhDGq2vngna1ZJmPiI0rFT00gj7vXOW20="; + useFetchCargoVendor = true; + cargoHash = "sha256-GzVdcQzYmKwb3GWhmbTb9HdBPosKgbimgvwZTfBMEk8="; # tests assume the authors macbook, and thus fail doCheck = false; diff --git a/pkgs/by-name/rp/rpm-sequoia/package.nix b/pkgs/by-name/rp/rpm-sequoia/package.nix index 4718e8c6c876..17b863a4678f 100644 --- a/pkgs/by-name/rp/rpm-sequoia/package.nix +++ b/pkgs/by-name/rp/rpm-sequoia/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AZCsboUv4muKOw5El2Hw5O1cvAgD3JhBppacrQCJT2k="; }; - cargoHash = "sha256-0yO1+OAkXje/ir8i8URVhIcW8gwXleYx+XL1U4bjtXk="; + useFetchCargoVendor = true; + cargoHash = "sha256-X+5Ww+cnt08mleA6FzxVGprjIEQVInQPSvTWGjXuGI8="; patches = [ ./objdump.patch diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix index b128d2c7e30a..c6245e9c1d42 100644 --- a/pkgs/by-name/rq/rq/package.nix +++ b/pkgs/by-name/rq/rq/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI="; }; - cargoHash = "sha256-WAgWc9rAQBjrsaHP6s3Djpg3iYmfRVC9J9yq0T/zMqA="; + useFetchCargoVendor = true; + cargoHash = "sha256-BwbGiLoygNUua+AAKw/JAAG1kuWLdnP+8o+FFuvbFlM="; postPatch = '' # Remove #[deny(warnings)] which is equivalent to -Werror in C. diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index f57afe0a066f..d92462f7ef29 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -45,7 +45,8 @@ in rustPlatform.buildRustPackage { inherit pname version src; - cargoHash = "sha256-esDUzzVm5J8fKftBfk5StJzN1YzLa1p0t7BsoxzrowI="; + useFetchCargoVendor = true; + cargoHash = "sha256-pwtD7a/AXmVUKH0+IubFAel2PD4ghpeGtepp3P+zVkc="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix index a4cb82b779ef..b94c02c955e2 100644 --- a/pkgs/by-name/rs/rs-tftpd/package.nix +++ b/pkgs/by-name/rs/rs-tftpd/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qazPEzLMIlnqKTayurZgNJ8TLLdB4qNO88tKMoh6VVI="; }; - cargoHash = "sha256-4OVP3W5Packi5KcIqbDFpNQ2DXaAEPZTZ8pqABVLByQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-xnvruSfrd2RWgWjV+mqMciGY/L2ynJrYW/j+P6rphEs="; buildFeatures = [ "client" ]; diff --git a/pkgs/by-name/rs/rsass/package.nix b/pkgs/by-name/rs/rsass/package.nix index 2198ac273cf4..f9d4dff3dcd7 100644 --- a/pkgs/by-name/rs/rsass/package.nix +++ b/pkgs/by-name/rs/rsass/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/2U1+kCRpM36r2fHB6Hditnm2dSVHh08M0RIi3AIe44="; }; - cargoHash = "sha256-pCQOFBs+lNdjcyOqZ/GjJyOthepnaWAM1feEpegdrDo="; + useFetchCargoVendor = true; + cargoHash = "sha256-q9cHxGBL/GryUD2Uq0AuKNPmdQ0q7g6oXobpgWj4e0o="; meta = with lib; { description = "Sass reimplemented in rust with nom"; diff --git a/pkgs/by-name/rs/rsbkb/package.nix b/pkgs/by-name/rs/rsbkb/package.nix index 1e05dbd15721..da1ced5f3812 100644 --- a/pkgs/by-name/rs/rsbkb/package.nix +++ b/pkgs/by-name/rs/rsbkb/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { cargoPatches = [ ./time.patch ]; - cargoHash = "sha256-jRkwfIEB9DEzoV5xogTDz1cHfdsvLM6E27E7hQBa9JY="; + useFetchCargoVendor = true; + cargoHash = "sha256-fg8LQXqmw5GXiQe7ZVciORWI/yhKAhywolpapNpHXZY="; # Setup symlinks for all the utilities, # busybox style diff --git a/pkgs/by-name/rs/rsclock/package.nix b/pkgs/by-name/rs/rsclock/package.nix index ecc2f2f6ae58..974164d6b396 100644 --- a/pkgs/by-name/rs/rsclock/package.nix +++ b/pkgs/by-name/rs/rsclock/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-z+WGi1Jl+YkdAc4Nu818vi+OXg54GfAM6PbWYkgptpo="; }; - cargoHash = "sha256-/uAxIV7eroJNGsLl4T/6RskoTIWKu5Cgmv48eMkDZQw="; + useFetchCargoVendor = true; + cargoHash = "sha256-Dt3TCqQWwBcQ/6ZGhsMS7aA0jsvxRrdYkKSwynOlad8="; meta = with lib; { description = "Simple terminal clock written in Rust"; diff --git a/pkgs/by-name/rs/rshijack/package.nix b/pkgs/by-name/rs/rshijack/package.nix index ebb47ead1c54..c30004c1a7a8 100644 --- a/pkgs/by-name/rs/rshijack/package.nix +++ b/pkgs/by-name/rs/rshijack/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-vTbjb0tm6jCP9+QWG5R83v31W6RUgSEv96iR37QdnFo="; }; - cargoHash = "sha256-3rDPk+lPRrDrE2iqHAOi7zhyc+xYPXkM9P4Bu0JUL40="; + useFetchCargoVendor = true; + cargoHash = "sha256-wRy+bSi6XxbbvxqE5PFWs4xW1zfkvTHyyGgRZCOU7cY="; meta = with lib; { description = "TCP connection hijacker"; diff --git a/pkgs/by-name/rs/rsign2/package.nix b/pkgs/by-name/rs/rsign2/package.nix index b548c092495a..d0f650b0ba6c 100644 --- a/pkgs/by-name/rs/rsign2/package.nix +++ b/pkgs/by-name/rs/rsign2/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bJeM1HTzmC8QZ488PpqQ0qqdFg1/rjPWuTtqo1GXyHM="; }; - cargoHash = "sha256-xqNFJFNV9mIVxzyQvhv5QwHVcXLuH76VYFAsgp5hW+w="; + useFetchCargoVendor = true; + cargoHash = "sha256-dCZcxtaqcRHhAmgGigBjN0jDfh1VjoosqTDTkqwlXp0="; meta = with lib; { description = "Command-line tool to sign files and verify signatures"; diff --git a/pkgs/by-name/rs/rslint/package.nix b/pkgs/by-name/rs/rslint/package.nix index 667f3e491daa..b110827da04f 100644 --- a/pkgs/by-name/rs/rslint/package.nix +++ b/pkgs/by-name/rs/rslint/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-3DEwi+bhqwP8aMpZYl07GZbe7IecraB3m54lZ5LViVc="; }; - cargoHash = "sha256-bqF5v52uxbvmVmphXAmcWlCI6nbQzZemCxlTcqhRDTY="; + useFetchCargoVendor = true; + cargoHash = "sha256-4DzQSnrUUNaeyNLKvnx4HKM4dAS10y5mu5S2NpzfFRQ="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/rs/rsonpath/package.nix b/pkgs/by-name/rs/rsonpath/package.nix index b6ee6766430d..bd7f6b114d44 100644 --- a/pkgs/by-name/rs/rsonpath/package.nix +++ b/pkgs/by-name/rs/rsonpath/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { tagPrefix = "v"; }; - cargoHash = "sha256-nv2dQ7JV+fJIW+AkKLJ1yauKog0bS7F62cXsqp1CoRo="; + useFetchCargoVendor = true; + cargoHash = "sha256-9pSn0f0VWsBg1z1UYGRtMb1z23htRm7qLmO80zvSjN8="; cargoBuildFlags = [ "-p=rsonpath" ]; cargoTestFlags = cargoBuildFlags; diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix index 8138b111ef5a..80821909e904 100644 --- a/pkgs/by-name/rs/rsop/package.nix +++ b/pkgs/by-name/rs/rsop/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Jh2SrIyMduODr3e3War0jCwHH6UwfU8764txzrImCaA="; }; - cargoHash = "sha256-OUJXQr3pQGCao0Ra5o9eZF0Jhp818/u5Pm1KJIoJV5w="; + useFetchCargoVendor = true; + cargoHash = "sha256-upeYQ96CLBBqwguar3ytQ+l0nncqV8ulCwIMKgNIlBk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/rt/rtss/package.nix b/pkgs/by-name/rt/rtss/package.nix index 3e30aa0dd592..2ea7890b9648 100644 --- a/pkgs/by-name/rt/rtss/package.nix +++ b/pkgs/by-name/rt/rtss/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-WeeZsB42/4SlIaWwKvOqWiPNV5p0QOToynI8ozVVxJM="; }; - cargoHash = "sha256-aHK9KBzRbU2IYr7vOdlz0Aw4iYGjD6VedbWPE/V7AVc="; + useFetchCargoVendor = true; + cargoHash = "sha256-7+58CMm9nPg9tVXphUcIufFGONOxjAlSWBseq5fbM44="; meta = with lib; { description = "Annotate output with relative durations between lines"; diff --git a/pkgs/by-name/ru/rucola/package.nix b/pkgs/by-name/ru/rucola/package.nix index a2cabcfa7170..502eebfdc485 100644 --- a/pkgs/by-name/ru/rucola/package.nix +++ b/pkgs/by-name/ru/rucola/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FeQPf9sCEqypvB8VrGa1nnXmxlqo6K4fpLkJakbysvI="; }; - cargoHash = "sha256-5TvJ8h/kmXG9G7dl5/gIYhVgvmqmm24BmOJzdKVJ+uY="; + useFetchCargoVendor = true; + cargoHash = "sha256-Cciop3vwRbK3JCUx+SBdIv5Ix/15p6/SmHR8ZVb6LSM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ru/rune-languageserver/package.nix b/pkgs/by-name/ru/rune-languageserver/package.nix index 12582104d922..35316fdc68a6 100644 --- a/pkgs/by-name/ru/rune-languageserver/package.nix +++ b/pkgs/by-name/ru/rune-languageserver/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Kw6Qh/9eQPMj4V689+7AxuJB+aCciK3FZTfcdhyZXGY="; }; - cargoHash = "sha256-GlzT7lN9iCNiPFIjhL/UfqohgtOwDaIeTVEWOyaeicM="; + useFetchCargoVendor = true; + cargoHash = "sha256-YviRACndc4r4ul72ZF3I/R/nEsIoML2Ek2xqUUE3FDQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix index dc0ca743448b..8f962d69c6f5 100644 --- a/pkgs/by-name/ru/rune/package.nix +++ b/pkgs/by-name/ru/rune/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+2eXTkn9yOMhvS8cFwAorLBNIPvIRwsPOsGCl3gtRSE="; }; - cargoHash = "sha256-yMqxd7PlpEEVS0jJwProaVjKUsU5TuebGTMrWiMFsM8="; + useFetchCargoVendor = true; + cargoHash = "sha256-SgfgoMqr2Cc7+qhf9Ejl4Ect1JR9RqI9I0b+PrdvdOs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/ru/russ/package.nix b/pkgs/by-name/ru/russ/package.nix index 98d460b6d43f..a90b0628dcac 100644 --- a/pkgs/by-name/ru/russ/package.nix +++ b/pkgs/by-name/ru/russ/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-/76CvSBYim831OZzLhsj2Hm+0hoY/FLtKQqt19E5YOI="; }; - cargoHash = "sha256-d3lJQafvBuj9Sb2Tuep3Ypt1sP+vlWHk4kuP99gMly8="; + useFetchCargoVendor = true; + cargoHash = "sha256-G2s/IggPXfi7FXOoM5s9I9PEphYHjEdg9W1LCAxIk1M="; # tests are network based :( doCheck = false; diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index 53aa4fb327f2..e6b0f063fc6e 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; version = "2025-01-08"; - cargoHash = "sha256-5PRfmjDamboKf77oeCOG1EPlsDvqjQzRZavFyN3gLK8="; + useFetchCargoVendor = true; + cargoHash = "sha256-7sLTQ+fwez8EmYgjXxDYDgslynHTQ65DdfMVdIVLhTU="; src = fetchFromGitHub { owner = "rust-lang"; diff --git a/pkgs/by-name/ru/rust-audit-info/package.nix b/pkgs/by-name/ru/rust-audit-info/package.nix index fb0d0b8bb8f3..cc1c04934494 100644 --- a/pkgs/by-name/ru/rust-audit-info/package.nix +++ b/pkgs/by-name/ru/rust-audit-info/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g7ElNehBAVSRRlqsxkNm20C0KOMkf310bXNs3EN+/NQ="; }; - cargoHash = "sha256-bKrdgz6dyv/PF5JXMq7uvsh7SsK/qEd2W7tm6+YYlxg="; + useFetchCargoVendor = true; + cargoHash = "sha256-TvbFhFtdQ6fBNjIMgzQDVnK+IZThUJmht7r2zSmcllE="; meta = with lib; { description = "Command-line tool to extract the dependency trees embedded in binaries by cargo-auditable"; diff --git a/pkgs/by-name/ru/rust-code-analysis/package.nix b/pkgs/by-name/ru/rust-code-analysis/package.nix index ecb56299faa9..448ba343969f 100644 --- a/pkgs/by-name/ru/rust-code-analysis/package.nix +++ b/pkgs/by-name/ru/rust-code-analysis/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/Irmtsy1PdRWQ7dTAHLZJ9M0J7oi2IiJyW6HeTIDOCs="; }; - cargoHash = "sha256-axrtFZQOm1/UUBq1CDFkaZCks1mWoLWmfajDfsqSBmY="; + useFetchCargoVendor = true; + cargoHash = "sha256-HirLjKkfZfc9UmUcUF5WW7xAJuCu7ftJDH8+zTSYlxs="; meta = with lib; { description = "Analyze and collect metrics on source code"; diff --git a/pkgs/by-name/ru/rust-parallel/package.nix b/pkgs/by-name/ru/rust-parallel/package.nix index d4a12aa15d31..76ca93565f68 100644 --- a/pkgs/by-name/ru/rust-parallel/package.nix +++ b/pkgs/by-name/ru/rust-parallel/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4f/JE8KWYDdLwx+bCSSbz0Cpfy/g3WIaRzqCvUix4t0="; }; - cargoHash = "sha256-bhwA2Acl10Rz5uRxJT+RagDZloeztM2eWJmkHV6Ib6c="; + useFetchCargoVendor = true; + cargoHash = "sha256-wJtXYx2mncOnnUep4CMFt+1mK1vMyhYFCQM/2B9m6zY="; postPatch = '' substituteInPlace tests/dummy_shell.sh \ diff --git a/pkgs/by-name/ru/rust-petname/package.nix b/pkgs/by-name/ru/rust-petname/package.nix index 8f9a1a4463d8..e0cb6fbd7cff 100644 --- a/pkgs/by-name/ru/rust-petname/package.nix +++ b/pkgs/by-name/ru/rust-petname/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KP+GdGlwLHcKE8nAmFr2wHbt5RD9Ptpiz1X5HgJ6BgU="; }; - cargoHash = "sha256-R1Xahr9R4G8Tr2cGRJ2oydVaLohPz2VM6tnbtE8Hysk="; + useFetchCargoVendor = true; + cargoHash = "sha256-gZxZeirvGHwm8C87HdCBYr30+0bbjwnWxIQzcLgl3iQ="; meta = with lib; { description = "Generate human readable random names"; diff --git a/pkgs/by-name/ru/rust-script/package.nix b/pkgs/by-name/ru/rust-script/package.nix index 8e85fe059045..9346088b749a 100644 --- a/pkgs/by-name/ru/rust-script/package.nix +++ b/pkgs/by-name/ru/rust-script/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-uKmQgrbsFIY0XwrO16Urz3L76Gm2SxHW/CpHeCIUinM="; }; - cargoHash = "sha256-WekXZ1bn2bGZu80SsEHtTY8wLwBhJsnJLu/r5GPdGzM="; + useFetchCargoVendor = true; + cargoHash = "sha256-eSj04d/ktabUm58C7PAtiPqdiVP9NB3uSFxILZxe6jA="; # tests require network access doCheck = false; diff --git a/pkgs/by-name/ru/rust-traverse/package.nix b/pkgs/by-name/ru/rust-traverse/package.nix index 643324a8feb3..a5d80ba81433 100644 --- a/pkgs/by-name/ru/rust-traverse/package.nix +++ b/pkgs/by-name/ru/rust-traverse/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OcCWmBNDo4AA5Pk5TQqb8hen9LlHaY09Wrm4BkrU7qA="; }; - cargoHash = "sha256-aZ0KewzeC6o+wW2EejodHnOPbuTLjRufEYGWDyoqkq0="; + useFetchCargoVendor = true; + cargoHash = "sha256-UGPXV55+0w6QFYxfmmimSX/dleCdtEahveNi8DgSVzQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ru/rustcat/package.nix b/pkgs/by-name/ru/rustcat/package.nix index 17cfb42fde5b..47c78d76b292 100644 --- a/pkgs/by-name/ru/rustcat/package.nix +++ b/pkgs/by-name/ru/rustcat/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/6vNFh7n6WvYerrL8m9sgUKsO2KKj7/f8xc4rzHy9Io="; }; - cargoHash = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg="; + useFetchCargoVendor = true; + cargoHash = "sha256-76/JK9IKYD6mxMddUyTgKAw53GM4EUhC0NbKFKdg8CI="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/ru/rustfinity/package.nix b/pkgs/by-name/ru/rustfinity/package.nix index c3db2c136a21..29fa3d875217 100644 --- a/pkgs/by-name/ru/rustfinity/package.nix +++ b/pkgs/by-name/ru/rustfinity/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yBWhY4Uta/K/Ka5DzhpZUiv0Y3Yfn4dI4ZARpJqTqY8="; }; - cargoHash = "sha256-jeV4R9UwKF5ZW2AZl/WZE2KTMGCzX4/dpP8uUIUD3CI="; + useFetchCargoVendor = true; + cargoHash = "sha256-ifVhVFiTO1CVpWo6B9OZXJwuc40IRkSc4ncMXG+5DnE="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix index 2d31a44fedf9..96cbda420d44 100644 --- a/pkgs/by-name/ru/rusti-cal/package.nix +++ b/pkgs/by-name/ru/rusti-cal/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pdsP2nuJh30BzqIyxSQXak/rceA4hI9jBYy1dDVEIvI="; }; - cargoHash = "sha256-5eS+OMaNAVNyDMKFNfb0J0rLsikw2LCXhWk7MS9UV2k="; + useFetchCargoVendor = true; + cargoHash = "sha256-9nd8xm3jAFouRYKSFpx3vQQaI/2wQzTaaehXjqljIfw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index cc9a6a6f412b..1b2b632438ab 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HYPzgynCeWDRRNyACHqnzkjn6uZWS0TDHuJE9STJxbQ="; }; - cargoHash = "sha256-0EiegC1eP77sUaruB9wnSViWSKHJcJiMjeEf8r4TqwU="; + useFetchCargoVendor = true; + cargoHash = "sha256-+BlLVnvI2qBfwEtyxmZFNhR9MEzs0/a1Ce6ALOKtoPU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix index 80eecb46dbcd..48a56690b2d1 100644 --- a/pkgs/by-name/ru/rustlings/package.nix +++ b/pkgs/by-name/ru/rustlings/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage { hash = "sha256-VdIIcpyoCuid3MECVc9aKeIOUlxGlxcG7znqbqo9pjc="; }; - cargoHash = "sha256-AU6OUGSWuxKmdoQLk+UiFzA7NRviDAgXrBDMdkjxOpA="; + useFetchCargoVendor = true; + cargoHash = "sha256-QWmK+chAUnMGjqLq2xN5y6NJZJBMDTszImB9bXhO4+w="; # Disabled test that does not work well in an isolated environment checkFlags = [ diff --git a/pkgs/by-name/ru/rustls-libssl/package.nix b/pkgs/by-name/ru/rustls-libssl/package.nix index 8f5745edd13b..79e05f6ac3b3 100644 --- a/pkgs/by-name/ru/rustls-libssl/package.nix +++ b/pkgs/by-name/ru/rustls-libssl/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage { # NOTE: No longer necessary in the next release. sourceRoot = "source/rustls-libssl"; - cargoHash = "sha256-Yyrs2eN4QTGGD7A+VM1YkdsIRUh3laZac3rsJThjTXM="; + useFetchCargoVendor = true; + cargoHash = "sha256-eVdcYJnJVduRk3zK9VQ1rE6AwjaXAG1h1g/fVHr4mqQ="; nativeBuildInputs = [ pkg-config # for openssl-sys diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix index 8790b4f8a499..a87e24b16802 100644 --- a/pkgs/by-name/ru/rustmission/package.nix +++ b/pkgs/by-name/ru/rustmission/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vQ6MBbzmOBgD1kcF62NmQys737QEN9isvFN7L7mP8mk="; }; - cargoHash = "sha256-yelDzx/5SxZ+DT9Rvx3tuSp/yDLfVOYmexa9ZqeUT88="; + useFetchCargoVendor = true; + cargoHash = "sha256-GwSf/o90RO6LURIcm/kYA8oXmnCJ1OkM+eHkyZduOt0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ru/rustus/package.nix b/pkgs/by-name/ru/rustus/package.nix index 7ecbdb9f8e07..131adc26f6fa 100644 --- a/pkgs/by-name/ru/rustus/package.nix +++ b/pkgs/by-name/ru/rustus/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage { hash = "sha256-S3hq6G78HRQVLJuuwfC6U7NQXMSdllrC/ZolVPZRTsA="; }; - cargoHash = "sha256-yFYDSgfNbm4a9oMG/ZeENhYTfpMxKH7TmPImFlBWwJ8="; + useFetchCargoVendor = true; + cargoHash = "sha256-PxXv9El81z6r1KJAMaF+pzB74tY3e2dxXzPPKakSeZ0="; env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ru/rusty-diceware/package.nix b/pkgs/by-name/ru/rusty-diceware/package.nix index 996f5fbc7bef..b57e33208c44 100644 --- a/pkgs/by-name/ru/rusty-diceware/package.nix +++ b/pkgs/by-name/ru/rusty-diceware/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GDWvHHl4EztTaR0jI4XL1I9qE2KSL+q9C8IvLWQF4Ys="; }; - cargoHash = "sha256-5SAKrNgFG3O+hLKvEGhawyRi7wiEPWmxPsLtEX0OkDM="; + useFetchCargoVendor = true; + cargoHash = "sha256-f+jvrokt5kuHYKKfluu4OvI7dzp9rFPlTo4KC4jKb0o="; doCheck = true; diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix index 023febdd38fb..1b2f5433347d 100644 --- a/pkgs/by-name/ru/rusty-man/package.nix +++ b/pkgs/by-name/ru/rusty-man/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-djprzmogT1OEf0/+twdxzx30YaMNzFjXkZd4IDsH8oo="; }; - cargoHash = "sha256-Wf8D6y3LRYJpQjFFt0w5X+BOllbR3mc4Gzcr1ad3zD0="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZIRwp5AJugMDxg3DyFIH5VlD0m4Si2tJdspKE5QEB4M="; meta = with lib; { description = "Command-line viewer for documentation generated by rustdoc"; diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix index 5945caf102bf..0f2cbef080d8 100644 --- a/pkgs/by-name/ru/rusty-psn/package.nix +++ b/pkgs/by-name/ru/rusty-psn/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./fix-cargo-lock.patch ]; - cargoHash = "sha256-8J92WtMmCTnghPqSmNYhG3IVdmpHsHEH7Fkod0UYKJU="; + useFetchCargoVendor = true; + cargoHash = "sha256-FhY4Yf7e0Kk/a1ngPUQcd6R6MDpoyt/2WJhcCeTjKJE="; # Tests require network access doCheck = false; diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix index a275889580fb..5e7c9d6a7e5f 100644 --- a/pkgs/by-name/ru/rustycli/package.nix +++ b/pkgs/by-name/ru/rustycli/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4Txw6Cmwwgu7K8VIVoX9GR76VUqAEw6uYptmczbjqg0="; }; - cargoHash = "sha256-WU3lgGJH6qVDI1Un3HBqg0edqiP5sobTsAIXdnjeNTU="; + useFetchCargoVendor = true; + cargoHash = "sha256-QjkUiPwjG25NsvAXM3jqQVtJzYiXhzVqFaDN1b7DXDE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ru/rustypaste-cli/package.nix b/pkgs/by-name/ru/rustypaste-cli/package.nix index a68dfcfc9453..721fecb594a3 100644 --- a/pkgs/by-name/ru/rustypaste-cli/package.nix +++ b/pkgs/by-name/ru/rustypaste-cli/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NqY3Lp1PNnl8Vf+zJZVrcp+VHe2gZbsoEQKAhpdZzT8="; }; - cargoHash = "sha256-vKPR3Qhnca0etDiV1I77W+J7IpzUQi7Kf7k3WuyhG4w="; + useFetchCargoVendor = true; + cargoHash = "sha256-vvK9BTDuNwN4/uZEk9AYBN/Hs6dungKz3RNl/lLm8wU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix index 6dff4d942efe..59dccac4a9ce 100644 --- a/pkgs/by-name/ru/rustypaste/package.nix +++ b/pkgs/by-name/ru/rustypaste/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Kv6hmqqGY9SssiT/MYmYCZ71N8CHFTT7K4q7eMdQTQU="; }; - cargoHash = "sha256-podM44J7RGpLdPo+yS7clwX6vvvQRllkqPu7UpC/LzI="; + useFetchCargoVendor = true; + cargoHash = "sha256-g7HoDPNP6DeV6NlC/F5KxBVMMgLw6zvVmOUe6yndRMQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix index 8413f3cdc1c8..9a9238d55be3 100644 --- a/pkgs/by-name/rw/rwalk/package.nix +++ b/pkgs/by-name/rw/rwalk/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-W42b3fUezMpOPaNmTogUbgn67nCiKteCkkYUAux9Ng4="; }; - cargoHash = "sha256-R5L19GMOjbXMVfjCuergxVZvAHCTLVkf3rmdvYJCMLU="; + useFetchCargoVendor = true; + cargoHash = "sha256-9zZLHjDpnxL3aR8zX4eNU1mpMDzMqzMC+Wr+DWVimUo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rw/rwedid/package.nix b/pkgs/by-name/rw/rwedid/package.nix index f62b18cb9c9c..bc7dc2c04846 100644 --- a/pkgs/by-name/rw/rwedid/package.nix +++ b/pkgs/by-name/rw/rwedid/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lbZD/QLCgkD5OQZdn6oCjry9edMcJ+q9qGF7IbY36U4="; }; - cargoHash = "sha256-eY12p8pyUjSaoP4QKfVFwKQGdvFNG7GMAbFkFa8i05I="; + useFetchCargoVendor = true; + cargoHash = "sha256-oOopJanCFva2Z6/N3IwQTQ3pTd/xnJ82LyQ6iO47uVE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rw/rwpspread/package.nix b/pkgs/by-name/rw/rwpspread/package.nix index 84bd7da27912..3934432d0ebc 100644 --- a/pkgs/by-name/rw/rwpspread/package.nix +++ b/pkgs/by-name/rw/rwpspread/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-ivxu1UsQLUm017A5Za82+l1bQoYA/TF/I1BwUQD3dWo="; }; - cargoHash = "sha256-pIsSH8cQYyG7v7z4O2R80kA4QHvKyTajBfqmRXjuQW8="; + useFetchCargoVendor = true; + cargoHash = "sha256-Lic/8RGipN6A8+kP1Un10rhXFYmpGMCCbv9PPABxyC4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/rx/rx/package.nix b/pkgs/by-name/rx/rx/package.nix index 3f564a6476e0..2441902c29d0 100644 --- a/pkgs/by-name/rx/rx/package.nix +++ b/pkgs/by-name/rx/rx/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM="; }; - cargoHash = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU="; + useFetchCargoVendor = true; + cargoHash = "sha256-gRhjqQNL1Cu6/RpF2AeIGwbuDkFvyOf3gnpYt5Hlhfc="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/sa/sad/package.nix b/pkgs/by-name/sa/sad/package.nix index 5353fb404828..c2f59c6c469a 100644 --- a/pkgs/by-name/sa/sad/package.nix +++ b/pkgs/by-name/sa/sad/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-frsOfv98VdetlwgNA6O0KEhcCSY9tQeEwkl2am226ko="; }; - cargoHash = "sha256-2oZf2wim2h/krGZMg7Psxx0VLFE/Xf1d1vWqkVtjSmo="; + useFetchCargoVendor = true; + cargoHash = "sha256-ea/jimyghG7bqe9iRhYL13RQ4gwp9Ke3IjpSI8dTyr8="; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/by-name/sa/safe-rm/package.nix b/pkgs/by-name/sa/safe-rm/package.nix index e9158630269c..8a6546e3b7e1 100644 --- a/pkgs/by-name/sa/safe-rm/package.nix +++ b/pkgs/by-name/sa/safe-rm/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw="; }; - cargoHash = "sha256-durb4RTzEun7HPeYfvDJpvO+6L7tNFmAxdIwINbwZrg="; + useFetchCargoVendor = true; + cargoHash = "sha256-6mPx7qgrsUtjDiFMIL4NTmG9jeC3mBlsQIf/TUB4SQM="; postPatch = '' substituteInPlace src/main.rs \ diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix index 0f9ca43291a9..31756bdf7d66 100644 --- a/pkgs/by-name/sa/safecloset/package.nix +++ b/pkgs/by-name/sa/safecloset/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-buIceYP/dZMDw3tyrzj1bY6+sIIPaVJIVj1L//jZnws="; }; - cargoHash = "sha256-rxNp9dOvy/UTx6Q9pzZGccEKmIiWxzWVYyMxb+h5bqw="; + useFetchCargoVendor = true; + cargoHash = "sha256-/AnzUaya+dgckcilxj9ZZbDNqmfj1uTWkzhVphpZIsM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix index 4d2740f071df..d913fcbf84e3 100644 --- a/pkgs/by-name/sa/sagoin/package.nix +++ b/pkgs/by-name/sa/sagoin/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zXYjR9ZFNX2guUSeMN/G77oBIlW3AowFWA4gwID2jQs="; }; - cargoHash = "sha256-NMv48gv3RUIjBRD2XuOhmS32d+MjZ/tP/ZhpRuyulgE="; + useFetchCargoVendor = true; + cargoHash = "sha256-JM7m/VdaXpUlPOi+N7gue6mlQuxvRFU6++SaSq45Ntg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sa/sanctity/package.nix b/pkgs/by-name/sa/sanctity/package.nix index 531181ed266a..c37c910c6080 100644 --- a/pkgs/by-name/sa/sanctity/package.nix +++ b/pkgs/by-name/sa/sanctity/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-y6xj4A5SHcW747aFE9TfuurNnuUxjTUeKJmzxeiWqVc="; }; - cargoHash = "sha256-co58YBeFjP9DKzxDegQI7txuJ1smqJxdlRLae+Ppwh0="; + useFetchCargoVendor = true; + cargoHash = "sha256-r+0Qd88slA4ke90U1urVjdoiXwGWv42AViUpRCTucxs="; meta = with lib; { description = "Test the 16 terminal colors in all combinations"; diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix index a6573f41137b..121762365651 100644 --- a/pkgs/by-name/sa/sarif-fmt/package.nix +++ b/pkgs/by-name/sa/sarif-fmt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uQQ/UbmyPJbilxP2R+6KyBkf2dzGohN22xCCtU31y0s="; }; - cargoHash = "sha256-F2zHGlIaSGWcw67AIOa3N0AbKMVGQukUECZxCte7qlE="; + useFetchCargoVendor = true; + cargoHash = "sha256-naABVC4z5tYfe/Y2Gw4wp2Ye9wIF0Wq7jqhelcRQY30="; # `test_clippy` (the only test we enable) is broken on Darwin # because `--enable-profiler` is not enabled in rustc on Darwin diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index 73aad9079f75..3610ca575654 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-81WX9GAZ0mPai1/4FrqDGDu6k4OVYrKSJSC/FkPkZmE="; }; - cargoHash = "sha256-ZMtOo7AgEza1OptBXAUZ590xf6znN6ZNrC9bhk4nR94="; + useFetchCargoVendor = true; + cargoHash = "sha256-Yfy0IP2RzIv+PvCGb5cK54FN3rBH3CKdBhaPpASirQ0="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/sc/scaphandre/package.nix b/pkgs/by-name/sc/scaphandre/package.nix index 31146c669722..db1ee7c69255 100644 --- a/pkgs/by-name/sc/scaphandre/package.nix +++ b/pkgs/by-name/sc/scaphandre/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cXwgPYTgom4KrL/PH53Fk6ChtALuMYyJ/oTrUKHCrzE="; }; - cargoHash = "sha256-Vdkq9ShbHWepvIgHPjhKY+LmhjS+Pl84QelgEpen7Qs="; + useFetchCargoVendor = true; + cargoHash = "sha256-fJxd/rwQN4Vc6behosZXOhgYNqlZ6O5BnVhzuLz2ILU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix index 647b3f5d7263..d05570e5a0a1 100644 --- a/pkgs/by-name/sc/sccache/package.nix +++ b/pkgs/by-name/sc/sccache/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-MR/zfE87Z4TXc3ta3192lG/tD7YiVrn0HCLr5O29Izo="; }; - cargoHash = "sha256-tmK+/m1yNQvwbOs05hADmHOwuIbLgGXvPSvXYuye/OY="; + useFetchCargoVendor = true; + cargoHash = "sha256-Cv+tIivwqNqnA8anDWWEgQKpDFktG4rGZ+qZejBoDAE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sc/schemamap/package.nix b/pkgs/by-name/sc/schemamap/package.nix index b3999fce965c..7705bd0d0746 100644 --- a/pkgs/by-name/sc/schemamap/package.nix +++ b/pkgs/by-name/sc/schemamap/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-iq1/8oWVgiqdYfmJKzrIe9gkCz7fDw08QcaQgfd7vuo="; + useFetchCargoVendor = true; + cargoHash = "sha256-8UmLAT7Etb9MARoGhvOHPhkdR/8jCEAjAK/mWRHL9hk="; buildInputs = [ openssl ] diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix index 21f0c90f0188..03f082d63121 100644 --- a/pkgs/by-name/sc/scooter/package.nix +++ b/pkgs/by-name/sc/scooter/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dojVVBdXBtWvD/YIfouRmnsf1AWgfB3CYjH2KhtCsvI="; }; - cargoHash = "sha256-moRqtxLMO/7fBNpq6Xcnzu9HgmE2vDf0xn9SlvY8ZU0="; + useFetchCargoVendor = true; + cargoHash = "sha256-yQhnN1GoosUx8YjUJsjtg2okDbSOFx0sUV26ggRDGI8="; meta = { description = "Interactive find and replace in the terminal"; diff --git a/pkgs/by-name/sc/scope-tui/package.nix b/pkgs/by-name/sc/scope-tui/package.nix index 8b99e3d7c7bb..be0e71f1a1cc 100644 --- a/pkgs/by-name/sc/scope-tui/package.nix +++ b/pkgs/by-name/sc/scope-tui/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-6UPIZ2UB5wb0IkigaOXdQ/0ux9vHUGC4w5WnrjEd1bg="; }; - cargoHash = "sha256-9e5FOf7X+54591SjikeAq/5gsnqjUOEtVKpr6vWAHMI="; + useFetchCargoVendor = true; + cargoHash = "sha256-RcpKpjPNJhTAsX4iBNOwBxutl2qyBxsis2m5xtXBhh4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sc/scraper/package.nix b/pkgs/by-name/sc/scraper/package.nix index f870777afaed..6e2b116f780b 100644 --- a/pkgs/by-name/sc/scraper/package.nix +++ b/pkgs/by-name/sc/scraper/package.nix @@ -9,7 +9,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YefezVG/p+nhdJu5YetR84yL9H7Iqz/k+Hnp8Bwv7gI="; }; - cargoHash = "sha256-ER47QAqPLUbbb92sBsPMGr/XPQXmVSNTVYx2UMrOeJo="; + useFetchCargoVendor = true; + cargoHash = "sha256-wIoToIbOSN1kKN3njkshZvN2FoHoY0kUMVv8RteD5uI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix index c18d9a2e37c2..191cfa461cfd 100644 --- a/pkgs/by-name/sc/screenly-cli/package.nix +++ b/pkgs/by-name/sc/screenly-cli/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sRi0CpdaPCH54m2XojicARLXZELB4PFcLLw0KB0j6jE="; }; - cargoHash = "sha256-6IK1aO4bx09ZVve7z340O7KMOttCcq3MqMs/XM6L0l4="; + useFetchCargoVendor = true; + cargoHash = "sha256-U9NAfColVKbLsEf3HXS4Vu2eNvCjG0+koESFUWP9vMk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sc/scriptisto/package.nix b/pkgs/by-name/sc/scriptisto/package.nix index 1065712928d9..f594153fd2d8 100644 --- a/pkgs/by-name/sc/scriptisto/package.nix +++ b/pkgs/by-name/sc/scriptisto/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-iaDdOFmi4kfcJSjXOcGAFG9i1SdB+K5Qz4+NDaVQALY="; }; - cargoHash = "sha256-LIOsl9qPKJr/ykbXeaHP6lNHGUMcw3omniSWx2FkF28="; + useFetchCargoVendor = true; + cargoHash = "sha256-20RRmbpJLHbSsa5OBk+IkyzZ4Jnss3nZ9izh7C6gmfI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix index 28ae3a4bdcf3..3a7274f7af72 100644 --- a/pkgs/by-name/sc/scryer-prolog/package.nix +++ b/pkgs/by-name/sc/scryer-prolog/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU="; }; - cargoHash = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo="; + useFetchCargoVendor = true; + cargoHash = "sha256-CuCVofzKd/VPBTZY+ubk5wP9akt9kQLyi221fg7yt3M="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sd/sd-switch/package.nix b/pkgs/by-name/sd/sd-switch/package.nix index 623d138c11c6..6b22add6d81f 100644 --- a/pkgs/by-name/sd/sd-switch/package.nix +++ b/pkgs/by-name/sd/sd-switch/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-9aIu37mmf4ZnmZZrU0GA6z+bHKwtfkA5KnLRLY0c2r8="; }; - cargoHash = "sha256-3XolxgnTIySucopogAzgf13IUCguJE6W17q506tUF6U="; + useFetchCargoVendor = true; + cargoHash = "sha256-2DpaO64EehlgG5zSzqERmenmEqUbhEwFmIQEmCKs4Wg="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sd/sd/package.nix b/pkgs/by-name/sd/sd/package.nix index 5734960eb074..c5b3295650db 100644 --- a/pkgs/by-name/sd/sd/package.nix +++ b/pkgs/by-name/sd/sd/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hC4VKEgrAVuqOX7b24XhtrxrnJW5kmlX4E6QbY9H8OA="; }; - cargoHash = "sha256-IhCuWCaSU7c7Tot4uvxE7oabY69wDLstuBN35OzkQcU="; + useFetchCargoVendor = true; + cargoHash = "sha256-KbEw09tTsUl9BLQsL7lW4VQq6D9E4lBiZf3Jrthst2Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix index 0b27163049bd..4748e9958fc1 100644 --- a/pkgs/by-name/se/sea-orm-cli/package.nix +++ b/pkgs/by-name/se/sea-orm-cli/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; - cargoHash = "sha256-ZdKDQUBpFEVBvvGCulRH+riTeLoXGMMBn2RGSL1uUy4="; + useFetchCargoVendor = true; + cargoHash = "sha256-kJz0jeKovZswkgLIqaNGUJegdsziIYQ3wJ/dGUlRUtY="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; diff --git a/pkgs/by-name/se/see-cat/package.nix b/pkgs/by-name/se/see-cat/package.nix index c8c213272a52..c9310bd5bb08 100644 --- a/pkgs/by-name/se/see-cat/package.nix +++ b/pkgs/by-name/se/see-cat/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VCUrPCaG2fKp9vpFLzNLcfCBu2NiwdY2+bo1pd7anZY="; }; - cargoHash = "sha256-lfpJ40QpZ9eQhDFJjLwiDU5DmaYAqCh5iJSjZ+jj+kk="; + useFetchCargoVendor = true; + cargoHash = "sha256-Yw6zRvwT+y3CFb6WwKBiMSWz8igLQ7JmyGalHdRDGL0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/se/seehecht/package.nix b/pkgs/by-name/se/seehecht/package.nix index c40578d7f950..250e98101ea5 100644 --- a/pkgs/by-name/se/seehecht/package.nix +++ b/pkgs/by-name/se/seehecht/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KIxK0JYfq/1Bn4LOn+LzWPBUvGYMvOEuqS7GMpDRvW0="; }; - cargoHash = "sha256-AeVUVF4SBS9FG0iezLBKUm4Uk1PPRXPTON93evgL9IA="; + useFetchCargoVendor = true; + cargoHash = "sha256-xsZyLyw+IC17QSVEtUJWIkQiaG7JtcLWr8xypTwYMUo="; postInstall = '' ln -s $out/bin/seh $out/bin/seehecht diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix index 6a9c625eb84d..1db50c18a8a6 100644 --- a/pkgs/by-name/se/selene/package.nix +++ b/pkgs/by-name/se/selene/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-QE9kXGQWg0pHtSI1bTppn5IE+53KoxqFED1VvwkumEI="; }; - cargoHash = "sha256-Uh07CHuImsYqLolkwAERIkKbyKWevm2KeqjSicXqI+c="; + useFetchCargoVendor = true; + cargoHash = "sha256-7mAtTOnrNT8280TOAqtsykfdLq6XAQkDjR5JXZGwCFM="; nativeBuildInputs = lib.optionals robloxSupport [ pkg-config diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 3f28c4d6ee8a..c271b6c065e3 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-lD9SFqBO9hhyTD4e7LSBktJzbj7uXk6naHEp9uZPhPc="; + useFetchCargoVendor = true; + cargoHash = "sha256-bdej8JmkiX5lP5IUQ4XisBVtOYIEspPIsK89CXiqUmM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index 5ad4b74439be..aae56c1a5f5c 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f3OgG6PTv9UUT5Gn1hBTHRIATrlvzBz1pjJ6fuWiCXM="; }; - cargoHash = "sha256-lWir4B3zGi7GBp5Of01GeGMV0SXzMjxcPBFipnoRRRk="; + useFetchCargoVendor = true; + cargoHash = "sha256-OcZkjjAUIWvTyzKEscT6q+fUWGC2X34Lxk34kzMZ6rY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix index 5a522c3dfd03..0d5e209ab748 100644 --- a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix +++ b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XoZA8X6lwziKFECJDPCSpqcFtJe5TsDGWvM+EgpBU3U="; }; - cargoHash = "sha256-xDQCAte+olmoMbchspNW/02NRkhwWxcgPkIXWBJsbIg="; + useFetchCargoVendor = true; + cargoHash = "sha256-BuUyOI0skXViwYTPP9/AVoqtLHCIrdRKJF/4Zq6aTD8="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix index a3b5f778982f..0eb2017dc08b 100644 --- a/pkgs/by-name/se/sequoia-sq/package.nix +++ b/pkgs/by-name/se/sequoia-sq/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-m6uUqTXswzdtIabNgijdU54VGQSk0SkSqdh+7m1Q7RU="; }; - cargoHash = "sha256-tq0TLiu8pdLIP0hGQ5x6TJKhweio0XdBMvlTdl8MvEY="; + useFetchCargoVendor = true; + cargoHash = "sha256-a+3oKORX88SfMw4/QA6+Ls12koZIw0iadTulCzGlr6U="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/se/sequoia-sqop/package.nix b/pkgs/by-name/se/sequoia-sqop/package.nix index 6b464de530bc..6e51f6077596 100644 --- a/pkgs/by-name/se/sequoia-sqop/package.nix +++ b/pkgs/by-name/se/sequoia-sqop/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JgLozj9LZwk6TRHj2d4kiq8j3aILBUWaE9ldzvlTBNs="; }; - cargoHash = "sha256-Z0UqJRm4QepMl83zE1TI7g/pc7b9XxUWeaMVVrp0zZ8="; + useFetchCargoVendor = true; + cargoHash = "sha256-Cg07SlNmG6ELZmoQfkr6ADrGJirbFm0D1Iko1WVNfl0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/se/sequoia-sqv/package.nix b/pkgs/by-name/se/sequoia-sqv/package.nix index c3b7e01b709f..755b1a2e222c 100644 --- a/pkgs/by-name/se/sequoia-sqv/package.nix +++ b/pkgs/by-name/se/sequoia-sqv/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-frGukJDsxq+BWLPC/4imfc42lDKVF8BPIQQDazaLaQ0="; }; - cargoHash = "sha256-1h1nXtXMTwL8ICxWTV8My0IdE+6w0L7xXZD012Cv5U8="; + useFetchCargoVendor = true; + cargoHash = "sha256-WaLRBf+Umaa8LTQ97TsJJ7pUlmficIwuFV6d5QDT6SA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/se/sequoia-wot/package.nix b/pkgs/by-name/se/sequoia-wot/package.nix index cd881884c365..412614537944 100644 --- a/pkgs/by-name/se/sequoia-wot/package.nix +++ b/pkgs/by-name/se/sequoia-wot/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Xbj1XLZQxyEYf/+R5e6EJMmL0C5ohfwZMZPVK5PwmUU="; }; - cargoHash = "sha256-BidSKnsIEEEU8UarbhqALcp44L0pes6O4m2mSEL1r4Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-hpI791Bz0MqZgjI2E/KMseqfPQU56Qr0xmHigyPv4HU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index 8e8d367d73f0..fb9b46e9566a 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-F+pKnvsBh3bVnFBe4HSPiUIUKivMCeVPuLX3MqxxjPQ="; }; - cargoHash = "sha256-TXDZsT+p8s6jd3D7EakaDHkzKiM/ad1LPnJtIy1QcPo="; + useFetchCargoVendor = true; + cargoHash = "sha256-mhq6SYMN3wIuc9XO0Q7F1E2GUGjfsbJrNbVaj2yg7fw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix index 8a21f6d78432..7603bc865374 100644 --- a/pkgs/by-name/se/serpl/package.nix +++ b/pkgs/by-name/se/serpl/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ makeWrapper ]; - cargoHash = "sha256-8XYEZQfoizVmOuh0hymzMj2UDiXNkSeHqBAWOqaMY84="; + useFetchCargoVendor = true; + cargoHash = "sha256-YfSxjlpUyRwpSoKmHOZrULGIIWTQ14JJwbsNB807WYQ="; postFixup = '' # Serpl needs ripgrep to function properly. diff --git a/pkgs/by-name/sf/sfz/package.nix b/pkgs/by-name/sf/sfz/package.nix index c50f9985dbb2..2193d542ee88 100644 --- a/pkgs/by-name/sf/sfz/package.nix +++ b/pkgs/by-name/sf/sfz/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mKH1vgk+3tZEnjJRkfa0dDR383VN1VLNd3HEzC7f8YI="; }; - cargoHash = "sha256-MgbK39xAr8g9F+1MXZiw5rE/PsgQPcLZ2ZV6LiQbA24="; + useFetchCargoVendor = true; + cargoHash = "sha256-/I0cSnB/HVhJr5qf5dMvawggwM7qHJbnD4InECuKdcA="; # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context doCheck = false; diff --git a/pkgs/by-name/sg/sgxs-tools/package.nix b/pkgs/by-name/sg/sgxs-tools/package.nix index 1364c2ac0689..f527dc4cee7e 100644 --- a/pkgs/by-name/sg/sgxs-tools/package.nix +++ b/pkgs/by-name/sg/sgxs-tools/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { inherit pname version; hash = "sha256-24lUhi4IPv+asM51/BfufkOUYVellXoXsbWXWN/zoBw="; }; - cargoHash = "sha256-vtuOCLo7qBOfqMynykqf9folmlETx3or35+CuTurh3s="; + useFetchCargoVendor = true; + cargoHash = "sha256-7Jzr9Y6ixK1SHCHXaNKVXk0qfbtmXpr9dz1UNk7Q3XI="; meta = { description = "Utilities for working with the SGX stream format"; homepage = "https://github.com/fortanix/rust-sgx"; diff --git a/pkgs/by-name/sh/shadow-tls/package.nix b/pkgs/by-name/sh/shadow-tls/package.nix index b0219c46f26b..06fad8e56f56 100644 --- a/pkgs/by-name/sh/shadow-tls/package.nix +++ b/pkgs/by-name/sh/shadow-tls/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T+GPIrcME6Wq5sdfIt4t426/3ew5sUQMykYeZ6zw1ko="; }; - cargoHash = "sha256-w+DQeiQAtVsTw1VJhntX1FXymgS0fxsXiUmd6OjVWLQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-1oJCdqBa1pWpQ7QvZ0vZaOd73R+SzR9OPf+yoI+RwCY="; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix index 29f12cba22e6..dd0bed1f3e70 100644 --- a/pkgs/by-name/sh/shellcheck-sarif/package.nix +++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cgcvl/nlnJtYzTfxbJHJ967zFH8KtWTMZPKGVpH66z0="; }; - cargoHash = "sha256-wGr9UQ9zJ8EJCrYOgYmRO9Oy7jtxPNRnIZROmf7xwmk="; + useFetchCargoVendor = true; + cargoHash = "sha256-eJzhaLQCniVUmsFgvzLE9Aw1nUq+P9m9wjSH3l8vQxo="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/sh/shellclear/package.nix b/pkgs/by-name/sh/shellclear/package.nix index 0e89e371df17..769810e4b2fb 100644 --- a/pkgs/by-name/sh/shellclear/package.nix +++ b/pkgs/by-name/sh/shellclear/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/0pqegVxrqqxaQ2JiUfkkFK9hp+Vuq7eTap052HEcJs="; }; - cargoHash = "sha256-vPd1cFfoSkOnXH3zKQUB0zWDzEtao50AUrUzhpZIkgI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Q6F7cqs+d1LqYaZkcpCBTOB9Z0qxuGz9zRDK2Yg10CU="; buildAndTestSubdir = "shellclear"; diff --git a/pkgs/by-name/sh/shellharden/package.nix b/pkgs/by-name/sh/shellharden/package.nix index 7d385ad357b4..df66e2d21b31 100644 --- a/pkgs/by-name/sh/shellharden/package.nix +++ b/pkgs/by-name/sh/shellharden/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-aBX3RXfDhlXVMV8aPO0pu3527nDoYrUDUbH6crWO/W8="; }; - cargoHash = "sha256-/t5dsDOokuUC0ZG8hPzsUoAvteLHWby6eKZNtnL/XUw="; + useFetchCargoVendor = true; + cargoHash = "sha256-kMY+esMOsQZC979jntcqF35KVJCBuNLXHb0WYOV5YHA="; postPatch = "patchShebangs moduletests/run"; diff --git a/pkgs/by-name/sh/shikane/package.nix b/pkgs/by-name/sh/shikane/package.nix index f638d7c19883..73a21535fc21 100644 --- a/pkgs/by-name/sh/shikane/package.nix +++ b/pkgs/by-name/sh/shikane/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Chc1+JUHXzuLl26NuBGVxSiXiaE4Ns1FXb0dBs6STVk="; }; - cargoHash = "sha256-uuQBTAyWczzc4Ez2Tq4Ps6NPonXqHrXAP2AZFzgsvo4="; + useFetchCargoVendor = true; + cargoHash = "sha256-eVEfuX/dNFoNH9o18fIx51DP/MWrQMqInU4wtGCmUbQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/sh/shisho/package.nix b/pkgs/by-name/sh/shisho/package.nix index 99590098f828..320df36b19a3 100644 --- a/pkgs/by-name/sh/shisho/package.nix +++ b/pkgs/by-name/sh/shisho/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-G7sHaDq+F5lXNaF1sSLUecdjZbCejJE79P4AQifKdFY="; fetchSubmodules = true; }; - cargoHash = "sha256-xd4andytmDMOIT+3DkmUC9fkxxGJ6yRY2WSdnGB6ZwY="; + useFetchCargoVendor = true; + cargoHash = "sha256-gv3qvDzqwuuAVpbaOpMI7DuapSALMr/qzyhor3avYQI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix index 3d30c4857859..ef5a41a1fe83 100644 --- a/pkgs/by-name/sh/shotgun/package.nix +++ b/pkgs/by-name/sh/shotgun/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-sBstFz7cYfwVQpDZeC3wPjzbKU5zQzmnhiWNqiCda1k="; }; - cargoHash = "sha256-P6riJgnEe+bNP3cUKNCfIkgKM44XGYSDADnU6w7CFDA="; + useFetchCargoVendor = true; + cargoHash = "sha256-Hv/lQhxRJvvMB5LC5K7k9SmuUCfaVZJynWIz8QOeL9A="; meta = with lib; { description = "Minimal X screenshot utility"; diff --git a/pkgs/by-name/sh/shotman/package.nix b/pkgs/by-name/sh/shotman/package.nix index 6b4a07da910f..1d120737f7f0 100644 --- a/pkgs/by-name/sh/shotman/package.nix +++ b/pkgs/by-name/sh/shotman/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kf/qloCaptxPzPEgd8fkzTfgqsI/PC3KJfHpBQWadjQ="; }; - cargoHash = "sha256-a70zJdhPncagah/gCvkHtSvnYhnYMTINCd5ZyBeDwAE="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZL0dKvCX/cvMzJi05qPULlwWuUcXH/bY84sDH67UFHg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix index 744c0c41d3cf..eb4eda0b2ee8 100644 --- a/pkgs/by-name/sh/shpool/package.nix +++ b/pkgs/by-name/sh/shpool/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin/shpool' "$out/bin/shpool" ''; - cargoHash = "sha256-NUo9Y/c4Wm3d8lbhdHEqu9Zp7tX8giq2wnYwz8SMTXo="; + useFetchCargoVendor = true; + cargoHash = "sha256-JDMgYd9mKsLdqc8rpDg3ymgFj/ntpBBF5fSDb2cLOJs="; buildInputs = [ linux-pam diff --git a/pkgs/by-name/si/sic-image-cli/package.nix b/pkgs/by-name/si/sic-image-cli/package.nix index 782a764e99d3..ee93342f2d93 100644 --- a/pkgs/by-name/si/sic-image-cli/package.nix +++ b/pkgs/by-name/si/sic-image-cli/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PFbHHO3m4mnV5s8DVev/iao9sC3FYht0whTHYzO25Yo="; }; - cargoHash = "sha256-Pw5PJ0xQCLfPaVEzsfqeHJ0E3miDwlj+71J98KRrYDs="; + useFetchCargoVendor = true; + cargoHash = "sha256-HL/KCC8Y42OFL1LXoewmH1Bxp6FICuDjkTnK5DE94Ms="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/si/sig/package.nix b/pkgs/by-name/si/sig/package.nix index fa5244f91523..9033c282cdc4 100644 --- a/pkgs/by-name/si/sig/package.nix +++ b/pkgs/by-name/si/sig/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-685VBQ64B+IbSSyqtVXtOgs4wY85WZ/OceHL++v5ip4="; }; - cargoHash = "sha256-afsLf/WsCShjagYWDUA3ZgpgK1XjQiZzISZngzzYybg="; + useFetchCargoVendor = true; + cargoHash = "sha256-x4/vCFbC+kxhne4iRjuJy4L6QRpRKrJU3r+TPpDh4Pw="; meta = { description = "Interactive grep (for streaming)"; diff --git a/pkgs/by-name/si/sigi/package.nix b/pkgs/by-name/si/sigi/package.nix index ba92c47224c6..e9da8c0cb77b 100644 --- a/pkgs/by-name/si/sigi/package.nix +++ b/pkgs/by-name/si/sigi/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Tsrfan7aejP2oy9x9VoTIq0ba0s0tnx1RTlAB0v6eis="; }; - cargoHash = "sha256-jstxl1CcSNv1bQuAY9n2kYmoTYmfeBYUCKJKWCSEuec="; + useFetchCargoVendor = true; + cargoHash = "sha256-SFT0quq5e37tFa07sCFjb8u8scZLjhICBvKdQOR8s14="; nativeBuildInputs = [ installShellFiles ]; # In case anything goes wrong. diff --git a/pkgs/by-name/si/siketyan-ghr/package.nix b/pkgs/by-name/si/siketyan-ghr/package.nix index 2b0a24c0bbdf..7293bbf2f33a 100644 --- a/pkgs/by-name/si/siketyan-ghr/package.nix +++ b/pkgs/by-name/si/siketyan-ghr/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-L9+rcdt+MGZSCOJyCE4t/TT6Fjtxvfr9LBJYyRrx208="; }; - cargoHash = "sha256-HBVMDR+3UB+zWmvZXBph36bajTOAnvVGTGYooJtk9Zg="; + useFetchCargoVendor = true; + cargoHash = "sha256-xRa/brOYJ19J25wGdtNR2g+ouMyvz9YFXnzepeipWNQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix index 333a34838aba..0f27506c4e7e 100644 --- a/pkgs/by-name/si/simple-http-server/package.nix +++ b/pkgs/by-name/si/simple-http-server/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-r8Ush6cdGNxcRB3RSRJLtjseII5SQt9+oMqOTBmVfaY="; }; - cargoHash = "sha256-RdHcMnUctHYdQRsF6T9w8FoD56Bv4Xm0Jlu4Rls0C+M="; + useFetchCargoVendor = true; + cargoHash = "sha256-rQdqLflH2KQh7nrEECZrGhslZh1xBcbp+yfRs7Fhr84="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/si/sink-rotate/package.nix b/pkgs/by-name/si/sink-rotate/package.nix index 058289484f85..02d8f7e26cf0 100644 --- a/pkgs/by-name/si/sink-rotate/package.nix +++ b/pkgs/by-name/si/sink-rotate/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-ZHbisG9pdctkwfD1S3kxMZhBqPw0Ni5Q9qQG4RssnSw="; }; - cargoHash = "sha256-TWuyU1+F3zEcFFd8ZeZmL3IvpKLLv3zimZ2WFVYFqyo="; + useFetchCargoVendor = true; + cargoHash = "sha256-OYFRiPAhiGbA7aNy3c4I0Tc39BNmFuP68YoBviMfbak="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index 8a2468a6b8c2..7198a4ae7ba6 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim ''; - cargoHash = "sha256-/tfbhNlpx96jlzUYwbucXi+pk1IE2jqxgWYjNU+4mHg="; + useFetchCargoVendor = true; + cargoHash = "sha256-DQ6O3jujulNMd1uBttf6cCzy/wFsCBHhqZ4MawWj/gM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix index 951d17ebe5b7..4b9590c14665 100644 --- a/pkgs/by-name/sl/slimevr/package.nix +++ b/pkgs/by-name/sl/slimevr/package.nix @@ -34,7 +34,8 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "gui/src-tauri"; - cargoHash = "sha256-jvt5x2Jr185XVSFjob4cusP/zYJklJ/eqZe47qUg58s="; + useFetchCargoVendor = true; + cargoHash = "sha256-93aOM6iJguTdC5RAUDuoSr05ar+iKilmddgKBOG2fDE="; pnpmDeps = pnpm_9.fetchDeps { pname = "${pname}-pnpm-deps"; diff --git a/pkgs/by-name/sl/slingshot/package.nix b/pkgs/by-name/sl/slingshot/package.nix index b2a18dda5297..4d3b886bedc4 100644 --- a/pkgs/by-name/sl/slingshot/package.nix +++ b/pkgs/by-name/sl/slingshot/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XI6uf54sEJ0htfY43aF8/X1/OF9m6peHUGDS+2nK3xA="; }; - cargoHash = "sha256-NZyO6oXmgTUszp2Vc9iVAnCvM78/BJ8IfpeTrsOMvlo="; + useFetchCargoVendor = true; + cargoHash = "sha256-Xf5lSwnD6ChpHaM7RQ/eti40iRZrNPpBsUn2QRzxecg="; meta = with lib; { description = "Lightweight command line tool to quickly navigate across folders"; diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix index b661d1e3308d..f42e722452f3 100644 --- a/pkgs/by-name/sl/slowlorust/package.nix +++ b/pkgs/by-name/sl/slowlorust/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c4NWkQ/QvlUo1YoV2s7rWB6wQskAP5Qp1WVM23wvV3c="; }; - cargoHash = "sha256-Wu1mm+yJw2SddddxC5NfnMWLr+dplnRxH3AJ1/mTAKM="; + useFetchCargoVendor = true; + cargoHash = "sha256-L0N7SVUzdTzDXPaS/da4kCKNG2lwS8Mqk1HET2LqSvY="; postPatch = '' # https://github.com/MJVL/slowlorust/issues/2 diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 130a8e14522c..ace04ecc42db 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ojHVH/GE2FonqqxpGK6t/AmCaeOS1TkWMt89iUt5i1s="; }; - cargoHash = "sha256-qBOZnEhYoTMEzzhf2K6zcXeLCj0rMFs1qERwdUw1fVw="; + useFetchCargoVendor = true; + cargoHash = "sha256-1xWSFM1LSFKTaGWgAK9M2TI5Gqes29A/L1WMDj+GSIA="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/by-name/sm/smag/package.nix b/pkgs/by-name/sm/smag/package.nix index 160098cd1413..fc0b1198de61 100644 --- a/pkgs/by-name/sm/smag/package.nix +++ b/pkgs/by-name/sm/smag/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Vyd35wYDNI4T7DdqihwpmJOAZGxjnCeWS609o3L+gHM="; }; - cargoHash = "sha256-ujQAT36qzlfliEC7rFYiWUb3DuwkqCvpUS5Q3v+6378="; + useFetchCargoVendor = true; + cargoHash = "sha256-qOinPZwZqcfQ4gv0Z+sfF53zd4tlEWCczaGGmLL79iE="; meta = with lib; { description = "Easily create graphs from cli commands and view them in the terminal"; diff --git a/pkgs/by-name/sm/smartcat/package.nix b/pkgs/by-name/sm/smartcat/package.nix index fed363cb0d4a..a06d2d8b151a 100644 --- a/pkgs/by-name/sm/smartcat/package.nix +++ b/pkgs/by-name/sm/smartcat/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nXuMyHV5Sln3qWXIhIDdV0thSY4YbvzGqNWGIw4QLdM="; }; - cargoHash = "sha256-tR7+SecTS1FWwcPF25PclT6lEjY9NUEj/2EBhbgg0tw="; + useFetchCargoVendor = true; + cargoHash = "sha256-AiOVIDfARztwQxOzBFWc8NXEEsxEvKAStCokcRrJyOE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix index 81b7883be0be..9924b3a27384 100644 --- a/pkgs/by-name/sn/sn0int/package.nix +++ b/pkgs/by-name/sn/sn0int/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tiJLwlxZ9ndircgkH23ew+3QJeuuqt93JahAtFPcuG8="; }; - cargoHash = "sha256-3FrUlv6UxULsrvgyV5mlry9j3wFMiXZVoxk6z6pRM3I="; + useFetchCargoVendor = true; + cargoHash = "sha256-nDgWNm5HTvFEMQhUUnU7o2Rpzl3/bGwyB0N9Z1KorDs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sn/snazy/package.nix b/pkgs/by-name/sn/snazy/package.nix index e4431592f22c..cb367b1e7c5b 100644 --- a/pkgs/by-name/sn/snazy/package.nix +++ b/pkgs/by-name/sn/snazy/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1+UbUwvv5HWiQ+u9gPtJ3JwP6cMi4IZOCSMedXzWEoQ="; }; - cargoHash = "sha256-NmnKWVyD+NrP7ReERQB1/K8hyrSFj6qgjQjYwxZc+OY="; + useFetchCargoVendor = true; + cargoHash = "sha256-Y2GUE9S0bZFVvu9bvs8WptrdO1V27z+Vu/eQDNvq7pE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sn/sniffglue/package.nix b/pkgs/by-name/sn/sniffglue/package.nix index 28c22a04089e..6f499f44b3c3 100644 --- a/pkgs/by-name/sn/sniffglue/package.nix +++ b/pkgs/by-name/sn/sniffglue/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Pp/SJJQFpEU/4GKZQB8BjRGS4hqB850QbSb5WoG6Wh4="; }; - cargoHash = "sha256-/MGrdo8cmodC3oVWk6y8C73gsLKROmNOI9aytPPzA8o="; + useFetchCargoVendor = true; + cargoHash = "sha256-4aOp9z1xAZ4+GfvcP4rwiS35BfNBnftNhK/oJDixa8w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix index 0f04ca2b8823..48a8d368969a 100644 --- a/pkgs/by-name/sn/sniffnet/package.nix +++ b/pkgs/by-name/sn/sniffnet/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wepy56LOhliU6t0ZRPviEbZtsWNqrtUnpUXsEdkRDqI="; }; - cargoHash = "sha256-cV3WhidnH2CBlmHa3IVHTQfTuPdSHwwY0XhgNPyLDN4="; + useFetchCargoVendor = true; + cargoHash = "sha256-rHXlCMqa/NDWF5WzO+HUlxjIQINu8zQ86hmsRuMK8ns="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix index 2f9a35906db5..f454bd7c516a 100644 --- a/pkgs/by-name/sn/snpguest/package.nix +++ b/pkgs/by-name/sn/snpguest/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NqessN2yo7H17zWsnnI1oNIRG5Z1Wxi8oTWETP9DHpk="; }; - cargoHash = "sha256-vhHlfGl6fSe8rKRv5u3iqomIlLpVKwOVbZDwuDgsdhs="; + useFetchCargoVendor = true; + cargoHash = "sha256-r0F/nTT0YTrkknI2wATvBnRxVyXT1mTM8Qt0rOgg8VM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sn/snphost/package.nix b/pkgs/by-name/sn/snphost/package.nix index a62a41c45bdd..9f8aacce8f3e 100644 --- a/pkgs/by-name/sn/snphost/package.nix +++ b/pkgs/by-name/sn/snphost/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GaeNoLx/fV/NNUS2b2auGvylhW6MOFp98Xi0sdDV3VM="; }; - cargoHash = "sha256-fG3MTCHfIfYeFK03Ee9uzq8e7f5NN/h8LIye7Y3+0uI="; + useFetchCargoVendor = true; + cargoHash = "sha256-11D26PqCcKPoyCk4Zx29pkc6/B8DR+9+y+RJAq6ZbCs="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/so/so/package.nix b/pkgs/by-name/so/so/package.nix index a5493b3c76b3..df39145c5973 100644 --- a/pkgs/by-name/so/so/package.nix +++ b/pkgs/by-name/so/so/package.nix @@ -25,7 +25,8 @@ let hash = "sha256-25jZEo1C9XF4m9YzDwtecQy468nHyv2wnRuK5oY2siU="; }; - cargoHash = "sha256-F9DNY0jKhH6aQRqlXq6MEMoFa1qtvAdL5lSEsql6gcI="; + useFetchCargoVendor = true; + cargoHash = "sha256-cSLsfYYtdMiXGCG3jpq2Cxl8TgSb7iCWoeXNwEuv4FM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix index 7709d6058cbb..aaff4caac201 100644 --- a/pkgs/by-name/so/songrec/package.nix +++ b/pkgs/by-name/so/songrec/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pTonrxlYvfuLRKMXW0Lao4KCoNFlMzE9rH+hwpa60JY="; }; - cargoHash = "sha256-2BXUZD63xzHpUi8lk2fV5qBmeq6Gzpq0uEcKfbReANI="; + useFetchCargoVendor = true; + cargoHash = "sha256-wSRn1JY067RVqGGdiox87+zRb2/2OMcvKLYZE1QUs/s="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/so/sonic-server/package.nix b/pkgs/by-name/so/sonic-server/package.nix index 53270dbd8728..4518babafeb7 100644 --- a/pkgs/by-name/so/sonic-server/package.nix +++ b/pkgs/by-name/so/sonic-server/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PTujR3ciLRvbpiqStNMx3W5fkUdW2dsGmCj/iFRTKJM="; }; - cargoHash = "sha256-bH9u38gvH6QEySQ3XFXEHBiSqKKtB+kjcZRLjx4Z6XM="; + useFetchCargoVendor = true; + cargoHash = "sha256-RO4wY7FMwczZeR4GOxA3mwfBJZKPToOJJKGZb48yHJA="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/so/soteria/package.nix b/pkgs/by-name/so/soteria/package.nix index 667531fe2209..40417aaf684f 100644 --- a/pkgs/by-name/so/soteria/package.nix +++ b/pkgs/by-name/so/soteria/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage { hash = "sha256-lhS+37DqSgZrgrYgKGUpKMC22Qjdq9LPNS5k/dqvkRY="; }; - cargoHash = "sha256-NMSGSqdCu/kW6vv8+C7UC6oitZqlTklO1sRKDcc1T9o="; + useFetchCargoVendor = true; + cargoHash = "sha256-inesrYFVIRIcckYWjFCG1dYyhLBInC8ODFEXwXgMjb4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix index 0c79ce5a97ed..a7a9990f0495 100644 --- a/pkgs/by-name/so/sozu/package.nix +++ b/pkgs/by-name/so/sozu/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Cda53lhKPxm2w8guoKuQjdjhZNWJinzR1PHc5S57y2w="; }; - cargoHash = "sha256-DCiPy9bU56ocWwQ8sTVZ5T9eMi1ifj3enCHPuC2x6aY="; + useFetchCargoVendor = true; + cargoHash = "sha256-AIj59MqK+TqyTTDjGzN1Oec3svPaXRBkHJTBtxTwZNg="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/sp/spacer/package.nix b/pkgs/by-name/sp/spacer/package.nix index c0b96db011ce..c97ae8828b39 100644 --- a/pkgs/by-name/sp/spacer/package.nix +++ b/pkgs/by-name/sp/spacer/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gxqUMtONjYPjSmxyguE9/GBC91PUK1rdFGsISGaSe44="; }; - cargoHash = "sha256-pMYqIl0Td2awAxe3BRglBcOychwTmFZ+pZV0QOT0CL4="; + useFetchCargoVendor = true; + cargoHash = "sha256-OZzelg7UZiCcPXUNbmN5gwL5RctiVWseQIZzOaJdFSU="; meta = with lib; { description = "CLI tool to insert spacers when command output stops"; diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index d68654742dd9..6fac99af8fbc 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { inherit pname version; hash = "sha256-3DzBNebg1y/+psD2zOpDsnRJmabQLeO1UMxPq9M0CsU="; }; - cargoHash = "sha256-InWaPybZbUbhIF1MEMeTUGa8LRUPwcTdw7uclZ1zBu4="; + useFetchCargoVendor = true; + cargoHash = "sha256-DnOnqi60JsRX8yqEM/5zZ3yX/rk85/ruwL3aW1FRXKg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; diff --git a/pkgs/by-name/sp/specr-transpile/package.nix b/pkgs/by-name/sp/specr-transpile/package.nix index 56e6b46a15e2..526dacf895c7 100644 --- a/pkgs/by-name/sp/specr-transpile/package.nix +++ b/pkgs/by-name/sp/specr-transpile/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yB4b7VaZ22zk8jhQijBOWRks22TV19q9IQNlVXyBlss="; }; - cargoHash = "sha256-pD+Llzt4ekkQgKGidEL6jIbbFpuqjuFTmQM29FtReTY="; + useFetchCargoVendor = true; + cargoHash = "sha256-pMkvyMGfvLdj406xH/1+ZHE33iZDcmUUBjeSiIro0xY="; meta = with lib; { description = "Converts Specr lang code to Rust"; diff --git a/pkgs/by-name/sp/speedtest-rs/package.nix b/pkgs/by-name/sp/speedtest-rs/package.nix index 5cc171ff7db7..c28c1c8f52eb 100644 --- a/pkgs/by-name/sp/speedtest-rs/package.nix +++ b/pkgs/by-name/sp/speedtest-rs/package.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-0YPCBzidE1+LgIYk457eSoerLvQuuZs9cTd7uUt1Lr8="; + useFetchCargoVendor = true; + cargoHash = "sha256-T8OG6jmUILeRmvPLjGDFlJyBm87Xdgy4bw4n7V0BQMk="; # Fail for unclear reasons (only on darwin) checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/sp/spl/package.nix b/pkgs/by-name/sp/spl/package.nix index 43b6e24a9b8f..48e741abce29 100644 --- a/pkgs/by-name/sp/spl/package.nix +++ b/pkgs/by-name/sp/spl/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cU6qSh4HM3os/A1w0+5TSZLkS2Y/C864qvmixkxPAh8="; }; - cargoHash = "sha256-AWkyh3MRtnK+IzXu+h6jurNVMLDQVlBs2RsS2jn9lrA="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ra3pNw3NJ9hSSxb1O7piMD+1cPeofTAYbdM9WRlwYKo="; meta = { description = "Simple, concise, concatenative scripting language"; diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix index f2e1c8439ebf..693b775bdf72 100644 --- a/pkgs/by-name/sp/spotify-player/package.nix +++ b/pkgs/by-name/sp/spotify-player/package.nix @@ -56,7 +56,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9iXsZod1aLdCQYUKBjdRayQfRUz770Xw3/M85Rp/OCw="; }; - cargoHash = "sha256-e9MAq31FTmukHjP5VoAuHRGf28vX9aPUWjOFfH9uY9g="; + useFetchCargoVendor = true; + cargoHash = "sha256-LX4DuIIL9jGQLEzECydIdPEdPGdRTYREwFbMCS8CoNo="; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index 627a15215fdc..c2d5da644a0b 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -34,7 +34,8 @@ rustPackages.rustPlatform.buildRustPackage rec { hash = "sha256-0HDrnEeqynb4vtJBnXyItprJkP+ZOAKIBP68Ht9xr2c="; }; - cargoHash = "sha256-bRO7cK+BlAUEr6DlK7GSJf/WNoCM4SYq/lZ8e9ENJZw="; + useFetchCargoVendor = true; + cargoHash = "sha256-12yil8Xg3xHeOe/oq9O+Cvkgrx1KhmlQ11d9QHCxtsk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sp/spytrap-adb/package.nix b/pkgs/by-name/sp/spytrap-adb/package.nix index 4f619f13e486..48b3d592554c 100644 --- a/pkgs/by-name/sp/spytrap-adb/package.nix +++ b/pkgs/by-name/sp/spytrap-adb/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CL+MxSzHpOq2MXmsaa9sipQZ06Kkzy4r1eFjUrPSj1E="; }; - cargoHash = "sha256-Utg3ds0nGAUjBfuEjGfkohkmssKIZT1NiH9hiFnW4ps="; + useFetchCargoVendor = true; + cargoHash = "sha256-vVDMfst7Uh5q92SYTV9CQdZRoi8ZfjKlqDcQm+YfrjE="; env.SPYTRAP_ADB_BINARY = lib.getExe' android-tools "adb"; diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix index 9e128b43e1c0..678d220a165b 100644 --- a/pkgs/by-name/sq/sql-studio/package.nix +++ b/pkgs/by-name/sq/sql-studio/package.nix @@ -29,7 +29,8 @@ in rustPlatform.buildRustPackage { inherit pname version src; - cargoHash = "sha256-Hw7VbcU/Y8wl4KObHvQfUXRORlbsuLHTQDMzk3Qel20="; + useFetchCargoVendor = true; + cargoHash = "sha256-pvoQ73aW5XbnQJVCuV7lyrN3mg85Ye4913RzrA3S8J4="; preBuild = '' cp -pr --reflink=auto -- ${ui} ui/dist diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix index 148cc8d944a8..2b925fdb2333 100644 --- a/pkgs/by-name/sq/sqlpage/package.nix +++ b/pkgs/by-name/sq/sqlpage/package.nix @@ -74,7 +74,8 @@ rustPlatform.buildRustPackage rec { "$(cat ${tomselect})" ''; - cargoHash = "sha256-/B8tayEbyOsc0/po1YQKtp694X12B3I50OU4cMwJo8Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-pXmWXHoGbo1YRUjHGVEMZDk4YYqP8XwcDSPWX474Z2c="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix index f4e4f49ff6f7..f2f6dfdb8374 100644 --- a/pkgs/by-name/sq/sqruff/package.nix +++ b/pkgs/by-name/sq/sqruff/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Vlre3D1ydDqFdysf5no2rW2V2U/BimhCeV1vWZ2JPSM="; }; - cargoHash = "sha256-WqkHZcA4FBm8zubAnDrJGH+fgLVIxsNNm3B+mdj5Sxw="; + useFetchCargoVendor = true; + cargoHash = "sha256-sFKq7CxQ7yoPqDQOR9Nr111RCiSA6bK50QvhHkaU5Go="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix index 0e4023fd9268..22d472ce9800 100644 --- a/pkgs/by-name/sr/srgn/package.nix +++ b/pkgs/by-name/sr/srgn/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KshZ7QnY4TXng9KCcIzdt0E4R83cTEr6fGo9p/riCPU="; }; - cargoHash = "sha256-nWBDVrRzjJY3wzzGdnrcRD7Sj+dmCYprpX5p4PP/Yrw="; + useFetchCargoVendor = true; + cargoHash = "sha256-g3ShEKslU01zDLCNHQZ+ZxF1ErCh7jSRELD2wtxWRSs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sr/srisum/package.nix b/pkgs/by-name/sr/srisum/package.nix index 5fce3fcacab2..085d7f7011fe 100644 --- a/pkgs/by-name/sr/srisum/package.nix +++ b/pkgs/by-name/sr/srisum/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-Nw3uTGOcz1ivAm9X+PnOdNA937wuK3vtJQ0iJHlHVdw="; }; - cargoHash = "sha256-q6FGykY+HmU3/jMaGRO36OlYGVLG9mU8yZ8j/Shux3s="; + useFetchCargoVendor = true; + cargoHash = "sha256-J++aj925krYvOTzcuVZSEk+eYupL0M7o407fd1dCjeA="; doInstallCheck = true; diff --git a/pkgs/by-name/ss/sshs/package.nix b/pkgs/by-name/ss/sshs/package.nix index 3f4757d47c01..3d1dff4682fb 100644 --- a/pkgs/by-name/ss/sshs/package.nix +++ b/pkgs/by-name/ss/sshs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8tIIpGEQBXfLQ/Bok4KrpDGwoYhIQz/ylg6fUc6mBdc="; }; - cargoHash = "sha256-w+KYaYO3LXUEk4If6LSncS5KZJyNl8JMLGa+NtF3hf0="; + useFetchCargoVendor = true; + cargoHash = "sha256-U1E11NB+MVte31hfSAwhzXsId7U5uGy5C6Ubk6RPNvA="; passthru.tests.version = testers.testVersion { package = sshs; }; diff --git a/pkgs/by-name/ss/sss-cli/package.nix b/pkgs/by-name/ss/sss-cli/package.nix index 0c7db346097f..5fb3fdc43c2c 100644 --- a/pkgs/by-name/ss/sss-cli/package.nix +++ b/pkgs/by-name/ss/sss-cli/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./fix-cargo-lock.patch ]; - cargoHash = "sha256-nKb0J9ym3ZYC80KemwQwT5vVtQUngYD4/091hAIYAiU="; + useFetchCargoVendor = true; + cargoHash = "sha256-yutjlaqLf8R8KmdeKF+CHz/s/b6T+GB9bOl2liMBmMQ="; meta = with lib; { homepage = "https://github.com/dsprenkels/sss-cli"; diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 5ad612ab29bd..3e1ccb9d5293 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage { fetchSubmodules = true; }; - cargoHash = "sha256-4MUw9nBx4uZgUOGQksiurFuyStmWXwYuOOGT1e9AoLg="; + useFetchCargoVendor = true; + cargoHash = "sha256-k0pNNLwFRLI7eHjVwHGjgrnX4moWOwoWvMiyPfGMgCo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix index da9d1bafd057..097e2bae31b6 100644 --- a/pkgs/by-name/st/star-history/package.nix +++ b/pkgs/by-name/st/star-history/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qwpUV+amv/n/lRcFYf/TgXoj3aHdg3kZJigEeA0fKBg="; }; - cargoHash = "sha256-dKC+ZrQEcJW8jiYmFWBVWYiFzJ4guGAw4X4nazi9u6Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-Lzuzb0d1p5JGrz1cp+GuB7uoCIV+xJLNs6N22Gd8Nbs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/st/starlark-rust/package.nix b/pkgs/by-name/st/starlark-rust/package.nix index 10d84e1796a1..6b5ab174261b 100644 --- a/pkgs/by-name/st/starlark-rust/package.nix +++ b/pkgs/by-name/st/starlark-rust/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1M3p5QHMOBgmdEyr31Bhv7X8UdUmoeL0o1hWaw2tahQ="; }; - cargoHash = "sha256-zcU0xdVDFNfUZR+t/HdwRXEw4/5hmKgUX20gFm7lVhk="; + useFetchCargoVendor = true; + cargoHash = "sha256-BSXbFKR4AOKhssj+m5PIfgaoeRVDK+KRkApi8FUa8jg="; meta = with lib; { description = "Rust implementation of the Starlark language"; diff --git a/pkgs/by-name/st/starry/package.nix b/pkgs/by-name/st/starry/package.nix index fc5b7fb2b658..244d19a3eed8 100644 --- a/pkgs/by-name/st/starry/package.nix +++ b/pkgs/by-name/st/starry/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/ZUmMLEqlpqu+Ja/3XjFJf+OFZJCz7rp5MrQBEjwsXs="; }; - cargoHash = "sha256-L6s1LkWnjht2VLwq1GOFiIosnZjFN9tDSLpPtokmj9o="; + useFetchCargoVendor = true; + cargoHash = "sha256-NNQhU6NVacRCzFp2hWcBvHvD6zPOlTvII8n7k505HrY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix index 25895853ac6b..68d88a29326d 100644 --- a/pkgs/by-name/st/static-web-server/package.nix +++ b/pkgs/by-name/st/static-web-server/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vrv/qCn57wO3no3ASgaJFAhTjFyW5M4kZkfpgkpYYhY="; }; - cargoHash = "sha256-JDZKcKLVYTrmhaJyZcTECCDbAjRewr1A/XiaG4lpsjA="; + useFetchCargoVendor = true; + cargoHash = "sha256-i+x8Box4gz79qnrcI2XXkSZ3u3h5qHKwJhOBc+Lx+Nw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix index 8aa5d23e4c93..5828124fcaa0 100644 --- a/pkgs/by-name/st/statix/package.nix +++ b/pkgs/by-name/st/statix/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bMs3XMiGP6sXCqdjna4xoV6CANOIWuISSzCaL5LYY4c="; }; - cargoHash = "sha256-QF7P0CWlKfBzVQC//eKhf/u1qV9AfLIJDxWDDWzMG8g="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pi1q2qNLjQYr3Wla7rqrktNm0StszB2klcfzwAnF3tE="; buildFeatures = lib.optional withJson "json"; diff --git a/pkgs/by-name/st/steam-acf/package.nix b/pkgs/by-name/st/steam-acf/package.nix index 664ff5f46586..787c67fbdef1 100644 --- a/pkgs/by-name/st/steam-acf/package.nix +++ b/pkgs/by-name/st/steam-acf/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "16q3md7cvdz37pqm1sda81rkjf249xbsrlpdl639r06p7f4nqlc2"; }; - cargoHash = "sha256-BneC0zFcyMntCePpnxF9bRTK6vTMnqUvHMEcqoHd9Ds="; + useFetchCargoVendor = true; + cargoHash = "sha256-3BbSTzFcQju0n7pwFqvrJB2sU8RM47Svi4lndlhkYmE="; meta = with lib; { description = "Tool to convert Steam .acf files to JSON"; diff --git a/pkgs/by-name/st/steam-tui/package.nix b/pkgs/by-name/st/steam-tui/package.nix index e21e353737d5..822b234fe549 100644 --- a/pkgs/by-name/st/steam-tui/package.nix +++ b/pkgs/by-name/st/steam-tui/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-3vBIpPIsh+7PjTuNNqp7e/pdciOYnzuGkjb/Eks6QJw="; }; - cargoHash = "sha256-poNPdrMguV79cwo2Eq1dGVUN0E4yG84Q63kU9o+eABo="; + useFetchCargoVendor = true; + cargoHash = "sha256-/39MrHCdJGTBTZplQcwYk6zpaVFYHpRKHhZC1GTNysY="; nativeBuildInputs = [ openssl diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index d8da7cca9fb8..e85c2268b53a 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Cxl6FczWr5kAYt+q1m3HLEKCBeQz3TcW/aaOxsBcuwc="; }; - cargoHash = "sha256-YKlTEKk2pbwLIFZjK/sBIIYwu0DYarVeJsIB9FSR9XM="; + useFetchCargoVendor = true; + cargoHash = "sha256-ku5O7coA9OKCLNIkp/WPSgYsTO546/v3RZ/PcNkGRmA="; nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/st/stgit/package.nix b/pkgs/by-name/st/stgit/package.nix index 6ef1afe79ce0..741549edafa5 100644 --- a/pkgs/by-name/st/stgit/package.nix +++ b/pkgs/by-name/st/stgit/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-XyBVboNrvhOSZBPd5ZqdMuF261TpFzduC6XQtKJGntE="; }; - cargoHash = "sha256-xh8TW8TgwaCqqKVyP9ImHkKAIwW5c6AC1pZD5tu0XBs="; + useFetchCargoVendor = true; + cargoHash = "sha256-G2n9vSs+9N0v/rR5qo9HstHOfvJVeE8MPyABs2XD0Ic="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/strace-analyzer/package.nix b/pkgs/by-name/st/strace-analyzer/package.nix index 5c257e53cd10..5256106beb0e 100644 --- a/pkgs/by-name/st/strace-analyzer/package.nix +++ b/pkgs/by-name/st/strace-analyzer/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-KbdQeZoWFz4D5txu/411J0HNnIAs3t5IvO30/34vBek="; }; - cargoHash = "sha256-t1BFc5cNOQJIbufFH2hHI4f7SMrZ5mwVODXukdbHf3M="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZvbWJSe/jQEswcdFM/Akb6hW/0iqMNbtEyzcxsbemFQ="; nativeCheckInputs = [ strace ]; diff --git a/pkgs/by-name/st/stratovirt/package.nix b/pkgs/by-name/st/stratovirt/package.nix index 843390d848fd..77793972eec7 100644 --- a/pkgs/by-name/st/stratovirt/package.nix +++ b/pkgs/by-name/st/stratovirt/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI="; }; - cargoHash = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I="; + useFetchCargoVendor = true; + cargoHash = "sha256-tNFF5WdQyNqkj2ahtpOfGTHriHpMGtV1UurO3teKFcU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix index 7245dedf6465..b8170d1856f8 100644 --- a/pkgs/by-name/st/stu/package.nix +++ b/pkgs/by-name/st/stu/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-an/FNDwtP8EKPwuhu/Dkqj5hZym6wpySEfr66C21pvw="; }; - cargoHash = "sha256-qZG+3Wh3R8LRvSQR5RQ1ZwAbk8s1mxg10P5I9clcMSo="; + useFetchCargoVendor = true; + cargoHash = "sha256-BrRy0jTDA6SEikoQOzajBMKOPwK6AQRdehlK5rBZTgw="; passthru.tests.version = testers.testVersion { package = stu; }; diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix index c6d6d82c827d..75424af1573f 100644 --- a/pkgs/by-name/st/stylance-cli/package.nix +++ b/pkgs/by-name/st/stylance-cli/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YN7Y8dxwpZel1SeEgyckh4ZPuRqcAsNvc/fGRgvzeDw="; }; - cargoHash = "sha256-VKfQzsTTKIbh+X0suXyUXDsd8sDSRsc5SnO8qxcxGPQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-qIxmegxxFnN0SXWArbPyaAM2PwMt1IUYPbhbkKOZ0lY="; meta = with lib; { description = "Library and cli tool for working with scoped CSS in rust"; diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix index 06e2e45a26be..7f51de473ca4 100644 --- a/pkgs/by-name/st/stylua/package.nix +++ b/pkgs/by-name/st/stylua/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-sZrymo1RRfDLz8fPa7FnbutSpOCFoyQPoFVjA6BH5qQ="; }; - cargoHash = "sha256-fgj6C9Mq8Xyg1nuMZ5GtT4GkK+kUFtGfP8V8B8sLEgY="; + useFetchCargoVendor = true; + cargoHash = "sha256-uQCF/u1+slouHypepoPQtaYcsMD7NXhK1qcOl52txXs="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/pkgs/by-name/su/sub-batch/package.nix b/pkgs/by-name/su/sub-batch/package.nix index 0cfeddd572db..90d335096c62 100644 --- a/pkgs/by-name/su/sub-batch/package.nix +++ b/pkgs/by-name/su/sub-batch/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-TOcK+l65iKON1kgBE4DYV/BXACnvqPCshavnVdpnGH4="; }; - cargoHash = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI="; + useFetchCargoVendor = true; + cargoHash = "sha256-eT4u/IHj+yqeLQZ7E4cWAJFMT503zHq7HYyIhsoaj6s="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix index 80bcc27a890e..23b1bec70b7a 100644 --- a/pkgs/by-name/su/subxt/package.nix +++ b/pkgs/by-name/su/subxt/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mUW1foT3JkpsnieJutL+GZZXiTcRUklnjfoaWcH8ccE="; }; - cargoHash = "sha256-+psdikles6ICg2eSBGxJoiG5EZG8voR2fs6PGnOWvDc="; + useFetchCargoVendor = true; + cargoHash = "sha256-DcoD74uxO1aGZ50qVnfPiCRsQf3G0E0ANX33WdLSNOo="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; diff --git a/pkgs/by-name/su/sudachi-rs/package.nix b/pkgs/by-name/su/sudachi-rs/package.nix index 5200749808ef..7e60a4643792 100644 --- a/pkgs/by-name/su/sudachi-rs/package.nix +++ b/pkgs/by-name/su/sudachi-rs/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { --replace '"resources"' '"${placeholder "out"}/share/resources"' ''; - cargoHash = "sha256-fFvuxLOerqdjYogfTH3JiSlNPw2t7QT09lxp7prIpA8="; + useFetchCargoVendor = true; + cargoHash = "sha256-/VKveTtB8BbWgRBEzWBjrSrW84uFcz08cz6tZTuMMeE="; # prepare the resources before the build so that the binary can find sudachidict preBuild = '' diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix index 17a7b4744fa2..5622aa275749 100644 --- a/pkgs/by-name/su/sudo-rs/package.nix +++ b/pkgs/by-name/su/sudo-rs/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-aXKkEdg44AJTcaGyllQmyUON3Z+irIatz06/l0cbi+E="; }; - cargoHash = "sha256-laTcGi2pwc9uWjum03PviyakVMmjijKgxfIPjIpoRy8="; + useFetchCargoVendor = true; + cargoHash = "sha256-q81thjNDGF+7zARThrPhS1gnJIJ1lnwmCyOYngjjkKk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/su/supergfxctl/package.nix b/pkgs/by-name/su/supergfxctl/package.nix index e0d76bac985b..59ccbc77eeae 100644 --- a/pkgs/by-name/su/supergfxctl/package.nix +++ b/pkgs/by-name/su/supergfxctl/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ie5JPHBvypUtPStwA/aO4GeQ/qbHTzUJF3T4QuW6JNc="; }; - cargoHash = "sha256-qZC4axeRnKgUNGDFzmdvN/mwkcqsh8KwLlM6oGT19e8="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ef4lxuN7s5X/9I7VSub5DZVjQG8DhdMr/7CRtd2x9rs="; postPatch = '' substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd diff --git a/pkgs/by-name/su/supertag/package.nix b/pkgs/by-name/su/supertag/package.nix index fe79aaf58681..f4d2cf48f5a3 100644 --- a/pkgs/by-name/su/supertag/package.nix +++ b/pkgs/by-name/su/supertag/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { # patches Cargo.lock to include a more up-to-date version of lexical-core cargoPatches = [ ./cargo-lock-update-lexical-core.patch ]; - cargoHash = "sha256-W5Emkbe1jI9Z+irMckD/3gJO47rACa9E5k5dqAFC1yQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-i+v2PK07GHmTaLT0Bcpitd1g3Mrol28S2a2lBwBETb8="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index ebab4440a260..83416ddc8aac 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kTTZx/IXXJrkC0qm4Nx0hYPbricNjwFshCq0aFYCTo0="; }; - cargoHash = "sha256-K62RqJqYyuAPwm8zLIiASH7kbw6raXS6ZzINMevWav0="; + useFetchCargoVendor = true; + cargoHash = "sha256-yJfpxklHD/qbEoUS4OMAzlc9/0d/iW3EABU6AK/Maqo="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix index c37197a5baea..c6a0ed83a860 100644 --- a/pkgs/by-name/sv/svd2rust/package.nix +++ b/pkgs/by-name/sv/svd2rust/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KLwIwJtPBQ8Sa94/IEJhIGTx/n3oYQKINmNV5L5TJV0="; }; - cargoHash = "sha256-4a89Do57KFKu/RDTB4BxUxVlO46HL5aEhhHmnzLuZGo="; + useFetchCargoVendor = true; + cargoHash = "sha256-hac29ixPEjm/07isiEndlxyFFDib2K5FAAEN3WsdHmw="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index 6666c5b12448..f6a0e67a6f7a 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cZLLpFYjKIF4bhZJWXFUpTSKSUOWkLZ0DTQ0PpZnPIg="; }; - cargoHash = "sha256-Pt810QwfO+b6L5GYtzDAxIIuD/qv9inGMJAGjVIVUtM="; + useFetchCargoVendor = true; + cargoHash = "sha256-UEXFkiz4brOXGDa0Ffea712Ng5E8t/yBm4H8y7Lz9Mc="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/by-name/sv/svg2pdf/package.nix b/pkgs/by-name/sv/svg2pdf/package.nix index 60b1f49838d9..5fb63d9ce2ff 100644 --- a/pkgs/by-name/sv/svg2pdf/package.nix +++ b/pkgs/by-name/sv/svg2pdf/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9v4A0mZjknc6a933b3ifPJo3xyem17Vpp0Wu0sUS0DM="; }; - cargoHash = "sha256-oCyvssTtUr8FR0XaFx2syxE8+zWXOGrf8kvQiBCyq18="; + useFetchCargoVendor = true; + cargoHash = "sha256-JS7VhgirhI3UXDrdZ+WYg5Ac42/Q2xXQxKXSnkdWpE0="; cargoBuildFlags = [ "-p=svg2pdf-cli" diff --git a/pkgs/by-name/sv/svgbob/package.nix b/pkgs/by-name/sv/svgbob/package.nix index e2dd2e92ca2c..9761700ecb9a 100644 --- a/pkgs/by-name/sv/svgbob/package.nix +++ b/pkgs/by-name/sv/svgbob/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qSY12WjSPMoWqJHkYnPvhCtZAuI3eq+sA+/Yr9Yssp8="; }; - cargoHash = "sha256-dgOEztAlX823M+bc+vnrOvmeWtxxCsCR6+k1Yho82EM="; + useFetchCargoVendor = true; + cargoHash = "sha256-nMo8qO0dKwtZJY78+r4kLrR9Cw6Eu5Hq8IPp6ilJqfk="; postInstall = '' mv $out/bin/svgbob_cli $out/bin/svgbob diff --git a/pkgs/by-name/sv/svgcleaner/package.nix b/pkgs/by-name/sv/svgcleaner/package.nix index aa9f98b6481d..c848de1a75be 100644 --- a/pkgs/by-name/sv/svgcleaner/package.nix +++ b/pkgs/by-name/sv/svgcleaner/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pRDRRVb8Lyna8X/PEjS9tS5dbG4g7vyMCU5AqPlpxec="; }; - cargoHash = "sha256-SZWmJGiCc/FevxMWJpa8xKVz/rbll52oNbFtqPpz74g="; + useFetchCargoVendor = true; + cargoHash = "sha256-5HRhKW1VbecUdc+iad3hOKsR82JI2Pgtio3z/8pqZIg="; meta = with lib; { description = "Clean and optimize SVG files from unnecessary data"; diff --git a/pkgs/by-name/sv/svlint/package.nix b/pkgs/by-name/sv/svlint/package.nix index c67a2b2217c3..9c680b572fe4 100644 --- a/pkgs/by-name/sv/svlint/package.nix +++ b/pkgs/by-name/sv/svlint/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-u61gmkO7eij7r1A1RPk0ro+pml7ZmMsg0ukJLCFNaD0="; }; - cargoHash = "sha256-HBfCTOETQ1hHzLFDw12W58omRmliiWDFGSrmr3PELD8="; + useFetchCargoVendor = true; + cargoHash = "sha256-0vL9fdZqxGleEPTXq+/R+1GzqD91ZTgwt2C8sx0kUbM="; cargoBuildFlags = [ "--bin" diff --git a/pkgs/by-name/sv/svls/package.nix b/pkgs/by-name/sv/svls/package.nix index da278e226a9e..fa9bbdf1dfa5 100644 --- a/pkgs/by-name/sv/svls/package.nix +++ b/pkgs/by-name/sv/svls/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-DuwH0qie8SctvOGntljOdTRMGKrNFPycdaFG3QZxihA="; }; - cargoHash = "sha256-vDpuIWB5pbhYrFgQ1ogALMJpZvy8ETZtneX1fjpjl+0="; + useFetchCargoVendor = true; + cargoHash = "sha256-L+MTU92SUohhQ5Oy2ziU/1f4IxFcrW2JGUSx7iPxl/I="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/pkgs/by-name/sw/sway-easyfocus/package.nix b/pkgs/by-name/sw/sway-easyfocus/package.nix index 65d7ed9018c2..dfc68a83f757 100644 --- a/pkgs/by-name/sw/sway-easyfocus/package.nix +++ b/pkgs/by-name/sw/sway-easyfocus/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ogqstgJqUczn0LDwpOAppC1J/Cs0IEOAXjNAnbiKn6M="; }; - cargoHash = "sha256-lAyKW6tjb4lVNA8xtvXLYYiLeKxSe/yfyY6h/f/WuP4="; + useFetchCargoVendor = true; + cargoHash = "sha256-VxcMHh1eIiHugpTFpclwuO0joY95bPz6hVIBHQwB6ZA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sw/sway-new-workspace/package.nix b/pkgs/by-name/sw/sway-new-workspace/package.nix index a38583a1d1e3..c85e735c2bdb 100644 --- a/pkgs/by-name/sw/sway-new-workspace/package.nix +++ b/pkgs/by-name/sw/sway-new-workspace/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CoSfpsaGqNNR5jdAQys3nQxshI0NXXr8MacUnSTKFNo="; }; - cargoHash = "sha256-uGjNneIfhI49gGnH/MPTzXWjBJPdnAFggZZQfovBxDM="; + useFetchCargoVendor = true; + cargoHash = "sha256-Gxqg0FqIU7e1oZ1inCe/xN3IXyQkMAt3yfbAfhfxy1o="; meta = with lib; { description = "Command to create new Sway workpaces"; diff --git a/pkgs/by-name/sw/sway-overfocus/package.nix b/pkgs/by-name/sw/sway-overfocus/package.nix index 619f2b4babde..55bd059840bd 100644 --- a/pkgs/by-name/sw/sway-overfocus/package.nix +++ b/pkgs/by-name/sw/sway-overfocus/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-trpjKA0TV8InSfViIXKnMDeZeFXZfavpiU7/R3JDQkQ="; }; - cargoHash = "sha256-uAzD4x7pSyem2juQi/4223Cbt6pVt4gynhn2lWMSKSQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-RtiXcUvId+bf8t74Ld2JXQGx+o094Qo3O5kt+ldm1Ag="; # Crate without tests. doCheck = false; diff --git a/pkgs/by-name/sw/sway-scratch/package.nix b/pkgs/by-name/sw/sway-scratch/package.nix index 210a08de811e..4a6b914ecfca 100644 --- a/pkgs/by-name/sw/sway-scratch/package.nix +++ b/pkgs/by-name/sw/sway-scratch/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1N/33XtkEWamgQYNDyZgSSaaGD+2HtbseEpQgrAz3CU="; }; - cargoHash = "sha256-Z+ls6OCrDkmfxRTD+DOQhr7p183RRhXaXm8a/mWBixw="; + useFetchCargoVendor = true; + cargoHash = "sha256-ba0d7rbGwK3KNxd6pdoqqCwfHrs/Lt7hl0APkGT+0gw="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sw/swaycons/package.nix b/pkgs/by-name/sw/swaycons/package.nix index 28c8faeace16..54ea44a8fb47 100644 --- a/pkgs/by-name/sw/swaycons/package.nix +++ b/pkgs/by-name/sw/swaycons/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vyZcfBH2mry8Yd41QPX4+yLv0nS9J1yrgg7lpslJs7M="; }; - cargoHash = "sha256-cdZ7DpH//c9TulvPYd6aaXpQHYC1b+T7BrxAyr56Pf0="; + useFetchCargoVendor = true; + cargoHash = "sha256-LE+YEFmkB4EBQcuxbExN9Td5LWpI4AZgyVHXdTyq7gU="; meta = with lib; { description = "Window Icons in Sway with Nerd Fonts!"; diff --git a/pkgs/by-name/sw/swayest-workstyle/package.nix b/pkgs/by-name/sw/swayest-workstyle/package.nix index c42f0007ed27..7daf1b43439a 100644 --- a/pkgs/by-name/sw/swayest-workstyle/package.nix +++ b/pkgs/by-name/sw/swayest-workstyle/package.nix @@ -17,7 +17,8 @@ in rustPlatform.buildRustPackage { inherit pname version src; - cargoHash = "sha256-sLQPq3tyWq1TxxeFyg05qBt+KGI/vO0jLU7wJLiqcYA="; + useFetchCargoVendor = true; + cargoHash = "sha256-gDyVT+mrrQ0HTMY+XYwskgYvzst9oFpQDvTjBIodrkY="; # No tests doCheck = false; diff --git a/pkgs/by-name/sw/swayr/package.nix b/pkgs/by-name/sw/swayr/package.nix index 36adeddd3139..0a27f635a65a 100644 --- a/pkgs/by-name/sw/swayr/package.nix +++ b/pkgs/by-name/sw/swayr/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-dliRPKtCJ6mbBl87QoDsHJ2+iaI9nVsWWWwWAkQ1RqE="; }; - cargoHash = "sha256-6e4eJIGCrkOdoOTtbYvTLjNVA9FQBQUhgOyM/064/Sw="; + useFetchCargoVendor = true; + cargoHash = "sha256-n32mjAycWaNjYUU1gGUwZmH+3plsf+gXB9Tdt0I0D+c="; patches = [ ./icon-paths.patch diff --git a/pkgs/by-name/sw/swayrbar/package.nix b/pkgs/by-name/sw/swayrbar/package.nix index 85a92cbdd4cd..7be7731ecd64 100644 --- a/pkgs/by-name/sw/swayrbar/package.nix +++ b/pkgs/by-name/sw/swayrbar/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-qfk4yqJkqTiFKFZXCVPPZM0g0/+A8d8fDeat9ZsfokI="; }; - cargoHash = "sha256-+YhBwQWDxjS8yAS/+uX7I72qNad9N/xQCVr4QHp+kyw="; + useFetchCargoVendor = true; + cargoHash = "sha256-rByw6l/4CATEIDS5h1owGCr1x8Qt4+lzabLwni7PYMc="; # don't build swayr buildAndTestSubdir = pname; diff --git a/pkgs/by-name/sw/swaysome/package.nix b/pkgs/by-name/sw/swaysome/package.nix index 755456dad7a5..c6872fe0124e 100644 --- a/pkgs/by-name/sw/swaysome/package.nix +++ b/pkgs/by-name/sw/swaysome/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2Q88/XgPN+byEo3e1yvwcwSQxPgPTtgy/rNc/Yduo3U="; }; - cargoHash = "sha256-rGmQihmVGKOXgX2oEQiIagdyUwzOteJfh5jxfoeD5bs="; + useFetchCargoVendor = true; + cargoHash = "sha256-/TW1rPg/1t3n4XPBOEhgr1hd5PJMLwghLvQGBbZPZ34="; meta = with lib; { description = "Helper to make sway behave more like awesomewm"; diff --git a/pkgs/by-name/sw/swaywsr/package.nix b/pkgs/by-name/sw/swaywsr/package.nix index cdec0aab22ab..3470218ef85a 100644 --- a/pkgs/by-name/sw/swaywsr/package.nix +++ b/pkgs/by-name/sw/swaywsr/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6hGEcJz+zGfwz1q+XKQYfyJJK7lr+kCgk2/uiq1xP0M="; }; - cargoHash = "sha256-zoV2vy41fVsX8BtddURqQymMX4Zpso+GOBBqoVr3tYo="; + useFetchCargoVendor = true; + cargoHash = "sha256-u+aMwj+IxFY+fSAECkKr8dSPVw2q+FXZpgwwexu7BFU="; nativeBuildInputs = [ python3 ]; buildInputs = [ libxcb ]; diff --git a/pkgs/by-name/sw/swc/package.nix b/pkgs/by-name/sw/swc/package.nix index 2355bb880189..ae2a069a9bd3 100644 --- a/pkgs/by-name/sw/swc/package.nix +++ b/pkgs/by-name/sw/swc/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6n6zHMV87h1kmjzEmdE86/toHI99q2HO1EEGHUE9sg8="; }; - cargoHash = "sha256-/Ku0W+L2mqVYDSkd2zRqM7UhHueXya4zjewp/xO/XlQ"; + useFetchCargoVendor = true; + cargoHash = "sha256-YuqoT5vGuUZfTenSgPPrC/7bTC0syiiiMYF/y0szG4Q="; meta = with lib; { description = "Rust-based platform for the Web"; diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix index 7b7c68bfd58a..5a3ce1827aef 100644 --- a/pkgs/by-name/sw/swim/package.nix +++ b/pkgs/by-name/sw/swim/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GJQzz9o0QKbnE8l1MEjdW36S/rJo2GoaK02Qnl9dtEA="; }; - cargoHash = "sha256-OQpKy/TVsJV/AjqvvdqTnAnAc1+YhN83N1EyNfgF4qg="; + useFetchCargoVendor = true; + cargoHash = "sha256-J4u89zP3+AI4nSUJkQ4HNGmbwLnmCYUf4WVRBhPVAC4="; preConfigure = '' # de-vendor spade git submodule diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index 295ce2418810..03027ea2c9d6 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-k7qh375SuonybwgECI9Bl898FFigVxJ4L174AUDxntk="; }; - cargoHash = "sha256-iupVEo7ZEcKfPw3MbZoQqwWw9lKAbcFKeiLy+1DwXHU="; + useFetchCargoVendor = true; + cargoHash = "sha256-RpMHq8y80syLKj0uqpfxg3W3y4W4laBsGK9n27AdwFY="; nativeBuildInputs = [ mandoc diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix index 6f0938a74ebf..51df682001f9 100644 --- a/pkgs/by-name/sy/syndicate-server/package.nix +++ b/pkgs/by-name/sy/syndicate-server/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { rev = "${pname}-v${version}"; hash = "sha256-DVgFlJCqaTmQ7eL2LQ8rkIbvaEfwx+NDeXRA8qB+/Qo="; }; - cargoHash = "sha256-eSzRKTUDkx0i2z5y5rm1A799CfLPqd+txpmbolqe+PQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-P/NYyoH/9kkyBwCGORK9bxEjyye12SP3hRDnL9c6i78="; nativeBuildInputs = [ pkg-config versionCheckHook diff --git a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix index e4fc5166a824..69574c66581f 100644 --- a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix +++ b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-3FUcJHuMOSbtE0sL6N2AvedyseJ7RiUbo8jtY/nWAW0="; + useFetchCargoVendor = true; + cargoHash = "sha256-0UmEWQz+8fKx8Z1slVuVZeiWN9JKjEKINgXzZ6a4jkE="; postInstall = '' install -Dm444 linux/com.system76.keyboardconfigurator.desktop -t $out/share/applications diff --git a/pkgs/by-name/sy/system76-scheduler/package.nix b/pkgs/by-name/sy/system76-scheduler/package.nix index d8e0ebe89d58..f45d3836b7fd 100644 --- a/pkgs/by-name/sy/system76-scheduler/package.nix +++ b/pkgs/by-name/sy/system76-scheduler/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { rev = version; hash = "sha256-5GiHmu++YRCewDHm/qxKmQwDIAZwlW5Eya/fDriVSdA="; }; - cargoHash = "sha256-HxNqGe+KrmOoLgaKY9pniPWFF/hehSi1dgZn4LPE7OA="; + useFetchCargoVendor = true; + cargoHash = "sha256-o2Ma9WNmBz+18SSMBPXYK4BXzHFLQwa3JWhq4S7jSBg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index 8a1d05f3338c..470ebe3deb15 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7I4PM4ZQVtDESfchX0/HGu0Y94BxMCLNIrPw8bSokCQ="; }; - cargoHash = "sha256-Ur1/3AAN55doW8xyeoeuU6C1KvjTQQjooCl9WVDAGuM="; + useFetchCargoVendor = true; + cargoHash = "sha256-bnnqGWX7xA4+55qDY7hzimVDPKaVD4sX//tk8Tgkqkc="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/sy/systemfd/package.nix b/pkgs/by-name/sy/systemfd/package.nix index 4751cf78b6b5..a96eaaf35b87 100644 --- a/pkgs/by-name/sy/systemfd/package.nix +++ b/pkgs/by-name/sy/systemfd/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-OUsQBHymoiLClRS45KE4zsyOh/Df8psP0t8aIkKNZsM="; }; - cargoHash = "sha256-4lgl/oZwxRLO88VHaHlu5/gRR9iOCIkYzRYaw5xWKGg="; + useFetchCargoVendor = true; + cargoHash = "sha256-89yFfyByKistkzrvBqwH0FNGgnjKtvDpvDVsiWkWeKM="; meta = { description = "Convenient helper for passing sockets into another process"; diff --git a/pkgs/by-name/sy/systeroid/package.nix b/pkgs/by-name/sy/systeroid/package.nix index 42eb209f5aad..a86998a3e5e1 100644 --- a/pkgs/by-name/sy/systeroid/package.nix +++ b/pkgs/by-name/sy/systeroid/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { --replace '"/usr/share/doc/kernel-doc-*/Documentation/*",' '"${linux-doc}/share/doc/linux-doc/*",' ''; - cargoHash = "sha256-ErNSsObo4Tbt9uvbIqOgR6dnSsL25urqocSGN/Won4A="; + useFetchCargoVendor = true; + cargoHash = "sha256-KopbqiQKHzz40SYJXexIAUCoF7224JtmQ0jkhFSTr4c="; buildInputs = [ xorg.libxcb diff --git a/pkgs/by-name/sz/szyszka/package.nix b/pkgs/by-name/sz/szyszka/package.nix index caccd45c1f23..97cb882bff2c 100644 --- a/pkgs/by-name/sz/szyszka/package.nix +++ b/pkgs/by-name/sz/szyszka/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LkXGKDFKaY+mg53ZEO4h2br/4eRle/QbSQJTVEMpAoY="; }; - cargoHash = "sha256-WJR1BogNnQoZeOt5yBFzjYNZS8OmE84R1FbQpHTb7V0="; + useFetchCargoVendor = true; + cargoHash = "sha256-0VlhBd1GpmynNflssizg+Y9D8Hr40rT7OzOSP4AmhxY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/t-/t-rex/package.nix b/pkgs/by-name/t-/t-rex/package.nix index e0c41b0d0abf..3001f15a4a94 100644 --- a/pkgs/by-name/t-/t-rex/package.nix +++ b/pkgs/by-name/t-/t-rex/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oZZrR86/acoyMX3vC1JGrpc8G+DEuplqfEAnaP+TBGU="; }; - cargoHash = "sha256-nxq4mX2Sy6Hyi8tA2CQsQwISB/kau4DEkAgIm4SvGns="; + useFetchCargoVendor = true; + cargoHash = "sha256-z0YpX1dMWcn2N6fKDbT7lYEQC5PaDNNHi4CW88d/dgI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix index c84c66a4d655..b98a2fdfc096 100644 --- a/pkgs/by-name/ta/tabiew/package.nix +++ b/pkgs/by-name/ta/tabiew/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Q/GX3kcGx83h0XFlG0r2RGpoh63ijnaM4mp/ewrf920="; }; - cargoHash = "sha256-gG9zb4DrgTiYOQ2ZFHz0Dcc0koa0++G6hNWtbfnJle0="; + useFetchCargoVendor = true; + cargoHash = "sha256-rViJDF0cC8j8OVGNCxf6C1xpA8GXrt2UZvnkOuEJEmA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ta/tagref/package.nix b/pkgs/by-name/ta/tagref/package.nix index 13ec01f5900d..7de6c769ed84 100644 --- a/pkgs/by-name/ta/tagref/package.nix +++ b/pkgs/by-name/ta/tagref/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ANQxW5Qznu2JbiazFElB1sxpX4BwPgk6SVGgYpJ6DUw="; }; - cargoHash = "sha256-vdmr5n4M+Qe/jzjNdg+sy7q2osTivxmLG+xMTMkEFm4="; + useFetchCargoVendor = true; + cargoHash = "sha256-XQ0/J8o9yqEGWH1Cy5VDkpsK60SS6JhYxMNsI08uI6U="; meta = with lib; { description = "Manage cross-references in your code"; diff --git a/pkgs/by-name/ta/tailspin/package.nix b/pkgs/by-name/ta/tailspin/package.nix index 52af0672f4e9..0b9d2cf4a794 100644 --- a/pkgs/by-name/ta/tailspin/package.nix +++ b/pkgs/by-name/ta/tailspin/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5VbxQDK69If5N8EiS8sIKNqHkCAfquOz8nUS7ynp+nA="; }; - cargoHash = "sha256-ohfza2ti7Ar/9TV/WoTL5g6CPaONrxtr7nW0qmLdB/8="; + useFetchCargoVendor = true; + cargoHash = "sha256-QkdnmeXor2K0c5m/TV5hYl1oSPWpykPfZy/ZRqFUt1s="; postPatch = '' substituteInPlace tests/utils.rs --replace-fail \ diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix index 1554295613f4..23eefcc2d49c 100644 --- a/pkgs/by-name/ta/taizen/package.nix +++ b/pkgs/by-name/ta/taizen/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-bE7GZOQgAg4XdWCmnicPK4H4Y+T1snISCe/uGjoQATo="; + useFetchCargoVendor = true; + cargoHash = "sha256-kK9na2Pk3Hl4TYYVVUfeBv6DDDkrD7mIv7eVHXkS5QY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ta/talecast/package.nix b/pkgs/by-name/ta/talecast/package.nix index de9ee864b9d3..9d304d75d517 100644 --- a/pkgs/by-name/ta/talecast/package.nix +++ b/pkgs/by-name/ta/talecast/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RwB+X+i3CEcTyKac81he9/cT2aQ4M7AqgqSDBEvhFJU="; }; - cargoHash = "sha256-mIzrYlAqHYrK2bb/ZUzqIwhPJKcTQpNpqijpEuwLc5A="; + useFetchCargoVendor = true; + cargoHash = "sha256-mRoFg1UUPCKWiPxZg+8o2+2K6R+88RI/pdO8OLM4jFk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ta/taler-depolymerization/package.nix b/pkgs/by-name/ta/taler-depolymerization/package.nix index 1189a6eebcaa..5874223a44f0 100644 --- a/pkgs/by-name/ta/taler-depolymerization/package.nix +++ b/pkgs/by-name/ta/taler-depolymerization/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-HmQ/DPq/O6aODWms/bSsCVgBF7z246xxfYxiHrAkgYw="; }; - cargoHash = "sha256-NgoLCTHhEs45cnx21bU2ko3oWxePSzKgUpnCGqhjvTs="; + useFetchCargoVendor = true; + cargoHash = "sha256-P0VrXYbO4RD3cNTai2hfTksbiGldkwoYgZm+C5Jh/4Y="; outputs = [ "out" diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index 4336cf5d2f76..e748d95922cc 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dNGQbaIfFmgXh2AOcaE74BTz7/jaiBgU7Y1pkg1rV7U="; }; - cargoHash = "sha256-iucjewjRCunKxKCqeZwf7bdEo7+aN9hfWPwUAJhaSq0="; + useFetchCargoVendor = true; + cargoHash = "sha256-7u7ZyS+5QIGfXKNVJZLzGXoMSI2DHSrD1AEtPttS22Q="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ta/tarssh/package.nix b/pkgs/by-name/ta/tarssh/package.nix index 02d7cd8e70cc..031a2a214b37 100644 --- a/pkgs/by-name/ta/tarssh/package.nix +++ b/pkgs/by-name/ta/tarssh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-AoKc8VF6rqYIsijIfgvevwu+6+suOO7XQCXXgAPNgLk="; }; - cargoHash = "sha256-w1MNsMSGONsAAjyvAHjio2K88j1sqyP1Aqmw3EMya+c="; + useFetchCargoVendor = true; + cargoHash = "sha256-r1WwAL24Ohmf4L7UXUwmecRiMmthjpzoWOVv33bMkDk="; meta = with lib; { description = "Simple SSH tarpit inspired by endlessh"; diff --git a/pkgs/by-name/ta/taschenrechner/package.nix b/pkgs/by-name/ta/taschenrechner/package.nix index 48e8c181afaf..6d5965190e3e 100644 --- a/pkgs/by-name/ta/taschenrechner/package.nix +++ b/pkgs/by-name/ta/taschenrechner/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZZVghL0R3p5sE8V9Z0MsmTiCacuE2RXohQQEYJYgp/o="; }; - cargoHash = "sha256-xZ3Ki1HLzF7A1+83GQNTBgRjn802Z9ZAKENKB5CykCc="; + useFetchCargoVendor = true; + cargoHash = "sha256-/tgfHU4/B7tes2jU8L/MbWIG1sTLg9exWhmuSA6Davk="; meta = with lib; { description = "Cli-calculator written in Rust"; diff --git a/pkgs/by-name/ta/task-keeper/package.nix b/pkgs/by-name/ta/task-keeper/package.nix index 8acf10bffa77..b3f7a831a367 100644 --- a/pkgs/by-name/ta/task-keeper/package.nix +++ b/pkgs/by-name/ta/task-keeper/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-fFN7nkkOlOreFVg2phvX2uj3crnohJrLgpgDUJucz5Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-6KnZDSYPf3Rr9II/lsrPvzRMiwOknrstU8/91mv7x8k="; # tests depend on many packages (java, node, python, sbt, ...) - which I'm not currently willing to set up 😅 doCheck = false; diff --git a/pkgs/by-name/ta/taskchampion-sync-server/package.nix b/pkgs/by-name/ta/taskchampion-sync-server/package.nix index 36a008ee2af7..3fbbfc52fbae 100644 --- a/pkgs/by-name/ta/taskchampion-sync-server/package.nix +++ b/pkgs/by-name/ta/taskchampion-sync-server/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uOlubcQ5LAECvQEqgUR/5aLuDGQrdHy+K6vSapACmoo="; }; - cargoHash = "sha256-Erhr5NduvQyUJSSurKqcZXJe4ExP68t8ysn7hZLAgP4="; + useFetchCargoVendor = true; + cargoHash = "sha256-BOXg6Pjy4lhzdaqJkOLJNGAtX9cWmbN6QEmP0g7D6Qw="; meta = { description = "Sync server for Taskwarrior 3"; diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix index ba4a34ab062c..cfdc047d0dfd 100644 --- a/pkgs/by-name/ta/taskwarrior-tui/package.nix +++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-8PFGlsm9B6qHRrY7YIPwknmGS+Peg5MWd0kMT173wIQ="; }; - cargoHash = "sha256-Cd319GCvdh6S8OO2ylKs1H2+zO4Uq1tgNakghVD12BA="; + useFetchCargoVendor = true; + cargoHash = "sha256-y5tHZIsbHLU9acIUM/QUx1T0eLK/E/jR+XXys5JnGjU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/td/tdns-cli/package.nix b/pkgs/by-name/td/tdns-cli/package.nix index 2683afb4491e..02c6d4701427 100644 --- a/pkgs/by-name/td/tdns-cli/package.nix +++ b/pkgs/by-name/td/tdns-cli/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BGxkqlKg81izq4eOBEZFJ/MPb3UCSOo8ZTYTjtjierk="; }; - cargoHash = "sha256-uRny+l/LaQPjF5AnbxgKFLdjuAxcez1BqsL4g54KAwU="; + useFetchCargoVendor = true; + cargoHash = "sha256-KDZGTGLHLuZgFtzIp+lL0VIiQcYspvxAivp7hVE9V/A="; meta = with lib; { description = "DNS tool that aims to replace dig and nsupdate"; diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix index 3d029f8e8ece..acdb7c0095d1 100644 --- a/pkgs/by-name/te/tealdeer/package.nix +++ b/pkgs/by-name/te/tealdeer/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-UYOAj6ft6FHQz06A+K2K+bK3WXQnF5U7TuN95WIXj+M="; }; - cargoHash = "sha256-ZKaq/JqH/Y2Cs9LLnlt1Gawe4R+kvS3vpUcNK95uujk="; + useFetchCargoVendor = true; + cargoHash = "sha256-gIJWHqJk0epsPJm1QNOpbvDC1a0d/6AfcNlaT824vWA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/teehee/package.nix b/pkgs/by-name/te/teehee/package.nix index 04dc45cdc570..a7d5b4780076 100644 --- a/pkgs/by-name/te/teehee/package.nix +++ b/pkgs/by-name/te/teehee/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yTterXAev6eOnUe1/MJV8s8dUYJcXHDKVJ6T0G/JHzI="; }; - cargoHash = "sha256-hEc7MaqTXMrKiosYacPw/b1ANnfZKdlhThOp2h14fg4="; + useFetchCargoVendor = true; + cargoHash = "sha256-PebwLIFBA6NdEXCQoEZzPFsSTMz8o2s+yOMyElrR4TM="; meta = with lib; { description = "Modal terminal hex editor"; diff --git a/pkgs/by-name/te/teip/package.nix b/pkgs/by-name/te/teip/package.nix index 7f18790d4efb..64dae6231fd3 100644 --- a/pkgs/by-name/te/teip/package.nix +++ b/pkgs/by-name/te/teip/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-09IKAM1ha40CvF5hdQIlUab7EBBFourC70LAagrs5+4="; }; - cargoHash = "sha256-cBFczgvLja6upuPnXphG2d9Rf1ZpNAVh16NHAHfXxHg="; + useFetchCargoVendor = true; + cargoHash = "sha256-EMdwjdgrSNGTbhnjwyt6KZ6U6wRRKwXGynfr397AGbg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 3c9af991b718..fbe842ad2ec3 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0VnDgDLsPmNaY1sjw891hm65TsE3HH9KBkkgp0TFQKg="; }; - cargoHash = "sha256-WtB1rmgOfAnZ9OGJ8M5s5NqMm24s8gcPzlu14f2mTrE="; + useFetchCargoVendor = true; + cargoHash = "sha256-C1iMU7ZlzMqSNSgXakwInSTNcRYYuD18UYgrq3o6RCA="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/te/teller/package.nix b/pkgs/by-name/te/teller/package.nix index 21eb39d6558a..1fcdbcd46ff7 100644 --- a/pkgs/by-name/te/teller/package.nix +++ b/pkgs/by-name/te/teller/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { hash = "sha256-CI74nMMTIPwjJfy7ASR19V6EbYZ62NoAOxlP3Xt2BuI="; }; - cargoHash = "sha256-iqZX+9l3TWrFuaQreNz4RrCgPQCyKJt6RJ1UeKYaNRs="; + useFetchCargoVendor = true; + cargoHash = "sha256-PSa4EEDEFdFpfYPG5M5wMwfq3WSqMw5d8a+mKgBzCFw="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/te/tenere/package.nix b/pkgs/by-name/te/tenere/package.nix index fd2a56b74331..19a6147daeb9 100644 --- a/pkgs/by-name/te/tenere/package.nix +++ b/pkgs/by-name/te/tenere/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { rev = "0f3181ab23066aa69aa4fec387a7e16578078179"; hash = "sha256-HKPCX0bmXkB3LwvgE1li3dlWTgpW5CXuWZNq3mFY6FY="; }; - cargoHash = "sha256-u6QCs3RaLeRoVfhRzUG7wwx7kd0O3KyiC5vhZ3mE7UM="; + useFetchCargoVendor = true; + cargoHash = "sha256-vwnMfY8xYrH3pWl8YMb7Jedu1gEOcAKPChClboJJSsw="; requiredSystemFeatures = [ "big-parallel" ]; # for fat LTO from upstream diff --git a/pkgs/by-name/te/tenki/package.nix b/pkgs/by-name/te/tenki/package.nix index 9832e910d078..275422880048 100644 --- a/pkgs/by-name/te/tenki/package.nix +++ b/pkgs/by-name/te/tenki/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jd7D0iC3+s3w6uG0WqlvL9F4xQL+cQzsUvAIOc7ORgw="; }; - cargoHash = "sha256-3SdOUSSerTnA9VHZEmFt1LiatLwC7Dq4k/MKstE8x80="; + useFetchCargoVendor = true; + cargoHash = "sha256-jV+KHHAPpsFxNnBaMPE5XYDG4Fhn3a89NBUpZg++YUE="; meta = with lib; { description = "tty-clock with weather effect"; diff --git a/pkgs/by-name/te/tera-cli/package.nix b/pkgs/by-name/te/tera-cli/package.nix index 8c90c7811306..2b9f6077c088 100644 --- a/pkgs/by-name/te/tera-cli/package.nix +++ b/pkgs/by-name/te/tera-cli/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mYFvqzSnTljzRbb9W4/hY7fOO35UF31P5M49JkM58R8="; }; - cargoHash = "sha256-aG0J9hnkGvz42gOczU3uF3GsmKZWgrLtx8lXOkDwt0c="; + useFetchCargoVendor = true; + cargoHash = "sha256-7UKdnq5xmkO95Sf9YR3LqS2RoUYGbvWqRYUXNQXfkf0="; meta = with lib; { description = "Command line utility to render templates from json|toml|yaml and ENV, using the tera templating engine"; diff --git a/pkgs/by-name/te/tere/package.nix b/pkgs/by-name/te/tere/package.nix index a0af183e197f..ec0dbe041b09 100644 --- a/pkgs/by-name/te/tere/package.nix +++ b/pkgs/by-name/te/tere/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-oY4oeSttM8LLXLirYq/B7Nzajkg4Pw26uig5gZxqU3s="; }; - cargoHash = "sha256-UWZWm6wDiQqUNcWV1nDUWXVhWgqoVUCDWz09cRkiPKg="; + useFetchCargoVendor = true; + cargoHash = "sha256-E3gLxuxidjjjmMVWCQYZCbz8sov1a+MkLiOj4/TU6MI="; nativeCheckInputs = [ # ncurses provides the tput command needed for integration tests diff --git a/pkgs/by-name/te/termimage/package.nix b/pkgs/by-name/te/termimage/package.nix index 1b13e33866ec..5d172a96483a 100644 --- a/pkgs/by-name/te/termimage/package.nix +++ b/pkgs/by-name/te/termimage/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1FOPe466GqQfiIpsQT9DJn+FupI2vy9b4+7p31ceY6M="; }; - cargoHash = "sha256-Up6wvkZJ4yLrXp/2sEAv5RqGbhLOQPNHO2vEy2Vhy+E="; + useFetchCargoVendor = true; + cargoHash = "sha256-SIPak7tl/fIH6WzvAl8bjhclZqQ6imC/zdxCnBnEsbk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/te/termscp/package.nix b/pkgs/by-name/te/termscp/package.nix index 25304d78771d..2ef1e8b5ec2e 100644 --- a/pkgs/by-name/te/termscp/package.nix +++ b/pkgs/by-name/te/termscp/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tR+jfFdCSsf+WR8VUX60/mdfsp7cX9jUDI+CKIZkgEE="; }; - cargoHash = "sha256-g6A8rNOUduhdwSqunDlZvO7E07GmDgb1o2FVohFAcL0="; + useFetchCargoVendor = true; + cargoHash = "sha256-13M5p988ziI3bcOHR7lsSrjT4JkyqCJF9Tm7YznO6N8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/te/termsnap/package.nix b/pkgs/by-name/te/termsnap/package.nix index df4dfd3020f4..622c4b72a95c 100644 --- a/pkgs/by-name/te/termsnap/package.nix +++ b/pkgs/by-name/te/termsnap/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bYqhrMmgkEAiA1eiDbIOwH/PktwtIfxmYJRwDrFsNIc="; }; - cargoHash = "sha256-Q1FTVaFZzJJNQg6FDOaPpRCpPgw2EPQsnb8o6dSoVWw="; + useFetchCargoVendor = true; + cargoHash = "sha256-lfWQ7VzFYhbEjrhKxPT8quhxbL+5pTzIPUVjBBHRk7Q="; meta = with lib; { description = "Create SVGs from terminal output"; diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix index a1f7c3beddcd..1557d1d407c3 100644 --- a/pkgs/by-name/te/termusic/package.nix +++ b/pkgs/by-name/te/termusic/package.nix @@ -50,7 +50,8 @@ rustPlatform.buildRustPackage rec { popd ''; - cargoHash = "sha256-4PprZdTIcYa8y7FwQVrG0ZBg7N/Xe6HDt/z6ZmaHd5Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-LWatmnmLBDf4BFq5RMQBbN4wmptYuz3xqyzz6gJGzX8="; useNextest = true; diff --git a/pkgs/by-name/te/textplots/package.nix b/pkgs/by-name/te/textplots/package.nix index add6164cddd1..46a8c0b741ec 100644 --- a/pkgs/by-name/te/textplots/package.nix +++ b/pkgs/by-name/te/textplots/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-83EAe6O8ETsuGJ5MK6kt68OnJL+r+BAYkFzvzlxHyp4="; }; - cargoHash = "sha256-O47b00PGRXTWWxywitS2V15gXahzgjNvFKUvE+VMXaM="; + useFetchCargoVendor = true; + cargoHash = "sha256-ep7gXTWHRhWpGo6n/EgjY0d/vqIqd3yEikzy9sLTtf8="; buildFeatures = [ "tool" ]; diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix index e0c590296e35..ca41c64a18c3 100644 --- a/pkgs/by-name/th/the-way/package.nix +++ b/pkgs/by-name/th/the-way/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/vG5LkQiA8iPP+UV1opLeJwbYfmzqYwpsoMizpGT98o="; }; - cargoHash = "sha256-iZxV099582LuZ8A3uOsKPyekAQG2cQusLZhW+W1wW/8="; + useFetchCargoVendor = true; + cargoHash = "sha256-GBr0z2iJuk86xkgZd2sAz+ISTRfESDt99g6ssxXhzhI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/th/theattyr/package.nix b/pkgs/by-name/th/theattyr/package.nix index 7b10fd304fe3..709271504b4c 100644 --- a/pkgs/by-name/th/theattyr/package.nix +++ b/pkgs/by-name/th/theattyr/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gqgoG5JwGecm8MEqH36BvJyLuh6nDao1d9ydX1AlbgU="; }; - cargoHash = "sha256-LwJW1WTUa0iz4PeDOMmRr6H0XLhWOn9b4W3SUR+SHyc="; + useFetchCargoVendor = true; + cargoHash = "sha256-44pHUqHBr0286Kc/yreb15mQXnFuyh12D2uCU2MrrTk="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/th/thokr/package.nix b/pkgs/by-name/th/thokr/package.nix index 584446db00f8..8b4d39f520c1 100644 --- a/pkgs/by-name/th/thokr/package.nix +++ b/pkgs/by-name/th/thokr/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0aryfx9qlnjdq3iq2d823c82fhkafvibmbz58g48b8ah5x5fv3ir"; }; - cargoHash = "sha256-gEpmXyLmw6bX3enA3gNVtXNMlkQl6J/8AwJQSY0RtFw="; + useFetchCargoVendor = true; + cargoHash = "sha256-BjUPXsErdLGmZaDIMaY+iV3XcoQHGNZbRmFJb/fblwU="; meta = with lib; { description = "Typing tui with visualized results and historical logging"; diff --git a/pkgs/by-name/th/thud/package.nix b/pkgs/by-name/th/thud/package.nix index 6e867d7ce43c..2ceea89f1f2c 100644 --- a/pkgs/by-name/th/thud/package.nix +++ b/pkgs/by-name/th/thud/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BmrJaZ1IKXjx4/QkBDZyXvTTaalfEOKsBp9ZCW8px7I="; }; - cargoHash = "sha256-rmVVdes7GuGV+ClqJGxNIrs7oSwe8/ZHFD6OfP/UW7A="; + useFetchCargoVendor = true; + cargoHash = "sha256-J7YioL8AIhoaPsYPzOXbwz76sMmBbDI/eql1HgDFgCU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/th/thumbs/package.nix b/pkgs/by-name/th/thumbs/package.nix index 1f8583b81d74..4062e6517a04 100644 --- a/pkgs/by-name/th/thumbs/package.nix +++ b/pkgs/by-name/th/thumbs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-XMz1ZOTz2q1Dt4QdxG83re9PIsgvxTTkytESkgKxhGM="; }; - cargoHash = "sha256-PfTx6PcW5DESShfr9Ekhbq1asZ0xUGM4Vi9EwmoDv+s"; + useFetchCargoVendor = true; + cargoHash = "sha256-xvfjWS1QZWrlwytFyWVtjOyB3EPT9leodVLt72yyM4E="; patches = [ ./fix.patch ]; diff --git a/pkgs/by-name/ti/tickrs/package.nix b/pkgs/by-name/ti/tickrs/package.nix index 7e2e0e69d453..dddce59659b5 100644 --- a/pkgs/by-name/ti/tickrs/package.nix +++ b/pkgs/by-name/ti/tickrs/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6iMThVLIkFoNa7Z0MuyhUNGCwFtCfmG7jHvDfrEZE2I="; }; - cargoHash = "sha256-gfBmoN91xUcjBafxBoLP41Fl8FuH2taAu3P6sgJPNWI="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZlU+PVkias3VuP1Bss6TTR84pzh1weJfbwQpCZ1ZaNs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix index 2e211df3f504..09a9dcd7dbfc 100644 --- a/pkgs/by-name/ti/tidy-viewer/package.nix +++ b/pkgs/by-name/ti/tidy-viewer/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4="; }; - cargoHash = "sha256-pIGuBP0a4jWFzkQfqvxQUrBmqYjhERVyEbZvL7g5hRM="; + useFetchCargoVendor = true; + cargoHash = "sha256-k/8crmGkFOLcakL5roYrSBVoYyGMELh1Mu/X6SlUeds="; # this test parses command line arguments # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context diff --git a/pkgs/by-name/ti/timewall/package.nix b/pkgs/by-name/ti/timewall/package.nix index 216d2ebe5771..7f35f4f88f43 100644 --- a/pkgs/by-name/ti/timewall/package.nix +++ b/pkgs/by-name/ti/timewall/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-B3pZCjl7Z78vAYYzceicwjmGfTbzYgrhpldUJnY8Aqs="; }; - cargoHash = "sha256-AYfRZyUitUgWIeDbg00RFbs+VLnIJFHrdpUcjDlkwE8="; + useFetchCargoVendor = true; + cargoHash = "sha256-M7o2EKBVvx0RzPDwinHUJp20NHqcFwBO6QTRvGMfHa0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix index 2586f34e2341..d806bc48a542 100644 --- a/pkgs/by-name/ti/tinty/package.nix +++ b/pkgs/by-name/ti/tinty/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Yvwls9bh8YN8/jKC889soCSotLSBU9hJWz95szOdJ2k="; }; - cargoHash = "sha256-jSKhKcBcURjizUZlqZmL5UT19gvNzHinD4rMQ3jMgVw="; + useFetchCargoVendor = true; + cargoHash = "sha256-2VnuZYUZRh2kJKoKl5/1o+RMFl4ZAr2GOU5RwJ0vc0c="; # Pretty much all tests require internet access doCheck = false; diff --git a/pkgs/by-name/ti/tiny-dfr/package.nix b/pkgs/by-name/ti/tiny-dfr/package.nix index b521311f6c07..81db841d26d6 100644 --- a/pkgs/by-name/ti/tiny-dfr/package.nix +++ b/pkgs/by-name/ti/tiny-dfr/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5u5jyoDEt7aMs8/8QrhrUrUzFJJCNayqbN2WrMhUCV4="; }; - cargoHash = "sha256-repPyeIVM2ufG5NhJHGbZUaxOItiTZTxiCZ21Fpt0wM="; + useFetchCargoVendor = true; + cargoHash = "sha256-9UlH2W8wNzdZJxIgOafGylliS2RjaBlpirxSWHJ/SIQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo gdk-pixbuf glib libinput libxml2 pango udev ]; diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix index 483d729c1718..bd9416d01e95 100644 --- a/pkgs/by-name/tl/tlrc/package.nix +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3KS/KN6/RO+PxoxbCVryymnTyWcmfXuCoc9E+asdU/E="; }; - cargoHash = "sha256-9MnYSmMhLn31aHwooo8W/1Rp7N5P6Tar7Ft2iXRVnh0="; + useFetchCargoVendor = true; + cargoHash = "sha256-104ulV8YNdGu23/49sQQf1zroT1ceFZc+ERTECG4K6U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/to/to-html/package.nix b/pkgs/by-name/to/to-html/package.nix index 1d5aeee4dba1..f4b57320848a 100644 --- a/pkgs/by-name/to/to-html/package.nix +++ b/pkgs/by-name/to/to-html/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eNFt9/yK4oHOspNM8PMTewhx8APaHzmgNdrWqrUuQSU="; }; - cargoHash = "sha256-UxDyk7m6eWvuWPHWUY2OJI59p43/bag8pcZyeGJr/QA="; + useFetchCargoVendor = true; + cargoHash = "sha256-EeR0nzTKQ4fB/tXuPIWokSNBQIthGpxSySsASo74A/A="; # Requires external resources doCheck = false; diff --git a/pkgs/by-name/to/toast/package.nix b/pkgs/by-name/to/toast/package.nix index 783098ee8be8..619f1ea13998 100644 --- a/pkgs/by-name/to/toast/package.nix +++ b/pkgs/by-name/to/toast/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+qntd687LF4tJwHZglZ6mppHq3dOZ+l431oKBBNDI0k="; }; - cargoHash = "sha256-A2sJ0o0RDztk3NjxG0CD8wNA4tmOizY4Tvff6ADzYQ8="; + useFetchCargoVendor = true; + cargoHash = "sha256-SzbQaiHOhczxChpKwcIkq1VOY9PfCbNtI5rhxZ5B5No="; checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails diff --git a/pkgs/by-name/to/toipe/package.nix b/pkgs/by-name/to/toipe/package.nix index e90142608042..f44de64d146a 100644 --- a/pkgs/by-name/to/toipe/package.nix +++ b/pkgs/by-name/to/toipe/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-L4JemOxpynGYsA8FgHnMv/hrogLSRaaiIzDjxzZDqjM="; }; - cargoHash = "sha256-ShJ7dbd3oNo3qZJ5+ut+NfLF9j8kPPZy9yC2zl/s56k="; + useFetchCargoVendor = true; + cargoHash = "sha256-bBkHqcPWE6jkqvUZ28ukUidET9XkRQ9t9bfTpHC5Jyo="; meta = with lib; { description = "Trusty terminal typing tester"; diff --git a/pkgs/by-name/to/tokio-console/package.nix b/pkgs/by-name/to/tokio-console/package.nix index 98c2707f0d32..486d20765c52 100644 --- a/pkgs/by-name/to/tokio-console/package.nix +++ b/pkgs/by-name/to/tokio-console/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KqX+s1oQIRyqAP+0iGrZiT8lB+cGviY1vtHaXy5Q6TA="; }; - cargoHash = "sha256-QJdTysoVIbeLsTMt62Q355S8zx8tNCikZAyeRs7cz4o="; + useFetchCargoVendor = true; + cargoHash = "sha256-9jnBgrfB0nWOq2+hfDq3/2Wo4z7WSfBKxoGrQ888lKw="; buildAndTestSubdir = "tokio-console"; diff --git a/pkgs/by-name/to/toml-cli/package.nix b/pkgs/by-name/to/toml-cli/package.nix index 8cb7aacce5cb..f363b03b6d40 100644 --- a/pkgs/by-name/to/toml-cli/package.nix +++ b/pkgs/by-name/to/toml-cli/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-V/yMk/Zt3yvEx10nzRhY/7GYnQninGg9h63NSaQChSA="; }; - cargoHash = "sha256-v+GBn9mmiWcWnxmpH6JRPVz1fOSrsjWoY+l+bdzKtT4="; + useFetchCargoVendor = true; + cargoHash = "sha256-PoqVMTCRmSTt7UhCpMF3ixmAfVtpkaOfaTTmDNhrpLA="; cargoTestFlags = [ "--bin=toml" diff --git a/pkgs/by-name/to/toml2json/package.nix b/pkgs/by-name/to/toml2json/package.nix index 5ab7cf5a592e..7a5b5834a2ee 100644 --- a/pkgs/by-name/to/toml2json/package.nix +++ b/pkgs/by-name/to/toml2json/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9q2HtNzsRO0/5gcmxUfWuQlWsfvw/A21WEXZlifCUjY="; }; - cargoHash = "sha256-laOM7LpmsCpLcm4kPRsJiXHoKR58RCuQxVO5Z78beWI="; + useFetchCargoVendor = true; + cargoHash = "sha256-IglwVFTKOQFln/LE76+QM4P0J9dDM83jSAF6jGGNLEg="; meta = with lib; { description = "Very small CLI for converting TOML to JSON"; diff --git a/pkgs/by-name/to/tomlq/package.nix b/pkgs/by-name/to/tomlq/package.nix index 1b526c1844c2..171783c03936 100644 --- a/pkgs/by-name/to/tomlq/package.nix +++ b/pkgs/by-name/to/tomlq/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g8xjz8qCTiulTwcEbLTHYldw4PI+4ZfCOMJs+J6L1C4="; }; - cargoHash = "sha256-/cepTVJoBM1LYZkFpH9UCvE74cSszHDaeThsZksQ1P8="; + useFetchCargoVendor = true; + cargoHash = "sha256-/n1+8n0zGs9qS5QQcAfXJ1kmRkcfsCTxQonEaFsNdHo="; meta = { description = "Tool for getting data from TOML files on the command line"; diff --git a/pkgs/by-name/to/topfew-rs/package.nix b/pkgs/by-name/to/topfew-rs/package.nix index 8a47b04c45d7..0caaee2629ea 100644 --- a/pkgs/by-name/to/topfew-rs/package.nix +++ b/pkgs/by-name/to/topfew-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VlSLPcKw3LYGnmKk5YOkcGIizw1tqtKF2BykY+1MtvY="; }; - cargoHash = "sha256-j+afSwDHau7H20siYtid7l8tq+iS24KJBsNZAEdNJlI="; + useFetchCargoVendor = true; + cargoHash = "sha256-NAM/s3m+ZqgHoX6GESgJOxr88sy4+JieWB8u8aKbW7Y="; meta = with lib; { description = "Rust implementation of Tim Bray's topfew tool"; diff --git a/pkgs/by-name/to/tox-node/package.nix b/pkgs/by-name/to/tox-node/package.nix index e09d4fc754e3..906daf467030 100644 --- a/pkgs/by-name/to/tox-node/package.nix +++ b/pkgs/by-name/to/tox-node/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "tox_node"; - cargoHash = "sha256-L5IvYA32W8cTnuWjeljge5X+LZ912ugtcvEKXLqYZ+k="; + useFetchCargoVendor = true; + cargoHash = "sha256-UNvhls6qY1u9STr8PsgcUfFYRDTlqvxB3M57j/fdkH8="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/tp/tp-auto-kbbl/package.nix b/pkgs/by-name/tp/tp-auto-kbbl/package.nix index ecfccd0bdc76..2640a84ff3b7 100644 --- a/pkgs/by-name/tp/tp-auto-kbbl/package.nix +++ b/pkgs/by-name/tp/tp-auto-kbbl/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fhBCsOjaQH2tRsBjMGiDmZSIkAgEVxxywVp8/0uAaTU="; }; - cargoHash = "sha256-zBTn3dcKzm5JfL1a31m6ZHXp2JoGObPBciy1BfVmL1Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ptc4m+99YknHY28DR5WHt/JG9tgUOcbz/TezUkezmS8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/tp/tpi/package.nix b/pkgs/by-name/tp/tpi/package.nix index 7ccd26716664..0e2135103417 100644 --- a/pkgs/by-name/tp/tpi/package.nix +++ b/pkgs/by-name/tp/tpi/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-se5+8Zf+RKtvfkmDDxKiUVp5J+bQ9j9RFedDK/pxCgA="; }; - cargoHash = "sha256-5TfLAMPl3I9gkd3SSjPlBeBJzANK9u5XjY0ReHVSTJw="; + useFetchCargoVendor = true; + cargoHash = "sha256-neXFAMeo/LG3beNoR9q2gAZhlNrk0T4A5IdqR2cZocs="; meta = { description = "CLI tool to control your Turing Pi 2 board"; diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix index e3ef32f48869..2c567f0254a1 100644 --- a/pkgs/by-name/tp/tplay/package.nix +++ b/pkgs/by-name/tp/tplay/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SRn7kg5FdSimKMFowKNUIan+MrojtNO0apeehIRTzfw="; }; - cargoHash = "sha256-ztWs20Vl+fX0enL12pybiM6lhFh0/EFa1aSTRpzz64g="; + useFetchCargoVendor = true; + cargoHash = "sha256-SzOx9IPp+TjiJpAEX8+GhZ+UEEmqNpI67S40OiYrHfM="; checkFlags = [ # requires network access "--skip=pipeline::image_pipeline::tests::test_process" diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index de79c3d5d430..969d64711357 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TT34+r4f3TaurLwyXxQa5AZT1xPOKkDYPra/bgchoTc="; }; - cargoHash = "sha256-1+LPsTvJwouFkJoCEkRUjKGqldXLYyF3Y4UuISoYF2A="; + useFetchCargoVendor = true; + cargoHash = "sha256-1uqUB+65sMjjp4LJbvHehg9hMcrjun3/1cEmPPnrx3Y="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix index 5c800fa9d1c9..27a209d5aaed 100644 --- a/pkgs/by-name/tr/tracexec/package.nix +++ b/pkgs/by-name/tr/tracexec/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage { hash = "sha256-qLvox7ef9eU1Vvg4gZGCKkic4+mcOIz9BZWTi/Q2grk="; }; - cargoHash = "sha256-yagXxTEWsR7FkLVo9DZHxmlXD/L6R+IoateUUQxn77E="; + useFetchCargoVendor = true; + cargoHash = "sha256-uFuMuSDcNKrlf2kpk/7+jaM7079Il63d/TtRiRIQZD4="; hardeningDisable = [ "zerocallusedregs" ]; diff --git a/pkgs/by-name/tr/transmission-rss/package.nix b/pkgs/by-name/tr/transmission-rss/package.nix index 7aadbb804d43..3167cc841abd 100644 --- a/pkgs/by-name/tr/transmission-rss/package.nix +++ b/pkgs/by-name/tr/transmission-rss/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./update-cargo-lock-version.patch ]; - cargoHash = "sha256-QNMdqoxxY8ao2O44hJxZNgLrPwzu9+ieweTPc7pfFY4="; + useFetchCargoVendor = true; + cargoHash = "sha256-ETbWV5OjRzQuq/rVyu22YRFjeQcuNA1REyzg46s3q5A="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/by-name/tr/trashy/package.nix b/pkgs/by-name/tr/trashy/package.nix index 8798f7ab5ed7..3ed051316e80 100644 --- a/pkgs/by-name/tr/trashy/package.nix +++ b/pkgs/by-name/tr/trashy/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1xHyhAV8hpgMngQdamRzEliyG60t+I3KfsDJi0+180o="; }; - cargoHash = "sha256-ZWqWtWzb+CLH1ravBb/oV+aPxplEyiC1wEFhvchcLqg="; + useFetchCargoVendor = true; + cargoHash = "sha256-tlz8WeFOxNPJxCqwqH98S/JkU7MZSDj/OaPvNkf6iwg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/tr/tre-command/package.nix b/pkgs/by-name/tr/tre-command/package.nix index 12d76e61e5df..f7e239e2acd9 100644 --- a/pkgs/by-name/tr/tre-command/package.nix +++ b/pkgs/by-name/tr/tre-command/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-JlkONhXMWLzxAf3SYoLkSvXw4bFYBnsCyyj0TUsezwg="; }; - cargoHash = "sha256-b3fScJMG/CIkMrahbELLQp1otmT5En+p8kQsip05SOc="; + useFetchCargoVendor = true; + cargoHash = "sha256-a3k5P+i0jLqamP2CInSQjivyI/tREeJME6IqI/YiLog="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/tr/treefmt1/package.nix b/pkgs/by-name/tr/treefmt1/package.nix index 738ae4ef986b..f600c6573991 100644 --- a/pkgs/by-name/tr/treefmt1/package.nix +++ b/pkgs/by-name/tr/treefmt1/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-icAe54Mv1xpOjUPSk8QDZaMk2ueNvjER6UyJ9uyUL6s="; }; - cargoHash = "sha256-bpNIGuh74nwEmHPeXtPmsML9vJOb00xkdjK0Nd7esAc="; + useFetchCargoVendor = true; + cargoHash = "sha256-OLKqfAYHGgEkjU5lVkbuH2eVZIZ3cw9w9n4/MkqbX/8="; meta = { description = "one CLI to format the code tree"; diff --git a/pkgs/by-name/tr/trippy/package.nix b/pkgs/by-name/tr/trippy/package.nix index 26f85342371a..9df1eb487f23 100644 --- a/pkgs/by-name/tr/trippy/package.nix +++ b/pkgs/by-name/tr/trippy/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - cargoHash = "sha256-uZb8KrYFkxDOjM8PiUsEux+9UBcDM+mwTCtHIeKjmOU="; + useFetchCargoVendor = true; + cargoHash = "sha256-+PaSLq++tKA6dy4CI1EYrEDdXi2TI9XHjvMLfwDp/HA="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' local INSTALL="$out/bin/trip" diff --git a/pkgs/by-name/tr/trojan-rs/package.nix b/pkgs/by-name/tr/trojan-rs/package.nix index a748e7687aaa..702797dd0b46 100644 --- a/pkgs/by-name/tr/trojan-rs/package.nix +++ b/pkgs/by-name/tr/trojan-rs/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { hash = "sha256-rtYvsFxxhkUuR/tLrRFvRBLG8C84Qs0kYmXkNP/Ai3c="; }; - cargoHash = "sha256-FJV4pMfaw4rHTYZekot5ZTBDChfS1gCPc5NqoLeGjws="; + useFetchCargoVendor = true; + cargoHash = "sha256-1HrIjkv/CyHCiC3RzQ2M8kHl74eMsWNfypr8PsL6kA0="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ ipset ]; diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix index abda881970ae..e54d09b650d5 100644 --- a/pkgs/by-name/tr/trunk/package.nix +++ b/pkgs/by-name/tr/trunk/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoHash = "sha256-m09ZV0Z4bNyAfO6XNiDKyqMeqv2/tx4vpQnWlesCW2A="; + useFetchCargoVendor = true; + cargoHash = "sha256-MkH0khm4b/xumrzwBfwq4CbBgqeL71iag9WTOoi/IOw="; meta = with lib; { homepage = "https://github.com/trunk-rs/trunk"; diff --git a/pkgs/by-name/tt/ttags/package.nix b/pkgs/by-name/tt/ttags/package.nix index 3b9ebac943c8..879f8b4fecf9 100644 --- a/pkgs/by-name/tt/ttags/package.nix +++ b/pkgs/by-name/tt/ttags/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-z0IxGdveMtCXmCKD4jp/BEA6mtTl4CitIrVhM6BtHzA="; }; - cargoHash = "sha256-kyduUQcc3w5JyQICwTu9GdNRJF6H5353Ow05oKg6Ozg="; + useFetchCargoVendor = true; + cargoHash = "sha256-XgtBcEVfeR0yYKJkpFfA8pXk1S1fg+2QS8o7n9G1CXU="; passthru.tests.version = testers.testVersion { package = ttags; diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index 177f8e59d3ed..0ef0dc2920d7 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-RHmKCayouxtlbp/dpZlC9d9OuUXHDLVWucnuIP3rEhA="; }; - cargoHash = "sha256-DR0dAaSLQtWcCcCYXPb4vMDzjct0oNk7GMT5BbZuMlE="; + useFetchCargoVendor = true; + cargoHash = "sha256-Jrr9/H9c9/u5Vf5Ym/WGIKPH/wXyt25LjK3XWidUyIc="; meta = with lib; { description = "CLI tool to manage todo lists in todo.txt format"; diff --git a/pkgs/by-name/tt/ttfb/package.nix b/pkgs/by-name/tt/ttfb/package.nix index 12b900aacfc7..fbd89da0064c 100644 --- a/pkgs/by-name/tt/ttfb/package.nix +++ b/pkgs/by-name/tt/ttfb/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-lB1AgigYsPwaIvD0HmgOnKK28pIpn1iIDKsvCpKvlfM="; + useFetchCargoVendor = true; + cargoHash = "sha256-NXwSqTshaC5hnyruSQFgFQRqRTmINMnMZsaisuudqvY="; # The bin feature activates all dependencies of the binary. Otherwise, # only the library is build. diff --git a/pkgs/by-name/tt/ttyper/package.nix b/pkgs/by-name/tt/ttyper/package.nix index ad0e268d4ef5..6c04c60d4b12 100644 --- a/pkgs/by-name/tt/ttyper/package.nix +++ b/pkgs/by-name/tt/ttyper/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g4OD4Mc3KHN9rrzM+9JvN2xTnSojGQy6yptdGj3zgW4="; }; - cargoHash = "sha256-EXBs73651lP2B/1lAGHLcc9F1Xi+Bj6+c9wv2uX56Lg="; + useFetchCargoVendor = true; + cargoHash = "sha256-M8LG/rZLFRUztniCmUuyj5mdzH3qUKoj02uUQ2zlq8M="; meta = with lib; { description = "Terminal-based typing test"; diff --git a/pkgs/by-name/tt/ttysvr/package.nix b/pkgs/by-name/tt/ttysvr/package.nix index c613142db582..a95bd22e2b23 100644 --- a/pkgs/by-name/tt/ttysvr/package.nix +++ b/pkgs/by-name/tt/ttysvr/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { tag = "v${version}"; hash = "sha256-W8IglZVvhFqn0TH1ZBGWERizCxCQ+C4SckYFLCzB3yc="; }; - cargoHash = "sha256-gHrsdlmA8QxahrWIy6+5knLydVcSbEfS7+02fF1sSsA="; + useFetchCargoVendor = true; + cargoHash = "sha256-iMzHoB1nfRDDSpHBrwKzW64fw7aYqh7uB14idbHTKH0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/tu/tuc/package.nix b/pkgs/by-name/tu/tuc/package.nix index f2e8266f6958..d07b518c253a 100644 --- a/pkgs/by-name/tu/tuc/package.nix +++ b/pkgs/by-name/tu/tuc/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+QkkwQfp818bKVo1yUkWKLMqbdzRJ+oHpjxB+UFDRsU="; }; - cargoHash = "sha256-NbqmXptLmqLd6QizRB1bIM53Rdj010Hy3JqSuLQ4H24="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ry7S/Pqo3AoUKCyGFfV9RNWOguBwajJ8rOqRg+LFReY="; meta = with lib; { description = "When cut doesn't cut it"; diff --git a/pkgs/by-name/tu/tuckr/package.nix b/pkgs/by-name/tu/tuckr/package.nix index 191572598e48..ffdcea040f28 100644 --- a/pkgs/by-name/tu/tuckr/package.nix +++ b/pkgs/by-name/tu/tuckr/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1hF8zZYkvNYA0bDgvu+zsfcT/8MF8HTiTHpYfOxXljA="; }; - cargoHash = "sha256-QRZsP9OW0oj4PuQNZ1wzvhp9guZ5K3k6WolxzEPUQKw="; + useFetchCargoVendor = true; + cargoHash = "sha256-RuJlF7ZFj0BF5WKHnTPnWbqU9U6rL6RtH9R/FSjavmo="; doCheck = false; # test result: FAILED. 5 passed; 3 failed; diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix index 167330b9e2b7..144fb8abb5cd 100644 --- a/pkgs/by-name/tu/tui-journal/package.nix +++ b/pkgs/by-name/tu/tui-journal/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KPh+ree1XSOdURb+pM0sjJeq3NnNvPOQ+spK4g3RxGM="; }; - cargoHash = "sha256-YiD2MtRMGdzPeKR082n9Kx3OBMFvtcqZOd+HRg7zA5o="; + useFetchCargoVendor = true; + cargoHash = "sha256-d+JlOLQtSMeC4W/9vsSm/CItAIuuwgLnZUEmR0jO9tM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/tu/tuisky/package.nix b/pkgs/by-name/tu/tuisky/package.nix index d0831d00b8cc..34416791bafe 100644 --- a/pkgs/by-name/tu/tuisky/package.nix +++ b/pkgs/by-name/tu/tuisky/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-phadkJgSvizSNPvrVaYu/+y1uAj6fmb9JQLdj0dEQIg="; }; - cargoHash = "sha256-jI4HKn8HalEnBCuFR8/auTqi8M1qt25MS3h/b1pf3BA="; + useFetchCargoVendor = true; + cargoHash = "sha256-nY+9DOdpFxVA16DTL47rDbbeBPSrXxlC1+APzb4Kkbk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix index 5acc3bd75f37..0d73d590dced 100644 --- a/pkgs/by-name/tu/tun2proxy/package.nix +++ b/pkgs/by-name/tu/tun2proxy/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LY7vVD85GVFqARYOBDeb4fS6rL2PwPXYXIAJtwm2goo="; }; - cargoHash = "sha256-o/zQjWR9qNs0XVL/dcRiMHgj+8Xvl6vVl/Yw5iLhroI="; + useFetchCargoVendor = true; + cargoHash = "sha256-jlU6zR1W4rRNiU2mMEUzlqK3WqwRd0YncpN01EnzStw="; cargoPatches = [ ./Cargo.lock.patch diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix index aba0ff47ae19..d9c5a345fedb 100644 --- a/pkgs/by-name/tu/turnon/package.nix +++ b/pkgs/by-name/tu/turnon/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HCeK0aOGxeiZD7Am+kUf3z4rT7JENQxyrAufBStrSms="; }; - cargoHash = "sha256-43hv+ZCpgXK6GGMDG0hXza7g4jvRNmr57MTgkvTOvVQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ya4HiYGotRjl6HTIQGcBgqsJRoj6wl56MC1UAmw+qNA="; nativeBuildInputs = [ cairo diff --git a/pkgs/by-name/tu/turtle-build/package.nix b/pkgs/by-name/tu/turtle-build/package.nix index 86b153d13f9a..ad33d92191ae 100644 --- a/pkgs/by-name/tu/turtle-build/package.nix +++ b/pkgs/by-name/tu/turtle-build/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PDpiLPMyBZzj2nBy76cSC4ab/kyaoZC/Gd2HSaRVHUM="; }; - cargoHash = "sha256-Z9PCnFrUgvF9anfShfU9U7iYISDpzAuJudLq/wN4ONU="; + useFetchCargoVendor = true; + cargoHash = "sha256-V3ks6AWEpPHUkarbgRfCs1G26UKJC5EtEZGVDCHu5V0="; meta = with lib; { description = "Ninja-compatible build system for high-level programming languages written in Rust"; diff --git a/pkgs/by-name/tu/tuxedo-rs/package.nix b/pkgs/by-name/tu/tuxedo-rs/package.nix index 4f9abd7adadc..1d3d8be7b08a 100644 --- a/pkgs/by-name/tu/tuxedo-rs/package.nix +++ b/pkgs/by-name/tu/tuxedo-rs/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { # Some of the tests are impure and rely on files in /etc/tailord doCheck = false; - cargoHash = "sha256-HtyCKQ0xDIXevgr4FAnVJcDI8G6vR9fLHFghe9+ADiU="; + useFetchCargoVendor = true; + cargoHash = "sha256-EkTLL7thZ/bBpY7TwfEsPOjJxzQ3vpxDi+sYPNAK6og="; passthru.tests.version = testers.testVersion { package = tuxedo-rs; diff --git a/pkgs/by-name/tu/tuxmux/package.nix b/pkgs/by-name/tu/tuxmux/package.nix index 709ca9d31bee..2609f4b9dbc6 100644 --- a/pkgs/by-name/tu/tuxmux/package.nix +++ b/pkgs/by-name/tu/tuxmux/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WcHsFKpYexBEg382837NqGgNMTKzVUG3XIER9aa1zK8="; }; - cargoHash = "sha256-ZftnJ6SYfPzwgsS44YgL9tbwL8Y+7PahI0EfFbKdlqA="; + useFetchCargoVendor = true; + cargoHash = "sha256-ceEF9ySxcU9vVZdNIogSiHbN/xYjudAoohy7jyeKrBU="; buildInputs = [ libiconv ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/tv/tv/package.nix b/pkgs/by-name/tv/tv/package.nix index 4e42503a4eaa..8abbf26e608c 100644 --- a/pkgs/by-name/tv/tv/package.nix +++ b/pkgs/by-name/tv/tv/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-qODv45smZ6jHCJBaa6EEvFLG+7g+FWrRf6BiHRFLzqM="; }; - cargoHash = "sha256-nI4n4KMPLaIF978b5VvW3mb02vKW+r39nllrhukJilI="; + useFetchCargoVendor = true; + cargoHash = "sha256-pg8u+1C68ilg0uhszQnsN1bRbniJd39yQHujerQx+mI="; meta = with lib; { description = "Format json into table view"; diff --git a/pkgs/by-name/tw/twiggy/package.nix b/pkgs/by-name/tw/twiggy/package.nix index 5c621073915b..44f6510e9621 100644 --- a/pkgs/by-name/tw/twiggy/package.nix +++ b/pkgs/by-name/tw/twiggy/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NbtS7A5Zl8634Q3xyjVzNraNszjt1uIXqmctArfnqkk="; }; - cargoHash = "sha256-94pfhVZ0CNMn+lCl5O+wOyE+D6fVXbH4NAPx92nMNbM="; + useFetchCargoVendor = true; + cargoHash = "sha256-thGehtb8cF4b/G76nbkuBqQyNodaCbAiDBsrUKQ3zbQ="; meta = with lib; { homepage = "https://rustwasm.github.io/twiggy/"; diff --git a/pkgs/by-name/tw/twm/package.nix b/pkgs/by-name/tw/twm/package.nix index c6c39529f732..f4777d9a5243 100644 --- a/pkgs/by-name/tw/twm/package.nix +++ b/pkgs/by-name/tw/twm/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SiwLqUq/gC8Tr31jjblLc9YP4yBi9HL38W83kgh7eJI="; }; - cargoHash = "sha256-BjQ7dDXHzX+O/V328TTwl9wGtpOq+NjOMRiZwb9O7ZU="; + useFetchCargoVendor = true; + cargoHash = "sha256-iqFPerePQStx1QsFW+2nDNSZEMlDW2HNW05i38rMYgg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ty/tydra/package.nix b/pkgs/by-name/ty/tydra/package.nix index 12b46863c8e7..df61202e91a8 100644 --- a/pkgs/by-name/ty/tydra/package.nix +++ b/pkgs/by-name/ty/tydra/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bH/W54b7UHdkbgLXAd+l5I6UAKjWDMW+I5mfwT4yEEY="; }; - cargoHash = "sha256-emZWQHOgYUQzCa/SmztSLa19bB1aJpPUiBg2C7w6W8M="; + useFetchCargoVendor = true; + cargoHash = "sha256-sFNrpddhsqxy7HtCXV78oacyNzrTeM0rUcL7qgeJTcM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ty/typeshare/package.nix b/pkgs/by-name/ty/typeshare/package.nix index fc96cd710268..6c222ef5378c 100644 --- a/pkgs/by-name/ty/typeshare/package.nix +++ b/pkgs/by-name/ty/typeshare/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZoCl/dWGtoHUtNsNhHQvMjyUnoVdkGBuiBkWPwaQeIQ="; }; - cargoHash = "sha256-TfYWzBK4ZVp65GmamYOL9b/+uuP0NVxxviHE9A7vTC8="; + useFetchCargoVendor = true; + cargoHash = "sha256-Jw073otz8uBdvHi+GTb6qOTCfnR/lTMif1S8QuHwEDY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ty/typical/package.nix b/pkgs/by-name/ty/typical/package.nix index 4d962003d02e..7b3e508af9de 100644 --- a/pkgs/by-name/ty/typical/package.nix +++ b/pkgs/by-name/ty/typical/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-y7PWTzD9+rkC4wZYhecmDTa3AoWl4Tgh7QXbSK4Qq5Q="; }; - cargoHash = "sha256-U6dRk8fqhxxMbu283jvkjGMjbIOYqy9jN64M2VmdZ/g="; + useFetchCargoVendor = true; + cargoHash = "sha256-+SnwxmNQDj6acr2nEKJkNmR5PqnTIvyMApyZOmCld2U="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index b020629712c9..212d9ef86092 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FunbE4HxDmugLmR2XwFFAjvNBTVbLAhiHtacxuPXMVE="; }; - cargoHash = "sha256-hmKm8mPIZlEDcAPuvyUUQZUpIy51mSksahcRknMnMW0="; + useFetchCargoVendor = true; + cargoHash = "sha256-JFsDq9FaOvQmCCO2He2BIUJO6E8x5aMTBQy0B5kY4lQ="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 5f9246ce01f1..d745d3b687ad 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4cCXh6fysunsc6MNb7YNx+1I1tnYJkBgpA30P6IzTcM="; }; - cargoHash = "sha256-NgMImjR+JJElKlrhlf9beqQSwp+6KGcI7sSc5OxDHl4="; + useFetchCargoVendor = true; + cargoHash = "sha256-ISz65YPKgQ7W4pC6KM87xPr6Xt1g+Ve0L5nqShS3Ujc="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ty/typst-live/package.nix b/pkgs/by-name/ty/typst-live/package.nix index f38ba0db7f1c..1dbb2ea22744 100644 --- a/pkgs/by-name/ty/typst-live/package.nix +++ b/pkgs/by-name/ty/typst-live/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bR4Rhhs6rAC6C1nfPFj/3rCtfEziuTGn5m33CR0qZkU="; }; - cargoHash = "sha256-jUtlJ5LPEy/4BX2G5z/UbOYM5nPNH/hTC7MiMrqYWRI="; + useFetchCargoVendor = true; + cargoHash = "sha256-C85hV7uCsuRsxH2/8arjz9Pqs5j23s5b9RHmFsRtZSw="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/tz/tzupdate/package.nix b/pkgs/by-name/tz/tzupdate/package.nix index 64efcc84ac7c..a919459fc272 100644 --- a/pkgs/by-name/tz/tzupdate/package.nix +++ b/pkgs/by-name/tz/tzupdate/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eod4yFzX7pATNQmG7jU+r9mnC9nprJ55ufMXpKjw/YI="; }; - cargoHash = "sha256-5+lp5xlwJxFDqzVxptJPX7z0iLoMkgdwHxvRVIXHF7Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-v6Om9lnFKMuLFdxhU3qmyZLV/f+C3vCMp9luU0jZBEQ="; meta = { description = "Set the system timezone based on IP geolocation"; diff --git a/pkgs/by-name/ua/uair/package.nix b/pkgs/by-name/ua/uair/package.nix index 8dcdd62844fe..2e2c8ae5ff2d 100644 --- a/pkgs/by-name/ua/uair/package.nix +++ b/pkgs/by-name/ua/uair/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-s6st4rBuviH1DACui3dakRt90z3TphIS4ptMN3eHpr8="; }; - cargoHash = "sha256-n7Kaha22Rh/5AGoHUiAxnaZvHtZ+rPsmLHiUYfA0YPE="; + useFetchCargoVendor = true; + cargoHash = "sha256-kSivxIRXmAZ+YfpkOd/ZImCcwEYYIMAAkRgbQ4wv9Pc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ud/udict/package.nix b/pkgs/by-name/ud/udict/package.nix index 121e30e664ed..881c7b8cb9ba 100644 --- a/pkgs/by-name/ud/udict/package.nix +++ b/pkgs/by-name/ud/udict/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vcyzMw2tWil4MULEkf25S6kXzqMG6JXIx6GibxxspkY="; }; - cargoHash = "sha256-WI+dz7FKa3kot3gWr/JK/v6Ua/u2ioZ04Jwk8t9r1ls="; + useFetchCargoVendor = true; + cargoHash = "sha256-KlWzcJtNBTLCDDH01vI1mn9H7LUqni5o/Q6PsNeI7HE="; cargoPatches = [ ./0001-update-version-in-lock-file.patch diff --git a/pkgs/by-name/ud/udpt/package.nix b/pkgs/by-name/ud/udpt/package.nix index 94819a687de5..d18e17187fed 100644 --- a/pkgs/by-name/ud/udpt/package.nix +++ b/pkgs/by-name/ud/udpt/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-dWZRl5OiuEmCx7+Id0/feCohH5k/HA47nbPUEo8BBwQ="; }; - cargoHash = "sha256-wOBD8XKlIpLqj5R8rOw6m4V/UAFiPodo+P32mvjA8Go="; + useFetchCargoVendor = true; + cargoHash = "sha256-AtqtANpxsmvdEoISyGZKDVR7/IxMBPwGGNelgf7ZlH4="; postInstall = '' install -D udpt.toml $out/share/udpt/udpt.toml diff --git a/pkgs/by-name/ue/uefi-run/package.nix b/pkgs/by-name/ue/uefi-run/package.nix index ba0650cdcfea..399f4f7d5ffa 100644 --- a/pkgs/by-name/ue/uefi-run/package.nix +++ b/pkgs/by-name/ue/uefi-run/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tR547osqw18dCMHJLqJ8AQBelbv8yCl7rAqslu+vnDQ="; }; - cargoHash = "sha256-s1Kbc3JHoYy0UJwNfSunIdQ3xHjlQaut/Cb0JSYyB9g="; + useFetchCargoVendor = true; + cargoHash = "sha256-c9aooU60zN58/m8q4G/f8VOjq7oXUTqxqSUMp47YOcA="; meta = with lib; { description = "Directly run UEFI applications in qemu"; diff --git a/pkgs/by-name/ue/uefisettings/package.nix b/pkgs/by-name/ue/uefisettings/package.nix index d93f9650dc8f..3177263e2471 100644 --- a/pkgs/by-name/ue/uefisettings/package.nix +++ b/pkgs/by-name/ue/uefisettings/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Cik8uVdzhMmgXfx23axkUJBg8zd5afMgYvluN0BJsdo="; }; - cargoHash = "sha256-FCQ/1E6SZyVOOAlpqyaDWEZx0y0Wk3Caosvr48VamAA="; + useFetchCargoVendor = true; + cargoHash = "sha256-adCC5o17j6tuffymiLUn2SEPlrjMzYn6a74/4a9HI/w="; checkFlags = [ # Expects filesystem access to /proc and rootfs diff --git a/pkgs/by-name/ue/uesave/package.nix b/pkgs/by-name/ue/uesave/package.nix index ce4d23fb138d..f090eea2065f 100644 --- a/pkgs/by-name/ue/uesave/package.nix +++ b/pkgs/by-name/ue/uesave/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9gOOSLejVfR1KJMhcNuKDkuTOvPC6sNG8xQOZlt8NxI="; }; - cargoHash = "sha256-U6RzSS2j6FK70OHlmWmHZZYT3UB0+Hi+uLofLy+XtGQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-rAbZfAAW+/7wjsVg9x/OkoCmSbUWeuIkRUYlF+PY0Vs="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/un/unbook/package.nix b/pkgs/by-name/un/unbook/package.nix index 3c50f83d5a5e..0a80554a9180 100644 --- a/pkgs/by-name/un/unbook/package.nix +++ b/pkgs/by-name/un/unbook/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-whWWh/jQ4RkGA3T1VCmt6zhpQQCzh2jASYg69IlfEeo="; }; - cargoHash = "sha256-whmp4ST89TZuxQe9fnkW98A9t3rwpTdQCej49ZsDanE="; + useFetchCargoVendor = true; + cargoHash = "sha256-r4RWcz7TSP7wfo9mu8wfOyy7C4PIWkrSt4RyDY3/lQA="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/un/uni-sync/package.nix b/pkgs/by-name/un/uni-sync/package.nix index 3625fcf2d578..7514873cac18 100644 --- a/pkgs/by-name/un/uni-sync/package.nix +++ b/pkgs/by-name/un/uni-sync/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { ./ignore_read-only_filesystem.patch ]; - cargoHash = "sha256-DdmjP0h15cXkHJZxvOcINgoZ/EhTgu/7iYb+bgsIXxU="; + useFetchCargoVendor = true; + cargoHash = "sha256-Qb0TPpYGDjsqHkI4B8QRz5c9rqZ+H98YjOg5K++zpBg="; meta = with lib; { description = "Synchronization tool for Lian Li Uni Controllers"; diff --git a/pkgs/by-name/un/unison-fsmonitor/package.nix b/pkgs/by-name/un/unison-fsmonitor/package.nix index c784772fb70e..13afed3aaff4 100644 --- a/pkgs/by-name/un/unison-fsmonitor/package.nix +++ b/pkgs/by-name/un/unison-fsmonitor/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-1W05b9s0Pg2LzNu0mFo/JKpPw0QORqZkXhbbSuCZIUo="; }; - cargoHash = "sha256-i5FRTdilY1T25KefZjVS2aVQjfH6KrvO0c4Wwes6zYQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-FhENsOGv4jN9A0HS0TIPJMiXA4mYBL668jyckVNGOKc="; checkFlags = [ # accesses /usr/bin/env diff --git a/pkgs/by-name/un/universal-android-debloater/package.nix b/pkgs/by-name/un/universal-android-debloater/package.nix index 8fc5e35f5f7b..f004c1aa9318 100644 --- a/pkgs/by-name/un/universal-android-debloater/package.nix +++ b/pkgs/by-name/un/universal-android-debloater/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-o54gwFl2x0/nE1hiE5F8D18vQSNCKU9Oxiq8RA+yOoE="; }; - cargoHash = "sha256-Zm0zC9GZ2IsjVp5Phd38UAiBH8n0O/i56CEURBUapAg="; + useFetchCargoVendor = true; + cargoHash = "sha256-eiaDqhWuoYybtlhFuM8/Cic4jUEnqOsfNZ+p7tBVL2c="; buildInputs = [ expat diff --git a/pkgs/by-name/un/unpfs/package.nix b/pkgs/by-name/un/unpfs/package.nix index 575bb15f1bc2..630f362fc3d5 100644 --- a/pkgs/by-name/un/unpfs/package.nix +++ b/pkgs/by-name/un/unpfs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/example/unpfs"; - cargoHash = "sha256-v8hbxKuxux0oYglEIK5dM9q0oBQzjyYDP1JB1cYR/T0="; + useFetchCargoVendor = true; + cargoHash = "sha256-jRe1lgzfhzBUsS6wwwlqxxomap2TIDOyF3YBv20GJ14="; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/un/unused/package.nix b/pkgs/by-name/un/unused/package.nix index 3d8fd5c8f7a5..219151c1489c 100644 --- a/pkgs/by-name/un/unused/package.nix +++ b/pkgs/by-name/un/unused/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake ]; - cargoHash = "sha256-hCtkR20+xs1UHZP7oJVpJACVGcMQLQmSS1QE2tmIVhs="; + useFetchCargoVendor = true; + cargoHash = "sha256-YOTTwkmYLU9+7FHw3EhIWFK2oDOwm+pGqCAqa4Ywuew="; meta = with lib; { description = "Tool to identify potentially unused code"; diff --git a/pkgs/by-name/un/unzrip/package.nix b/pkgs/by-name/un/unzrip/package.nix index fbd233b60067..bbc12ffb6e23 100644 --- a/pkgs/by-name/un/unzrip/package.nix +++ b/pkgs/by-name/un/unzrip/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-QYu4PXWQGagj7r8lLs0IngIXzt6B8uq2qonycaGDg6g="; }; - cargoHash = "sha256-9CjKSdd+E2frI8VvdOawYQ3u+KF22xw9kBpnAufRUG0="; + useFetchCargoVendor = true; + cargoHash = "sha256-3EbZv4mguNT3FtqcDBJriqRGGzz/093AMHqH6c2xYvQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ur/urlencode/package.nix b/pkgs/by-name/ur/urlencode/package.nix index 54c89485d1c7..6ea9dce8eed3 100644 --- a/pkgs/by-name/ur/urlencode/package.nix +++ b/pkgs/by-name/ur/urlencode/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-LvLUbtMPVbYZMUb9vWhTscYfZPtEM5GrZme3azvVlPE="; }; - cargoHash = "sha256-UPw+/wVOEM+kciOr70P+gdMCxtCKQ/SXsNAWA44v4v8="; + useFetchCargoVendor = true; + cargoHash = "sha256-rHoqBrDFQ31jIHFZbHwjKHPDgMzM7gUCIhew03OYN6M="; meta = with lib; { description = "CLI utility for URL-encoding or -decoding strings"; diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix index 7da0d1d671ab..d31c06d17d1a 100644 --- a/pkgs/by-name/us/usage/package.nix +++ b/pkgs/by-name/us/usage/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bS8wMtmD7UPctP+8yDm8KylLIPzPuk6dt9ilWQzFvY0="; }; - cargoHash = "sha256-z/McKMlLvr/YBzXSCLFZk9PSIBnrweU7tIPjTwTeiuQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-E8C6iqx/Ov01xinHh+A1tmtcpw84z8tyaj/Z8gWSwNY="; postPatch = '' substituteInPlace ./examples/mounted.sh \ diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix index 5290fd054338..4d767090654d 100644 --- a/pkgs/by-name/us/userborn/package.nix +++ b/pkgs/by-name/us/userborn/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/rust/userborn"; - cargoHash = "sha256-/S2rkZyXHN5NiW9TFhKguqtf/udFcDOTfV2jYRMV14s="; + useFetchCargoVendor = true; + cargoHash = "sha256-QqD+pbCJZAPhA6BdG6EJbbhkaEE7NK/IHH8HE8ye3DY="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/uw/uwc/package.nix b/pkgs/by-name/uw/uwc/package.nix index fea7e9cd0107..d8032dc205e4 100644 --- a/pkgs/by-name/uw/uwc/package.nix +++ b/pkgs/by-name/uw/uwc/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Qv8vMjCMhpVxkJyH1uTsFXu2waO8oaLPuoBETaWOUqI="; }; - cargoHash = "sha256-20brxqYAvgBxbOQ7KOFviXxmFrSHDXNV/0lcks7x3a8="; + useFetchCargoVendor = true; + cargoHash = "sha256-9inL/z19lbZY8OxIjut3d/HJJXQzZi/cL750Cx98Kcg="; doCheck = false; diff --git a/pkgs/by-name/uw/uwuify/package.nix b/pkgs/by-name/uw/uwuify/package.nix index 128b590ee80b..e539ca7cb556 100644 --- a/pkgs/by-name/uw/uwuify/package.nix +++ b/pkgs/by-name/uw/uwuify/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-MzXObbxccwEG7egmQMCdhUukGqZS+NgbYwZjTaqME7I="; }; - cargoHash = "sha256-1BoB7K/dWy3AbogvHIDLrdPD7K54EISvn4RVU5RLTi4="; + useFetchCargoVendor = true; + cargoHash = "sha256-gR3FL1GeD9Dx5TKeThmPScMCRJQ2THlO4pBViXlI9XM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { diff --git a/pkgs/by-name/va/vale-ls/package.nix b/pkgs/by-name/va/vale-ls/package.nix index e5d69ccf4a72..6fd99c0d44c7 100644 --- a/pkgs/by-name/va/vale-ls/package.nix +++ b/pkgs/by-name/va/vale-ls/package.nix @@ -51,7 +51,8 @@ rustPlatform.buildRustPackage rec { env.OPENSSL_NO_VENDOR = true; - cargoHash = "sha256-YurMB54jeMQIAOgDQhXEYrkYUYrSl02M9JG5Wtp6Eb8="; + useFetchCargoVendor = true; + cargoHash = "sha256-KPgi0wZh1+PTKUmvCkLGPf+DZW5Tt4dQVK/cdxjm/1A="; postInstall = '' wrapProgram $out/bin/vale-ls \ diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix index e42d1758c4c6..e215a13f42a3 100644 --- a/pkgs/by-name/va/vault-tasks/package.nix +++ b/pkgs/by-name/va/vault-tasks/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { rev = "v${version}"; hash = "sha256-4sg1v541NknaOClZAkYC6tGlpItBT6RzUK9Itniu7OQ="; }; - cargoHash = "sha256-7MSe2YpVV68nXXeMPy+AGO0hYPpsOaR2S82c/EBczwQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-ocRf+orNwp5+iDQR6Vyc85O9oguUFcVabwINRYDCXe0="; postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications"; diff --git a/pkgs/by-name/ve/verco/package.nix b/pkgs/by-name/ve/verco/package.nix index 8af24bfa90bd..64796257e069 100644 --- a/pkgs/by-name/ve/verco/package.nix +++ b/pkgs/by-name/ve/verco/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-M3Utrt350I67kqzEH130tgBIiI7rY8ODCSxgMohWWWM="; }; - cargoHash = "sha256-urnTPlQTmOPq7mHZjsTqxql/FQe7NYHE8sVJJ4fno+U="; + useFetchCargoVendor = true; + cargoHash = "sha256-cpPEIFoEqc/4Md+/5e09B/ZQ+7cflLE+PY4ATAgWUvo="; meta = with lib; { description = "Simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts"; diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index 7c05fdf77ed5..0b1bbbc542ff 100644 --- a/pkgs/by-name/ve/versatiles/package.nix +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ejMqTMGLbVr/Aaqw8U0ojV43N6t0GeWdYIcP0guAsO0="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed. }; - cargoHash = "sha256-2C/oPB48CTX7i4xoF1iegrpNvaSMkIbVeEyy/WteKqM="; # When updating: Same as above + useFetchCargoVendor = true; + cargoHash = "sha256-ZvkuA/6TQc5CsBvjQHlVb2AFA60q6Wa5mrfxjh49uYE="; # When updating: Same as above # Testing only necessary for the `bins` and `lib` features cargoTestFlags = [ diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix index f00ba1658799..a0fdca2925fa 100644 --- a/pkgs/by-name/ve/veryl/package.nix +++ b/pkgs/by-name/ve/veryl/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-w7mB0cAN5aRO1pw21BDIFUtnYUJUoYjW+7nXFCBfYgM="; + useFetchCargoVendor = true; + cargoHash = "sha256-DEq67oPEo5CZYtX7kaqWNXzgbOiyvN3n+Qs9fiMHgUw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/vh/vhdl-ls/package.nix b/pkgs/by-name/vh/vhdl-ls/package.nix index 84c83a51c843..2c95fb32cdb5 100644 --- a/pkgs/by-name/vh/vhdl-ls/package.nix +++ b/pkgs/by-name/vh/vhdl-ls/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AO95J138d3m8CpJ7hWYeGP+rRd2009qQXwLxbuHDSDs="; }; - cargoHash = "sha256-L7Y5sJe/6xx0JIEyxPHyKWxHRnkNUek5U3X5BL5a0k8="; + useFetchCargoVendor = true; + cargoHash = "sha256-7+isSSjF4V1FQaWRzmNAAW0q3/x/Tqkt8jNzGXsJHAo="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix index d1f6e6abcb28..de37893373a3 100644 --- a/pkgs/by-name/vi/viddy/package.nix +++ b/pkgs/by-name/vi/viddy/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZdDe0ymPkj0ZGiPLo1Y0qMDk2SsUcPsSStay+Tuf4p0="; }; - cargoHash = "sha256-d/wmjvbTITpcGCrMVZrkUcCFPDdas2CDDPlIqoVBl9k="; + useFetchCargoVendor = true; + cargoHash = "sha256-Bp3t/fjaFeouIoKlRvQPVDlc46Ggitfx6HUXE+RZN0A="; # requires nightly features env.RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix index da2bd69d0aba..b57e51867316 100644 --- a/pkgs/by-name/vi/vimcats/package.nix +++ b/pkgs/by-name/vi/vimcats/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "cli" ]; - cargoHash = "sha256-LBiuh7OkEoOkoPXCeGnDQLSlRIMkbiWyCv0dk0y7swk="; + useFetchCargoVendor = true; + cargoHash = "sha256-qxAxMAeeqiHNQ5jJ+Mxtkw9y0xeUFUzhClUc1k8I4HM="; passthru.tests.version = testers.testVersion { package = vimcats; }; diff --git a/pkgs/by-name/vi/vimv-rs/package.nix b/pkgs/by-name/vi/vimv-rs/package.nix index bff4c550b940..0ad02b284fd6 100644 --- a/pkgs/by-name/vi/vimv-rs/package.nix +++ b/pkgs/by-name/vi/vimv-rs/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jbRsgEsRYF5hlvo0jEB4jhy5jzCAXNzOsNWWyh4XULQ="; }; - cargoHash = "sha256-rYQxIttuGBGEkYkFtSBl8ce1I/Akm6FxeITJcaIeP6M="; + useFetchCargoVendor = true; + cargoHash = "sha256-A+Ba3OWQDAramwin1Yc1YDOyabuEEaZGhE1gel2tFoM="; meta = with lib; { description = "Command line utility for batch-renaming files"; diff --git a/pkgs/by-name/vi/virtiofsd/package.nix b/pkgs/by-name/vi/virtiofsd/package.nix index 4c8fb25a8f68..84dfc2e9237a 100644 --- a/pkgs/by-name/vi/virtiofsd/package.nix +++ b/pkgs/by-name/vi/virtiofsd/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { separateDebugInfo = true; - cargoHash = "sha256-mD6hZxkqLGdzMfeD9BDZDObCm607mR6LTWhWwDsfRH8="; + useFetchCargoVendor = true; + cargoHash = "sha256-skGU3eA4nN55+EUBlB/C5kHP/RmQBexw3Cf0e4TzSyA="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/pkgs/by-name/vi/viu/package.nix b/pkgs/by-name/vi/viu/package.nix index ef28b02e8c1d..91ceb2116473 100644 --- a/pkgs/by-name/vi/viu/package.nix +++ b/pkgs/by-name/vi/viu/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { # tests need an interactive terminal doCheck = false; - cargoHash = "sha256-OyG4DAMoWdLBO0IOcbpD2Fmac0XIP7hdaeDdKiQ4PQA="; + useFetchCargoVendor = true; + cargoHash = "sha256-a9Z6/+/fMyJ2pFiKPexuiM5DAbk+Tcq3D9rDAyUwC84="; buildFeatures = lib.optional withSixel "sixel"; buildInputs = lib.optional withSixel libsixel; diff --git a/pkgs/by-name/vi/vivid/package.nix b/pkgs/by-name/vi/vivid/package.nix index 6696abe9bc21..83781bb09f3f 100644 --- a/pkgs/by-name/vi/vivid/package.nix +++ b/pkgs/by-name/vi/vivid/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mxBBfezaMM2dfiXK/s+Htr+i5GJP1xVSXzkmYxEuwNs="; }; - cargoHash = "sha256-B1PYLUtBcx35NkU/NR+CmM8bF0hfJWmu11vsovFwR+c="; + useFetchCargoVendor = true; + cargoHash = "sha256-oP5/G/PSkwn4JruLQOGtM8M2uPt4Q88bU3kNmXUK4JE="; meta = with lib; { description = "Generator for LS_COLORS with support for multiple color themes"; diff --git a/pkgs/by-name/vo/voidmap/package.nix b/pkgs/by-name/vo/voidmap/package.nix index f55a2ddf8811..625035b74ad1 100644 --- a/pkgs/by-name/vo/voidmap/package.nix +++ b/pkgs/by-name/vo/voidmap/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+P83psu+BYzgC/I/Ul7vrbZ99KIybd410/ycsIY1pGI="; }; - cargoHash = "sha256-+UhqGl7w2jtGBFgX4u/g8tGO0NJTkDAJdNfwe8RobPQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-H2KyqphEleEnWNfPdswns5QOLAlhO4UnmolnHcsV5FU="; checkFlags = [ # The test utilizes a redirect stdout to file with dup2 and breaks sandbox assumptions diff --git a/pkgs/by-name/vo/vopono/package.nix b/pkgs/by-name/vo/vopono/package.nix index f4f6a63c2ca3..94f933a03327 100644 --- a/pkgs/by-name/vo/vopono/package.nix +++ b/pkgs/by-name/vo/vopono/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qgsfTniikrdykFSFqZATp7ewPZm5z5p5FMztNKWzPIY="; }; - cargoHash = "sha256-/z4qBBY/Htlv55vNKj2c1frWsUFTRweJh/G0T2jHLr4="; + useFetchCargoVendor = true; + cargoHash = "sha256-hQfLj2wbCjI2O/6hh9IJk9ehakGrvF2IbY8aVAPPT0o="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; diff --git a/pkgs/by-name/vu/vulkan-helper/package.nix b/pkgs/by-name/vu/vulkan-helper/package.nix index 30dc0250943b..5f653ef99d3a 100644 --- a/pkgs/by-name/vu/vulkan-helper/package.nix +++ b/pkgs/by-name/vu/vulkan-helper/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2pLHnTn0gJKz4gfrR6h85LHOaZPrhIGYzQeci4Dzz2E="; }; - cargoHash = "sha256-OXMz1qu4/LDeQbwe7shhn2Eee15xKmBpWSsP0IbjoGM="; + useFetchCargoVendor = true; + cargoHash = "sha256-9Zc949redmYLCgDR9pabR4ZTtcvOjrXvviRdsb8AiBU="; nativeBuildInputs = [ addDriverRunpath diff --git a/pkgs/by-name/wa/wallust/package.nix b/pkgs/by-name/wa/wallust/package.nix index d61c2e153e4b..47c789cc01e4 100644 --- a/pkgs/by-name/wa/wallust/package.nix +++ b/pkgs/by-name/wa/wallust/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Tad+zyhmTr734GEW0A4SNrfWzqcL0gLFsM6MoMrV17k="; }; - cargoHash = "sha256-SEaq0qeWuDeIeCqz9imb5nV4WK44CF5wIwG62nhyqlU="; + useFetchCargoVendor = true; + cargoHash = "sha256-Kd+03yERyTxBJ5GSVQQqY4PxV7DfE1REeh43RpSfJNo="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/wa/wambo/package.nix b/pkgs/by-name/wa/wambo/package.nix index 086ac05656e0..19927dff81e8 100644 --- a/pkgs/by-name/wa/wambo/package.nix +++ b/pkgs/by-name/wa/wambo/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3EwNC78DhSXbVFSg6q+66yge4S1m5icJ5nOhoy9qsRI="; }; - cargoHash = "sha256-sg7J6hQGEevGAMD7DocW1UtgyO36rrEb7kKhQTRKPZ4="; + useFetchCargoVendor = true; + cargoHash = "sha256-rFUZGP9pH5J3iXGTyjdtDjS+wiWo5pD3X9eUtIivp2c="; meta = { description = "All-in-one tool to convert decimal/bin/oct/hex and interpret bits as integers"; diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix index 017928c610bd..d70166275e6b 100644 --- a/pkgs/by-name/wa/wapm/package.nix +++ b/pkgs/by-name/wa/wapm/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T7YEe8xg5iwI/npisW0m+6FLi+eaAQVgYNe6TvMlhAs="; }; - cargoHash = "sha256-r4123NJ+nxNOVIg6svWr636xbxOJQ7tp76JoAi2m9p8="; + useFetchCargoVendor = true; + cargoHash = "sha256-GW5/1/RsS5jn6DoR+wGpwNzUW+nN45cxpE85XbnXqso="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/wa/wash-cli/package.nix b/pkgs/by-name/wa/wash-cli/package.nix index aed9801132d0..b01b2396a4bd 100644 --- a/pkgs/by-name/wa/wash-cli/package.nix +++ b/pkgs/by-name/wa/wash-cli/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-A66KSDYFbByguhnlzzU5nf8pE3lhnYQjI3h73SKB2Zo="; }; - cargoHash = "sha256-2mo30xHQ3aCExdI0ITDY9g/C5peN48PdUNFVVxM//+c="; + useFetchCargoVendor = true; + cargoHash = "sha256-m8NkYqfWRNJn+1Qym1C5ZwKhvXrwFd01TSpVigYwsJ8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/wa/wasm-pack/package.nix b/pkgs/by-name/wa/wasm-pack/package.nix index d030c4ee388c..7810cc4a08d2 100644 --- a/pkgs/by-name/wa/wasm-pack/package.nix +++ b/pkgs/by-name/wa/wasm-pack/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CN1LcLX7ag+in9sosT2NYVKfhDLGv2m3zHOk2T4MFYc="; }; - cargoHash = "sha256-RdBnW8HKSgjVnyafycGFTSTc5j1A9WRDvUuZu8upRWY="; + useFetchCargoVendor = true; + cargoHash = "sha256-nYWvk2v+4IAk/y7fg+Z/nMH+Ml+J5k5ER8uudCQOMB8="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index cee890827557..7babe2a143ce 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-UEQnlfXZgNprd9w/ZyeqQkN4psmKKhRf2PCBadDnYDo="; + useFetchCargoVendor = true; + cargoHash = "sha256-/u1FtSWHynpwEmNmh9iUm4EzEnUqatJDzg4+oc1657g="; cargoBuildFlags = [ "--package" "wasm-tools" diff --git a/pkgs/by-name/wa/wasmer-pack/package.nix b/pkgs/by-name/wa/wasmer-pack/package.nix index e372640c9d4b..0536ed30e8f2 100644 --- a/pkgs/by-name/wa/wasmer-pack/package.nix +++ b/pkgs/by-name/wa/wasmer-pack/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+wqgYkdkuhPFkJBdQLnUKAGmUfGBU9mBfMRNBFmiT4E="; }; - cargoHash = "sha256-nyhjwEZyT8IEb0pTbou/EtN47gehge3fUCQVPs2TkIY="; + useFetchCargoVendor = true; + cargoHash = "sha256-PZudXmdPz6fG7NDC/yN7qG+RQFSzNynXo6SpYJEku9A="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index 3a292eb208b7..cd57977444b7 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-iiGg5En7p+7142qURsdOj7nYwS/ushbxfa5QlT/pHDc="; }; - cargoHash = "sha256-yfjAtORymdSn0pLwnGPvjLH3/R4juY08+NanTdm4420="; + useFetchCargoVendor = true; + cargoHash = "sha256-wVnHCMdZLaT31+ctJ9/DOTin4GpNZvNGN+Gm3D4vGlk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix index 630d51f85528..4bb90d70d03c 100644 --- a/pkgs/by-name/wa/watchlog/package.nix +++ b/pkgs/by-name/wa/watchlog/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MVYIBHyCgMKtddlOzpdUxlI6Sqje7ddAyA+FbXSD/78="; }; - cargoHash = "sha256-qbCv/DuBN4Z79hLg/cJMYeo5t3GUMOVCc/KymtAsVCg="; + useFetchCargoVendor = true; + cargoHash = "sha256-qF5Mv3lT6j/lAyrIHiYgcx75EUy1iqnE5sD+gFM34V0="; meta = { description = "Easier monitoring of live logs"; diff --git a/pkgs/by-name/wa/watershot/package.nix b/pkgs/by-name/wa/watershot/package.nix index 6ae8a28ba0ea..51854c095e6e 100644 --- a/pkgs/by-name/wa/watershot/package.nix +++ b/pkgs/by-name/wa/watershot/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-l9CPSB8TCw901ugl5FLVZDkp2rLha0yXMewK7LxXIiE="; }; - cargoHash = "sha256-SEv4DoTZxGAzGe++q9GjRuyp3D+k4BkVzpKkZpqoCFw="; + useFetchCargoVendor = true; + cargoHash = "sha256-ETyz2fmcDPvrYA08ZrDuIE9ve8T74mBn//lU5ZNQt1A="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/waycorner/package.nix b/pkgs/by-name/wa/waycorner/package.nix index 3e17b1483289..5fa7c04d19f1 100644 --- a/pkgs/by-name/wa/waycorner/package.nix +++ b/pkgs/by-name/wa/waycorner/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b8juIhJ3kh+NJc8RUVVoatqjWISSW0ir/vk2Dz/428Y="; }; - cargoHash = "sha256-LGxFRGzQ8jOfxT5di3+YGqfS5KM4+Br6KlTFpPbkJyU="; + useFetchCargoVendor = true; + cargoHash = "sha256-sMsqH4+Vhqiu5GKPs9FQMQjjc2H6ZGZosd4Qj3DlBqA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/wayfreeze/package.nix b/pkgs/by-name/wa/wayfreeze/package.nix index a9df0cb2c318..b6e4b434182b 100644 --- a/pkgs/by-name/wa/wayfreeze/package.nix +++ b/pkgs/by-name/wa/wayfreeze/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; - cargoHash = "sha256-khbayCb0M3vOx00a7M0tOTQ+AKumioCBtoJs2/Ca0+g="; + useFetchCargoVendor = true; + cargoHash = "sha256-jA+hVVV2hM/Hw/9rzGM63UuT/aq488kTMC/AKwSmoJk="; buildInputs = [ libxkbcommon diff --git a/pkgs/by-name/wa/wayidle/package.nix b/pkgs/by-name/wa/wayidle/package.nix index ebe51dd5e100..a0cbeafa8c31 100644 --- a/pkgs/by-name/wa/wayidle/package.nix +++ b/pkgs/by-name/wa/wayidle/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7hFk/YGOQ5+gQy6pT5DRgMLThQ1vFAvUvdHekTyzIRU="; }; - cargoHash = "sha256-PohfLmUoK+2a7Glnje4Rbym2rvzydUJAYW+edOj7qeo="; + useFetchCargoVendor = true; + cargoHash = "sha256-WnEIzcdgX5mFF2/GHykV5ATlr8lSqblvmbv1NnOEaiU="; meta = with lib; { description = "Execute a program when a Wayland compositor reports being N seconds idle"; diff --git a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix index 60e20ed60d01..da3dc53ed1ae 100644 --- a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix +++ b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8oVTexYGQWyaAVJedrp4kIQ7VjBR47l65eByZr7oghg="; }; - cargoHash = "sha256-6MzV2JOVFezD9fVDbzZ6Zm9RWOexh5LPk6AWOleOc2Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-dPP3umoaRMiwQ4uf98CvBqc8GOSH46HSt4xyxzCQsJc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/waylevel/package.nix b/pkgs/by-name/wa/waylevel/package.nix index 615f22f92bf9..8cebaec8a984 100644 --- a/pkgs/by-name/wa/waylevel/package.nix +++ b/pkgs/by-name/wa/waylevel/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T2gqiRcKrKsvwGNnWrxR1Ga/VX4AyllYn1H25aIKt5s="; }; - cargoHash = "sha256-gw5m1/btJ5zZP04C7BCnHqEOUBoeu0whK8W7xA+xSQo="; + useFetchCargoVendor = true; + cargoHash = "sha256-W1xWVH8vKA6hItXRg4VxxvcJRUtURrUAlQFaZV4geY4="; postFixup = '' patchelf --set-rpath ${lib.makeLibraryPath [ wayland ]} $out/bin/waylevel diff --git a/pkgs/by-name/wa/wayout/package.nix b/pkgs/by-name/wa/wayout/package.nix index c9cde3d6f353..87764f20c8a7 100644 --- a/pkgs/by-name/wa/wayout/package.nix +++ b/pkgs/by-name/wa/wayout/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-EzRetxx0NojhBlBPwhQ7p9rGXDUBlocVqxcEVGIF3+0="; }; - cargoHash = "sha256-QlxXbfeWJdCythYRRLSpJbTzKkwrL4kmAfyL3tRt194="; + useFetchCargoVendor = true; + cargoHash = "sha256-RiM9d/aOCnV0t13QQO1fdw+QPGMoF/EjIDA2uttjXcQ="; meta = with lib; { description = "Simple output management tool for wlroots based compositors implementing"; diff --git a/pkgs/by-name/wa/wayshot/package.nix b/pkgs/by-name/wa/wayshot/package.nix index 43100b4f1a64..e8c018d2c390 100644 --- a/pkgs/by-name/wa/wayshot/package.nix +++ b/pkgs/by-name/wa/wayshot/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nUpIN4WTePtFZTmKAjv0tgj4VTdZeXjoQX6am9+M3ig="; }; - cargoHash = "sha256-1Y9ymodZHtxHzhudjGbkP2ohMaBMOD9K+GpUoNmzHQs="; + useFetchCargoVendor = true; + cargoHash = "sha256-uKETDGi1n6VcdGCrjrnEM1sQ0vVjd/vCXMUn9Hby2m8="; # tests are off as they are broken and pr for integration testing is still WIP doCheck = false; diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix index a11a3d43579d..767b2c0c7dd2 100644 --- a/pkgs/by-name/wc/wchisp/package.nix +++ b/pkgs/by-name/wc/wchisp/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6WNXsRvbldEjAykMn1DCiuKctBrsTHGv1fJuRXBblu0="; }; - cargoHash = "sha256-5kJ0MK0rUzyJvLZH/3nje+gTAM6et0mNE3sxVoK1L5s="; + useFetchCargoVendor = true; + cargoHash = "sha256-VC8wiMdg7BnE92m57pKSrtv7vmbRNwV1yyy3f+1e+cY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index 0b6c27a36499..43ad2ffe995f 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FBf+X0Xs3Yr9Sk5v86f2N9WOyv/rW/RSGlAYJ6UCBGY="; }; - cargoHash = "sha256-r7l6/xeClphOI9kz/r36P0tTNHmSTKDhRL6KTVZNmvk="; + useFetchCargoVendor = true; + cargoHash = "sha256-rxBij00NQySBVK3lJSm5rWo4YUZZvxk6tnNUzCj75FQ="; checkFlags = [ # Skip tests requiring network diff --git a/pkgs/by-name/we/webdav-server-rs/package.nix b/pkgs/by-name/we/webdav-server-rs/package.nix index c89dbded735c..bbc883f2f3ef 100644 --- a/pkgs/by-name/we/webdav-server-rs/package.nix +++ b/pkgs/by-name/we/webdav-server-rs/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-nTygUEjAUXD0mRTmjt8/UPVfZA4rP6oop1s/fI5mYeg="; }; - cargoHash = "sha256-TDDfGQig4i/DpsilTPqMQ1oT0mXK5DKlZmwsPPLrzFc="; + useFetchCargoVendor = true; + cargoHash = "sha256-0Ee0L3gKNP1O3SFkImBzQrT1fgnWFrrW8owxEM1dUYQ="; buildInputs = [ libtirpc ] ++ lib.optional enablePAM pam; nativeBuildInputs = [ rpcsvc-proto ]; diff --git a/pkgs/by-name/we/websocat/package.nix b/pkgs/by-name/we/websocat/package.nix index cfbc6b725c62..5e9b3602181e 100644 --- a/pkgs/by-name/we/websocat/package.nix +++ b/pkgs/by-name/we/websocat/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-v5+9cbKe3c12/SrW7mgN6tvQIiAuweqvMIl46Ce9f2A="; }; - cargoHash = "sha256-2THUFcaM4niB7YiQiRXJQuaQu02fpgZKPWrejfhmRQ0="; + useFetchCargoVendor = true; + cargoHash = "sha256-KqtjewctX5M77aCIOpKpqlFEMs9QAzFP/v6KrZwiHb4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/we/weggli/package.nix b/pkgs/by-name/we/weggli/package.nix index a80fd37cc099..2f12a878274e 100644 --- a/pkgs/by-name/we/weggli/package.nix +++ b/pkgs/by-name/we/weggli/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6XSedsTUjcZzFXaNitsXlUBpxC6TYVMCB+AfH3x7c5E="; }; - cargoHash = "sha256-Cj/m4GRaqI/lHYFruj047B7FdGoVl/wC8I2o1dzhOTs="; + useFetchCargoVendor = true; + cargoHash = "sha256-vJd+4cZuDSGThnkUULhwEUFbHlkiIGyxT+1fWRUsIJk="; passthru.tests.version = testers.testVersion { package = weggli; diff --git a/pkgs/by-name/wh/when-cli/package.nix b/pkgs/by-name/wh/when-cli/package.nix index a15a99edf8e6..98d794c5a817 100644 --- a/pkgs/by-name/wh/when-cli/package.nix +++ b/pkgs/by-name/wh/when-cli/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LWssrLl2HKul24N3bJdf2ePqeR4PCROrTiVY5sqzB2M="; }; - cargoHash = "sha256-9emY0yhAKVzuk1Tlzi0kW8oR9jRqLdg8wbTcJMBrxMw="; + useFetchCargoVendor = true; + cargoHash = "sha256-ArrKKcTPfp71ltLh1eeEmanFa7B3nLj+jgj4CzINBY0="; meta = { description = "Command line tool for converting between timezones"; diff --git a/pkgs/by-name/wi/wiper/package.nix b/pkgs/by-name/wi/wiper/package.nix index 95cd355c69c1..bbf4eb8f3541 100644 --- a/pkgs/by-name/wi/wiper/package.nix +++ b/pkgs/by-name/wi/wiper/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-IheSAPk1l6wJ2v4RLPIPvY/5XMfh+vJLyQ/Lc7RrCJQ="; }; - cargoHash = "sha256-gYWTv0AXOmpx9Nc8akBMVWkESI0AtnGgvfH9hQZ0peo="; + useFetchCargoVendor = true; + cargoHash = "sha256-p2bUiRLI0vfOAAi4Cb8B9E8kMVS6aX4ksbF+H9gMsDs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/wi/wired/package.nix b/pkgs/by-name/wi/wired/package.nix index c89c875a7e26..f6a189d9b175 100644 --- a/pkgs/by-name/wi/wired/package.nix +++ b/pkgs/by-name/wi/wired/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AWIV/+vVwDZECZ4lFMSFyuyUKJc/gb72PiBJv6lbhnc="; }; - cargoHash = "sha256-gIDMD1jT6Wj5FCgbPURF0aayFBOq2mrZE1GZWQ3iYAA="; + useFetchCargoVendor = true; + cargoHash = "sha256-xE6r8l3d9WAXf4DsGbhEiaeMPs02kXY2dG9dk0/7flQ="; strictDeps = true; diff --git a/pkgs/by-name/wi/wishbone-tool/package.nix b/pkgs/by-name/wi/wishbone-tool/package.nix index 2281e124ce39..053021fe29f9 100644 --- a/pkgs/by-name/wi/wishbone-tool/package.nix +++ b/pkgs/by-name/wi/wishbone-tool/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { sourceRoot = "${src.name}/wishbone-tool"; - cargoHash = "sha256-wOw3v47AekJUW+8dpHVysheA+42HwEahn/hriYF7CfA="; + useFetchCargoVendor = true; + cargoHash = "sha256-YJEsTGnBUkQ35VOwZQeBbO3RZqglLYm2xecmIS4jiZM="; buildInputs = [ libusb-compat-0_1 ]; diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index 8dac08abc2fd..e51e42162dfd 100644 --- a/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T+9T8hyp2YCZnklh6SP5LtdYIo3kMK6z/LCfbrN77rw="; }; - cargoHash = "sha256-+CXwJNSg7wJF471SnxR5Ob/yhQaFxUR3xfAtlgO3nJY="; + useFetchCargoVendor = true; + cargoHash = "sha256-wp/I4v1M5JSC4sZmrqx9T2NdK1sLab8om3FQ4z/xmbU="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/pkgs/by-name/wi/wizer/package.nix b/pkgs/by-name/wi/wizer/package.nix index 424547aa8d04..0e41dea72c22 100644 --- a/pkgs/by-name/wi/wizer/package.nix +++ b/pkgs/by-name/wi/wizer/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bx8V/jaKDpJdWRwYm6GrjsdXQpDyTulRMKVnQZlqLNE="; }; - cargoHash = "sha256-8iQ6ULdle8tJDPgIoPT9R3jfS32tBBfs4vZNQcV8vfs="; + useFetchCargoVendor = true; + cargoHash = "sha256-TBr+9pWq9kVV01NyzgURJjZnkvyNKTw1LUeCG5VyYiY="; cargoBuildFlags = [ "--bin" diff --git a/pkgs/by-name/wl/wl-clip-persist/package.nix b/pkgs/by-name/wl/wl-clip-persist/package.nix index cfa8eced287f..cd7704ef7f3f 100644 --- a/pkgs/by-name/wl/wl-clip-persist/package.nix +++ b/pkgs/by-name/wl/wl-clip-persist/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dFhHsBazBHVWgPxoRDNwh8Yctt4w64E0RyFaHEC4mvk="; }; - cargoHash = "sha256-rhXVjXhRPCjt7ur7fQviGFXVtQneuFKWZcDNkhM9tkY="; + useFetchCargoVendor = true; + cargoHash = "sha256-x2kNWFfHgzoSSD75Cp3noiq61zlBnmz9twwTAlBBL9w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/wl/wl-clipboard-rs/package.nix b/pkgs/by-name/wl/wl-clipboard-rs/package.nix index e11744ea8c32..2fc26e2c3836 100644 --- a/pkgs/by-name/wl/wl-clipboard-rs/package.nix +++ b/pkgs/by-name/wl/wl-clipboard-rs/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jGTWcVR6atkEeEUunystJ4B6I3GzYiCOMs0MC6pvPfI="; }; - cargoHash = "sha256-P0WLYHNLN8ZqoDRszsgfQTiWeVpfBpFHiEWpQMBjNJM="; + useFetchCargoVendor = true; + cargoHash = "sha256-6HNSQ27PGhF6tt12jdu6llDUZ/tYsFwx2pCJx3mKm/E="; cargoBuildFlags = [ diff --git a/pkgs/by-name/wl/wl-crosshair/package.nix b/pkgs/by-name/wl/wl-crosshair/package.nix index 1c993efa0898..adf8d08bf3ca 100644 --- a/pkgs/by-name/wl/wl-crosshair/package.nix +++ b/pkgs/by-name/wl/wl-crosshair/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-q5key9BWJjJQqECrhflso9ZTzULBeScvromo0S4fjqE="; }; - cargoHash = "sha256-+QAvwnMMADj8Guo1idWj4uqmdxTLK95CB2BwP4QeQ18="; + useFetchCargoVendor = true; + cargoHash = "sha256-34K8Vjb7MrB8WGGLase+GnN2bUDuAnvU6VWRV1k+ZYM="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix index 7da62ca22f87..017a1cd86eee 100644 --- a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix +++ b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-t6bycmaquZ0IMs/WnAzkz5FnIWKIq0BTbeeoUFLeuYg="; }; - cargoHash = "sha256-1hJLu/ndnBYdzJ+NjLaCYENFszvAj9MYpLsZyLEq0Sg="; + useFetchCargoVendor = true; + cargoHash = "sha256-XrU519ibku7OMKxt51gzVOZVOiqgdrBrxAJuBIcAtgc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wl/wl-screenrec/package.nix b/pkgs/by-name/wl/wl-screenrec/package.nix index 8091a3f3d7ef..2c82f0e328ce 100644 --- a/pkgs/by-name/wl/wl-screenrec/package.nix +++ b/pkgs/by-name/wl/wl-screenrec/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-07O2YM9dOHWzriM2+uiBWjEt2hKAuXtRtnKBuzb02Us="; }; - cargoHash = "sha256-AYirjrnk8SGTXk5IjzCep2AQJYPbgHAOOf47MUDYj4k="; + useFetchCargoVendor = true; + cargoHash = "sha256-nwABNqJNqgBVwD860lSu9mcEgty/GbSYmPys3xp535Q="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wl/wldash/package.nix b/pkgs/by-name/wl/wldash/package.nix index 5b2aa6b6825a..287f9da37e37 100644 --- a/pkgs/by-name/wl/wldash/package.nix +++ b/pkgs/by-name/wl/wldash/package.nix @@ -56,7 +56,8 @@ rustPlatform.buildRustPackage { ./0002-Update-fontconfig.patch ]; - cargoHash = "sha256-Y7nhj8VpO6sEzVkM3uPv8Tlk2jPn3c/uPJqFc/HjHI0="; + useFetchCargoVendor = true; + cargoHash = "sha256-gvIsm6D6ZvRm0APw+xpayY+yt2IedMpWoa/hmvIpmV8="; dontPatchELF = true; diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix index 9defe3798e24..d83e8b399757 100644 --- a/pkgs/by-name/wl/wleave/package.nix +++ b/pkgs/by-name/wl/wleave/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PkEj0RlSxhxG9qOJkuMTVj6r0lxsm7V8b1AIaCVaXCQ="; }; - cargoHash = "sha256-ivKPGA5UADKT47CL5jSOB4ZEfKh9uJkXgv9vfvEnBzw="; + useFetchCargoVendor = true; + cargoHash = "sha256-HDlL/tRc60kLW2qoa/TYKe11RbpX0CCmkPiKa7BRK80="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wl/wlink/package.nix b/pkgs/by-name/wl/wlink/package.nix index 29f67573e427..9ab23435169d 100644 --- a/pkgs/by-name/wl/wlink/package.nix +++ b/pkgs/by-name/wl/wlink/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YxozhEJh/KBirlA6ymIEbJY3r7wYSeTL40W2xQLyue0="; }; - cargoHash = "sha256-l9oBwnI26hUgc0hStd7piYc4XD+9nFX6ylScmlhbA0w="; + useFetchCargoVendor = true; + cargoHash = "sha256-Hv+W8yFw6zAKwrV6gf9fWOkR/LFNgAD7WwQsHBqTnPI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/wl/wlr-which-key/package.nix b/pkgs/by-name/wl/wlr-which-key/package.nix index 54f6a209abf6..fa49d11db5e0 100644 --- a/pkgs/by-name/wl/wlr-which-key/package.nix +++ b/pkgs/by-name/wl/wlr-which-key/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BEf1qpy0bVPi5nmu3UUiv8k0bJvE5VFB5Zqb5lS0+t4="; }; - cargoHash = "sha256-QWYqZT6ptxGkDqRAXnT1pWXiuk7j/6KVBBzuFJOB81M="; + useFetchCargoVendor = true; + cargoHash = "sha256-409PW1Ya38imGqtrVqOI50yJa49/RjB68yGQZSvyYd0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wl/wluma/package.nix b/pkgs/by-name/wl/wluma/package.nix index 076a27af0a79..e8cba7a25bcd 100644 --- a/pkgs/by-name/wl/wluma/package.nix +++ b/pkgs/by-name/wl/wluma/package.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { 'ExecStart=/usr/bin/wluma' 'ExecStart=${placeholder "out"}/bin/wluma' ''; - cargoHash = "sha256-WUczKF9Mq39HpnQ077AiXWy8jN30IehzOxqCmUFGMh0="; + useFetchCargoVendor = true; + cargoHash = "sha256-1zBp6eTkIDSMzNN5jKKu6lZVzzBJY+oB6y5UESlm/yA="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix index de9ffda5a384..9e50dd669ea7 100644 --- a/pkgs/by-name/wo/wofi-power-menu/package.nix +++ b/pkgs/by-name/wo/wofi-power-menu/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-UDDDtI6wnx64KG+1/S6bYTc1xi1vOFuZOmRCLK2Yzew="; }; - cargoHash = "sha256-NNlUV9hMIOXxYnCx5/njqQSEE5xIkbPRhTMet4oNJt0="; + useFetchCargoVendor = true; + cargoHash = "sha256-rlEjktBGBrOqG82PA7LSiXo0iyEPpeWgLix/sVd/dTM="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/wo/workshop-runner/package.nix b/pkgs/by-name/wo/workshop-runner/package.nix index 82f2eccb5053..2320c9144e8f 100644 --- a/pkgs/by-name/wo/workshop-runner/package.nix +++ b/pkgs/by-name/wo/workshop-runner/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2lt4RloIRnFvWZ+HeZx7M2cg/wHb1/j0qDmhUhOoF+M="; }; - cargoHash = "sha256-VoIAwPrkhrRl48czXtKWmLTktsZ/U4TVV924wx0DL+A="; + useFetchCargoVendor = true; + cargoHash = "sha256-pDXD59sP86pleL/sC4+jWRdd8WVpX1zEL6rbTH4MHfE="; meta = { description = "CLI tool to drive test-driven Rust workshops"; diff --git a/pkgs/by-name/wp/wpaperd/package.nix b/pkgs/by-name/wp/wpaperd/package.nix index e6a8e1dd3ad7..1c3b7d40feaa 100644 --- a/pkgs/by-name/wp/wpaperd/package.nix +++ b/pkgs/by-name/wp/wpaperd/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eCD+eNdiVWLEmpkt0EaID534t6eE2OIVCgWMie5kbFE="; }; - cargoHash = "sha256-BlndjwvVYUaotCMKkArZ4EtFTLVcVhPDiY2QBnc5NUo="; + useFetchCargoVendor = true; + cargoHash = "sha256-AhIBTDtsyLoKRBE1V+DD9ofCz9XknWA4fn5AQ8O0upQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wr/writedisk/package.nix b/pkgs/by-name/wr/writedisk/package.nix index 0e22b8c651ef..fc52cafc1f3a 100644 --- a/pkgs/by-name/wr/writedisk/package.nix +++ b/pkgs/by-name/wr/writedisk/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MZFnNb8rJMu/nlH8rfnD//bhqPSkhyXucbTrwsRM9OY="; }; - cargoHash = "sha256-DGroBBozAViibbIYbtqH2SxIGLqdtyJ9XKyz7O1L05g="; + useFetchCargoVendor = true; + cargoHash = "sha256-2Vc0vCQJY2enwTAgaRgqLdCTtF5znrF3xaCTvF44XX0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/wt/wthrr/package.nix b/pkgs/by-name/wt/wthrr/package.nix index 0ce0b98357b9..be0b4608788e 100644 --- a/pkgs/by-name/wt/wthrr/package.nix +++ b/pkgs/by-name/wt/wthrr/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8o84FFdcEPRtbsxWCc97tTGGownxlhpIM71GiBRT6uM="; }; - cargoHash = "sha256-gHvPz8DZ6wSfMCzh8vx7Wv8pfP3P7p5EeRCTo4b30cw="; + useFetchCargoVendor = true; + cargoHash = "sha256-q2WkdSb6UKY1/Aut3W70vCQPsqhqv6DPuT40RaGZWAM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix index b1f9abc8f1e0..b5bc96f793eb 100644 --- a/pkgs/by-name/wt/wttrbar/package.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { ] ); - cargoHash = "sha256-UwDaf4osH9Kj1cF2BYbyuv9HmmPGxTB/ynNBAuwa5fs="; + useFetchCargoVendor = true; + cargoHash = "sha256-sv9hSTmq5J6s0PPBMJgaMUWBaRk0/NJV41nNDIj6MoY="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wy/wyvern/package.nix b/pkgs/by-name/wy/wyvern/package.nix index 53f50ca80903..55bb7fe1f29c 100644 --- a/pkgs/by-name/wy/wyvern/package.nix +++ b/pkgs/by-name/wy/wyvern/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; - cargoHash = "sha256-cwk8yFt8JrYkYlNUW9n/bgMUA6jyOpG0TSh5C+eERLY="; + useFetchCargoVendor = true; + cargoHash = "sha256-3zcXHl/CK5p/5BpGwafMYF/ztE6Erid9nS49vRFyPfE="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/x4/x4/package.nix b/pkgs/by-name/x4/x4/package.nix index 7e3998d1f90b..26815dd7a0c7 100644 --- a/pkgs/by-name/x4/x4/package.nix +++ b/pkgs/by-name/x4/x4/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IF+8lu56fzYM79p7MiNpVLFIs2GKPlzw5pNXD/hT6BM="; }; - cargoHash = "sha256-p3iMqnRW/quk2AHr2nLgOTvtshZ+xo6DGvWDsDj+bvU="; + useFetchCargoVendor = true; + cargoHash = "sha256-iWLRXi7Xt4FQPgXGhk6+mDi1T+Jxrvh7S4myL0cYXec="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/xc/xcolor/package.nix b/pkgs/by-name/xc/xcolor/package.nix index 84997af2c336..1517aa141cbd 100644 --- a/pkgs/by-name/xc/xcolor/package.nix +++ b/pkgs/by-name/xc/xcolor/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NfmoBZek4hsga6RflE5EKkWarhCFIcTwEXhg2fpkxNE="; }; - cargoHash = "sha256-Zh73+FJ63SkusSavCqSCLbHVnU++4ZFSMFUIM7TnOj0="; + useFetchCargoVendor = true; + cargoHash = "sha256-8hx8c0LvzI2T/kONq29XzCbFGGMiO1J0XXxbzi+FSxM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix index c4f611090193..796f50bbb8f3 100644 --- a/pkgs/by-name/xc/xcp/package.nix +++ b/pkgs/by-name/xc/xcp/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { # no such file or directory errors doCheck = false; - cargoHash = "sha256-P6A1tO+XlZobvptwfJ4KH6iE/p/T1Md1sOSKZ/H/xt4="; + useFetchCargoVendor = true; + cargoHash = "sha256-X3zXCiMZAolPLjCKSKocc00t3/P2tS57a2+BWW3VaD0="; meta = with lib; { description = "Extended cp(1)"; diff --git a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix index c4d898b6bbf9..7411badfcbd4 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage rec { mesonBuildType = "release"; - cargoHash = "sha256-/iJAYG0OjTaRrDtNjypvmSUad8PS0lRfykSxp0fJZ98="; + useFetchCargoVendor = true; + cargoHash = "sha256-E573A3njd+IMOEHnKwyKmA4I4bfCt4Kttj7MiFOUw/0="; meta = with lib; { description = "Filechooser portal backend for any desktop environment"; diff --git a/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix b/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix index 1d6e61edb6b0..0080cb9ed227 100644 --- a/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix +++ b/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-iVp+tg+OujMMddKsQ/T9wyqh/Jk/j/jQgsl23uQA/iM="; }; - cargoHash = "sha256-x2oEPFx2KRhnKPX3QjGBM16nkYGclxR5mELGYvxjtMA="; + useFetchCargoVendor = true; + cargoHash = "sha256-4GNdH+cfr3hhbK3BQXHntPr0sTSl6SS56wkdTWbv8/k="; meta = { description = "Alternative rust-based implementation of the proposed XDG Default Terminal Execution Specification"; diff --git a/pkgs/by-name/xe/xen-guest-agent/package.nix b/pkgs/by-name/xe/xen-guest-agent/package.nix index 07226a396fb8..297e7904bc59 100644 --- a/pkgs/by-name/xe/xen-guest-agent/package.nix +++ b/pkgs/by-name/xe/xen-guest-agent/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OhzRsRwDvt0Ov+nLxQSP87G3RDYSLREMz2w9pPtSUYg="; }; - cargoHash = "sha256-E6QKh4FFr6sLAByU5n6sLppFwPHSKtKffhQ7FfdXAu4="; + useFetchCargoVendor = true; + cargoHash = "sha256-o4eQ1ORI7Rw097m6CsvWLeCW5Dtl75uRXi/tcv/Xq0Q="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix index dd0fc11bc992..2afe5d5ef48e 100644 --- a/pkgs/by-name/xh/xh/package.nix +++ b/pkgs/by-name/xh/xh/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fNsiM9B3E34x8m+RuVlZXIhsoB0JaxloAUfa0RmXobQ="; }; - cargoHash = "sha256-SVinnMapZ2mFvihYYuBpvyzXQsnwBrpazk/yhSa++8g="; + useFetchCargoVendor = true; + cargoHash = "sha256-uF2FoDgQQjLAiI2bjtLKmGxRINdF6RHSXR8j0TWDXkU="; buildFeatures = lib.optional withNativeTls "native-tls"; diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix index 2d24acd34efb..7d9433cc4221 100644 --- a/pkgs/by-name/xi/xiu/package.nix +++ b/pkgs/by-name/xi/xiu/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EjyvCwqcPkOe69YnDiAExtBNPhsqqGa95ao+bn6wcyA="; }; - cargoHash = "sha256-pW1VvnK7WDRvSVFOMUibtsPn+dhcFp64EpTW5beaJ+s="; + useFetchCargoVendor = true; + cargoHash = "sha256-IEIZM27zQZrq63ZsCVAeOl2exuFR5tUG3Gwipjg4+oo="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix index 0e69eefda525..7ea709aadb76 100644 --- a/pkgs/by-name/xp/xplr/package.nix +++ b/pkgs/by-name/xp/xplr/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0c2QJUEQwKEzzDBDP5XdX7xe1rivazsoZtepB4Dxp/c="; }; - cargoHash = "sha256-RZgdWhVBZozYxbbNslCBLhN6EnogpyVXvht6GbzLnPs="; + useFetchCargoVendor = true; + cargoHash = "sha256-D8BYJtf6joAXyqLDdAeP4GGAA9W5dvA16ia4/ZeZWaE="; # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin env = lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) { diff --git a/pkgs/by-name/xq/xq/package.nix b/pkgs/by-name/xq/xq/package.nix index da5e9ec3e4a0..ae5675c063da 100644 --- a/pkgs/by-name/xq/xq/package.nix +++ b/pkgs/by-name/xq/xq/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Qe+crretlKJRoNPO2+aHxCmMO9MecqGjOuvdhr4a0NU="; }; - cargoHash = "sha256-R2ng5l2l/5vWnTJ3kt3cURNWL4Lo55yGbSE+9hjQu20="; + useFetchCargoVendor = true; + cargoHash = "sha256-q8kVyj31Ne8ddMm2Q3Z/VB10SCxrq/65PH08mmtFCu4="; meta = with lib; { description = "Pure rust implementation of jq"; diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index 829a4452de76..aa61abefcf93 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/local/bin' "$out/bin" ''; - cargoHash = "sha256-KnkU+uLToD0cBNgPnRiR34XHIphQWoATjim1E/MVf48="; + useFetchCargoVendor = true; + cargoHash = "sha256-1IsKt+OfezILaDklHts74TnS0/FVogu6Ds/7JG+ataY="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/ya/yambar-hyprland-wses/package.nix b/pkgs/by-name/ya/yambar-hyprland-wses/package.nix index 871c4cecf5f4..2b1c8ce049f0 100644 --- a/pkgs/by-name/ya/yambar-hyprland-wses/package.nix +++ b/pkgs/by-name/ya/yambar-hyprland-wses/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-furHj1AAFgNiNHP9RBsVrIvrDckSKU8FXilzH9TQ99c="; }; - cargoHash = "sha256-/ewEgrBxRw5Xii5PX1GLKzBrZjgnzYc/Hz+M1pJpncQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-bAJ8TTlSgXDYC7gSTuSISIS1HH0jCF9W5WswZhw94vQ="; meta = { description = "Enable Yambar to show Hyprland workspaces"; diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 050c331e002d..009978e53960 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gIYqWRJI/IZwEyc1Fke/CD8PPoSZvwtvOT0rnK+LFIo="; }; - cargoHash = "sha256-hlwHF6ESrRpXduXZmC/svldzYuoIwwOllf5pSbvEpCM="; + useFetchCargoVendor = true; + cargoHash = "sha256-w/jMrWu/JKhrlI5Ux+6UNkIgnVpxJtTX2LU+wP+kYFY="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index a092cbb76017..a9a79b12a5f7 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2fBajVFpmgNHb90NbK59yUeaYLWR7rhQxpce9Tq1uQU="; }; - cargoHash = "sha256-54KD20C1oFK2KlH6aCwvjT4tf4p15FJV5y6pJUoQXG0="; + useFetchCargoVendor = true; + cargoHash = "sha256-WViLfoPOFQz2zod2ZSWgmX5VqYiXKvdBUUqPPt9ereE="; env.YAZI_GEN_COMPLETIONS = true; env.VERGEN_GIT_SHA = "Nixpkgs"; diff --git a/pkgs/by-name/ye/yex-lang/package.nix b/pkgs/by-name/ye/yex-lang/package.nix index 2950aa864f2a..55ef9f067219 100644 --- a/pkgs/by-name/ye/yex-lang/package.nix +++ b/pkgs/by-name/ye/yex-lang/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sxzkZ2Rhn3HvZIfjnJ6Z2au/l/jV5705ecs/X3Iah6k="; }; - cargoHash = "sha256-nX5FoPAk50wt0CXskyg7jQeHvD5YtBNnCe0CVOGXTMI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Kz/7BFBmTK8h6nO+jrSYh2p0GMlT1E0icmLXC+mJVmg="; meta = with lib; { homepage = "https://github.com/nonamescm/yex-lang"; diff --git a/pkgs/by-name/yg/yggdrasil-jumper/package.nix b/pkgs/by-name/yg/yggdrasil-jumper/package.nix index ab1aa514b525..b5321d7d2402 100644 --- a/pkgs/by-name/yg/yggdrasil-jumper/package.nix +++ b/pkgs/by-name/yg/yggdrasil-jumper/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Op3KBJ911AjB7BIJuV4xR8KHMxBtQj7hf++tC1g7SlM="; }; - cargoHash = "sha256-i4w+cUCTzbXMC76HuVUdKh54ww8T9nPqQkL64YAneos="; + useFetchCargoVendor = true; + cargoHash = "sha256-EbG83rGlUbiJC1qm9H1+YrCFSq23kSDeW7KMHP8Wee8="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/yo/yofi/package.nix b/pkgs/by-name/yo/yofi/package.nix index ecd4c9976ff0..b9030eceb27f 100644 --- a/pkgs/by-name/yo/yofi/package.nix +++ b/pkgs/by-name/yo/yofi/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-GA6rFet0GIYFR/8WsWteMDwVRz/KyyxlFQOz/lNX7Rk="; + useFetchCargoVendor = true; + cargoHash = "sha256-UCJlBVQb4aLObi5hqXnh/FAD7l2VSocAlqmYMlxLUJc="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix index 9967168f4fac..c7703f27cd1f 100644 --- a/pkgs/by-name/yo/youki/package.nix +++ b/pkgs/by-name/yo/youki/package.nix @@ -53,7 +53,8 @@ rustPlatform.buildRustPackage rec { "youki" ]; - cargoHash = "sha256-3a6KlDTQCKXIPaz6134MVmFYvwUk/t6H/jeBFDH+FrA="; + useFetchCargoVendor = true; + cargoHash = "sha256-JI37KtuWLhFiusQTqKy2DpSdgTY4jNuzsEkoyhLPieI="; meta = with lib; { description = "Container runtime written in Rust"; diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix index 6cf472a3d27f..8bc1d7e5334f 100644 --- a/pkgs/by-name/yt/ytui-music/package.nix +++ b/pkgs/by-name/yt/ytui-music/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f/23PVk4bpUCvcQ25iNI/UVXqiPBzPKWq6OohVF41p8="; }; - cargoHash = "sha256-766Wev2/R/9LLlWWxOPl6y4CBRUU4hUrTDlVVuoJ8C8="; + useFetchCargoVendor = true; + cargoHash = "sha256-I+ciLSMvV9EqlfA1+/IC1w7pWpj9HHF/DTfAbKw2CVM="; checkFlags = [ "--skip=tests::display_config_path" diff --git a/pkgs/by-name/zb/zbus-xmlgen/package.nix b/pkgs/by-name/zb/zbus-xmlgen/package.nix index e984ca23347e..439bf07fd58d 100644 --- a/pkgs/by-name/zb/zbus-xmlgen/package.nix +++ b/pkgs/by-name/zb/zbus-xmlgen/package.nix @@ -9,7 +9,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-H3QA1Eh1AL1CtiUykEjJ7Ltskcen8tIfbGg6jy7Xic8="; }; - cargoHash = "sha256-bglcui1OLp2USRpL2kOxU8fw+aLAbbDv5hrg5fxz4cQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-aD0aEMQ8YAOXTJCjGolqG9k5UciK3pXB7Z9dbp4E2uY="; nativeBuildInputs = [ makeBinaryWrapper ]; nativeCheckInputs = [ rustfmt ]; diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index f977e94be852..1f3f447ab691 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { --replace-fail ', "vendored_curl"' "" ''; - cargoHash = "sha256-38hTOsa1a5vpR1i8GK1aq1b8qaJoCE74ewbUOnun+Qs="; + useFetchCargoVendor = true; + cargoHash = "sha256-nfk+4vf9toPwWcAgNtK9uy263g+j/Km1v8SJexlHhNg="; env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix index a6ba3a65a30a..197c1a819a2b 100644 --- a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-V35nqrTUQb5Emn6kgGubvVkTHYQHDz82p3S7pk0Aagg="; }; - cargoHash = "sha256-qpubYs7JEdL1iSYrMQ2HXPXrkCmFLjHyC0+MhiolEFk="; + useFetchCargoVendor = true; + cargoHash = "sha256-EXI3x9u7OWKVGaAv8lOefR3vEyNSRmMpHJVFjTXutIQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix index aafd5a14b1c2..2058edd48f33 100644 --- a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-X8COHoAf+VG5RXg6KLozxe39a/4oVuiEJLESnEKaCEE="; }; - cargoHash = "sha256-4V0blfTQ5plFD4MNJeIIuztVlhOlzOgtycsg8J/pZjQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-orTq5cfkCBedUCu0HeCb7VoMaW6GHCXowSzVxiy5EPA="; meta = { description = "Backend and Storages for zenoh using InfluxDB"; diff --git a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix index d119a40a61b9..4eaca6812af2 100644 --- a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+dA/4VA1oHhTiMcSXful2Z1B+IYykPMC/2p0mjEbako="; }; - cargoHash = "sha256-bQQWewhKibUKmJ9sJGcgvsNJhdCu67qOwFTNsCkjlO0="; + useFetchCargoVendor = true; + cargoHash = "sha256-JYBhaPROsk8+df0tIO2i7hp0Ms1DEGZ2ykL7Fiyddd4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix index 7a5953cbdad0..c417a30461b2 100644 --- a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-boe4AI0U0JHNuChhHOlfCMlKJ0Zo5yUGG3xubR/Msrc="; }; - cargoHash = "sha256-uB/geIBpNStXx82zL2sX6e6sLsoWRkbUsx14xLvDdsw="; + useFetchCargoVendor = true; + cargoHash = "sha256-prkF0x6JRh+YsakwDR9acm2xJxyrfHPPccvAVVstsho="; # Some test time out doCheck = false; diff --git a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix index 0b2360458f33..548c98a2242f 100644 --- a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DduYSy8jO0LtpEadhBhVFW5uht9LFmTbmSJ0jGTh/TQ="; }; - cargoHash = "sha256-W1vmrKP4aS6O/+8sCzPb5Rs9kAm8ePnowtYEhcS7yMo="; + useFetchCargoVendor = true; + cargoHash = "sha256-YFCu3e3SGAelAneJ/LwXZy3c6kz76qG4B8tsBVOPynI="; meta = { description = "Implements an HTTP server mapping URLs to zenoh paths"; diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix index 622acf3e180e..f29c07987dd0 100644 --- a/pkgs/by-name/ze/zenoh/package.nix +++ b/pkgs/by-name/ze/zenoh/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5lFs/t1Otmp8C0j5LQN/GV19ukfLq4alBpgwsA934FU="; }; - cargoHash = "sha256-NF131RKn3G5wINRMEkfgI5eE25gKlIsaZA98YN9ZWS8="; + useFetchCargoVendor = true; + cargoHash = "sha256-A0xjYn9+Xt+K1U1Z1J8mAegw4mR4cB5T2mYIOBu4AbE="; cargoBuildFlags = [ "--workspace" diff --git a/pkgs/by-name/ze/zeronsd/package.nix b/pkgs/by-name/ze/zeronsd/package.nix index 71eeb50e6163..0c1cc9f88052 100644 --- a/pkgs/by-name/ze/zeronsd/package.nix +++ b/pkgs/by-name/ze/zeronsd/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TL0bgzQgge6j1SpZCdxv/s4pBMSg4/3U5QisjkVE6BE="; }; - cargoHash = "sha256-WGap0j90obpJHiMNokCWg0Q3xIAqwvmiESg9NVnFMKE="; + useFetchCargoVendor = true; + cargoHash = "sha256-xIuMANJGRHbYBbhlVMXxIVrukW1NY7ucxO79tIdPSpI="; strictDeps = true; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ze/zet/package.nix b/pkgs/by-name/ze/zet/package.nix index e1fa08c94162..747659a22ca4 100644 --- a/pkgs/by-name/ze/zet/package.nix +++ b/pkgs/by-name/ze/zet/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-kHIOsSR7ZxBzp4dtm2hbi8ddtlQ86x5EASk5HFmnhFo="; + useFetchCargoVendor = true; + cargoHash = "sha256-1nuYdaQ6p0tnd7a7/H8wVtzOCGr0pCTcsT+Q0X9/DGc="; # tests fail with `--release` # https://github.com/yarrow/zet/pull/7 diff --git a/pkgs/by-name/zi/zine/package.nix b/pkgs/by-name/zi/zine/package.nix index fab0f769d6ce..0f218e6ae8e7 100644 --- a/pkgs/by-name/zi/zine/package.nix +++ b/pkgs/by-name/zi/zine/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pUoMMgZQ+oDs9Yhc1rQuy9cUWiR800DlIe8wxQjnIis="; }; - cargoHash = "sha256-B0yPTyZ+d+s0Mdgeb23IammuABpEYWvAksyP7d+MEig="; + useFetchCargoVendor = true; + cargoHash = "sha256-6SIwOkLQ6rayhRQEMSCm72mMhGJ6NlIBq4aKukXURdM="; cargoPatches = [ # fix build with rust 1.80+ diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index ddbbf86305c6..3716937e9d77 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J2pKaGPbRYWlupWHeXbDpxMDpWk+Px0yuKsH6wiFq5M="; }; - cargoHash = "sha256-YrQBR5RVBAqYqdAucRiqO8cFmgdVvqA8HEYOXFieSsU="; + useFetchCargoVendor = true; + cargoHash = "sha256-64H/eJn6gHw7M96FhcmLW7ItjS7b4H/fecYZTosS9Oc="; passthru.tests.version = testers.testVersion { package = zizmor; diff --git a/pkgs/by-name/zk/zktree/package.nix b/pkgs/by-name/zk/zktree/package.nix index f2bcf64da048..36f7b50f0a36 100644 --- a/pkgs/by-name/zk/zktree/package.nix +++ b/pkgs/by-name/zk/zktree/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "11w86k1w5zryiq6bqr98pjhffd3l76377yz53qx0n76vc5374fk9"; }; - cargoHash = "sha256-RZtxpUsh8Gt/7bNcVGE4qfiLLENHDHAYXZapNOpTZ6M="; + useFetchCargoVendor = true; + cargoHash = "sha256-h6tDAcWOS1MikPMXiH0eQzkQIqVEC8rSsWbufGsh1CI="; meta = with lib; { description = "Small tool to display Znodes in Zookeeper in tree structure"; diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix index 7d45fbb2a5f9..6dedf2ab7a54 100644 --- a/pkgs/by-name/zo/zola/package.nix +++ b/pkgs/by-name/zo/zola/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BjHAHj3EGE1L+EQdniS4OGOViOmcRDR5RhgmYK2zmVY="; }; - cargoHash = "sha256-ZbSdPi90Nl15YYN1tx9iNsdAjh6x02XKGG73IlOKdXo="; + useFetchCargoVendor = true; + cargoHash = "sha256-B53Bt4/1HuNdPUU3pkmi6FoSOmRsk97ohdAz9RUvUfI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix index 786a7f1848a8..78ff39b89a46 100644 --- a/pkgs/by-name/zo/zoxide/package.nix +++ b/pkgs/by-name/zo/zoxide/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoHash = "sha256-ZRsnoLysNzDIi9hDOqwAzbxcyFQgn2Wv3gRNAjV5HfE="; + useFetchCargoVendor = true; + cargoHash = "sha256-+Vip7MjVV23dZdD8GxmNFrfnsjmucohMDUZE9vbpG5w="; postInstall = '' installManPage man/man*/* From c597750454b1ff81f2a48b05b4e3b0d9d1ea3771 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 23 Jan 2025 12:15:44 +0100 Subject: [PATCH 229/280] treewide: migrate to fetchCargoVendor, batch 2 Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. It should be possible to reproduce this diff. To generate it, I first ran: xargs sed -i 's/^\(. *\)\(cargoHash =\)/\1useFetchCargoVendor = true;\n\1cargoHash =/' The following manually identified list of files were given as standard input: pkgs/applications/audio/listenbrainz-mpd/default.nix pkgs/applications/audio/minidsp/default.nix pkgs/applications/audio/muso/default.nix pkgs/applications/audio/parrot/default.nix pkgs/applications/blockchains/electrs/default.nix pkgs/applications/blockchains/snarkos/default.nix pkgs/applications/blockchains/teos/default.nix pkgs/applications/blockchains/zcash/default.nix pkgs/applications/display-managers/greetd/default.nix pkgs/applications/display-managers/greetd/regreet.nix pkgs/applications/display-managers/greetd/tuigreet.nix pkgs/applications/display-managers/greetd/wlgreet.nix pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix pkgs/applications/editors/neovim/gnvim/default.nix pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix pkgs/applications/editors/zee/default.nix pkgs/applications/gis/whitebox-tools/default.nix pkgs/applications/graphics/emulsion/default.nix pkgs/applications/graphics/menyoki/default.nix pkgs/applications/misc/binocle/default.nix pkgs/applications/misc/cobalt/default.nix pkgs/applications/misc/eureka-ideas/default.nix pkgs/applications/misc/inherd-quake/default.nix pkgs/applications/misc/inlyne/default.nix pkgs/applications/misc/klipper-estimator/default.nix pkgs/applications/misc/mdzk/default.nix pkgs/applications/misc/pastel/default.nix pkgs/applications/misc/pomodoro/default.nix pkgs/applications/misc/pueue/default.nix pkgs/applications/misc/reddsaver/default.nix pkgs/applications/misc/stork/default.nix pkgs/applications/misc/terminal-typeracer/default.nix pkgs/applications/networking/browsers/asuka/default.nix pkgs/applications/networking/feedreaders/tuifeed/default.nix pkgs/applications/networking/geph/default.nix pkgs/applications/networking/gopher/phetch/default.nix pkgs/applications/networking/instant-messengers/twitch-tui/default.nix pkgs/applications/networking/irc/tiny/default.nix pkgs/applications/networking/mhost/default.nix pkgs/applications/networking/mujmap/default.nix pkgs/applications/networking/p2p/synapse-bt/default.nix pkgs/applications/office/activitywatch/default.nix pkgs/applications/science/machine-learning/finalfrontier/default.nix pkgs/applications/science/machine-learning/finalfusion-utils/default.nix pkgs/applications/science/misc/rink/default.nix pkgs/applications/system/coolercontrol/coolercontrol-gui.nix pkgs/applications/version-management/gfold/default.nix pkgs/applications/version-management/git-absorb/default.nix pkgs/applications/version-management/git-branchless/default.nix pkgs/applications/version-management/git-cliff/default.nix pkgs/applications/version-management/git-credential-keepassxc/default.nix pkgs/applications/version-management/git-gone/default.nix pkgs/applications/version-management/git-quickfix/default.nix pkgs/applications/version-management/git-stack/default.nix pkgs/applications/version-management/git-trim/default.nix pkgs/applications/version-management/git-workspace/default.nix pkgs/applications/version-management/gitoxide/default.nix pkgs/applications/version-management/lucky-commit/default.nix pkgs/applications/virtualization/crosvm/default.nix pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix pkgs/applications/window-managers/dwm/dwm-status.nix pkgs/applications/window-managers/i3/auto-layout.nix pkgs/applications/window-managers/i3/cycle-focus.nix pkgs/applications/window-managers/i3/i3-ratiosplit.nix pkgs/applications/window-managers/i3/status-rust.nix pkgs/applications/window-managers/i3/wmfocus.nix pkgs/applications/window-managers/i3/wsr.nix pkgs/build-support/mitm-cache/default.nix pkgs/development/compilers/gleam/default.nix pkgs/development/compilers/kind2/default.nix pkgs/development/embedded/fpga/ecpdap/default.nix pkgs/development/interpreters/evcxr/default.nix pkgs/development/interpreters/wasmer/default.nix pkgs/development/interpreters/wasmtime/default.nix pkgs/development/tools/analysis/dotenv-linter/default.nix pkgs/development/tools/build-managers/fac/default.nix pkgs/development/tools/build-managers/moon/default.nix pkgs/development/tools/cocogitto/default.nix pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix pkgs/development/tools/database/dynein/default.nix pkgs/development/tools/database/indradb/default.nix pkgs/development/tools/database/surrealdb-migrations/default.nix pkgs/development/tools/dump_syms/default.nix pkgs/development/tools/fnm/default.nix pkgs/development/tools/geckodriver/default.nix pkgs/development/tools/git-ps-rs/default.nix pkgs/development/tools/gptcommit/default.nix pkgs/development/tools/graphql-client/default.nix pkgs/development/tools/hors/default.nix pkgs/development/tools/htmlq/default.nix pkgs/development/tools/jless/default.nix pkgs/development/tools/kdash/default.nix pkgs/development/tools/kubie/default.nix pkgs/development/tools/misc/dura/default.nix pkgs/development/tools/misc/pwninit/default.nix pkgs/development/tools/misc/texlab/default.nix pkgs/development/tools/misc/tokei/default.nix pkgs/development/tools/pactorio/default.nix pkgs/development/tools/parsing/tree-sitter/default.nix pkgs/development/tools/perseus-cli/default.nix pkgs/development/tools/py-spy/default.nix pkgs/development/tools/rbspy/default.nix pkgs/development/tools/remodel/default.nix pkgs/development/tools/rover/default.nix pkgs/development/tools/rover/update.sh pkgs/development/tools/rubyfmt/default.nix pkgs/development/tools/rust/bindgen/unwrapped.nix pkgs/development/tools/rust/cargo-audit/default.nix pkgs/development/tools/rust/cargo-bazel/default.nix pkgs/development/tools/rust/cargo-c/default.nix pkgs/development/tools/rust/cargo-cache/default.nix pkgs/development/tools/rust/cargo-clone/default.nix pkgs/development/tools/rust/cargo-codspeed/default.nix pkgs/development/tools/rust/cargo-crev/default.nix pkgs/development/tools/rust/cargo-cyclonedx/default.nix pkgs/development/tools/rust/cargo-edit/default.nix pkgs/development/tools/rust/cargo-flamegraph/default.nix pkgs/development/tools/rust/cargo-fund/default.nix pkgs/development/tools/rust/cargo-hf2/default.nix pkgs/development/tools/rust/cargo-lambda/default.nix pkgs/development/tools/rust/cargo-ndk/default.nix pkgs/development/tools/rust/cargo-outdated/default.nix pkgs/development/tools/rust/cargo-udeps/default.nix pkgs/development/tools/rust/cargo-vet/default.nix pkgs/development/tools/rust/cargo-watch/default.nix pkgs/development/tools/rust/cargo-whatfeatures/default.nix pkgs/development/tools/rust/cargo-zigbuild/default.nix pkgs/development/tools/rust/duckscript/default.nix pkgs/development/tools/rust/rustup/default.nix pkgs/development/tools/rust/sqlx-cli/default.nix pkgs/development/tools/sentry-cli/default.nix pkgs/development/tools/spr/default.nix pkgs/development/tools/viceroy/default.nix pkgs/development/tools/wrangler_1/default.nix pkgs/games/blightmud/default.nix pkgs/games/ferium/default.nix pkgs/kde/gear/akonadi-search/default.nix pkgs/kde/gear/angelfish/default.nix pkgs/kde/gear/kdepim-addons/default.nix pkgs/misc/cliscord/default.nix pkgs/misc/t-rec/default.nix pkgs/misc/wiki-tui/default.nix pkgs/os-specific/linux/scx/scx_rustscheds.nix pkgs/servers/bindle/default.nix pkgs/servers/dns/doh-proxy-rust/default.nix pkgs/servers/gemini/stargazer/default.nix pkgs/servers/geospatial/martin/default.nix pkgs/servers/krill/default.nix pkgs/servers/monitoring/laurel/default.nix pkgs/servers/monitoring/prometheus/wireguard-exporter.nix pkgs/servers/oxigraph/default.nix pkgs/servers/piping-server-rust/default.nix pkgs/servers/rtrtr/default.nix pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix pkgs/servers/sql/postgresql/ext/pgx_ulid.nix pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix pkgs/shells/nushell/default.nix pkgs/shells/nushell/plugins/dbus.nix pkgs/shells/nushell/plugins/formats.nix pkgs/shells/nushell/plugins/gstat.nix pkgs/shells/nushell/plugins/highlight.nix pkgs/shells/nushell/plugins/net.nix pkgs/shells/nushell/plugins/polars.nix pkgs/shells/nushell/plugins/query.nix pkgs/shells/nushell/plugins/skim.nix pkgs/shells/nushell/plugins/units.nix pkgs/tools/X11/xidlehook/default.nix pkgs/tools/admin/coldsnap/default.nix pkgs/tools/admin/procs/default.nix pkgs/tools/backup/awsbck/default.nix pkgs/tools/backup/bupstash/default.nix pkgs/tools/backup/monolith/default.nix pkgs/tools/backup/rdedup/default.nix pkgs/tools/misc/aoc-cli/default.nix pkgs/tools/misc/apkeep/default.nix pkgs/tools/misc/didyoumean/default.nix pkgs/tools/misc/dijo/default.nix pkgs/tools/misc/diskus/default.nix pkgs/tools/misc/eludris/default.nix pkgs/tools/misc/fclones/default.nix pkgs/tools/misc/fclones/gui.nix pkgs/tools/misc/ffsend/default.nix pkgs/tools/misc/flowgger/default.nix pkgs/tools/misc/gh-cal/default.nix pkgs/tools/misc/grex/default.nix pkgs/tools/misc/hiksink/default.nix pkgs/tools/misc/hyperfine/default.nix pkgs/tools/misc/iay/default.nix pkgs/tools/misc/jsonwatch/default.nix pkgs/tools/misc/killport/default.nix pkgs/tools/misc/lighthouse-steamvr/default.nix pkgs/tools/misc/lorri/default.nix pkgs/tools/misc/nvfancontrol/default.nix pkgs/tools/misc/octofetch/default.nix pkgs/tools/misc/owofetch/default.nix pkgs/tools/misc/rust-motd/default.nix pkgs/tools/misc/shadowenv/default.nix pkgs/tools/misc/sheldon/default.nix pkgs/tools/misc/starship/default.nix pkgs/tools/misc/synth/default.nix pkgs/tools/misc/tab-rs/default.nix pkgs/tools/misc/tmux-sessionizer/default.nix pkgs/tools/misc/toastify/default.nix pkgs/tools/misc/topgrade/default.nix pkgs/tools/misc/tremor-rs/default.nix pkgs/tools/misc/vrc-get/default.nix pkgs/tools/misc/wagyu/default.nix pkgs/tools/misc/watchexec/default.nix pkgs/tools/networking/bore-cli/default.nix pkgs/tools/networking/bore/default.nix pkgs/tools/networking/cocom/default.nix pkgs/tools/networking/drill/default.nix pkgs/tools/networking/fast-ssh/default.nix pkgs/tools/networking/ifwifi/default.nix pkgs/tools/networking/innernet/default.nix pkgs/tools/networking/lychee/default.nix pkgs/tools/networking/mozwire/default.nix pkgs/tools/networking/ockam/default.nix pkgs/tools/networking/onetun/default.nix pkgs/tools/networking/rosenpass/default.nix pkgs/tools/networking/s3rs/default.nix pkgs/tools/networking/shadowsocks-rust/default.nix pkgs/tools/networking/suckit/default.nix pkgs/tools/networking/wg-netmanager/default.nix pkgs/tools/nix/nixci/default.nix pkgs/tools/package-management/nix-du/default.nix pkgs/tools/package-management/nix-template/default.nix pkgs/tools/security/age-plugin-ledger/default.nix pkgs/tools/security/feroxbuster/default.nix pkgs/tools/security/genpass/default.nix pkgs/tools/security/gpg-tui/default.nix pkgs/tools/security/kbs2/default.nix pkgs/tools/security/lethe/default.nix pkgs/tools/security/rblake2sum/default.nix pkgs/tools/security/rblake3sum/default.nix pkgs/tools/security/rucredstash/default.nix pkgs/tools/security/rustscan/default.nix pkgs/tools/security/solo2-cli/default.nix pkgs/tools/text/amber/default.nix pkgs/tools/text/chars/default.nix pkgs/tools/text/coloursum/default.nix pkgs/tools/text/diffr/default.nix pkgs/tools/text/fastmod/default.nix pkgs/tools/text/igrep/default.nix pkgs/tools/text/languagetool-rust/default.nix pkgs/tools/text/mdbook-admonish/default.nix pkgs/tools/text/mdbook-epub/default.nix pkgs/tools/text/mdbook-footnote/default.nix pkgs/tools/text/mdbook-katex/default.nix pkgs/tools/text/mdbook-mermaid/default.nix pkgs/tools/text/mdbook-pdf/default.nix pkgs/tools/text/mdbook-plantuml/default.nix pkgs/tools/text/mdbook-toc/default.nix pkgs/tools/text/mdcat/default.nix pkgs/tools/text/pinyin-tool/default.nix pkgs/tools/text/ruplacer/default.nix pkgs/tools/typesetting/tex/texpresso/tectonic.nix pkgs/tools/video/yaydl/default.nix Then I ran: xargs -n 1 nix-update --version=skip With this list of attributes corresponding to the changed files given as standard input: listenbrainz-mpd minidsp muso parrot electrs snarkos teos teos-watchtower-plugin zcash greetd.greetd greetd.regreet greetd.tuigreet greetd.wlgreet emacsPackages.lspce.lspce-module gnvim.unwrapped vimPlugins.LanguageClient-neovim.LanguageClient-neovim-bin vimPlugins.avante-nvim.avante-nvim-lib vimPlugins.codesnap-nvim.codesnap-lib vimPlugins.cord-nvim.cord-nvim-rust vimPlugins.nvim-spectre.spectre_oxi vimPlugins.sg-nvim.sg-nvim-rust vimPlugins.sniprun.sniprun-bin vimPlugins.vim-markdown-composer.vim-markdown-composer-bin vscode-extensions.vadimcn.vscode-lldb.adapter zee whitebox-tools emulsion menyoki binocle cobalt eureka-ideas inherd-quake inlyne klipper-estimator mdzk pastel pomodoro pueue reddsaver stork terminal-typeracer asuka tuifeed geph.cli phetch twitch-tui tiny mhost mujmap synapse-bt aw-server-rust finalfrontier finalfusion-utils rink coolercontrol.coolercontrol-gui gfold git-absorb git-branchless git-cliff git-credential-keepassxc git-gone git-quickfix git-stack git-trim git-workspace gitoxide lucky-commit crosvm rust-hypervisor-firmware dwm-status i3status-rust i3-auto-layout i3-cycle-focus i3-ratiosplit wmfocus i3wsr mitm-cache gleam kind2 ecpdap evcxr wasmer wasmtime dotenv-linter fac-build moon cocogitto buildkite-test-collector-rust dynein indradb-client indradb-server surrealdb-migrations dump_syms fnm geckodriver git-ps-rs gptcommit graphql-client hors htmlq jless kdash kubie dura pwninit texlab tokei pactorio tree-sitter perseus-cli py-spy rbspy remodel rover rover rubyfmt rust-bindgen-unwrapped cargo-audit cargo-bazel cargo-c cargo-cache cargo-clone cargo-codspeed cargo-crev cargo-cyclonedx cargo-edit cargo-flamegraph cargo-fund cargo-hf2 cargo-lambda cargo-ndk cargo-outdated cargo-udeps cargo-vet cargo-watch cargo-whatfeatures cargo-zigbuild duckscript rustup sqlx-cli sentry-cli spr viceroy wrangler_1 blightmud ferium kdePackages.akonadi-search kdePackages.angelfish kdePackages.kdepim-addons cliscord t-rec wiki-tui scx.rustscheds bindle doh-proxy-rust stargazer martin krill laurel prometheus-wireguard-exporter oxigraph piping-server-rust rtrtr postgresql16Packages.pgvecto-rs postgresql16Packages.pgx_ulid postgresql16Packages.timescaledb_toolkit nushell nushellPlugins.dbus nushellPlugins.formats nushellPlugins.gstat nushellPlugins.highlight nushellPlugins.net nushellPlugins.polars nushellPlugins.query nushellPlugins.skim nushellPlugins.units xidlehook coldsnap procs awsbck bupstash monolith rdedup aoc-cli apkeep didyoumean dijo diskus eludris fclones fclones-gui ffsend flowgger gh-cal grex hiksink hyperfine iay jsonwatch killport lighthouse-steamvr lorri nvfancontrol octofetch owofetch rust-motd shadowenv sheldon starship synth tab-rs tmux-sessionizer toastify topgrade tremor-rs vrc-get wagyu watchexec bore-cli bore cocom drill fast-ssh ifwifi innernet lychee mozwire ockam onetun rosenpass s3rs shadowsocks-rust suckit wg-netmanager nixci nix-du nix-template age-plugin-ledger feroxbuster genpass gpg-tui kbs2 lethe rblake2sum rblake3sum rucredstash rustscan solo2-cli amber chars coloursum diffr fastmod igrep languagetool-rust mdbook-admonish mdbook-epub mdbook-footnote mdbook-katex mdbook-mermaid mdbook-pdf mdbook-plantuml mdbook-toc mdcat pinyin-tool ruplacer texpresso.tectonic yaydl The list of files for the first command and the list of attributes for the second command are in the same order, so it should be easy enough to check their correspondence by putting them side by side. It might be possible to parallelize the nix-update operations using xargs' -P option. I haven't tested it. --- pkgs/applications/audio/listenbrainz-mpd/default.nix | 3 ++- pkgs/applications/audio/minidsp/default.nix | 3 ++- pkgs/applications/audio/muso/default.nix | 3 ++- pkgs/applications/audio/parrot/default.nix | 3 ++- pkgs/applications/blockchains/electrs/default.nix | 3 ++- pkgs/applications/blockchains/snarkos/default.nix | 3 ++- pkgs/applications/blockchains/teos/default.nix | 6 ++++-- pkgs/applications/blockchains/zcash/default.nix | 3 ++- pkgs/applications/display-managers/greetd/default.nix | 3 ++- pkgs/applications/display-managers/greetd/regreet.nix | 3 ++- pkgs/applications/display-managers/greetd/tuigreet.nix | 3 ++- pkgs/applications/display-managers/greetd/wlgreet.nix | 3 ++- .../emacs/elisp-packages/manual-packages/lspce/module.nix | 3 ++- pkgs/applications/editors/neovim/gnvim/default.nix | 3 ++- .../plugins/non-generated/LanguageClient-neovim/default.nix | 3 ++- .../vim/plugins/non-generated/avante-nvim/default.nix | 3 ++- .../vim/plugins/non-generated/codesnap-nvim/default.nix | 3 ++- .../editors/vim/plugins/non-generated/cord-nvim/default.nix | 3 ++- .../vim/plugins/non-generated/nvim-spectre/default.nix | 3 ++- .../editors/vim/plugins/non-generated/sg-nvim/default.nix | 3 ++- .../editors/vim/plugins/non-generated/sniprun/default.nix | 3 ++- .../plugins/non-generated/vim-markdown-composer/default.nix | 3 ++- .../vscode/extensions/vadimcn.vscode-lldb/adapter.nix | 3 ++- pkgs/applications/editors/zee/default.nix | 3 ++- pkgs/applications/gis/whitebox-tools/default.nix | 3 ++- pkgs/applications/graphics/emulsion/default.nix | 3 ++- pkgs/applications/graphics/menyoki/default.nix | 3 ++- pkgs/applications/misc/binocle/default.nix | 3 ++- pkgs/applications/misc/cobalt/default.nix | 3 ++- pkgs/applications/misc/eureka-ideas/default.nix | 3 ++- pkgs/applications/misc/inherd-quake/default.nix | 3 ++- pkgs/applications/misc/inlyne/default.nix | 3 ++- pkgs/applications/misc/klipper-estimator/default.nix | 3 ++- pkgs/applications/misc/mdzk/default.nix | 3 ++- pkgs/applications/misc/pastel/default.nix | 3 ++- pkgs/applications/misc/pomodoro/default.nix | 3 ++- pkgs/applications/misc/pueue/default.nix | 3 ++- pkgs/applications/misc/reddsaver/default.nix | 3 ++- pkgs/applications/misc/stork/default.nix | 3 ++- pkgs/applications/misc/terminal-typeracer/default.nix | 3 ++- pkgs/applications/networking/browsers/asuka/default.nix | 3 ++- .../applications/networking/feedreaders/tuifeed/default.nix | 3 ++- pkgs/applications/networking/geph/default.nix | 3 ++- pkgs/applications/networking/gopher/phetch/default.nix | 3 ++- .../networking/instant-messengers/twitch-tui/default.nix | 3 ++- pkgs/applications/networking/irc/tiny/default.nix | 3 ++- pkgs/applications/networking/mhost/default.nix | 3 ++- pkgs/applications/networking/mujmap/default.nix | 3 ++- pkgs/applications/networking/p2p/synapse-bt/default.nix | 3 ++- pkgs/applications/office/activitywatch/default.nix | 3 ++- .../science/machine-learning/finalfrontier/default.nix | 3 ++- .../science/machine-learning/finalfusion-utils/default.nix | 3 ++- pkgs/applications/science/misc/rink/default.nix | 3 ++- .../applications/system/coolercontrol/coolercontrol-gui.nix | 3 ++- pkgs/applications/version-management/gfold/default.nix | 3 ++- pkgs/applications/version-management/git-absorb/default.nix | 3 ++- .../version-management/git-branchless/default.nix | 3 ++- pkgs/applications/version-management/git-cliff/default.nix | 3 ++- .../version-management/git-credential-keepassxc/default.nix | 3 ++- pkgs/applications/version-management/git-gone/default.nix | 3 ++- .../version-management/git-quickfix/default.nix | 3 ++- pkgs/applications/version-management/git-stack/default.nix | 3 ++- pkgs/applications/version-management/git-trim/default.nix | 3 ++- .../version-management/git-workspace/default.nix | 3 ++- pkgs/applications/version-management/gitoxide/default.nix | 3 ++- .../version-management/lucky-commit/default.nix | 3 ++- pkgs/applications/virtualization/crosvm/default.nix | 3 ++- .../virtualization/rust-hypervisor-firmware/default.nix | 3 ++- pkgs/applications/window-managers/dwm/dwm-status.nix | 3 ++- pkgs/applications/window-managers/i3/auto-layout.nix | 3 ++- pkgs/applications/window-managers/i3/cycle-focus.nix | 3 ++- pkgs/applications/window-managers/i3/i3-ratiosplit.nix | 3 ++- pkgs/applications/window-managers/i3/status-rust.nix | 3 ++- pkgs/applications/window-managers/i3/wmfocus.nix | 3 ++- pkgs/applications/window-managers/i3/wsr.nix | 3 ++- pkgs/build-support/mitm-cache/default.nix | 3 ++- pkgs/development/compilers/gleam/default.nix | 3 ++- pkgs/development/compilers/kind2/default.nix | 3 ++- pkgs/development/embedded/fpga/ecpdap/default.nix | 3 ++- pkgs/development/interpreters/evcxr/default.nix | 3 ++- pkgs/development/interpreters/wasmer/default.nix | 3 ++- pkgs/development/interpreters/wasmtime/default.nix | 3 ++- pkgs/development/tools/analysis/dotenv-linter/default.nix | 3 ++- pkgs/development/tools/build-managers/fac/default.nix | 3 ++- pkgs/development/tools/build-managers/moon/default.nix | 3 ++- pkgs/development/tools/cocogitto/default.nix | 3 ++- .../buildkite-test-collector-rust/default.nix | 3 ++- pkgs/development/tools/database/dynein/default.nix | 3 ++- pkgs/development/tools/database/indradb/default.nix | 6 ++++-- .../tools/database/surrealdb-migrations/default.nix | 3 ++- pkgs/development/tools/dump_syms/default.nix | 3 ++- pkgs/development/tools/fnm/default.nix | 3 ++- pkgs/development/tools/geckodriver/default.nix | 3 ++- pkgs/development/tools/git-ps-rs/default.nix | 3 ++- pkgs/development/tools/gptcommit/default.nix | 3 ++- pkgs/development/tools/graphql-client/default.nix | 3 ++- pkgs/development/tools/hors/default.nix | 3 ++- pkgs/development/tools/htmlq/default.nix | 3 ++- pkgs/development/tools/jless/default.nix | 3 ++- pkgs/development/tools/kdash/default.nix | 3 ++- pkgs/development/tools/kubie/default.nix | 3 ++- pkgs/development/tools/misc/dura/default.nix | 3 ++- pkgs/development/tools/misc/pwninit/default.nix | 3 ++- pkgs/development/tools/misc/texlab/default.nix | 3 ++- pkgs/development/tools/misc/tokei/default.nix | 3 ++- pkgs/development/tools/pactorio/default.nix | 3 ++- pkgs/development/tools/parsing/tree-sitter/default.nix | 3 ++- pkgs/development/tools/perseus-cli/default.nix | 3 ++- pkgs/development/tools/py-spy/default.nix | 3 ++- pkgs/development/tools/rbspy/default.nix | 3 ++- pkgs/development/tools/remodel/default.nix | 3 ++- pkgs/development/tools/rover/default.nix | 3 ++- pkgs/development/tools/rubyfmt/default.nix | 3 ++- pkgs/development/tools/rust/bindgen/unwrapped.nix | 3 ++- pkgs/development/tools/rust/cargo-audit/default.nix | 3 ++- pkgs/development/tools/rust/cargo-bazel/default.nix | 3 ++- pkgs/development/tools/rust/cargo-c/default.nix | 3 ++- pkgs/development/tools/rust/cargo-cache/default.nix | 3 ++- pkgs/development/tools/rust/cargo-clone/default.nix | 3 ++- pkgs/development/tools/rust/cargo-codspeed/default.nix | 3 ++- pkgs/development/tools/rust/cargo-crev/default.nix | 3 ++- pkgs/development/tools/rust/cargo-cyclonedx/default.nix | 3 ++- pkgs/development/tools/rust/cargo-edit/default.nix | 3 ++- pkgs/development/tools/rust/cargo-flamegraph/default.nix | 3 ++- pkgs/development/tools/rust/cargo-fund/default.nix | 3 ++- pkgs/development/tools/rust/cargo-hf2/default.nix | 3 ++- pkgs/development/tools/rust/cargo-lambda/default.nix | 3 ++- pkgs/development/tools/rust/cargo-ndk/default.nix | 3 ++- pkgs/development/tools/rust/cargo-outdated/default.nix | 3 ++- pkgs/development/tools/rust/cargo-udeps/default.nix | 3 ++- pkgs/development/tools/rust/cargo-vet/default.nix | 3 ++- pkgs/development/tools/rust/cargo-watch/default.nix | 3 ++- pkgs/development/tools/rust/cargo-whatfeatures/default.nix | 3 ++- pkgs/development/tools/rust/cargo-zigbuild/default.nix | 3 ++- pkgs/development/tools/rust/duckscript/default.nix | 3 ++- pkgs/development/tools/rust/rustup/default.nix | 3 ++- pkgs/development/tools/rust/sqlx-cli/default.nix | 3 ++- pkgs/development/tools/sentry-cli/default.nix | 3 ++- pkgs/development/tools/spr/default.nix | 3 ++- pkgs/development/tools/viceroy/default.nix | 3 ++- pkgs/development/tools/wrangler_1/default.nix | 3 ++- pkgs/games/blightmud/default.nix | 3 ++- pkgs/games/ferium/default.nix | 3 ++- pkgs/misc/cliscord/default.nix | 3 ++- pkgs/misc/t-rec/default.nix | 3 ++- pkgs/misc/wiki-tui/default.nix | 3 ++- pkgs/servers/bindle/default.nix | 3 ++- pkgs/servers/dns/doh-proxy-rust/default.nix | 3 ++- pkgs/servers/gemini/stargazer/default.nix | 3 ++- pkgs/servers/geospatial/martin/default.nix | 3 ++- pkgs/servers/krill/default.nix | 3 ++- pkgs/servers/monitoring/laurel/default.nix | 3 ++- pkgs/servers/monitoring/prometheus/wireguard-exporter.nix | 3 ++- pkgs/servers/oxigraph/default.nix | 3 ++- pkgs/servers/piping-server-rust/default.nix | 3 ++- pkgs/servers/rtrtr/default.nix | 3 ++- pkgs/servers/sql/postgresql/ext/pgx_ulid.nix | 3 ++- pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix | 3 ++- pkgs/shells/nushell/default.nix | 3 ++- pkgs/shells/nushell/plugins/dbus.nix | 3 ++- pkgs/shells/nushell/plugins/formats.nix | 3 ++- pkgs/shells/nushell/plugins/gstat.nix | 3 ++- pkgs/shells/nushell/plugins/highlight.nix | 3 ++- pkgs/shells/nushell/plugins/net.nix | 3 ++- pkgs/shells/nushell/plugins/polars.nix | 3 ++- pkgs/shells/nushell/plugins/query.nix | 3 ++- pkgs/shells/nushell/plugins/skim.nix | 3 ++- pkgs/shells/nushell/plugins/units.nix | 3 ++- pkgs/tools/X11/xidlehook/default.nix | 3 ++- pkgs/tools/admin/coldsnap/default.nix | 3 ++- pkgs/tools/admin/procs/default.nix | 3 ++- pkgs/tools/backup/awsbck/default.nix | 3 ++- pkgs/tools/backup/bupstash/default.nix | 3 ++- pkgs/tools/backup/monolith/default.nix | 3 ++- pkgs/tools/backup/rdedup/default.nix | 3 ++- pkgs/tools/misc/aoc-cli/default.nix | 3 ++- pkgs/tools/misc/apkeep/default.nix | 3 ++- pkgs/tools/misc/didyoumean/default.nix | 3 ++- pkgs/tools/misc/dijo/default.nix | 3 ++- pkgs/tools/misc/diskus/default.nix | 3 ++- pkgs/tools/misc/eludris/default.nix | 3 ++- pkgs/tools/misc/fclones/default.nix | 3 ++- pkgs/tools/misc/fclones/gui.nix | 3 ++- pkgs/tools/misc/ffsend/default.nix | 3 ++- pkgs/tools/misc/flowgger/default.nix | 3 ++- pkgs/tools/misc/gh-cal/default.nix | 3 ++- pkgs/tools/misc/grex/default.nix | 3 ++- pkgs/tools/misc/hiksink/default.nix | 3 ++- pkgs/tools/misc/hyperfine/default.nix | 3 ++- pkgs/tools/misc/iay/default.nix | 3 ++- pkgs/tools/misc/jsonwatch/default.nix | 3 ++- pkgs/tools/misc/killport/default.nix | 3 ++- pkgs/tools/misc/lighthouse-steamvr/default.nix | 3 ++- pkgs/tools/misc/lorri/default.nix | 3 ++- pkgs/tools/misc/nvfancontrol/default.nix | 3 ++- pkgs/tools/misc/octofetch/default.nix | 3 ++- pkgs/tools/misc/owofetch/default.nix | 3 ++- pkgs/tools/misc/rust-motd/default.nix | 3 ++- pkgs/tools/misc/shadowenv/default.nix | 3 ++- pkgs/tools/misc/sheldon/default.nix | 3 ++- pkgs/tools/misc/starship/default.nix | 3 ++- pkgs/tools/misc/synth/default.nix | 3 ++- pkgs/tools/misc/tab-rs/default.nix | 3 ++- pkgs/tools/misc/tmux-sessionizer/default.nix | 3 ++- pkgs/tools/misc/toastify/default.nix | 3 ++- pkgs/tools/misc/topgrade/default.nix | 3 ++- pkgs/tools/misc/tremor-rs/default.nix | 3 ++- pkgs/tools/misc/vrc-get/default.nix | 3 ++- pkgs/tools/misc/wagyu/default.nix | 3 ++- pkgs/tools/misc/watchexec/default.nix | 3 ++- pkgs/tools/networking/bore-cli/default.nix | 3 ++- pkgs/tools/networking/bore/default.nix | 3 ++- pkgs/tools/networking/cocom/default.nix | 3 ++- pkgs/tools/networking/drill/default.nix | 3 ++- pkgs/tools/networking/fast-ssh/default.nix | 3 ++- pkgs/tools/networking/ifwifi/default.nix | 3 ++- pkgs/tools/networking/innernet/default.nix | 3 ++- pkgs/tools/networking/lychee/default.nix | 3 ++- pkgs/tools/networking/mozwire/default.nix | 3 ++- pkgs/tools/networking/ockam/default.nix | 3 ++- pkgs/tools/networking/onetun/default.nix | 3 ++- pkgs/tools/networking/rosenpass/default.nix | 3 ++- pkgs/tools/networking/s3rs/default.nix | 3 ++- pkgs/tools/networking/shadowsocks-rust/default.nix | 3 ++- pkgs/tools/networking/suckit/default.nix | 3 ++- pkgs/tools/networking/wg-netmanager/default.nix | 3 ++- pkgs/tools/nix/nixci/default.nix | 3 ++- pkgs/tools/package-management/nix-du/default.nix | 3 ++- pkgs/tools/package-management/nix-template/default.nix | 3 ++- pkgs/tools/security/age-plugin-ledger/default.nix | 3 ++- pkgs/tools/security/feroxbuster/default.nix | 3 ++- pkgs/tools/security/gpg-tui/default.nix | 3 ++- pkgs/tools/security/kbs2/default.nix | 3 ++- pkgs/tools/security/lethe/default.nix | 3 ++- pkgs/tools/security/rblake2sum/default.nix | 3 ++- pkgs/tools/security/rblake3sum/default.nix | 3 ++- pkgs/tools/security/rucredstash/default.nix | 3 ++- pkgs/tools/security/rustscan/default.nix | 3 ++- pkgs/tools/security/solo2-cli/default.nix | 3 ++- pkgs/tools/text/amber/default.nix | 3 ++- pkgs/tools/text/chars/default.nix | 3 ++- pkgs/tools/text/coloursum/default.nix | 3 ++- pkgs/tools/text/diffr/default.nix | 3 ++- pkgs/tools/text/fastmod/default.nix | 3 ++- pkgs/tools/text/igrep/default.nix | 3 ++- pkgs/tools/text/languagetool-rust/default.nix | 3 ++- pkgs/tools/text/mdbook-admonish/default.nix | 3 ++- pkgs/tools/text/mdbook-epub/default.nix | 3 ++- pkgs/tools/text/mdbook-footnote/default.nix | 3 ++- pkgs/tools/text/mdbook-katex/default.nix | 3 ++- pkgs/tools/text/mdbook-mermaid/default.nix | 3 ++- pkgs/tools/text/mdbook-pdf/default.nix | 3 ++- pkgs/tools/text/mdbook-plantuml/default.nix | 3 ++- pkgs/tools/text/mdbook-toc/default.nix | 3 ++- pkgs/tools/text/mdcat/default.nix | 3 ++- pkgs/tools/text/pinyin-tool/default.nix | 3 ++- pkgs/tools/text/ruplacer/default.nix | 3 ++- pkgs/tools/typesetting/tex/texpresso/tectonic.nix | 3 ++- pkgs/tools/video/yaydl/default.nix | 3 ++- 259 files changed, 522 insertions(+), 261 deletions(-) diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix index 9b3683a9f091..f7c33347e13e 100644 --- a/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-QBc0avci232UIxzTKlS0pjL7cCuvwAFgw6dSwdtYAtU="; }; - cargoHash = "sha256-jnDS9tIJ387A2P9oUSYB3tXrXjwwVmQ26erIIlHBkao="; + useFetchCargoVendor = true; + cargoHash = "sha256-NQXXR6b1XZDihVoRNFJLXtMNjlzOIzkc4rthwx0A7AE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix index 0c2e76cae389..37f87257bdf3 100644 --- a/pkgs/applications/audio/minidsp/default.nix +++ b/pkgs/applications/audio/minidsp/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8bKP9/byVRKj1P1MP3ZVg8yw0WaNB0BcqarCti7B8CA="; }; - cargoHash = "sha256-GUrYEFpTo83lKuDyENaVN3VhnZ2Y/igtsbEY7kNa1os="; + useFetchCargoVendor = true; + cargoHash = "sha256-JIm0XcgqXGPXlkQ1rhG5D38bQkQT9K44F71ZaCT2g8o="; cargoBuildFlags = [ "-p minidsp -p minidsp-daemon" ]; diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index 0623754cfa18..ac807528f509 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -35,7 +35,8 @@ rustPlatform.buildRustPackage rec { cp share/* $out/share/muso/ ''; - cargoHash = "sha256-+UVUejKCfjC6zdW315wmu7f3A5GmnoQ3rIk8SK6LIRI="; + useFetchCargoVendor = true; + cargoHash = "sha256-L0ZQoz9J5Hxg98puk1RbKuybLboIoOsy5qqGnvEPi1U="; meta = with lib; { broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/applications/audio/parrot/default.nix b/pkgs/applications/audio/parrot/default.nix index c34bd7649b13..bc0672399b11 100644 --- a/pkgs/applications/audio/parrot/default.nix +++ b/pkgs/applications/audio/parrot/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { hash = "sha256-3YTXIKj1iqCB+tN7/0v1DAaMM6aJiSxBYHO98uK8KFo="; }; - cargoHash = "sha256-3G7NwSZaiocjgfdtmJVWfMZOHCNhC08NgolPa9AvPfE="; + useFetchCargoVendor = true; + cargoHash = "sha256-be/gGKCd8/VgcjzhyMKDl5TzAuavm1rPNYBm8RLTP90="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 440b59b5bd63..1fac4d32b846 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-L26jzAn8vwnw9kFd6ciyYS/OLEFTbN8doNKy3P8qKRE="; }; - cargoHash = "sha256-/0XS4xF5gzEBWXS39f0FsIK1dFwmGT4McaExR/srB5Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-dqVnIiaGXnoKLvwQm/aiwSptKksikNGgAOu704rhDPA="; # needed for librocksdb-sys nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index e54e24c5a7b6..219e9f530f4c 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+z9dgg5HdR+Gomug03gI1zdCU6t4SBHkl1Pxoq69wrc="; }; - cargoHash = "sha256-qW/ZV4JqpNqqh8BYc+/d5g8junwhdZ38NhHclx+k/0M="; + useFetchCargoVendor = true; + cargoHash = "sha256-riUOxmuXDP5+BPSPu5+cLBP43bZxAqvVG/k5kvThSAs="; # buildAndTestSubdir = "cli"; diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix index 45cb42514ac3..66d28bd3bac8 100644 --- a/pkgs/applications/blockchains/teos/default.nix +++ b/pkgs/applications/blockchains/teos/default.nix @@ -32,7 +32,8 @@ in pname = "teos"; inherit version src; - cargoHash = "sha256-U0imKEPszlBOaS6xEd3kfzy/w2SYe3EY/E1e0L+ViDk="; + useFetchCargoVendor = true; + cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; buildAndTestSubdir = "teos"; @@ -58,7 +59,8 @@ in pname = "teos-watchtower-plugin"; inherit version src; - cargoHash = "sha256-3ke1qTFw/4I5dPLuPjIGp1n2C/eRfPB7A6ErMFfwUzE="; + useFetchCargoVendor = true; + cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; buildAndTestSubdir = "watchtower-plugin"; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index ecd50d3744cf..1706bcd888d7 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -42,7 +42,8 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { --replace "linker = \"aarch64-linux-gnu-gcc\"" "" ''; - cargoHash = "sha256-Mz8mr/RDcOfwJvXhY19rZmWHP8mUeEf9GYD+3JAPNOw="; + useFetchCargoVendor = true; + cargoHash = "sha256-VBqasLpxqI4kr73Mr7OVuwb2OIhUwnY9CTyZZOyEElU="; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/applications/display-managers/greetd/default.nix b/pkgs/applications/display-managers/greetd/default.nix index 37db111efe0a..8ef7bd41bbbf 100644 --- a/pkgs/applications/display-managers/greetd/default.nix +++ b/pkgs/applications/display-managers/greetd/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg="; }; - cargoHash = "sha256-M52Kj14X+vMPKeGwi5pbEuh3F9/a3eVjhsbZI06Jkzs="; + useFetchCargoVendor = true; + cargoHash = "sha256-JwTLZawY9+M09IDbMPoNUcNrnW1C2OVlEVn1n7ol6dY="; nativeBuildInputs = [ scdoc diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix index 6ff8d7e3587a..ec537e7b0d85 100644 --- a/pkgs/applications/display-managers/greetd/regreet.nix +++ b/pkgs/applications/display-managers/greetd/regreet.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f8Xvno5QqmWz4SUiFYDvs8lFU1ZaqQ8gpTaVzWxW4T8="; }; - cargoHash = "sha256-XdJbghHT2NR+pWAsgayz748C8yw/Rv86lNfvjABwJws="; + useFetchCargoVendor = true; + cargoHash = "sha256-abCQ3RsnZ/a1DbjQFOiA7Xs7bbqSJxwNps8yV6Q4FIw="; buildFeatures = [ "gtk4_8" ]; diff --git a/pkgs/applications/display-managers/greetd/tuigreet.nix b/pkgs/applications/display-managers/greetd/tuigreet.nix index 4a6b7834f203..dda898b9dd50 100644 --- a/pkgs/applications/display-managers/greetd/tuigreet.nix +++ b/pkgs/applications/display-managers/greetd/tuigreet.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY="; }; - cargoHash = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A="; + useFetchCargoVendor = true; + cargoHash = "sha256-w6ZOqpwogKoN4oqqI1gFqY8xAnfvhEBVaL8/6JXpKXs="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/display-managers/greetd/wlgreet.nix b/pkgs/applications/display-managers/greetd/wlgreet.nix index aa4cd8e2f94b..793f14f02907 100644 --- a/pkgs/applications/display-managers/greetd/wlgreet.nix +++ b/pkgs/applications/display-managers/greetd/wlgreet.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TQTHFBOTxtSuzrAG4cjZ9oirl80xc0rPdYeLJ0t39DQ="; }; - cargoHash = "sha256-+YGhfEq2RltPq5oLLh1h+vGphDpoGZNVdvzko3P1iUQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-ITo9qvcT5aOybWLV7kn9BZbux6uxx1RwRGWCGQYdZ2I="; nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ gcc-unwrapped ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix index c3d6a1634970..9a3fa0f37593 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-DiqC7z1AQbXsSXc77AGRilWi3HfEg0YoHrXu54O3Clo="; }; - cargoHash = "sha256-ZRWzkojcNlgdjXUvmdR/vjJx9k3xRvV0Yz7+8TN+8qc="; + useFetchCargoVendor = true; + cargoHash = "sha256-ygFXKniCCOyXndPOTKoRbd4W1OR2CSA2jr7yxpwkw28="; checkFlags = [ # flaky test diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index ea2f543b5ef1..1fc6f2184f08 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VyyHlyMW/9zYECobQwngFARQYqcoXmopyCHUwHolXfo="; }; - cargoHash = "sha256-uhObLKoQE+r0/ocWA26MpJsSt9RAzKG1XmZsXat+ohg="; + useFetchCargoVendor = true; + cargoHash = "sha256-+i4fFiuNmc2+aFyOW2FxRZXINN1XF0nDJVsFYnIHI24="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix index 2ede65b4e72d..15cc28df0657 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix @@ -17,7 +17,8 @@ let pname = "LanguageClient-neovim-bin"; inherit version src; - cargoHash = "sha256-H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4="; + useFetchCargoVendor = true; + cargoHash = "sha256-1tfeowqvjEjMXIfrhr388YhlZrk3ns+Y/2odQnkLw7k="; }; in vimUtils.buildVimPlugin { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 9fcd587ae0fc..c07f1e8e2458 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -21,7 +21,8 @@ let pname = "avante-nvim-lib"; inherit version src; - cargoHash = "sha256-80++U7CIu6QtH1jQCHCEpv2tnYOuoWSczZIUmKyrqJE="; + useFetchCargoVendor = true; + cargoHash = "sha256-pJDk9JHcKNDZRrJM/zqrUvDom7hnhD1B5Ssa+DgitqQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix index 554fe7e48ac0..cffd5943faba 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix @@ -22,7 +22,8 @@ let sourceRoot = "${src.name}/generator"; - cargoHash = "sha256-6n37n8oHIHrz3S1+40nuD0Ud3l0iNgXig1ZwrgsnYTI="; + useFetchCargoVendor = true; + cargoHash = "sha256-tg4BO4tPzHhJTowL7RiAuBo4i440FehpGmnz9stTxfI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix index b60067186f3d..fb93a62f329c 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix @@ -19,7 +19,8 @@ let pname = "cord.nvim-rust"; inherit version src; - cargoHash = "sha256-unE600Uo8fXaFV0UWRhBenhQaXftDH7K+HyQ/9xo7JY="; + useFetchCargoVendor = true; + cargoHash = "sha256-UJdSQNaYaZxvmfuHwePzGhQ3Pv+Cm7YaRK1L0CJhtEc="; installPhase = let diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix index 5499303b5e8b..d2b29aaf5feb 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix @@ -20,7 +20,8 @@ let inherit version src; sourceRoot = "${src.name}/spectre_oxi"; - cargoHash = "sha256-jVNeK1BeCzQaS5G561iWB3xEupzjIgnbUpEo1IVr9nQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-0szVL45QRo3AuBMf+WQ0QF0CS1B9HWPxfF6l6TJtv6Q="; preCheck = '' mkdir tests/tmp/ diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix index 05922d1adaad..cca4bb6633ad 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix @@ -21,7 +21,8 @@ let pname = "sg-nvim-rust"; inherit version src; - cargoHash = "sha256-t0+0Zw8NjCD1VB1hTrSjOa1130IVanoTALdFoTloFe4="; + useFetchCargoVendor = true; + cargoHash = "sha256-yY/5w2ztmTKJAYDxBJND8itCOwRNi1negiFq3PyFaSM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix index 09d9de3606f4..ac7643443ee8 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix @@ -24,7 +24,8 @@ let pname = "sniprun-bin"; inherit version src; - cargoHash = "sha256-eZcWS+DWec0V9G6hBnZRUNcb3uZeSiBhn4Ed9KodFV8="; + useFetchCargoVendor = true; + cargoHash = "sha256-j3i86I5Lmt0+fQONikHnxfeLEbiyFSairgjHXmjZfTk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix index ff81fdaba36f..eab1edbb7e17 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix @@ -17,7 +17,8 @@ let vim-markdown-composer-bin = rustPlatform.buildRustPackage { pname = "vim-markdown-composer-bin"; inherit src version; - cargoHash = "sha256-z5hjY2RUbM5NLfRtyfiHi4PjMnKdAflaZsHw53lgU2E="; + useFetchCargoVendor = true; + cargoHash = "sha256-xzlEIaDEYDbxJ6YqzF+lSHcB9O+brClw026YI1YeNUc="; # tests require network access doCheck = false; }; diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix index 4c8ff7e1559a..9f99b2e50a27 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage { pname = "${pname}-adapter"; inherit version src; - cargoHash = "sha256-e/Jki/4pCs0qzaBVR4iiUhdBFmWlTZYREQkuFSoWYFo="; + useFetchCargoVendor = true; + cargoHash = "sha256-7tGX8wt2bb1segoWbBEBwZbznOaAiAyh9i/JC5FKUBU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ lldb ]; diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix index 4aec2af12cda..43c63bb95260 100644 --- a/pkgs/applications/editors/zee/default.nix +++ b/pkgs/applications/editors/zee/default.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec { # see https://github.com/zee-editor/zee#syntax-highlighting ZEE_DISABLE_GRAMMAR_BUILD = 1; - cargoHash = "sha256-fBBjtjM7AnyAL6EOFstL4h6yS+UoLgxck6Mc0tJcXaI="; + useFetchCargoVendor = true; + cargoHash = "sha256-auwbpavF/WZQIE/htYXJ4di6xoRtXkBBkP/Bj4lFp6U="; meta = with lib; { description = "Modern text editor for the terminal written in Rust"; diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 1409410d07ac..24be5ebeb558 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kvtfEEydwonoDux1VbAxqrF/Hf8Qh8mhprYnROGOC6g="; }; - cargoHash = "sha256-6v/3b6BHh/n7M2ZhLVKRvv0Va2xbLUSsxUb5paOStbQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-yQFGuhEGgkaa5N4uUIZ/0GFzP9CsPtiFet0hUppIQzQ="; buildInputs = [ atk diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index 03032dd6074b..89014afb8eb4 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -49,7 +49,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0t+MUZu1cvkJSL9Ly9kblH8fMr05KuRpOo+JDn/VUc8="; }; - cargoHash = "sha256-detJZRnxT3FubaF/A4w2pFdhW03BH0gsaeuNFYu+cBw="; + useFetchCargoVendor = true; + cargoHash = "sha256-1s5kCUxn4t1A40QHuygGKaqphLmcl+EYfx++RZQmL00="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index c2b66fb45755..a0e757cc536f 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y="; }; - cargoHash = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0="; + useFetchCargoVendor = true; + cargoHash = "sha256-6FRc/kEhGJXIZ+6GXeYj5j7QVmvZgIQgtDPvt94hlho="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config; diff --git a/pkgs/applications/misc/binocle/default.nix b/pkgs/applications/misc/binocle/default.nix index d80678848b94..e2afd9d91b14 100644 --- a/pkgs/applications/misc/binocle/default.nix +++ b/pkgs/applications/misc/binocle/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-WAk7xIrCRfVofn4w+gP5E3wnSZbXm/6MZWlNmtoLm20="; }; - cargoHash = "sha256-ZmY88WcoQiDLSXkBbnE/+jPX713qh6n+nyNXeWWTBKA="; + useFetchCargoVendor = true; + cargoHash = "sha256-AUmDubbi6y1SaHZazr2xZc+16SQhI6WBnPg6I7rv3K4="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index 53cff166991e..4e45238a401d 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6fsKEIgcBu0SE/f0TNfvTdpZX3zc5Bd0F1T82COOqVQ="; }; - cargoHash = "sha256-g25Pw3BlRbuaGjsQav6mU9zVyS1mVUKkgKDOILm8R6U="; + useFetchCargoVendor = true; + cargoHash = "sha256-NLSdYGZy+FWjA5N1zGf3Lajg2qo4TJ86AzlKVrHxwaU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix index a16b58bc5a0e..d43afca3250c 100644 --- a/pkgs/applications/misc/eureka-ideas/default.nix +++ b/pkgs/applications/misc/eureka-ideas/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc="; }; - cargoHash = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM="; + useFetchCargoVendor = true; + cargoHash = "sha256-nTYMKJ5OCApqooIF1dsDLriPfYjkZkTdtzpkJya/5ag="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix index 5cd38ca8cc08..a05800414a79 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q="; }; - cargoHash = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w="; + useFetchCargoVendor = true; + cargoHash = "sha256-klxigm3RpTfwbENva2WmOPaiJEV2yujY323xRkAML0I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index 904f4df67646..17db60517423 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-j4DEau7LZxIoVIIYwCUgqmkSgdRxWzF5/vOS0lvjgUk="; }; - cargoHash = "sha256-fMovzaP+R0CUwJy1HKATH2tPrIPwzGtubF1WHUoQDRY="; + useFetchCargoVendor = true; + cargoHash = "sha256-9Ev/D58MU0aMleM6NFG7MsXqGlhi0eAujqYaLDuPjIY="; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix index a577bb30f646..967eac699f01 100644 --- a/pkgs/applications/misc/klipper-estimator/default.nix +++ b/pkgs/applications/misc/klipper-estimator/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EjfW2qeq0ehGhjE2Psz5g/suYMZPvtQi2gaYb+NCa2U="; }; - cargoHash = "sha256-bboXG2nBrK2hVzB43um6EUgLPlSa8huyPH7VOJ48Nkk="; + useFetchCargoVendor = true; + cargoHash = "sha256-wMgFkzgoHjvE+5t+cA5OW2COXbUj/5tWXz0Zp9cd5lw="; buildInputs = [ openssl ] diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index a613fe5492a1..ce1897b4aed2 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { ./update-mdbook-for-rust-1.64.patch ]; - cargoHash = "sha256-5zGUBvmf68tCk5jGrNn+ukgYbiKzrlmZvWrYgoJf2zk="; + useFetchCargoVendor = true; + cargoHash = "sha256-+x4pOtszvdzI/zR55ezcxlS52GrWQTuBn7vbnqDTVac="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index e8b81cfeb59d..4a8ad4c60ab0 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0="; }; - cargoHash = "sha256-+Cw/aAXkSbYLqc7TGWsMUJNo88v0s1Cq1m4V84j3gXE="; + useFetchCargoVendor = true; + cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix index b0afdcf23538..7656407c6b94 100644 --- a/pkgs/applications/misc/pomodoro/default.nix +++ b/pkgs/applications/misc/pomodoro/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ="; }; - cargoHash = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4="; + useFetchCargoVendor = true; + cargoHash = "sha256-oXOf9G0BMSbFFAsmRaAZzaquFva1i1gJ4ISqJkqSx4k="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; meta = with lib; { diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 31f19f4fbbe0..6e5d4a332d5f 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b4kZ//+rO70uZh1fvI4A2dbCZ7ymci9g/u5keMBWYf8="; }; - cargoHash = "sha256-sTpxcJs5I7LzVw56ka5PlFixJSiJeCae9serS0FhmuA="; + useFetchCargoVendor = true; + cargoHash = "sha256-MDUBP1NI50I8sSXHYFiAdyL8C2DloCjnq8pr7PsBBIE="; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 46e684d0d36e..435da18f8abe 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf"; }; - cargoHash = "sha256-l+fxk9gkM+pStBVJcsN4P2tNCuFIiBaAxpq9SLlvJHk="; + useFetchCargoVendor = true; + cargoHash = "sha256-xYtdGhuieFudfJz+LxUjP7mV8uItaIvLahCH7vBWTtg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 5c020e923765..24e160ab3a62 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw="; }; - cargoHash = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4="; + useFetchCargoVendor = true; + cargoHash = "sha256-nN2aNNBq2YDOY9H9682hvwrlI5WTg7s1EPi68UuBTBM="; checkFlags = [ # Fails for 1.6.0, but binary works fine diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix index ec2cda0c164c..d991a063d972 100644 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-S3OW6KihRd6ReTWUXRb1OWC7+YoxehjFRBxcnJVgImU="; }; - cargoHash = "sha256-OwbFIbKB/arj+3gq2tfEq8yTKSUPBQNYJNzrWvDv4A4="; + useFetchCargoVendor = true; + cargoHash = "sha256-WYqbG0iSVvnRLCy5Qs4wr72LjQ6uPgskVWP62Af0RQ8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index c2f6a0936771..8b5e672d690f 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M="; }; - cargoHash = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI="; + useFetchCargoVendor = true; + cargoHash = "sha256-aNHkhcvOdK6sf6nWxCNPxcktYhrnmLdMrLqWb/1QBQ4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/feedreaders/tuifeed/default.nix b/pkgs/applications/networking/feedreaders/tuifeed/default.nix index b4262c7aa424..31cb1e36fc27 100644 --- a/pkgs/applications/networking/feedreaders/tuifeed/default.nix +++ b/pkgs/applications/networking/feedreaders/tuifeed/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JG/l6NfN5RqBpz9NVcVY3mP/iE31TXvw+Vjq8N8rNIY="; }; - cargoHash = "sha256-QKSNbpVRtSKp2q1jVPYTS8XCMtQAyg3AWvD/6+OjI7Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-UlZDT/i3UB0wGGpuSBBvVPqRbzGHneDJs57pHn11E5k="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix index a3b1cbb52d29..14e920f7d65a 100644 --- a/pkgs/applications/networking/geph/default.nix +++ b/pkgs/applications/networking/geph/default.nix @@ -38,7 +38,8 @@ in hash = "sha256-6YWPsSRIZpvVCIGZ1z7srobDvVzLr0o2jBcB/7kbK7I="; }; - cargoHash = "sha256-c9Sq3mdotvB/oNIiOLTrAAUnUdkaye7y1l+29Uwjfm8="; + useFetchCargoVendor = true; + cargoHash = "sha256-igIYTlI3hqvlOTgdwouA9YussP9h0pOHUUTCjA2LE5U="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/networking/gopher/phetch/default.nix b/pkgs/applications/networking/gopher/phetch/default.nix index 2b3e9cf7d2aa..e5c90097e765 100644 --- a/pkgs/applications/networking/gopher/phetch/default.nix +++ b/pkgs/applications/networking/gopher/phetch/default.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J+ka7/B37WzVPPE2Krkd/TIiVwuKfI2QYWmT0JHgBGQ="; }; - cargoHash = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk="; + useFetchCargoVendor = true; + cargoHash = "sha256-2lbQAM3gdytXsoMFzKwLWA1hvQIJf1vBdMRpYx/VLVg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 78056a158532..31aaf069e8e2 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uo9QEwSRIJKjWza8dEQXDCMQ/ydKBk/BX2TaVhX+k1M="; }; - cargoHash = "sha256-QYT5Aqwl2m/+SZlw55Ep3dIfmESSNowN30JJ52mY/Lk="; + useFetchCargoVendor = true; + cargoHash = "sha256-H/MAbN7wCg74bNWt5xlNaukvGJLYyzuynYtIqxBOcbo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index bda1d21c5b7e..30023e00057d 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-phjEae2SS3zkSpuhhE4iscUM8ij8DT47YLIMATMG/+Q="; }; - cargoHash = "sha256-DvFrRH6wObMvkRxS8vh3tlCrZNAiuZHfN0ARagMfG2k="; + useFetchCargoVendor = true; + cargoHash = "sha256-lyjTl0kbtfQdqSqxti1181+oDVYP4U++v2JEOYvI7aM="; nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config; buildInputs = diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix index 145a68bbfc76..aade921aa809 100644 --- a/pkgs/applications/networking/mhost/default.nix +++ b/pkgs/applications/networking/mhost/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6jn9jOCh96d9y2l1OZ5hgxg7sYXPUFzJiiT95OR7lD0="; }; - cargoHash = "sha256-d2JYT/eJaGm8pfmjsuSZiQxlzcsypFH53F/9joW0J6I="; + useFetchCargoVendor = true; + cargoHash = "sha256-n+ZVsdR+X7tMqZFYsjsWSUr6OkD90s44EFORqRldCNE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix index b522e29370e5..a37177426b10 100644 --- a/pkgs/applications/networking/mujmap/default.nix +++ b/pkgs/applications/networking/mujmap/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E="; }; - cargoHash = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU="; + useFetchCargoVendor = true; + cargoHash = "sha256-LyiJYKhoSXVf1P+nu56Wgp+z8biPpt0tWgPZQrB2NNQ="; buildInputs = [ notmuch diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index ba0200066918..bbfbfda1f0c8 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2irXNgEK9BjRuNu3DUMElmf2vIpGzwoFneAEe97GRh4="; }; - cargoHash = "sha256-TwXouPYM7Hg1HEr2KnEPScYFkC52PcQ5kb5aGP1gj9U="; + useFetchCargoVendor = true; + cargoHash = "sha256-ebqUH01h4B3Aq3apSKpae8ncaFirbrZiDxjiQM9kzg4="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix index 699c5aec9c67..1287c4c3ccc4 100644 --- a/pkgs/applications/office/activitywatch/default.nix +++ b/pkgs/applications/office/activitywatch/default.nix @@ -187,7 +187,8 @@ rec { src = "${sources}/aw-server-rust"; - cargoHash = "sha256-2KnfLNVw48VVQ1Ec8MS2MaiA3BpGeFd/uIrJRHhaJR8="; + useFetchCargoVendor = true; + cargoHash = "sha256-E89E/LWBPHtb6vX94swodmE+UrWMrzQnm8AO5GeyuoA="; patches = [ # Override version string with hardcoded value as it may be outdated upstream. diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index c388a55cb5eb..2fb6e386346a 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4="; }; - cargoHash = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4="; + useFetchCargoVendor = true; + cargoHash = "sha256-AQiXRKOXV7kXiu9GbtPE0Rddy93t1Y5tuJmww4xFSaU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index 4357b8ca2e55..ec1e20a91329 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-suzivynlgk4VvDOC2dQR40n5IJHoJ736+ObdrM9dIqE="; }; - cargoHash = "sha256-HekjmctuzOWs5k/ihhsV8vVkm6906jEnFf3yvhkrA5Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-X8ENEtjH1RHU2+VwtkHsyVYK37O8doMlLk94O2BGqy0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 1a20a122f39b..dfa7fbf8daf4 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2+ZkyWhEnnO/QgCzWscbMr0u5kwdv2HqPLjtiXDfv/o="; }; - cargoHash = "sha256-j1pQfMjDNu57otOBTVBQEZIx80p4/beEUQdUkAJhvso="; + useFetchCargoVendor = true; + cargoHash = "sha256-XvtEXBsdxUMJJntzzKVbUIjg78JpwyuUlTm6J3huDPE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix index 1f1fec06f319..1460ea3e8e08 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { inherit version src; sourceRoot = "${src.name}/coolercontrol-ui/src-tauri"; - cargoHash = "sha256-gjR54dZjVonyznfBGb3iNNdmPalE+a53MmkOEZj3+sY="; + useFetchCargoVendor = true; + cargoHash = "sha256-C0oVtU6esXOkssKyJ4XzLV2vGCPbvVKgvf3wXo9L158="; buildFeatures = [ "custom-protocol" ]; diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index 7f764283d032..a2a98bfe018c 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-z5E+YS2zO4zgsW7mZbVN0z4HOurqoXwXn8hQc++9tks="; }; - cargoHash = "sha256-mSqqtHZDm1ySu48DdI2sF7i7A8rDkFS/4/9uB30JOI8="; + useFetchCargoVendor = true; + cargoHash = "sha256-7VPMWou23iJHzKFMXirsjlIvq8kyAnNSeQ26IKxfNZE="; passthru.tests.version = testers.testVersion { package = gfold; diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index ae477caec042..146f79ad28ca 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - cargoHash = "sha256-R9hh696KLoYUfJIe3X4X1VHOpPmv1fhZ55y8muVAdRI="; + useFetchCargoVendor = true; + cargoHash = "sha256-QQNGUlEamMPRS5sPi3VYbIU28KWxM4ibIEQnk/1sgNA="; postInstall = '' diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index b4997b85575b..acfa061a27fc 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8uv+sZRr06K42hmxgjrKk6FDEngUhN/9epixRYKwE3U="; }; - cargoHash = "sha256-AEEAHMKGVYcijA+Oget+maDZwsk/RGPhHQfiv+AT4v8="; + useFetchCargoVendor = true; + cargoHash = "sha256-i7KpTd4fX3PrhDjj3R9u98rdI0uHkpQCxSmEF+Gu7yk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 889a67312200..57b0464ac06e 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wGxxLfl+d8uTPLHPL2EKpaL36x0or7PHwdVaZTlKITE="; }; - cargoHash = "sha256-8G6iyvnKYxiRotQH7SwLSZStJg7iDNw4zPvT9sUTvmA="; + useFetchCargoVendor = true; + cargoHash = "sha256-8Zybs+SlwVuF+obJD+yt36HdtDGIJWLSGUnypqOlFWU="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-credential-keepassxc/default.nix index e1c658e2324d..fec95af3a761 100644 --- a/pkgs/applications/version-management/git-credential-keepassxc/default.nix +++ b/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qxNzWuuIoK9BJLVcWtrER+MyA5cyd03xAwGljh8DZC4="; }; - cargoHash = "sha256-jBUp0jes4wtr8cmqceEBb6noqGkJUHbIfYgWOw5KMF4="; + useFetchCargoVendor = true; + cargoHash = "sha256-jjexSzxRhnNPW+urG7KpZBWfGcy06Cg4lXlQogF3L/A="; buildFeatures = [ ] diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix index 6211b3f080f2..8d3f634cee2c 100644 --- a/pkgs/applications/version-management/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-j88ZnJ0V8h/fthOWwV6B0ZbzUz7THykqrI2QpOkDT4I="; }; - cargoHash = "sha256-H41wpG5LhjJ7BtFrol0JbjTpssOPUgumgapOiZJi2lc="; + useFetchCargoVendor = true; + cargoHash = "sha256-fXdWwGkdMhZA9u/xbvRIV6m88q6SQDahU12ZjQZFu3Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix index f30c06c7bf6c..332e2eb983b4 100644 --- a/pkgs/applications/version-management/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-quickfix/default.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoHash = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI="; + useFetchCargoVendor = true; + cargoHash = "sha256-2VhbvhGeQHAbQLW0iBAgl0ICAX/X+PnwcGdodJG2Hsw="; meta = with lib; { description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch"; diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix index e3a61ad02fe4..e9a4e087624b 100644 --- a/pkgs/applications/version-management/git-stack/default.nix +++ b/pkgs/applications/version-management/git-stack/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-foItJSZ6jsLuWkO/c1Ejb45dSdzZ/ripieyVIYsEyy0="; }; - cargoHash = "sha256-MEhUmy4ijR/zHm/qMt4PqNGYnCfIgjNaL9SlMmXCMmc="; + useFetchCargoVendor = true; + cargoHash = "sha256-rh0keAIEwLRvZNv+gG2OXDdrJmd6/cTXP51xA/Opc3M="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix index 1f0171acc674..1c4019f3c5a3 100644 --- a/pkgs/applications/version-management/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM="; }; - cargoHash = "sha256-mS8kNkZs8jX99ryG4XkU+U/iWIIcmET2vOfG1YNNZFU="; + useFetchCargoVendor = true; + cargoHash = "sha256-irgekVTWCujzSbZQMNJw3NZ3cjaUftpSJha6iZQqYJ8="; cargoPatches = [ # Update git2 https://github.com/foriequal0/git-trim/pull/202 diff --git a/pkgs/applications/version-management/git-workspace/default.nix b/pkgs/applications/version-management/git-workspace/default.nix index 36ca542517f9..3d5a29f487a9 100644 --- a/pkgs/applications/version-management/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-workspace/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-sS452PCX2G49Q5tnScG+ySkUAhFctGsGZrMvQXL7WkY="; }; - cargoHash = "sha256-OrAZ4SGhqP+cGYB2gUIh6rON67hBRmgnq1nn9cEUAU0="; + useFetchCargoVendor = true; + cargoHash = "sha256-iYT45iqKmx+t+xImbQuSv/nAvaiLNrLLqbe8zKAF4Jw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 35680d240ae6..dda082b3a278 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xv4xGkrArJ/LTVLs2SYhvxhfNG6sjVm5nZWsi4s34iM="; }; - cargoHash = "sha256-36ue3f67Btw0/AM5lTaByrJLKU5r1FJA3sFRJ1IbXXc="; + useFetchCargoVendor = true; + cargoHash = "sha256-SRJkI61Z8revRWoschkUAJwcJfKB/U03+YfwEcnEIm8="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/version-management/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix index db35bcc0ec2b..8d1a1aea9e31 100644 --- a/pkgs/applications/version-management/lucky-commit/default.nix +++ b/pkgs/applications/version-management/lucky-commit/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-jxcsTtQcSuL+2vwdxIVxqTpKh8Bfvna+hkGt+Rx21FE="; }; - cargoHash = "sha256-8JkodGtMdYP/IIBqRcJFD5syiZi+VakDyX7VcvR0HLo="; + useFetchCargoVendor = true; + cargoHash = "sha256-e3011CvoxoAeXrJqcjKSWbpkQBncFV5qgFLM8ByZOYI="; buildInputs = lib.optional withOpenCL (if stdenv.hostPlatform.isDarwin then OpenCL else ocl-icd); diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index c74c24050c10..8713b665cb5f 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { separateDebugInfo = true; - cargoHash = "sha256-FvDJhmrSBShxRTpc23C0jEk9YRbtGyYgC1Z8ekxNnb8="; + useFetchCargoVendor = true; + cargoHash = "sha256-NrRHLDRr5spB/qRvZungNL7qFTdYS32lynJNoY0EjDQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index b7cd6f438661..172317eea399 100644 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -38,7 +38,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-hKk5pcop8rb5Q+IVchcl+XhMc3DCBBPn5P+AkAb9XxI="; }; - cargoHash = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Cl2DHKrK24uswkMiyDbn+C1Rb7ebcqSgWoAC0yG+U8Y="; # lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO' # https://github.com/cloud-hypervisor/rust-hypervisor-firmware/issues/249 diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index c7509ae6e973..3019ab156fb1 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -52,7 +52,8 @@ rustPlatform.buildRustPackage rec { xorg.libX11 ]; - cargoHash = "sha256-CNhRMJZJMMKh5L308a93YL0kJLkt6DdlmILMVPQV90Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-G31p8iVRUODD4hUssXaOqEOUTW+C+GZMy/L/tgumDtA="; postInstall = lib.optionalString (bins != [ ]) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" diff --git a/pkgs/applications/window-managers/i3/auto-layout.nix b/pkgs/applications/window-managers/i3/auto-layout.nix index b72f7f2ffbaf..cd75d7c1d8aa 100644 --- a/pkgs/applications/window-managers/i3/auto-layout.nix +++ b/pkgs/applications/window-managers/i3/auto-layout.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs="; }; - cargoHash = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo="; + useFetchCargoVendor = true; + cargoHash = "sha256-oKpcYhD9QNW+8gFVybDEnz58cZ+2Bf4bwYuflXiJ1jc="; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/applications/window-managers/i3/cycle-focus.nix b/pkgs/applications/window-managers/i3/cycle-focus.nix index 1ec3b1e67fe9..d359e9eb6fee 100644 --- a/pkgs/applications/window-managers/i3/cycle-focus.nix +++ b/pkgs/applications/window-managers/i3/cycle-focus.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-caZKvxOqoYgPs+Zjltj8K0/ospjkLnA4kh0rsTjeU3Y="; }; - cargoHash = "sha256-9glaxThm/ovgvUWCyrycS/Oe5t8iN5P38fF5vO5awQE="; + useFetchCargoVendor = true; + cargoHash = "sha256-6d3a9iaXKakbs7g/649nO39bh4Ka8jcBI/yJImTqoZs="; meta = with lib; { description = "Simple tool to cyclically switch between the windows on the active workspace"; diff --git a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix index e7b339177476..325e47c1b0d5 100644 --- a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix +++ b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3"; }; - cargoHash = "sha256-5rAg+vPlfx8eG1qkC6HQPIsgDI1PJ2on16dI0BJ7mow="; + useFetchCargoVendor = true; + cargoHash = "sha256-no5fJ5nlwyS/PVi9J5Ek3c3Rp7A3MflpReo9kwJrj6U="; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index a234e5e3e6f4..273a5900dde4 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xJm4MsEU0OVX401WvKllg3zUwgCvjLxlAQzXE/oD1J0="; }; - cargoHash = "sha256-9jbJVnZhFbMYldBkRVSIiorUYDNtF3AAwNEpyNJXpjo="; + useFetchCargoVendor = true; + cargoHash = "sha256-EFFmH9aG7DvSA5rsAuszc1B8kcLdruSk3Hhp4V9t9Gk="; nativeBuildInputs = [ pkg-config makeWrapper ] ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]); diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index d3828484171b..c0e04baeda08 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-94MgE2j8HaS8IyzHEDtoqTls2A8xD96v2iAFx9XfMcw="; }; - cargoHash = "sha256-sSJAlDe1vBYs1vZW/X04cU14Wj1OF4Jy8oI4uWkrEjk="; + useFetchCargoVendor = true; + cargoHash = "sha256-tYzJS/ApjGuvNnGuBEVr54AGcEmDhG9HtirZvtmNslY="; nativeBuildInputs = [ python3 diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/applications/window-managers/i3/wsr.nix index 1f4588be0ed6..cc3e9bbce47b 100644 --- a/pkgs/applications/window-managers/i3/wsr.nix +++ b/pkgs/applications/window-managers/i3/wsr.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Mq4TpQDiIYePUS3EwBfOe2+QmvF6+WEDK12WahbuhSU="; }; - cargoHash = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo="; + useFetchCargoVendor = true; + cargoHash = "sha256-ecFlektG6CcGvD2l39MuplknpXuJ5B08ydJunxI7Pvg="; nativeBuildInputs = [ python3 ]; buildInputs = [ libxcb ]; diff --git a/pkgs/build-support/mitm-cache/default.nix b/pkgs/build-support/mitm-cache/default.nix index 8d206034f7ea..2c2db877c835 100644 --- a/pkgs/build-support/mitm-cache/default.nix +++ b/pkgs/build-support/mitm-cache/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-6eYOSSlswJGR2IrFo17qVnwI+h2FkyTjLFvwf62nG2c="; + useFetchCargoVendor = true; + cargoHash = "sha256-6554Tf5W+7OFQw8Zm4yBQ2/rHm31MQ0Q+vTbnmZTGMQ="; setupHook = replaceVars ./setup-hook.sh { inherit openssl; diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index c8c3d998f7ed..dbffcc09c88a 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -38,7 +38,8 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-E1iowktT7oK259WY6AopfvinQuRT1yMnORbJn9Ly+3E="; + useFetchCargoVendor = true; + cargoHash = "sha256-3McEZ/qwrLm8W2Umtah5shU74iFxLfe4ihp7x4YEvKc="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/compilers/kind2/default.nix b/pkgs/development/compilers/kind2/default.nix index 4af6762da2a7..54d7f8c68977 100644 --- a/pkgs/development/compilers/kind2/default.nix +++ b/pkgs/development/compilers/kind2/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-X2sjfYrSSym289jDJV3hNmcwyQCMnrabmGCUKD5wfdY="; }; - cargoHash = "sha256-KzoEh/kMKsHx9K3t1/uQZ7fdsZEM+v8UOft8JjEB1Zw="; + useFetchCargoVendor = true; + cargoHash = "sha256-G6UW8m/6D+hgRRceMPYFI+k4D7Ui6sDUDzI5IVWvVyc="; postPatch = '' substituteInPlace src/main.rs \ diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index faa3790b3440..7babd86443a3 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pgQqDRdewBSCm1/9/r8E9DBzwSKAaons3e6OLNv5gHM="; }; - cargoHash = "sha256-70Aq/gNfRv9JQyYWb7amYkfzFcNGCGbmCfJH4chbyyc="; + useFetchCargoVendor = true; + cargoHash = "sha256-o+qm4MFZt+BzqhQsaI5EU9lZz4LI9D75eL+VKIKbIyI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index d4520719a7e8..79c291f08e02 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6gSJJ3ptqpYydjg+xf5Pz3iTk0D+bkC6N79OeiKxPHY="; }; - cargoHash = "sha256-MRoEFP7VXBNBe6/e3ezPnzhKACwqTApGH9c0T4ycvg4="; + useFetchCargoVendor = true; + cargoHash = "sha256-U2LBesQNOa/E/NkVeLulb8JUtGsHgMne0MgY0RT9lqI="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 8c593d09cf35..9f1dbfd3f2cd 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rP0qvSb9PxsTMAq0hpB+zdSTHvridyCVdukLUYxdao8="; }; - cargoHash = "sha256-6UwFfTHhAr56K7kDAp0dCSoCjZuCHdgw2bpOD1WdvYU="; + useFetchCargoVendor = true; + cargoHash = "sha256-Fympp2A04viibo4U79FiBSJIeGDUWS34OOwebCks6S0="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index a5c67947b08d..eb6af7299d64 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-h5vSdKETereFCS06HYqQPSExBWPGxJHnWCj8SJNeqE4="; + useFetchCargoVendor = true; + cargoHash = "sha256-5U+02G3sXXkCwcAOUZ3lY1tovE8JAW7W/YjC+s1/MXU="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index aa6bf93b4e2b..04be4a79ca19 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo="; }; - cargoHash = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710="; + useFetchCargoVendor = true; + cargoHash = "sha256-lBHqvwZrnkSfmMXBmnhovbDn+pf5iLJepJjO/FKT1wY="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index ce8b4a52cf2b..c889f7994c59 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - cargoHash = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk="; + useFetchCargoVendor = true; + cargoHash = "sha256-+2j6xH1Ww1WOLfbjknUPvCmYLAl4W3Zp/mQTaL0qnv0="; # fac includes a unit test called ls_files_works which assumes it's # running in a git repo. Nix's sandbox runs cargo build outside git, diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index dac18aead95c..195821e8333f 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2418rlM8WdQ2b4wrtUC+6yCgy+wxfApQTaVDPXbnvKo="; }; - cargoHash = "sha256-I958/qvPqqRayvQwe8/SMgERwM+E7d3J6hpKPHfSBf0="; + useFetchCargoVendor = true; + cargoHash = "sha256-dnC5MsfwqZZeZsbf80KkigOYHuG3qpHRGBRH66oM0Q0="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 4b0b7d5eb433..7e8f7c3e912b 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VorWk7E+I1hU8Hc+WF47+V483E/xPjf7Glqp7iA1t5g="; }; - cargoHash = "sha256-pjCLlti/6CITFLN3UxYujP/K6j2bSAu1OS1zw3YiSFM="; + useFetchCargoVendor = true; + cargoHash = "sha256-h6XX25uN9wBCdOYc1Bl6VWi3htopcXb7VhjNIDkmEJY="; # Test depend on git configuration that would likely exist in a normal user environment # and might be failing to create the test repository it works in. diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix index 5258908cdef4..fae399658a30 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-4eaU6dOb97/vV3NSCCpdzK2oQUIHl4kdAtgWbGsY5LU="; + useFetchCargoVendor = true; + cargoHash = "sha256-jymWM0DCR6jUE1Kyhbx6HHf6YlrGu1THKTyDHaPG+Vs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/database/dynein/default.nix b/pkgs/development/tools/database/dynein/default.nix index d48d25f04026..7497a7db3803 100644 --- a/pkgs/development/tools/database/dynein/default.nix +++ b/pkgs/development/tools/database/dynein/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoHash = "sha256-QyhoYgqBfK6LCdtLuo0feVCgIMPueYeA8MMGspGLbGQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-rOfJz5G6kO1/IM6M6dZJTJmzJhx/450dIPvAVBHUp5o="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/database/indradb/default.nix b/pkgs/development/tools/database/indradb/default.nix index 87ff3688641a..8bb52cc135bd 100644 --- a/pkgs/development/tools/database/indradb/default.nix +++ b/pkgs/development/tools/database/indradb/default.nix @@ -28,7 +28,8 @@ in version = "unstable-2021-01-05"; inherit src meta; - cargoHash = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js="; + useFetchCargoVendor = true; + cargoHash = "sha256-wehQU0EOSkxQatoViqBJwgu4LG7NsbKjVZvKE6SoOFs="; buildAndTestSubdir = "server"; @@ -49,7 +50,8 @@ in version = "unstable-2021-01-05"; inherit src meta; - cargoHash = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM="; + useFetchCargoVendor = true; + cargoHash = "sha256-wehQU0EOSkxQatoViqBJwgu4LG7NsbKjVZvKE6SoOFs="; PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index e3dc5c8d62bc..834bf8927859 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zTOAwSjsgu3axq+VSnXAIGKRDeeRBaQtoNoVU2eKAIk="; }; - cargoHash = "sha256-ZvWq3DKNAUz/6v0RjUXbEeO6+H84bbDLOVV05vD96Yk="; + useFetchCargoVendor = true; + cargoHash = "sha256-0O4WWBevEyPMPS59rDmYHWpgKTc713jLn9MNHoLVd0I="; buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index 073730272dc3..88f1f2bcf251 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage { hash = "sha256-6VDuZ5rw2N4z6wOVbaOKO6TNaq8QA5RstsIzmuE3QrI="; }; - cargoHash = "sha256-ndRw5z4CfuX0KNqNgpA4yohG8p/cUR/Op2fIunuO6GM="; + useFetchCargoVendor = true; + cargoHash = "sha256-GYkkB0Z40UedPLnZZ0tHdMQR2HhuQBg75J2J9vNsMuU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index dcaf8bd79b37..43905399e693 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - cargoHash = "sha256-InukV9tey9fVBj2tDff9HMQ149mXJCPJ85B1fMKyIJ0="; + useFetchCargoVendor = true; + cargoHash = "sha256-mxYTV3kNetIHB8XcvFdqp7t78E9EzMdMgD4ENIAYyec="; doCheck = false; diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 85c58a9d77bb..4acd337e0f99 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-3EJP+y+Egz0kj5e+1FRHPGWfneB/tCCVggmgmylMyDE="; }; - cargoHash = "sha256-gopI5iOCSzD23mvOues76WIiBtpNf9A6X9NoOULm6Qo="; + useFetchCargoVendor = true; + cargoHash = "sha256-BZosk8tCHpQqQTNFe8BPArdkTHoRN/SViG10xtYs8jY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix index 10299c5d439b..6053aaae41f7 100644 --- a/pkgs/development/tools/git-ps-rs/default.nix +++ b/pkgs/development/tools/git-ps-rs/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4lk6AHquWKgDk0pBaswbVShZbUDA3wO6cPakhrvrwac="; }; - cargoHash = "sha256-GS/RRPzULUla4XY4tO+eM2NAy2nG0qDxqcSq292ivgU="; + useFetchCargoVendor = true; + cargoHash = "sha256-QYkEBqDwspdhSliwLwMWmybS9nd41DCjGNURnMzLzBM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix index 6ef0590ffbf5..a3f07bf00f50 100644 --- a/pkgs/development/tools/gptcommit/default.nix +++ b/pkgs/development/tools/gptcommit/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { hash = "sha256-MB78QsJA90Au0bCUXfkcjnvfPagTPZwFhFVqxix+Clw="; }; - cargoHash = "sha256-F4nabUeQZMnmSNC8KlHjx3IcyR2Xn36kovabmJ6g1zo="; + useFetchCargoVendor = true; + cargoHash = "sha256-PFpc9z45k0nlWEyjDDKG/U8V7EwR5b8rHPV4CmkRers="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/graphql-client/default.nix b/pkgs/development/tools/graphql-client/default.nix index 8a9817bd430d..0b6623ca1846 100644 --- a/pkgs/development/tools/graphql-client/default.nix +++ b/pkgs/development/tools/graphql-client/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4="; }; - cargoHash = "sha256-fEjt7ax818hlIq2+UrIG6EismQUGdaq7/C3xN+Nrw2s="; + useFetchCargoVendor = true; + cargoHash = "sha256-GPUOIDKlxk2P+cPmOPlpz/EM9TCXvHo41+1fQ0xAqto="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/hors/default.nix b/pkgs/development/tools/hors/default.nix index b2217078394d..09bf6b2ec98a 100644 --- a/pkgs/development/tools/hors/default.nix +++ b/pkgs/development/tools/hors/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1q17i8zg7dwd8al42wfnkn891dy5hdhw4325plnihkarr50avbr0"; }; - cargoHash = "sha256-1PB/JvgfC6qABI+cIePqtsSlZXPqMGQIay9SCXJkV9o="; + useFetchCargoVendor = true; + cargoHash = "sha256-JTHgOEBpGXPO3C7YUbBF0LFeSUQK+R2w1LugwMV5xyU="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix index 120521c71b6c..76f7bb443aa2 100644 --- a/pkgs/development/tools/htmlq/default.nix +++ b/pkgs/development/tools/htmlq/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-kZtK2QuefzfxxuE1NjXphR7otr+RYfMif/RSpR6TxY0="; }; - cargoHash = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY="; + useFetchCargoVendor = true; + cargoHash = "sha256-QUlR6PuOLbeAHzARtTo7Zn7fmjs2ET6TdXT4VgCYEVg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix index bf7ecb5b25c7..a3a26c4eae2c 100644 --- a/pkgs/development/tools/jless/default.nix +++ b/pkgs/development/tools/jless/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-76oFPUWROX389U8DeMjle/GkdItu+0eYxZkt1c6l0V4="; }; - cargoHash = "sha256-sas94liAOSIirIJGdexdApXic2gWIBDT4uJFRM3qMw0="; + useFetchCargoVendor = true; + cargoHash = "sha256-moXZcPGh0+KyyeUMjH7/+hvF86Penk2o2DQWj4BEzt8="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix index fe6d7f868979..278dda658b14 100644 --- a/pkgs/development/tools/kdash/default.nix +++ b/pkgs/development/tools/kdash/default.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec { xorg.xcbutil ] ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; - cargoHash = "sha256-jm0UCKDy6TrogMPavB86lvk8yKZXubTGGbApk+oP2RQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-NRFTrSH2aorBqsvBOTqfKmer5tXEEF1ZMUtlMfZ6vD8="; meta = with lib; { description = "Simple and fast dashboard for Kubernetes"; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 9ac575221749..d691b3b0b90e 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-h4GaOZ9wHhRq8/GRKrXkH7fJPpOdYmwZ2nQPsVzt66U="; }; - cargoHash = "sha256-dtl1YCMZdNtgaR8TxT3UZ7+CYREzpjaxmT80C1VTTa8="; + useFetchCargoVendor = true; + cargoHash = "sha256-uVetaDiX5IZQt8G5iKv9ucDUOo3EEvxd2+v61xchkOA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/dura/default.nix b/pkgs/development/tools/misc/dura/default.nix index 2b1e38d295aa..390c9661ef80 100644 --- a/pkgs/development/tools/misc/dura/default.nix +++ b/pkgs/development/tools/misc/dura/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xAcFk7z26l4BYYBEw+MvbG6g33MpPUvnpGvgmcqhpGM="; }; - cargoHash = "sha256-XOtPtOEKZMJzNeBZBT3Mc/KOjMOcz71byIv/ftcRP48="; + useFetchCargoVendor = true; + cargoHash = "sha256-Xci9168KqJf+mhx3k0d+nH6Ov5tqNtB6nxiL9BwVYjU="; cargoPatches = [ ./Cargo.lock.patch diff --git a/pkgs/development/tools/misc/pwninit/default.nix b/pkgs/development/tools/misc/pwninit/default.nix index 7a616761311d..7a645f4b8106 100644 --- a/pkgs/development/tools/misc/pwninit/default.nix +++ b/pkgs/development/tools/misc/pwninit/default.nix @@ -36,7 +36,8 @@ rustPlatform.buildRustPackage rec { ''; doCheck = false; # there are no tests to run - cargoHash = "sha256-J2uQoqStBl+qItaXWi17H/IailZ7P4YzhLNs17BY92Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-N0vje5ZU7B++f71BJKwkEfpbInpermH241f6oP1/fQE="; meta = { description = "Automate starting binary exploit challenges"; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index acf7043b5d65..7f118386befd 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Lx7vENYuBXaMvGDOZxAPqivGZVaCXYrihaTnBn9eTm4="; }; - cargoHash = "sha256-6JDG9Ac43AW6HV2baZH08uxdb84hjrGXgdzZiFr2Ybk="; + useFetchCargoVendor = true; + cargoHash = "sha256-poCLSloNPhJRDrG2HD6xn9ZxMILu9HlR2To0vbDeT2I="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index a577405c730c..6cefdd772263 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI="; }; - cargoHash = "sha256-U7Bode8qwDsNf4FVppfEHA9uiOFz74CtKgXG6xyYlT8="; + useFetchCargoVendor = true; + cargoHash = "sha256-hCFFqvnbm0MXDvC5ea7Uo3xQdMO2e4tU7dEAvZxTM3s="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/development/tools/pactorio/default.nix b/pkgs/development/tools/pactorio/default.nix index dc0b2e1dfbcb..9d85c9594ad8 100644 --- a/pkgs/development/tools/pactorio/default.nix +++ b/pkgs/development/tools/pactorio/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-3+irejeDltf7x+gyJxWBgvPgpQx5uU3DewU23Z4Nr/A="; }; - cargoHash = "sha256-sAFsG+EPSmvPDFR9R0fZ5f+y/PXVpTJlMzL61vwf4SY="; + useFetchCargoVendor = true; + cargoHash = "sha256-1rqYp9OZ7hkZhrU813uBQAOZNdQ3j+OQdM6ia+t5cOc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index fd10f7877a9d..82b8cd33972b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -169,7 +169,8 @@ rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version; - cargoHash = "sha256-mk3aw1aFu7N+b4AQL5kiaHuIAuJv24KonFeGKid427Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-wrMqeJxOj9Jp3luy6ir6UzNQClRglqP8pfoqWk+Ky+w="; buildInputs = [ installShellFiles ]; nativeBuildInputs = [ which ] ++ lib.optionals webUISupport [ emscripten ]; diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/development/tools/perseus-cli/default.nix index ba37dc5e1417..11a996ebfe2f 100644 --- a/pkgs/development/tools/perseus-cli/default.nix +++ b/pkgs/development/tools/perseus-cli/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs="; }; - cargoHash = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0="; + useFetchCargoVendor = true; + cargoHash = "sha256-9McjhdS6KrFgtWIaP0qKsUYpPxGQjNX7SM9gJ/aJGwc="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index eb3d10016157..9f03149f887b 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T96F8xgB9HRwuvDLXi6+lfi8za/iNn1NAbG4AIpE0V0="; }; - cargoHash = "sha256-SkHlXvhmw7swjZDdat0z0o5ATDJ1qSE/iwiwywsFOyw="; + useFetchCargoVendor = true; + cargoHash = "sha256-velwX7lcNQvwg3VAUTbgsOPLlA5fAcPiPvczrBBsMvs="; buildFeatures = [ "unwind" ]; diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index 4a61021a00ca..429c6879ab00 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6tCTrplzoiimKvXEIXd2gUOXzcZ/eQ22npBqbVv0Nv0="; }; - cargoHash = "sha256-J+3v7O38+MhCoq1UKf0Sqaomw/SSu+JK3sWWv9rB6FI="; + useFetchCargoVendor = true; + cargoHash = "sha256-yb0AvWrXAyi3HOBxlF59//DrwqWwSK1LQNhzrrO4QD8="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/remodel/default.nix b/pkgs/development/tools/remodel/default.nix index c0de834e678e..6d3f6a560271 100644 --- a/pkgs/development/tools/remodel/default.nix +++ b/pkgs/development/tools/remodel/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-tZ6ptGeNBULJaoFomMFN294wY8YUu1SrJh4UfOL/MnI="; }; - cargoHash = "sha256-YCYs+MMTxnJEKhzjddBp7lnSYPrpf3G+ktr1ez/ZKkg="; + useFetchCargoVendor = true; + cargoHash = "sha256-41EkXciQZ7lGlD+gVlZEahrGPeEMmaIaiF7tYff9xXw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix index 8b2e47d81605..720066ca6910 100644 --- a/pkgs/development/tools/rover/default.nix +++ b/pkgs/development/tools/rover/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-uyeePAHBDCzXzwIWrKcc9LHClwSI7DMBYod/o4LfK+Y="; }; - cargoHash = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI="; + useFetchCargoVendor = true; + cargoHash = "sha256-uR5XvkHUmZzCHZITKgScmzqjLOIvbPyrih/0B1OpsAc="; buildInputs = [ diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix index f58e56a35f03..ebb5769e8082 100644 --- a/pkgs/development/tools/rubyfmt/default.nix +++ b/pkgs/development/tools/rubyfmt/default.nix @@ -68,7 +68,8 @@ rustPlatform.buildRustPackage rec { ./0003-ignore-warnings.patch ]; - cargoHash = "sha256-QZ26GmsKyENkzdCGg2peie/aJhEt7KQAF/lwsibonDk="; + useFetchCargoVendor = true; + cargoHash = "sha256-8LgAHznxU30bbK8ivNamVD3Yi2pljgpqJg2WC0nxftk="; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec"; diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index c93bb562fe31..eb71a35e023a 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -13,7 +13,8 @@ in rustPlatform.buildRustPackage rec { hash = "sha256-RL9P0dPYWLlEGgGWZuIvyULJfH+c/B+3sySVadJQS3w="; }; - cargoHash = "sha256-i92f9grVqVqWmOKkLcBxB1Brk5KztJpPi9zSxVcgXfY="; + useFetchCargoVendor = true; + cargoHash = "sha256-4EyDjHreFFFSGf7UoftCh6eI/8nfIP1ANlYWq0K8a3I="; buildInputs = [ (lib.getLib clang.cc) ]; diff --git a/pkgs/development/tools/rust/cargo-audit/default.nix b/pkgs/development/tools/rust/cargo-audit/default.nix index 7368e2fa9ca6..0865883df1c1 100644 --- a/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/pkgs/development/tools/rust/cargo-audit/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oMXpJE49If4QKE80ZKhRpMRPh3Bl517a2Ez/1VcaQJQ="; }; - cargoHash = "sha256-XefJGAU3NxIyby/0lIx2xnJ00Jv1bNlKWkBe+1hapoU="; + useFetchCargoVendor = true; + cargoHash = "sha256-RY1cAsVi76N1jaWL+t0lfayChGPrL9T05xoFfFPTni4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-bazel/default.nix b/pkgs/development/tools/rust/cargo-bazel/default.nix index 35db4be2116b..1ee5aebc14b7 100644 --- a/pkgs/development/tools/rust/cargo-bazel/default.nix +++ b/pkgs/development/tools/rust/cargo-bazel/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios="; }; - cargoHash = "sha256-+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw="; + useFetchCargoVendor = true; + cargoHash = "sha256-E/yF42Vx9tv8Ik1j23El3+fI19ZGzq6nikVMATY7m3E="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index 0f3f244fcb9e..e8ab6ff42249 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ltxd4n3oo8ZF/G/zmR4FSVtNOkxwCjDv6PdxkmWxZ+8="; }; - cargoHash = "sha256-UfhIz87s0CLUDbIpWMPzGQ7qVmh14GuiFoquauSbTOw="; + useFetchCargoVendor = true; + cargoHash = "sha256-tCJ7Giyj7Wqowhk0N7CkvAiWvF6DBNw7G7aAnn2+mp8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 2021101430d8..90fd9685b3d7 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-q9tYKXK8RqiqbDZ/lTxUI1Dm/h28/yZR8rTQuq+roZs="; }; - cargoHash = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38="; + useFetchCargoVendor = true; + cargoHash = "sha256-cwTHJ5Cd17ur8AhEQb8FTS0mcgqg83VGjvCQP00JY6s="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zlib diff --git a/pkgs/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix index a14d9f4431b8..1aad2fdf19b9 100644 --- a/pkgs/development/tools/rust/cargo-clone/default.nix +++ b/pkgs/development/tools/rust/cargo-clone/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-kK0J1Vfx1T17CgZ3DV9kQbAUxk4lEfje5p6QvdBS5VQ="; }; - cargoHash = "sha256-6UUaOwu6N/XFdGEnoAX5zM4xTsqwHwPrmZ1t5huF6nM="; + useFetchCargoVendor = true; + cargoHash = "sha256-IbNwlVKGsi70G+ATimRZbHbW91vFddQl//dfAM6JO8I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 2d162dd2ef35..07220d39ecde 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pi02Bn5m4JoTtCIZvxkiUVKkjmtCShKqZw+AyhaVdyY="; }; - cargoHash = "sha256-5Ps31Hdis+N/MT/o0IDHSJgHBM3F/ve50ovfFSviMtA="; + useFetchCargoVendor = true; + cargoHash = "sha256-xHA6fe1/0p/PHGV6JcyVir5uGAqJ7qkHObjVqDPGwSY="; nativeBuildInputs = [ curl diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index fa1df501ce9f..faf717762fba 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-OxE0+KK2qt06gAi7rw3hiG2lczBqbyNThb4aCpyM6q8="; }; - cargoHash = "sha256-RtN3+TWRNsOgVb4KrCEN0cxB8ctBZ5qNUXbux3RKkqc="; + useFetchCargoVendor = true; + cargoHash = "sha256-MdRK4mQ09KatcgjTu/0l6Qkd3FYefiwC+UcmXOgsQ0A="; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index a8430563625c..b6024347c03f 100644 --- a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T/9eHI2P8eCZAqMTeZz1yEi5nljQWfHrdNiU3h3h74U="; }; - cargoHash = "sha256-o7ARj41a5LWwjiggFFa804ytFZRcz1OZN+QWjOytWy8="; + useFetchCargoVendor = true; + cargoHash = "sha256-deczbMPeJsnmXbVB60stKhJJZRIIwjY5vExS3x3b6aU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 7b52294da6e7..905670420376 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Y5tnY8EZJcVhYyVTpvcT6DFbPSmmw3+knzkMVvQxQbI="; }; - cargoHash = "sha256-X8wQvLSvZ7rrDfX423SDB5QDDMoeDDFvJZKO92CLycg="; + useFetchCargoVendor = true; + cargoHash = "sha256-D5wZWFXmM3tadhL+OHAPhBu6BXJh5fAYlOLR4q+wlsQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix index 05d2642b0fc1..0a62e9a99992 100644 --- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-OpneGyulSreUKhmnLfsJ2sEbkDPCcrDjkRu9ccKZcJc="; }; - cargoHash = "sha256-gdTqObOWboNlhU+tI/z5KYSOdmgRg36v73iLuKfwVkA="; + useFetchCargoVendor = true; + cargoHash = "sha256-uErlNPkacAmURNKAZp1wLsV2NB1w9HfjLZl5PgeMRu0="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix index 50e3b7db2bf0..589186bd86e0 100644 --- a/pkgs/development/tools/rust/cargo-fund/default.nix +++ b/pkgs/development/tools/rust/cargo-fund/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8mnCwWwReNH9s/gbxIhe7XdJRIA6BSUKm5jzykU5qMU="; }; - cargoHash = "sha256-J4AylYE4RTRPTUz5Hek7D34q9HjlFnrc/z/ax0i6lPQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-9NozPJzQIuF2KHaT6t4qBU0qKtBbM05mHxzmHlU3Dr4="; # The tests need a GitHub API token. doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix index 08544400fc46..7569b4a10217 100644 --- a/pkgs/development/tools/rust/cargo-hf2/default.nix +++ b/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU="; }; - cargoHash = "sha256-zBxvpQfB9xw8+Rc1H1EaK/gQZtQ+uSs4YJwhm2o0vhI="; + useFetchCargoVendor = true; + cargoHash = "sha256-cRliZegzRKmoGIE96pyVuNySA2L6l+imcTHbZBXXiz4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix index 3c4ad5f0a714..135cce1f47ff 100644 --- a/pkgs/development/tools/rust/cargo-lambda/default.nix +++ b/pkgs/development/tools/rust/cargo-lambda/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-21p9bo+kfqVrRAxVSuZ24XaHDU7XkIIhGXjHLUsGQOg="; }; - cargoHash = "sha256-5AzeqJjs8Ee6ltXnXMZU47fXt1THsSERxCaT22zjK6g="; + useFetchCargoVendor = true; + cargoHash = "sha256-GtlT2ek/HjRN/+1Ocp/bJgEL5Oy6Dm1p+CdWjs7NW7Q="; nativeCheckInputs = [ cacert ]; diff --git a/pkgs/development/tools/rust/cargo-ndk/default.nix b/pkgs/development/tools/rust/cargo-ndk/default.nix index c0231216b4ba..e132991be676 100644 --- a/pkgs/development/tools/rust/cargo-ndk/default.nix +++ b/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-tzjiq1jjluWqTl+8MhzFs47VRp3jIRJ7EOLhUP8ydbM="; }; - cargoHash = "sha256-UthI01fLC35BPp550LaDLoo1kjisUmQZqSud8JM/kqM="; + useFetchCargoVendor = true; + cargoHash = "sha256-Kt4GLvbGK42RjivLpL5W5z5YBfDP5B83mCulWz6Bisw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreGraphics diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index 876f01215cbf..56f6e258638a 100644 --- a/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bAo3098QxepKbvBb9uF6iGNW0+RAKCCMyWfuG5WyREo="; }; - cargoHash = "sha256-YGGmzdcy3x4RF1S8jMPXTAglThlfG7nZTD0IATGvePw="; + useFetchCargoVendor = true; + cargoHash = "sha256-h+sxnTAJ1uhPUk5dRiYPgPoxvbpVggnCn0TQ6kRCzO4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 76f0401e72f3..29bdec0e08e0 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-R4t1mzXX95rVbEuHvoAnxxEYt7XYg+Bmr8Mh4LIhnMs="; }; - cargoHash = "sha256-DigRCz9BicNI+bkEwdJEKy9i0pT9HAhLsN56hAbEzUI="; + useFetchCargoVendor = true; + cargoHash = "sha256-oNWjU/KxvnKipChHPxKDxO5ZKw/44XAG3twQiZ1Lr8I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix index af5364e9a206..6ff8f75f407e 100644 --- a/pkgs/development/tools/rust/cargo-vet/default.nix +++ b/pkgs/development/tools/rust/cargo-vet/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-VnOqQ1dKgNZSHTzJrD7stoCzNGrSkYxcLDJAsrJUsEQ="; }; - cargoHash = "sha256-M8sZzgSEMIB6pPVaE+tC18MCbwYaYpHOnhrEvm9JTso="; + useFetchCargoVendor = true; + cargoHash = "sha256-8QbXZtf5kry0/QDrnUVQCtqK4/6EMliOI4Z410QR2Ec="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 0ba5fd8b450f..8564f62150d7 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-agwK20MkvnhqSVAWMy3HLkUJbraINn12i6VAg8mTzBk="; }; - cargoHash = "sha256-oqGc5haN8Jyi0eQf8egrRXWxi0RGVdIFhpGKgmFB8DI="; + useFetchCargoVendor = true; + cargoHash = "sha256-4AVZ747d6lOjxHN+co0A7APVB5Xj6g5p/Al5fLbgPnc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index ad29ce377497..6014baaf3a90 100644 --- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-YJ08oBTn9OwovnTOuuc1OuVsQp+/TPO3vcY4ybJ26Ms="; }; - cargoHash = "sha256-Zi9FCNBxQ9S4S9k6hoMUOixTs6PJyxmgTB+ArrX8oBE="; + useFetchCargoVendor = true; + cargoHash = "sha256-p95aYXsZM9xwP/OHEFwq4vRiXoO1n1M0X3TNbleH+Zw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 7ab99f9b5916..4ba9eb792e98 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kuzKW7ol4ZdxIhfAdvAKRb8fgwaU2LTO43dxrpke1Ow="; }; - cargoHash = "sha256-86rxLszfr1Bi0mNf53KKowKx/i+dbFUcNVoi5Q50xc8="; + useFetchCargoVendor = true; + cargoHash = "sha256-WsX1noIRlMRzNqJUxR55CxdTCxJ+DVddVRIbkLtWK1Q="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index adebe70d878a..c78f0558b0a0 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoHash = "sha256-TX/Xi57fn85GjHc74icxhsQ6n7FwqzGIr3Qoc2o681E="; + useFetchCargoVendor = true; + cargoHash = "sha256-ft6EUajAj+Zw3cEhdajwwHAaMaUf+/vtTuUYni8E+o0="; meta = with lib; { description = "Simple, extendable and embeddable scripting language"; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index e0de754928fc..649497629329 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-BehkJTEIbZHaM+ABaWN/grl9pX75lPqyBj1q1Kt273M="; }; - cargoHash = "sha256-iQoMPV97V9WJqT+qVtNpQtW5g+Jyl+U2uA+JEoRYTQA="; + useFetchCargoVendor = true; + cargoHash = "sha256-CQHpsOGofDqsbLLTcznu5a0MSthJgy27HjBk8AYA72s="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index 989c51f464e9..4a3b1880436f 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kAZUconMYUF9gZbLSg7KW3fVb7pkTq/d/yQyVzscxRw="; }; - cargoHash = "sha256-HDiWT13tknEC+Z4nVe4ZDFMP3y5VtRXozRLd68T9BuE="; + useFetchCargoVendor = true; + cargoHash = "sha256-d+VOtFC+OTp6MQnzEIOfIxk1ARAcNYvS7U2+IJ1hqSs="; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 81bfa72a3f71..6d7c1d7f96e4 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - cargoHash = "sha256-Mp92cEvgOj0JH7+5+hl8wN+a7zPf8heV6whaqvIcBTU="; + useFetchCargoVendor = true; + cargoHash = "sha256-ciM4ir7MRTkfLmGUFpVVyldcxPtSbttyWLSI1pNjDkA="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ diff --git a/pkgs/development/tools/spr/default.nix b/pkgs/development/tools/spr/default.nix index 9d7467383a8d..a186e600a686 100644 --- a/pkgs/development/tools/spr/default.nix +++ b/pkgs/development/tools/spr/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc="; }; - cargoHash = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8="; + useFetchCargoVendor = true; + cargoHash = "sha256-4fYQM+GQ5yqES8HQ23ft4wfM5mwDdcWuE5Ed2LST9Gw="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 6220337c275c..c398893d3e34 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - cargoHash = "sha256-3wkO4w66FJ996cahLvP8wFQSL4RKuw5959qo9rlbTcY="; + useFetchCargoVendor = true; + cargoHash = "sha256-UrfxNjKOHQCYKMr83W7XSpQIYxnZkCgIWfp/YtTKpIc="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/pkgs/development/tools/wrangler_1/default.nix b/pkgs/development/tools/wrangler_1/default.nix index 259139fc661b..b51d26745bf2 100644 --- a/pkgs/development/tools/wrangler_1/default.nix +++ b/pkgs/development/tools/wrangler_1/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-GfuU+g4tPU3TorzymEa9q8n4uKYsG0ZTz8rJirGOLfQ="; }; - cargoHash = "sha256-tPLqDm6kOVBKrLvhgZ9xD6vVBNjBBk9uLF7WOPgz8qE="; + useFetchCargoVendor = true; + cargoHash = "sha256-MJFXcmRzvzDJ8cd0WdcNiHr3Wxgp/hKO1xKRfmbxRLA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix index c152ed040a4e..b38c6dffa88d 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/games/blightmud/default.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk="; }; - cargoHash = "sha256-84m5dihmiEGrFCajqaMW05MQtBceLodBzqtjW+zh6kg="; + useFetchCargoVendor = true; + cargoHash = "sha256-7cMd7pNWGV5DOSCLRW5fP3L1VnDTEsZZjhVz1AQLEXM="; buildFeatures = lib.optional withTTS "tts"; diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index 1073764cbaea..4c835cab698a 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-yBi6zyljkYEIUvSH4nXMw8fjPnt4kjqiuZ/QLT5IbqQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-3YKFKngyLg2ah4GY+LlbPbnVks7/xFawnMf3D1gjmwI="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix index 0ceb9ca462a2..5531b8c9805e 100644 --- a/pkgs/misc/cliscord/default.nix +++ b/pkgs/misc/cliscord/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-Z8ras6W4BnAWjHe6rPd1X1d3US5gq7CxnBAkW//OTsg="; + useFetchCargoVendor = true; + cargoHash = "sha256-bJA+vqbhXeygIAg9HWom3xSuPpJgJY5FLb8UMBjrh7U="; meta = with lib; { description = "Simple command-line tool to send text and files to discord"; diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index fd33e41c1ea7..0e9a9bdb7c66 100644 --- a/pkgs/misc/t-rec/default.nix +++ b/pkgs/misc/t-rec/default.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" ''; - cargoHash = "sha256-orgSmGtZwTqlWSpUjU17QRgDlbheo2DbS1YI7l4MhmM="; + useFetchCargoVendor = true; + cargoHash = "sha256-2ErXqQ1vRsPMJPFqdAlrmdPTuEC/h5L+DvGJf2K0ziw="; meta = with lib; { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 4234894fcfd8..2f9919ed7d42 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-fLA7dF91mEgjTnbhujTKaHX+qmpzYaqzL8cc/x+mrUk="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pe6mNbn4GFjhpFZeWMlaRt7Bj5BLiIy789hXWkII2ps="; meta = with lib; { description = "Simple and easy to use Wikipedia Text User Interface"; diff --git a/pkgs/servers/bindle/default.nix b/pkgs/servers/bindle/default.nix index 07507e00adde..88867342500c 100644 --- a/pkgs/servers/bindle/default.nix +++ b/pkgs/servers/bindle/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-RECEeo0uoGO5bBe+r++zpTjYYX3BIkT58uht2MLYkN0="; + useFetchCargoVendor = true; + cargoHash = "sha256-cTgR1yp6TFwotm5VEG5e0O7R1zCMbQmcH2zmRmF7cjI="; cargoBuildFlags = [ "--bin" diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix index 2dcb7c06d16a..913d77b029ec 100644 --- a/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-h2LwxqyyBPAXRr6XOmcLEmbet063kkM1ledULp3M2ek="; }; - cargoHash = "sha256-eXPAn2ziSdciZa6YrOIa7y7Lms681X+yVAD9HrvsZHg="; + useFetchCargoVendor = true; + cargoHash = "sha256-eYJoHFIC0NF3OAbZXDWB57IOFC9JDV4IXHQgzIWMT04="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/servers/gemini/stargazer/default.nix index da7a432d2375..8da7c0576d5d 100644 --- a/pkgs/servers/gemini/stargazer/default.nix +++ b/pkgs/servers/gemini/stargazer/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0vbQDHuLrgrsWiOb2hb6lYylJm5o/wOzoDIw85H8Eh0="; }; - cargoHash = "sha256-EtRJsm6jo0fSEN9s0cS4IBWV/NnuUeDTa/x1utbh85k="; + useFetchCargoVendor = true; + cargoHash = "sha256-KdHYyuH1RMLRueqYbfADUktBx9aL8yTagB0KxEGQsCs="; passthru = { tests.basic-functionality = nixosTests.stargazer; diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix index f23ea254a336..9d48f9c1136b 100644 --- a/pkgs/servers/geospatial/martin/default.nix +++ b/pkgs/servers/geospatial/martin/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Jq72aEwM5bIaVywmS3HetR6nnBZnr3oa9a/4ZbgeL9E="; }; - cargoHash = "sha256-RO9nUH2+0jOCbvGtZ5j802mL85tY+Jz7ygPrNuFeE98="; + useFetchCargoVendor = true; + cargoHash = "sha256-595VKHLajoNinyv12J9qUi55hOcOFRgUeLlzvSdjESs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix index 61703b16f7d8..fd8f627fa316 100644 --- a/pkgs/servers/krill/default.nix +++ b/pkgs/servers/krill/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3pkDu20vgzslJcK5KQH+GY+jnimEZgm+bQxy8QMUeCk="; }; - cargoHash = "sha256-Z12fUK4TUgk38/vNAt8RWLFGLc8WnZAgHWz0xl1QKLI="; + useFetchCargoVendor = true; + cargoHash = "sha256-8K4Jn2A9OREwLRyFddHREcylapoFr+/AMT7Wq4o2Ue4="; buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index 30791e412af1..e670c4ae5287 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mp1XTFD6mvH3RzvzvnJ58iJ6/EjENKYSzOavC2rVixs="; }; - cargoHash = "sha256-F5yMNm1JaE9q0NQJ3PDmPlW4WdjfyJj/J9er18acsKw="; + useFetchCargoVendor = true; + cargoHash = "sha256-hqOtICFufmx7mNzinPpj2/abjKINR4QGoNZrk5I3GIQ="; postPatch = '' # Upstream started to redirect aarch64-unknown-linux-gnu to aarch64-linux-gnu-gcc diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 388441b1c640..b77b1254c86c 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-2e31ZuGJvpvu7L2Lb+n6bZWpC1JhETzEzSiNaxxsAtA="; }; - cargoHash = "sha256-NsxGpjuZPpz4gCJRp5IOcfRFh8DTud47nV2bE0/kc2Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-PVjeCKGHiHo+OtjIxMZBBJ19Z3807R34Oyu/HYZO90U="; postPatch = '' # drop hardcoded linker names, fixing static build diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index 091b2037d235..c1bf8fa265b5 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-O9/YvvFOaZ1F7HYO/AplWLz1vw0hysJEvGketk8zb9w="; + useFetchCargoVendor = true; + cargoHash = "sha256-UnXWBq+oS7tXFCsOhlTkq0L1j8pqzXZ0QKrdYayLunA="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix index 5b4d101b2ff0..2798e203542e 100644 --- a/pkgs/servers/piping-server-rust/default.nix +++ b/pkgs/servers/piping-server-rust/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-8kYaANVWmBOncTdhtjjbaYnEFQeuWjemdz/kTjwj2fw="; }; - cargoHash = "sha256-YSiClSnjgqFqT2IGJoatcy7j3NUKcff826AvJ/+RNNU="; + useFetchCargoVendor = true; + cargoHash = "sha256-m6bYkewBE0ZloDVUhUslS+dgPyoK+eay7rrP3+c00mo="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices diff --git a/pkgs/servers/rtrtr/default.nix b/pkgs/servers/rtrtr/default.nix index d78f5b56db58..4774ebd1ce2d 100644 --- a/pkgs/servers/rtrtr/default.nix +++ b/pkgs/servers/rtrtr/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c1jzUP7cYjqn49gbjXLWTge8ywHBI29gSnhzWDzNCV8="; }; - cargoHash = "sha256-2/pm/Tfn6UxFpHW6HW20yOxEtm6N3jOe8kk9k7OPppU="; + useFetchCargoVendor = true; + cargoHash = "sha256-RPCT2mmzuvDYSTTDM7S1yRcmCe8RlkA1i80dW7OPVO4="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix index 6d64689c0863..a063dd82ee46 100644 --- a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix +++ b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix @@ -19,7 +19,8 @@ buildPgrxExtension rec { hash = "sha256-VdLWwkUA0sVs5Z/Lyf5oTRhcHVzPmhgnYQhIM8MWJ0c="; }; - cargoHash = "sha256-Gn+SjzGaxnGKJYI9+WyE1+TzlF/2Ne43aKbXrSzfQKM="; + useFetchCargoVendor = true; + cargoHash = "sha256-OyrfwLMHn2aihfijHxE5oaz+XQC1HFlYbTp8Sw8RcK0="; postInstall = '' # Upstream renames the extension when packaging diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index e877aadd66d1..a82c73e84337 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -21,7 +21,8 @@ hash = "sha256-7yUbtWbYL4AnuUX8OXG4OVqYCY2Lf0pISSTlcFdPqog="; }; - cargoHash = "sha256-+uD4UU7QwNISQZ7a2kDkY/y3fQWk/K0fFcrFq4yq6RU="; + useFetchCargoVendor = true; + cargoHash = "sha256-g5pIIifsJAs0C02o/+y+ILLnTXFqwG9tZcvY6NqfnDA="; buildAndTestSubdir = "extension"; passthru = { diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index dd453cd8bdd1..1645caebff22 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -36,7 +36,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Ptctp2ECypmSd0BHa6l09/U7wEjtLsvRSQV/ISz9+3w="; }; - cargoHash = "sha256-KOIVlF8V5bdtGIFbboTQpVSieETegA6iF7Hi6/F+2bE="; + useFetchCargoVendor = true; + cargoHash = "sha256-88qcDlIukhpaUJ1vl1v8KMzj4XaYvATxlU+BOMZu6tk="; nativeBuildInputs = [ pkg-config ] diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/shells/nushell/plugins/dbus.nix index 91b263331539..91d63bb9f316 100644 --- a/pkgs/shells/nushell/plugins/dbus.nix +++ b/pkgs/shells/nushell/plugins/dbus.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Ga+1zFwS/v+3iKVEz7TFmJjyBW/gq6leHeyH2vjawto="; }; - cargoHash = "sha256-2QbsgxY82Vq7Op5kc45ejK/H14iDNpSqVWVAVaMObFY="; + useFetchCargoVendor = true; + cargoHash = "sha256-7pD5LA1ytO7VqFnHwgf7vW9eS3olnZBgdsj+rmcHkbU="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ dbus ]; diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 7e2112d491a5..6e1cb241bd90 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-igmSU2ziLfQbcEvHiQcuU8I8SeEN34gimBlcXtfuC0o="; + useFetchCargoVendor = true; + cargoHash = "sha256-88qcDlIukhpaUJ1vl1v8KMzj4XaYvATxlU+BOMZu6tk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 47ab2ea27ead..495956961d14 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-xoiKsn3XkKkw+KpgnIPFw78JN3ERxkj+2SgrCoe9HOU="; + useFetchCargoVendor = true; + cargoHash = "sha256-88qcDlIukhpaUJ1vl1v8KMzj4XaYvATxlU+BOMZu6tk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix index efb7bb99087d..59f8fa3a6622 100644 --- a/pkgs/shells/nushell/plugins/highlight.nix +++ b/pkgs/shells/nushell/plugins/highlight.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-LDVKZLktP4+W04O8EDkMs8dgViHyzA/b7k+/oJS2pro="; + useFetchCargoVendor = true; + cargoHash = "sha256-yZPiDz5BMZqXD3MM8OHKwv1WgoFEmtoQZqzSogVoMnQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index 4b28ddf74b74..fa3fcc55ad95 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nKcB919M9FkDloulh9IusWYPhf8vlhUmKVs6Gd6w3Bw="; }; - cargoHash = "sha256-bsrpdQS0wA3T0jZTG476sSkMRngEAOjgr4wX7svyMP4="; + useFetchCargoVendor = true; + cargoHash = "sha256-nQILwEZaVL1xJ/CKGGObogFGPmW0UPq0v3vFP2kHqWo="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix index caccd2f62f00..f724765c2436 100644 --- a/pkgs/shells/nushell/plugins/polars.nix +++ b/pkgs/shells/nushell/plugins/polars.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_polars"; inherit (nushell) version src; - cargoHash = "sha256-rzTXVde0ZqgJQb1Hs3nvo9v1k+0UKkgKlTym4pukvuk="; + useFetchCargoVendor = true; + cargoHash = "sha256-88qcDlIukhpaUJ1vl1v8KMzj4XaYvATxlU+BOMZu6tk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 041c26db8754..a9b0a7d7742b 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-OuunFi3zUIgxWol30btAR71TU7Jc++IhlZuM56KpM/Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-88qcDlIukhpaUJ1vl1v8KMzj4XaYvATxlU+BOMZu6tk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/shells/nushell/plugins/skim.nix b/pkgs/shells/nushell/plugins/skim.nix index f93a752f06b5..8bfba8cc5d43 100644 --- a/pkgs/shells/nushell/plugins/skim.nix +++ b/pkgs/shells/nushell/plugins/skim.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-z+NT5WjwBn5yrdQNuERswZgsfM4OJPKssWPyClIi0Fk="; }; - cargoHash = "sha256-IcecexmlWjpmqgkuhJv58+GeLhi8cHNItKzUHC3+UCc="; + useFetchCargoVendor = true; + cargoHash = "sha256-ssRUUwRS21TsnBfofb53MhcqZFUJ3GlxV4AirPDdVzw="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix index d929d0286071..4be46ad05f7e 100644 --- a/pkgs/shells/nushell/plugins/units.nix +++ b/pkgs/shells/nushell/plugins/units.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-iDRrA8bvufV92ADeG+eF3xu7I/4IinJcSxEkwuhkHlg="; }; - cargoHash = "sha256-if8uvDRwr6p5VENdls9mIfECiu/zDybcpkphZLHRHe8="; + useFetchCargoVendor = true; + cargoHash = "sha256-8TYqvg+g9VmzbNwOGLfE274r1dvlKiMovJCciVgc+yw="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index c2a209d7f513..ef10ceed7f74 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1pl7f8fhxfcy0c6c08vkagp0x1ak96vc5wgamigrk1nkd6l371lb"; }; - cargoHash = "sha256-uroO0PgnCkFRNYAZgdTZWgDDbBqq1ZM+dni/A2Qw9fg="; + useFetchCargoVendor = true; + cargoHash = "sha256-U1kjOWrFEp1pZnbawW2MCtC4UN7ELD/kcYWfEmn94Pg="; buildInputs = [ xorg.libX11 diff --git a/pkgs/tools/admin/coldsnap/default.nix b/pkgs/tools/admin/coldsnap/default.nix index d6bff3a6ae67..9e06c365b9f4 100644 --- a/pkgs/tools/admin/coldsnap/default.nix +++ b/pkgs/tools/admin/coldsnap/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-NYMcCLFhX7eD6GXMP9NZDXDnXDDVbcvVwhUAqmwX+ig="; }; - cargoHash = "sha256-ngkoxybl52zTH4wo+sIUtU8vtzOAp+jU1RyTO2KbCgU="; + useFetchCargoVendor = true; + cargoHash = "sha256-wUpLYPBACinRO9j+ZrbmJohuN27BPB6ZYu8K14XJmGw="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 40fa98cab14e..b8babd1f5abd 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lm9bGu2AIVulVBcMzEpxxek5g6ajQmBENHeHV210g0k="; }; - cargoHash = "sha256-zruW6Cf7zspqv8LadCIXZ0iQdlQ7CVfWhkxLwDA+IFc="; + useFetchCargoVendor = true; + cargoHash = "sha256-bV59m59vEGvPYctD2pTPspH9zxSV2xg9J0QDGnXPUUA="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/tools/backup/awsbck/default.nix index 361c2fea583f..f49f590a6e73 100644 --- a/pkgs/tools/backup/awsbck/default.nix +++ b/pkgs/tools/backup/awsbck/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6AJTNJ/vuRAMnkuOoBVmEAlJy18OZDWVr4OzFv9/oag="; }; - cargoHash = "sha256-kJLkI+01tZMYnvxr8Gnuq7ia9iGEYrlUNvHv9Fg7L6s="; + useFetchCargoVendor = true; + cargoHash = "sha256-sr9E6AbgGibOhlg+LOuYL5ysd6gHDyKOAYJTwjrzl2E="; # tests run in CI on the source repo doCheck = false; diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index 5897238ef42a..86367d92dad7 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Ekjxna3u+71s1q7jjXp7PxYUQIfbp2E+jAqKGuszU6g="; }; - cargoHash = "sha256-hkGmE7WseEjMxmmPyR8C4osbdbpIt8qG9sfVGuC4d84="; + useFetchCargoVendor = true; + cargoHash = "sha256-kWUAI25ag9ghIhn36NF+SunRtmbS0HzsZsxGJujmuG4="; nativeBuildInputs = [ ronn diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index fa567086015b..950e03c175b9 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-t4FdTFXbKs7Xfw8dKoME7WDn+Fpe/uHPXyr5Wj+AXSA="; }; - cargoHash = "sha256-lBGcS1+CBYeVIG546aHSBVJ9y96rB3IDDVJPqCFUDZQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-FBxNK50ONmezXH8tVFpaBpSFVENS0uMO6mHcaeJq7Og="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index b11c7c9aab1c..3b49848beffd 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-GEYP18CaCQShvCg8T7YTvlybH1LNO34KBxgmsTv2Lzs="; }; - cargoHash = "sha256-I6d3IyPBcUsrvlzF7W0hFM4hcXi4wWro9bCeP4eArHI="; + useFetchCargoVendor = true; + cargoHash = "sha256-JpsUceR9Y3r6RiaLOtbgBUrb6eoan7fFt76U9ztQoM8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/aoc-cli/default.nix b/pkgs/tools/misc/aoc-cli/default.nix index 6f4cdad5240e..b0c7c615cfaf 100644 --- a/pkgs/tools/misc/aoc-cli/default.nix +++ b/pkgs/tools/misc/aoc-cli/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; - cargoHash = "sha256-EluP4N3UBQeEKVdHTs4O0THXji+nAyE52nGKsxA3AA4="; + useFetchCargoVendor = true; + cargoHash = "sha256-cm8yt7PRjar21EVFIjXYgDkO7+VpHGIB3tJ8hkK+Phw="; meta = with lib; { description = "Advent of code command line tool"; diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index 11f12b294415..de68610e76a0 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YjGfnYK22RIVa8D8CWnAxHGDqXENGAPIeQQ606Q3JW8="; }; - cargoHash = "sha256-Fx/XNmml/5opekmH1qs/f3sD45KWfNZjdOxTuNJfZiw="; + useFetchCargoVendor = true; + cargoHash = "sha256-CwucGAwAvxePNQu5p1OWx9o9xsvpzX1abH6HyF43nEE="; prePatch = '' rm .cargo/config.toml diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix index 76d52622a839..6af7fdffe2d0 100644 --- a/pkgs/tools/misc/didyoumean/default.nix +++ b/pkgs/tools/misc/didyoumean/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-PSEoh1OMElFJ8m4er1vBMkQak3JvLjd+oWNWA46cows="; }; - cargoHash = "sha256-QERnohWpkJ0LWkdxHrY6gKxdGqxDkLla7jlG44laojk="; + useFetchCargoVendor = true; + cargoHash = "sha256-BASM0gBQFuJY2ze9X9HJUkiP4WrOP/inD87bVFraeAY="; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index 9a4867971252..9ff4b4d058fa 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE="; }; - cargoHash = "sha256-o3+KcE7ozu6eUgwsOSr9DOoIo+/BZ3bJZe+WYQLXHpY="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pny/RBtr65jKu2DdyIrluZWeZIgGb8Ev7mxvTMWPlyI="; meta = with lib; { description = "Scriptable, curses-based, digital habit tracker"; diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index 415781981086..7404b142fc00 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-7xGt+HDX20Bxwdff0Ca/D6lcT3baumeiUmIPXSh5NYM="; + useFetchCargoVendor = true; + cargoHash = "sha256-keBnhE4ltOVMEuxPifiB2EAHk32u3PqaPGTeVexVXWM="; meta = with lib; { description = "Minimal, fast alternative to 'du -sh'"; diff --git a/pkgs/tools/misc/eludris/default.nix b/pkgs/tools/misc/eludris/default.nix index 19def0a87cbe..4d91026bb183 100644 --- a/pkgs/tools/misc/eludris/default.nix +++ b/pkgs/tools/misc/eludris/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TVYgimkGUSITB3IaMlMd10PWomqyJRvONvJwiW85U4M="; }; - cargoHash = "sha256-5B9D19jFh5+eNTjiho22CFsn51nmwLry08zSDWvs1OU="; + useFetchCargoVendor = true; + cargoHash = "sha256-JpXjnkZHz12YxgTSqTcWdQTkrMugP7ZGw48145BeBZk="; cargoBuildFlags = [ "-p eludris" ]; cargoTestFlags = [ "-p eludris" ]; diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 01948b1ba566..901f6c28df65 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JgeajCubRz9hR6uvRAw1HXdKa6Ua+l/Im/bYXdx1gL0="; }; - cargoHash = "sha256-mEgFfg8I+JJuUEvj+sia2aL3BVg3HteQorZ2EOiLo64="; + useFetchCargoVendor = true; + cargoHash = "sha256-LOEsxqRlGL2B/ruBb/4XoCYZk5hBf2vPvcj+tT/UcA0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix index 38eae30a59b2..5eeac952d277 100644 --- a/pkgs/tools/misc/fclones/gui.nix +++ b/pkgs/tools/misc/fclones/gui.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ad7wyoCjSQ8i6c+4IorImqAY2Q6pwBtI2JkkbkGa46U="; }; - cargoHash = "sha256-7+I0Tj+DcrItU2apB1iMiYiTv9AeDparke86HkJNF3A="; + useFetchCargoVendor = true; + cargoHash = "sha256-01HNWhHfbun+Er39eN5tEmqXMGDsBQrZtVTA9R7kifo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index f2de570ff606..5ec56de3c064 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-L1j1lXPxy9nWMeED9uzQHV5y7XTE6+DB57rDnXa4kMo="; }; - cargoHash = "sha256-r1yIPV2sW/EpHJpdaJyi6pzE+rtNkBIxSUJF+XA8kbA="; + useFetchCargoVendor = true; + cargoHash = "sha256-Gv70H3SLgiO7SWKYfCKzBhgAHxhjx3Gv7ZPLrGeQ+HY="; cargoPatches = [ diff --git a/pkgs/tools/misc/flowgger/default.nix b/pkgs/tools/misc/flowgger/default.nix index 0ad0f183b540..21713f24ce79 100644 --- a/pkgs/tools/misc/flowgger/default.nix +++ b/pkgs/tools/misc/flowgger/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eybahv1A/AIpAXGj6/md8k+b9fu9gSchU16fnAWZP2s="; }; - cargoHash = "sha256-DZGyX3UDqCjB5NwCXcR8b9pXdq8qacd3nkqGp6vYb+U="; + useFetchCargoVendor = true; + cargoHash = "sha256-50/rg1Bo8wEpD9UT1EWIKNLglZLS1FigoPtZudDaL4c="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/gh-cal/default.nix b/pkgs/tools/misc/gh-cal/default.nix index 9d099cf6a7aa..eb6629c78a45 100644 --- a/pkgs/tools/misc/gh-cal/default.nix +++ b/pkgs/tools/misc/gh-cal/default.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-x9DekflZoXxH964isWCi6YuV3v/iIyYOuRYVgKaUBx0="; }; - cargoHash = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-myfvPAeWuFHQcHXfkTYRfXVQ5ZBrdzQlaqHljbS0ppg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index 265ed57e45cb..b302e7c4fbe5 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Ut2H2H66XN1+wHpYivnuhil21lbd7bwIcIcMyIimdis="; }; - cargoHash = "sha256-ZRE1vKgi0/UtSe2bdN0BLdtDfAauTfwcqOcl3y63fAA="; + useFetchCargoVendor = true; + cargoHash = "sha256-OsK6X7qwMMQ1FK3JE98J2u6pn6AixE8izFmxUVDs5GM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/hiksink/default.nix b/pkgs/tools/misc/hiksink/default.nix index 4e9a4172cfa0..fb2fd6df3fe5 100644 --- a/pkgs/tools/misc/hiksink/default.nix +++ b/pkgs/tools/misc/hiksink/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-k/cBCc7DywyBbAzCRCHdrOVmo+QVCsSgDn8hcyTIUI8="; }; - cargoHash = "sha256-vqzXpSPBwY7m/Fdob0mHH0OXnzyQwFk7x2kk9Tgez3M="; + useFetchCargoVendor = true; + cargoHash = "sha256-P5h0jYSSy6i30g93Jor98vOmniJCA4eMyQkI8TLfbN8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index b8b5d1437063..79859ce7f990 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c8yK9U8UWRWUSGGGrAds6zAqxAiBLWq/RcZ6pvYNpgk="; }; - cargoHash = "sha256-Ia9L7RxYmhFzTVOzegxAmsgBmx30PPqyVFELayL3dq8="; + useFetchCargoVendor = true; + cargoHash = "sha256-eZpGqkowp/R//RqLRk3AIbTpW3i9e+lOWpfdli7S4uE="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/misc/iay/default.nix b/pkgs/tools/misc/iay/default.nix index 01f1205f9dc2..d30f38d3d4fc 100644 --- a/pkgs/tools/misc/iay/default.nix +++ b/pkgs/tools/misc/iay/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-oNUK2ROcocKoIlAuNZcJczDYtSchzpB1qaYbSYsjN50="; }; - cargoHash = "sha256-bcMi8967dsJ3fL28XiUXfHz6CPB/RKSKsRvwMJtxEUA="; + useFetchCargoVendor = true; + cargoHash = "sha256-QO9gzJKSBMs5s1fCfpBuyHDK9uE1B148bMjp8RjH4nY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/jsonwatch/default.nix b/pkgs/tools/misc/jsonwatch/default.nix index f2cd306ecced..d70642d319bc 100644 --- a/pkgs/tools/misc/jsonwatch/default.nix +++ b/pkgs/tools/misc/jsonwatch/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/DYKjhHjfXPWpU1RFmRUbartSxIBgVP59nbgwKMd0jg="; }; - cargoHash = "sha256-Io51qbZOVcOKyMvo9/GTPXkGiJwjxcIPK3y7vAuTJOM="; + useFetchCargoVendor = true; + cargoHash = "sha256-QVS+b/mH7hnzaZjnGg8rw6k11uOuKGFeiPoXyqwD8tk="; meta = with lib; { description = "Like watch -d but for JSON"; diff --git a/pkgs/tools/misc/killport/default.nix b/pkgs/tools/misc/killport/default.nix index 514d61a3bf15..91565de392ae 100644 --- a/pkgs/tools/misc/killport/default.nix +++ b/pkgs/tools/misc/killport/default.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eyRI4ZVp9HPMvpzyV9sQdh2r966pCdyUPnEhxGkzH3Q="; }; - cargoHash = "sha256-QQ43dT9BTu7qCzpnTGKzlVL6jKDXofXStYWYNLHSuVs="; + useFetchCargoVendor = true; + cargoHash = "sha256-rJgbTJGRZNev5hPyH7NuRB0Utpdbh6zoYQL4rbfhn2Y="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix index f614301a010c..77afc0114258 100644 --- a/pkgs/tools/misc/lighthouse-steamvr/default.nix +++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uJ8U4knNKAliHjxP0JnV1lSCEsB6OHyYSbb5aWboYV4="; }; - cargoHash = "sha256-XVPrtZNLdF9mKSl56kBepkpXRQBJsu9KlZRhb6BeG/E="; + useFetchCargoVendor = true; + cargoHash = "sha256-YJgtkrDs7cBpjux0SE6TTXcduZRC+8+4SMMiCXYeCYI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index a30f368ba76a..715eea7768d7 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -17,7 +17,8 @@ let # Also don’t forget to run `nix-build -A lorri.tests` version = "1.7.1"; sha256 = "sha256-dEdKMgE4Jd8CCvtGQDZNDCYOomZAV8aR7Cmtyn8RfTo="; - cargoHash = "sha256-+sKxKxc2DVHn54uQa8K+CKmm0A0ym9SXgtOcfRZ6R5E="; + useFetchCargoVendor = true; + cargoHash = "sha256-d1kXwb2WsF3J5AyD8wrrnGtCMYQ4P2mtiuJLMyCDPdM="; in (rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/misc/nvfancontrol/default.nix b/pkgs/tools/misc/nvfancontrol/default.nix index 6ec6da4672a0..c35a4715936c 100644 --- a/pkgs/tools/misc/nvfancontrol/default.nix +++ b/pkgs/tools/misc/nvfancontrol/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0WBQSnTYVc3sNmZf/KFzznMg9AVsyaBgdx/IvG1dZAw="; }; - cargoHash = "sha256-fEzdghGQSSeyeyiHjw1ggQ38gsETJFl9bq/tizGxIis="; + useFetchCargoVendor = true; + cargoHash = "sha256-nJc1G9R0+o22H1KiBtzfdcIIfKrD+Dksl7HsZ2ICD7U="; nativeBuildInputs = [ libXNVCtrl diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix index cfee7e5caef5..e3fbe0415d41 100644 --- a/pkgs/tools/misc/octofetch/default.nix +++ b/pkgs/tools/misc/octofetch/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI="; }; - cargoHash = "sha256-iuhJYibyQ7hdeXzqCW2PLq7FiKnZp2VHyKT4qO/6vrU="; + useFetchCargoVendor = true; + cargoHash = "sha256-1lnHCiRktBGYb7Bgq4p60+kikb/LApPhzNp1O0Go46Q="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/owofetch/default.nix b/pkgs/tools/misc/owofetch/default.nix index 3de70679c933..f850a9ad6949 100644 --- a/pkgs/tools/misc/owofetch/default.nix +++ b/pkgs/tools/misc/owofetch/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-I8mzOUvm72KLLBumpgn9gNyx9FKvUrB4ze1iM1+OA18="; }; - cargoHash = "sha256-rfN4QERs1H1G7ZZim//78vlxbYfU4Cx7SYYUz/QLKeU="; + useFetchCargoVendor = true; + cargoHash = "sha256-0ON1h8+ruLOvBR7Q/hOIW6j+BjfPAAuYA2wrUYj59Ow="; buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ Foundation diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix index 9ab9594f8a22..e3fc4fe5b6dd 100644 --- a/pkgs/tools/misc/rust-motd/default.nix +++ b/pkgs/tools/misc/rust-motd/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-x3dx4PdYSYd7wA/GGj9QYC8rK33FWATs2SnaOagGE80="; }; - cargoHash = "sha256-7YvzVG3c10EJET+659F1fwgZ0SmBKMdAWD6LeWnGrNI="; + useFetchCargoVendor = true; + cargoHash = "sha256-12janO6zzlLge1uDLHHjGtycCPwkJXwII6LeG0586Fk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index fd577be3a88f..a1706b45f623 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9K04g2DCADkRwjo55rDwVwkvmypqujdN1fqOmHmC09E="; }; - cargoHash = "sha256-GBqxA49H3KG63hn8QfM4U8m9uZ1YAhJio6bGziyLvV0="; + useFetchCargoVendor = true; + cargoHash = "sha256-IHg36zgBF7o/O9kL6t54fV6dBJDZLYausM1u8pLR+Mk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix index c827afe52914..770f04f8ac30 100644 --- a/pkgs/tools/misc/sheldon/default.nix +++ b/pkgs/tools/misc/sheldon/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eyfIPO1yXvb+0SeAx+F6/z5iDUA2GfWOiElfjn6abJM="; }; - cargoHash = "sha256-+yTX1wUfVVjsM42X0QliL+0xbzTPheADZibPh/5Czh8="; + useFetchCargoVendor = true; + cargoHash = "sha256-HINEhJ6xpiRAPopJDhbXlSCn4K4aPFErgIYwDOBmRX8="; buildInputs = [ openssl ] diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 2de7e22032d7..348529476681 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -57,7 +57,8 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoHash = "sha256-Z/dMKExGemssCMqRzQ58xXxXvbFR84WX3KI2pC20omI="; + useFetchCargoVendor = true; + cargoHash = "sha256-B2CCrSH2aTcGEX96oBxl/27hNMdDpdd2vxdt0/nlN6I="; nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix index d52c72be5de3..9dd4cb6ff039 100644 --- a/pkgs/tools/misc/synth/default.nix +++ b/pkgs/tools/misc/synth/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/z2VEfeCCuffxlMh4WOpYkMSAgmh+sbx3ajcD5d4DdE="; }; - cargoHash = "sha256-i2Pp9sfTBth3DtrQ99Vw+KLnGECrkqtlRNAKiwSWf48="; + useFetchCargoVendor = true; + cargoHash = "sha256-sJSU85f4bLh89qo8fojWJNfJ9t7i/Hlg5pnLcxcwKt4="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index c6698c446bdb..7d5d1a906ff0 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1crj0caimin667f9kz34c0sm77892dmqaf1kxryqakqm75az5wfr"; }; - cargoHash = "sha256-56gy9AH3i4OSvExMuR3n/2hF5pJgbn5JJpxZLXKfu2w="; + useFetchCargoVendor = true; + cargoHash = "sha256-4bscAhYE3JNk4ikTH+Sw2kGDDsBWcCZZ88weg9USjC0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; diff --git a/pkgs/tools/misc/tmux-sessionizer/default.nix b/pkgs/tools/misc/tmux-sessionizer/default.nix index a68cf47fb86c..877650f9b8b6 100644 --- a/pkgs/tools/misc/tmux-sessionizer/default.nix +++ b/pkgs/tools/misc/tmux-sessionizer/default.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage { hash = "sha256-4xwpenoAVGKdVO3eSS4BhaEcwpNPGA5Ozie53focDlA="; }; - cargoHash = "sha256-ajeCB1w/JHMT5e7mSwsh++lzLNfp0qfutONStpJpFDo="; + useFetchCargoVendor = true; + cargoHash = "sha256-NFM9tZQIR9Rw9uSlqxhbNnmwe3xqK+dv/qyJBHfEmi4="; passthru.tests.version = testers.testVersion { package = tmux-sessionizer; diff --git a/pkgs/tools/misc/toastify/default.nix b/pkgs/tools/misc/toastify/default.nix index 3578e6af1d92..a95122afbeef 100644 --- a/pkgs/tools/misc/toastify/default.nix +++ b/pkgs/tools/misc/toastify/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-hSBh1LTfe3rQDPUryo2Swdf/yLYrOQ/Fg3Dz7ZqV3gw="; }; - cargoHash = "sha256-Ps2pRLpPxw+OS1ungQtVQ8beoKpc8pjzQEndMNni08k="; + useFetchCargoVendor = true; + cargoHash = "sha256-xnmns0YXsKuoNxxax3St5pLiFwu6BD0iIYHNi9N9mO0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index b7164272ae38..55910cfaaa44 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0wJxBFGPjJReWoeeKpHEsKaB3npR8nf7Uw8BgPQ+ccs="; }; - cargoHash = "sha256-ac62RyjQujEYAOcoGOMlDlbx1MmVmrRKoNpgb3dFUFk="; + useFetchCargoVendor = true; + cargoHash = "sha256-/sN5Vl1Co2VYnG2vN170Q3hAbOYhJSvLawJDFytz+ho="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index 897fe98394e6..3d53fe0b43bb 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DoFqHKTu4CvgDYPT4vbwNvSZ/lNTdAF+wlHOOIBJKUw="; }; - cargoHash = "sha256-mgg6yzjRZsDbnK19nhNmy2I95tPWD4NmGCXtI957D0M="; + useFetchCargoVendor = true; + cargoHash = "sha256-w/d/MMd5JNQMRUxRaH4Tpf4Dzh14eykG+zzuM/YrU40="; nativeBuildInputs = [ cmake diff --git a/pkgs/tools/misc/vrc-get/default.nix b/pkgs/tools/misc/vrc-get/default.nix index ec5c92ee9012..b29418adadbb 100644 --- a/pkgs/tools/misc/vrc-get/default.nix +++ b/pkgs/tools/misc/vrc-get/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - cargoHash = "sha256-xfW9pIaSL9bvGXk4XxRUVyvtRwKXmjS3Gc5b7v7q17A="; + useFetchCargoVendor = true; + cargoHash = "sha256-cG6fcSIQ0E1htEM4H914SSKDNRGM5fj52SUoLqRYzoc="; # Execute the resulting binary to generate shell completions, using emulation if necessary when cross-compiling. # If no emulator is available, then give up on generating shell completions diff --git a/pkgs/tools/misc/wagyu/default.nix b/pkgs/tools/misc/wagyu/default.nix index d95c29509be4..b711e6d8ca9a 100644 --- a/pkgs/tools/misc/wagyu/default.nix +++ b/pkgs/tools/misc/wagyu/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./fix-rustc-serialize-version.patch ]; - cargoHash = "sha256-vseTtok0E0ddg9ALQ1ql3NPPxirfyMPHOSWsM2qu2jU="; + useFetchCargoVendor = true; + cargoHash = "sha256-vtNxRW/b8kvy21YQezCUiZNtLnlMSkdTRr/OkGy6UAw="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index c8a51356f015..cfe99237fb2c 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wm3zse5VqUNZ5d6ksCXXrngCcwrAniQbQqx9MOJoK58="; }; - cargoHash = "sha256-92lvMka6IqzNAxvYSMUeiDfYw4uKZjjpkZOABq9Mypo="; + useFetchCargoVendor = true; + cargoHash = "sha256-3deZMc1zrauldUZnFHYSRe2UjqWwYY7ePGBEE8g9g1g="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix index c680a5d9b380..892e7e4c0e21 100644 --- a/pkgs/tools/networking/bore-cli/default.nix +++ b/pkgs/tools/networking/bore-cli/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Wkhcv8q/dGRJqG7ArsnsPsRBnXdScGedwxunbOzAjyY="; }; - cargoHash = "sha256-vwvDtzShlQQO/oAnjbqDIP3fUdcH1kEmFR7fyV+uYbY="; + useFetchCargoVendor = true; + cargoHash = "sha256-va6d7Z5WUeokP77v/xidsMJCXHa8EKQ0gemNd1Naqdk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index e74ea0a5fae7..fdc69871baf6 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1fdnnx7d18gj4rkv1dc6q379dqabl66zks9i0rjarjwcci8m30d9"; }; - cargoHash = "sha256-vUKv98lfsrxBiJxjL8ZKLZ1IVCX5hHzl+F5y4Ot3i/Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-6uIqvX50XoWCPQ8u38rUdi4LwtMTBcNuefNmzGY+vLU="; cargoBuildFlags = [ "-p" pname diff --git a/pkgs/tools/networking/cocom/default.nix b/pkgs/tools/networking/cocom/default.nix index f3ae01d96eb9..98f837cf0bba 100644 --- a/pkgs/tools/networking/cocom/default.nix +++ b/pkgs/tools/networking/cocom/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0sl4ivn95sr5pgw2z877gmhyfc4mk9xr457i5g2i4wqnf2jmy14j"; }; - cargoHash = "sha256-y5/xOP5YzqsqBxG9c4r9ORyaEf5Ed6D10NFCaKQPchI="; + useFetchCargoVendor = true; + cargoHash = "sha256-kfseD0dYNC1IFAamLJee7LozGppE2mZgBMCUHJC0dP4="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 3679932ff225..e02263f7a3f7 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-4y5gpkQB0U6Yq92O6DDD5eq/i/36l/VfeyiE//pcZOk="; }; - cargoHash = "sha256-96eUCg0mzgUFLOKxpwRfzj1jH2Z+aDohBTztvRVWln0="; + useFetchCargoVendor = true; + cargoHash = "sha256-wrfQtJHhSG53tV3R4u/Ri4iv1VoAmuT3xleAQEJOIzE="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config diff --git a/pkgs/tools/networking/fast-ssh/default.nix b/pkgs/tools/networking/fast-ssh/default.nix index 2da8a048d6f4..c8ce11fc984a 100644 --- a/pkgs/tools/networking/fast-ssh/default.nix +++ b/pkgs/tools/networking/fast-ssh/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Wn1kwuY1tRJVe9DJexyQ/h+Z1gNtluj78QpBYjeCbSE="; }; - cargoHash = "sha256-CJ3Xx5jaTD01Ai7YAY4vB7RB5lU1BIXq7530B6+KeX4="; + useFetchCargoVendor = true; + cargoHash = "sha256-qkvonLuS18BBPdBUUnIAbmA+9ZJZFmTRaewrnK9PHFE="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/networking/ifwifi/default.nix b/pkgs/tools/networking/ifwifi/default.nix index d39ab99ee697..0e9b2c850f74 100644 --- a/pkgs/tools/networking/ifwifi/default.nix +++ b/pkgs/tools/networking/ifwifi/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-DPMCwyKqGJrav0wASBky9bS1bvJ3xaGsDzsk1bKaH1U="; }; - cargoHash = "sha256-TL7ZsRbpRdYymJHuoCUCqe/U3Vacb9mtKFh85IOl+PA="; + useFetchCargoVendor = true; + cargoHash = "sha256-oxuOc9FSKYq6UjimZPLayJ+5xsWzh3gZV/mVpPbPWHk="; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index 44cab1b4ca91..19277c0d446b 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dFMAzLvPO5xAfJqUXdiLf13uh5H5ay+CI9aop7Fhprk="; }; - cargoHash = "sha256-39LryfisVtNMX2XLPh/AEQ1KzVtwdE3wuTaTbxGMaBI="; + useFetchCargoVendor = true; + cargoHash = "sha256-gTFvxmnh+d1pNqG0sEHFpl0m9KKCQ78sai//iiJ0aGs="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix index 342e07e010e0..ae546198a89d 100644 --- a/pkgs/tools/networking/lychee/default.nix +++ b/pkgs/tools/networking/lychee/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DRGby8Ov7Mosz4FVz/w2ECkvyuBktL9PTnUYds+mCI8="; }; - cargoHash = "sha256-pD8UQEdZwZNAeON4zKYa6nUaz87vx7n/Op8H5NtXRZo="; + useFetchCargoVendor = true; + cargoHash = "sha256-B0bskG5ptUJCwRy/m0ZMo80dE2MTi39mnQLsgQjwTBY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index 65887a39bac2..20fddf5ba910 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-YXVH7kx5CiurTeXiphjDgcYxxovKtTF3Q9y/XOyVPUA="; + useFetchCargoVendor = true; + cargoHash = "sha256-UEo/CSRg1hS/BIEQTEgqfwwz1LAMDdjKwV8bDyspX7o="; meta = with lib; { description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index c03b1006e20b..2b5e8e4e7988 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage { hash = "sha256-AY0i7qXA7JXfIEY0htmL+/yn71xAuh7WowXOs2fD6n8="; }; - cargoHash = "sha256-gAl2es8UFVFv40sMY++SiDGjCMdL0XDN4PeSV7VlGmQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-Mt/UFVFLZRrY8Mka4VFi6J2XjBjFsnJPi9tnBVZ6a5E="; nativeBuildInputs = [ git pkg-config diff --git a/pkgs/tools/networking/onetun/default.nix b/pkgs/tools/networking/onetun/default.nix index fc288c3abab2..000163a2fdb6 100644 --- a/pkgs/tools/networking/onetun/default.nix +++ b/pkgs/tools/networking/onetun/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bggBBl2YQUncfOYIDsPgrHPwznCJQOlIOY3bbiZz7Rw="; }; - cargoHash = "sha256-Il/jwaQ4nu93R1fC3r6haSSF5ATSrgkv4uZmAA/RZBI="; + useFetchCargoVendor = true; + cargoHash = "sha256-VC7q2ZTdbBmvZ9l70uQz59paFIi8HXp5CPxfQC6cVmk="; meta = { description = "Cross-platform, user-space WireGuard port-forwarder that requires no root-access or system network configurations"; diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/tools/networking/rosenpass/default.nix index 1ec285b64a89..0326f9df532d 100644 --- a/pkgs/tools/networking/rosenpass/default.nix +++ b/pkgs/tools/networking/rosenpass/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fQIeKGyTkFWUV9M1o256G4U1Os5OlVsRZu+5olEkbD4="; }; - cargoHash = "sha256-GyeJCIE60JuZa/NuixDc3gTj9WAOpSReIyVxQqM4tDQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-vx6kSdDOXiIp2626yKVieDuS9DD5/wKyXutMiKMKn24="; nativeBuildInputs = [ cmake # for oqs build in the oqs-sys crate diff --git a/pkgs/tools/networking/s3rs/default.nix b/pkgs/tools/networking/s3rs/default.nix index d3714fb56c4b..3a09bee66c52 100644 --- a/pkgs/tools/networking/s3rs/default.nix +++ b/pkgs/tools/networking/s3rs/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-mJ1bMfv/HY74TknpRvu8RIs1d2VlNreEVtHCtQSHQw8="; }; - cargoHash = "sha256-Q1EqEyNxWIx3wD8zuU7/MO3Qz6zsfBZbtT/IIUmJccE="; + useFetchCargoVendor = true; + cargoHash = "sha256-z7de/TZXyNsb+dxWcNFdJsaGsM3Ld2A0jorNMAVOZOg="; nativeBuildInputs = [ python3 diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index c49f03cc8342..497ed5540c8c 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bvYp25EPKtkuZzplVYK4Cwd0mm4UuyN1LMiDAkgMIAc="; }; - cargoHash = "sha256-zmyce0Dt9ai4pNQi+b37KrCDqdjT9tQ8k2yHLDWDTXY="; + useFetchCargoVendor = true; + cargoHash = "sha256-TwUIyUEBe+qMKxfPxEGXcNYJmJSNfdcrOBnUbb0N6cs="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/tools/networking/suckit/default.nix b/pkgs/tools/networking/suckit/default.nix index f80a34b2a202..8cbbefeab601 100644 --- a/pkgs/tools/networking/suckit/default.nix +++ b/pkgs/tools/networking/suckit/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-M4/vD1sVny7hAf4h56Z2xy7yuCqH/H3qHYod6haZOs0="; }; - cargoHash = "sha256-JsH7TL9iITawuECm1hzs5oXFtnoUqLT4ug2CafoO2ao="; + useFetchCargoVendor = true; + cargoHash = "sha256-20Fz98mAkmhk7g0359S7Gjg6i89cXtKuS/9bVzOagBs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/wg-netmanager/default.nix b/pkgs/tools/networking/wg-netmanager/default.nix index b9a2353c8426..31bb2df07c36 100644 --- a/pkgs/tools/networking/wg-netmanager/default.nix +++ b/pkgs/tools/networking/wg-netmanager/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Mr4+TW1yOePEHa7puz6mTRJ514LGQeiEwPW3NKupV/M="; }; - cargoHash = "sha256-cOxkWMFPVmi+/BQWIvExzX5LDyC7C8kaTf5dGwfXj+s="; + useFetchCargoVendor = true; + cargoHash = "sha256-LtZTfmVVUqxc9GAM6mLLmlJXBhLqnfrvBZWh0RWrR/0="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/nix/nixci/default.nix b/pkgs/tools/nix/nixci/default.nix index 3e6866df79c7..bdc3a3676762 100644 --- a/pkgs/tools/nix/nixci/default.nix +++ b/pkgs/tools/nix/nixci/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-49I09hXYoVo6vzv1b6mkeiFwzfj6g1SkXTL/tCEdOYc="; }; - cargoHash = "sha256-trmWeYJNev7jYJtGp9XR/emmQiiI94NM0cPFrAuD7m0="; + useFetchCargoVendor = true; + cargoHash = "sha256-iRsmB+ak6pWFtAdXEmGSc9dGdIuSbgLp3UT3SdOUOGQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 9a3decc9e052..98693d50128d 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-WImnfkBU17SFQG1DzVUdsNq3hkiISNjAVZr2xGbgwHg="; }; - cargoHash = "sha256-gE99nCJIi6fsuxzJuU80VWXIZqVbqwBhKM2aRlhmYco="; + useFetchCargoVendor = true; + cargoHash = "sha256-HUyqkO9uPrfqTCljJzKfQ5sRCh4uj8XL4wSkwmc/Z8A="; doCheck = true; nativeCheckInputs = [ diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index 96e735948f65..1f255aef6796 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-42u5FmTIKHpfQ2zZQXIrFkAN2/XvU0wWnCRrQkQzcNI="; }; - cargoHash = "sha256-f8Th6SbV66Uukqh1Cb5uQVa844qw1PmBB9W7EMXMU4E="; + useFetchCargoVendor = true; + cargoHash = "sha256-cLSGWOyBQLv235TeYqSVg/f0Zmcnpj+RshINN69JYEU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/age-plugin-ledger/default.nix b/pkgs/tools/security/age-plugin-ledger/default.nix index e5b5ccfdbe7f..9c441ccda539 100644 --- a/pkgs/tools/security/age-plugin-ledger/default.nix +++ b/pkgs/tools/security/age-plugin-ledger/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g5GbWXhaGEafiM3qkGlRXHcOzPZl2pbDWEBPg4gQWcg="; }; - cargoHash = "sha256-SbgH67XuxBa7WFirSdOIUxfJGlIYezISCEA3LJGN3ys="; + useFetchCargoVendor = true; + cargoHash = "sha256-zR7gJNIqno50bQo0kondCxEC0ZgssqXNqACF6fnLDrc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index 7892e73e0144..525aa942ddec 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { rm .cargo/config ''; - cargoHash = "sha256-hOIOcz7YyZbQNScsY0jdxGLZQnWRBsFOzmRdu8oWIN8="; + useFetchCargoVendor = true; + cargoHash = "sha256-DjmMoATagWGK2DHMc6YB0u2X5x5hnqgCwIGe3+Wmdic="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 9cbb02b24201..2d650d3ac395 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aHmLcWiDy5GMbcKi285tfBggNmGkpVAoZMm4dt8LKak="; }; - cargoHash = "sha256-rtBvo2nX4A6K/TBl6xhW8huLXdR6xDUhzMB3KRXRYMs="; + useFetchCargoVendor = true; + cargoHash = "sha256-VLBou/XNYTd8vJNT+ntShLCRy9pzjCwJlbDbfRX2ag8="; nativeBuildInputs = [ gpgme # for gpgme-config diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index 0815c65ec12b..056d9699a745 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-o8/ENAWzVqs7rokST6xnyu9Q/pKqq/UnKWOFRuIuGes="; }; - cargoHash = "sha256-LcnvCWGVdBxhDgQDoGHXRppGeEpfjOv/F0dZMN2bOF8="; + useFetchCargoVendor = true; + cargoHash = "sha256-+TJ/QG+6ZILcSZEIXj6B4qYF0P5pQpo1kw2qEfE0FDw="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; diff --git a/pkgs/tools/security/lethe/default.nix b/pkgs/tools/security/lethe/default.nix index bd07d73130cf..c654c975eebc 100644 --- a/pkgs/tools/security/lethe/default.nix +++ b/pkgs/tools/security/lethe/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-y2D/80pnpYpTl+q9COTQkvtj9lzBlOWuMcnn5WFnX8E="; }; - cargoHash = "sha256-SFNNpbHZdDJvH95f+VWyVKnQp3OJwQmCOqHtLAhhkOk="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ky39RpLoYks4xDiheSsrUj3l/ZrGcY+y5IuDZ28pH/c="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/security/rblake2sum/default.nix b/pkgs/tools/security/rblake2sum/default.nix index 805bfbf8ec9d..06b1853cf5c5 100644 --- a/pkgs/tools/security/rblake2sum/default.nix +++ b/pkgs/tools/security/rblake2sum/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { hash = "sha256-bzOjJ+/M0YWY4/r8cNARPVqbuLBeTllqFyVXhJz6ZMI="; }; - cargoHash = "sha256-egwL3z7uB4AcRwPT0uPrenyh4FSxhbZKMdkPhRztMbs="; + useFetchCargoVendor = true; + cargoHash = "sha256-wIJWwU4D0OeVa2RMgmpN512TIvNdcBdorXU8KfFRTIg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/security/rblake3sum/default.nix b/pkgs/tools/security/rblake3sum/default.nix index 84f1c7283238..19428078db00 100644 --- a/pkgs/tools/security/rblake3sum/default.nix +++ b/pkgs/tools/security/rblake3sum/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { hash = "sha256-UFk6SJVA58WXhH1CIuT48MEF19yPUe1HD+ekn4LDj8g="; }; - cargoHash = "sha256-SE/Zg/UEV/vhB/VDcn8Y70OUIoxbJBh6H2QgFMkWPc4="; + useFetchCargoVendor = true; + cargoHash = "sha256-cxPNqUVNMkNY9Ov7/ajTAwnBd2j/gKDHVLXPtd1aPVA="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/security/rucredstash/default.nix b/pkgs/tools/security/rucredstash/default.nix index 9fe739ed814b..f98cd0f74858 100644 --- a/pkgs/tools/security/rucredstash/default.nix +++ b/pkgs/tools/security/rucredstash/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-trupBiinULzD8TAy3eh1MYXhQilO08xu2a4yN7wwhwk="; }; - cargoHash = "sha256-TYobVjjzrK3gprZcYyY98EvdASkq4urB+WiLlbJbwmk="; + useFetchCargoVendor = true; + cargoHash = "sha256-QylZkqE8my2ldCjtg3++6TTDm0om3SVp0jwYUZ9qVes="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index f61507f15e94..16b5abac46c0 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6heC/bHo4IqKNvPjch7AiyWTCZDCv4MZHC7DTEX3U5c="; }; - cargoHash = "sha256-Fr+m4BeYvUOoSkewwdUgpmdNchweeLK7v/tKLEzFOBs="; + useFetchCargoVendor = true; + cargoHash = "sha256-M3Nm1eWWofcxHcadx3cxxORWKyiOPZHVzTwY2YIAfiE="; postPatch = '' substituteInPlace src/scripts/mod.rs \ diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix index 4e4004e9c8b5..99a633dafe61 100644 --- a/pkgs/tools/security/solo2-cli/default.nix +++ b/pkgs/tools/security/solo2-cli/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-7tpO5ir42mIKJXD0NJzEPXi/Xe6LdyEeBQWNfOdgX5I="; }; - cargoHash = "sha256-X+IEeztSL312Yq9Loi3cNJuVfSGk/tRRBCsy0Juji7Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-qD185H6wfW9yuYImTm9hqSgQpUQcKuCESM8riZwmGY0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 67deb89c3936..043e96d4d39a 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-q0o2PQngbDLumck27V0bIiB35zesn55Y+MwK2GjNVWo="; }; - cargoHash = "sha256-nBSgP30Izskq9RbhVIyqWzZgG5ZWHVdiukldw+Q0rco="; + useFetchCargoVendor = true; + cargoHash = "sha256-UFuWD3phcKuayQITd85Sou4ygDBMzjrR39vWrlseYJQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix index d674e4be53cd..aab4fad6d1b7 100644 --- a/pkgs/tools/text/chars/default.nix +++ b/pkgs/tools/text/chars/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-mBtwdPzIc6RgEFTyReStFlhS4UhhRWjBTKT6gD3tzpQ="; }; - cargoHash = "sha256-wqyExG4haco6jg1zpbouz3xMR7sjiVIAC16PnDU2tc8="; + useFetchCargoVendor = true; + cargoHash = "sha256-Df+twOjzfq+Vxzuv+APiy94XmhBajgk+6+1BRFf+xm0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index b080b63b36bd..3b9c6d2b383a 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zA2JhSnlFccSY01WMGsgF4AmrF/3BRUCcSMfoEbEPgA="; }; - cargoHash = "sha256-dhcTpff4h37MHNbLoYUZiolSclSGcFrMJ3kKLCZAVAw="; + useFetchCargoVendor = true; + cargoHash = "sha256-aZkWzJaEW6/fiCfb+RKNef0eJf/CJW8OU1N2OlHwuJM="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index 577cb46b07b5..97e0247df632 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ylZE2NtTXbGqsxE72ylEQCacTyxBO+/WgvEpoXd5OZI="; }; - cargoHash = "sha256-RmQu55OnKfeuDGcJrfjhMKnxDatdowkvh3Kh4N8I8Sg="; + useFetchCargoVendor = true; + cargoHash = "sha256-pbGfoEk8peWBA0F0EdiAJJtan74O5RD6TmNJUTY2ijA="; buildInputs = (lib.optional stdenv.hostPlatform.isDarwin Security); diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix index 6e02473b52aa..5d94bd299fd0 100644 --- a/pkgs/tools/text/fastmod/default.nix +++ b/pkgs/tools/text/fastmod/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-A/3vzfwaStoQ9gdNM8yjmL2J/pQjj6yb68WThiTF+1E="; }; - cargoHash = "sha256-sFrABp4oYhel+GONFsTbunq+4We2DicvF9A3FT/ZArc="; + useFetchCargoVendor = true; + cargoHash = "sha256-GpV7F0TQyIRowY8LqLTVuwJcRYyyu055+g7BmxT4TMQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index 739b284d3734..77537ec0adbd 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/pkgs/tools/text/igrep/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZZhzBGLpzd9+rok+S/ypKpWXVzXaA1CnviC7LfgP/CU="; }; - cargoHash = "sha256-raSz/+u7P04qHmvdfYoWKOKtNtaFlgmT8Nw0ImhCMkU="; + useFetchCargoVendor = true; + cargoHash = "sha256-NZN9pB9McZkTlpGgAbxi8bwn+aRiPMymGmBLYBc6bmw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/text/languagetool-rust/default.nix b/pkgs/tools/text/languagetool-rust/default.nix index 5cca7a529beb..13f049648973 100644 --- a/pkgs/tools/text/languagetool-rust/default.nix +++ b/pkgs/tools/text/languagetool-rust/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YsVK72q+A9T00u9bXIUfGDhwQl5kiLMec6onbp9YKkg="; }; - cargoHash = "sha256-Yit6zWWEcH5LXpcvy9EXUvRNz+JsyW10fauSNBf1BoU="; + useFetchCargoVendor = true; + cargoHash = "sha256-R2CjzljguyzosVlq5k96/g0jHiq0/oRiTAjVzjy6xTY="; buildFeatures = [ "full" ]; diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index fcd172491098..e38687e819b6 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GNQIOjgHCt3XPCzF0RjV9YStI8psLdHhTPuTkdgx8vA="; }; - cargoHash = "sha256-CG4WvAFDqtRUjF4kJ29363F6jWRChIXgT5i6ozwV4pw="; + useFetchCargoVendor = true; + cargoHash = "sha256-GbXLlWHbLL7HbyuX223S/o1/+LwbK8FjL7lnEgVVn00="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-epub/default.nix b/pkgs/tools/text/mdbook-epub/default.nix index ca662eaefcb7..c6731a27fade 100644 --- a/pkgs/tools/text/mdbook-epub/default.nix +++ b/pkgs/tools/text/mdbook-epub/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { hash = "sha256-ddWClkeGabvqteVUtuwy4pWZGnarrKrIbuPEe62m6es="; }; - cargoHash = "sha256-cJS9HgbnLYXkZrAyGNEeu6q+znH+7cj8CUGIbTCbB9Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-3R81PJCOFc22QDHH2BqGB9jjvEcMc1axoySSJLJD3wI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/text/mdbook-footnote/default.nix b/pkgs/tools/text/mdbook-footnote/default.nix index ea66ed24a3be..0559edf0488a 100644 --- a/pkgs/tools/text/mdbook-footnote/default.nix +++ b/pkgs/tools/text/mdbook-footnote/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WUMgm1hwsU9BeheLfb8Di0AfvVQ6j92kXxH2SyG3ses="; }; - cargoHash = "sha256-Ig+uVCO5oHIkkvFsKiBiUFzjUgH/Pydn4MVJHb2wKGc="; + useFetchCargoVendor = true; + cargoHash = "sha256-3tuejWMZlEAOgnBKEqZP2a72a8QP1yamfE/g2BJDEbg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index bf3c4a643b7c..260dcccd3e01 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O2hFv/9pqrs8cSDvHLAUnXx4mX6TN8hvPLroWgoCgwE="; }; - cargoHash = "sha256-ONZZ6D0Ien0wakjhy6P2lhx0AnRLH0xpuYon+N9Crg8="; + useFetchCargoVendor = true; + cargoHash = "sha256-EoWsjuvvWeAI3OnVRJQT2hwoYq4BNqqvitH9LT0XGnA="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix index 4ddd1613df0f..8afaa0b1b00d 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hqz2zUdDZjbe3nq4YpL68XJ64qpbjANag9S2uAM5nXg="; }; - cargoHash = "sha256-KrvrmodsoAvNxjJqdKTXva32dtlKINPGHwfxcK1VDwY="; + useFetchCargoVendor = true; + cargoHash = "sha256-yb4EWSl/mQp5q9fmYUq6UEdsknqfUx//BZ8IK/BVs7g="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices diff --git a/pkgs/tools/text/mdbook-pdf/default.nix b/pkgs/tools/text/mdbook-pdf/default.nix index 03a3823e3cb7..2abc8e53a1a2 100644 --- a/pkgs/tools/text/mdbook-pdf/default.nix +++ b/pkgs/tools/text/mdbook-pdf/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zRoO84ij7zF1I8ijXS/oApMKfS3e04+5/CgahAemqCA="; }; - cargoHash = "sha256-eay3tl4edeM05D+0iIu8Zw4L1N2Bk1csLo0AwNdyCdA="; + useFetchCargoVendor = true; + cargoHash = "sha256-cZNTfhrpuEoAXviog/qq2PWii/wycxxq5l/vFHW1f6k="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/text/mdbook-plantuml/default.nix b/pkgs/tools/text/mdbook-plantuml/default.nix index 01640999080f..8e844b8f1095 100644 --- a/pkgs/tools/text/mdbook-plantuml/default.nix +++ b/pkgs/tools/text/mdbook-plantuml/default.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-3HlnhRexfFcAuk1RoatWORMJvYRrnoEft5ys6j3t9S0="; + useFetchCargoVendor = true; + cargoHash = "sha256-JI5UdLb2ZcPcAIvprVdpQRGMzc0Qu0awIUpMjNyaAPQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/text/mdbook-toc/default.nix b/pkgs/tools/text/mdbook-toc/default.nix index d56e23bf9543..5f5c1b289899 100644 --- a/pkgs/tools/text/mdbook-toc/default.nix +++ b/pkgs/tools/text/mdbook-toc/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-OFNp+kFDafYbzqb7xfPTO885cAjgWfNeDvUPDKq5GJU="; }; - cargoHash = "sha256-95W0gERjwL9r0+DOgxQu+sjSFSThWeShLAqlDQiGxFw="; + useFetchCargoVendor = true; + cargoHash = "sha256-0x/x3TRwRinQ/uLCQoRrJOE/mc2snkL/MCz76nQqb5E="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index a77c3ffb0857..4133f5cecda2 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-TvGGu9mSKT5y4b2JuoUUxsK8J7W/bMa9MOe1y0Idy7g="; + useFetchCargoVendor = true; + cargoHash = "sha256-8A0RLbFkh3fruZAbjJzipQvuFLchqIRovPcc6MSKdOc="; nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. diff --git a/pkgs/tools/text/pinyin-tool/default.nix b/pkgs/tools/text/pinyin-tool/default.nix index 54520d5d317e..05dd8c2305c7 100644 --- a/pkgs/tools/text/pinyin-tool/default.nix +++ b/pkgs/tools/text/pinyin-tool/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1gwqwxlvdrm4sdyqkvpvvfi6jh6qqn6qybn0z66wm06k62f8zj5b"; }; - cargoHash = "sha256-jeRKtKv8Lg/ritl42dMbEQpXaNlCIaHTrw0xtPQitMc="; + useFetchCargoVendor = true; + cargoHash = "sha256-SOeyk2uWCdO99ooQc2L1eXlV77lR4DLBK6PnV6Ur49A="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index 5f7d766089a2..2bade1d3b9ee 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Zvbb9pQpxbJZi0qcDU6f2jEgavl9cA7gIYU7NRXZ9fc="; }; - cargoHash = "sha256-vdq2nEFhvteQEqEZNbSegivvkU6cTxSmZLc6oaxLkwY="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ko6EBASK6olMyp0kDY4wgfpH+5j9vq0dJ74l8K6HPGY="; meta = { description = "Find and replace text in source files"; diff --git a/pkgs/tools/typesetting/tex/texpresso/tectonic.nix b/pkgs/tools/typesetting/tex/texpresso/tectonic.nix index 27eff6e0f662..21f8e73bbd39 100644 --- a/pkgs/tools/typesetting/tex/texpresso/tectonic.nix +++ b/pkgs/tools/typesetting/tex/texpresso/tectonic.nix @@ -14,7 +14,8 @@ tectonic-unwrapped.override (old: { hash = "sha256-RPsXmp+5MF9h+H3wdL1O1hXSRZWjWTY8lXq/dWZIM1g="; fetchSubmodules = true; }; - cargoHash = "sha256-g4iBo8r+QUOcFJ3CI2+HOi4VHxU7jKnIWlJcKx/6r5E="; + useFetchCargoVendor = true; + cargoHash = "sha256-mqhbIv5r/5EDRDfP2BymXv9se2NCKxzRGqNqwqbD9A0="; # binary has a different name, bundled tests won't work doCheck = false; meta.mainProgram = "texpresso-tonic"; diff --git a/pkgs/tools/video/yaydl/default.nix b/pkgs/tools/video/yaydl/default.nix index 1befd6715f16..ebdc76cae1b1 100644 --- a/pkgs/tools/video/yaydl/default.nix +++ b/pkgs/tools/video/yaydl/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-mMV7fnl3tEM22LCTLXoXG9RQhPSQ7DXanSURdoa0+EI="; }; - cargoHash = "sha256-HsRg8SO9c9Fomeb5B+kOW3VDNIG4W+dagEwAoWqONyA="; + useFetchCargoVendor = true; + cargoHash = "sha256-YWJfmC1wrl1MXXbWx2N9y//a7Jn+3rDrUseSBWkctvc="; nativeBuildInputs = [ pkg-config From 4b7e67992cc0edd267853c4f93a36597690cc5f9 Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 23 Jan 2025 14:24:35 +0200 Subject: [PATCH 230/280] swtpm: fix cross build --- pkgs/by-name/sw/swtpm/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sw/swtpm/package.nix b/pkgs/by-name/sw/swtpm/package.nix index 55b82abe0335..94fc2114133f 100644 --- a/pkgs/by-name/sw/swtpm/package.nix +++ b/pkgs/by-name/sw/swtpm/package.nix @@ -74,6 +74,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs tests/* + # Needed for cross-compilation + substituteInPlace configure.ac --replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config' + # Makefile tries to create the directory /var/lib/swtpm-localca, which fails substituteInPlace samples/Makefile.am \ --replace 'install-data-local:' 'do-not-execute:' From c368e3cb07b0d6949085faca436b37e4f002e3ad Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 23 Jan 2025 14:35:41 +0100 Subject: [PATCH 231/280] treewide: migrate to fetchCargoVendor, batch 3 Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. It should be possible to reproduce this diff. To do so, get the list of files changed by this commit, e.g. with git diff --name-only, then run the following two commands, each with that list of files as their standard input: xargs sed -i 's/fetchCargoTarball/fetchCargoVendor/' cut -d / -f 4 | xargs -n 1 nix-update --version=skip This will take a long time. It might be possible to parallelize it using xargs' -P option. I haven't tested it. --- pkgs/by-name/_3/_389-ds-base/package.nix | 4 ++-- pkgs/by-name/am/amberol/package.nix | 4 ++-- pkgs/by-name/as/ashpd-demo/package.nix | 4 ++-- pkgs/by-name/au/audio-sharing/package.nix | 4 ++-- pkgs/by-name/au/authenticator/package.nix | 4 ++-- pkgs/by-name/bc/bcachefs-tools/package.nix | 4 ++-- pkgs/by-name/bu/bustle/package.nix | 4 ++-- pkgs/by-name/ca/cargo-tauri_1/package.nix | 4 ++-- pkgs/by-name/ca/cartero/package.nix | 4 ++-- pkgs/by-name/cc/ccextractor/package.nix | 4 ++-- pkgs/by-name/ch/chance/package.nix | 4 ++-- pkgs/by-name/ch/chromatic/package.nix | 4 ++-- pkgs/by-name/ci/citations/package.nix | 4 ++-- pkgs/by-name/co/contrast/package.nix | 4 ++-- pkgs/by-name/de/delfin/package.nix | 4 ++-- pkgs/by-name/di/diebahn/package.nix | 4 ++-- pkgs/by-name/do/done/package.nix | 4 ++-- pkgs/by-name/em/emblem/package.nix | 4 ++-- pkgs/by-name/en/envision-unwrapped/package.nix | 4 ++-- pkgs/by-name/ey/eyedropper/package.nix | 4 ++-- pkgs/by-name/fo/fontfinder/package.nix | 4 ++-- pkgs/by-name/fo/footage/package.nix | 4 ++-- pkgs/by-name/fr/fragments/package.nix | 4 ++-- pkgs/by-name/fr/fretboard/package.nix | 4 ++-- pkgs/by-name/fu/furtherance/package.nix | 4 ++-- pkgs/by-name/ga/gale/package.nix | 4 ++-- pkgs/by-name/ge/geopard/package.nix | 4 ++-- pkgs/by-name/gg/gg-jj/package.nix | 4 ++-- pkgs/by-name/gl/glide-media-player/package.nix | 4 ++-- pkgs/by-name/gn/gnome-commander/package.nix | 4 ++-- pkgs/by-name/gn/gnome-podcasts/package.nix | 4 ++-- pkgs/by-name/gn/gnome-robots/package.nix | 4 ++-- pkgs/by-name/gn/gnome-solanum/package.nix | 4 ++-- pkgs/by-name/gr/granian/package.nix | 4 ++-- pkgs/by-name/he/health/package.nix | 4 ++-- pkgs/by-name/he/helvum/package.nix | 4 ++-- pkgs/by-name/id/identity/package.nix | 4 ++-- pkgs/by-name/im/impression/package.nix | 4 ++-- pkgs/by-name/in/intiface-central/package.nix | 4 ++-- pkgs/by-name/ip/iplan/package.nix | 4 ++-- pkgs/by-name/jo/jogger/package.nix | 4 ++-- pkgs/by-name/ka/kana/package.nix | 4 ++-- pkgs/by-name/ke/key-rack/package.nix | 4 ++-- pkgs/by-name/ke/keypunch/package.nix | 4 ++-- pkgs/by-name/ki/kime/package.nix | 4 ++-- pkgs/by-name/ko/kooha/package.nix | 4 ++-- pkgs/by-name/li/libkrun/package.nix | 4 ++-- pkgs/by-name/lo/lorem/package.nix | 4 ++-- pkgs/by-name/me/metronome/package.nix | 4 ++-- pkgs/by-name/mo/mousai/package.nix | 4 ++-- pkgs/by-name/mo/mozillavpn/package.nix | 4 ++-- pkgs/by-name/no/notify-client/package.nix | 4 ++-- pkgs/by-name/pa/paleta/package.nix | 4 ++-- pkgs/by-name/pa/papers/package.nix | 4 ++-- pkgs/by-name/pd/pdns-recursor/package.nix | 4 ++-- pkgs/by-name/pi/pika-backup/package.nix | 4 ++-- pkgs/by-name/re/read-it-later/package.nix | 4 ++-- pkgs/by-name/re/resonance/package.nix | 4 ++-- pkgs/by-name/re/resources/package.nix | 4 ++-- pkgs/by-name/ro/rofi-games/package.nix | 4 ++-- pkgs/by-name/ru/rustls-ffi/package.nix | 4 ++-- pkgs/by-name/ru/rutabaga_gfx/package.nix | 4 ++-- pkgs/by-name/sh/share-preview/package.nix | 4 ++-- pkgs/by-name/sh/shortwave/package.nix | 4 ++-- pkgs/by-name/sp/spot/package.nix | 4 ++-- pkgs/by-name/sq/squeekboard/package.nix | 4 ++-- pkgs/by-name/st/stratisd/package.nix | 4 ++-- pkgs/by-name/su/surrealist/package.nix | 4 ++-- pkgs/by-name/sw/swayosd/package.nix | 4 ++-- pkgs/by-name/sw/switcheroo/package.nix | 4 ++-- pkgs/by-name/ta/tailor-gui/package.nix | 4 ++-- pkgs/by-name/ta/taskwarrior3/package.nix | 4 ++-- pkgs/by-name/ta/taterclient-ddnet/package.nix | 4 ++-- pkgs/by-name/te/televido/package.nix | 4 ++-- pkgs/by-name/uu/uutils-coreutils/package.nix | 4 ++-- pkgs/by-name/va/vaults/package.nix | 4 ++-- pkgs/by-name/vi/video-trimmer/package.nix | 4 ++-- pkgs/by-name/vp/vpv/package.nix | 4 ++-- pkgs/by-name/wa/waypipe/package.nix | 4 ++-- pkgs/by-name/we/wealthfolio/package.nix | 4 ++-- pkgs/by-name/wi/wildcard/package.nix | 4 ++-- 81 files changed, 162 insertions(+), 162 deletions(-) diff --git a/pkgs/by-name/_3/_389-ds-base/package.nix b/pkgs/by-name/_3/_389-ds-base/package.nix index a847b0eefb97..6eb041873cd8 100644 --- a/pkgs/by-name/_3/_389-ds-base/package.nix +++ b/pkgs/by-name/_3/_389-ds-base/package.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OPtyeF1D46X6DslP3NewbjVgqPXngWUz943UsTqgWRo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/src"; name = "389-ds-base-${finalAttrs.version}"; - hash = "sha256-xI0T+Riw+6gjBGVYg5SI3GWH7MyAzt5At54fI7PH010="; + hash = "sha256-8A2xnJI22mjupX5FVsvRa5RfWyOE+VLH2aJwBHjDOME="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/am/amberol/package.nix b/pkgs/by-name/am/amberol/package.nix index f19812224e0f..1bb0406a50b2 100644 --- a/pkgs/by-name/am/amberol/package.nix +++ b/pkgs/by-name/am/amberol/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { hash = "sha256-FK0TJFjknEFraY8T+PQ/ABiid36kEYIEhekgyx0y3aI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "amberol-${version}"; - hash = "sha256-9YRd1iOh+l+Jy8eSwJP6pxonEofBkMpFqb+JAAFDbCA="; + hash = "sha256-OsQMiye/sUsnmfx2V49ZUMGS/HQH9m9i5/qvho0jTD8="; }; postPatch = '' diff --git a/pkgs/by-name/as/ashpd-demo/package.nix b/pkgs/by-name/as/ashpd-demo/package.nix index d06352c70581..bcfca11eaa5e 100644 --- a/pkgs/by-name/as/ashpd-demo/package.nix +++ b/pkgs/by-name/as/ashpd-demo/package.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-fIyJEUcyTcjTbBycjuJb99wALQelMT7Zq6PHKcL2F80="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = "${finalAttrs.src}/ashpd-demo"; - hash = "sha256-ldflCBErM9w3eO2DwWfYTrdO7lowZtqfj7Fft6Crl1w="; + hash = "sha256-iluV24uSEHDcYi6pO2HNrKs4ShwFvZ/ryv8ioopaNMI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/audio-sharing/package.nix b/pkgs/by-name/au/audio-sharing/package.nix index 269058a150b2..955d8ad736e3 100644 --- a/pkgs/by-name/au/audio-sharing/package.nix +++ b/pkgs/by-name/au/audio-sharing/package.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yUMiy5DaCPfCmBIGCXpqtvSSmQl5wo6vsLdW7Tt/Wfo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-FfjSttXf6WF2w59CP6L/+BIuuXp2yKPTku7FMvdIHg0="; + hash = "sha256-ePgEAVYXLOHWQXG92Grb9nmenyGj0JkgVy1UDsQF0xw="; }; nativeBuildInputs = diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index 472c604d0ec3..7065de716fa1 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { hash = "sha256-g4+ntBuAEH9sj61CiS5t95nMfCgaWJTgiwRXtwrUTs0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-XNAC1eA+11gAvMRu95huRM+YHdsrg5Sqpzb6F3Rgu5U="; + hash = "sha256-fG0xABK/qzoACFEYhMeDF6Qbucx0FCPpuTuInDFHnu8="; }; preFixup = '' diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index fb5d64a39825..aaefee067a7f 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -70,9 +70,9 @@ stdenv.mkDerivation (finalAttrs: { udev ] ++ lib.optional fuseSupport fuse3; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; - hash = "sha256-rO4AjCnxmHQPk0hxgXK4yxUK5eag/+Q+fRG/BsRi0i0="; + hash = "sha256-xP3V3Cqb+F33I1fVhp7ru/qBl22ww4oZDUCb1OHBiag="; }; makeFlags = [ diff --git a/pkgs/by-name/bu/bustle/package.nix b/pkgs/by-name/bu/bustle/package.nix index 3d783eeb97b8..95fc7553949b 100644 --- a/pkgs/by-name/bu/bustle/package.nix +++ b/pkgs/by-name/bu/bustle/package.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5ZZiRD64OOMtTNxI0uvilGM22rsJv7vU3yPDY8ROrxU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-tUSGldWeCLEHi35bDLMnfjnfofF2Qse5uBu2mDGJrsE="; + hash = "sha256-XCKKzgSqTGF9WoaYnNtXB7e8BvtElmAfKH6s/7h8cGs="; }; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index 3ec0a69ddcbd..c8f7ee7ba7b7 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -26,14 +26,14 @@ cargo-tauri.overrideAttrs ( # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${newAttrs.src.name}/tooling/cli"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (newAttrs) pname version src sourceRoot ; - hash = "sha256-OIXC4kwGIemIL8KaqK5SUDZZrOX3PX0w3h9bNiM/pCw="; + hash = "sha256-t5sR02qC06H7A2vukwyZYKA2XMVUzJrgIOYuNSf42mE="; }; buildInputs = diff --git a/pkgs/by-name/ca/cartero/package.nix b/pkgs/by-name/ca/cartero/package.nix index e73bf605cb88..6b09665e97a8 100644 --- a/pkgs/by-name/ca/cartero/package.nix +++ b/pkgs/by-name/ca/cartero/package.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-fXFrxaqHgf7XWX1guySsaP6PxmAPwVxoPaEOTpz4OqY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-hbByC2r48+Zm/On99m9VWj4TJi6aeM/km2vcfvMMz38="; + hash = "sha256-+HygFNqW2CDksFTX9qdac6615zxCav0/sNLbICwTaKw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix index 293784acd422..b9998dd6e369 100644 --- a/pkgs/by-name/cc/ccextractor/package.nix +++ b/pkgs/by-name/cc/ccextractor/package.nix @@ -48,12 +48,12 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "src/rust"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; patches = [ ./use-rsmpeg-0.15.patch ]; patchFlags = [ "-p3" ]; - hash = "sha256-jh8hHKAad+tCJGwuGdoJp/TMm/IsMrZmz8aag9lj0BA="; + hash = "sha256-7v3gQghByUDWZLJRRGa/7X2ivUumirq6BbexNQcCXCk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chance/package.nix b/pkgs/by-name/ch/chance/package.nix index 872670789be2..748bce5deb08 100644 --- a/pkgs/by-name/ch/chance/package.nix +++ b/pkgs/by-name/ch/chance/package.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-25+/TvTba/QF7+QE8+O7u4yc9BNi0pcZeNj11dGkEfg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-Jy/Tc5Rmqh6NIcLzGSIxQg1dLiAkw+xbrdo6qfqrRSg="; + hash = "sha256-ObT3l/Exk6UzUGmzCed7mJ7hVzg8CsQIT3fe1RIUfIM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chromatic/package.nix b/pkgs/by-name/ch/chromatic/package.nix index 32a518b36ce9..d5f3c194133c 100644 --- a/pkgs/by-name/ch/chromatic/package.nix +++ b/pkgs/by-name/ch/chromatic/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { ./rustc_serialize_update.patch ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; patches = [ ./rustc_serialize_update.patch ]; - hash = "sha256-1Zb0J2tO/gIifDymmoXxZf6RNV8foE9QiQqZcrHrWzE="; + hash = "sha256-9fdOOkxs4L0sYZIRT9wbgp169mQc2IyFRZlAcOHcOcg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/citations/package.nix b/pkgs/by-name/ci/citations/package.nix index b030947b0238..e18b80bf04aa 100644 --- a/pkgs/by-name/ci/citations/package.nix +++ b/pkgs/by-name/ci/citations/package.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-WYy6cyPmyWL/11yHf+dRbcZGBfvVfELeTwKvpJMu5ns="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; - hash = "sha256-SmKt3oPzeJRAFjgZvJubNCTsjhqCrGZfE1LfDQ8AxZA="; + hash = "sha256-bqZZIA7sE0viAhI5GUFIVCXTkK+U9aWPvCPCug5SR94="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/contrast/package.nix b/pkgs/by-name/co/contrast/package.nix index adb038462893..bc9839926ac8 100644 --- a/pkgs/by-name/co/contrast/package.nix +++ b/pkgs/by-name/co/contrast/package.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { hash = "sha256-8A1qX1H0cET5AUvMoHC1/VyIQiaTysEY5RJRrVYvGng="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-Z5Gn1J/ziDlSowUk3HYLdx1PDg0WlQJQDjto2xYYK44="; + hash = "sha256-Nj5MkYDeYUzgqegCbPt/XofSCw8ULFXAD7XHNecPznc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/delfin/package.nix b/pkgs/by-name/de/delfin/package.nix index 05ab8c25203d..3f9353585d2a 100644 --- a/pkgs/by-name/de/delfin/package.nix +++ b/pkgs/by-name/de/delfin/package.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { hash = "sha256-2ussvPXMX4wGE9N+Zh8KYIjbbqEKkPaNymN1Oqj8w8U="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-JEHiLdEU9QkCxWPoTFVn2c6UDqnRbTG1WPetdsW/N8g="; + hash = "sha256-zZc2+0oskptpWZE4fyVcR4QHxqzpj71GXMXNXMK4an0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix index b658d952e376..317500b7fb0e 100644 --- a/pkgs/by-name/di/diebahn/package.nix +++ b/pkgs/by-name/di/diebahn/package.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { hash = "sha256-jk2Pn/kqjMx5reMkIL8nLMWMZylwdoVq4FmnzaohnjU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-UE+N6cvcWVJTxE8m4hHmBLyd5RBecDQy1kR4zDzPyf0="; + hash = "sha256-WiFW+xz5kxFKe9y8vHaFD9xW7f9iHc9hyCBWW4uMquU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/done/package.nix b/pkgs/by-name/do/done/package.nix index 7c44157b21d8..7b4398e1e2bb 100644 --- a/pkgs/by-name/do/done/package.nix +++ b/pkgs/by-name/do/done/package.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { hash = "sha256-SbeP7PnJd7jjdXa9uDIAlMAJLOrYHqNP5p9gQclb6RU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-YJJGQR1tkK5z7vQQgkd8xPSqYhtiZIN+s9Xnwjn0z5A="; + hash = "sha256-yEpaQa9hKOq0k9MurihbFM4tDB//TPCJdOgKA9tyqVc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/em/emblem/package.nix b/pkgs/by-name/em/emblem/package.nix index 439d8368a3c3..d5687cfd4469 100644 --- a/pkgs/by-name/em/emblem/package.nix +++ b/pkgs/by-name/em/emblem/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-pW+2kQANZ9M1f0jMoBqCxMjLCu0xAnuEE2EdzDq4ZCE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-2mxDXDGQA2YB+gnGwy6VSZP/RRBKg0RiR1GlXIkio9E="; + hash = "sha256-j9PrnXt0GyyfCKmcq1zYmDNlrvogtK5n316MIC+z+w0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index de64e6eb852e..2eec7d035295 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -48,13 +48,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version; # TODO: Use srcOnly instead src = applyPatches { inherit (finalAttrs) src patches; }; - hash = "sha256-zWaw6K2H67PEmFISDNce5jDUXKV39qu35SO+Ai0DP90="; + hash = "sha256-O3+urY2FlnHfxoJLn4iehnVWf1Y0uATEteyQVnZLxTQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ey/eyedropper/package.nix b/pkgs/by-name/ey/eyedropper/package.nix index 5c30bd814332..a5631ff046ef 100644 --- a/pkgs/by-name/ey/eyedropper/package.nix +++ b/pkgs/by-name/ey/eyedropper/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { hash = "sha256-FyGj0180Wn8iIDTdDqnNEvFYegwdWCsCq+hmyTTUIo4="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-jXo7Aq+pXWySe6MyH9GCTQVNwbboER7RwJe6Asqbxxc="; + hash = "sha256-nYmH7Nu43TDJKvwfSaBKSihD0acLPmIUQpQM6kV4CAk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/fontfinder/package.nix b/pkgs/by-name/fo/fontfinder/package.nix index b421bf00876d..bde673c84a56 100644 --- a/pkgs/by-name/fo/fontfinder/package.nix +++ b/pkgs/by-name/fo/fontfinder/package.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { hash = "sha256-C4KqEdqToVnPXFPWvNkl/md9L2W4NxRd5jvZ4E7CtfA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-PXO8E41KHPNOR527gs2vM3J9JMG0PWi8Eg/13UCkr3U="; + hash = "sha256-g6PRGHrkHA0JTekKaQs+8mtyOCj99m0zPbgP8AnP7GU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/footage/package.nix b/pkgs/by-name/fo/footage/package.nix index 595603530e86..bf636a7e2978 100644 --- a/pkgs/by-name/fo/footage/package.nix +++ b/pkgs/by-name/fo/footage/package.nix @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { hash = "sha256-VEL96JrJ5eJEoX2miiB4dqGUXizNlYWCUZkkYkh09B8="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-RWMNeMrctIlcA4MiRx9t7OfzKeHtw3phrYsYFZH7z4c="; + hash = "sha256-H8sv7faI/qbmcP7ir++/vIpN+cvRQ254rXmAvGyjdsY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/fragments/package.nix b/pkgs/by-name/fr/fragments/package.nix index 2107dd0c6631..19bb0a8c9dda 100644 --- a/pkgs/by-name/fr/fragments/package.nix +++ b/pkgs/by-name/fr/fragments/package.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { hash = "sha256-lTOO6ZQWImaFqYZ3qerYYHWj/eOLYU/2k2Wh/ju9Njw="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-7TIjd1ewazJGY8uG6f1B97ol+7+uLjnZVGC2/2DlUdQ="; + hash = "sha256-i77LHbaAURxWrEpuR40jRkUGPk8wZR+q3DB+rzH3sEc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix index d9debb71f9f6..ba4ed09bac00 100644 --- a/pkgs/by-name/fr/fretboard/package.nix +++ b/pkgs/by-name/fr/fretboard/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8xINlVhWgg73DrRi8S5rhNc1sbG4DbWOsiEBjU8NSXo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-LSL7VvRgA8MaFXn/vi5Zf1sY4cqv0a9PNnZ3JlDNIaE="; + hash = "sha256-wYDlJ5n878Apv+ywnHnDy1Rgn+WJtcuePsGYEWSNvs4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fu/furtherance/package.nix b/pkgs/by-name/fu/furtherance/package.nix index a983b914cae6..a9445a231233 100644 --- a/pkgs/by-name/fu/furtherance/package.nix +++ b/pkgs/by-name/fu/furtherance/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TxYARpCqqjjwinoRU2Wjihp+FYIvcI0YCGlOuumX6To="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-VGBxBHs/kqW0mvOiz0UQRg0duDmW8ee9cSh6EOT9aaY="; + hash = "sha256-SFp9YCmneOll2pItWmg2b2jrpRqPnvV9vwz4mjjvwM4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index e0b98cfb0c8a..af74f730976a 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -39,14 +39,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-xKg/ABUdtylFpT3EisXVvyv38++KjucrZ+s3/fFjzmM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src cargoRoot ; - hash = "sha256-xaqNps2AimGWKSwtnfkP3RkLgTNlkaAUtOgDWpB2yEg="; + hash = "sha256-OocLkYAdmnAwvojzywNlg6BirkItoopX36aDYfqeeTA="; }; cargoRoot = "src-tauri"; diff --git a/pkgs/by-name/ge/geopard/package.nix b/pkgs/by-name/ge/geopard/package.nix index a844858f5078..edd037894a11 100644 --- a/pkgs/by-name/ge/geopard/package.nix +++ b/pkgs/by-name/ge/geopard/package.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-etx8YPEFGSNyiSLpTNIXTZZiLSgAntQsM93On7dPGI0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-YVbaXGGwQaqjUkA47ryW1VgJpZTx5ApRGdCcB5aA71M="; + hash = "sha256-FHYWpMmJvcHuAHr9fFKl1qIhJb32NJEA/0j3R6/mVgQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix index 7372c8236c3b..2ac88766f92a 100644 --- a/pkgs/by-name/gg/gg-jj/package.nix +++ b/pkgs/by-name/gg/gg-jj/package.nix @@ -36,10 +36,10 @@ stdenv.mkDerivation (finalAttrs: { buildAndTestSubdir = "src-tauri"; # FIXME: Switch back to cargoHash when https://github.com/NixOS/nixpkgs/issues/356811 is fixed - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-Lr/0GkWHvfDy/leRLxisuTzGPZYFo2beHq9UCl6XlDo="; + hash = "sha256-IyU8dqtQbKcoymTOP01givB1968MUNas2znqsdbcqdw="; nativeBuildInputs = [ yq ]; diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix index 41125d042729..3df8b59ba5a4 100644 --- a/pkgs/by-name/gl/glide-media-player/package.nix +++ b/pkgs/by-name/gl/glide-media-player/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-gmBXUj6LxC7VDH/ni8neYivysagqcbI/UCUq9Ly3D24="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-u41H746/nPX2PmpyweUp4Y9k+XIruazgMdU6B4ig708="; + hash = "sha256-5cohhm8/QP+vYzVf8iz3hLtu0ej7lQiHpDAC9I52+ME="; }; postPatch = '' diff --git a/pkgs/by-name/gn/gnome-commander/package.nix b/pkgs/by-name/gn/gnome-commander/package.nix index 4de7e5f1e051..4504abf84c3b 100644 --- a/pkgs/by-name/gn/gnome-commander/package.nix +++ b/pkgs/by-name/gn/gnome-commander/package.nix @@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: { '/share/gsettings-schemas/${finalAttrs.finalPackage.name}/glib-2.0/schemas' ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-Nx/e2H9NxCTj62xVDlKTpPdjlxAx2YAcQJh1kHByrd4="; + hash = "sha256-dOd/4n8G/zEsF0ClqhI2QBLosEz3uyzC9q5sHDVWAx4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-podcasts/package.nix b/pkgs/by-name/gn/gnome-podcasts/package.nix index 94504c6e2324..bc69273c4869 100644 --- a/pkgs/by-name/gn/gnome-podcasts/package.nix +++ b/pkgs/by-name/gn/gnome-podcasts/package.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { hash = "sha256-KCjHT/4AeJ+RXCtawkhs6f4D8NCJotYIPk3tGr5YG9M="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-XTfKqKs7874ak7Lzscxw8E2qcnJOWMZaaol8TpIB6Vw="; + hash = "sha256-L9/PCYanv8AgxD/fkEsNXQA1Zyz2+ia88lVahg9IOdA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-robots/package.nix b/pkgs/by-name/gn/gnome-robots/package.nix index 72b8725d3da6..b34f8a5c8c0b 100644 --- a/pkgs/by-name/gn/gnome-robots/package.nix +++ b/pkgs/by-name/gn/gnome-robots/package.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-K4BQcFrIPpOL56iREyYB62XHk/IJzX6RDGzWQphzBHg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "gnome-robots-${finalAttrs.version}"; - hash = "sha256-rn/rs0D2qKDYf8oxpegQalPQIVuT8rSrHTzeZqWGn44="; + hash = "sha256-7kwjpZJqAqqKlt6mOFyjaaxZ1Tr2WuhE72jwjCZpX9E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-solanum/package.nix b/pkgs/by-name/gn/gnome-solanum/package.nix index 2b22d1bf2d43..b23b4c3dda2d 100644 --- a/pkgs/by-name/gn/gnome-solanum/package.nix +++ b/pkgs/by-name/gn/gnome-solanum/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { hash = "sha256-Xf/b/9o6zHF1hjHSyAXb90ySoBj+DMMe31e6RfF8C4Y="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-POvKpwzi+bkEkfSDhi/vjs/ey+A2vNN5ta4Q7Ma/RBQ="; + hash = "sha256-jtMTW9tIf0UGbE9bJU31maub+o0agf0pDRO4s9QReyc="; }; postPatch = '' diff --git a/pkgs/by-name/gr/granian/package.nix b/pkgs/by-name/gr/granian/package.nix index c5884fdce8b0..4ed069e3a31c 100644 --- a/pkgs/by-name/gr/granian/package.nix +++ b/pkgs/by-name/gr/granian/package.nix @@ -18,10 +18,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-OjyDwfp0d779oFQ7wUdR1eRPP35kcJa3wIdcYGrGGME="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-NiDGVQGKo+aku1is8OpRavuSalxLc5XfLai0XdtxUMA="; + hash = "sha256-jAjHvVyFhGGE/OwfusUE/GdrNrEgvh48lmC5tla4lhI="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/by-name/he/health/package.nix b/pkgs/by-name/he/health/package.nix index e87cda81e63f..6c9c1810f468 100644 --- a/pkgs/by-name/he/health/package.nix +++ b/pkgs/by-name/he/health/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { hash = "sha256-PrNPprSS98yN8b8yw2G6hzTSaoE65VbsM3q7FVB4mds="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-8fa3fa+sFi5H+49B5sr2vYPkp9C9s6CcE0zv4xB8gww="; + hash = "sha256-eR1ZGtTZQNhofFUEjI7IX16sMKPJmAl7aIFfPJukecg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/helvum/package.nix b/pkgs/by-name/he/helvum/package.nix index 9ba438c3df1f..5ebf326c7b09 100644 --- a/pkgs/by-name/he/helvum/package.nix +++ b/pkgs/by-name/he/helvum/package.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { hash = "sha256-9vlzLPpyZ9qtCEbCDvYhWDcV+8T63ukdos1l2U6fD+E="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-Xebm3XlsO6kBoMnxJsOk/3SO7avVoaGqi2CVWBRzr88="; + hash = "sha256-rwhhbEaUg7IiszmJUFh4vQV7cYyyh3tqr1z4QgmwIDY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix index 0965765ec6b7..89eb8fc44aa3 100644 --- a/pkgs/by-name/id/identity/package.nix +++ b/pkgs/by-name/id/identity/package.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-h8/mWGuosBiQRpoW8rINJht/7UBVEnUnTKY5HBCAyw4="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-oO7l4zVKR93fFLqkY67DfzrAA9kUN06ov9ogwDuaVlE="; + hash = "sha256-YkbhZQUpe8ffBpHcYl7wjFgs3krAXlvHgcBdP/6uvek="; }; strictDeps = true; diff --git a/pkgs/by-name/im/impression/package.nix b/pkgs/by-name/im/impression/package.nix index 22b359200ff3..edc1963095d5 100644 --- a/pkgs/by-name/im/impression/package.nix +++ b/pkgs/by-name/im/impression/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-F2ZyATDKnUgEOAI++54fR6coJOr9rtyGm5TzsKzkDmg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-H4x7D25UzDdAEad7QEsZZGLXhfiUupm3mTrNho+ShFo="; + hash = "sha256-mQyGQXEFmMkTvkZcniws/11u1RqnsxgNi9dvYn1Mx0o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 26da97f6c643..f79235ba55f0 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -25,11 +25,11 @@ flutterPackages.stable.buildFlutterApplication rec { pubspecLock = lib.importJSON ./pubspec.lock.json; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "${pname}-${version}-cargo-deps"; inherit src; sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; - hash = "sha256-S3Yy0IIMiRUUpFNlLvS1PGwpvxePMB1sO5M6mpm1OgY="; + hash = "sha256-1j1maTrR7V/Tlu7uimTJuoEtxhn5Hn0VmR0GnJuKIoo="; }; cargoRoot = "intiface-engine-flutter-bridge"; diff --git a/pkgs/by-name/ip/iplan/package.nix b/pkgs/by-name/ip/iplan/package.nix index 018ba38d80ee..9bce3b9683bc 100644 --- a/pkgs/by-name/ip/iplan/package.nix +++ b/pkgs/by-name/ip/iplan/package.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { hash = "sha256-BIoxaE8c3HmvPjgj4wcZK9YFTZ0wr9338AIdYEoAiqs="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-p8ETWWvjtP9f/lc347ORPqTai5p/TWQCCMRe+c0FyFk="; + hash = "sha256-ATEm7RYfW9nYtTDAx580tvokVUIS7BL9mA65aEeJJvk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/jo/jogger/package.nix b/pkgs/by-name/jo/jogger/package.nix index d4d4dbf67317..68032948b103 100644 --- a/pkgs/by-name/jo/jogger/package.nix +++ b/pkgs/by-name/jo/jogger/package.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-bju9XXMT6HRHG9QViO+FQCYQ+llrC+GP/AlIha0mxkM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-YCLIxKl4QCmqHx/WXwxpqOqIMx1Ab16QyAi+j542eoY="; + hash = "sha256-k4nUtFdwCWa8flSkOEQe7UqorpYPCGrcXHTvVOqoAQI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ka/kana/package.nix b/pkgs/by-name/ka/kana/package.nix index 78902b4c2fca..ba8cf79ef86a 100644 --- a/pkgs/by-name/ka/kana/package.nix +++ b/pkgs/by-name/ka/kana/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-/Ri723ub8LMlhbPObC83bay63JuWIQpgxAT5UUYuwZI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "kana-${version}"; - hash = "sha256-Z7DpPe8/Tt8AcLjCwKbwzQTsLe6YvWBCG7DlDkkklew="; + hash = "sha256-3ODkAstBZQE3eqGmRUdm3xyCoBXV41hK4ndxeDK8+Yc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/key-rack/package.nix b/pkgs/by-name/ke/key-rack/package.nix index dcb5ac1c82ff..2f5b9bc356c6 100644 --- a/pkgs/by-name/ke/key-rack/package.nix +++ b/pkgs/by-name/ke/key-rack/package.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs --build build-aux/{checks.sh,read-manifest.py} ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-wCJTm0W+g3+O1t1fR4maqJoxpPM0NeJG7d54MMAH33c="; + hash = "sha256-iV9ILi3/Uqi8lDHh1Uf2caz6Kc129CDThnqTN9VfUHc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix index ed8f60a0b84f..f87e343aa4e4 100644 --- a/pkgs/by-name/ke/keypunch/package.nix +++ b/pkgs/by-name/ke/keypunch/package.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-C0WD8vBPlKvCJHVJHSfEbMIxNARoRrCn7PNebJ0rkoI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-RufJy5mHuirAO056p5/w63jw5h00E41t+H4VQP3kPks="; + hash = "sha256-SQ1BI9BuUfUvafsBnC1P5YQ8qVAaer6ywuRQkfS/V1w="; }; strictDeps = true; diff --git a/pkgs/by-name/ki/kime/package.nix b/pkgs/by-name/ki/kime/package.nix index 2b8e2951571b..b0debbb29f02 100644 --- a/pkgs/by-name/ki/kime/package.nix +++ b/pkgs/by-name/ki/kime/package.nix @@ -45,9 +45,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-apQkxAUve7+2h9XACZZgroqBK1sCUYMNfsX/4nEnCPA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-2MG6xigiKdvQX8PR457d6AXswTRPRJBPERvZqemjv24="; + hash = "sha256-U3SOHZvgyPwv98wY41dnwSCUg+DTkb/LY6woffrAli8="; }; # Replace autostart path diff --git a/pkgs/by-name/ko/kooha/package.nix b/pkgs/by-name/ko/kooha/package.nix index 83ac277aabd4..c466270cac12 100644 --- a/pkgs/by-name/ko/kooha/package.nix +++ b/pkgs/by-name/ko/kooha/package.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { hash = "sha256-Z+PMSV6fipfHBrqGS24SOgGJS173Vct12sVzCGZL0IA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-m5y/VfjTJgK+/ZjsMo/9zPVxcV3kuwXb+HNdXR6hkV4="; + hash = "sha256-3LYoNQquYbyiEd9ZXRr4UPIcl3gultsBYWCWaCYshwQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix index 692b989f11c9..71ff653b002e 100644 --- a/pkgs/by-name/li/libkrun/package.nix +++ b/pkgs/by-name/li/libkrun/package.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-oa3M/HL0hWoXlqY0Wxy9jf6hIvMqevtpuYiTCrS1Q74="; + hash = "sha256-X1NPZQaXFBw9IKD2DbBCPug0WDjv8XnpefbA2RNJgFU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lo/lorem/package.nix b/pkgs/by-name/lo/lorem/package.nix index 0ac17840129b..f8e1da98c726 100644 --- a/pkgs/by-name/lo/lorem/package.nix +++ b/pkgs/by-name/lo/lorem/package.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-6+kDKKK1bkIOZlqzKWpzpjAS5o7bkbVFITMZVmJijuU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-nzP2Jp9l1QgL7Wk9SWlsSVNaeVe3t48MmeX7Xuz+PKM="; + hash = "sha256-l6vd521DmV019Yu5O1Kf5RKan2ROCBHlPiEDhf34Grc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/metronome/package.nix b/pkgs/by-name/me/metronome/package.nix index 9c78def44931..c2010ce3a10b 100644 --- a/pkgs/by-name/me/metronome/package.nix +++ b/pkgs/by-name/me/metronome/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-Sn2Ua/XxPnJjcQvWeOPkphl+BE7/BdOrUIpf+tLt20U="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "metronome-${version}"; - hash = "sha256-HYO/IY5yGW8JLBxD/SZz16GFnwvv77kFl/x+QXhV+V0="; + hash = "sha256-T/x5LpODpKWGA40W1je6jw1DS9attVUK4ZjAnRAyf6k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mousai/package.nix b/pkgs/by-name/mo/mousai/package.nix index 5bbee8e4ac02..3a45a524d8e9 100644 --- a/pkgs/by-name/mo/mousai/package.nix +++ b/pkgs/by-name/mo/mousai/package.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { hash = "sha256-lib2rPUTKudzbZQIGZxxxzvWNlbLkLdWtb9h7+C05QE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-KrOvPeT8zhxSTNDRJPrAbUnSgnIQegRmNe5TEgGE8+s="; + hash = "sha256-59mxTtXQaGiHHbS4vOtwm5py/1BWwaSf+CBdKEtUpno="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index 8a5f309fb7fb..faa881f229a5 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -56,9 +56,9 @@ stdenv.mkDerivation (finalAttrs: { vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-ryJFvnJIiDKf2EqlzHj79hSPYrD+3UtZ5lT/QeFv6V0="; + hash = "sha256-EUD6eAhe5Qjom60EZ9LTRmBsfDyIJV1Kx7PBU4ikR0w="; }; buildInputs = [ diff --git a/pkgs/by-name/no/notify-client/package.nix b/pkgs/by-name/no/notify-client/package.nix index 2b034f8f13c9..8e0a22416530 100644 --- a/pkgs/by-name/no/notify-client/package.nix +++ b/pkgs/by-name/no/notify-client/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { hash = "sha256-0p/XIGaawreGHbMRoHNmUEIxgwEgigtrubeJpndHsug="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-uZRAGnydPGwyzAyHIyY+UlT42m+GyEasM0cSa8Bp9Hs="; + hash = "sha256-hnv4XXsx/kmhH4YUTdTvvxxjbguHBx3TnUKacGwnCTw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/paleta/package.nix b/pkgs/by-name/pa/paleta/package.nix index e9a26b9274e5..072acba9cb02 100644 --- a/pkgs/by-name/pa/paleta/package.nix +++ b/pkgs/by-name/pa/paleta/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-c+X49bMywstRg7cSAbbpG/vd8OUB7RhdQVRumTIBDDk="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-2/ZfKvlvAY4pfUU3F9pEw+OR5oRSsSAAi3/W5x4zVs0="; + hash = "sha256-RuzqU06iyK+IN7aO+Lq/IaRLh2oFpWM1rz69Koiicgg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index aab00d5121ec..aa877d8d8d5e 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -64,14 +64,14 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "shell-rs"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src pname version cargoRoot ; - hash = "sha256-/5IySNEUkwiQezLx4n4jlPJdqJhlcgt5bXIelUFftZI="; + hash = "sha256-66pOdZxgzbvXkvF07rNvWtcF/dJ2+RuS24IeI/VWykE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix index fc4ed4524681..bba6c4f4d185 100644 --- a/pkgs/by-name/pd/pdns-recursor/package.nix +++ b/pkgs/by-name/pd/pdns-recursor/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-s6N+uyAoWrmsu7DhNw5iO7OY7TCH8OZ48j/6OwBjmD0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "pdns-recursor-${finalAttrs.version}/settings/rust"; - hash = "sha256-1CHhnW8s4AA06HAgW+A/mx1jGTynj4CvIc/I7n0h+VY"; + hash = "sha256-/fxFqs5lDzOhatc6KBc7Zwsq3A7N5AOanGOebttr1l8="; }; cargoRoot = "settings/rust"; diff --git a/pkgs/by-name/pi/pika-backup/package.nix b/pkgs/by-name/pi/pika-backup/package.nix index 760fdc069c24..efe3b973bd06 100644 --- a/pkgs/by-name/pi/pika-backup/package.nix +++ b/pkgs/by-name/pi/pika-backup/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { hash = "sha256-DtLGD7+Ydj2fvEHU+bDQDMC/E/9VgrlVNMCG6OlPmfg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-8nFkc77FiLxMA1hMm8k5VB84l+pQeL0JSzYDytXrNUE="; + hash = "sha256-1JFXSVs9HPPzh+IjH4RGugrZEifPVcQho9B3hLSTL6s="; }; patches = [ diff --git a/pkgs/by-name/re/read-it-later/package.nix b/pkgs/by-name/re/read-it-later/package.nix index 5c8e417841b1..2f0d2a3b3ba6 100644 --- a/pkgs/by-name/re/read-it-later/package.nix +++ b/pkgs/by-name/re/read-it-later/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { hash = "sha256-A8u1fecJAsVlordgZmUJt/KZWxx6EWMhfdayKWHTTFY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-wK7cegcjiu8i1Grey6ELoqAn2BrvElDXlCwafTLuFv0="; + hash = "sha256-DgqFdihMVKWMdbGEmyGH9yXkC9Ywmh7FcmFtLBCJeDc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/resonance/package.nix b/pkgs/by-name/re/resonance/package.nix index 4e642c2d736c..e2b89e9027e3 100644 --- a/pkgs/by-name/re/resonance/package.nix +++ b/pkgs/by-name/re/resonance/package.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-DgNUjb8+2WTw91OGgFf97YL6lnODtkftYAP/c05RUPI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; - hash = "sha256-/v3OokClOk95GOzidBHRkUG7kjHQm35yPeC1n3PzcyM="; + hash = "sha256-g0gNgTw9zpC9sWAKy/jFNGVtPH/6a84v6r6pRuS0NpU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix index 602e9d081157..791e11b8dfd8 100644 --- a/pkgs/by-name/re/resources/package.nix +++ b/pkgs/by-name/re/resources/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-SHawaH09+mDovFiznZ+ZkUgUbv5tQGcXBgUGrdetOcA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "resources-${finalAttrs.version}"; - hash = "sha256-tUD+gx9nQiGWKKRPcR7OHbPvU2j1dQjYck7FF9vYqSQ="; + hash = "sha256-zqCqbQAUAIhjntX4gcV1aoJwjozZFlF7Sr49w7uIgaI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ro/rofi-games/package.nix b/pkgs/by-name/ro/rofi-games/package.nix index d5e7291376a9..31c802344912 100644 --- a/pkgs/by-name/ro/rofi-games/package.nix +++ b/pkgs/by-name/ro/rofi-games/package.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4L3gk/RG9g5QnUW1AJkZIl0VkBiO/L0HUBC3pibN/qo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-cU7gp/c1yx3ZLaZuGs1bvOV4AKgLusraILVJ2EhH1iA="; + hash = "sha256-jTc4dAp7OogjYZWqtxVcjJc2sPozRLM5WcgMe7QS09s="; }; patches = [ diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index 8b83c212e4f1..61bbb514cc75 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ZKAyKcKwhnPE6PrfBFjLJKkTlGbdLcmW1EP/xSv2cpM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-IaOhQfDEgLhGmes0xzhLVym29aP691TY0EXdOIgXEMA="; + hash = "sha256-cZ92wSKoygt9x6O/ginOEiCiarlR5qGVFOHrIFdWOWE="; }; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix index 36592007c942..a0656b9fcc54 100644 --- a/pkgs/by-name/ru/rutabaga_gfx/package.nix +++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix @@ -59,9 +59,9 @@ stdenv.mkDerivation (finalAttrs: { ] ); - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-wuF3Isrp+u5J8jPQoPsIOWYGNKLSNa2pLfvladAWkLs="; + hash = "sha256-53xCzKuXtnnbS0TWdQrh4Rwy+V+D9soK41ycYd656Uc="; }; CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix index 2945bd6582fe..961c6ca606bc 100644 --- a/pkgs/by-name/sh/share-preview/package.nix +++ b/pkgs/by-name/sh/share-preview/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "share-preview-${finalAttrs.version}"; - hash = "sha256-Gh6bQZD1mlkj3XeGp+fF/NShC4PZCZSEqymrsSdX4Ec="; + hash = "sha256-XY48fQ5HLvZ1nxLk6rbuxSBAHAPUcnwu/5AwgTWhfbg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix index e4344f093437..fbab3ca14b4b 100644 --- a/pkgs/by-name/sh/shortwave/package.nix +++ b/pkgs/by-name/sh/shortwave/package.nix @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-W1eOMyiooDesI13lOze/JcxzhSSxYOW6FOY85NkVyps="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-O5K5aNcWwUYkaJbGzTzS3FdNbEsQsdliyi0YShw+6PU="; + hash = "sha256-vtQRt8/eWwMA1+tKULpStLR7E1+R7LkNutS2Joz7zeI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spot/package.nix b/pkgs/by-name/sp/spot/package.nix index 8e40e70a51ad..630682bce77c 100644 --- a/pkgs/by-name/sp/spot/package.nix +++ b/pkgs/by-name/sp/spot/package.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { hash = "sha256-7zWK0wkh53ojnoznv4T/X//JeyKJVKOrfYF0IkvciIY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-AaRmTOgFmBi0s1zdIVHc6bLjrUopy9YuB3GJOCnbjU4="; + hash = "sha256-731aD+yJkyrNMmYtgKYzXIAyLegDBzTT2XqZs5usXiI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/squeekboard/package.nix b/pkgs/by-name/sq/squeekboard/package.nix index 811a1eb65f23..7ce2811362de 100644 --- a/pkgs/by-name/sq/squeekboard/package.nix +++ b/pkgs/by-name/sq/squeekboard/package.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { hash = "sha256-UsUr4UnYNo2ybEdNyOD/IiafEZ1YJFwRQ3CVy76X2H0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-1yBGn8cZxwpEOeF2BcUIIcI4Uxn80vRau/MvlufX9GU="; + hash = "sha256-3K1heokPYxYbiAGha9TrrjQXguzGv/djIB4eWa8dVjg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/st/stratisd/package.nix b/pkgs/by-name/st/stratisd/package.nix index 018eb7feaf69..1b8259928646 100644 --- a/pkgs/by-name/st/stratisd/package.nix +++ b/pkgs/by-name/st/stratisd/package.nix @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { hash = "sha256-W8ssLTFU36t6iLrt9S9V8qcN7EP4IsL7VbhNPLpftio="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-Qv2qknWNx2OQeucUFwL1veu3MSF+fd19jFfHCCVGprM="; + hash = "sha256-blhB+UfvG22Xe2O0csZ00/jgnVcLTUIkDJG5P22mffQ="; }; postPatch = '' diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 371dcab6dbe5..99bf40004f78 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -69,10 +69,10 @@ stdenv.mkDerivation (finalAttrs: { ./0001-Cargo.patch ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) patches src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-8rw3x17f5pLLyvxozFPWq9pJNHy4wXwV9CcaUGAbdd0="; + hash = "sha256-qrPIcWpdrvTmaFcfKAfz+n8a6lp6IcIMq9ZCHaa7AHQ="; patchFlags = [ "-p2" ]; }; diff --git a/pkgs/by-name/sw/swayosd/package.nix b/pkgs/by-name/sw/swayosd/package.nix index 1b4d736f56ca..d4ed483bc8ed 100644 --- a/pkgs/by-name/sw/swayosd/package.nix +++ b/pkgs/by-name/sw/swayosd/package.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { hash = "sha256-GyvRWEzTxQxTAk+xCLFsHdd1SttBliOgJ6eZqAxQMME="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-EUxJ+aGtYAO0kNggNXIZqj2DmPzc4serj0/V+fvH7ds="; + hash = "sha256-oeLhJwlOITp8YHJdZQY7oo8Z31WUT4Y70dHd3tDDsk8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sw/switcheroo/package.nix b/pkgs/by-name/sw/switcheroo/package.nix index 796a84638ad5..601e2c322bde 100644 --- a/pkgs/by-name/sw/switcheroo/package.nix +++ b/pkgs/by-name/sw/switcheroo/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-AwecOA8HWGimhQyCEG3Z3hhwa9RVWssykUXsdvqqs9U="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "switcheroo-${finalAttrs.version}"; - hash = "sha256-fpI4ue30DhkeWAolyeots+LkaRyaIPhYmIqRmx08i2s="; + hash = "sha256-Ose1gx6vwKZCdtMDkyM9Y+f6wt7VDKTI3Wc7kep1428="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tailor-gui/package.nix b/pkgs/by-name/ta/tailor-gui/package.nix index ab26609fb7dd..5341a7b999af 100644 --- a/pkgs/by-name/ta/tailor-gui/package.nix +++ b/pkgs/by-name/ta/tailor-gui/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation { version ; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src sourceRoot; name = "${pname}-${version}"; - hash = "sha256-jcjq0uls28V8Ka2CMM8oOQmZZRUr9eEQeVtW56AmU28="; + hash = "sha256-9jMy23VD+C87hg/TMXGbzAoqx76dhVOkWcQNudSwsYA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 277c54025681..7567d205173a 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-aKDwRCJ1yopRdsPxnHhgOpSho1i8/dcAurI+XhpSbn4="; fetchSubmodules = true; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "${finalAttrs.pname}-${finalAttrs.version}-cargo-deps"; inherit (finalAttrs) src; - hash = "sha256-mzmrbsUuIjUVuNEa33EgtOTl9r+0xYj2WkKqFjxX1oU="; + hash = "sha256-UbJodQBCrmXbw5+ahusBnEcoCYGFHRA6bg5hf9/prmA="; }; postPatch = '' diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix index 55ad58d4abaf..beecfa75f8c5 100644 --- a/pkgs/by-name/ta/taterclient-ddnet/package.nix +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -43,9 +43,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RhOZuPsjyXq5UcM+5dawDi1BfjMMQ3K9O3PHkCg5sDI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname src version; - hash = "sha256-NDeHpf1iYApP/Y/DE7FGBu67ld6A0+8227oTVlOMe1M="; + hash = "sha256-VKGc4LQjt2FHbELLBKtV8rKpxjGBrzlA3m9BSdZ/6Z0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/televido/package.nix b/pkgs/by-name/te/televido/package.nix index bf82f2a107c9..014f23f73af9 100644 --- a/pkgs/by-name/te/televido/package.nix +++ b/pkgs/by-name/te/televido/package.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { hash = "sha256-pMrMXRnfvpDLFkL2IqYJKRao/OF78mXUCBqBgT97+hc="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-wavxkhDS0hspGMw5ZKTxjZ07TiZ67OkbMhicB8h5y64="; + hash = "sha256-o857QBRfANkk6e/zIwc0JLpsiP2+wCb5U7Umlx4xMdI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 2499fcbb07ba..7c58c01e568d 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { hash = "sha256-B6lz75uxROo7npiZNCdTt0NCxVvsaIgtWnuGOKevDQQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "uutils-coreutils-${version}"; - hash = "sha256-BSRYL9qsa+FUjfXTP/vx7VZwOyjhBM7DREvI6/X2tCA="; + hash = "sha256-Z5A1Tyf7SbvIBVGG3YPxh4q/SLU+yNlVv2jBRNumNwM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/va/vaults/package.nix b/pkgs/by-name/va/vaults/package.nix index 8e854c0d485a..84e57cada7f4 100644 --- a/pkgs/by-name/va/vaults/package.nix +++ b/pkgs/by-name/va/vaults/package.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { hash = "sha256-USVP/7TNdpUNx1kDsCReGYIP8gHUeij2dqy8TR4R+CE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-h25YRqQ4Z+Af+zHITnmnwpg09V7sik88YRGbG8BZUjg="; + hash = "sha256-93X2BCn6Ih2DqYJNvYvUCYrC1E6wpCT5X8Hyux/8mno="; }; postPatch = '' diff --git a/pkgs/by-name/vi/video-trimmer/package.nix b/pkgs/by-name/vi/video-trimmer/package.nix index 766d59a4f72c..6e7b14b75474 100644 --- a/pkgs/by-name/vi/video-trimmer/package.nix +++ b/pkgs/by-name/vi/video-trimmer/package.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4B3NNGww+UjI/VbsKL62vWlKye7NYXYPzlJ4TfywJDw="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-vtV5TrF81TK4PUwzOF/CuDsKH1vTLO+4PFufyIOp2zk="; + hash = "sha256-H7KB4O3Wyp2YdMLFwvQuYLhk7Ei7SecnMN9wg60FIm8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vp/vpv/package.nix b/pkgs/by-name/vp/vpv/package.nix index 89631f60af51..d54ae34dd0a3 100644 --- a/pkgs/by-name/vp/vpv/package.nix +++ b/pkgs/by-name/vp/vpv/package.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation (finalAttrs: { }; cargoRoot = "src/fuzzy-finder"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; sourceRoot = "${finalAttrs.src.name}/src/fuzzy-finder"; - hash = "sha256-CDKlmwA2Wj78xPaSiYPmIJ7xmiE5Co+oGGejZU3v1zI="; + hash = "sha256-5QjKvndExImVn+w6OZNSD5n7K3C+tmN2jJOcDCVEW8I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index 61eedc92e513..3d4e7e8593e5 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -31,9 +31,9 @@ llvmPackages.stdenv.mkDerivation rec { tag = "v${version}"; hash = "sha256-l9gZ7FtLxGKBRlMem3VGJGTvOkVAtLBa7eF9+gA5Vfo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-DjqyKXbCQ6kzb1138wNWPnRXIgUaaE1nnCExLeLX6pw="; + hash = "sha256-CTLSMm8GN21L+5WtPBWSTTbeD3WoeScKV27TCu7tovI="; }; strictDeps = true; diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index f2a5c3c0289a..43f8b347be35 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -35,10 +35,10 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-Teno9y+busOGbreer2RzT+3sigRKvJbO1obfo0QpcPU="; + hash = "sha256-UyVIBctAbzslqID44+9zTXyx7wL4UosTQHqMdAX9mmE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wi/wildcard/package.nix b/pkgs/by-name/wi/wildcard/package.nix index ada2cffde23f..3f7591026262 100644 --- a/pkgs/by-name/wi/wildcard/package.nix +++ b/pkgs/by-name/wi/wildcard/package.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-8jNNCcZRoLyOHdaWmYTOGD7Nf7NkmJ1MIxBXLJGrm5Y="; + hash = "sha256-eUT3K7DJk0U4GZ/oqvMAGUjTctcDMaRdsjq1sD+fitg="; name = "wildcard-${finalAttrs.version}"; }; From d3ca60f3661735cc42f2d27affcde8b36608f7b0 Mon Sep 17 00:00:00 2001 From: Sander Date: Thu, 23 Jan 2025 17:23:54 +0400 Subject: [PATCH 232/280] curl: patch netrc parsing bug for password-less entries --- .../curlMinimal/fix-password-less-netrc.patch | 123 ++++++++++++++++++ pkgs/by-name/cu/curlMinimal/package.nix | 2 + 2 files changed, 125 insertions(+) create mode 100644 pkgs/by-name/cu/curlMinimal/fix-password-less-netrc.patch diff --git a/pkgs/by-name/cu/curlMinimal/fix-password-less-netrc.patch b/pkgs/by-name/cu/curlMinimal/fix-password-less-netrc.patch new file mode 100644 index 000000000000..fced57221dc9 --- /dev/null +++ b/pkgs/by-name/cu/curlMinimal/fix-password-less-netrc.patch @@ -0,0 +1,123 @@ +From 9fce2c55d4b0273ac99b59bd8cb982a6d96b88cf Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Tue, 17 Dec 2024 23:56:42 +0100 +Subject: [PATCH] netrc: fix password-only entries + +When a specific hostname matched, and only a password is set before +another machine is specified in the netrc file, the parser would not be +happy and stop there and return the password-only state. It instead +continued and did not return a match. + +Add test 2005 to verify this case + +Regression from e9b9bba, shipped in 8.11.1. + +Reported-by: Ben Zanin +Fixes #15767 +Closes #15768 +--- + lib/netrc.c | 7 +++++- + tests/data/Makefile.am | 2 +- + tests/data/test2005 | 55 ++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 62 insertions(+), 2 deletions(-) + create mode 100644 tests/data/test2005 + +diff --git a/lib/netrc.c b/lib/netrc.c +index cbc86484f6f..b517c1dfab6 100644 +--- a/lib/netrc.c ++++ b/lib/netrc.c +@@ -267,7 +267,8 @@ static int parsenetrc(struct store_netrc *store, + retcode = NETRC_FAILED; /* allocation failed */ + goto out; + } +- found |= FOUND_PASSWORD; ++ if(!specific_login || our_login) ++ found |= FOUND_PASSWORD; + keyword = NONE; + } + else if(strcasecompare("login", tok)) +@@ -276,6 +277,10 @@ static int parsenetrc(struct store_netrc *store, + keyword = PASSWORD; + else if(strcasecompare("machine", tok)) { + /* a new machine here */ ++ if(found & FOUND_PASSWORD) { ++ done = TRUE; ++ break; ++ } + state = HOSTFOUND; + keyword = NONE; + found = 0; +diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am +index bd9a0bbaaff..105108309d5 100644 +--- a/tests/data/Makefile.am ++++ b/tests/data/Makefile.am +@@ -238,7 +238,7 @@ test1941 test1942 test1943 test1944 test1945 test1946 test1947 test1948 \ + test1955 test1956 test1957 test1958 test1959 test1960 test1964 \ + test1970 test1971 test1972 test1973 test1974 test1975 test1976 \ + \ +-test2000 test2001 test2002 test2003 test2004 \ ++test2000 test2001 test2002 test2003 test2004 test2005 \ + \ + test2023 \ + test2024 test2025 test2026 test2027 test2028 test2029 test2030 test2031 \ +diff --git a/tests/data/test2005 b/tests/data/test2005 +new file mode 100644 +index 00000000000..91e256298a4 +--- /dev/null ++++ b/tests/data/test2005 +@@ -0,0 +1,55 @@ ++ ++ ++ ++HTTP ++netrc ++ ++ ++# ++# Server-side ++ ++ ++HTTP/1.1 200 OK ++Date: Fri, 05 Aug 2022 10:09:00 GMT ++Server: test-server/fake ++Content-Type: text/plain ++Content-Length: 6 ++Connection: close ++ ++-foo- ++ ++ ++ ++# ++# Client-side ++ ++ ++http ++ ++ ++netrc match with password only in file, no username. machine follows ++ ++ ++--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ ++ ++ ++machine %HOSTIP ++password 5up3r53cr37 ++ ++machine example.com ++ ++ ++ ++# ++# Verify data after the test has been "shot" ++ ++ ++GET / HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic %b64[:5up3r53cr37]b64% ++User-Agent: curl/%VERSION ++Accept: */* ++ ++ ++ ++ diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 9d670607d4c3..0ddcd19cd8a1 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -67,6 +67,8 @@ stdenv.mkDerivation (finalAttrs: { patches = lib.optionals (!stdenv.isDarwin) [ # https://github.com/curl/curl/issues/15725 ./fix-eventfd-free.patch + # https://github.com/curl/curl/issues/15767 + ./fix-password-less-netrc.patch ]; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion From 9a3e4294f74926a5c6c0ef2f0d7348988fb4dc51 Mon Sep 17 00:00:00 2001 From: Sander Date: Thu, 23 Jan 2025 18:35:58 +0400 Subject: [PATCH 233/280] curl: apply patches to darwin build --- pkgs/by-name/cu/curlMinimal/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 0ddcd19cd8a1..f2fffcf1e244 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -63,8 +63,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-x8p9tIsJCXQ+rvNCUNoCwZvGHU8dzt1mA/EJQJU2q1Y="; }; - # FIXME: avoid rebuilding darwin stdenv for now - patches = lib.optionals (!stdenv.isDarwin) [ + patches = [ # https://github.com/curl/curl/issues/15725 ./fix-eventfd-free.patch # https://github.com/curl/curl/issues/15767 From 2985b9a8dae9c7fbc09351309cd564c02699410e Mon Sep 17 00:00:00 2001 From: Sander Date: Thu, 23 Jan 2025 18:50:01 +0400 Subject: [PATCH 234/280] curl: fix typo in patch name --- ...-password-less-netrc.patch => fix-password-only-netrc.patch} | 0 pkgs/by-name/cu/curlMinimal/package.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/by-name/cu/curlMinimal/{fix-password-less-netrc.patch => fix-password-only-netrc.patch} (100%) diff --git a/pkgs/by-name/cu/curlMinimal/fix-password-less-netrc.patch b/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch similarity index 100% rename from pkgs/by-name/cu/curlMinimal/fix-password-less-netrc.patch rename to pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index f2fffcf1e244..1c58c12f9860 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/curl/curl/issues/15725 ./fix-eventfd-free.patch # https://github.com/curl/curl/issues/15767 - ./fix-password-less-netrc.patch + ./fix-password-only-netrc.patch ]; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion From 5915be7ae831b0c77cbe1901d08a95711fc18c6d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 23 Jan 2025 16:20:23 +0100 Subject: [PATCH 235/280] abseil-cpp: 20240722.0 -> 20240722.1 Diff: https://github.com/abseil/abseil-cpp/compare/20240722.0...20240722.1 Changelog: https://github.com/abseil/abseil-cpp/releases/tag/20240722.1 --- pkgs/development/libraries/abseil-cpp/202407.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/abseil-cpp/202407.nix b/pkgs/development/libraries/abseil-cpp/202407.nix index 51056ff86d9d..5ee129883f37 100644 --- a/pkgs/development/libraries/abseil-cpp/202407.nix +++ b/pkgs/development/libraries/abseil-cpp/202407.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abseil-cpp"; - version = "20240722.0"; + version = "20240722.1"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4="; + tag = finalAttrs.version; + hash = "sha256-ir4hG2VIPv3se7JfWqCM/siLqFEFkmhMW/IGCocy6Pc="; }; patches = [ @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; + changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; platforms = lib.platforms.all; maintainers = [ lib.maintainers.GaetanLepage ]; From 1da5a1c8ebe010f95bcb446e6133c76cd9959548 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 23 Jan 2025 16:22:34 +0100 Subject: [PATCH 236/280] abseil-cpp_202401: 20240116.2 -> 20240116.3 Diff: https://github.com/abseil/abseil-cpp/compare/20240116.2...20240116.3 Changelog: https://github.com/abseil/abseil-cpp/releases/tag/20240116.3 --- pkgs/development/libraries/abseil-cpp/202401.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/abseil-cpp/202401.nix b/pkgs/development/libraries/abseil-cpp/202401.nix index 7a9d1eb836e3..8881b0d8f984 100644 --- a/pkgs/development/libraries/abseil-cpp/202401.nix +++ b/pkgs/development/libraries/abseil-cpp/202401.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abseil-cpp"; - version = "20240116.2"; + version = "20240116.3"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg="; + tag = finalAttrs.version; + hash = "sha256-VfC8kQtGlOew9iVKxQ7kIgqFMvHiDpSBhvyNOfneuwo="; }; patches = [ @@ -46,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; + changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; platforms = lib.platforms.all; maintainers = [ lib.maintainers.GaetanLepage ]; From 3b72265cb7915431cab661902bb06b8658a4aab1 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 23 Jan 2025 11:25:17 -0800 Subject: [PATCH 237/280] cc-wrapper: set dontCheckForBrokenSymlinks --- pkgs/build-support/cc-wrapper/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8558a9f3d8d2..54c1158e5dae 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -340,6 +340,10 @@ stdenvNoCC.mkDerivation { dontConfigure = true; enableParallelBuilding = true; + # TODO(@connorbaker): + # This is a quick fix unblock builds broken by https://github.com/NixOS/nixpkgs/pull/370750. + dontCheckForBrokenSymlinks = true; + unpackPhase = '' src=$PWD ''; From 9cdac5fc5225c9aa1df4e8a1480255e728d3f8d2 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 23 Jan 2025 00:34:09 -0800 Subject: [PATCH 238/280] apple-sdk: set dontCheckForBrokenSymlinks --- pkgs/by-name/ap/apple-sdk/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix index 779ed45260ec..fa85a5ded31c 100644 --- a/pkgs/by-name/ap/apple-sdk/package.nix +++ b/pkgs/by-name/ap/apple-sdk/package.nix @@ -59,6 +59,12 @@ stdenvNoCC.mkDerivation ( dontConfigure = true; + # TODO(@connorbaker): + # This is a quick fix unblock builds broken by https://github.com/NixOS/nixpkgs/pull/370750. + # Fails due to a reflexive symlink: + # $out/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/A + dontCheckForBrokenSymlinks = true; + strictDeps = true; setupHooks = [ From ca851b6f124ce5aabee2653afeeb31389245c608 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 23 Jan 2025 21:23:13 +0100 Subject: [PATCH 239/280] glibc: 2.40-36 -> 2.40-66 Fixes CVE-2025-0395 / GLIBC-SA-2025-0001 https://sourceware.org/git/?p=glibc.git;a=blob;f=advisories/GLIBC-SA-2025-0001;h=45f8b8f181fa024611452518ca0147ede1b88c47;hb=d9dcfe766eb9adcf9b1143112b569ac34ea9a9e6 https://www.openwall.com/lists/oss-security/2025/01/22/4 --- .../libraries/glibc/2.40-master.patch | 21091 ++++++++++++++++ pkgs/development/libraries/glibc/common.nix | 6 +- 2 files changed, 21094 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glibc/2.40-master.patch b/pkgs/development/libraries/glibc/2.40-master.patch index 0b418d1dbeb3..c7885ead7b7f 100644 --- a/pkgs/development/libraries/glibc/2.40-master.patch +++ b/pkgs/development/libraries/glibc/2.40-master.patch @@ -5125,3 +5125,21094 @@ index 35d8b30710..6f20d49669 100644 _IO_free_wbackup_area (fp); if (! (fp->_flags & _IO_UNBUFFERED) + +commit 77018fd9f99f86a354387219fdf099915857a527 +Author: Sergey Kolosov +Date: Wed Sep 25 15:51:23 2024 +0200 + + stdio-common: Add new test for fdopen + + This commit adds fdopen test with all modes. + Reviewed-by: DJ Delorie + + (cherry picked from commit 1d72fa3cfa046f7293421a7e58f2a272474ea901) + +diff --git a/stdio-common/Makefile b/stdio-common/Makefile +index a91754f52d..5af53d61fd 100644 +--- a/stdio-common/Makefile ++++ b/stdio-common/Makefile +@@ -207,6 +207,7 @@ tests := \ + tst-cookie \ + tst-dprintf-length \ + tst-fdopen \ ++ tst-fdopen2 \ + tst-ferror \ + tst-fgets \ + tst-fileno \ +diff --git a/stdio-common/tst-fdopen2.c b/stdio-common/tst-fdopen2.c +new file mode 100644 +index 0000000000..0c6625f258 +--- /dev/null ++++ b/stdio-common/tst-fdopen2.c +@@ -0,0 +1,246 @@ ++/* Test the fdopen function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++char *tmp_dir; ++char *path_to_file; ++ ++void ++prepare_tmp_dir (void) ++{ ++ tmp_dir = support_create_temp_directory ("tst-fdopen2"); ++ path_to_file = xasprintf ("%s/tst-fdopen2.txt", tmp_dir); ++} ++ ++/* open temp file descriptor with mode. */ ++int ++open_tmp_fd (int mode) ++{ ++ int fd = xopen (path_to_file, mode, 0644); ++ return fd; ++} ++ ++ ++/* close and remove temp file with close. */ ++void ++close_tmp_fd (int fd) ++{ ++ xclose (fd); ++ xunlink (path_to_file); ++} ++ ++/* close and remove temp file with fclose. */ ++void ++close_tmp_fp (FILE *fp) ++{ ++ fclose (fp); ++ xunlink (path_to_file); ++} ++ ++/* test "w" fdopen mode. */ ++void ++do_test_fdopen_w (void) ++{ ++ int fd, ret; ++ FILE *fp; ++ fd = open_tmp_fd (O_WRONLY | O_CREAT | O_TRUNC); ++ ++ /* test mode mismatch. */ ++ fp = fdopen (fd, "r"); ++ if (fp != NULL || errno != EINVAL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, r) should fail with EINVAL: %m", fd); ++ } ++ ++ fp = fdopen (fd, "w"); ++ if (fp == NULL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, w): %m", fd); ++ } ++ ++ const void *buf = "AAAA"; ++ ret = fwrite (buf, 1, 4, fp); ++ if (ret != 4) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fwrite (): %m"); ++ } ++ ++ unsigned char buf2[4]; ++ rewind (fp); ++ clearerr (fp); ++ /* fread should fail in "w" mode */ ++ ret = fread (buf2, 1, 4, fp); ++ if (ret != 0 || ferror (fp) == 0) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fread should fail in \"w\" mode"); ++ } ++ ++ fclose (fp); ++} ++ ++/* test "r" fdopen mode. */ ++void ++do_test_fdopen_r (void) ++{ ++ int fd, ret; ++ FILE *fp; ++ fd = open_tmp_fd (O_RDONLY); ++ ++ /* test mode mismatch. */ ++ fp = fdopen (fd, "w"); ++ if (fp != NULL || errno != EINVAL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, w) should fail with EINVAL: %m", fd); ++ } ++ ++ fp = fdopen (fd, "r"); ++ if (fp == NULL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, w): %m", fd); ++ } ++ ++ const void *buf = "BBBB"; ++ /* fwrite should fail in "r" mode. */ ++ ret = fwrite (buf, 1, 4, fp); ++ if (ret != 0 || ferror (fp) == 0) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fwrite should fail in \"r\" mode"); ++ } ++ ++ unsigned char buf2[4]; ++ ret = fread (buf2, 1, 4, fp); ++ if (ret != 4) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fread (): %m"); ++ } ++ ++ fclose (fp); ++} ++ ++/* test "a" fdopen mode. */ ++void ++do_test_fdopen_a (void) ++{ ++ int fd, ret; ++ FILE *fp; ++ fd = open_tmp_fd (O_WRONLY | O_CREAT | O_APPEND); ++ ++ /* test mode mismatch. */ ++ fp = fdopen (fd, "r+"); ++ if (fp != NULL || errno != EINVAL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, \"r+\") should fail with EINVAL: %m", fd); ++ } ++ ++ fp = fdopen (fd, "a"); ++ if (fp == NULL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, w): %m", fd); ++ } ++ ++ const void *buf = "CCCC"; ++ ret = fwrite (buf, 1, 4, fp); ++ if (ret != 4) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fwrite (): %m"); ++ } ++ ++ /* fread should fail in "a" mode. */ ++ unsigned char buf2[4]; ++ clearerr (fp); ++ ret = fread (buf2, 1, 4, fp); ++ if (ret != 0 || ferror (fp) == 0) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fread should fail \"a\" mode"); ++ } ++ ++ fclose (fp); ++} ++ ++void ++do_test_fdopen_mode (int mode, const char *fmode) ++{ ++ int fd, ret; ++ FILE *fp; ++ fd = open_tmp_fd (mode); ++ ++ fp = fdopen (fd, fmode); ++ if (fp == NULL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, %s): %m", fd, fmode); ++ } ++ ++ const void *buf = "EEEE"; ++ ret = fwrite (buf, 1, 4, fp); ++ if (ret != 4) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fwrite () in mode:%s returns %d: %m", fmode, ret); ++ } ++ ++ rewind (fp); ++ unsigned char buf2[4]; ++ ret = fread (buf2, 1, 4, fp); ++ if (ret != 4) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fread () in mode:%s returns %d: %m", fmode, ret); ++ } ++ ++ fclose (fp); ++} ++ ++static int ++do_test (void) ++{ ++ ++ prepare_tmp_dir (); ++ ++ do_test_fdopen_w (); ++ do_test_fdopen_r (); ++ do_test_fdopen_a (); ++ ++ /* test r+ w+ a+ fdopen modes. */ ++ do_test_fdopen_mode (O_RDWR, "r+"); ++ do_test_fdopen_mode (O_RDWR | O_CREAT | O_TRUNC, "w+"); ++ do_test_fdopen_mode (O_RDWR | O_CREAT | O_APPEND, "a+"); ++ xunlink (path_to_file); ++ return 0; ++} ++ ++#include + +commit 61b6464f8d72aef520ee769a2ae317b4f68d5e1d +Author: Joseph Myers +Date: Tue Sep 24 14:06:22 2024 +0000 + + Add tests of fread + + There seem to be no glibc tests specifically for the fread function. + Add basic tests of that function. + + Tested for x86_64. + + (cherry picked from commit d14c977c65aac7db35bb59380ef99d6582c4f930) + +diff --git a/stdio-common/Makefile b/stdio-common/Makefile +index 5af53d61fd..3396090be1 100644 +--- a/stdio-common/Makefile ++++ b/stdio-common/Makefile +@@ -217,6 +217,7 @@ tests := \ + tst-fmemopen4 \ + tst-fphex \ + tst-fphex-wide \ ++ tst-fread \ + tst-fseek \ + tst-fwrite \ + tst-gets \ +diff --git a/stdio-common/tst-fread.c b/stdio-common/tst-fread.c +new file mode 100644 +index 0000000000..4d9a7895f6 +--- /dev/null ++++ b/stdio-common/tst-fread.c +@@ -0,0 +1,134 @@ ++/* Test fread. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++int ++do_test (void) ++{ ++ char *temp_dir = support_create_temp_directory ("tst-fread"); ++ char *file1 = xasprintf ("%s/file1", temp_dir); ++ support_write_file_string (file1, "file1"); ++ add_temp_file (file1); ++ FILE *fp; ++ size_t ret; ++ char buf[1024]; ++ ++ verbose_printf ("test single-byte reads\n"); ++ fp = xfopen (file1, "r"); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 1, 2, fp); ++ TEST_COMPARE (ret, 2); ++ TEST_COMPARE (buf[0], 'f'); ++ TEST_COMPARE (buf[1], 'i'); ++ TEST_COMPARE (feof (fp), 0); ++ TEST_COMPARE (ftell (fp), 2); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 1, 3, fp); ++ TEST_COMPARE (ret, 3); ++ TEST_COMPARE (buf[0], 'l'); ++ TEST_COMPARE (buf[1], 'e'); ++ TEST_COMPARE (buf[2], '1'); ++ TEST_COMPARE (ftell (fp), 5); ++ TEST_COMPARE (feof (fp), 0); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 1, 1, fp); ++ TEST_COMPARE (ret, 0); ++ TEST_COMPARE (!!feof (fp), 1); ++ TEST_COMPARE (ferror (fp), 0); ++ TEST_COMPARE (ftell (fp), 5); ++ xfclose (fp); ++ ++ verbose_printf ("test single-byte reads, EOF part way through\n"); ++ fp = xfopen (file1, "r"); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 1, sizeof buf, fp); ++ TEST_COMPARE (ret, 5); ++ TEST_COMPARE (buf[0], 'f'); ++ TEST_COMPARE (buf[1], 'i'); ++ TEST_COMPARE (buf[2], 'l'); ++ TEST_COMPARE (buf[3], 'e'); ++ TEST_COMPARE (buf[4], '1'); ++ TEST_COMPARE (!!feof (fp), 1); ++ TEST_COMPARE (ferror (fp), 0); ++ TEST_COMPARE (ftell (fp), 5); ++ xfclose (fp); ++ ++ verbose_printf ("test multi-byte reads\n"); ++ fp = xfopen (file1, "r"); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 2, 2, fp); ++ TEST_COMPARE (ret, 2); ++ TEST_COMPARE (buf[0], 'f'); ++ TEST_COMPARE (buf[1], 'i'); ++ TEST_COMPARE (buf[2], 'l'); ++ TEST_COMPARE (buf[3], 'e'); ++ TEST_COMPARE (feof (fp), 0); ++ TEST_COMPARE (ftell (fp), 4); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 3, 3, fp); ++ TEST_COMPARE (ret, 0); ++ /* The bytes written for a partial element read are unspecified. */ ++ TEST_COMPARE (!!feof (fp), 1); ++ TEST_COMPARE (ferror (fp), 0); ++ TEST_COMPARE (ftell (fp), 5); ++ xfclose (fp); ++ ++ verbose_printf ("test read error\n"); ++ fp = xfopen (file1, "r"); ++ xclose (fileno (fp)); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 1, sizeof buf, fp); ++ TEST_COMPARE (ret, 0); ++ TEST_COMPARE (feof (fp), 0); ++ TEST_COMPARE (!!ferror (fp), 1); ++ fclose (fp); ++ ++ verbose_printf ("test zero size\n"); ++ fp = xfopen (file1, "r"); ++ ret = fread (buf, 0, SIZE_MAX, fp); ++ TEST_COMPARE (ret, 0); ++ TEST_COMPARE (feof (fp), 0); ++ TEST_COMPARE (ferror (fp), 0); ++ TEST_COMPARE (ftell (fp), 0); ++ xfclose (fp); ++ ++ verbose_printf ("test zero items\n"); ++ fp = xfopen (file1, "r"); ++ ret = fread (buf, SIZE_MAX, 0, fp); ++ TEST_COMPARE (ret, 0); ++ TEST_COMPARE (feof (fp), 0); ++ TEST_COMPARE (ferror (fp), 0); ++ TEST_COMPARE (ftell (fp), 0); ++ xfclose (fp); ++ ++ free (temp_dir); ++ free (file1); ++ return 0; ++} ++ ++#include + +commit 9bc76c7ca4d6022fd588c274d139813f99e04f35 +Author: Joseph Myers +Date: Wed Aug 14 17:15:46 2024 +0000 + + Test errno setting on strtod overflow in tst-strtod-round + + We have no tests that errno is set to ERANGE on overflow of + strtod-family functions (we do have some tests for underflow, in + tst-strtod-underflow). Add such tests to tst-strtod-round. + + Tested for x86_64. + + (cherry picked from commit 207d64feb26279e152c50744e3c37e68491aca99) + +diff --git a/stdlib/tst-strtod-round-skeleton.c b/stdlib/tst-strtod-round-skeleton.c +index 6fba4b5228..c3cc0201d4 100644 +--- a/stdlib/tst-strtod-round-skeleton.c ++++ b/stdlib/tst-strtod-round-skeleton.c +@@ -21,6 +21,7 @@ + declared in the headers. */ + #define _LIBC_TEST 1 + #define __STDC_WANT_IEC_60559_TYPES_EXT__ ++#include + #include + #include + #include +@@ -205,7 +206,9 @@ struct test { + #define GEN_ONE_TEST(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ + { \ + feclearexcept (FE_ALL_EXCEPT); \ ++ errno = 0; \ + FTYPE f = STRTO (FSUF) (s, NULL); \ ++ int new_errno = errno; \ + if (f != expected->FSUF \ + || (copysign ## CSUF) (1.0 ## LSUF, f) \ + != (copysign ## CSUF) (1.0 ## LSUF, expected->FSUF)) \ +@@ -254,6 +257,14 @@ struct test { + printf ("ignoring this exception error\n"); \ + } \ + } \ ++ if (overflow->FSUF && new_errno != ERANGE) \ ++ { \ ++ printf (FNPFXS "to" #FSUF \ ++ " (" STRM ") left errno == %d," \ ++ " not %d (ERANGE)\n", \ ++ s, new_errno, ERANGE); \ ++ result = 1; \ ++ } \ + } \ + } + + +commit e06153665fa931e4c7d2a3ecc14e5197e96143a7 +Author: Joseph Myers +Date: Tue Aug 27 12:38:01 2024 +0000 + + More thoroughly test underflow / errno in tst-strtod-round + + Add tests of underflow in tst-strtod-round, and thus also test for + errno being unchanged when there is neither overflow nor underflow. + The errno setting before the function call to test for being unchanged + is adjusted to set errno to 12345 instead of 0, so that any bugs where + strtod sets errno to 0 would be detected. + + This doesn't add any new test inputs for tst-strtod-round, and in + particular doesn't cover the edge cases of underflow the way + tst-strtod-underflow does (none of the existing test inputs for + tst-strtod-round actually exercise cases that have underflow with + before-rounding tininess detection but not with after-rounding + tininess detection), but at least it provides some coverage (as per + the recent discussions) that ordinary non-overflowing non-underflowing + inputs to these functions do not set errno. + + Tested for x86_64. + + (cherry picked from commit d73ed2601b7c3c93c3529149a3d7f7b6177900a8) + +diff --git a/stdlib/gen-tst-strtod-round.c b/stdlib/gen-tst-strtod-round.c +index e48bf4d6ea..7ce735f81d 100644 +--- a/stdlib/gen-tst-strtod-round.c ++++ b/stdlib/gen-tst-strtod-round.c +@@ -46,6 +46,7 @@ static int + string_to_fp (mpfr_t f, const char *s, mpfr_rnd_t rnd) + { + mpfr_clear_overflow (); ++ mpfr_clear_underflow (); + #ifdef WORKAROUND + mpfr_t f2; + mpfr_init2 (f2, 100000); +@@ -53,12 +54,16 @@ string_to_fp (mpfr_t f, const char *s, mpfr_rnd_t rnd) + int r = mpfr_set (f, f2, rnd); + r |= mpfr_subnormalize (f, r, rnd); + mpfr_clear (f2); +- return r0 | r; ++ r |= r0; + #else + int r = mpfr_strtofr (f, s, NULL, 0, rnd); + r |= mpfr_subnormalize (f, r, rnd); +- return r; + #endif ++ if (r == 0) ++ /* The MPFR underflow flag is set for exact subnormal results, ++ which is not wanted here. */ ++ mpfr_clear_underflow (); ++ return r; + } + + void +@@ -70,6 +75,21 @@ print_fp (FILE *fout, mpfr_t f, const char *suffix) + mpfr_fprintf (fout, "\t%Ra%s", f, suffix); + } + ++static const char * ++suffix_to_print (bool overflow, bool underflow, bool underflow_before_rounding, ++ bool with_comma) ++{ ++ if (overflow) ++ return with_comma ? ", true, false,\n" : ", true, false"; ++ if (underflow) ++ return with_comma ? ", false, true,\n" : ", false, true"; ++ if (underflow_before_rounding) ++ return (with_comma ++ ? ", false, !TININESS_AFTER_ROUNDING,\n" ++ : ", false, !TININESS_AFTER_ROUNDING"); ++ return with_comma ? ", false, false,\n" : ", false, false"; ++} ++ + static void + round_str (FILE *fout, const char *s, int prec, int emin, int emax, + bool ibm_ld) +@@ -80,8 +100,11 @@ round_str (FILE *fout, const char *s, int prec, int emin, int emax, + mpfr_set_emin (emin); + mpfr_set_emax (emax); + mpfr_init (f); ++ string_to_fp (f, s, MPFR_RNDZ); ++ bool underflow_before_rounding = mpfr_underflow_p () != 0; + int r = string_to_fp (f, s, MPFR_RNDD); + bool overflow = mpfr_overflow_p () != 0; ++ bool underflow = mpfr_underflow_p () != 0; + if (ibm_ld) + { + assert (prec == 106 && emin == -1073 && emax == 1024); +@@ -97,19 +120,27 @@ round_str (FILE *fout, const char *s, int prec, int emin, int emax, + } + } + mpfr_fprintf (fout, "\t%s,\n", r ? "false" : "true"); +- print_fp (fout, f, overflow ? ", true,\n" : ", false,\n"); ++ print_fp (fout, f, ++ suffix_to_print (overflow, underflow, underflow_before_rounding, ++ true)); + string_to_fp (f, s, MPFR_RNDN); + overflow = (mpfr_overflow_p () != 0 + || (ibm_ld && mpfr_cmpabs (f, max_value) > 0)); +- print_fp (fout, f, overflow ? ", true,\n" : ", false,\n"); ++ print_fp (fout, f, ++ suffix_to_print (overflow, underflow, underflow_before_rounding, ++ true)); + string_to_fp (f, s, MPFR_RNDZ); + overflow = (mpfr_overflow_p () != 0 + || (ibm_ld && mpfr_cmpabs (f, max_value) > 0)); +- print_fp (fout, f, overflow ? ", true,\n" : ", false,\n"); ++ print_fp (fout, f, ++ suffix_to_print (overflow, underflow, underflow_before_rounding, ++ true)); + string_to_fp (f, s, MPFR_RNDU); + overflow = (mpfr_overflow_p () != 0 + || (ibm_ld && mpfr_cmpabs (f, max_value) > 0)); +- print_fp (fout, f, overflow ? ", true" : ", false"); ++ print_fp (fout, f, ++ suffix_to_print (overflow, underflow, underflow_before_rounding, ++ false)); + mpfr_clear (f); + if (ibm_ld) + mpfr_clear (max_value); +diff --git a/stdlib/tst-strtod-round-data.h b/stdlib/tst-strtod-round-data.h +index 8899d15f9b..13e62dd2b0 100644 +--- a/stdlib/tst-strtod-round-data.h ++++ b/stdlib/tst-strtod-round-data.h +@@ -2,1852 +2,1852 @@ + static const struct test tests[] = { + TEST ("3.518437208883201171875E+013", + false, +- 0x2p+44, false, +- 0x2p+44, false, +- 0x2p+44, false, +- 0x2.000004p+44, false, +- false, +- 0x2.0000000000002p+44, false, +- 0x2.0000000000004p+44, false, +- 0x2.0000000000002p+44, false, +- 0x2.0000000000004p+44, false, +- true, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- true, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- true, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- true, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false), ++ 0x2p+44, false, false, ++ 0x2p+44, false, false, ++ 0x2p+44, false, false, ++ 0x2.000004p+44, false, false, ++ false, ++ 0x2.0000000000002p+44, false, false, ++ 0x2.0000000000004p+44, false, false, ++ 0x2.0000000000002p+44, false, false, ++ 0x2.0000000000004p+44, false, false, ++ true, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ true, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ true, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ true, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false), + TEST ("1.00000005960464477550", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000001p+0, false, +- false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000004p+0, false, +- false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000004p+0, false, +- false, +- 0x1.0000010000000002048242f2ffp+0, false, +- 0x1.0000010000000002048242f2ff8p+0, false, +- 0x1.0000010000000002048242f2ffp+0, false, +- 0x1.0000010000000002048242f2ff8p+0, false, +- false, +- 0x1.0000010000000002048242f2ff66p+0, false, +- 0x1.0000010000000002048242f2ff67p+0, false, +- 0x1.0000010000000002048242f2ff66p+0, false, +- 0x1.0000010000000002048242f2ff67p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000004p+0, false, false, ++ false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000004p+0, false, false, ++ false, ++ 0x1.0000010000000002048242f2ffp+0, false, false, ++ 0x1.0000010000000002048242f2ff8p+0, false, false, ++ 0x1.0000010000000002048242f2ffp+0, false, false, ++ 0x1.0000010000000002048242f2ff8p+0, false, false, ++ false, ++ 0x1.0000010000000002048242f2ff66p+0, false, false, ++ 0x1.0000010000000002048242f2ff67p+0, false, false, ++ 0x1.0000010000000002048242f2ff66p+0, false, false, ++ 0x1.0000010000000002048242f2ff67p+0, false, false), + TEST ("1.0000000596046447755", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000001p+0, false, +- false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000004p+0, false, +- false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000004p+0, false, +- false, +- 0x1.0000010000000002048242f2ffp+0, false, +- 0x1.0000010000000002048242f2ff8p+0, false, +- 0x1.0000010000000002048242f2ffp+0, false, +- 0x1.0000010000000002048242f2ff8p+0, false, +- false, +- 0x1.0000010000000002048242f2ff66p+0, false, +- 0x1.0000010000000002048242f2ff67p+0, false, +- 0x1.0000010000000002048242f2ff66p+0, false, +- 0x1.0000010000000002048242f2ff67p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000004p+0, false, false, ++ false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000004p+0, false, false, ++ false, ++ 0x1.0000010000000002048242f2ffp+0, false, false, ++ 0x1.0000010000000002048242f2ff8p+0, false, false, ++ 0x1.0000010000000002048242f2ffp+0, false, false, ++ 0x1.0000010000000002048242f2ff8p+0, false, false, ++ false, ++ 0x1.0000010000000002048242f2ff66p+0, false, false, ++ 0x1.0000010000000002048242f2ff67p+0, false, false, ++ 0x1.0000010000000002048242f2ff66p+0, false, false, ++ 0x1.0000010000000002048242f2ff67p+0, false, false), + TEST ("1.000000059604644776", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000001p+0, false, +- false, +- 0x1.000001000000000ap+0, false, +- 0x1.000001000000000cp+0, false, +- 0x1.000001000000000ap+0, false, +- 0x1.000001000000000cp+0, false, +- false, +- 0x1.000001000000000ap+0, false, +- 0x1.000001000000000cp+0, false, +- 0x1.000001000000000ap+0, false, +- 0x1.000001000000000cp+0, false, +- false, +- 0x1.000001000000000b3db12bdc21p+0, false, +- 0x1.000001000000000b3db12bdc21p+0, false, +- 0x1.000001000000000b3db12bdc21p+0, false, +- 0x1.000001000000000b3db12bdc218p+0, false, +- false, +- 0x1.000001000000000b3db12bdc213cp+0, false, +- 0x1.000001000000000b3db12bdc213dp+0, false, +- 0x1.000001000000000b3db12bdc213cp+0, false, +- 0x1.000001000000000b3db12bdc213dp+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ false, ++ 0x1.000001000000000ap+0, false, false, ++ 0x1.000001000000000cp+0, false, false, ++ 0x1.000001000000000ap+0, false, false, ++ 0x1.000001000000000cp+0, false, false, ++ false, ++ 0x1.000001000000000ap+0, false, false, ++ 0x1.000001000000000cp+0, false, false, ++ 0x1.000001000000000ap+0, false, false, ++ 0x1.000001000000000cp+0, false, false, ++ false, ++ 0x1.000001000000000b3db12bdc21p+0, false, false, ++ 0x1.000001000000000b3db12bdc21p+0, false, false, ++ 0x1.000001000000000b3db12bdc21p+0, false, false, ++ 0x1.000001000000000b3db12bdc218p+0, false, false, ++ false, ++ 0x1.000001000000000b3db12bdc213cp+0, false, false, ++ 0x1.000001000000000b3db12bdc213dp+0, false, false, ++ 0x1.000001000000000b3db12bdc213cp+0, false, false, ++ 0x1.000001000000000b3db12bdc213dp+0, false, false), + TEST ("1.000000059604644775", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000000fffffffp+0, false, +- 0x1.000001p+0, false, +- 0x1.000000fffffffp+0, false, +- 0x1.000001p+0, false, +- false, +- 0x1.000000fffffffff8p+0, false, +- 0x1.000000fffffffff8p+0, false, +- 0x1.000000fffffffff8p+0, false, +- 0x1.000000fffffffffap+0, false, +- false, +- 0x1.000000fffffffff8p+0, false, +- 0x1.000000fffffffff8p+0, false, +- 0x1.000000fffffffff8p+0, false, +- 0x1.000000fffffffffap+0, false, +- false, +- 0x1.000000fffffffff8cb535a09dd8p+0, false, +- 0x1.000000fffffffff8cb535a09dd8p+0, false, +- 0x1.000000fffffffff8cb535a09dd8p+0, false, +- 0x1.000000fffffffff8cb535a09dep+0, false, +- false, +- 0x1.000000fffffffff8cb535a09dd9p+0, false, +- 0x1.000000fffffffff8cb535a09dd91p+0, false, +- 0x1.000000fffffffff8cb535a09dd9p+0, false, +- 0x1.000000fffffffff8cb535a09dd91p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000000fffffffp+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000000fffffffp+0, false, false, ++ 0x1.000001p+0, false, false, ++ false, ++ 0x1.000000fffffffff8p+0, false, false, ++ 0x1.000000fffffffff8p+0, false, false, ++ 0x1.000000fffffffff8p+0, false, false, ++ 0x1.000000fffffffffap+0, false, false, ++ false, ++ 0x1.000000fffffffff8p+0, false, false, ++ 0x1.000000fffffffff8p+0, false, false, ++ 0x1.000000fffffffff8p+0, false, false, ++ 0x1.000000fffffffffap+0, false, false, ++ false, ++ 0x1.000000fffffffff8cb535a09dd8p+0, false, false, ++ 0x1.000000fffffffff8cb535a09dd8p+0, false, false, ++ 0x1.000000fffffffff8cb535a09dd8p+0, false, false, ++ 0x1.000000fffffffff8cb535a09dep+0, false, false, ++ false, ++ 0x1.000000fffffffff8cb535a09dd9p+0, false, false, ++ 0x1.000000fffffffff8cb535a09dd91p+0, false, false, ++ 0x1.000000fffffffff8cb535a09dd9p+0, false, false, ++ 0x1.000000fffffffff8cb535a09dd91p+0, false, false), + TEST ("1.00000005960464478", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000001p+0, false, +- false, +- 0x1.0000010000000054p+0, false, +- 0x1.0000010000000056p+0, false, +- 0x1.0000010000000054p+0, false, +- 0x1.0000010000000056p+0, false, +- false, +- 0x1.0000010000000054p+0, false, +- 0x1.0000010000000056p+0, false, +- 0x1.0000010000000054p+0, false, +- 0x1.0000010000000056p+0, false, +- false, +- 0x1.0000010000000055072873252f8p+0, false, +- 0x1.0000010000000055072873253p+0, false, +- 0x1.0000010000000055072873252f8p+0, false, +- 0x1.0000010000000055072873253p+0, false, +- false, +- 0x1.0000010000000055072873252febp+0, false, +- 0x1.0000010000000055072873252febp+0, false, +- 0x1.0000010000000055072873252febp+0, false, +- 0x1.0000010000000055072873252fecp+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ false, ++ 0x1.0000010000000054p+0, false, false, ++ 0x1.0000010000000056p+0, false, false, ++ 0x1.0000010000000054p+0, false, false, ++ 0x1.0000010000000056p+0, false, false, ++ false, ++ 0x1.0000010000000054p+0, false, false, ++ 0x1.0000010000000056p+0, false, false, ++ 0x1.0000010000000054p+0, false, false, ++ 0x1.0000010000000056p+0, false, false, ++ false, ++ 0x1.0000010000000055072873252f8p+0, false, false, ++ 0x1.0000010000000055072873253p+0, false, false, ++ 0x1.0000010000000055072873252f8p+0, false, false, ++ 0x1.0000010000000055072873253p+0, false, false, ++ false, ++ 0x1.0000010000000055072873252febp+0, false, false, ++ 0x1.0000010000000055072873252febp+0, false, false, ++ 0x1.0000010000000055072873252febp+0, false, false, ++ 0x1.0000010000000055072873252fecp+0, false, false), + TEST ("1.0000000596046448", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000001p+0, false, +- false, +- 0x1.00000100000001c4p+0, false, +- 0x1.00000100000001c6p+0, false, +- 0x1.00000100000001c4p+0, false, +- 0x1.00000100000001c6p+0, false, +- false, +- 0x1.00000100000001c4p+0, false, +- 0x1.00000100000001c6p+0, false, +- 0x1.00000100000001c4p+0, false, +- 0x1.00000100000001c6p+0, false, +- false, +- 0x1.00000100000001c5f67cd79279p+0, false, +- 0x1.00000100000001c5f67cd792798p+0, false, +- 0x1.00000100000001c5f67cd79279p+0, false, +- 0x1.00000100000001c5f67cd792798p+0, false, +- false, +- 0x1.00000100000001c5f67cd7927953p+0, false, +- 0x1.00000100000001c5f67cd7927954p+0, false, +- 0x1.00000100000001c5f67cd7927953p+0, false, +- 0x1.00000100000001c5f67cd7927954p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ false, ++ 0x1.00000100000001c4p+0, false, false, ++ 0x1.00000100000001c6p+0, false, false, ++ 0x1.00000100000001c4p+0, false, false, ++ 0x1.00000100000001c6p+0, false, false, ++ false, ++ 0x1.00000100000001c4p+0, false, false, ++ 0x1.00000100000001c6p+0, false, false, ++ 0x1.00000100000001c4p+0, false, false, ++ 0x1.00000100000001c6p+0, false, false, ++ false, ++ 0x1.00000100000001c5f67cd79279p+0, false, false, ++ 0x1.00000100000001c5f67cd792798p+0, false, false, ++ 0x1.00000100000001c5f67cd79279p+0, false, false, ++ 0x1.00000100000001c5f67cd792798p+0, false, false, ++ false, ++ 0x1.00000100000001c5f67cd7927953p+0, false, false, ++ 0x1.00000100000001c5f67cd7927954p+0, false, false, ++ 0x1.00000100000001c5f67cd7927953p+0, false, false, ++ 0x1.00000100000001c5f67cd7927954p+0, false, false), + TEST ("1.000000059604645", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.0000010000001p+0, false, +- 0x1.0000010000001p+0, false, +- 0x1.0000010000001p+0, false, +- 0x1.0000010000002p+0, false, +- false, +- 0x1.000001000000102ep+0, false, +- 0x1.000001000000103p+0, false, +- 0x1.000001000000102ep+0, false, +- 0x1.000001000000103p+0, false, +- false, +- 0x1.000001000000102ep+0, false, +- 0x1.000001000000103p+0, false, +- 0x1.000001000000102ep+0, false, +- 0x1.000001000000103p+0, false, +- false, +- 0x1.000001000000102f4fc8c3d757p+0, false, +- 0x1.000001000000102f4fc8c3d7578p+0, false, +- 0x1.000001000000102f4fc8c3d757p+0, false, +- 0x1.000001000000102f4fc8c3d7578p+0, false, +- false, +- 0x1.000001000000102f4fc8c3d75769p+0, false, +- 0x1.000001000000102f4fc8c3d75769p+0, false, +- 0x1.000001000000102f4fc8c3d75769p+0, false, +- 0x1.000001000000102f4fc8c3d7576ap+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.0000010000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ 0x1.0000010000002p+0, false, false, ++ false, ++ 0x1.000001000000102ep+0, false, false, ++ 0x1.000001000000103p+0, false, false, ++ 0x1.000001000000102ep+0, false, false, ++ 0x1.000001000000103p+0, false, false, ++ false, ++ 0x1.000001000000102ep+0, false, false, ++ 0x1.000001000000103p+0, false, false, ++ 0x1.000001000000102ep+0, false, false, ++ 0x1.000001000000103p+0, false, false, ++ false, ++ 0x1.000001000000102f4fc8c3d757p+0, false, false, ++ 0x1.000001000000102f4fc8c3d7578p+0, false, false, ++ 0x1.000001000000102f4fc8c3d757p+0, false, false, ++ 0x1.000001000000102f4fc8c3d7578p+0, false, false, ++ false, ++ 0x1.000001000000102f4fc8c3d75769p+0, false, false, ++ 0x1.000001000000102f4fc8c3d75769p+0, false, false, ++ 0x1.000001000000102f4fc8c3d75769p+0, false, false, ++ 0x1.000001000000102f4fc8c3d7576ap+0, false, false), + TEST ("1.00000005960464", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000000fffffeap+0, false, +- 0x1.000000fffffeap+0, false, +- 0x1.000000fffffeap+0, false, +- 0x1.000000fffffebp+0, false, +- false, +- 0x1.000000fffffea7e4p+0, false, +- 0x1.000000fffffea7e6p+0, false, +- 0x1.000000fffffea7e4p+0, false, +- 0x1.000000fffffea7e6p+0, false, +- false, +- 0x1.000000fffffea7e4p+0, false, +- 0x1.000000fffffea7e6p+0, false, +- 0x1.000000fffffea7e4p+0, false, +- 0x1.000000fffffea7e6p+0, false, +- false, +- 0x1.000000fffffea7e5975eb11da7p+0, false, +- 0x1.000000fffffea7e5975eb11da78p+0, false, +- 0x1.000000fffffea7e5975eb11da7p+0, false, +- 0x1.000000fffffea7e5975eb11da78p+0, false, +- false, +- 0x1.000000fffffea7e5975eb11da74ap+0, false, +- 0x1.000000fffffea7e5975eb11da74bp+0, false, +- 0x1.000000fffffea7e5975eb11da74ap+0, false, +- 0x1.000000fffffea7e5975eb11da74bp+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000000fffffeap+0, false, false, ++ 0x1.000000fffffeap+0, false, false, ++ 0x1.000000fffffeap+0, false, false, ++ 0x1.000000fffffebp+0, false, false, ++ false, ++ 0x1.000000fffffea7e4p+0, false, false, ++ 0x1.000000fffffea7e6p+0, false, false, ++ 0x1.000000fffffea7e4p+0, false, false, ++ 0x1.000000fffffea7e6p+0, false, false, ++ false, ++ 0x1.000000fffffea7e4p+0, false, false, ++ 0x1.000000fffffea7e6p+0, false, false, ++ 0x1.000000fffffea7e4p+0, false, false, ++ 0x1.000000fffffea7e6p+0, false, false, ++ false, ++ 0x1.000000fffffea7e5975eb11da7p+0, false, false, ++ 0x1.000000fffffea7e5975eb11da78p+0, false, false, ++ 0x1.000000fffffea7e5975eb11da7p+0, false, false, ++ 0x1.000000fffffea7e5975eb11da78p+0, false, false, ++ false, ++ 0x1.000000fffffea7e5975eb11da74ap+0, false, false, ++ 0x1.000000fffffea7e5975eb11da74bp+0, false, false, ++ 0x1.000000fffffea7e5975eb11da74ap+0, false, false, ++ 0x1.000000fffffea7e5975eb11da74bp+0, false, false), + TEST ("1.0000000596046", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000000fffff36p+0, false, +- 0x1.000000fffff36p+0, false, +- 0x1.000000fffff36p+0, false, +- 0x1.000000fffff37p+0, false, +- false, +- 0x1.000000fffff36596p+0, false, +- 0x1.000000fffff36598p+0, false, +- 0x1.000000fffff36596p+0, false, +- 0x1.000000fffff36598p+0, false, +- false, +- 0x1.000000fffff36596p+0, false, +- 0x1.000000fffff36598p+0, false, +- 0x1.000000fffff36596p+0, false, +- 0x1.000000fffff36598p+0, false, +- false, +- 0x1.000000fffff36597d40e1b5026p+0, false, +- 0x1.000000fffff36597d40e1b50268p+0, false, +- 0x1.000000fffff36597d40e1b5026p+0, false, +- 0x1.000000fffff36597d40e1b50268p+0, false, +- false, +- 0x1.000000fffff36597d40e1b502655p+0, false, +- 0x1.000000fffff36597d40e1b502656p+0, false, +- 0x1.000000fffff36597d40e1b502655p+0, false, +- 0x1.000000fffff36597d40e1b502656p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000000fffff36p+0, false, false, ++ 0x1.000000fffff36p+0, false, false, ++ 0x1.000000fffff36p+0, false, false, ++ 0x1.000000fffff37p+0, false, false, ++ false, ++ 0x1.000000fffff36596p+0, false, false, ++ 0x1.000000fffff36598p+0, false, false, ++ 0x1.000000fffff36596p+0, false, false, ++ 0x1.000000fffff36598p+0, false, false, ++ false, ++ 0x1.000000fffff36596p+0, false, false, ++ 0x1.000000fffff36598p+0, false, false, ++ 0x1.000000fffff36596p+0, false, false, ++ 0x1.000000fffff36598p+0, false, false, ++ false, ++ 0x1.000000fffff36597d40e1b5026p+0, false, false, ++ 0x1.000000fffff36597d40e1b50268p+0, false, false, ++ 0x1.000000fffff36597d40e1b5026p+0, false, false, ++ 0x1.000000fffff36597d40e1b50268p+0, false, false, ++ false, ++ 0x1.000000fffff36597d40e1b502655p+0, false, false, ++ 0x1.000000fffff36597d40e1b502656p+0, false, false, ++ 0x1.000000fffff36597d40e1b502655p+0, false, false, ++ 0x1.000000fffff36597d40e1b502656p+0, false, false), + TEST ("1.000000059605", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001000063fp+0, false, +- 0x1.000001000064p+0, false, +- 0x1.000001000063fp+0, false, +- 0x1.000001000064p+0, false, +- false, +- 0x1.000001000063fcap+0, false, +- 0x1.000001000063fca2p+0, false, +- 0x1.000001000063fcap+0, false, +- 0x1.000001000063fca2p+0, false, +- false, +- 0x1.000001000063fcap+0, false, +- 0x1.000001000063fca2p+0, false, +- 0x1.000001000063fcap+0, false, +- 0x1.000001000063fca2p+0, false, +- false, +- 0x1.000001000063fca17533f5572f8p+0, false, +- 0x1.000001000063fca17533f5573p+0, false, +- 0x1.000001000063fca17533f5572f8p+0, false, +- 0x1.000001000063fca17533f5573p+0, false, +- false, +- 0x1.000001000063fca17533f5572fe9p+0, false, +- 0x1.000001000063fca17533f5572feap+0, false, +- 0x1.000001000063fca17533f5572fe9p+0, false, +- 0x1.000001000063fca17533f5572feap+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001000063fp+0, false, false, ++ 0x1.000001000064p+0, false, false, ++ 0x1.000001000063fp+0, false, false, ++ 0x1.000001000064p+0, false, false, ++ false, ++ 0x1.000001000063fcap+0, false, false, ++ 0x1.000001000063fca2p+0, false, false, ++ 0x1.000001000063fcap+0, false, false, ++ 0x1.000001000063fca2p+0, false, false, ++ false, ++ 0x1.000001000063fcap+0, false, false, ++ 0x1.000001000063fca2p+0, false, false, ++ 0x1.000001000063fcap+0, false, false, ++ 0x1.000001000063fca2p+0, false, false, ++ false, ++ 0x1.000001000063fca17533f5572f8p+0, false, false, ++ 0x1.000001000063fca17533f5573p+0, false, false, ++ 0x1.000001000063fca17533f5572f8p+0, false, false, ++ 0x1.000001000063fca17533f5573p+0, false, false, ++ false, ++ 0x1.000001000063fca17533f5572fe9p+0, false, false, ++ 0x1.000001000063fca17533f5572feap+0, false, false, ++ 0x1.000001000063fca17533f5572fe9p+0, false, false, ++ 0x1.000001000063fca17533f5572feap+0, false, false), + TEST ("1.00000005960", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000000fffae49p+0, false, +- 0x1.000000fffae4ap+0, false, +- 0x1.000000fffae49p+0, false, +- 0x1.000000fffae4ap+0, false, +- false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- false, +- 0x1.000000fffae49ca916dacfff38p+0, false, +- 0x1.000000fffae49ca916dacfff38p+0, false, +- 0x1.000000fffae49ca916dacfff38p+0, false, +- 0x1.000000fffae49ca916dacfff388p+0, false, +- false, +- 0x1.000000fffae49ca916dacfff382dp+0, false, +- 0x1.000000fffae49ca916dacfff382dp+0, false, +- 0x1.000000fffae49ca916dacfff382dp+0, false, +- 0x1.000000fffae49ca916dacfff382ep+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000000fffae49p+0, false, false, ++ 0x1.000000fffae4ap+0, false, false, ++ 0x1.000000fffae49p+0, false, false, ++ 0x1.000000fffae4ap+0, false, false, ++ false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ false, ++ 0x1.000000fffae49ca916dacfff38p+0, false, false, ++ 0x1.000000fffae49ca916dacfff38p+0, false, false, ++ 0x1.000000fffae49ca916dacfff38p+0, false, false, ++ 0x1.000000fffae49ca916dacfff388p+0, false, false, ++ false, ++ 0x1.000000fffae49ca916dacfff382dp+0, false, false, ++ 0x1.000000fffae49ca916dacfff382dp+0, false, false, ++ 0x1.000000fffae49ca916dacfff382dp+0, false, false, ++ 0x1.000000fffae49ca916dacfff382ep+0, false, false), + TEST ("1.0000000596", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000000fffae49p+0, false, +- 0x1.000000fffae4ap+0, false, +- 0x1.000000fffae49p+0, false, +- 0x1.000000fffae4ap+0, false, +- false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- false, +- 0x1.000000fffae49ca916dacfff38p+0, false, +- 0x1.000000fffae49ca916dacfff38p+0, false, +- 0x1.000000fffae49ca916dacfff38p+0, false, +- 0x1.000000fffae49ca916dacfff388p+0, false, +- false, +- 0x1.000000fffae49ca916dacfff382dp+0, false, +- 0x1.000000fffae49ca916dacfff382dp+0, false, +- 0x1.000000fffae49ca916dacfff382dp+0, false, +- 0x1.000000fffae49ca916dacfff382ep+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000000fffae49p+0, false, false, ++ 0x1.000000fffae4ap+0, false, false, ++ 0x1.000000fffae49p+0, false, false, ++ 0x1.000000fffae4ap+0, false, false, ++ false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ false, ++ 0x1.000000fffae49ca916dacfff38p+0, false, false, ++ 0x1.000000fffae49ca916dacfff38p+0, false, false, ++ 0x1.000000fffae49ca916dacfff38p+0, false, false, ++ 0x1.000000fffae49ca916dacfff388p+0, false, false, ++ false, ++ 0x1.000000fffae49ca916dacfff382dp+0, false, false, ++ 0x1.000000fffae49ca916dacfff382dp+0, false, false, ++ 0x1.000000fffae49ca916dacfff382dp+0, false, false, ++ 0x1.000000fffae49ca916dacfff382ep+0, false, false), + TEST ("1.000000060", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.00000101b2b29p+0, false, +- 0x1.00000101b2b2ap+0, false, +- 0x1.00000101b2b29p+0, false, +- 0x1.00000101b2b2ap+0, false, +- false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a48p+0, false, +- false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a48p+0, false, +- false, +- 0x1.00000101b2b29a4692b67b7ca3p+0, false, +- 0x1.00000101b2b29a4692b67b7ca3p+0, false, +- 0x1.00000101b2b29a4692b67b7ca3p+0, false, +- 0x1.00000101b2b29a4692b67b7ca38p+0, false, +- false, +- 0x1.00000101b2b29a4692b67b7ca313p+0, false, +- 0x1.00000101b2b29a4692b67b7ca314p+0, false, +- 0x1.00000101b2b29a4692b67b7ca313p+0, false, +- 0x1.00000101b2b29a4692b67b7ca314p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.00000101b2b29p+0, false, false, ++ 0x1.00000101b2b2ap+0, false, false, ++ 0x1.00000101b2b29p+0, false, false, ++ 0x1.00000101b2b2ap+0, false, false, ++ false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a48p+0, false, false, ++ false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a48p+0, false, false, ++ false, ++ 0x1.00000101b2b29a4692b67b7ca3p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca3p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca3p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca38p+0, false, false, ++ false, ++ 0x1.00000101b2b29a4692b67b7ca313p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca314p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca313p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca314p+0, false, false), + TEST ("1.00000006", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.00000101b2b29p+0, false, +- 0x1.00000101b2b2ap+0, false, +- 0x1.00000101b2b29p+0, false, +- 0x1.00000101b2b2ap+0, false, +- false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a48p+0, false, +- false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a48p+0, false, +- false, +- 0x1.00000101b2b29a4692b67b7ca3p+0, false, +- 0x1.00000101b2b29a4692b67b7ca3p+0, false, +- 0x1.00000101b2b29a4692b67b7ca3p+0, false, +- 0x1.00000101b2b29a4692b67b7ca38p+0, false, +- false, +- 0x1.00000101b2b29a4692b67b7ca313p+0, false, +- 0x1.00000101b2b29a4692b67b7ca314p+0, false, +- 0x1.00000101b2b29a4692b67b7ca313p+0, false, +- 0x1.00000101b2b29a4692b67b7ca314p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.00000101b2b29p+0, false, false, ++ 0x1.00000101b2b2ap+0, false, false, ++ 0x1.00000101b2b29p+0, false, false, ++ 0x1.00000101b2b2ap+0, false, false, ++ false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a48p+0, false, false, ++ false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a48p+0, false, false, ++ false, ++ 0x1.00000101b2b29a4692b67b7ca3p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca3p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca3p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca38p+0, false, false, ++ false, ++ 0x1.00000101b2b29a4692b67b7ca313p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca314p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca313p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca314p+0, false, false), + TEST ("1.0000001", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001ad7f29ap+0, false, +- 0x1.000001ad7f29bp+0, false, +- 0x1.000001ad7f29ap+0, false, +- 0x1.000001ad7f29bp+0, false, +- false, +- 0x1.000001ad7f29abcap+0, false, +- 0x1.000001ad7f29abcap+0, false, +- 0x1.000001ad7f29abcap+0, false, +- 0x1.000001ad7f29abccp+0, false, +- false, +- 0x1.000001ad7f29abcap+0, false, +- 0x1.000001ad7f29abcap+0, false, +- 0x1.000001ad7f29abcap+0, false, +- 0x1.000001ad7f29abccp+0, false, +- false, +- 0x1.000001ad7f29abcaf485787a65p+0, false, +- 0x1.000001ad7f29abcaf485787a65p+0, false, +- 0x1.000001ad7f29abcaf485787a65p+0, false, +- 0x1.000001ad7f29abcaf485787a658p+0, false, +- false, +- 0x1.000001ad7f29abcaf485787a652p+0, false, +- 0x1.000001ad7f29abcaf485787a6521p+0, false, +- 0x1.000001ad7f29abcaf485787a652p+0, false, +- 0x1.000001ad7f29abcaf485787a6521p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001ad7f29ap+0, false, false, ++ 0x1.000001ad7f29bp+0, false, false, ++ 0x1.000001ad7f29ap+0, false, false, ++ 0x1.000001ad7f29bp+0, false, false, ++ false, ++ 0x1.000001ad7f29abcap+0, false, false, ++ 0x1.000001ad7f29abcap+0, false, false, ++ 0x1.000001ad7f29abcap+0, false, false, ++ 0x1.000001ad7f29abccp+0, false, false, ++ false, ++ 0x1.000001ad7f29abcap+0, false, false, ++ 0x1.000001ad7f29abcap+0, false, false, ++ 0x1.000001ad7f29abcap+0, false, false, ++ 0x1.000001ad7f29abccp+0, false, false, ++ false, ++ 0x1.000001ad7f29abcaf485787a65p+0, false, false, ++ 0x1.000001ad7f29abcaf485787a65p+0, false, false, ++ 0x1.000001ad7f29abcaf485787a65p+0, false, false, ++ 0x1.000001ad7f29abcaf485787a658p+0, false, false, ++ false, ++ 0x1.000001ad7f29abcaf485787a652p+0, false, false, ++ 0x1.000001ad7f29abcaf485787a6521p+0, false, false, ++ 0x1.000001ad7f29abcaf485787a652p+0, false, false, ++ 0x1.000001ad7f29abcaf485787a6521p+0, false, false), + TEST ("1.000000", + true, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- true, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- true, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- true, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- true, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- true, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ true, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ true, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ true, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ true, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ true, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false), + TEST ("1.00000000000000011113", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- false, +- 0x1.0000000000000801fc96557232p+0, false, +- 0x1.0000000000000801fc96557232p+0, false, +- 0x1.0000000000000801fc96557232p+0, false, +- 0x1.0000000000000801fc965572328p+0, false, +- false, +- 0x1.0000000000000801fc9655723222p+0, false, +- 0x1.0000000000000801fc9655723222p+0, false, +- 0x1.0000000000000801fc9655723222p+0, false, +- 0x1.0000000000000801fc9655723223p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ false, ++ 0x1.0000000000000801fc96557232p+0, false, false, ++ 0x1.0000000000000801fc96557232p+0, false, false, ++ 0x1.0000000000000801fc96557232p+0, false, false, ++ 0x1.0000000000000801fc965572328p+0, false, false, ++ false, ++ 0x1.0000000000000801fc9655723222p+0, false, false, ++ 0x1.0000000000000801fc9655723222p+0, false, false, ++ 0x1.0000000000000801fc9655723222p+0, false, false, ++ 0x1.0000000000000801fc9655723223p+0, false, false), + TEST ("1.00000000000000011103", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- false, +- 0x1.00000000000008002459c076c48p+0, false, +- 0x1.00000000000008002459c076c5p+0, false, +- 0x1.00000000000008002459c076c48p+0, false, +- 0x1.00000000000008002459c076c5p+0, false, +- false, +- 0x1.00000000000008002459c076c4f7p+0, false, +- 0x1.00000000000008002459c076c4f8p+0, false, +- 0x1.00000000000008002459c076c4f7p+0, false, +- 0x1.00000000000008002459c076c4f8p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ false, ++ 0x1.00000000000008002459c076c48p+0, false, false, ++ 0x1.00000000000008002459c076c5p+0, false, false, ++ 0x1.00000000000008002459c076c48p+0, false, false, ++ 0x1.00000000000008002459c076c5p+0, false, false, ++ false, ++ 0x1.00000000000008002459c076c4f7p+0, false, false, ++ 0x1.00000000000008002459c076c4f8p+0, false, false, ++ 0x1.00000000000008002459c076c4f7p+0, false, false, ++ 0x1.00000000000008002459c076c4f8p+0, false, false), + TEST ("1.00000000000000011102", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- false, +- 0x1.00000000000007fff5207e5dap+0, false, +- 0x1.00000000000007fff5207e5da08p+0, false, +- 0x1.00000000000007fff5207e5dap+0, false, +- 0x1.00000000000007fff5207e5da08p+0, false, +- false, +- 0x1.00000000000007fff5207e5da073p+0, false, +- 0x1.00000000000007fff5207e5da073p+0, false, +- 0x1.00000000000007fff5207e5da073p+0, false, +- 0x1.00000000000007fff5207e5da074p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ false, ++ 0x1.00000000000007fff5207e5dap+0, false, false, ++ 0x1.00000000000007fff5207e5da08p+0, false, false, ++ 0x1.00000000000007fff5207e5dap+0, false, false, ++ 0x1.00000000000007fff5207e5da08p+0, false, false, ++ false, ++ 0x1.00000000000007fff5207e5da073p+0, false, false, ++ 0x1.00000000000007fff5207e5da073p+0, false, false, ++ 0x1.00000000000007fff5207e5da073p+0, false, false, ++ 0x1.00000000000007fff5207e5da074p+0, false, false), + TEST ("1.00000000000000011101", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- false, +- 0x1.00000000000007ffc5e73c447b8p+0, false, +- 0x1.00000000000007ffc5e73c447cp+0, false, +- 0x1.00000000000007ffc5e73c447b8p+0, false, +- 0x1.00000000000007ffc5e73c447cp+0, false, +- false, +- 0x1.00000000000007ffc5e73c447befp+0, false, +- 0x1.00000000000007ffc5e73c447befp+0, false, +- 0x1.00000000000007ffc5e73c447befp+0, false, +- 0x1.00000000000007ffc5e73c447bfp+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ false, ++ 0x1.00000000000007ffc5e73c447b8p+0, false, false, ++ 0x1.00000000000007ffc5e73c447cp+0, false, false, ++ 0x1.00000000000007ffc5e73c447b8p+0, false, false, ++ 0x1.00000000000007ffc5e73c447cp+0, false, false, ++ false, ++ 0x1.00000000000007ffc5e73c447befp+0, false, false, ++ 0x1.00000000000007ffc5e73c447befp+0, false, false, ++ 0x1.00000000000007ffc5e73c447befp+0, false, false, ++ 0x1.00000000000007ffc5e73c447bfp+0, false, false), + TEST ("1.0000000000000001111", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- false, +- 0x1.00000000000008016eea8f26c48p+0, false, +- 0x1.00000000000008016eea8f26c48p+0, false, +- 0x1.00000000000008016eea8f26c48p+0, false, +- 0x1.00000000000008016eea8f26c5p+0, false, +- false, +- 0x1.00000000000008016eea8f26c495p+0, false, +- 0x1.00000000000008016eea8f26c496p+0, false, +- 0x1.00000000000008016eea8f26c495p+0, false, +- 0x1.00000000000008016eea8f26c496p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ false, ++ 0x1.00000000000008016eea8f26c48p+0, false, false, ++ 0x1.00000000000008016eea8f26c48p+0, false, false, ++ 0x1.00000000000008016eea8f26c48p+0, false, false, ++ 0x1.00000000000008016eea8f26c5p+0, false, false, ++ false, ++ 0x1.00000000000008016eea8f26c495p+0, false, false, ++ 0x1.00000000000008016eea8f26c496p+0, false, false, ++ 0x1.00000000000008016eea8f26c495p+0, false, false, ++ 0x1.00000000000008016eea8f26c496p+0, false, false), + TEST ("1.000000000000000111", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- false, +- 0x1.00000000000007ff96adfa2b57p+0, false, +- 0x1.00000000000007ff96adfa2b578p+0, false, +- 0x1.00000000000007ff96adfa2b57p+0, false, +- 0x1.00000000000007ff96adfa2b578p+0, false, +- false, +- 0x1.00000000000007ff96adfa2b576ap+0, false, +- 0x1.00000000000007ff96adfa2b576bp+0, false, +- 0x1.00000000000007ff96adfa2b576ap+0, false, +- 0x1.00000000000007ff96adfa2b576bp+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ false, ++ 0x1.00000000000007ff96adfa2b57p+0, false, false, ++ 0x1.00000000000007ff96adfa2b578p+0, false, false, ++ 0x1.00000000000007ff96adfa2b57p+0, false, false, ++ 0x1.00000000000007ff96adfa2b578p+0, false, false, ++ false, ++ 0x1.00000000000007ff96adfa2b576ap+0, false, false, ++ 0x1.00000000000007ff96adfa2b576bp+0, false, false, ++ 0x1.00000000000007ff96adfa2b576ap+0, false, false, ++ 0x1.00000000000007ff96adfa2b576bp+0, false, false), + TEST ("1.00000000000000011", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000007ecp+0, false, +- 0x1.00000000000007eep+0, false, +- 0x1.00000000000007ecp+0, false, +- 0x1.00000000000007eep+0, false, +- false, +- 0x1.00000000000007ecp+0, false, +- 0x1.00000000000007eep+0, false, +- 0x1.00000000000007ecp+0, false, +- 0x1.00000000000007eep+0, false, +- false, +- 0x1.00000000000007ed24502859138p+0, false, +- 0x1.00000000000007ed24502859138p+0, false, +- 0x1.00000000000007ed24502859138p+0, false, +- 0x1.00000000000007ed2450285914p+0, false, +- false, +- 0x1.00000000000007ed2450285913bfp+0, false, +- 0x1.00000000000007ed2450285913bfp+0, false, +- 0x1.00000000000007ed2450285913bfp+0, false, +- 0x1.00000000000007ed2450285913cp+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000007ecp+0, false, false, ++ 0x1.00000000000007eep+0, false, false, ++ 0x1.00000000000007ecp+0, false, false, ++ 0x1.00000000000007eep+0, false, false, ++ false, ++ 0x1.00000000000007ecp+0, false, false, ++ 0x1.00000000000007eep+0, false, false, ++ 0x1.00000000000007ecp+0, false, false, ++ 0x1.00000000000007eep+0, false, false, ++ false, ++ 0x1.00000000000007ed24502859138p+0, false, false, ++ 0x1.00000000000007ed24502859138p+0, false, false, ++ 0x1.00000000000007ed24502859138p+0, false, false, ++ 0x1.00000000000007ed2450285914p+0, false, false, ++ false, ++ 0x1.00000000000007ed2450285913bfp+0, false, false, ++ 0x1.00000000000007ed2450285913bfp+0, false, false, ++ 0x1.00000000000007ed2450285913bfp+0, false, false, ++ 0x1.00000000000007ed2450285913cp+0, false, false), + TEST ("1.0000000000000001", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.0000000000000734p+0, false, +- 0x1.0000000000000734p+0, false, +- 0x1.0000000000000734p+0, false, +- 0x1.0000000000000736p+0, false, +- false, +- 0x1.0000000000000734p+0, false, +- 0x1.0000000000000734p+0, false, +- 0x1.0000000000000734p+0, false, +- 0x1.0000000000000736p+0, false, +- false, +- 0x1.0000000000000734aca5f6226fp+0, false, +- 0x1.0000000000000734aca5f6226fp+0, false, +- 0x1.0000000000000734aca5f6226fp+0, false, +- 0x1.0000000000000734aca5f6226f8p+0, false, +- false, +- 0x1.0000000000000734aca5f6226f0ap+0, false, +- 0x1.0000000000000734aca5f6226f0bp+0, false, +- 0x1.0000000000000734aca5f6226f0ap+0, false, +- 0x1.0000000000000734aca5f6226f0bp+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.0000000000000734p+0, false, false, ++ 0x1.0000000000000734p+0, false, false, ++ 0x1.0000000000000734p+0, false, false, ++ 0x1.0000000000000736p+0, false, false, ++ false, ++ 0x1.0000000000000734p+0, false, false, ++ 0x1.0000000000000734p+0, false, false, ++ 0x1.0000000000000734p+0, false, false, ++ 0x1.0000000000000736p+0, false, false, ++ false, ++ 0x1.0000000000000734aca5f6226fp+0, false, false, ++ 0x1.0000000000000734aca5f6226fp+0, false, false, ++ 0x1.0000000000000734aca5f6226fp+0, false, false, ++ 0x1.0000000000000734aca5f6226f8p+0, false, false, ++ false, ++ 0x1.0000000000000734aca5f6226f0ap+0, false, false, ++ 0x1.0000000000000734aca5f6226f0bp+0, false, false, ++ 0x1.0000000000000734aca5f6226f0ap+0, false, false, ++ 0x1.0000000000000734aca5f6226f0bp+0, false, false), + TEST ("3929201589819414e-25", + false, +- 0x1.b0053p-32, false, +- 0x1.b00532p-32, false, +- 0x1.b0053p-32, false, +- 0x1.b00532p-32, false, +- false, +- 0x1.b005314e2421ep-32, false, +- 0x1.b005314e2421ep-32, false, +- 0x1.b005314e2421ep-32, false, +- 0x1.b005314e2421fp-32, false, +- false, +- 0x1.b005314e2421e7fep-32, false, +- 0x1.b005314e2421e8p-32, false, +- 0x1.b005314e2421e7fep-32, false, +- 0x1.b005314e2421e8p-32, false, +- false, +- 0x1.b005314e2421e7fep-32, false, +- 0x1.b005314e2421e8p-32, false, +- 0x1.b005314e2421e7fep-32, false, +- 0x1.b005314e2421e8p-32, false, +- false, +- 0x1.b005314e2421e7ffb472840c5ap-32, false, +- 0x1.b005314e2421e7ffb472840c5a8p-32, false, +- 0x1.b005314e2421e7ffb472840c5ap-32, false, +- 0x1.b005314e2421e7ffb472840c5a8p-32, false, +- false, +- 0x1.b005314e2421e7ffb472840c5a6ep-32, false, +- 0x1.b005314e2421e7ffb472840c5a6fp-32, false, +- 0x1.b005314e2421e7ffb472840c5a6ep-32, false, +- 0x1.b005314e2421e7ffb472840c5a6fp-32, false), ++ 0x1.b0053p-32, false, false, ++ 0x1.b00532p-32, false, false, ++ 0x1.b0053p-32, false, false, ++ 0x1.b00532p-32, false, false, ++ false, ++ 0x1.b005314e2421ep-32, false, false, ++ 0x1.b005314e2421ep-32, false, false, ++ 0x1.b005314e2421ep-32, false, false, ++ 0x1.b005314e2421fp-32, false, false, ++ false, ++ 0x1.b005314e2421e7fep-32, false, false, ++ 0x1.b005314e2421e8p-32, false, false, ++ 0x1.b005314e2421e7fep-32, false, false, ++ 0x1.b005314e2421e8p-32, false, false, ++ false, ++ 0x1.b005314e2421e7fep-32, false, false, ++ 0x1.b005314e2421e8p-32, false, false, ++ 0x1.b005314e2421e7fep-32, false, false, ++ 0x1.b005314e2421e8p-32, false, false, ++ false, ++ 0x1.b005314e2421e7ffb472840c5ap-32, false, false, ++ 0x1.b005314e2421e7ffb472840c5a8p-32, false, false, ++ 0x1.b005314e2421e7ffb472840c5ap-32, false, false, ++ 0x1.b005314e2421e7ffb472840c5a8p-32, false, false, ++ false, ++ 0x1.b005314e2421e7ffb472840c5a6ep-32, false, false, ++ 0x1.b005314e2421e7ffb472840c5a6fp-32, false, false, ++ 0x1.b005314e2421e7ffb472840c5a6ep-32, false, false, ++ 0x1.b005314e2421e7ffb472840c5a6fp-32, false, false), + TEST ("0.0000000000000000000000000000000000000000000021019476964872" + "256063855943749348741969203929128147736576356024258346866240" + "28790902229957282543182373046875", + false, +- 0x8p-152, false, +- 0x1p-148, false, +- 0x8p-152, false, +- 0x1p-148, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false), ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false), + TEST ("1.00000005960464477539062499", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000000fffffffp+0, false, +- 0x1.000001p+0, false, +- 0x1.000000fffffffp+0, false, +- 0x1.000001p+0, false, +- false, +- 0x1.000000fffffffffep+0, false, +- 0x1.000001p+0, false, +- 0x1.000000fffffffffep+0, false, +- 0x1.000001p+0, false, +- false, +- 0x1.000000fffffffffep+0, false, +- 0x1.000001p+0, false, +- 0x1.000000fffffffffep+0, false, +- 0x1.000001p+0, false, +- false, +- 0x1.000000fffffffffffffffce7b78p+0, false, +- 0x1.000000fffffffffffffffce7b8p+0, false, +- 0x1.000000fffffffffffffffce7b78p+0, false, +- 0x1.000000fffffffffffffffce7b8p+0, false, +- false, +- 0x1.000000fffffffffffffffce7b7e7p+0, false, +- 0x1.000000fffffffffffffffce7b7e7p+0, false, +- 0x1.000000fffffffffffffffce7b7e7p+0, false, +- 0x1.000000fffffffffffffffce7b7e8p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000000fffffffp+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000000fffffffp+0, false, false, ++ 0x1.000001p+0, false, false, ++ false, ++ 0x1.000000fffffffffep+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000000fffffffffep+0, false, false, ++ 0x1.000001p+0, false, false, ++ false, ++ 0x1.000000fffffffffep+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000000fffffffffep+0, false, false, ++ 0x1.000001p+0, false, false, ++ false, ++ 0x1.000000fffffffffffffffce7b78p+0, false, false, ++ 0x1.000000fffffffffffffffce7b8p+0, false, false, ++ 0x1.000000fffffffffffffffce7b78p+0, false, false, ++ 0x1.000000fffffffffffffffce7b8p+0, false, false, ++ false, ++ 0x1.000000fffffffffffffffce7b7e7p+0, false, false, ++ 0x1.000000fffffffffffffffce7b7e7p+0, false, false, ++ 0x1.000000fffffffffffffffce7b7e7p+0, false, false, ++ 0x1.000000fffffffffffffffce7b7e8p+0, false, false), + TEST ("1.000000059604644775390625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- true, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- true, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- true, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- true, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ true, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ true, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ true, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ true, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false), + TEST ("1.00000005960464477539062501", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000001p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000000002p+0, false, +- false, +- 0x1.00000100000000000000031848p+0, false, +- 0x1.00000100000000000000031848p+0, false, +- 0x1.00000100000000000000031848p+0, false, +- 0x1.000001000000000000000318488p+0, false, +- false, +- 0x1.0000010000000000000003184818p+0, false, +- 0x1.0000010000000000000003184819p+0, false, +- 0x1.0000010000000000000003184818p+0, false, +- 0x1.0000010000000000000003184819p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ false, ++ 0x1.00000100000000000000031848p+0, false, false, ++ 0x1.00000100000000000000031848p+0, false, false, ++ 0x1.00000100000000000000031848p+0, false, false, ++ 0x1.000001000000000000000318488p+0, false, false, ++ false, ++ 0x1.0000010000000000000003184818p+0, false, false, ++ 0x1.0000010000000000000003184819p+0, false, false, ++ 0x1.0000010000000000000003184818p+0, false, false, ++ 0x1.0000010000000000000003184819p+0, false, false), + TEST ("1.00000011920928955078125", + true, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false), ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false), + TEST ("1.00000017881393432617187499", + false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000004p+0, false, +- false, +- 0x1.000002fffffffp+0, false, +- 0x1.000003p+0, false, +- 0x1.000002fffffffp+0, false, +- 0x1.000003p+0, false, +- false, +- 0x1.000002fffffffffep+0, false, +- 0x1.000003p+0, false, +- 0x1.000002fffffffffep+0, false, +- 0x1.000003p+0, false, +- false, +- 0x1.000002fffffffffep+0, false, +- 0x1.000003p+0, false, +- 0x1.000002fffffffffep+0, false, +- 0x1.000003p+0, false, +- false, +- 0x1.000002fffffffffffffffce7b78p+0, false, +- 0x1.000002fffffffffffffffce7b8p+0, false, +- 0x1.000002fffffffffffffffce7b78p+0, false, +- 0x1.000002fffffffffffffffce7b8p+0, false, +- false, +- 0x1.000002fffffffffffffffce7b7e7p+0, false, +- 0x1.000002fffffffffffffffce7b7e7p+0, false, +- 0x1.000002fffffffffffffffce7b7e7p+0, false, +- 0x1.000002fffffffffffffffce7b7e8p+0, false), ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000004p+0, false, false, ++ false, ++ 0x1.000002fffffffp+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000002fffffffp+0, false, false, ++ 0x1.000003p+0, false, false, ++ false, ++ 0x1.000002fffffffffep+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000002fffffffffep+0, false, false, ++ 0x1.000003p+0, false, false, ++ false, ++ 0x1.000002fffffffffep+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000002fffffffffep+0, false, false, ++ 0x1.000003p+0, false, false, ++ false, ++ 0x1.000002fffffffffffffffce7b78p+0, false, false, ++ 0x1.000002fffffffffffffffce7b8p+0, false, false, ++ 0x1.000002fffffffffffffffce7b78p+0, false, false, ++ 0x1.000002fffffffffffffffce7b8p+0, false, false, ++ false, ++ 0x1.000002fffffffffffffffce7b7e7p+0, false, false, ++ 0x1.000002fffffffffffffffce7b7e7p+0, false, false, ++ 0x1.000002fffffffffffffffce7b7e7p+0, false, false, ++ 0x1.000002fffffffffffffffce7b7e8p+0, false, false), + TEST ("1.000000178813934326171875", + false, +- 0x1.000002p+0, false, +- 0x1.000004p+0, false, +- 0x1.000002p+0, false, +- 0x1.000004p+0, false, +- true, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- true, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- true, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- true, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- true, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false), ++ 0x1.000002p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000004p+0, false, false, ++ true, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ true, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ true, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ true, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ true, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false), + TEST ("1.00000017881393432617187501", + false, +- 0x1.000002p+0, false, +- 0x1.000004p+0, false, +- 0x1.000002p+0, false, +- 0x1.000004p+0, false, +- false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.0000030000001p+0, false, +- false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.0000030000000002p+0, false, +- false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.0000030000000002p+0, false, +- false, +- 0x1.00000300000000000000031848p+0, false, +- 0x1.00000300000000000000031848p+0, false, +- 0x1.00000300000000000000031848p+0, false, +- 0x1.000003000000000000000318488p+0, false, +- false, +- 0x1.0000030000000000000003184818p+0, false, +- 0x1.0000030000000000000003184819p+0, false, +- 0x1.0000030000000000000003184818p+0, false, +- 0x1.0000030000000000000003184819p+0, false), ++ 0x1.000002p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000004p+0, false, false, ++ false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.0000030000001p+0, false, false, ++ false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.0000030000000002p+0, false, false, ++ false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.0000030000000002p+0, false, false, ++ false, ++ 0x1.00000300000000000000031848p+0, false, false, ++ 0x1.00000300000000000000031848p+0, false, false, ++ 0x1.00000300000000000000031848p+0, false, false, ++ 0x1.000003000000000000000318488p+0, false, false, ++ false, ++ 0x1.0000030000000000000003184818p+0, false, false, ++ 0x1.0000030000000000000003184819p+0, false, false, ++ 0x1.0000030000000000000003184818p+0, false, false, ++ 0x1.0000030000000000000003184819p+0, false, false), + TEST ("1.0000002384185791015625", + true, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- true, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- true, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- true, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- true, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- true, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false), ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ true, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ true, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ true, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ true, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ true, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false), + TEST ("1.08420217248550443400745280086994171142578125e-19", + true, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- true, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- true, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- true, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- true, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- true, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false), ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ true, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ true, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ true, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ true, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ true, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false), + TEST ("1.0842022371089897897127399001987457793916291848290711641311" + "645507812499e-19", + false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2.000004p-64, false, +- false, +- 0x2.000001ffffffep-64, false, +- 0x2.000002p-64, false, +- 0x2.000001ffffffep-64, false, +- 0x2.000002p-64, false, +- false, +- 0x2.000001fffffffffcp-64, false, +- 0x2.000002p-64, false, +- 0x2.000001fffffffffcp-64, false, +- 0x2.000002p-64, false, +- false, +- 0x2.000001fffffffffcp-64, false, +- 0x2.000002p-64, false, +- 0x2.000001fffffffffcp-64, false, +- 0x2.000002p-64, false, +- false, +- 0x2.000001ffffffffffffffffffffp-64, false, +- 0x2.000002p-64, false, +- 0x2.000001ffffffffffffffffffffp-64, false, +- 0x2.000002p-64, false, +- false, +- 0x2.000001fffffffffffffffffffffep-64, false, +- 0x2.000002p-64, false, +- 0x2.000001fffffffffffffffffffffep-64, false, +- 0x2.000002p-64, false), ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2.000004p-64, false, false, ++ false, ++ 0x2.000001ffffffep-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000001ffffffep-64, false, false, ++ 0x2.000002p-64, false, false, ++ false, ++ 0x2.000001fffffffffcp-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000001fffffffffcp-64, false, false, ++ 0x2.000002p-64, false, false, ++ false, ++ 0x2.000001fffffffffcp-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000001fffffffffcp-64, false, false, ++ 0x2.000002p-64, false, false, ++ false, ++ 0x2.000001ffffffffffffffffffffp-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000001ffffffffffffffffffffp-64, false, false, ++ 0x2.000002p-64, false, false, ++ false, ++ 0x2.000001fffffffffffffffffffffep-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000001fffffffffffffffffffffep-64, false, false, ++ 0x2.000002p-64, false, false), + TEST ("1.0842022371089897897127399001987457793916291848290711641311" + "6455078125e-19", + false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2.000004p-64, false, +- true, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- true, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- true, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- true, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- true, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false), ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2.000004p-64, false, false, ++ true, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ true, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ true, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ true, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ true, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false), + TEST ("1.0842022371089897897127399001987457793916291848290711641311" + "645507812501e-19", + false, +- 0x2p-64, false, +- 0x2.000004p-64, false, +- 0x2p-64, false, +- 0x2.000004p-64, false, +- false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.0000020000002p-64, false, +- false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.0000020000000004p-64, false, +- false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.0000020000000004p-64, false, +- false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.00000200000000000000000001p-64, false, +- false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.0000020000000000000000000002p-64, false), ++ 0x2p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2.000004p-64, false, false, ++ false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.0000020000002p-64, false, false, ++ false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.0000020000000004p-64, false, false, ++ false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.0000020000000004p-64, false, false, ++ false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.00000200000000000000000001p-64, false, false, ++ false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.0000020000000000000000000002p-64, false, false), + TEST ("1.0842023017324751454180269995275498473574771196581423282623" + "291015625e-19", + true, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- true, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- true, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- true, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- true, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- true, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false), ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ true, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ true, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ true, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ true, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ true, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false), + TEST ("1.0842023663559605011233140988563539153233250544872134923934" + "936523437499e-19", + false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000008p-64, false, +- false, +- 0x2.000005ffffffep-64, false, +- 0x2.000006p-64, false, +- 0x2.000005ffffffep-64, false, +- 0x2.000006p-64, false, +- false, +- 0x2.000005fffffffffcp-64, false, +- 0x2.000006p-64, false, +- 0x2.000005fffffffffcp-64, false, +- 0x2.000006p-64, false, +- false, +- 0x2.000005fffffffffcp-64, false, +- 0x2.000006p-64, false, +- 0x2.000005fffffffffcp-64, false, +- 0x2.000006p-64, false, +- false, +- 0x2.000005ffffffffffffffffffffp-64, false, +- 0x2.000006p-64, false, +- 0x2.000005ffffffffffffffffffffp-64, false, +- 0x2.000006p-64, false, +- false, +- 0x2.000005fffffffffffffffffffffep-64, false, +- 0x2.000006p-64, false, +- 0x2.000005fffffffffffffffffffffep-64, false, +- 0x2.000006p-64, false), ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000008p-64, false, false, ++ false, ++ 0x2.000005ffffffep-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000005ffffffep-64, false, false, ++ 0x2.000006p-64, false, false, ++ false, ++ 0x2.000005fffffffffcp-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000005fffffffffcp-64, false, false, ++ 0x2.000006p-64, false, false, ++ false, ++ 0x2.000005fffffffffcp-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000005fffffffffcp-64, false, false, ++ 0x2.000006p-64, false, false, ++ false, ++ 0x2.000005ffffffffffffffffffffp-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000005ffffffffffffffffffffp-64, false, false, ++ 0x2.000006p-64, false, false, ++ false, ++ 0x2.000005fffffffffffffffffffffep-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000005fffffffffffffffffffffep-64, false, false, ++ 0x2.000006p-64, false, false), + TEST ("1.0842023663559605011233140988563539153233250544872134923934" + "9365234375e-19", + false, +- 0x2.000004p-64, false, +- 0x2.000008p-64, false, +- 0x2.000004p-64, false, +- 0x2.000008p-64, false, +- true, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- true, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- true, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- true, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- true, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false), ++ 0x2.000004p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000008p-64, false, false, ++ true, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ true, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ true, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ true, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ true, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false), + TEST ("1.0842023663559605011233140988563539153233250544872134923934" + "936523437501e-19", + false, +- 0x2.000004p-64, false, +- 0x2.000008p-64, false, +- 0x2.000004p-64, false, +- 0x2.000008p-64, false, +- false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.0000060000002p-64, false, +- false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.0000060000000004p-64, false, +- false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.0000060000000004p-64, false, +- false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.00000600000000000000000001p-64, false, +- false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.0000060000000000000000000002p-64, false), ++ 0x2.000004p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000008p-64, false, false, ++ false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.0000060000002p-64, false, false, ++ false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.0000060000000004p-64, false, false, ++ false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.0000060000000004p-64, false, false, ++ false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.00000600000000000000000001p-64, false, false, ++ false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.0000060000000000000000000002p-64, false, false), + TEST ("1.0842024309794458568286011981851579832891729893162846565246" + "58203125e-19", + true, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- true, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- true, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- true, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- true, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- true, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false), ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ true, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ true, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ true, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ true, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ true, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false), + TEST ("7.5231638452626400509999138382223723380394595633413601376560" + "1092018187046051025390625e-37", + true, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- true, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- true, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- true, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- true, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- true, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false), ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ true, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ true, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ true, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ true, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ true, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false), + TEST ("7.5231642936781486349413765338158389908126215730251815381410" + "578824437213052434003657253924757242202758789062499e-37", + false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1.000002p-120, false, +- false, +- 0x1.000000fffffffp-120, false, +- 0x1.000001p-120, false, +- 0x1.000000fffffffp-120, false, +- 0x1.000001p-120, false, +- false, +- 0x1.000000fffffffffep-120, false, +- 0x1.000001p-120, false, +- 0x1.000000fffffffffep-120, false, +- 0x1.000001p-120, false, +- false, +- 0x1.000000fffffffffep-120, false, +- 0x1.000001p-120, false, +- 0x1.000000fffffffffep-120, false, +- 0x1.000001p-120, false, +- false, +- 0x1.000000ffffffffffffffffffff8p-120, false, +- 0x1.000001p-120, false, +- 0x1.000000ffffffffffffffffffff8p-120, false, +- 0x1.000001p-120, false, +- false, +- 0x1.000000ffffffffffffffffffffffp-120, false, +- 0x1.000001p-120, false, +- 0x1.000000ffffffffffffffffffffffp-120, false, +- 0x1.000001p-120, false), ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1.000002p-120, false, false, ++ false, ++ 0x1.000000fffffffp-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000000fffffffp-120, false, false, ++ 0x1.000001p-120, false, false, ++ false, ++ 0x1.000000fffffffffep-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000000fffffffffep-120, false, false, ++ 0x1.000001p-120, false, false, ++ false, ++ 0x1.000000fffffffffep-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000000fffffffffep-120, false, false, ++ 0x1.000001p-120, false, false, ++ false, ++ 0x1.000000ffffffffffffffffffff8p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000000ffffffffffffffffffff8p-120, false, false, ++ 0x1.000001p-120, false, false, ++ false, ++ 0x1.000000ffffffffffffffffffffffp-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000000ffffffffffffffffffffffp-120, false, false, ++ 0x1.000001p-120, false, false), + TEST ("7.5231642936781486349413765338158389908126215730251815381410" + "5788244372130524340036572539247572422027587890625e-37", + false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1.000002p-120, false, +- true, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- true, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- true, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- true, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- true, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false), ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1.000002p-120, false, false, ++ true, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ true, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ true, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ true, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ true, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false), + TEST ("7.5231642936781486349413765338158389908126215730251815381410" + "578824437213052434003657253924757242202758789062501e-37", + false, +- 0x1p-120, false, +- 0x1.000002p-120, false, +- 0x1p-120, false, +- 0x1.000002p-120, false, +- false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.0000010000001p-120, false, +- false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.0000010000000002p-120, false, +- false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.0000010000000002p-120, false, +- false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001000000000000000000008p-120, false, +- false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.0000010000000000000000000001p-120, false), ++ 0x1p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1.000002p-120, false, false, ++ false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.0000010000001p-120, false, false, ++ false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.0000010000000002p-120, false, false, ++ false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.0000010000000002p-120, false, false, ++ false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001000000000000000000008p-120, false, false, ++ false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.0000010000000000000000000001p-120, false, false), + TEST ("7.5231647420936572188828392294093056435857835827090029386261" + "048447055721499765468252007849514484405517578125e-37", + true, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- true, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- true, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- true, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- true, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- true, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false), ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ true, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ true, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ true, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ true, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ true, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false), + TEST ("7.5231651905091658028243019250027722963589455923928243391111" + "518069674229947096932846761774271726608276367187499e-37", + false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000004p-120, false, +- false, +- 0x1.000002fffffffp-120, false, +- 0x1.000003p-120, false, +- 0x1.000002fffffffp-120, false, +- 0x1.000003p-120, false, +- false, +- 0x1.000002fffffffffep-120, false, +- 0x1.000003p-120, false, +- 0x1.000002fffffffffep-120, false, +- 0x1.000003p-120, false, +- false, +- 0x1.000002fffffffffep-120, false, +- 0x1.000003p-120, false, +- 0x1.000002fffffffffep-120, false, +- 0x1.000003p-120, false, +- false, +- 0x1.000002ffffffffffffffffffff8p-120, false, +- 0x1.000003p-120, false, +- 0x1.000002ffffffffffffffffffff8p-120, false, +- 0x1.000003p-120, false, +- false, +- 0x1.000002ffffffffffffffffffffffp-120, false, +- 0x1.000003p-120, false, +- 0x1.000002ffffffffffffffffffffffp-120, false, +- 0x1.000003p-120, false), ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000004p-120, false, false, ++ false, ++ 0x1.000002fffffffp-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000002fffffffp-120, false, false, ++ 0x1.000003p-120, false, false, ++ false, ++ 0x1.000002fffffffffep-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000002fffffffffep-120, false, false, ++ 0x1.000003p-120, false, false, ++ false, ++ 0x1.000002fffffffffep-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000002fffffffffep-120, false, false, ++ 0x1.000003p-120, false, false, ++ false, ++ 0x1.000002ffffffffffffffffffff8p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000002ffffffffffffffffffff8p-120, false, false, ++ 0x1.000003p-120, false, false, ++ false, ++ 0x1.000002ffffffffffffffffffffffp-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000002ffffffffffffffffffffffp-120, false, false, ++ 0x1.000003p-120, false, false), + TEST ("7.5231651905091658028243019250027722963589455923928243391111" + "5180696742299470969328467617742717266082763671875e-37", + false, +- 0x1.000002p-120, false, +- 0x1.000004p-120, false, +- 0x1.000002p-120, false, +- 0x1.000004p-120, false, +- true, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- true, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- true, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- true, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- true, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false), ++ 0x1.000002p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000004p-120, false, false, ++ true, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ true, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ true, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ true, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ true, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false), + TEST ("7.5231651905091658028243019250027722963589455923928243391111" + "518069674229947096932846761774271726608276367187501e-37", + false, +- 0x1.000002p-120, false, +- 0x1.000004p-120, false, +- 0x1.000002p-120, false, +- 0x1.000004p-120, false, +- false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.0000030000001p-120, false, +- false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.0000030000000002p-120, false, +- false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.0000030000000002p-120, false, +- false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003000000000000000000008p-120, false, +- false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.0000030000000000000000000001p-120, false), ++ 0x1.000002p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000004p-120, false, false, ++ false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.0000030000001p-120, false, false, ++ false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.0000030000000002p-120, false, false, ++ false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.0000030000000002p-120, false, false, ++ false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003000000000000000000008p-120, false, false, ++ false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.0000030000000000000000000001p-120, false, false), + TEST ("7.5231656389246743867657646205962389491321076020766457395961" + "98769229273839442839744151569902896881103515625e-37", + true, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- true, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- true, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- true, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- true, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- true, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false), ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ true, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ true, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ true, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ true, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ true, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false), + TEST ("340282356779733661637539395458142568447.999", + false, +- 0xf.fffffp+124, false, +- 0xf.fffffp+124, false, +- 0xf.fffffp+124, false, +- INF, true, +- false, +- 0xf.fffff7ffffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff7ffffff8p+124, false, +- 0xf.fffff8p+124, false, +- false, +- 0xf.fffff7fffffffffp+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff7fffffffffp+124, false, +- 0xf.fffff8p+124, false, +- false, +- 0xf.fffff7fffffffffp+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff7fffffffffp+124, false, +- 0xf.fffff8p+124, false, +- false, +- 0xf.fffff7fffffffffffffffffffcp+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff7fffffffffffffffffffcp+124, false, +- 0xf.fffff8p+124, false, +- false, +- 0xf.fffff7fffffffffffffffffffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff7fffffffffffffffffffff8p+124, false, +- 0xf.fffff8p+124, false), ++ 0xf.fffffp+124, false, false, ++ 0xf.fffffp+124, false, false, ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffff7ffffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff7ffffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ false, ++ 0xf.fffff7fffffffffp+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff7fffffffffp+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ false, ++ 0xf.fffff7fffffffffp+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff7fffffffffp+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ false, ++ 0xf.fffff7fffffffffffffffffffcp+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff7fffffffffffffffffffcp+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ false, ++ 0xf.fffff7fffffffffffffffffffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff7fffffffffffffffffffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false), + TEST ("340282356779733661637539395458142568448", + false, +- 0xf.fffffp+124, false, +- INF, true, +- 0xf.fffffp+124, false, +- INF, true, +- true, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- true, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- true, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- true, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- true, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false), ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ true, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ true, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ true, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ true, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ true, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false), + TEST ("340282356779733661637539395458142568448.001", + false, +- 0xf.fffffp+124, false, +- INF, true, +- 0xf.fffffp+124, false, +- INF, true, +- false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff80000008p+124, false, +- false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8000000001p+124, false, +- false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8000000001p+124, false, +- false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff800000000000000000004p+124, false, +- false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff80000000000000000000008p+124, false), ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff80000008p+124, false, false, ++ false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8000000001p+124, false, false, ++ false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8000000001p+124, false, false, ++ false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff800000000000000000004p+124, false, false, ++ false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff80000000000000000000008p+124, false, false), + TEST ("-340282356779733661637539395458142568447.999", + false, +- -INF, true, +- -0xf.fffffp+124, false, +- -0xf.fffffp+124, false, +- -0xf.fffffp+124, false, +- false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff7ffffff8p+124, false, +- -0xf.fffff7ffffff8p+124, false, +- false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff7fffffffffp+124, false, +- -0xf.fffff7fffffffffp+124, false, +- false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff7fffffffffp+124, false, +- -0xf.fffff7fffffffffp+124, false, +- false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff7fffffffffffffffffffcp+124, false, +- -0xf.fffff7fffffffffffffffffffcp+124, false, +- false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff7fffffffffffffffffffff8p+124, false, +- -0xf.fffff7fffffffffffffffffffff8p+124, false), ++ -INF, true, false, ++ -0xf.fffffp+124, false, false, ++ -0xf.fffffp+124, false, false, ++ -0xf.fffffp+124, false, false, ++ false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff7ffffff8p+124, false, false, ++ -0xf.fffff7ffffff8p+124, false, false, ++ false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff7fffffffffp+124, false, false, ++ -0xf.fffff7fffffffffp+124, false, false, ++ false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff7fffffffffp+124, false, false, ++ -0xf.fffff7fffffffffp+124, false, false, ++ false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff7fffffffffffffffffffcp+124, false, false, ++ -0xf.fffff7fffffffffffffffffffcp+124, false, false, ++ false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff7fffffffffffffffffffff8p+124, false, false, ++ -0xf.fffff7fffffffffffffffffffff8p+124, false, false), + TEST ("-340282356779733661637539395458142568448", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, false, +- -0xf.fffffp+124, false, +- true, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- true, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- true, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- true, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- true, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, false, false, ++ -0xf.fffffp+124, false, false, ++ true, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ true, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ true, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ true, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ true, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false), + TEST ("-340282356779733661637539395458142568448.001", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, false, +- -0xf.fffffp+124, false, +- false, +- -0xf.fffff80000008p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- false, +- -0xf.fffff8000000001p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- false, +- -0xf.fffff8000000001p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- false, +- -0xf.fffff800000000000000000004p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- false, +- -0xf.fffff80000000000000000000008p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, false, false, ++ -0xf.fffffp+124, false, false, ++ false, ++ -0xf.fffff80000008p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ false, ++ -0xf.fffff8000000001p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ false, ++ -0xf.fffff8000000001p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ false, ++ -0xf.fffff800000000000000000004p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ false, ++ -0xf.fffff80000000000000000000008p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false), + TEST ("179769313486231580793728971405303415079934132710037826936173" + "778980444968292764750946649017977587207096330286416692887910" + "946555547851940402630657488671505820681908902000708383676273" +@@ -1855,35 +1855,35 @@ static const struct test tests[] = { + "936475292719074168444365510704342711559699508093042880177904" + "174497791.999", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, false, +- 0xf.ffffffffffff8p+1020, false, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- false, +- 0xf.ffffffffffffbffp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffbffp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- false, +- 0xf.ffffffffffffbffp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffbffp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- false, +- 0xf.ffffffffffffbffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffbffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, true, +- false, +- 0xf.ffffffffffffbffffffffffffff8p+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffbffffffffffffff8p+1020, false, +- 0xf.ffffffffffffcp+1020, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffffbffp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffbffp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ false, ++ 0xf.ffffffffffffbffp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffbffp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ false, ++ 0xf.ffffffffffffbffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffbffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ false, ++ 0xf.ffffffffffffbffffffffffffff8p+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffbffffffffffffff8p+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false), + TEST ("179769313486231580793728971405303415079934132710037826936173" + "778980444968292764750946649017977587207096330286416692887910" + "946555547851940402630657488671505820681908902000708383676273" +@@ -1891,35 +1891,35 @@ static const struct test tests[] = { + "936475292719074168444365510704342711559699508093042880177904" + "174497792", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- true, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- true, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- false, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffcp+1020, true, +- true, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ true, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ true, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ true, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false), + TEST ("179769313486231580793728971405303415079934132710037826936173" + "778980444968292764750946649017977587207096330286416692887910" + "946555547851940402630657488671505820681908902000708383676273" +@@ -1927,35 +1927,35 @@ static const struct test tests[] = { + "936475292719074168444365510704342711559699508093042880177904" + "174497792.001", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffc01p+1020, false, +- false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffc01p+1020, false, +- false, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffc0000000000004p+1020, true, +- false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffc000000000000008p+1020, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffc01p+1020, false, false, ++ false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffc01p+1020, false, false, ++ false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffc0000000000004p+1020, true, false, ++ false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffc000000000000008p+1020, false, false), + TEST ("-17976931348623158079372897140530341507993413271003782693617" + "377898044496829276475094664901797758720709633028641669288791" + "094655554785194040263065748867150582068190890200070838367627" +@@ -1963,35 +1963,35 @@ static const struct test tests[] = { + "493647529271907416844436551070434271155969950809304288017790" + "4174497791.999", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -0xf.ffffffffffff8p+1020, false, +- -0xf.ffffffffffff8p+1020, false, +- -0xf.ffffffffffff8p+1020, false, +- false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffbffp+1020, false, +- -0xf.ffffffffffffbffp+1020, false, +- false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffbffp+1020, false, +- -0xf.ffffffffffffbffp+1020, false, +- false, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffbffffffffffffcp+1020, false, +- -0xf.ffffffffffffbffffffffffffcp+1020, false, +- false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffbffffffffffffff8p+1020, false, +- -0xf.ffffffffffffbffffffffffffff8p+1020, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffbffp+1020, false, false, ++ -0xf.ffffffffffffbffp+1020, false, false, ++ false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffbffp+1020, false, false, ++ -0xf.ffffffffffffbffp+1020, false, false, ++ false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffbffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffbffffffffffffcp+1020, false, false, ++ false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffbffffffffffffff8p+1020, false, false, ++ -0xf.ffffffffffffbffffffffffffff8p+1020, false, false), + TEST ("-17976931348623158079372897140530341507993413271003782693617" + "377898044496829276475094664901797758720709633028641669288791" + "094655554785194040263065748867150582068190890200070838367627" +@@ -1999,35 +1999,35 @@ static const struct test tests[] = { + "493647529271907416844436551070434271155969950809304288017790" + "4174497792", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, false, +- -0xf.ffffffffffff8p+1020, false, +- true, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- true, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- false, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- true, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ true, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ true, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ true, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false), + TEST ("-17976931348623158079372897140530341507993413271003782693617" + "377898044496829276475094664901797758720709633028641669288791" + "094655554785194040263065748867150582068190890200070838367627" +@@ -2035,35 +2035,35 @@ static const struct test tests[] = { + "493647529271907416844436551070434271155969950809304288017790" + "4174497792.001", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, false, +- -0xf.ffffffffffff8p+1020, false, +- false, +- -0xf.ffffffffffffc01p+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- false, +- -0xf.ffffffffffffc01p+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- false, +- -0xf.ffffffffffffc0000000000004p+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- false, +- -0xf.ffffffffffffc000000000000008p+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ false, ++ -0xf.ffffffffffffc01p+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ false, ++ -0xf.ffffffffffffc01p+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ false, ++ -0xf.ffffffffffffc0000000000004p+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ false, ++ -0xf.ffffffffffffc000000000000008p+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false), + TEST ("118973149535723176505351158982948866796625400469556721895649" + "927756249918185172720476044944290457046138433056764616744328" + "666255526748948793023632513609765434237723241753648908036202" +@@ -2148,35 +2148,35 @@ static const struct test tests[] = { + "578031503869424406179027994752890226443351619365453243328968" + "8740976918527.999", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- 0xf.fffffffffffffffp+16380, false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- 0xf.fffffffffffffffp+16380, false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffff7fffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff7fffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffff7fffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff7fffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false), + TEST ("118973149535723176505351158982948866796625400469556721895649" + "927756249918185172720476044944290457046138433056764616744328" + "666255526748948793023632513609765434237723241753648908036202" +@@ -2261,35 +2261,35 @@ static const struct test tests[] = { + "578031503869424406179027994752890226443351619365453243328968" + "8740976918528", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- true, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ true, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false), + TEST ("118973149535723176505351158982948866796625400469556721895649" + "927756249918185172720476044944290457046138433056764616744328" + "666255526748948793023632513609765434237723241753648908036202" +@@ -2374,35 +2374,35 @@ static const struct test tests[] = { + "578031503869424406179027994752890226443351619365453243328968" + "8740976918528.001", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff8000000000008p+16380, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8000000000008p+16380, false, false), + TEST ("-11897314953572317650535115898294886679662540046955672189564" + "992775624991818517272047604494429045704613843305676461674432" + "866625552674894879302363251360976543423772324175364890803620" +@@ -2487,35 +2487,35 @@ static const struct test tests[] = { + "557803150386942440617902799475289022644335161936545324332896" + "88740976918527.999", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff7fffffffffff8p+16380, false, +- -0xf.fffffffffffffff7fffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff7fffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff7fffffffffff8p+16380, false, false), + TEST ("-11897314953572317650535115898294886679662540046955672189564" + "992775624991818517272047604494429045704613843305676461674432" + "866625552674894879302363251360976543423772324175364890803620" +@@ -2600,35 +2600,35 @@ static const struct test tests[] = { + "557803150386942440617902799475289022644335161936545324332896" + "88740976918528", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- true, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ true, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false), + TEST ("-11897314953572317650535115898294886679662540046955672189564" + "992775624991818517272047604494429045704613843305676461674432" + "866625552674894879302363251360976543423772324175364890803620" +@@ -2713,35 +2713,35 @@ static const struct test tests[] = { + "557803150386942440617902799475289022644335161936545324332896" + "88740976918528.001", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -0xf.fffffffffffffff8000000000008p+16380, false, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -0xf.fffffffffffffff8000000000008p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false), + TEST ("118973149535723176508575932662800707347995686986910214150118" + "685272271246896789803961473130416053705672050873552479421805" + "932646640744124594447361172514341324846716679654551308018400" +@@ -2826,35 +2826,35 @@ static const struct test tests[] = { + "972233447491583165728635513802591543441145939539353470970452" + "5536550715391.999", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false), + TEST ("118973149535723176508575932662800707347995686986910214150118" + "685272271246896789803961473130416053705672050873552479421805" + "932646640744124594447361172514341324846716679654551308018400" +@@ -2939,35 +2939,35 @@ static const struct test tests[] = { + "972233447491583165728635513802591543441145939539353470970452" + "5536550715392", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false), + TEST ("118973149535723176508575932662800707347995686986910214150118" + "685272271246896789803961473130416053705672050873552479421805" + "932646640744124594447361172514341324846716679654551308018400" +@@ -3052,35 +3052,35 @@ static const struct test tests[] = { + "972233447491583165728635513802591543441145939539353470970452" + "5536550715392.001", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false), + TEST ("-11897314953572317650857593266280070734799568698691021415011" + "868527227124689678980396147313041605370567205087355247942180" + "593264664074412459444736117251434132484671667965455130801840" +@@ -3165,35 +3165,35 @@ static const struct test tests[] = { + "097223344749158316572863551380259154344114593953935347097045" + "25536550715391.999", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -INF, true, +- -0xf.fffffffffffffffffffffffffff8p+16380, false, +- -0xf.fffffffffffffffffffffffffff8p+16380, false, +- -0xf.fffffffffffffffffffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false), + TEST ("-11897314953572317650857593266280070734799568698691021415011" + "868527227124689678980396147313041605370567205087355247942180" + "593264664074412459444736117251434132484671667965455130801840" +@@ -3278,35 +3278,35 @@ static const struct test tests[] = { + "097223344749158316572863551380259154344114593953935347097045" + "25536550715392", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffff8p+16380, false, +- -0xf.fffffffffffffffffffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false), + TEST ("-11897314953572317650857593266280070734799568698691021415011" + "868527227124689678980396147313041605370567205087355247942180" + "593264664074412459444736117251434132484671667965455130801840" +@@ -3391,419 +3391,419 @@ static const struct test tests[] = { + "097223344749158316572863551380259154344114593953935347097045" + "25536550715392.001", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffff8p+16380, false, +- -0xf.fffffffffffffffffffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false), + TEST ("2.1019476964872256063855943749348741969203929128147736576356" + "0242583468662402879090222995728254318237304687499e-45", + false, +- 0x8p-152, false, +- 0x8p-152, false, +- 0x8p-152, false, +- 0x1p-148, false, +- false, +- 0xb.ffffffffffff8p-152, false, +- 0xcp-152, false, +- 0xb.ffffffffffff8p-152, false, +- 0xcp-152, false, +- false, +- 0xb.fffffffffffffffp-152, false, +- 0xcp-152, false, +- 0xb.fffffffffffffffp-152, false, +- 0xcp-152, false, +- false, +- 0xb.fffffffffffffffp-152, false, +- 0xcp-152, false, +- 0xb.fffffffffffffffp-152, false, +- 0xcp-152, false, +- false, +- 0xb.fffffffffffffffffffffffffcp-152, false, +- 0xcp-152, false, +- 0xb.fffffffffffffffffffffffffcp-152, false, +- 0xcp-152, false, +- false, +- 0xb.fffffffffffffffffffffffffff8p-152, false, +- 0xcp-152, false, +- 0xb.fffffffffffffffffffffffffff8p-152, false, +- 0xcp-152, false), ++ 0x8p-152, false, true, ++ 0x8p-152, false, true, ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ false, ++ 0xb.ffffffffffff8p-152, false, false, ++ 0xcp-152, false, false, ++ 0xb.ffffffffffff8p-152, false, false, ++ 0xcp-152, false, false, ++ false, ++ 0xb.fffffffffffffffp-152, false, false, ++ 0xcp-152, false, false, ++ 0xb.fffffffffffffffp-152, false, false, ++ 0xcp-152, false, false, ++ false, ++ 0xb.fffffffffffffffp-152, false, false, ++ 0xcp-152, false, false, ++ 0xb.fffffffffffffffp-152, false, false, ++ 0xcp-152, false, false, ++ false, ++ 0xb.fffffffffffffffffffffffffcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xb.fffffffffffffffffffffffffcp-152, false, false, ++ 0xcp-152, false, false, ++ false, ++ 0xb.fffffffffffffffffffffffffff8p-152, false, false, ++ 0xcp-152, false, false, ++ 0xb.fffffffffffffffffffffffffff8p-152, false, false, ++ 0xcp-152, false, false), + TEST ("2.1019476964872256063855943749348741969203929128147736576356" + "02425834686624028790902229957282543182373046875e-45", + false, +- 0x8p-152, false, +- 0x1p-148, false, +- 0x8p-152, false, +- 0x1p-148, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false), ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false), + TEST ("2.1019476964872256063855943749348741969203929128147736576356" + "0242583468662402879090222995728254318237304687501e-45", + false, +- 0x8p-152, false, +- 0x1p-148, false, +- 0x8p-152, false, +- 0x1p-148, false, +- false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xc.0000000000008p-152, false, +- false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xc.000000000000001p-152, false, +- false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xc.000000000000001p-152, false, +- false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xc.00000000000000000000000004p-152, false, +- false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xc.0000000000000000000000000008p-152, false), ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xc.0000000000008p-152, false, false, ++ false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xc.000000000000001p-152, false, false, ++ false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xc.000000000000001p-152, false, false, ++ false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xc.00000000000000000000000004p-152, false, false, ++ false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xc.0000000000000000000000000008p-152, false, false), + TEST ("-2.101947696487225606385594374934874196920392912814773657635" + "60242583468662402879090222995728254318237304687499e-45", + false, +- -0x1p-148, false, +- -0x8p-152, false, +- -0x8p-152, false, +- -0x8p-152, false, +- false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xb.ffffffffffff8p-152, false, +- -0xb.ffffffffffff8p-152, false, +- false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xb.fffffffffffffffp-152, false, +- -0xb.fffffffffffffffp-152, false, +- false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xb.fffffffffffffffp-152, false, +- -0xb.fffffffffffffffp-152, false, +- false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xb.fffffffffffffffffffffffffcp-152, false, +- -0xb.fffffffffffffffffffffffffcp-152, false, +- false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xb.fffffffffffffffffffffffffff8p-152, false, +- -0xb.fffffffffffffffffffffffffff8p-152, false), ++ -0x1p-148, false, true, ++ -0x8p-152, false, true, ++ -0x8p-152, false, true, ++ -0x8p-152, false, true, ++ false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xb.ffffffffffff8p-152, false, false, ++ -0xb.ffffffffffff8p-152, false, false, ++ false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xb.fffffffffffffffp-152, false, false, ++ -0xb.fffffffffffffffp-152, false, false, ++ false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xb.fffffffffffffffp-152, false, false, ++ -0xb.fffffffffffffffp-152, false, false, ++ false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xb.fffffffffffffffffffffffffcp-152, false, false, ++ -0xb.fffffffffffffffffffffffffcp-152, false, false, ++ false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xb.fffffffffffffffffffffffffff8p-152, false, false, ++ -0xb.fffffffffffffffffffffffffff8p-152, false, false), + TEST ("-2.101947696487225606385594374934874196920392912814773657635" + "602425834686624028790902229957282543182373046875e-45", + false, +- -0x1p-148, false, +- -0x1p-148, false, +- -0x8p-152, false, +- -0x8p-152, false, +- true, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- true, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- true, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- true, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- true, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false), ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ -0x8p-152, false, true, ++ -0x8p-152, false, true, ++ true, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ true, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ true, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ true, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ true, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false), + TEST ("-2.101947696487225606385594374934874196920392912814773657635" + "60242583468662402879090222995728254318237304687501e-45", + false, +- -0x1p-148, false, +- -0x1p-148, false, +- -0x8p-152, false, +- -0x8p-152, false, +- false, +- -0xc.0000000000008p-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- false, +- -0xc.000000000000001p-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- false, +- -0xc.000000000000001p-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- false, +- -0xc.00000000000000000000000004p-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- false, +- -0xc.0000000000000000000000000008p-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false), ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ -0x8p-152, false, true, ++ -0x8p-152, false, true, ++ false, ++ -0xc.0000000000008p-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ false, ++ -0xc.000000000000001p-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ false, ++ -0xc.000000000000001p-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ false, ++ -0xc.00000000000000000000000004p-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ false, ++ -0xc.0000000000000000000000000008p-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false), + TEST ("3.5032461608120426773093239582247903282006548546912894293926" + "7070972447770671465150371659547090530395507812499e-45", + false, +- 0x1p-148, false, +- 0x1p-148, false, +- 0x1p-148, false, +- 0x1.8p-148, false, +- false, +- 0x1.3ffffffffffffp-148, false, +- 0x1.4p-148, false, +- 0x1.3ffffffffffffp-148, false, +- 0x1.4p-148, false, +- false, +- 0x1.3ffffffffffffffep-148, false, +- 0x1.4p-148, false, +- 0x1.3ffffffffffffffep-148, false, +- 0x1.4p-148, false, +- false, +- 0x1.3ffffffffffffffep-148, false, +- 0x1.4p-148, false, +- 0x1.3ffffffffffffffep-148, false, +- 0x1.4p-148, false, +- false, +- 0x1.3fffffffffffffffffffffffff8p-148, false, +- 0x1.4p-148, false, +- 0x1.3fffffffffffffffffffffffff8p-148, false, +- 0x1.4p-148, false, +- false, +- 0x1.3fffffffffffffffffffffffffffp-148, false, +- 0x1.4p-148, false, +- 0x1.3fffffffffffffffffffffffffffp-148, false, +- 0x1.4p-148, false), ++ 0x1p-148, false, true, ++ 0x1p-148, false, true, ++ 0x1p-148, false, true, ++ 0x1.8p-148, false, true, ++ false, ++ 0x1.3ffffffffffffp-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.3ffffffffffffp-148, false, false, ++ 0x1.4p-148, false, false, ++ false, ++ 0x1.3ffffffffffffffep-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.3ffffffffffffffep-148, false, false, ++ 0x1.4p-148, false, false, ++ false, ++ 0x1.3ffffffffffffffep-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.3ffffffffffffffep-148, false, false, ++ 0x1.4p-148, false, false, ++ false, ++ 0x1.3fffffffffffffffffffffffff8p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.3fffffffffffffffffffffffff8p-148, false, false, ++ 0x1.4p-148, false, false, ++ false, ++ 0x1.3fffffffffffffffffffffffffffp-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.3fffffffffffffffffffffffffffp-148, false, false, ++ 0x1.4p-148, false, false), + TEST ("3.5032461608120426773093239582247903282006548546912894293926" + "70709724477706714651503716595470905303955078125e-45", + false, +- 0x1p-148, false, +- 0x1p-148, false, +- 0x1p-148, false, +- 0x1.8p-148, false, +- true, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- true, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- true, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- true, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- true, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false), ++ 0x1p-148, false, true, ++ 0x1p-148, false, true, ++ 0x1p-148, false, true, ++ 0x1.8p-148, false, true, ++ true, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ true, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ true, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ true, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ true, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false), + TEST ("3.5032461608120426773093239582247903282006548546912894293926" + "7070972447770671465150371659547090530395507812501e-45", + false, +- 0x1p-148, false, +- 0x1.8p-148, false, +- 0x1p-148, false, +- 0x1.8p-148, false, +- false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4000000000001p-148, false, +- false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4000000000000002p-148, false, +- false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4000000000000002p-148, false, +- false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.400000000000000000000000008p-148, false, +- false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4000000000000000000000000001p-148, false), ++ 0x1p-148, false, true, ++ 0x1.8p-148, false, true, ++ 0x1p-148, false, true, ++ 0x1.8p-148, false, true, ++ false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4000000000001p-148, false, false, ++ false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4000000000000002p-148, false, false, ++ false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4000000000000002p-148, false, false, ++ false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.400000000000000000000000008p-148, false, false, ++ false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4000000000000000000000000001p-148, false, false), + TEST ("-3.503246160812042677309323958224790328200654854691289429392" + "67070972447770671465150371659547090530395507812499e-45", + false, +- -0x1.8p-148, false, +- -0x1p-148, false, +- -0x1p-148, false, +- -0x1p-148, false, +- false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.3ffffffffffffp-148, false, +- -0x1.3ffffffffffffp-148, false, +- false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.3ffffffffffffffep-148, false, +- -0x1.3ffffffffffffffep-148, false, +- false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.3ffffffffffffffep-148, false, +- -0x1.3ffffffffffffffep-148, false, +- false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.3fffffffffffffffffffffffff8p-148, false, +- -0x1.3fffffffffffffffffffffffff8p-148, false, +- false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.3fffffffffffffffffffffffffffp-148, false, +- -0x1.3fffffffffffffffffffffffffffp-148, false), ++ -0x1.8p-148, false, true, ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.3ffffffffffffp-148, false, false, ++ -0x1.3ffffffffffffp-148, false, false, ++ false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.3ffffffffffffffep-148, false, false, ++ -0x1.3ffffffffffffffep-148, false, false, ++ false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.3ffffffffffffffep-148, false, false, ++ -0x1.3ffffffffffffffep-148, false, false, ++ false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.3fffffffffffffffffffffffff8p-148, false, false, ++ -0x1.3fffffffffffffffffffffffff8p-148, false, false, ++ false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.3fffffffffffffffffffffffffffp-148, false, false, ++ -0x1.3fffffffffffffffffffffffffffp-148, false, false), + TEST ("-3.503246160812042677309323958224790328200654854691289429392" + "670709724477706714651503716595470905303955078125e-45", + false, +- -0x1.8p-148, false, +- -0x1p-148, false, +- -0x1p-148, false, +- -0x1p-148, false, +- true, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- true, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- true, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- true, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- true, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false), ++ -0x1.8p-148, false, true, ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ true, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ true, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ true, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ true, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ true, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false), + TEST ("-3.503246160812042677309323958224790328200654854691289429392" + "67070972447770671465150371659547090530395507812501e-45", + false, +- -0x1.8p-148, false, +- -0x1.8p-148, false, +- -0x1p-148, false, +- -0x1p-148, false, +- false, +- -0x1.4000000000001p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- false, +- -0x1.4000000000000002p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- false, +- -0x1.4000000000000002p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- false, +- -0x1.400000000000000000000000008p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- false, +- -0x1.4000000000000000000000000001p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false), ++ -0x1.8p-148, false, true, ++ -0x1.8p-148, false, true, ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ false, ++ -0x1.4000000000001p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ false, ++ -0x1.4000000000000002p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ false, ++ -0x1.4000000000000002p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ false, ++ -0x1.400000000000000000000000008p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ false, ++ -0x1.4000000000000000000000000001p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false), + TEST ("7.4109846876186981626485318930233205854758970392148714663837" + "852375101326090531312779794975454245398856969484704316857659" + "638998506553390969459816219401617281718945106978546710679176" +@@ -3818,35 +3818,35 @@ static const struct test tests[] = { + "337560846003984904972149117463085539556354188641513168478436" + "31308023759629577398300170898437499e-324", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x4p-1076, false, +- 0x4p-1076, false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- false, +- 0x5.fffffffffffffff8p-1076, false, +- 0x6p-1076, false, +- 0x5.fffffffffffffff8p-1076, false, +- 0x6p-1076, false, +- false, +- 0x5.fffffffffffffff8p-1076, false, +- 0x6p-1076, false, +- 0x5.fffffffffffffff8p-1076, false, +- 0x6p-1076, false, +- false, +- 0x4p-1076, false, +- 0x4p-1076, false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- false, +- 0x5.fffffffffffffffffffffffffffcp-1076, false, +- 0x6p-1076, false, +- 0x5.fffffffffffffffffffffffffffcp-1076, false, +- 0x6p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x4p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ false, ++ 0x5.fffffffffffffff8p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x5.fffffffffffffff8p-1076, false, false, ++ 0x6p-1076, false, false, ++ false, ++ 0x5.fffffffffffffff8p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x5.fffffffffffffff8p-1076, false, false, ++ 0x6p-1076, false, false, ++ false, ++ 0x4p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ false, ++ 0x5.fffffffffffffffffffffffffffcp-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x5.fffffffffffffffffffffffffffcp-1076, false, false, ++ 0x6p-1076, false, false), + TEST ("7.4109846876186981626485318930233205854758970392148714663837" + "852375101326090531312779794975454245398856969484704316857659" + "638998506553390969459816219401617281718945106978546710679176" +@@ -3861,35 +3861,35 @@ static const struct test tests[] = { + "337560846003984904972149117463085539556354188641513168478436" + "313080237596295773983001708984375e-324", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- true, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- true, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- true, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ true, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ true, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ false, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ true, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false), + TEST ("7.4109846876186981626485318930233205854758970392148714663837" + "852375101326090531312779794975454245398856969484704316857659" + "638998506553390969459816219401617281718945106978546710679176" +@@ -3904,35 +3904,35 @@ static const struct test tests[] = { + "337560846003984904972149117463085539556354188641513168478436" + "31308023759629577398300170898437501e-324", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6.0000000000000008p-1076, false, +- false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6.0000000000000008p-1076, false, +- false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6.0000000000000000000000000004p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6.0000000000000008p-1076, false, false, ++ false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6.0000000000000008p-1076, false, false, ++ false, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6.0000000000000000000000000004p-1076, false, false), + TEST ("-7.410984687618698162648531893023320585475897039214871466383" + "785237510132609053131277979497545424539885696948470431685765" + "963899850655339096945981621940161728171894510697854671067917" +@@ -3947,35 +3947,35 @@ static const struct test tests[] = { + "433756084600398490497214911746308553955635418864151316847843" + "631308023759629577398300170898437499e-324", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x5.fffffffffffffff8p-1076, false, +- -0x5.fffffffffffffff8p-1076, false, +- false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x5.fffffffffffffff8p-1076, false, +- -0x5.fffffffffffffff8p-1076, false, +- false, +- -0x8p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x5.fffffffffffffffffffffffffffcp-1076, false, +- -0x5.fffffffffffffffffffffffffffcp-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x5.fffffffffffffff8p-1076, false, false, ++ -0x5.fffffffffffffff8p-1076, false, false, ++ false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x5.fffffffffffffff8p-1076, false, false, ++ -0x5.fffffffffffffff8p-1076, false, false, ++ false, ++ -0x8p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x5.fffffffffffffffffffffffffffcp-1076, false, false, ++ -0x5.fffffffffffffffffffffffffffcp-1076, false, false), + TEST ("-7.410984687618698162648531893023320585475897039214871466383" + "785237510132609053131277979497545424539885696948470431685765" + "963899850655339096945981621940161728171894510697854671067917" +@@ -3990,35 +3990,35 @@ static const struct test tests[] = { + "433756084600398490497214911746308553955635418864151316847843" + "6313080237596295773983001708984375e-324", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-1076, false, +- -0x8p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- true, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- true, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- false, +- -0x8p-1076, false, +- -0x8p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- true, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-1076, false, true, ++ -0x8p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ true, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ true, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ false, ++ -0x8p-1076, false, true, ++ -0x8p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ true, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false), + TEST ("-7.410984687618698162648531893023320585475897039214871466383" + "785237510132609053131277979497545424539885696948470431685765" + "963899850655339096945981621940161728171894510697854671067917" +@@ -4033,35 +4033,35 @@ static const struct test tests[] = { + "433756084600398490497214911746308553955635418864151316847843" + "631308023759629577398300170898437501e-324", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-1076, false, +- -0x8p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- false, +- -0x6.0000000000000008p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- false, +- -0x6.0000000000000008p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- false, +- -0x8p-1076, false, +- -0x8p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- false, +- -0x6.0000000000000000000000000004p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-1076, false, true, ++ -0x8p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ false, ++ -0x6.0000000000000008p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ false, ++ -0x6.0000000000000008p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ false, ++ -0x8p-1076, false, true, ++ -0x8p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ false, ++ -0x6.0000000000000000000000000004p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false), + TEST ("5.4677992978237119037926089004291297245985762235403450155814" + "707305425575329500966052143410629387408077958710210208052966" + "529504784489330482549602621133847135082257338717668975178538" +@@ -4255,35 +4255,35 @@ static const struct test tests[] = { + "866268925981702690270202829595794350800918257913991744455922" + "683343374046671669930219650268554687499e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x8p-16448, false, +- 0x8p-16448, false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- false, +- 0x8p-16448, false, +- 0xcp-16448, false, +- 0x8p-16448, false, +- 0xcp-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0xb.fffffffffffcp-16448, false, +- 0xcp-16448, false, +- 0xb.fffffffffffcp-16448, false, +- 0xcp-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0x8p-16448, false, true, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0xcp-16448, false, true, ++ 0x8p-16448, false, true, ++ 0xcp-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0xb.fffffffffffcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xb.fffffffffffcp-16448, false, true, ++ 0xcp-16448, false, true), + TEST ("5.4677992978237119037926089004291297245985762235403450155814" + "707305425575329500966052143410629387408077958710210208052966" + "529504784489330482549602621133847135082257338717668975178538" +@@ -4477,35 +4477,35 @@ static const struct test tests[] = { + "866268925981702690270202829595794350800918257913991744455922" + "6833433740466716699302196502685546875e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- true, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ true, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false), + TEST ("5.4677992978237119037926089004291297245985762235403450155814" + "707305425575329500966052143410629387408077958710210208052966" + "529504784489330482549602621133847135082257338717668975178538" +@@ -4699,35 +4699,35 @@ static const struct test tests[] = { + "866268925981702690270202829595794350800918257913991744455922" + "683343374046671669930219650268554687501e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0x1p-16444, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xc.000000000004p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ false, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0x1p-16444, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xc.000000000004p-16448, false, true), + TEST ("-5.467799297823711903792608900429129724598576223540345015581" + "470730542557532950096605214341062938740807795871021020805296" + "652950478448933048254960262113384713508225733871766897517853" +@@ -4921,35 +4921,35 @@ static const struct test tests[] = { + "386626892598170269027020282959579435080091825791399174445592" + "2683343374046671669930219650268554687499e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x1p-16444, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xb.fffffffffffcp-16448, false, +- -0xb.fffffffffffcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ false, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xb.fffffffffffcp-16448, false, true, ++ -0xb.fffffffffffcp-16448, false, true), + TEST ("-5.467799297823711903792608900429129724598576223540345015581" + "470730542557532950096605214341062938740807795871021020805296" + "652950478448933048254960262113384713508225733871766897517853" +@@ -5143,35 +5143,35 @@ static const struct test tests[] = { + "386626892598170269027020282959579435080091825791399174445592" + "26833433740466716699302196502685546875e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x1p-16444, false, +- -0x1p-16444, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- true, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0x1p-16444, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ true, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false), + TEST ("-5.467799297823711903792608900429129724598576223540345015581" + "470730542557532950096605214341062938740807795871021020805296" + "652950478448933048254960262113384713508225733871766897517853" +@@ -5365,35 +5365,35 @@ static const struct test tests[] = { + "386626892598170269027020282959579435080091825791399174445592" + "2683343374046671669930219650268554687501e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x1p-16444, false, +- -0x1p-16444, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- false, +- -0x1p-16444, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0xc.000000000004p-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0x1p-16444, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0xc.000000000004p-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true), + TEST ("5.4677992978237119037926089004291297245985762235403450155814" + "707305425575329500966052143410629387408077958710210208052966" + "529504784489330482549602621133847135082257338717668975178538" +@@ -5587,35 +5587,35 @@ static const struct test tests[] = { + "866268925981702690270202829595794350800918257913991744455922" + "683343374046671669930219650268554687499e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x8p-16448, false, +- 0x8p-16448, false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- false, +- 0x8p-16448, false, +- 0xcp-16448, false, +- 0x8p-16448, false, +- 0xcp-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0xb.fffffffffffcp-16448, false, +- 0xcp-16448, false, +- 0xb.fffffffffffcp-16448, false, +- 0xcp-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0x8p-16448, false, true, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0xcp-16448, false, true, ++ 0x8p-16448, false, true, ++ 0xcp-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0xb.fffffffffffcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xb.fffffffffffcp-16448, false, true, ++ 0xcp-16448, false, true), + TEST ("5.4677992978237119037926089004291297245985762235403450155814" + "707305425575329500966052143410629387408077958710210208052966" + "529504784489330482549602621133847135082257338717668975178538" +@@ -5809,35 +5809,35 @@ static const struct test tests[] = { + "866268925981702690270202829595794350800918257913991744455922" + "6833433740466716699302196502685546875e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- true, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ true, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false), + TEST ("5.4677992978237119037926089004291297245985762235403450155814" + "707305425575329500966052143410629387408077958710210208052966" + "529504784489330482549602621133847135082257338717668975178538" +@@ -6031,35 +6031,35 @@ static const struct test tests[] = { + "866268925981702690270202829595794350800918257913991744455922" + "683343374046671669930219650268554687501e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0x1p-16444, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xc.000000000004p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ false, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0x1p-16444, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xc.000000000004p-16448, false, true), + TEST ("-5.467799297823711903792608900429129724598576223540345015581" + "470730542557532950096605214341062938740807795871021020805296" + "652950478448933048254960262113384713508225733871766897517853" +@@ -6253,35 +6253,35 @@ static const struct test tests[] = { + "386626892598170269027020282959579435080091825791399174445592" + "2683343374046671669930219650268554687499e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x1p-16444, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xb.fffffffffffcp-16448, false, +- -0xb.fffffffffffcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ false, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xb.fffffffffffcp-16448, false, true, ++ -0xb.fffffffffffcp-16448, false, true), + TEST ("-5.467799297823711903792608900429129724598576223540345015581" + "470730542557532950096605214341062938740807795871021020805296" + "652950478448933048254960262113384713508225733871766897517853" +@@ -6475,35 +6475,35 @@ static const struct test tests[] = { + "386626892598170269027020282959579435080091825791399174445592" + "26833433740466716699302196502685546875e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x1p-16444, false, +- -0x1p-16444, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- true, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0x1p-16444, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ true, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false), + TEST ("-5.467799297823711903792608900429129724598576223540345015581" + "470730542557532950096605214341062938740807795871021020805296" + "652950478448933048254960262113384713508225733871766897517853" +@@ -6697,630 +6697,630 @@ static const struct test tests[] = { + "386626892598170269027020282959579435080091825791399174445592" + "2683343374046671669930219650268554687501e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x1p-16444, false, +- -0x1p-16444, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- false, +- -0x1p-16444, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0xc.000000000004p-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0x1p-16444, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0xc.000000000004p-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true), + TEST ("-0x0.7p-149", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- true, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- true, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- true, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- true, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ true, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ true, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ true, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ true, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false), + TEST ("-0x0.7p-1074", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- true, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ true, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false), + TEST ("-0x0.7p-16445", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x3.8p-16448, false, +- -0x3.8p-16448, false, +- -0x3.8p-16448, false, +- -0x3.8p-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x3.8p-16448, false, false, ++ -0x3.8p-16448, false, false, ++ -0x3.8p-16448, false, false, ++ -0x3.8p-16448, false, false), + TEST ("-0x0.7p-16494", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16496, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16496, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true), + TEST ("0x1p-150", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false), + TEST ("0x1p-1075", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- true, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ true, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false), + TEST ("0x1p-16446", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- true, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ true, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false), + TEST ("0x1p-16495", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16496, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16496, false, true), + TEST ("-0x1p-150", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false), + TEST ("-0x1p-1075", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- true, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ true, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false), + TEST ("-0x1p-16446", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false), + TEST ("-0x1p-16495", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16496, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16496, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true), + TEST (".70064923216240853546186479164495807e-45", + false, +- 0x0p+0, false, +- 0x8p-152, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000004p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000000008p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000000008p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.00000000000000000000000002p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000000000000000000004p-152, false), ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000004p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000000008p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000000008p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.00000000000000000000000002p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000000000000000000004p-152, false, false), + TEST ("7.0064923216240853546186479164495806564013097093825788587853" + "4141944895541342930300743319094181060791015624e-46", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x3.ffffffffffffep-152, false, +- 0x4p-152, false, +- 0x3.ffffffffffffep-152, false, +- 0x4p-152, false, +- false, +- 0x3.fffffffffffffffcp-152, false, +- 0x4p-152, false, +- 0x3.fffffffffffffffcp-152, false, +- 0x4p-152, false, +- false, +- 0x3.fffffffffffffffcp-152, false, +- 0x4p-152, false, +- 0x3.fffffffffffffffcp-152, false, +- 0x4p-152, false, +- false, +- 0x3.ffffffffffffffffffffffffffp-152, false, +- 0x4p-152, false, +- 0x3.ffffffffffffffffffffffffffp-152, false, +- 0x4p-152, false, +- false, +- 0x3.fffffffffffffffffffffffffffep-152, false, +- 0x4p-152, false, +- 0x3.fffffffffffffffffffffffffffep-152, false, +- 0x4p-152, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x3.ffffffffffffep-152, false, false, ++ 0x4p-152, false, false, ++ 0x3.ffffffffffffep-152, false, false, ++ 0x4p-152, false, false, ++ false, ++ 0x3.fffffffffffffffcp-152, false, false, ++ 0x4p-152, false, false, ++ 0x3.fffffffffffffffcp-152, false, false, ++ 0x4p-152, false, false, ++ false, ++ 0x3.fffffffffffffffcp-152, false, false, ++ 0x4p-152, false, false, ++ 0x3.fffffffffffffffcp-152, false, false, ++ 0x4p-152, false, false, ++ false, ++ 0x3.ffffffffffffffffffffffffffp-152, false, false, ++ 0x4p-152, false, false, ++ 0x3.ffffffffffffffffffffffffffp-152, false, false, ++ 0x4p-152, false, false, ++ false, ++ 0x3.fffffffffffffffffffffffffffep-152, false, false, ++ 0x4p-152, false, false, ++ 0x3.fffffffffffffffffffffffffffep-152, false, false, ++ 0x4p-152, false, false), + TEST ("7.0064923216240853546186479164495806564013097093825788587853" + "4141944895541342930300743319094181060791015625e-46", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false), + TEST ("7.0064923216240853546186479164495806564013097093825788587853" + "4141944895541342930300743319094181060791015626e-46", + false, +- 0x0p+0, false, +- 0x8p-152, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000004p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000000008p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000000008p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.00000000000000000000000002p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000000000000000000004p-152, false), ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000004p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000000008p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000000008p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.00000000000000000000000002p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000000000000000000004p-152, false, false), + TEST ("-7.006492321624085354618647916449580656401309709382578858785" + "34141944895541342930300743319094181060791015624e-46", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x3.ffffffffffffep-152, false, +- -0x3.ffffffffffffep-152, false, +- false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x3.fffffffffffffffcp-152, false, +- -0x3.fffffffffffffffcp-152, false, +- false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x3.fffffffffffffffcp-152, false, +- -0x3.fffffffffffffffcp-152, false, +- false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x3.ffffffffffffffffffffffffffp-152, false, +- -0x3.ffffffffffffffffffffffffffp-152, false, +- false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x3.fffffffffffffffffffffffffffep-152, false, +- -0x3.fffffffffffffffffffffffffffep-152, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x3.ffffffffffffep-152, false, false, ++ -0x3.ffffffffffffep-152, false, false, ++ false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x3.fffffffffffffffcp-152, false, false, ++ -0x3.fffffffffffffffcp-152, false, false, ++ false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x3.fffffffffffffffcp-152, false, false, ++ -0x3.fffffffffffffffcp-152, false, false, ++ false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x3.ffffffffffffffffffffffffffp-152, false, false, ++ -0x3.ffffffffffffffffffffffffffp-152, false, false, ++ false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x3.fffffffffffffffffffffffffffep-152, false, false, ++ -0x3.fffffffffffffffffffffffffffep-152, false, false), + TEST ("-7.006492321624085354618647916449580656401309709382578858785" + "34141944895541342930300743319094181060791015625e-46", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false), + TEST ("-7.006492321624085354618647916449580656401309709382578858785" + "34141944895541342930300743319094181060791015626e-46", + false, +- -0x8p-152, false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4.0000000000004p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- false, +- -0x4.0000000000000008p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- false, +- -0x4.0000000000000008p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- false, +- -0x4.00000000000000000000000002p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- false, +- -0x4.0000000000000000000000000004p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false), ++ -0x8p-152, false, true, ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4.0000000000004p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ false, ++ -0x4.0000000000000008p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ false, ++ -0x4.0000000000000008p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ false, ++ -0x4.00000000000000000000000002p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ false, ++ -0x4.0000000000000000000000000004p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false), + TEST ("2.4703282292062327208828439643411068618252990130716238221279" + "284125033775363510437593264991818081799618989828234772285886" + "546332835517796989819938739800539093906315035659515570226392" +@@ -7335,35 +7335,35 @@ static const struct test tests[] = { + "779186948667994968324049705821028513185451396213837722826145" + "437693412532098591327667236328124e-324", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x1.fffffffffffffffep-1076, false, +- 0x2p-1076, false, +- 0x1.fffffffffffffffep-1076, false, +- 0x2p-1076, false, +- false, +- 0x1.fffffffffffffffep-1076, false, +- 0x2p-1076, false, +- 0x1.fffffffffffffffep-1076, false, +- 0x2p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x1.ffffffffffffffffffffffffffffp-1076, false, +- 0x2p-1076, false, +- 0x1.ffffffffffffffffffffffffffffp-1076, false, +- 0x2p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.fffffffffffffffep-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x1.fffffffffffffffep-1076, false, false, ++ 0x2p-1076, false, false, ++ false, ++ 0x1.fffffffffffffffep-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x1.fffffffffffffffep-1076, false, false, ++ 0x2p-1076, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.ffffffffffffffffffffffffffffp-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x1.ffffffffffffffffffffffffffffp-1076, false, false, ++ 0x2p-1076, false, false), + TEST ("2.4703282292062327208828439643411068618252990130716238221279" + "284125033775363510437593264991818081799618989828234772285886" + "546332835517796989819938739800539093906315035659515570226392" +@@ -7378,35 +7378,35 @@ static const struct test tests[] = { + "779186948667994968324049705821028513185451396213837722826145" + "437693412532098591327667236328125e-324", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- true, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ true, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false), + TEST ("2.4703282292062327208828439643411068618252990130716238221279" + "284125033775363510437593264991818081799618989828234772285886" + "546332835517796989819938739800539093906315035659515570226392" +@@ -7421,35 +7421,35 @@ static const struct test tests[] = { + "779186948667994968324049705821028513185451396213837722826145" + "437693412532098591327667236328126e-324", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x4p-1076, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2.0000000000000004p-1076, false, +- false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2.0000000000000004p-1076, false, +- false, +- 0x0p+0, false, +- 0x4p-1076, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2.0000000000000000000000000002p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2.0000000000000004p-1076, false, false, ++ false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2.0000000000000004p-1076, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2.0000000000000000000000000002p-1076, false, false), + TEST ("-2.470328229206232720882843964341106861825299013071623822127" + "928412503377536351043759326499181808179961898982823477228588" + "654633283551779698981993873980053909390631503565951557022639" +@@ -7464,35 +7464,35 @@ static const struct test tests[] = { + "477918694866799496832404970582102851318545139621383772282614" + "5437693412532098591327667236328124e-324", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x1.fffffffffffffffep-1076, false, +- -0x1.fffffffffffffffep-1076, false, +- false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x1.fffffffffffffffep-1076, false, +- -0x1.fffffffffffffffep-1076, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x1.ffffffffffffffffffffffffffffp-1076, false, +- -0x1.ffffffffffffffffffffffffffffp-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x1.fffffffffffffffep-1076, false, false, ++ -0x1.fffffffffffffffep-1076, false, false, ++ false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x1.fffffffffffffffep-1076, false, false, ++ -0x1.fffffffffffffffep-1076, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x1.ffffffffffffffffffffffffffffp-1076, false, false, ++ -0x1.ffffffffffffffffffffffffffffp-1076, false, false), + TEST ("-2.470328229206232720882843964341106861825299013071623822127" + "928412503377536351043759326499181808179961898982823477228588" + "654633283551779698981993873980053909390631503565951557022639" +@@ -7507,35 +7507,35 @@ static const struct test tests[] = { + "477918694866799496832404970582102851318545139621383772282614" + "5437693412532098591327667236328125e-324", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- true, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ true, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false), + TEST ("-2.470328229206232720882843964341106861825299013071623822127" + "928412503377536351043759326499181808179961898982823477228588" + "654633283551779698981993873980053909390631503565951557022639" +@@ -7550,35 +7550,35 @@ static const struct test tests[] = { + "477918694866799496832404970582102851318545139621383772282614" + "5437693412532098591327667236328126e-324", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x2.0000000000000004p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- false, +- -0x2.0000000000000004p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x2.0000000000000000000000000002p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x2.0000000000000004p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ false, ++ -0x2.0000000000000004p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x2.0000000000000000000000000002p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false), + TEST ("1.8225997659412373012642029668097099081995254078467816718604" + "902435141858443166988684047803543129136025986236736736017655" + "509834928163110160849867540377949045027419112905889658392846" +@@ -7772,35 +7772,35 @@ static const struct test tests[] = { + "622089641993900896756734276531931450266972752637997248151974" + "2277811246822238899767398834228515624e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x4p-16448, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x3.fffffffffffcp-16448, false, +- 0x4p-16448, false, +- 0x3.fffffffffffcp-16448, false, +- 0x4p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x3.fffffffffffcp-16448, false, true, ++ 0x4p-16448, false, true, ++ 0x3.fffffffffffcp-16448, false, true, ++ 0x4p-16448, false, true), + TEST ("1.8225997659412373012642029668097099081995254078467816718604" + "902435141858443166988684047803543129136025986236736736017655" + "509834928163110160849867540377949045027419112905889658392846" +@@ -7994,35 +7994,35 @@ static const struct test tests[] = { + "622089641993900896756734276531931450266972752637997248151974" + "2277811246822238899767398834228515625e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- true, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ true, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false), + TEST ("1.8225997659412373012642029668097099081995254078467816718604" + "902435141858443166988684047803543129136025986236736736017655" + "509834928163110160849867540377949045027419112905889658392846" +@@ -8216,35 +8216,35 @@ static const struct test tests[] = { + "622089641993900896756734276531931450266972752637997248151974" + "2277811246822238899767398834228515626e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x8p-16448, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4.000000000004p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x4p-16448, false, true, ++ 0x4p-16448, false, true, ++ 0x4p-16448, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x4p-16448, false, true, ++ 0x4p-16448, false, true, ++ 0x4p-16448, false, true, ++ 0x4.000000000004p-16448, false, true), + TEST ("-1.822599765941237301264202966809709908199525407846781671860" + "490243514185844316698868404780354312913602598623673673601765" + "550983492816311016084986754037794904502741911290588965839284" +@@ -8438,35 +8438,35 @@ static const struct test tests[] = { + "462208964199390089675673427653193145026697275263799724815197" + "42277811246822238899767398834228515624e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x3.fffffffffffcp-16448, false, +- -0x3.fffffffffffcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x3.fffffffffffcp-16448, false, true, ++ -0x3.fffffffffffcp-16448, false, true), + TEST ("-1.822599765941237301264202966809709908199525407846781671860" + "490243514185844316698868404780354312913602598623673673601765" + "550983492816311016084986754037794904502741911290588965839284" +@@ -8660,35 +8660,35 @@ static const struct test tests[] = { + "462208964199390089675673427653193145026697275263799724815197" + "42277811246822238899767398834228515625e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false), + TEST ("-1.822599765941237301264202966809709908199525407846781671860" + "490243514185844316698868404780354312913602598623673673601765" + "550983492816311016084986754037794904502741911290588965839284" +@@ -8882,35 +8882,35 @@ static const struct test tests[] = { + "462208964199390089675673427653193145026697275263799724815197" + "42277811246822238899767398834228515626e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4.000000000004p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4.000000000004p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true), + TEST ("9.1129988297061865063210148340485495409976270392339083593024" + "512175709292215834943420239017715645680129931183683680088277" + "549174640815550804249337701889745225137095564529448291964230" +@@ -9104,35 +9104,35 @@ static const struct test tests[] = { + "110448209969504483783671382659657251334863763189986240759871" + "1389056234111194498836994171142578124e-4952", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x1.fffffffffffcp-16448, false, +- 0x2p-16448, false, +- 0x1.fffffffffffcp-16448, false, +- 0x2p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.fffffffffffcp-16448, false, true, ++ 0x2p-16448, false, true, ++ 0x1.fffffffffffcp-16448, false, true, ++ 0x2p-16448, false, true), + TEST ("9.1129988297061865063210148340485495409976270392339083593024" + "512175709292215834943420239017715645680129931183683680088277" + "549174640815550804249337701889745225137095564529448291964230" +@@ -9326,35 +9326,35 @@ static const struct test tests[] = { + "110448209969504483783671382659657251334863763189986240759871" + "1389056234111194498836994171142578125e-4952", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x2p-16448, false, +- 0x2p-16448, false, +- 0x2p-16448, false, +- 0x2p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x2p-16448, false, false, ++ 0x2p-16448, false, false, ++ 0x2p-16448, false, false, ++ 0x2p-16448, false, false), + TEST ("9.1129988297061865063210148340485495409976270392339083593024" + "512175709292215834943420239017715645680129931183683680088277" + "549174640815550804249337701889745225137095564529448291964230" +@@ -9548,35 +9548,35 @@ static const struct test tests[] = { + "110448209969504483783671382659657251334863763189986240759871" + "1389056234111194498836994171142578126e-4952", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x4p-16448, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x2p-16448, false, +- 0x2p-16448, false, +- 0x2p-16448, false, +- 0x2.000000000004p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x2p-16448, false, true, ++ 0x2p-16448, false, true, ++ 0x2p-16448, false, true, ++ 0x2.000000000004p-16448, false, true), + TEST ("-9.112998829706186506321014834048549540997627039233908359302" + "451217570929221583494342023901771564568012993118368368008827" + "754917464081555080424933770188974522513709556452944829196423" +@@ -9770,35 +9770,35 @@ static const struct test tests[] = { + "311044820996950448378367138265965725133486376318998624075987" + "11389056234111194498836994171142578124e-4952", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x2p-16448, false, +- -0x2p-16448, false, +- -0x1.fffffffffffcp-16448, false, +- -0x1.fffffffffffcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x2p-16448, false, true, ++ -0x2p-16448, false, true, ++ -0x1.fffffffffffcp-16448, false, true, ++ -0x1.fffffffffffcp-16448, false, true), + TEST ("-9.112998829706186506321014834048549540997627039233908359302" + "451217570929221583494342023901771564568012993118368368008827" + "754917464081555080424933770188974522513709556452944829196423" +@@ -9992,35 +9992,35 @@ static const struct test tests[] = { + "311044820996950448378367138265965725133486376318998624075987" + "11389056234111194498836994171142578125e-4952", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x2p-16448, false, +- -0x2p-16448, false, +- -0x2p-16448, false, +- -0x2p-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x2p-16448, false, false, ++ -0x2p-16448, false, false, ++ -0x2p-16448, false, false, ++ -0x2p-16448, false, false), + TEST ("-9.112998829706186506321014834048549540997627039233908359302" + "451217570929221583494342023901771564568012993118368368008827" + "754917464081555080424933770188974522513709556452944829196423" +@@ -10214,35 +10214,35 @@ static const struct test tests[] = { + "311044820996950448378367138265965725133486376318998624075987" + "11389056234111194498836994171142578126e-4952", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x2.000000000004p-16448, false, +- -0x2p-16448, false, +- -0x2p-16448, false, +- -0x2p-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x2.000000000004p-16448, false, true, ++ -0x2p-16448, false, true, ++ -0x2p-16448, false, true, ++ -0x2p-16448, false, true), + TEST ("3.2375875597190125554622194791138232762497846690173405048449" + "421945985197700620596855088357456383249701279390707384240598" + "382936099431912710233425550359863089915213963553756674672083" +@@ -10437,35 +10437,35 @@ static const struct test tests[] = { + "182358152808745703724362178773168996492870519432472065091133" + "11767578124e-4966", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16496, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16496, false, true), + TEST ("3.2375875597190125554622194791138232762497846690173405048449" + "421945985197700620596855088357456383249701279390707384240598" + "382936099431912710233425550359863089915213963553756674672083" +@@ -10660,35 +10660,35 @@ static const struct test tests[] = { + "182358152808745703724362178773168996492870519432472065091133" + "11767578125e-4966", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16496, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16496, false, true), + TEST ("3.2375875597190125554622194791138232762497846690173405048449" + "421945985197700620596855088357456383249701279390707384240598" + "382936099431912710233425550359863089915213963553756674672083" +@@ -10883,35 +10883,35 @@ static const struct test tests[] = { + "182358152808745703724362178773168996492870519432472065091133" + "11767578126e-4966", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x4p-16496, false, +- 0x0p+0, false, +- 0x4p-16496, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x4p-16496, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16496, false, true), + TEST ("-3.237587559719012555462219479113823276249784669017340504844" + "942194598519770062059685508835745638324970127939070738424059" + "838293609943191271023342555035986308991521396355375667467208" +@@ -11106,35 +11106,35 @@ static const struct test tests[] = { + "218235815280874570372436217877316899649287051943247206509113" + "311767578124e-4966", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16496, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16496, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true), + TEST ("-3.237587559719012555462219479113823276249784669017340504844" + "942194598519770062059685508835745638324970127939070738424059" + "838293609943191271023342555035986308991521396355375667467208" +@@ -11329,35 +11329,35 @@ static const struct test tests[] = { + "218235815280874570372436217877316899649287051943247206509113" + "311767578125e-4966", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16496, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16496, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true), + TEST ("-3.237587559719012555462219479113823276249784669017340504844" + "942194598519770062059685508835745638324970127939070738424059" + "838293609943191271023342555035986308991521396355375667467208" +@@ -11552,66 +11552,66 @@ static const struct test tests[] = { + "218235815280874570372436217877316899649287051943247206509113" + "311767578126e-4966", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16496, false, +- -0x4p-16496, false, +- -0x0p+0, false, +- -0x0p+0, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16496, false, true, ++ -0x4p-16496, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true), + TEST ("340282366920938463463374607431768211455", + false, +- 0xf.fffffp+124, false, +- INF, true, +- 0xf.fffffp+124, false, +- INF, true, +- false, +- 0xf.ffffffffffff8p+124, false, +- 0x1p+128, false, +- 0xf.ffffffffffff8p+124, false, +- 0x1p+128, false, +- false, +- 0xf.fffffffffffffffp+124, false, +- 0x1p+128, false, +- 0xf.fffffffffffffffp+124, false, +- 0x1p+128, false, +- false, +- 0xf.fffffffffffffffp+124, false, +- 0x1p+128, false, +- 0xf.fffffffffffffffp+124, false, +- 0x1p+128, false, +- false, +- 0xf.fffffffffffffffffffffffffcp+124, false, +- 0x1p+128, false, +- 0xf.fffffffffffffffffffffffffcp+124, false, +- 0x1p+128, false, +- false, +- 0xf.fffffffffffffffffffffffffff8p+124, false, +- 0x1p+128, false, +- 0xf.fffffffffffffffffffffffffff8p+124, false, +- 0x1p+128, false), ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+124, false, false, ++ 0x1p+128, false, false, ++ 0xf.ffffffffffff8p+124, false, false, ++ 0x1p+128, false, false, ++ false, ++ 0xf.fffffffffffffffp+124, false, false, ++ 0x1p+128, false, false, ++ 0xf.fffffffffffffffp+124, false, false, ++ 0x1p+128, false, false, ++ false, ++ 0xf.fffffffffffffffp+124, false, false, ++ 0x1p+128, false, false, ++ 0xf.fffffffffffffffp+124, false, false, ++ 0x1p+128, false, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+124, false, false, ++ 0x1p+128, false, false, ++ 0xf.fffffffffffffffffffffffffcp+124, false, false, ++ 0x1p+128, false, false, ++ false, ++ 0xf.fffffffffffffffffffffffffff8p+124, false, false, ++ 0x1p+128, false, false, ++ 0xf.fffffffffffffffffffffffffff8p+124, false, false, ++ 0x1p+128, false, false), + TEST ("179769313486231590772930519078902473361797697894230657273430" + "081157732675805500963132708477322407536021120113879871393357" + "658789768814416622492847430639474124377767893424865485276302" +@@ -11619,35 +11619,35 @@ static const struct test tests[] = { + "540827237163350510684586298239947245938479716304835356329624" + "224137215", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+1020, false, +- 0x1p+1024, false, +- 0xf.fffffffffffffffp+1020, false, +- 0x1p+1024, false, +- false, +- 0xf.fffffffffffffffp+1020, false, +- 0x1p+1024, false, +- 0xf.fffffffffffffffp+1020, false, +- 0x1p+1024, false, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffff8p+1020, false, +- 0x1p+1024, false, +- 0xf.fffffffffffffffffffffffffff8p+1020, false, +- 0x1p+1024, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+1020, false, false, ++ 0x1p+1024, false, false, ++ 0xf.fffffffffffffffp+1020, false, false, ++ 0x1p+1024, false, false, ++ false, ++ 0xf.fffffffffffffffp+1020, false, false, ++ 0x1p+1024, false, false, ++ 0xf.fffffffffffffffp+1020, false, false, ++ 0x1p+1024, false, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffff8p+1020, false, false, ++ 0x1p+1024, false, false, ++ 0xf.fffffffffffffffffffffffffff8p+1020, false, false, ++ 0x1p+1024, false, false), + TEST ("118973149535723176508575932662800713076344468709651023747267" + "482123326135818048368690448859547261203991511543748483930925" + "889766738130868742627452469834156500608087163436600489752214" +@@ -11732,66 +11732,66 @@ static const struct test tests[] = { + "047398248889922809181821393428829567971736994315246044702729" + "0669964066815", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false), + TEST ("-340282366920938463463374607431768211455", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, false, +- -0xf.fffffp+124, false, +- false, +- -0x1p+128, false, +- -0x1p+128, false, +- -0xf.ffffffffffff8p+124, false, +- -0xf.ffffffffffff8p+124, false, +- false, +- -0x1p+128, false, +- -0x1p+128, false, +- -0xf.fffffffffffffffp+124, false, +- -0xf.fffffffffffffffp+124, false, +- false, +- -0x1p+128, false, +- -0x1p+128, false, +- -0xf.fffffffffffffffp+124, false, +- -0xf.fffffffffffffffp+124, false, +- false, +- -0x1p+128, false, +- -0x1p+128, false, +- -0xf.fffffffffffffffffffffffffcp+124, false, +- -0xf.fffffffffffffffffffffffffcp+124, false, +- false, +- -0x1p+128, false, +- -0x1p+128, false, +- -0xf.fffffffffffffffffffffffffff8p+124, false, +- -0xf.fffffffffffffffffffffffffff8p+124, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, false, false, ++ -0xf.fffffp+124, false, false, ++ false, ++ -0x1p+128, false, false, ++ -0x1p+128, false, false, ++ -0xf.ffffffffffff8p+124, false, false, ++ -0xf.ffffffffffff8p+124, false, false, ++ false, ++ -0x1p+128, false, false, ++ -0x1p+128, false, false, ++ -0xf.fffffffffffffffp+124, false, false, ++ -0xf.fffffffffffffffp+124, false, false, ++ false, ++ -0x1p+128, false, false, ++ -0x1p+128, false, false, ++ -0xf.fffffffffffffffp+124, false, false, ++ -0xf.fffffffffffffffp+124, false, false, ++ false, ++ -0x1p+128, false, false, ++ -0x1p+128, false, false, ++ -0xf.fffffffffffffffffffffffffcp+124, false, false, ++ -0xf.fffffffffffffffffffffffffcp+124, false, false, ++ false, ++ -0x1p+128, false, false, ++ -0x1p+128, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+124, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+124, false, false), + TEST ("-17976931348623159077293051907890247336179769789423065727343" + "008115773267580550096313270847732240753602112011387987139335" + "765878976881441662249284743063947412437776789342486548527630" +@@ -11799,35 +11799,35 @@ static const struct test tests[] = { + "054082723716335051068458629823994724593847971630483535632962" + "4224137215", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, false, +- -0xf.ffffffffffff8p+1020, false, +- false, +- -0x1p+1024, false, +- -0x1p+1024, false, +- -0xf.fffffffffffffffp+1020, false, +- -0xf.fffffffffffffffp+1020, false, +- false, +- -0x1p+1024, false, +- -0x1p+1024, false, +- -0xf.fffffffffffffffp+1020, false, +- -0xf.fffffffffffffffp+1020, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -0x1p+1024, false, +- -0x1p+1024, false, +- -0xf.fffffffffffffffffffffffffff8p+1020, false, +- -0xf.fffffffffffffffffffffffffff8p+1020, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ false, ++ -0x1p+1024, false, false, ++ -0x1p+1024, false, false, ++ -0xf.fffffffffffffffp+1020, false, false, ++ -0xf.fffffffffffffffp+1020, false, false, ++ false, ++ -0x1p+1024, false, false, ++ -0x1p+1024, false, false, ++ -0xf.fffffffffffffffp+1020, false, false, ++ -0xf.fffffffffffffffp+1020, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -0x1p+1024, false, false, ++ -0x1p+1024, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+1020, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+1020, false, false), + TEST ("-11897314953572317650857593266280071307634446870965102374726" + "748212332613581804836869044885954726120399151154374848393092" + "588976673813086874262745246983415650060808716343660048975221" +@@ -11912,3529 +11912,3529 @@ static const struct test tests[] = { + "904739824888992280918182139342882956797173699431524604470272" + "90669964066815", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffff8p+16380, false, +- -0xf.fffffffffffffffffffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false), + TEST ("+0x.80000000000000000000000000000001p1025", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0x1p+1024, false, +- 0x1p+1024, false, +- 0x1p+1024, false, +- 0x1.0000000000000002p+1024, false, +- false, +- 0x1p+1024, false, +- 0x1p+1024, false, +- 0x1p+1024, false, +- 0x1.0000000000000002p+1024, false, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0x1p+1024, false, +- 0x1p+1024, false, +- 0x1p+1024, false, +- 0x1.0000000000000000000000000001p+1024, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0x1p+1024, false, false, ++ 0x1p+1024, false, false, ++ 0x1p+1024, false, false, ++ 0x1.0000000000000002p+1024, false, false, ++ false, ++ 0x1p+1024, false, false, ++ 0x1p+1024, false, false, ++ 0x1p+1024, false, false, ++ 0x1.0000000000000002p+1024, false, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0x1p+1024, false, false, ++ 0x1p+1024, false, false, ++ 0x1p+1024, false, false, ++ 0x1.0000000000000000000000000001p+1024, false, false), + TEST ("1.5", + true, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- true, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- true, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- true, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- true, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- true, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false), ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ true, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ true, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ true, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ true, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ true, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false), + TEST ("1.25", + true, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- true, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- true, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- true, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- true, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- true, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false), ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ true, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ true, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ true, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ true, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ true, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false), + TEST ("1.125", + true, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- true, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- true, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- true, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- true, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- true, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false), ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ true, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ true, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ true, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ true, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ true, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false), + TEST ("1.0625", + true, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- true, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- true, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- true, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- true, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- true, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false), ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ true, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ true, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ true, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ true, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ true, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false), + TEST ("1.03125", + true, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- true, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- true, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- true, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- true, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- true, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false), ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ true, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ true, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ true, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ true, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ true, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false), + TEST ("1.015625", + true, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- true, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- true, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- true, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- true, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- true, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false), ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ true, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ true, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ true, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ true, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ true, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false), + TEST ("1.0078125", + true, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- true, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- true, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- true, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- true, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- true, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false), ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ true, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ true, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ true, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ true, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ true, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false), + TEST ("1.00390625", + true, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- true, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- true, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- true, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- true, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- true, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false), ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ true, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ true, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ true, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ true, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ true, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false), + TEST ("1.001953125", + true, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- true, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- true, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- true, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- true, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- true, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false), ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ true, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ true, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ true, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ true, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ true, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false), + TEST ("1.0009765625", + true, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- true, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- true, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- true, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- true, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- true, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false), ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ true, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ true, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ true, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ true, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ true, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false), + TEST ("1.00048828125", + true, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- true, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- true, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- true, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- true, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- true, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false), ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ true, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ true, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ true, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ true, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ true, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false), + TEST ("1.000244140625", + true, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- true, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- true, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- true, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- true, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- true, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false), ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ true, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ true, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ true, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ true, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ true, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false), + TEST ("1.0001220703125", + true, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- true, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- true, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- true, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- true, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- true, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false), ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ true, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ true, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ true, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ true, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ true, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false), + TEST ("1.00006103515625", + true, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- true, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- true, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- true, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- true, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- true, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false), ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ true, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ true, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ true, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ true, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ true, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false), + TEST ("1.000030517578125", + true, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- true, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- true, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- true, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- true, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- true, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false), ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ true, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ true, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ true, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ true, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ true, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false), + TEST ("1.0000152587890625", + true, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- true, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- true, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- true, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- true, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- true, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false), ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ true, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ true, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ true, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ true, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ true, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false), + TEST ("1.00000762939453125", + true, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- true, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- true, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- true, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- true, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- true, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false), ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ true, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ true, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ true, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ true, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ true, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false), + TEST ("1.000003814697265625", + true, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- true, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- true, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- true, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- true, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- true, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false), ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ true, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ true, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ true, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ true, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ true, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false), + TEST ("1.0000019073486328125", + true, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- true, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- true, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- true, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- true, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- true, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false), ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ true, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ true, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ true, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ true, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ true, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false), + TEST ("1.00000095367431640625", + true, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- true, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- true, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- true, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- true, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- true, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false), ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ true, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ true, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ true, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ true, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ true, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false), + TEST ("1.000000476837158203125", + true, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- true, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- true, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- true, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- true, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- true, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false), ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ true, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ true, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ true, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ true, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ true, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false), + TEST ("1.0000000298023223876953125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- true, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- true, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- true, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- true, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ true, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ true, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ true, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ true, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false), + TEST ("1.00000001490116119384765625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- true, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- true, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- true, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- true, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ true, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ true, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ true, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ true, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false), + TEST ("1.000000007450580596923828125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- true, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- true, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- true, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- true, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ true, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ true, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ true, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ true, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false), + TEST ("1.0000000037252902984619140625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- true, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- true, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- true, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- true, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ true, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ true, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ true, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ true, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false), + TEST ("1.00000000186264514923095703125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- true, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- true, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- true, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- true, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ true, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ true, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ true, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ true, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false), + TEST ("1.000000000931322574615478515625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- true, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- true, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- true, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- true, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ true, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ true, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ true, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ true, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false), + TEST ("1.0000000004656612873077392578125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- true, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- true, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- true, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- true, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ true, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ true, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ true, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ true, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false), + TEST ("1.00000000023283064365386962890625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- true, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- true, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- true, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- true, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ true, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ true, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ true, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ true, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false), + TEST ("1.000000000116415321826934814453125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- true, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- true, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- true, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- true, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ true, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ true, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ true, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ true, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false), + TEST ("1.0000000000582076609134674072265625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- true, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- true, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- true, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- true, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ true, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ true, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ true, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ true, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false), + TEST ("1.00000000002910383045673370361328125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- true, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- true, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- true, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- true, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ true, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ true, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ true, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ true, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false), + TEST ("1.000000000014551915228366851806640625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- true, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- true, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- true, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- true, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ true, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ true, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ true, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ true, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false), + TEST ("1.0000000000072759576141834259033203125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- true, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- true, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- true, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- true, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ true, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ true, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ true, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ true, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false), + TEST ("1.00000000000363797880709171295166015625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- true, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- true, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- true, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- true, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ true, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ true, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ true, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ true, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false), + TEST ("1.000000000001818989403545856475830078125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- true, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- true, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- true, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- true, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ true, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ true, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ true, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ true, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false), + TEST ("1.0000000000009094947017729282379150390625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- true, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- true, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- true, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- true, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ true, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ true, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ true, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ true, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false), + TEST ("1.00000000000045474735088646411895751953125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- true, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- true, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- true, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- true, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ true, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ true, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ true, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ true, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false), + TEST ("1.000000000000227373675443232059478759765625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- true, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- true, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- true, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- true, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ true, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ true, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ true, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ true, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false), + TEST ("1.0000000000001136868377216160297393798828125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- true, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- true, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- true, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- true, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ true, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ true, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ true, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ true, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false), + TEST ("1.00000000000005684341886080801486968994140625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- true, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- true, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- true, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- true, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ true, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ true, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ true, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ true, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false), + TEST ("1.000000000000028421709430404007434844970703125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- true, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- true, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- true, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- true, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ true, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ true, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ true, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ true, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false), + TEST ("1.0000000000000142108547152020037174224853515625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- true, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- true, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- true, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- true, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ true, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ true, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ true, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ true, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false), + TEST ("1.00000000000000710542735760100185871124267578125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- true, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- true, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- true, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- true, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ true, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ true, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ true, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ true, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false), + TEST ("1.000000000000003552713678800500929355621337890625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- true, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- true, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- true, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- true, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ true, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ true, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ true, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ true, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false), + TEST ("1.0000000000000017763568394002504646778106689453125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- true, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- true, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- true, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- true, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ true, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ true, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ true, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ true, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false), + TEST ("1.00000000000000088817841970012523233890533447265625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- true, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- true, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- true, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- true, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ true, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ true, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ true, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ true, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false), + TEST ("1.000000000000000444089209850062616169452667236328125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- true, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- true, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- true, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- true, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ true, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ true, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ true, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ true, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false), + TEST ("1.0000000000000002220446049250313080847263336181640625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false), + TEST ("1.00000000000000011102230246251565404236316680908203125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- true, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- true, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- true, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ true, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ true, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ true, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false), + TEST ("1.000000000000000055511151231257827021181583404541015625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- true, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- true, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- true, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ true, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ true, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ true, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false), + TEST ("1.0000000000000000277555756156289135105907917022705078125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- true, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- true, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- true, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ true, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ true, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ true, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false), + TEST ("1.00000000000000001387778780781445675529539585113525390625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- true, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- true, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- true, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ true, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ true, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ true, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false), + TEST ("1.000000000000000006938893903907228377647697925567626953125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- true, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- true, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- true, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false), + TEST ("1.0000000000000000034694469519536141888238489627838134765625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- true, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- true, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- true, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ true, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ true, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ true, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false), + TEST ("1.0000000000000000017347234759768070944119244813919067382812" + "5", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- true, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- true, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- true, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false), + TEST ("1.0000000000000000008673617379884035472059622406959533691406" + "25", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- true, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- true, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- true, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ true, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ true, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ true, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false), + TEST ("1.0000000000000000004336808689942017736029811203479766845703" + "125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- true, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- true, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- true, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false), + TEST ("1.0000000000000000002168404344971008868014905601739883422851" + "5625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- true, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- true, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- true, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ true, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ true, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ true, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false), + TEST ("1.0000000000000000001084202172485504434007452800869941711425" + "78125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false), + TEST ("1.0000000000000000000542101086242752217003726400434970855712" + "890625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000001p+0, false, +- 0x1.0000000000000001p+0, false, +- 0x1.0000000000000001p+0, false, +- 0x1.0000000000000001p+0, false, +- true, +- 0x1.0000000000000001p+0, false, +- 0x1.0000000000000001p+0, false, +- 0x1.0000000000000001p+0, false, +- 0x1.0000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000001p+0, false, false, ++ 0x1.0000000000000001p+0, false, false, ++ 0x1.0000000000000001p+0, false, false, ++ 0x1.0000000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000001p+0, false, false, ++ 0x1.0000000000000001p+0, false, false, ++ 0x1.0000000000000001p+0, false, false, ++ 0x1.0000000000000001p+0, false, false), + TEST ("1.0000000000000000000271050543121376108501863200217485427856" + "4453125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000008p+0, false, +- 0x1.00000000000000008p+0, false, +- 0x1.00000000000000008p+0, false, +- 0x1.00000000000000008p+0, false, +- true, +- 0x1.00000000000000008p+0, false, +- 0x1.00000000000000008p+0, false, +- 0x1.00000000000000008p+0, false, +- 0x1.00000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000008p+0, false, false, ++ 0x1.00000000000000008p+0, false, false, ++ 0x1.00000000000000008p+0, false, false, ++ 0x1.00000000000000008p+0, false, false, ++ true, ++ 0x1.00000000000000008p+0, false, false, ++ 0x1.00000000000000008p+0, false, false, ++ 0x1.00000000000000008p+0, false, false, ++ 0x1.00000000000000008p+0, false, false), + TEST ("1.0000000000000000000135525271560688054250931600108742713928" + "22265625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000004p+0, false, +- 0x1.00000000000000004p+0, false, +- 0x1.00000000000000004p+0, false, +- 0x1.00000000000000004p+0, false, +- true, +- 0x1.00000000000000004p+0, false, +- 0x1.00000000000000004p+0, false, +- 0x1.00000000000000004p+0, false, +- 0x1.00000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000004p+0, false, false, ++ 0x1.00000000000000004p+0, false, false, ++ 0x1.00000000000000004p+0, false, false, ++ 0x1.00000000000000004p+0, false, false, ++ true, ++ 0x1.00000000000000004p+0, false, false, ++ 0x1.00000000000000004p+0, false, false, ++ 0x1.00000000000000004p+0, false, false, ++ 0x1.00000000000000004p+0, false, false), + TEST ("1.0000000000000000000067762635780344027125465800054371356964" + "111328125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000002p+0, false, +- 0x1.00000000000000002p+0, false, +- 0x1.00000000000000002p+0, false, +- 0x1.00000000000000002p+0, false, +- true, +- 0x1.00000000000000002p+0, false, +- 0x1.00000000000000002p+0, false, +- 0x1.00000000000000002p+0, false, +- 0x1.00000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000002p+0, false, false, ++ 0x1.00000000000000002p+0, false, false, ++ 0x1.00000000000000002p+0, false, false, ++ 0x1.00000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000002p+0, false, false, ++ 0x1.00000000000000002p+0, false, false, ++ 0x1.00000000000000002p+0, false, false, ++ 0x1.00000000000000002p+0, false, false), + TEST ("1.0000000000000000000033881317890172013562732900027185678482" + "0556640625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000001p+0, false, +- 0x1.00000000000000001p+0, false, +- 0x1.00000000000000001p+0, false, +- 0x1.00000000000000001p+0, false, +- true, +- 0x1.00000000000000001p+0, false, +- 0x1.00000000000000001p+0, false, +- 0x1.00000000000000001p+0, false, +- 0x1.00000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000001p+0, false, false, ++ 0x1.00000000000000001p+0, false, false, ++ 0x1.00000000000000001p+0, false, false, ++ 0x1.00000000000000001p+0, false, false, ++ true, ++ 0x1.00000000000000001p+0, false, false, ++ 0x1.00000000000000001p+0, false, false, ++ 0x1.00000000000000001p+0, false, false, ++ 0x1.00000000000000001p+0, false, false), + TEST ("1.0000000000000000000016940658945086006781366450013592839241" + "02783203125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000008p+0, false, +- 0x1.000000000000000008p+0, false, +- 0x1.000000000000000008p+0, false, +- 0x1.000000000000000008p+0, false, +- true, +- 0x1.000000000000000008p+0, false, +- 0x1.000000000000000008p+0, false, +- 0x1.000000000000000008p+0, false, +- 0x1.000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000008p+0, false, false, ++ 0x1.000000000000000008p+0, false, false, ++ 0x1.000000000000000008p+0, false, false, ++ 0x1.000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000008p+0, false, false, ++ 0x1.000000000000000008p+0, false, false, ++ 0x1.000000000000000008p+0, false, false, ++ 0x1.000000000000000008p+0, false, false), + TEST ("1.0000000000000000000008470329472543003390683225006796419620" + "513916015625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000004p+0, false, +- 0x1.000000000000000004p+0, false, +- 0x1.000000000000000004p+0, false, +- 0x1.000000000000000004p+0, false, +- true, +- 0x1.000000000000000004p+0, false, +- 0x1.000000000000000004p+0, false, +- 0x1.000000000000000004p+0, false, +- 0x1.000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000004p+0, false, false, ++ 0x1.000000000000000004p+0, false, false, ++ 0x1.000000000000000004p+0, false, false, ++ 0x1.000000000000000004p+0, false, false, ++ true, ++ 0x1.000000000000000004p+0, false, false, ++ 0x1.000000000000000004p+0, false, false, ++ 0x1.000000000000000004p+0, false, false, ++ 0x1.000000000000000004p+0, false, false), + TEST ("1.0000000000000000000004235164736271501695341612503398209810" + "2569580078125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000002p+0, false, +- 0x1.000000000000000002p+0, false, +- 0x1.000000000000000002p+0, false, +- 0x1.000000000000000002p+0, false, +- true, +- 0x1.000000000000000002p+0, false, +- 0x1.000000000000000002p+0, false, +- 0x1.000000000000000002p+0, false, +- 0x1.000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000002p+0, false, false, ++ 0x1.000000000000000002p+0, false, false, ++ 0x1.000000000000000002p+0, false, false, ++ 0x1.000000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000002p+0, false, false, ++ 0x1.000000000000000002p+0, false, false, ++ 0x1.000000000000000002p+0, false, false, ++ 0x1.000000000000000002p+0, false, false), + TEST ("1.0000000000000000000002117582368135750847670806251699104905" + "12847900390625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000001p+0, false, +- 0x1.000000000000000001p+0, false, +- 0x1.000000000000000001p+0, false, +- 0x1.000000000000000001p+0, false, +- true, +- 0x1.000000000000000001p+0, false, +- 0x1.000000000000000001p+0, false, +- 0x1.000000000000000001p+0, false, +- 0x1.000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000001p+0, false, false, ++ 0x1.000000000000000001p+0, false, false, ++ 0x1.000000000000000001p+0, false, false, ++ 0x1.000000000000000001p+0, false, false, ++ true, ++ 0x1.000000000000000001p+0, false, false, ++ 0x1.000000000000000001p+0, false, false, ++ 0x1.000000000000000001p+0, false, false, ++ 0x1.000000000000000001p+0, false, false), + TEST ("1.0000000000000000000001058791184067875423835403125849552452" + "564239501953125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000008p+0, false, +- 0x1.0000000000000000008p+0, false, +- 0x1.0000000000000000008p+0, false, +- 0x1.0000000000000000008p+0, false, +- true, +- 0x1.0000000000000000008p+0, false, +- 0x1.0000000000000000008p+0, false, +- 0x1.0000000000000000008p+0, false, +- 0x1.0000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000008p+0, false, false, ++ 0x1.0000000000000000008p+0, false, false, ++ 0x1.0000000000000000008p+0, false, false, ++ 0x1.0000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000008p+0, false, false, ++ 0x1.0000000000000000008p+0, false, false, ++ 0x1.0000000000000000008p+0, false, false, ++ 0x1.0000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000529395592033937711917701562924776226" + "2821197509765625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000004p+0, false, +- 0x1.0000000000000000004p+0, false, +- 0x1.0000000000000000004p+0, false, +- 0x1.0000000000000000004p+0, false, +- true, +- 0x1.0000000000000000004p+0, false, +- 0x1.0000000000000000004p+0, false, +- 0x1.0000000000000000004p+0, false, +- 0x1.0000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000004p+0, false, false, ++ 0x1.0000000000000000004p+0, false, false, ++ 0x1.0000000000000000004p+0, false, false, ++ 0x1.0000000000000000004p+0, false, false, ++ true, ++ 0x1.0000000000000000004p+0, false, false, ++ 0x1.0000000000000000004p+0, false, false, ++ 0x1.0000000000000000004p+0, false, false, ++ 0x1.0000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000264697796016968855958850781462388113" + "14105987548828125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000002p+0, false, +- 0x1.0000000000000000002p+0, false, +- 0x1.0000000000000000002p+0, false, +- 0x1.0000000000000000002p+0, false, +- true, +- 0x1.0000000000000000002p+0, false, +- 0x1.0000000000000000002p+0, false, +- 0x1.0000000000000000002p+0, false, +- 0x1.0000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000002p+0, false, false, ++ 0x1.0000000000000000002p+0, false, false, ++ 0x1.0000000000000000002p+0, false, false, ++ 0x1.0000000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000002p+0, false, false, ++ 0x1.0000000000000000002p+0, false, false, ++ 0x1.0000000000000000002p+0, false, false, ++ 0x1.0000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000132348898008484427979425390731194056" + "570529937744140625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000001p+0, false, +- 0x1.0000000000000000001p+0, false, +- 0x1.0000000000000000001p+0, false, +- 0x1.0000000000000000001p+0, false, +- true, +- 0x1.0000000000000000001p+0, false, +- 0x1.0000000000000000001p+0, false, +- 0x1.0000000000000000001p+0, false, +- 0x1.0000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000001p+0, false, false, ++ 0x1.0000000000000000001p+0, false, false, ++ 0x1.0000000000000000001p+0, false, false, ++ 0x1.0000000000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000000001p+0, false, false, ++ 0x1.0000000000000000001p+0, false, false, ++ 0x1.0000000000000000001p+0, false, false, ++ 0x1.0000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000066174449004242213989712695365597028" + "2852649688720703125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000008p+0, false, +- 0x1.00000000000000000008p+0, false, +- 0x1.00000000000000000008p+0, false, +- 0x1.00000000000000000008p+0, false, +- true, +- 0x1.00000000000000000008p+0, false, +- 0x1.00000000000000000008p+0, false, +- 0x1.00000000000000000008p+0, false, +- 0x1.00000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000008p+0, false, false, ++ 0x1.00000000000000000008p+0, false, false, ++ 0x1.00000000000000000008p+0, false, false, ++ 0x1.00000000000000000008p+0, false, false, ++ true, ++ 0x1.00000000000000000008p+0, false, false, ++ 0x1.00000000000000000008p+0, false, false, ++ 0x1.00000000000000000008p+0, false, false, ++ 0x1.00000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000033087224502121106994856347682798514" + "14263248443603515625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000004p+0, false, +- 0x1.00000000000000000004p+0, false, +- 0x1.00000000000000000004p+0, false, +- 0x1.00000000000000000004p+0, false, +- true, +- 0x1.00000000000000000004p+0, false, +- 0x1.00000000000000000004p+0, false, +- 0x1.00000000000000000004p+0, false, +- 0x1.00000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000004p+0, false, false, ++ 0x1.00000000000000000004p+0, false, false, ++ 0x1.00000000000000000004p+0, false, false, ++ 0x1.00000000000000000004p+0, false, false, ++ true, ++ 0x1.00000000000000000004p+0, false, false, ++ 0x1.00000000000000000004p+0, false, false, ++ 0x1.00000000000000000004p+0, false, false, ++ 0x1.00000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000016543612251060553497428173841399257" + "071316242218017578125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000002p+0, false, +- 0x1.00000000000000000002p+0, false, +- 0x1.00000000000000000002p+0, false, +- 0x1.00000000000000000002p+0, false, +- true, +- 0x1.00000000000000000002p+0, false, +- 0x1.00000000000000000002p+0, false, +- 0x1.00000000000000000002p+0, false, +- 0x1.00000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000002p+0, false, false, ++ 0x1.00000000000000000002p+0, false, false, ++ 0x1.00000000000000000002p+0, false, false, ++ 0x1.00000000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000002p+0, false, false, ++ 0x1.00000000000000000002p+0, false, false, ++ 0x1.00000000000000000002p+0, false, false, ++ 0x1.00000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000008271806125530276748714086920699628" + "5356581211090087890625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000001p+0, false, +- 0x1.00000000000000000001p+0, false, +- 0x1.00000000000000000001p+0, false, +- 0x1.00000000000000000001p+0, false, +- true, +- 0x1.00000000000000000001p+0, false, +- 0x1.00000000000000000001p+0, false, +- 0x1.00000000000000000001p+0, false, +- 0x1.00000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000001p+0, false, false, ++ 0x1.00000000000000000001p+0, false, false, ++ 0x1.00000000000000000001p+0, false, false, ++ 0x1.00000000000000000001p+0, false, false, ++ true, ++ 0x1.00000000000000000001p+0, false, false, ++ 0x1.00000000000000000001p+0, false, false, ++ 0x1.00000000000000000001p+0, false, false, ++ 0x1.00000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000004135903062765138374357043460349814" + "26782906055450439453125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000008p+0, false, +- 0x1.000000000000000000008p+0, false, +- 0x1.000000000000000000008p+0, false, +- 0x1.000000000000000000008p+0, false, +- true, +- 0x1.000000000000000000008p+0, false, +- 0x1.000000000000000000008p+0, false, +- 0x1.000000000000000000008p+0, false, +- 0x1.000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000008p+0, false, false, ++ 0x1.000000000000000000008p+0, false, false, ++ 0x1.000000000000000000008p+0, false, false, ++ 0x1.000000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000000008p+0, false, false, ++ 0x1.000000000000000000008p+0, false, false, ++ 0x1.000000000000000000008p+0, false, false, ++ 0x1.000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000002067951531382569187178521730174907" + "133914530277252197265625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000004p+0, false, +- 0x1.000000000000000000004p+0, false, +- 0x1.000000000000000000004p+0, false, +- 0x1.000000000000000000004p+0, false, +- true, +- 0x1.000000000000000000004p+0, false, +- 0x1.000000000000000000004p+0, false, +- 0x1.000000000000000000004p+0, false, +- 0x1.000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000004p+0, false, false, ++ 0x1.000000000000000000004p+0, false, false, ++ 0x1.000000000000000000004p+0, false, false, ++ 0x1.000000000000000000004p+0, false, false, ++ true, ++ 0x1.000000000000000000004p+0, false, false, ++ 0x1.000000000000000000004p+0, false, false, ++ 0x1.000000000000000000004p+0, false, false, ++ 0x1.000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000001033975765691284593589260865087453" + "5669572651386260986328125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000002p+0, false, +- 0x1.000000000000000000002p+0, false, +- 0x1.000000000000000000002p+0, false, +- 0x1.000000000000000000002p+0, false, +- true, +- 0x1.000000000000000000002p+0, false, +- 0x1.000000000000000000002p+0, false, +- 0x1.000000000000000000002p+0, false, +- 0x1.000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000002p+0, false, false, ++ 0x1.000000000000000000002p+0, false, false, ++ 0x1.000000000000000000002p+0, false, false, ++ 0x1.000000000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000002p+0, false, false, ++ 0x1.000000000000000000002p+0, false, false, ++ 0x1.000000000000000000002p+0, false, false, ++ 0x1.000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000516987882845642296794630432543726" + "78347863256931304931640625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000001p+0, false, +- 0x1.000000000000000000001p+0, false, +- 0x1.000000000000000000001p+0, false, +- 0x1.000000000000000000001p+0, false, +- true, +- 0x1.000000000000000000001p+0, false, +- 0x1.000000000000000000001p+0, false, +- 0x1.000000000000000000001p+0, false, +- 0x1.000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000001p+0, false, false, ++ 0x1.000000000000000000001p+0, false, false, ++ 0x1.000000000000000000001p+0, false, false, ++ 0x1.000000000000000000001p+0, false, false, ++ true, ++ 0x1.000000000000000000001p+0, false, false, ++ 0x1.000000000000000000001p+0, false, false, ++ 0x1.000000000000000000001p+0, false, false, ++ 0x1.000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000258493941422821148397315216271863" + "391739316284656524658203125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000008p+0, false, +- 0x1.0000000000000000000008p+0, false, +- 0x1.0000000000000000000008p+0, false, +- 0x1.0000000000000000000008p+0, false, +- true, +- 0x1.0000000000000000000008p+0, false, +- 0x1.0000000000000000000008p+0, false, +- 0x1.0000000000000000000008p+0, false, +- 0x1.0000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000129246970711410574198657608135931" + "6958696581423282623291015625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000004p+0, false, +- 0x1.0000000000000000000004p+0, false, +- 0x1.0000000000000000000004p+0, false, +- 0x1.0000000000000000000004p+0, false, +- true, +- 0x1.0000000000000000000004p+0, false, +- 0x1.0000000000000000000004p+0, false, +- 0x1.0000000000000000000004p+0, false, +- 0x1.0000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000004p+0, false, false, ++ true, ++ 0x1.0000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000064623485355705287099328804067965" + "84793482907116413116455078125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000002p+0, false, +- 0x1.0000000000000000000002p+0, false, +- 0x1.0000000000000000000002p+0, false, +- 0x1.0000000000000000000002p+0, false, +- true, +- 0x1.0000000000000000000002p+0, false, +- 0x1.0000000000000000000002p+0, false, +- 0x1.0000000000000000000002p+0, false, +- 0x1.0000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000032311742677852643549664402033982" + "923967414535582065582275390625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000001p+0, false, +- 0x1.0000000000000000000001p+0, false, +- 0x1.0000000000000000000001p+0, false, +- 0x1.0000000000000000000001p+0, false, +- true, +- 0x1.0000000000000000000001p+0, false, +- 0x1.0000000000000000000001p+0, false, +- 0x1.0000000000000000000001p+0, false, +- 0x1.0000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000016155871338926321774832201016991" + "4619837072677910327911376953125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000008p+0, false, +- 0x1.00000000000000000000008p+0, false, +- 0x1.00000000000000000000008p+0, false, +- 0x1.00000000000000000000008p+0, false, +- true, +- 0x1.00000000000000000000008p+0, false, +- 0x1.00000000000000000000008p+0, false, +- 0x1.00000000000000000000008p+0, false, +- 0x1.00000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000008p+0, false, false, ++ true, ++ 0x1.00000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000008077935669463160887416100508495" + "73099185363389551639556884765625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000004p+0, false, +- 0x1.00000000000000000000004p+0, false, +- 0x1.00000000000000000000004p+0, false, +- 0x1.00000000000000000000004p+0, false, +- true, +- 0x1.00000000000000000000004p+0, false, +- 0x1.00000000000000000000004p+0, false, +- 0x1.00000000000000000000004p+0, false, +- 0x1.00000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000004p+0, false, false, ++ true, ++ 0x1.00000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000004038967834731580443708050254247" + "865495926816947758197784423828125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000002p+0, false, +- 0x1.00000000000000000000002p+0, false, +- 0x1.00000000000000000000002p+0, false, +- 0x1.00000000000000000000002p+0, false, +- true, +- 0x1.00000000000000000000002p+0, false, +- 0x1.00000000000000000000002p+0, false, +- 0x1.00000000000000000000002p+0, false, +- 0x1.00000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000002019483917365790221854025127123" + "9327479634084738790988922119140625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000001p+0, false, +- 0x1.00000000000000000000001p+0, false, +- 0x1.00000000000000000000001p+0, false, +- 0x1.00000000000000000000001p+0, false, +- true, +- 0x1.00000000000000000000001p+0, false, +- 0x1.00000000000000000000001p+0, false, +- 0x1.00000000000000000000001p+0, false, +- 0x1.00000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000001p+0, false, false, ++ true, ++ 0x1.00000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000001009741958682895110927012563561" + "96637398170423693954944610595703125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000000008p+0, false, +- 0x1.000000000000000000000008p+0, false, +- 0x1.000000000000000000000008p+0, false, +- 0x1.000000000000000000000008p+0, false, +- true, +- 0x1.000000000000000000000008p+0, false, +- 0x1.000000000000000000000008p+0, false, +- 0x1.000000000000000000000008p+0, false, +- 0x1.000000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000000504870979341447555463506281780" + "983186990852118469774723052978515625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000000004p+0, false, +- 0x1.000000000000000000000004p+0, false, +- 0x1.000000000000000000000004p+0, false, +- 0x1.000000000000000000000004p+0, false, +- true, +- 0x1.000000000000000000000004p+0, false, +- 0x1.000000000000000000000004p+0, false, +- 0x1.000000000000000000000004p+0, false, +- 0x1.000000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000004p+0, false, false, ++ true, ++ 0x1.000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000000252435489670723777731753140890" + "4915934954260592348873615264892578125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000000002p+0, false, +- 0x1.000000000000000000000002p+0, false, +- 0x1.000000000000000000000002p+0, false, +- 0x1.000000000000000000000002p+0, false, +- true, +- 0x1.000000000000000000000002p+0, false, +- 0x1.000000000000000000000002p+0, false, +- 0x1.000000000000000000000002p+0, false, +- 0x1.000000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000000126217744835361888865876570445" + "24579674771302961744368076324462890625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000000001p+0, false, +- 0x1.000000000000000000000001p+0, false, +- 0x1.000000000000000000000001p+0, false, +- 0x1.000000000000000000000001p+0, false, +- true, +- 0x1.000000000000000000000001p+0, false, +- 0x1.000000000000000000000001p+0, false, +- 0x1.000000000000000000000001p+0, false, +- 0x1.000000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000001p+0, false, false, ++ true, ++ 0x1.000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000000063108872417680944432938285222" + "622898373856514808721840381622314453125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000000008p+0, false, +- 0x1.0000000000000000000000008p+0, false, +- 0x1.0000000000000000000000008p+0, false, +- 0x1.0000000000000000000000008p+0, false, +- true, +- 0x1.0000000000000000000000008p+0, false, +- 0x1.0000000000000000000000008p+0, false, +- 0x1.0000000000000000000000008p+0, false, +- 0x1.0000000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000000031554436208840472216469142611" + "3114491869282574043609201908111572265625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000000004p+0, false, +- 0x1.0000000000000000000000004p+0, false, +- 0x1.0000000000000000000000004p+0, false, +- 0x1.0000000000000000000000004p+0, false, +- true, +- 0x1.0000000000000000000000004p+0, false, +- 0x1.0000000000000000000000004p+0, false, +- 0x1.0000000000000000000000004p+0, false, +- 0x1.0000000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000004p+0, false, false, ++ true, ++ 0x1.0000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000000015777218104420236108234571305" + "65572459346412870218046009540557861328125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000000002p+0, false, +- 0x1.0000000000000000000000002p+0, false, +- 0x1.0000000000000000000000002p+0, false, +- 0x1.0000000000000000000000002p+0, false, +- true, +- 0x1.0000000000000000000000002p+0, false, +- 0x1.0000000000000000000000002p+0, false, +- 0x1.0000000000000000000000002p+0, false, +- 0x1.0000000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000000007888609052210118054117285652" + "827862296732064351090230047702789306640625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000000001p+0, false, +- 0x1.0000000000000000000000001p+0, false, +- 0x1.0000000000000000000000001p+0, false, +- 0x1.0000000000000000000000001p+0, false, +- true, +- 0x1.0000000000000000000000001p+0, false, +- 0x1.0000000000000000000000001p+0, false, +- 0x1.0000000000000000000000001p+0, false, +- 0x1.0000000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000000003944304526105059027058642826" + "4139311483660321755451150238513946533203125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000000008p+0, false, +- 0x1.00000000000000000000000008p+0, false, +- 0x1.00000000000000000000000008p+0, false, +- 0x1.00000000000000000000000008p+0, false, +- true, +- 0x1.00000000000000000000000008p+0, false, +- 0x1.00000000000000000000000008p+0, false, +- 0x1.00000000000000000000000008p+0, false, +- 0x1.00000000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000000008p+0, false, false, ++ true, ++ 0x1.00000000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000000001972152263052529513529321413" + "20696557418301608777255751192569732666015625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000000004p+0, false, +- 0x1.00000000000000000000000004p+0, false, +- 0x1.00000000000000000000000004p+0, false, +- 0x1.00000000000000000000000004p+0, false, +- true, +- 0x1.00000000000000000000000004p+0, false, +- 0x1.00000000000000000000000004p+0, false, +- 0x1.00000000000000000000000004p+0, false, +- 0x1.00000000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000000004p+0, false, false, ++ true, ++ 0x1.00000000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000000000986076131526264756764660706" + "603482787091508043886278755962848663330078125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000000002p+0, false, +- 0x1.00000000000000000000000002p+0, false, +- 0x1.00000000000000000000000002p+0, false, +- 0x1.00000000000000000000000002p+0, false, +- true, +- 0x1.00000000000000000000000002p+0, false, +- 0x1.00000000000000000000000002p+0, false, +- 0x1.00000000000000000000000002p+0, false, +- 0x1.00000000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000000000493038065763132378382330353" + "3017413935457540219431393779814243316650390625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000000001p+0, false, +- 0x1.00000000000000000000000001p+0, false, +- 0x1.00000000000000000000000001p+0, false, +- 0x1.00000000000000000000000001p+0, false, +- true, +- 0x1.00000000000000000000000001p+0, false, +- 0x1.00000000000000000000000001p+0, false, +- 0x1.00000000000000000000000001p+0, false, +- 0x1.00000000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000000001p+0, false, false, ++ true, ++ 0x1.00000000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000000000246519032881566189191165176" + "65087069677287701097156968899071216583251953125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000000000008p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.000000000000000000000000008p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- 0x1.000000000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000000000123259516440783094595582588" + "325435348386438505485784844495356082916259765625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.000000000000000000000000004p+0, false, +- 0x1.000000000000000000000000004p+0, false, +- 0x1.000000000000000000000000004p+0, false, +- 0x1.000000000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000000000061629758220391547297791294" + "1627176741932192527428924222476780414581298828125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.000000000000000000000000002p+0, false, +- 0x1.000000000000000000000000002p+0, false, +- 0x1.000000000000000000000000002p+0, false, +- 0x1.000000000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000000000030814879110195773648895647" + "08135883709660962637144621112383902072906494140625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.000000000000000000000000001p+0, false, +- 0x1.000000000000000000000000001p+0, false, +- 0x1.000000000000000000000000001p+0, false, +- 0x1.000000000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000000000015407439555097886824447823" + "540679418548304813185723105561919510364532470703125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.0000000000000000000000000008p+0, false, +- 0x1.0000000000000000000000000008p+0, false, +- 0x1.0000000000000000000000000008p+0, false, +- 0x1.0000000000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000000000007703719777548943412223911" + "7703397092741524065928615527809597551822662353515625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.0000000000000000000000000004p+0, false, +- 0x1.0000000000000000000000000004p+0, false, +- 0x1.0000000000000000000000000004p+0, false, +- 0x1.0000000000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000000000003851859888774471706111955" + "88516985463707620329643077639047987759113311767578125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.0000000000000000000000000002p+0, false, +- 0x1.0000000000000000000000000002p+0, false, +- 0x1.0000000000000000000000000002p+0, false, +- 0x1.0000000000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000000000001925929944387235853055977" + "942584927318538101648215388195239938795566558837890625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.0000000000000000000000000001p+0, false, +- 0x1.0000000000000000000000000001p+0, false, +- 0x1.0000000000000000000000000001p+0, false, +- 0x1.0000000000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000000000000962964972193617926527988" + "9712924636592690508241076940976199693977832794189453125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000000000000000001p+0, false, false), + }; +diff --git a/stdlib/tst-strtod-round-skeleton.c b/stdlib/tst-strtod-round-skeleton.c +index c3cc0201d4..be081ba416 100644 +--- a/stdlib/tst-strtod-round-skeleton.c ++++ b/stdlib/tst-strtod-round-skeleton.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include "tst-strtod.h" + +@@ -139,16 +140,26 @@ + gen-tst-strtod-round utility to select the appropriately + rounded long double value for a given format. */ + #define TEST(s, \ +- fx, fd, fdo, fn, fno, fz, fzo, fu, fuo, \ +- dx, dd, ddo, dn, dno, dz, dzo, du, duo, \ +- ld64ix, ld64id, ld64ido, ld64in, ld64ino, \ +- ld64iz, ld64izo, ld64iu, ld64iuo, \ +- ld64mx, ld64md, ld64mdo, ld64mn, ld64mno, \ +- ld64mz, ld64mzo, ld64mu, ld64muo, \ +- ld106x, ld106d, ld106do, ld106n, ld106no, \ +- ld106z, ld106zo, ld106u, ld106uo, \ +- ld113x, ld113d, ld113do, ld113n, ld113no, \ +- ld113z, ld113zo, ld113u, ld113uo) \ ++ fx, fd, fdo, fdu, fn, fno, fnu, \ ++ fz, fzo, fzu, fu, fuo, fuu, \ ++ dx, dd, ddo, ddu, dn, dno, dnu, \ ++ dz, dzo, dzu, du, duo, duu, \ ++ ld64ix, ld64id, ld64ido, ld64idu, \ ++ ld64in, ld64ino, ld64inu, \ ++ ld64iz, ld64izo, ld64izu, \ ++ ld64iu, ld64iuo, ld64iuu, \ ++ ld64mx, ld64md, ld64mdo, ld64mdu, \ ++ ld64mn, ld64mno, ld64mnu, \ ++ ld64mz, ld64mzo, ld64mzu, \ ++ ld64mu, ld64muo, ld64muu, \ ++ ld106x, ld106d, ld106do, ld106du, \ ++ ld106n, ld106no, ld106nu, \ ++ ld106z, ld106zo, ld106zu, \ ++ ld106u, ld106uo, ld106uu, \ ++ ld113x, ld113d, ld113do, ld113du, \ ++ ld113n, ld113no, ld113nu, \ ++ ld113z, ld113zo, ld113zu, \ ++ ld113u, ld113uo, ld113uu) \ + { \ + L_ (s), \ + { XNTRY (fx, dx, ld64ix, ld64mx, ld106x, ld113x) }, \ +@@ -163,6 +174,12 @@ + { XNTRY (fdo, ddo, ld64ido, ld64mdo, ld106do, ld113do) }, \ + { XNTRY (fzo, dzo, ld64izo, ld64mzo, ld106zo, ld113zo) }, \ + { XNTRY (fuo, duo, ld64iuo, ld64muo, ld106uo, ld113uo) } \ ++ }, \ ++ { \ ++ { XNTRY (fnu, dnu, ld64inu, ld64mnu, ld106nu, ld113nu) }, \ ++ { XNTRY (fdu, ddu, ld64idu, ld64mdu, ld106du, ld113du) }, \ ++ { XNTRY (fzu, dzu, ld64izu, ld64mzu, ld106zu, ld113zu) }, \ ++ { XNTRY (fuu, duu, ld64iuu, ld64muu, ld106uu, ld113uu) } \ + } \ + } + +@@ -181,11 +198,17 @@ struct test_overflow + STRUCT_FOREACH_FLOAT_BOOL + }; + ++struct test_underflow ++ { ++ STRUCT_FOREACH_FLOAT_BOOL ++ }; ++ + struct test { + const CHAR *s; + struct test_exactness exact; + struct test_results r[4]; + struct test_overflow o[4]; ++ struct test_underflow u[4]; + }; + + /* Include the generated test data. */ +@@ -203,10 +226,14 @@ struct test { + # define FE_OVERFLOW 0 + #endif + ++#ifndef FE_UNDERFLOW ++# define FE_UNDERFLOW 0 ++#endif ++ + #define GEN_ONE_TEST(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ + { \ + feclearexcept (FE_ALL_EXCEPT); \ +- errno = 0; \ ++ errno = 12345; \ + FTYPE f = STRTO (FSUF) (s, NULL); \ + int new_errno = errno; \ + if (f != expected->FSUF \ +@@ -265,6 +292,40 @@ struct test { + s, new_errno, ERANGE); \ + result = 1; \ + } \ ++ if (FE_UNDERFLOW != 0) \ ++ { \ ++ bool underflow_raised \ ++ = fetestexcept (FE_UNDERFLOW) != 0; \ ++ if (underflow_raised != underflow->FSUF) \ ++ { \ ++ printf (FNPFXS "to" #FSUF \ ++ " (" STRM ") underflow %d " \ ++ "not %d\n", s, underflow_raised, \ ++ underflow->FSUF); \ ++ if (EXCEPTION_TESTS (FTYPE)) \ ++ result = 1; \ ++ else \ ++ printf ("ignoring this exception error\n"); \ ++ } \ ++ } \ ++ if (underflow->FSUF && new_errno != ERANGE) \ ++ { \ ++ printf (FNPFXS "to" #FSUF \ ++ " (" STRM ") left errno == %d," \ ++ " not %d (ERANGE)\n", \ ++ s, new_errno, ERANGE); \ ++ result = 1; \ ++ } \ ++ if (!overflow->FSUF \ ++ && !underflow->FSUF \ ++ && new_errno != 12345) \ ++ { \ ++ printf (FNPFXS "to" #FSUF \ ++ " (" STRM ") set errno == %d," \ ++ " should be unchanged\n", \ ++ s, new_errno); \ ++ result = 1; \ ++ } \ + } \ + } + +@@ -272,6 +333,7 @@ static int + test_in_one_mode (const CHAR *s, const struct test_results *expected, + const struct test_exactness *exact, + const struct test_overflow *overflow, ++ const struct test_underflow *underflow, + const char *mode_name, int rnd_mode) + { + int result = 0; +@@ -307,6 +369,7 @@ do_test (void) + { + result |= test_in_one_mode (tests[i].s, &tests[i].r[modes[0].rnd_i], + &tests[i].exact, &tests[i].o[modes[0].rnd_i], ++ &tests[i].u[modes[0].rnd_i], + modes[0].mode_name, modes[0].rnd_mode); + for (const struct fetestmodes *m = &modes[1]; m->mode_name != NULL; m++) + { +@@ -314,7 +377,9 @@ do_test (void) + { + result |= test_in_one_mode (tests[i].s, &tests[i].r[m->rnd_i], + &tests[i].exact, +- &tests[i].o[m->rnd_i], m->mode_name, ++ &tests[i].o[m->rnd_i], ++ &tests[i].u[m->rnd_i], ++ m->mode_name, + m->rnd_mode); + fesetround (save_round_mode); + } + +commit d0c1792ad269566f877208ffda91c21dcd1a72e6 +Author: Joseph Myers +Date: Tue Aug 27 12:41:02 2024 +0000 + + Fix strtod subnormal rounding (bug 30220) + + As reported in bug 30220, the implementation of strtod-family + functions has a bug in the following case: the input string would, + with infinite exponent range, take one more bit to represent than is + available in the normal precision of the return type; the value + represented is in the subnormal range; and there are no nonzero bits + in the value, below those that can be represented in subnormal + precision, other than the least significant bit and possibly the + 0.5ulp bit. In this case, round_and_return ends up discarding the + least significant bit. + + Fix by saving that bit to merge into more_bits (it can't be merged in + at the time it's computed, because more_bits mustn't include this bit + in the case of after-rounding tininess detection checking if the + result is still subnormal when rounded to normal precision, so merging + this bit into more_bits needs to take place after that check). + + Tested for x86_64. + + (cherry picked from commit 457622c2fa8f9f7435822d5287a437bc8be8090d) + +diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c +index be515ce659..beb97b3d0c 100644 +--- a/stdlib/strtod_l.c ++++ b/stdlib/strtod_l.c +@@ -222,6 +222,7 @@ round_and_return (mp_limb_t *retval, intmax_t exponent, int negative, + + mp_size_t shift = MIN_EXP - 1 - exponent; + bool is_tiny = true; ++ bool old_half_bit = (round_limb & (((mp_limb_t) 1) << round_bit)) != 0; + + more_bits |= (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0; + if (shift == MANT_DIG) +@@ -292,6 +293,7 @@ round_and_return (mp_limb_t *retval, intmax_t exponent, int negative, + round_bit = shift - 1; + (void) __mpn_rshift (retval, retval, RETURN_LIMB_SIZE, shift); + } ++ more_bits |= old_half_bit; + /* This is a hook for the m68k long double format, where the + exponent bias is the same for normalized and denormalized + numbers. */ +diff --git a/stdlib/tst-strtod-round-data b/stdlib/tst-strtod-round-data +index 84ab705709..9489fbcc9c 100644 +--- a/stdlib/tst-strtod-round-data ++++ b/stdlib/tst-strtod-round-data +@@ -265,3 +265,15 @@ + 1.000000000000000000000000000000000385185988877447170611195588516985463707620329643077639047987759113311767578125 + 1.0000000000000000000000000000000001925929944387235853055977942584927318538101648215388195239938795566558837890625 + 1.00000000000000000000000000000000009629649721936179265279889712924636592690508241076940976199693977832794189453125 ++0x30000002222225p-1077 ++0x0.7fffffffffffeap-1022 ++0x0.7fffffffffffe9p-1022 ++0x0.7ffffd4p-126 ++0x0.7ffffffffffffffd4p-16382 ++0x0.7ffffffffffffffd4p-16383 ++0x0.7ffffffffffffffffffffffffffeap-16382 ++0x0.7000004p-126 ++0x0.70000000000002p-1022 ++0x0.70000000000000004p-16382 ++0x0.70000000000000004p-16383 ++0x0.70000000000000000000000000002p-16382 +diff --git a/stdlib/tst-strtod-round-data.h b/stdlib/tst-strtod-round-data.h +index 13e62dd2b0..ed50eb2537 100644 +--- a/stdlib/tst-strtod-round-data.h ++++ b/stdlib/tst-strtod-round-data.h +@@ -15437,4 +15437,376 @@ static const struct test tests[] = { + 0x1p+0, false, false, + 0x1p+0, false, false, + 0x1.0000000000000000000000000001p+0, false, false), ++ TEST ("0x30000002222225p-1077", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x1.800000111111p-1024, false, true, ++ 0x1.8000001111114p-1024, false, true, ++ 0x1.800000111111p-1024, false, true, ++ 0x1.8000001111114p-1024, false, true, ++ true, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ true, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ false, ++ 0x1.800000111111p-1024, false, true, ++ 0x1.8000001111114p-1024, false, true, ++ 0x1.800000111111p-1024, false, true, ++ 0x1.8000001111114p-1024, false, true, ++ true, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false), ++ TEST ("0x0.7fffffffffffeap-1022", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ true, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ true, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ false, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ true, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false), ++ TEST ("0x0.7fffffffffffe9p-1022", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ true, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ true, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ false, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ true, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false), ++ TEST ("0x0.7ffffd4p-126", ++ false, ++ 0x1.fffffp-128, false, true, ++ 0x1.fffff8p-128, false, true, ++ 0x1.fffffp-128, false, true, ++ 0x1.fffff8p-128, false, true, ++ true, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ true, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ true, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ true, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ true, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false), ++ TEST ("0x0.7ffffffffffffffd4p-16382", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.fffffffffffffffp-16384, false, true, ++ 0x1.fffffffffffffff8p-16384, false, true, ++ 0x1.fffffffffffffffp-16384, false, true, ++ 0x1.fffffffffffffff8p-16384, false, true, ++ false, ++ 0x1.fffffffffffffff4p-16384, false, true, ++ 0x1.fffffffffffffff4p-16384, false, true, ++ 0x1.fffffffffffffff4p-16384, false, true, ++ 0x1.fffffffffffffff8p-16384, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x1.fffffffffffffff5p-16384, false, false, ++ 0x1.fffffffffffffff5p-16384, false, false, ++ 0x1.fffffffffffffff5p-16384, false, false, ++ 0x1.fffffffffffffff5p-16384, false, false), ++ TEST ("0x0.7ffffffffffffffd4p-16383", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0xf.ffffffffffffff8p-16388, false, true, ++ 0xf.ffffffffffffff8p-16388, false, true, ++ 0xf.ffffffffffffff8p-16388, false, true, ++ 0x1p-16384, false, true, ++ false, ++ 0xf.ffffffffffffff8p-16388, false, true, ++ 0xf.ffffffffffffffcp-16388, false, true, ++ 0xf.ffffffffffffff8p-16388, false, true, ++ 0xf.ffffffffffffffcp-16388, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0xf.ffffffffffffffa8p-16388, false, false, ++ 0xf.ffffffffffffffa8p-16388, false, false, ++ 0xf.ffffffffffffffa8p-16388, false, false, ++ 0xf.ffffffffffffffa8p-16388, false, false), ++ TEST ("0x0.7ffffffffffffffffffffffffffeap-16382", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.fffffffffffffff8p-16384, false, true, ++ 0x2p-16384, false, true, ++ 0x1.fffffffffffffff8p-16384, false, true, ++ 0x2p-16384, false, true, ++ false, ++ 0x1.fffffffffffffffcp-16384, false, true, ++ 0x2p-16384, false, true, ++ 0x1.fffffffffffffffcp-16384, false, true, ++ 0x2p-16384, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.fffffffffffffffffffffffffff8p-16384, false, true, ++ 0x1.fffffffffffffffffffffffffffcp-16384, false, true, ++ 0x1.fffffffffffffffffffffffffff8p-16384, false, true, ++ 0x1.fffffffffffffffffffffffffffcp-16384, false, true), ++ TEST ("0x0.7000004p-126", ++ false, ++ 0x1.cp-128, false, true, ++ 0x1.cp-128, false, true, ++ 0x1.cp-128, false, true, ++ 0x1.c00008p-128, false, true, ++ true, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ true, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ true, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ true, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ true, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false), ++ TEST ("0x0.70000000000002p-1022", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x1.cp-1024, false, true, ++ 0x1.cp-1024, false, true, ++ 0x1.cp-1024, false, true, ++ 0x1.c000000000004p-1024, false, true, ++ true, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ true, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ false, ++ 0x1.cp-1024, false, true, ++ 0x1.cp-1024, false, true, ++ 0x1.cp-1024, false, true, ++ 0x1.c000000000004p-1024, false, true, ++ true, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false), ++ TEST ("0x0.70000000000000004p-16382", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.c000000000000008p-16384, false, true, ++ false, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.c000000000000004p-16384, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x1.c000000000000001p-16384, false, false, ++ 0x1.c000000000000001p-16384, false, false, ++ 0x1.c000000000000001p-16384, false, false, ++ 0x1.c000000000000001p-16384, false, false), ++ TEST ("0x0.70000000000000004p-16383", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0xep-16388, false, true, ++ 0xep-16388, false, true, ++ 0xep-16388, false, true, ++ 0xe.000000000000008p-16388, false, true, ++ false, ++ 0xep-16388, false, true, ++ 0xep-16388, false, true, ++ 0xep-16388, false, true, ++ 0xe.000000000000004p-16388, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0xe.0000000000000008p-16388, false, false, ++ 0xe.0000000000000008p-16388, false, false, ++ 0xe.0000000000000008p-16388, false, false, ++ 0xe.0000000000000008p-16388, false, false), ++ TEST ("0x0.70000000000000000000000000002p-16382", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.c000000000000008p-16384, false, true, ++ false, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.c000000000000004p-16384, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.c000000000000000000000000004p-16384, false, true), + }; + +commit cac10d88c684c0171e549d813bfef7a31029f257 +Author: Joseph Myers +Date: Tue Aug 27 20:41:54 2024 +0000 + + Make __strtod_internal tests type-generic + + Some of the strtod tests use type-generic machinery in tst-strtod.h to + test the strto* functions for all floating types, while others only + test double even when the tests are in fact meaningful for all + floating types. + + Convert the tests of the internal __strtod_internal interface to cover + all floating types. I haven't tried to convert them to use newer test + interfaces in other ways, just made the changes necessary to use the + type-generic machinery. As an internal interface, there are no + aliases for different types with the same ABI (however, + __strtold_internal is defined even if long double has the same ABI as + double), so macros used by the type-generic testing code are redefined + as needed to avoid expecting such aliases to be present. + + Tested for x86_64. + + (cherry picked from commit 3fc063dee01da4f80920a14b7db637c8501d6fd4) + +diff --git a/stdlib/tst-strtod1i.c b/stdlib/tst-strtod1i.c +index 9d6bb760fb..44ae0264f4 100644 +--- a/stdlib/tst-strtod1i.c ++++ b/stdlib/tst-strtod1i.c +@@ -25,60 +25,91 @@ + #include + #include + +-/* Perform a few tests in a locale with thousands separators. */ +-static int +-do_test (void) +-{ +- static const struct +- { +- const char *loc; +- const char *str; +- double exp; +- ptrdiff_t nread; +- } tests[] = +- { +- { "de_DE.UTF-8", "1,5", 1.5, 3 }, +- { "de_DE.UTF-8", "1.5", 1.0, 1 }, +- { "de_DE.UTF-8", "1.500", 1500.0, 5 }, +- { "de_DE.UTF-8", "36.893.488.147.419.103.232", 0x1.0p65, 26 } +- }; +-#define ntests (sizeof (tests) / sizeof (tests[0])) +- size_t n; +- int result = 0; +- +- puts ("\nLocale tests"); ++#include "tst-strtod.h" + +- for (n = 0; n < ntests; ++n) +- { +- double d; +- char *endp; ++/* This tests internal interfaces, which are only defined for types ++ with distinct ABIs, so disable testing for types without distinct ++ ABIs. */ ++#undef IF_FLOAT32 ++#define IF_FLOAT32(x) ++#undef IF_FLOAT64 ++#define IF_FLOAT64(x) ++#undef IF_FLOAT32X ++#define IF_FLOAT32X(x) ++#undef IF_FLOAT64X ++#define IF_FLOAT64X(x) ++#if !__HAVE_DISTINCT_FLOAT128 ++# undef IF_FLOAT128 ++# define IF_FLOAT128(x) ++#endif + +- if (setlocale (LC_ALL, tests[n].loc) == NULL) +- { +- printf ("cannot set locale %s\n", tests[n].loc); +- result = 1; +- continue; +- } ++#define ntests (sizeof (tests) / sizeof (tests[0])) + +- d = __strtod_internal (tests[n].str, &endp, 1); +- if (d != tests[n].exp) +- { +- printf ("strtod(\"%s\") returns %g and not %g\n", +- tests[n].str, d, tests[n].exp); +- result = 1; +- } +- else if (endp - tests[n].str != tests[n].nread) +- { +- printf ("strtod(\"%s\") read %td bytes and not %td\n", +- tests[n].str, endp - tests[n].str, tests[n].nread); +- result = 1; +- } +- } ++/* Perform a few tests in a locale with thousands separators. */ ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++static int \ ++test_strto ## FSUF (void) \ ++{ \ ++ static const struct \ ++ { \ ++ const char *loc; \ ++ const char *str; \ ++ FTYPE exp; \ ++ ptrdiff_t nread; \ ++ } tests[] = \ ++ { \ ++ { "de_DE.UTF-8", "1,5", 1.5 ## LSUF, 3 }, \ ++ { "de_DE.UTF-8", "1.5", 1.0 ## LSUF, 1 }, \ ++ { "de_DE.UTF-8", "1.500", 1500.0 ## LSUF, 5 }, \ ++ { "de_DE.UTF-8", "36.893.488.147.419.103.232", 0x1.0p65 ## LSUF, 26 } \ ++ }; \ ++ size_t n; \ ++ int result = 0; \ ++ \ ++ puts ("\nLocale tests"); \ ++ \ ++ for (n = 0; n < ntests; ++n) \ ++ { \ ++ FTYPE d; \ ++ char *endp; \ ++ \ ++ if (setlocale (LC_ALL, tests[n].loc) == NULL) \ ++ { \ ++ printf ("cannot set locale %s\n", tests[n].loc); \ ++ result = 1; \ ++ continue; \ ++ } \ ++ \ ++ d = __strto ## FSUF ## _internal (tests[n].str, &endp, 1); \ ++ if (d != tests[n].exp) \ ++ { \ ++ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ ++ FTOSTR (buf1, sizeof (buf1), "%g", d); \ ++ FTOSTR (buf2, sizeof (buf2), "%g", tests[n].exp); \ ++ printf ("strto" # FSUF "(\"%s\") returns %s and not %s\n", \ ++ tests[n].str, buf1, buf2); \ ++ result = 1; \ ++ } \ ++ else if (endp - tests[n].str != tests[n].nread) \ ++ { \ ++ printf ("strto" # FSUF "(\"%s\") read %td bytes and not %td\n", \ ++ tests[n].str, endp - tests[n].str, tests[n].nread); \ ++ result = 1; \ ++ } \ ++ } \ ++ \ ++ if (result == 0) \ ++ puts ("all OK"); \ ++ \ ++ return result ? EXIT_FAILURE : EXIT_SUCCESS; \ ++} + +- if (result == 0) +- puts ("all OK"); ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) + +- return result ? EXIT_FAILURE : EXIT_SUCCESS; ++static int ++do_test (void) ++{ ++ return STRTOD_TEST_FOREACH (test_strto); + } + + #include +diff --git a/stdlib/tst-strtod3.c b/stdlib/tst-strtod3.c +index 23abec1896..0d662d8be8 100644 +--- a/stdlib/tst-strtod3.c ++++ b/stdlib/tst-strtod3.c +@@ -3,19 +3,73 @@ + #include + #include + +-static const struct +-{ +- const char *in; +- const char *out; +- double expected; +-} tests[] = +- { +- { "000,,,e1", ",,,e1", 0.0 }, +- { "000e1", "", 0.0 }, +- { "000,1e1", ",1e1", 0.0 } +- }; +-#define NTESTS (sizeof (tests) / sizeof (tests[0])) ++#include "tst-strtod.h" ++ ++/* This tests internal interfaces, which are only defined for types ++ with distinct ABIs, so disable testing for types without distinct ++ ABIs. */ ++#undef IF_FLOAT32 ++#define IF_FLOAT32(x) ++#undef IF_FLOAT64 ++#define IF_FLOAT64(x) ++#undef IF_FLOAT32X ++#define IF_FLOAT32X(x) ++#undef IF_FLOAT64X ++#define IF_FLOAT64X(x) ++#if !__HAVE_DISTINCT_FLOAT128 ++# undef IF_FLOAT128 ++# define IF_FLOAT128(x) ++#endif + ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++static const struct \ ++{ \ ++ const char *in; \ ++ const char *out; \ ++ FTYPE expected; \ ++} tests_strto ## FSUF[] = \ ++ { \ ++ { "000,,,e1", ",,,e1", 0.0 ## LSUF }, \ ++ { "000e1", "", 0.0 ## LSUF }, \ ++ { "000,1e1", ",1e1", 0.0 ## LSUF } \ ++ }; \ ++ \ ++static int \ ++test_strto ## FSUF (void) \ ++{ \ ++ int status = 0; \ ++ \ ++ for (int i = 0; \ ++ i < sizeof (tests_strto ## FSUF) / sizeof (tests_strto ## FSUF[0]); \ ++ ++i) \ ++ { \ ++ char *ep; \ ++ FTYPE r = __strto ## FSUF ## _internal (tests_strto ## FSUF[i].in, \ ++ &ep, 1); \ ++ \ ++ if (strcmp (ep, tests_strto ## FSUF[i].out) != 0) \ ++ { \ ++ printf ("%d: got rest string \"%s\", expected \"%s\"\n", \ ++ i, ep, tests_strto ## FSUF[i].out); \ ++ status = 1; \ ++ } \ ++ \ ++ if (r != tests_strto ## FSUF[i].expected) \ ++ { \ ++ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ ++ FTOSTR (buf1, sizeof (buf1), "%g", r); \ ++ FTOSTR (buf2, sizeof (buf2), "%g", \ ++ tests_strto ## FSUF[i].expected); \ ++ printf ("%d: got wrong results %s, expected %s\n", \ ++ i, buf1, buf2); \ ++ status = 1; \ ++ } \ ++ } \ ++ \ ++ return status; \ ++} ++ ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) + + static int + do_test (void) +@@ -26,29 +80,7 @@ do_test (void) + return 1; + } + +- int status = 0; +- +- for (int i = 0; i < NTESTS; ++i) +- { +- char *ep; +- double r = __strtod_internal (tests[i].in, &ep, 1); +- +- if (strcmp (ep, tests[i].out) != 0) +- { +- printf ("%d: got rest string \"%s\", expected \"%s\"\n", +- i, ep, tests[i].out); +- status = 1; +- } +- +- if (r != tests[i].expected) +- { +- printf ("%d: got wrong results %g, expected %g\n", +- i, r, tests[i].expected); +- status = 1; +- } +- } +- +- return status; ++ return STRTOD_TEST_FOREACH (test_strto); + } + + #define TEST_FUNCTION do_test () +diff --git a/stdlib/tst-strtod4.c b/stdlib/tst-strtod4.c +index 6cc4e843c7..dfd3f05027 100644 +--- a/stdlib/tst-strtod4.c ++++ b/stdlib/tst-strtod4.c +@@ -3,22 +3,76 @@ + #include + #include + ++#include "tst-strtod.h" ++ ++/* This tests internal interfaces, which are only defined for types ++ with distinct ABIs, so disable testing for types without distinct ++ ABIs. */ ++#undef IF_FLOAT32 ++#define IF_FLOAT32(x) ++#undef IF_FLOAT64 ++#define IF_FLOAT64(x) ++#undef IF_FLOAT32X ++#define IF_FLOAT32X(x) ++#undef IF_FLOAT64X ++#define IF_FLOAT64X(x) ++#if !__HAVE_DISTINCT_FLOAT128 ++# undef IF_FLOAT128 ++# define IF_FLOAT128(x) ++#endif ++ + #define NNBSP "\xe2\x80\xaf" + +-static const struct +-{ +- const char *in; +- const char *out; +- double expected; +-} tests[] = +- { +- { "000"NNBSP"000"NNBSP"000", "", 0.0 }, +- { "1"NNBSP"000"NNBSP"000,5x", "x", 1000000.5 }, +- /* Bug 30964 */ +- { "10"NNBSP NNBSP"200", NNBSP NNBSP"200", 10.0 } +- }; +-#define NTESTS (sizeof (tests) / sizeof (tests[0])) ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++static const struct \ ++{ \ ++ const char *in; \ ++ const char *out; \ ++ FTYPE expected; \ ++} tests_strto ## FSUF[] = \ ++ { \ ++ { "000"NNBSP"000"NNBSP"000", "", 0.0 ## LSUF }, \ ++ { "1"NNBSP"000"NNBSP"000,5x", "x", 1000000.5 ## LSUF }, \ ++ /* Bug 30964 */ \ ++ { "10"NNBSP NNBSP"200", NNBSP NNBSP"200", 10.0 ## LSUF } \ ++ }; \ ++ \ ++static int \ ++test_strto ## FSUF (void) \ ++{ \ ++ int status = 0; \ ++ \ ++ for (int i = 0; \ ++ i < sizeof (tests_strto ## FSUF) / sizeof (tests_strto ## FSUF[0]); \ ++ ++i) \ ++ { \ ++ char *ep; \ ++ FTYPE r = __strto ## FSUF ## _internal (tests_strto ## FSUF[i].in, \ ++ &ep, 1); \ ++ \ ++ if (strcmp (ep, tests_strto ## FSUF[i].out) != 0) \ ++ { \ ++ printf ("%d: got rest string \"%s\", expected \"%s\"\n", \ ++ i, ep, tests_strto ## FSUF[i].out); \ ++ status = 1; \ ++ } \ ++ \ ++ if (r != tests_strto ## FSUF[i].expected) \ ++ { \ ++ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ ++ FTOSTR (buf1, sizeof (buf1), "%g", r); \ ++ FTOSTR (buf2, sizeof (buf2), "%g", \ ++ tests_strto ## FSUF[i].expected); \ ++ printf ("%d: got wrong results %s, expected %s\n", \ ++ i, buf1, buf2); \ ++ status = 1; \ ++ } \ ++ } \ ++ \ ++ return status; \ ++} + ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) + + static int + do_test (void) +@@ -29,29 +83,7 @@ do_test (void) + return 1; + } + +- int status = 0; +- +- for (int i = 0; i < NTESTS; ++i) +- { +- char *ep; +- double r = __strtod_internal (tests[i].in, &ep, 1); +- +- if (strcmp (ep, tests[i].out) != 0) +- { +- printf ("%d: got rest string \"%s\", expected \"%s\"\n", +- i, ep, tests[i].out); +- status = 1; +- } +- +- if (r != tests[i].expected) +- { +- printf ("%d: got wrong results %g, expected %g\n", +- i, r, tests[i].expected); +- status = 1; +- } +- } +- +- return status; ++ return STRTOD_TEST_FOREACH (test_strto); + } + + #define TEST_FUNCTION do_test () +diff --git a/stdlib/tst-strtod5i.c b/stdlib/tst-strtod5i.c +index ee54e3404c..136aedea68 100644 +--- a/stdlib/tst-strtod5i.c ++++ b/stdlib/tst-strtod5i.c +@@ -16,52 +16,112 @@ + License along with the GNU C Library; if not, see + . */ + ++/* Defining _LIBC_TEST ensures long double math functions are ++ declared in the headers. */ ++#define _LIBC_TEST 1 + #include + #include + #include + #include + #include + ++#include "tst-strtod.h" ++ ++/* This tests internal interfaces, which are only defined for types ++ with distinct ABIs, so disable testing for types without distinct ++ ABIs. */ ++#undef IF_FLOAT32 ++#define IF_FLOAT32(x) ++#undef IF_FLOAT64 ++#define IF_FLOAT64(x) ++#undef IF_FLOAT32X ++#define IF_FLOAT32X(x) ++#undef IF_FLOAT64X ++#define IF_FLOAT64X(x) ++#if !__HAVE_DISTINCT_FLOAT128 ++# undef IF_FLOAT128 ++# define IF_FLOAT128(x) ++#endif ++ + #define NNBSP "\xe2\x80\xaf" + +-static const struct +-{ +- const char *in; +- int group; +- double expected; +-} tests[] = +- { +- { "0", 0, 0.0 }, +- { "000", 0, 0.0 }, +- { "-0", 0, -0.0 }, +- { "-000", 0, -0.0 }, +- { "0,", 0, 0.0 }, +- { "-0,", 0, -0.0 }, +- { "0,0", 0, 0.0 }, +- { "-0,0", 0, -0.0 }, +- { "0e-10", 0, 0.0 }, +- { "-0e-10", 0, -0.0 }, +- { "0,e-10", 0, 0.0 }, +- { "-0,e-10", 0, -0.0 }, +- { "0,0e-10", 0, 0.0 }, +- { "-0,0e-10", 0, -0.0 }, +- { "0e-1000000", 0, 0.0 }, +- { "-0e-1000000", 0, -0.0 }, +- { "0,0e-1000000", 0, 0.0 }, +- { "-0,0e-1000000", 0, -0.0 }, +- { "0", 1, 0.0 }, +- { "000", 1, 0.0 }, +- { "-0", 1, -0.0 }, +- { "-000", 1, -0.0 }, +- { "0e-10", 1, 0.0 }, +- { "-0e-10", 1, -0.0 }, +- { "0e-1000000", 1, 0.0 }, +- { "-0e-1000000", 1, -0.0 }, +- { "000"NNBSP"000"NNBSP"000", 1, 0.0 }, +- { "-000"NNBSP"000"NNBSP"000", 1, -0.0 } +- }; +-#define NTESTS (sizeof (tests) / sizeof (tests[0])) ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++static const struct \ ++{ \ ++ const char *in; \ ++ int group; \ ++ FTYPE expected; \ ++} tests_strto ## FSUF[] = \ ++ { \ ++ { "0", 0, 0.0 ## LSUF }, \ ++ { "000", 0, 0.0 ## LSUF }, \ ++ { "-0", 0, -0.0 ## LSUF }, \ ++ { "-000", 0, -0.0 ## LSUF }, \ ++ { "0,", 0, 0.0 ## LSUF }, \ ++ { "-0,", 0, -0.0 ## LSUF }, \ ++ { "0,0", 0, 0.0 ## LSUF }, \ ++ { "-0,0", 0, -0.0 ## LSUF }, \ ++ { "0e-10", 0, 0.0 ## LSUF }, \ ++ { "-0e-10", 0, -0.0 ## LSUF }, \ ++ { "0,e-10", 0, 0.0 ## LSUF }, \ ++ { "-0,e-10", 0, -0.0 ## LSUF }, \ ++ { "0,0e-10", 0, 0.0 ## LSUF }, \ ++ { "-0,0e-10", 0, -0.0 ## LSUF }, \ ++ { "0e-1000000", 0, 0.0 ## LSUF }, \ ++ { "-0e-1000000", 0, -0.0 ## LSUF }, \ ++ { "0,0e-1000000", 0, 0.0 ## LSUF }, \ ++ { "-0,0e-1000000", 0, -0.0 ## LSUF }, \ ++ { "0", 1, 0.0 ## LSUF }, \ ++ { "000", 1, 0.0 ## LSUF }, \ ++ { "-0", 1, -0.0 ## LSUF }, \ ++ { "-000", 1, -0.0 ## LSUF }, \ ++ { "0e-10", 1, 0.0 ## LSUF }, \ ++ { "-0e-10", 1, -0.0 ## LSUF }, \ ++ { "0e-1000000", 1, 0.0 ## LSUF }, \ ++ { "-0e-1000000", 1, -0.0 ## LSUF }, \ ++ { "000"NNBSP"000"NNBSP"000", 1, 0.0 ## LSUF }, \ ++ { "-000"NNBSP"000"NNBSP"000", 1, -0.0 ## LSUF } \ ++ }; \ ++ \ ++static int \ ++test_strto ## FSUF (void) \ ++{ \ ++ int status = 0; \ ++ \ ++ for (int i = 0; \ ++ i < sizeof (tests_strto ## FSUF) / sizeof (tests_strto ## FSUF[0]); \ ++ ++i) \ ++ { \ ++ char *ep; \ ++ FTYPE r = __strto ## FSUF ## _internal (tests_strto ## FSUF[i].in, \ ++ &ep, \ ++ tests_strto ## FSUF[i].group); \ ++ \ ++ if (*ep != '\0') \ ++ { \ ++ printf ("%d: got rest string \"%s\", expected \"\"\n", i, ep); \ ++ status = 1; \ ++ } \ ++ \ ++ if (r != tests_strto ## FSUF[i].expected \ ++ || (copysign ## CSUF (10.0 ## LSUF, r) \ ++ != copysign ## CSUF (10.0 ## LSUF, \ ++ tests_strto ## FSUF[i].expected))) \ ++ { \ ++ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ ++ FTOSTR (buf1, sizeof (buf1), "%g", r); \ ++ FTOSTR (buf2, sizeof (buf2), "%g", \ ++ tests_strto ## FSUF[i].expected); \ ++ printf ("%d: got wrong results %s, expected %s\n", \ ++ i, buf1, buf2); \ ++ status = 1; \ ++ } \ ++ } \ ++ \ ++ return status; \ ++} + ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) + + static int + do_test (void) +@@ -72,29 +132,7 @@ do_test (void) + return 1; + } + +- int status = 0; +- +- for (int i = 0; i < NTESTS; ++i) +- { +- char *ep; +- double r = __strtod_internal (tests[i].in, &ep, tests[i].group); +- +- if (*ep != '\0') +- { +- printf ("%d: got rest string \"%s\", expected \"\"\n", i, ep); +- status = 1; +- } +- +- if (r != tests[i].expected +- || copysign (10.0, r) != copysign (10.0, tests[i].expected)) +- { +- printf ("%d: got wrong results %g, expected %g\n", +- i, r, tests[i].expected); +- status = 1; +- } +- } +- +- return status; ++ return STRTOD_TEST_FOREACH (test_strto); + } + + #include + +commit ad93c2047d791044d45e8f65070d821b0b918993 +Author: Joseph Myers +Date: Wed Sep 4 13:20:18 2024 +0000 + + Improve NaN payload testing + + There are two separate sets of tests of NaN payloads in glibc: + + * libm-test-{get,set}payload* verify that getpayload, setpayload, + setpayloadsig and __builtin_nan functions are consistent in their + payload handling. + + * test-nan-payload verifies that strtod-family functions and the + not-built-in nan functions are consistent in their payload handling. + + Nothing, however, connects the two sets of functions (i.e., verifies + that strtod / nan are consistent with getpayload / setpayload / + __builtin_nan). + + Improve test-nan-payload to check actual payload value with getpayload + rather than just verifying that the strtod and nan functions produce + the same NaN. Also check that the NaNs produced aren't signaling and + extend the tests to cover _FloatN / _FloatNx. + + Tested for x86_64. + + (cherry picked from commit be77d5ae417236883c02d3d67c0716e3f669fa41) + +diff --git a/math/test-nan-payload.c b/math/test-nan-payload.c +index 4a81dc348b..55c13de14e 100644 +--- a/math/test-nan-payload.c ++++ b/math/test-nan-payload.c +@@ -16,6 +16,8 @@ + License along with the GNU C Library; if not, see + . */ + ++#define _LIBC_TEST 1 ++#define __STDC_WANT_IEC_60559_TYPES_EXT__ + #include + #include + #include +@@ -31,7 +33,7 @@ + #define CHECK_IS_NAN(TYPE, A) \ + do \ + { \ +- if (isnan (A)) \ ++ if (isnan (A) && !issignaling (A)) \ + puts ("PASS: " #TYPE " " #A); \ + else \ + { \ +@@ -41,6 +43,19 @@ + } \ + while (0) + ++#define CHECK_PAYLOAD(TYPE, FUNC, A, P) \ ++ do \ ++ { \ ++ if (FUNC (&(A)) == (P)) \ ++ puts ("PASS: " #TYPE " payload " #A); \ ++ else \ ++ { \ ++ puts ("FAIL: " #TYPE " payload " #A); \ ++ result = 1; \ ++ } \ ++ } \ ++ while (0) ++ + #define CHECK_SAME_NAN(TYPE, A, B) \ + do \ + { \ +@@ -71,7 +86,7 @@ + bits. */ + #define CAN_TEST_EQ(MANT_DIG) ((MANT_DIG) != 64 && (MANT_DIG) != 106) + +-#define RUN_TESTS(TYPE, SFUNC, FUNC, MANT_DIG) \ ++#define RUN_TESTS(TYPE, SFUNC, FUNC, PLFUNC, MANT_DIG) \ + do \ + { \ + TYPE n123 = WRAP_NAN (FUNC, "123"); \ +@@ -82,6 +97,10 @@ + CHECK_IS_NAN (TYPE, n456); \ + TYPE s456 = WRAP_STRTO (SFUNC, "NAN(456)"); \ + CHECK_IS_NAN (TYPE, s456); \ ++ TYPE nh123 = WRAP_NAN (FUNC, "0x123"); \ ++ CHECK_IS_NAN (TYPE, nh123); \ ++ TYPE sh123 = WRAP_STRTO (SFUNC, "NAN(0x123)"); \ ++ CHECK_IS_NAN (TYPE, sh123); \ + TYPE n123x = WRAP_NAN (FUNC, "123)"); \ + CHECK_IS_NAN (TYPE, n123x); \ + TYPE nemp = WRAP_NAN (FUNC, ""); \ +@@ -92,8 +111,16 @@ + CHECK_IS_NAN (TYPE, sx); \ + if (CAN_TEST_EQ (MANT_DIG)) \ + CHECK_SAME_NAN (TYPE, n123, s123); \ ++ CHECK_PAYLOAD (TYPE, PLFUNC, n123, 123); \ ++ CHECK_PAYLOAD (TYPE, PLFUNC, s123, 123); \ + if (CAN_TEST_EQ (MANT_DIG)) \ + CHECK_SAME_NAN (TYPE, n456, s456); \ ++ CHECK_PAYLOAD (TYPE, PLFUNC, n456, 456); \ ++ CHECK_PAYLOAD (TYPE, PLFUNC, s456, 456); \ ++ if (CAN_TEST_EQ (MANT_DIG)) \ ++ CHECK_SAME_NAN (TYPE, nh123, sh123); \ ++ CHECK_PAYLOAD (TYPE, PLFUNC, nh123, 0x123); \ ++ CHECK_PAYLOAD (TYPE, PLFUNC, sh123, 0x123); \ + if (CAN_TEST_EQ (MANT_DIG)) \ + CHECK_SAME_NAN (TYPE, nemp, semp); \ + if (CAN_TEST_EQ (MANT_DIG)) \ +@@ -110,9 +137,31 @@ static int + do_test (void) + { + int result = 0; +- RUN_TESTS (float, strtof, nanf, FLT_MANT_DIG); +- RUN_TESTS (double, strtod, nan, DBL_MANT_DIG); +- RUN_TESTS (long double, strtold, nanl, LDBL_MANT_DIG); ++ RUN_TESTS (float, strtof, nanf, getpayloadf, FLT_MANT_DIG); ++ RUN_TESTS (double, strtod, nan, getpayload, DBL_MANT_DIG); ++ RUN_TESTS (long double, strtold, nanl, getpayloadl, LDBL_MANT_DIG); ++#if __HAVE_FLOAT16 ++ RUN_TESTS (_Float16, strtof16, nanf16, getpayloadf16, FLT16_MANT_DIG); ++#endif ++#if __HAVE_FLOAT32 ++ RUN_TESTS (_Float32, strtof32, nanf32, getpayloadf32, FLT32_MANT_DIG); ++#endif ++#if __HAVE_FLOAT64 ++ RUN_TESTS (_Float64, strtof64, nanf64, getpayloadf64, FLT64_MANT_DIG); ++#endif ++#if __HAVE_FLOAT128 ++ RUN_TESTS (_Float128, strtof128, nanf128, getpayloadf128, FLT128_MANT_DIG); ++#endif ++#if __HAVE_FLOAT32X ++ RUN_TESTS (_Float32x, strtof32x, nanf32x, getpayloadf32x, FLT32X_MANT_DIG); ++#endif ++#if __HAVE_FLOAT64X ++ RUN_TESTS (_Float64x, strtof64x, nanf64x, getpayloadf64x, FLT64X_MANT_DIG); ++#endif ++#if __HAVE_FLOAT128X ++ RUN_TESTS (_Float128x, strtof128x, nanf128x, getpayloadf128x, ++ FLT128X_MANT_DIG); ++#endif + return result; + } + + +commit c4cc72d2efc741872d65ae1fd77572e47042d179 +Author: Joseph Myers +Date: Wed Sep 4 13:21:23 2024 +0000 + + Do not set errno for overflowing NaN payload in strtod/nan (bug 32045) + + As reported in bug 32045, it's incorrect for strtod/nan functions to + set errno based on overflowing payload (strtod should only set errno + for overflow / underflow of its actual result, and potentially if + nothing in the string can be parsed as a number at all; nan should be + a pure function that never sets it). Save and restore errno around + the internal strtoull call and add associated test coverage. + + Tested for x86_64. + + (cherry picked from commit 64f62c47e9c350f353336f2df6714e1d48ec50d8) + +diff --git a/math/Makefile b/math/Makefile +index f06d370383..b64c3eedd5 100644 +--- a/math/Makefile ++++ b/math/Makefile +@@ -1077,6 +1077,7 @@ CFLAGS-test-flt-eval-method.c += -fexcess-precision=standard + CFLAGS-test-fe-snans-always-signal.c += $(config-cflags-signaling-nans) + + CFLAGS-test-nan-const.c += -fno-builtin ++CFLAGS-test-nan-payload.c += -fno-builtin + + CFLAGS-test-ceil-except-2.c += -fno-builtin + CFLAGS-test-floor-except-2.c += -fno-builtin +diff --git a/math/test-nan-payload.c b/math/test-nan-payload.c +index 55c13de14e..413791e09f 100644 +--- a/math/test-nan-payload.c ++++ b/math/test-nan-payload.c +@@ -18,6 +18,7 @@ + + #define _LIBC_TEST 1 + #define __STDC_WANT_IEC_60559_TYPES_EXT__ ++#include + #include + #include + #include +@@ -82,6 +83,26 @@ + } \ + while (0) + ++#define CLEAR_ERRNO \ ++ do \ ++ { \ ++ errno = 12345; \ ++ } \ ++ while (0) ++ ++#define CHECK_ERRNO(TYPE, A) \ ++ do \ ++ { \ ++ if (errno == 12345) \ ++ puts ("PASS: " #TYPE " " #A " errno"); \ ++ else \ ++ { \ ++ puts ("FAIL: " #TYPE " " #A " errno"); \ ++ result = 1; \ ++ } \ ++ } \ ++ while (0) ++ + /* Cannot test payloads by memcmp for formats where NaNs have padding + bits. */ + #define CAN_TEST_EQ(MANT_DIG) ((MANT_DIG) != 64 && (MANT_DIG) != 106) +@@ -89,26 +110,58 @@ + #define RUN_TESTS(TYPE, SFUNC, FUNC, PLFUNC, MANT_DIG) \ + do \ + { \ ++ CLEAR_ERRNO; \ + TYPE n123 = WRAP_NAN (FUNC, "123"); \ ++ CHECK_ERRNO (TYPE, n123); \ + CHECK_IS_NAN (TYPE, n123); \ ++ CLEAR_ERRNO; \ + TYPE s123 = WRAP_STRTO (SFUNC, "NAN(123)"); \ ++ CHECK_ERRNO (TYPE, s123); \ + CHECK_IS_NAN (TYPE, s123); \ ++ CLEAR_ERRNO; \ + TYPE n456 = WRAP_NAN (FUNC, "456"); \ ++ CHECK_ERRNO (TYPE, n456); \ + CHECK_IS_NAN (TYPE, n456); \ ++ CLEAR_ERRNO; \ + TYPE s456 = WRAP_STRTO (SFUNC, "NAN(456)"); \ ++ CHECK_ERRNO (TYPE, s456); \ + CHECK_IS_NAN (TYPE, s456); \ ++ CLEAR_ERRNO; \ + TYPE nh123 = WRAP_NAN (FUNC, "0x123"); \ ++ CHECK_ERRNO (TYPE, nh123); \ + CHECK_IS_NAN (TYPE, nh123); \ ++ CLEAR_ERRNO; \ + TYPE sh123 = WRAP_STRTO (SFUNC, "NAN(0x123)"); \ ++ CHECK_ERRNO (TYPE, sh123); \ + CHECK_IS_NAN (TYPE, sh123); \ ++ CLEAR_ERRNO; \ + TYPE n123x = WRAP_NAN (FUNC, "123)"); \ ++ CHECK_ERRNO (TYPE, n123x); \ + CHECK_IS_NAN (TYPE, n123x); \ ++ CLEAR_ERRNO; \ + TYPE nemp = WRAP_NAN (FUNC, ""); \ ++ CHECK_ERRNO (TYPE, nemp); \ + CHECK_IS_NAN (TYPE, nemp); \ ++ CLEAR_ERRNO; \ + TYPE semp = WRAP_STRTO (SFUNC, "NAN()"); \ ++ CHECK_ERRNO (TYPE, semp); \ + CHECK_IS_NAN (TYPE, semp); \ ++ CLEAR_ERRNO; \ + TYPE sx = WRAP_STRTO (SFUNC, "NAN"); \ ++ CHECK_ERRNO (TYPE, sx); \ + CHECK_IS_NAN (TYPE, sx); \ ++ CLEAR_ERRNO; \ ++ TYPE novf = WRAP_NAN (FUNC, "9999999999" \ ++ "99999999999999999999" \ ++ "9999999999"); \ ++ CHECK_ERRNO (TYPE, novf); \ ++ CHECK_IS_NAN (TYPE, novf); \ ++ CLEAR_ERRNO; \ ++ TYPE sovf = WRAP_STRTO (SFUNC, "NAN(9999999999" \ ++ "99999999999999999999" \ ++ "9999999999)"); \ ++ CHECK_ERRNO (TYPE, sovf); \ ++ CHECK_IS_NAN (TYPE, sovf); \ + if (CAN_TEST_EQ (MANT_DIG)) \ + CHECK_SAME_NAN (TYPE, n123, s123); \ + CHECK_PAYLOAD (TYPE, PLFUNC, n123, 123); \ +diff --git a/stdlib/strtod_nan_main.c b/stdlib/strtod_nan_main.c +index 4cb286d2b3..39fb7e9f75 100644 +--- a/stdlib/strtod_nan_main.c ++++ b/stdlib/strtod_nan_main.c +@@ -16,6 +16,7 @@ + License along with the GNU C Library; if not, see + . */ + ++#include + #include + #include + #include +@@ -50,7 +51,9 @@ STRTOD_NAN (const STRING_TYPE *str, STRING_TYPE **endptr, STRING_TYPE endc) + STRING_TYPE *endp; + unsigned long long int mant; + ++ int save_errno = errno; + mant = STRTOULL (str, &endp, 0); ++ __set_errno (save_errno); + if (endp == cp) + SET_NAN_PAYLOAD (retval, mant); + + +commit 5a10d05c39689dcf7ee694ec94cd2fd069c747ee +Author: Florian Weimer +Date: Thu Sep 5 21:18:23 2024 +0200 + + powerpc64le: Build new strtod tests with long double ABI flags (bug 32145) + + This fixes several test failures: + + =====FAIL: stdlib/tst-strtod1i.out===== + Locale tests + all OK + Locale tests + all OK + Locale tests + strtold("1,5") returns -6,38643e+367 and not 1,5 + strtold("1.5") returns 1,5 and not 1 + strtold("1.500") returns 1 and not 1500 + strtold("36.893.488.147.419.103.232") returns 1500 and not 3,68935e+19 + Locale tests + all OK + + =====FAIL: stdlib/tst-strtod3.out===== + 0: got wrong results -2.5937e+4826, expected 0 + + =====FAIL: stdlib/tst-strtod4.out===== + 0: got wrong results -6,38643e+367, expected 0 + 1: got wrong results 0, expected 1e+06 + 2: got wrong results 1e+06, expected 10 + + =====FAIL: stdlib/tst-strtod5i.out===== + 0: got wrong results -6,38643e+367, expected 0 + 2: got wrong results 0, expected -0 + 4: got wrong results -0, expected 0 + 5: got wrong results 0, expected -0 + 6: got wrong results -0, expected 0 + 7: got wrong results 0, expected -0 + 8: got wrong results -0, expected 0 + 9: got wrong results 0, expected -0 + 10: got wrong results -0, expected 0 + 11: got wrong results 0, expected -0 + 12: got wrong results -0, expected 0 + 13: got wrong results 0, expected -0 + 14: got wrong results -0, expected 0 + 15: got wrong results 0, expected -0 + 16: got wrong results -0, expected 0 + 17: got wrong results 0, expected -0 + 18: got wrong results -0, expected 0 + 20: got wrong results 0, expected -0 + 22: got wrong results -0, expected 0 + 23: got wrong results 0, expected -0 + 24: got wrong results -0, expected 0 + 25: got wrong results 0, expected -0 + 26: got wrong results -0, expected 0 + 27: got wrong results 0, expected -0 + + Fixes commit 3fc063dee01da4f80920a14b7db637c8501d6fd4 + ("Make __strtod_internal tests type-generic"). + + Suggested-by: Joseph Myers + Reviewed-by: Carlos O'Donell + (cherry picked from commit cc3e743fc09ee6fca45767629df9cbcbe1feba82) + +diff --git a/sysdeps/powerpc/powerpc64/le/Makefile b/sysdeps/powerpc/powerpc64/le/Makefile +index 9d568d4f44..b77775cf95 100644 +--- a/sysdeps/powerpc/powerpc64/le/Makefile ++++ b/sysdeps/powerpc/powerpc64/le/Makefile +@@ -129,6 +129,10 @@ CFLAGS-tst-strtod-round.c += $(type-float128-CFLAGS) + CFLAGS-tst-wcstod-round.c += $(type-float128-CFLAGS) + CFLAGS-tst-strtod-nan-locale.c += $(type-float128-CFLAGS) + CFLAGS-tst-wcstod-nan-locale.c += $(type-float128-CFLAGS) ++CFLAGS-tst-strtod1i.c += $(type-float128-CFLAGS) ++CFLAGS-tst-strtod3.c += $(type-float128-CFLAGS) ++CFLAGS-tst-strtod4.c += $(type-float128-CFLAGS) ++CFLAGS-tst-strtod5i.c += $(type-float128-CFLAGS) + CFLAGS-tst-strtod6.c += $(type-float128-CFLAGS) + CFLAGS-tst-strfrom.c += $(type-float128-CFLAGS) + CFLAGS-tst-strfrom-locale.c += $(type-float128-CFLAGS) + +commit 4a9b6cdc88335e2a7291418563073a58fe97346e +Author: Joseph Myers +Date: Fri Sep 20 23:23:13 2024 +0000 + + Make tst-strtod2 and tst-strtod5 type-generic + + Some of the strtod tests use type-generic machinery in tst-strtod.h to + test the strto* functions for all floating types, while others only + test double even when the tests are in fact meaningful for all + floating types. + + Convert tst-strtod2 and tst-strtod5 to use the type-generic machinery + so they test all floating types. I haven't tried to convert them to + use newer test interfaces in other ways, just made the changes + necessary to use the type-generic machinery. + + Tested for x86_64. + + (cherry picked from commit 8de031bcb9adfa736c0caed2c79d10947b8d8f48) + +diff --git a/stdlib/tst-strtod2.c b/stdlib/tst-strtod2.c +index a7df82ebbd..2cb0953fa9 100644 +--- a/stdlib/tst-strtod2.c ++++ b/stdlib/tst-strtod2.c +@@ -1,43 +1,61 @@ + #include + #include + +-struct test +-{ +- const char *str; +- double result; +- size_t offset; +-} tests[] = +-{ +- { "0xy", 0.0, 1 }, +- { "0x.y", 0.0, 1 }, +- { "0x0.y", 0.0, 4 }, +- { "0x.0y", 0.0, 4 }, +- { ".y", 0.0, 0 }, +- { "0.y", 0.0, 2 }, +- { ".0y", 0.0, 2 } +-}; ++#include "tst-strtod.h" ++ ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++struct test_strto ## FSUF \ ++{ \ ++ const char *str; \ ++ FTYPE result; \ ++ size_t offset; \ ++} tests_strto ## FSUF[] = \ ++{ \ ++ { "0xy", 0.0 ## LSUF, 1 }, \ ++ { "0x.y", 0.0 ## LSUF, 1 }, \ ++ { "0x0.y", 0.0 ## LSUF, 4 }, \ ++ { "0x.0y", 0.0 ## LSUF, 4 }, \ ++ { ".y", 0.0 ## LSUF, 0 }, \ ++ { "0.y", 0.0 ## LSUF, 2 }, \ ++ { ".0y", 0.0 ## LSUF, 2 } \ ++}; \ ++ \ ++static int \ ++test_strto ## FSUF (void) \ ++{ \ ++ int status = 0; \ ++ for (size_t i = 0; \ ++ i < sizeof (tests_strto ## FSUF) / sizeof (tests_strto ## FSUF[0]); \ ++ ++i) \ ++ { \ ++ char *ep; \ ++ FTYPE r = strto ## FSUF (tests_strto ## FSUF[i].str, &ep); \ ++ if (r != tests_strto ## FSUF[i].result) \ ++ { \ ++ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ ++ FTOSTR (buf1, sizeof (buf1), "%g", r); \ ++ FTOSTR (buf2, sizeof (buf2), "%g", tests_strto ## FSUF[i].result); \ ++ printf ("test %zu r = %s, expect %s\n", i, buf1, buf2); \ ++ status = 1; \ ++ } \ ++ if (ep != tests_strto ## FSUF[i].str + tests_strto ## FSUF[i].offset) \ ++ { \ ++ printf ("test %zu strto" #FSUF \ ++ " parsed %tu characters, expected %zu\n", \ ++ i, ep - tests_strto ## FSUF[i].str, \ ++ tests_strto ## FSUF[i].offset); \ ++ status = 1; \ ++ } \ ++ } \ ++ return status; \ ++} ++ ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) + + static int + do_test (void) + { +- int status = 0; +- for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i) +- { +- char *ep; +- double r = strtod (tests[i].str, &ep); +- if (r != tests[i].result) +- { +- printf ("test %zu r = %g, expect %g\n", i, r, tests[i].result); +- status = 1; +- } +- if (ep != tests[i].str + tests[i].offset) +- { +- printf ("test %zu strtod parsed %tu characters, expected %zu\n", +- i, ep - tests[i].str, tests[i].offset); +- status = 1; +- } +- } +- return status; ++ return STRTOD_TEST_FOREACH (test_strto); + } + + #define TEST_FUNCTION do_test () +diff --git a/stdlib/tst-strtod5.c b/stdlib/tst-strtod5.c +index 29153ec005..7eb9b3a2d7 100644 +--- a/stdlib/tst-strtod5.c ++++ b/stdlib/tst-strtod5.c +@@ -22,35 +22,75 @@ + #include + #include + ++#include "tst-strtod.h" ++ + #define NBSP "\xc2\xa0" + +-static const struct +-{ +- const char *in; +- double expected; +-} tests[] = +- { +- { "0", 0.0 }, +- { "000", 0.0 }, +- { "-0", -0.0 }, +- { "-000", -0.0 }, +- { "0,", 0.0 }, +- { "-0,", -0.0 }, +- { "0,0", 0.0 }, +- { "-0,0", -0.0 }, +- { "0e-10", 0.0 }, +- { "-0e-10", -0.0 }, +- { "0,e-10", 0.0 }, +- { "-0,e-10", -0.0 }, +- { "0,0e-10", 0.0 }, +- { "-0,0e-10", -0.0 }, +- { "0e-1000000", 0.0 }, +- { "-0e-1000000", -0.0 }, +- { "0,0e-1000000", 0.0 }, +- { "-0,0e-1000000", -0.0 }, +- }; +-#define NTESTS (sizeof (tests) / sizeof (tests[0])) ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++static const struct \ ++{ \ ++ const char *in; \ ++ FTYPE expected; \ ++} tests_strto ## FSUF[] = \ ++ { \ ++ { "0", 0.0 ## LSUF }, \ ++ { "000", 0.0 ## LSUF }, \ ++ { "-0", -0.0 ## LSUF }, \ ++ { "-000", -0.0 ## LSUF }, \ ++ { "0,", 0.0 ## LSUF }, \ ++ { "-0,", -0.0 ## LSUF }, \ ++ { "0,0", 0.0 ## LSUF }, \ ++ { "-0,0", -0.0 ## LSUF }, \ ++ { "0e-10", 0.0 ## LSUF }, \ ++ { "-0e-10", -0.0 ## LSUF }, \ ++ { "0,e-10", 0.0 ## LSUF }, \ ++ { "-0,e-10", -0.0 ## LSUF }, \ ++ { "0,0e-10", 0.0 ## LSUF }, \ ++ { "-0,0e-10", -0.0 ## LSUF }, \ ++ { "0e-1000000", 0.0 ## LSUF }, \ ++ { "-0e-1000000", -0.0 ## LSUF }, \ ++ { "0,0e-1000000", 0.0 ## LSUF }, \ ++ { "-0,0e-1000000", -0.0 ## LSUF }, \ ++ }; \ ++ \ ++ \ ++static int \ ++test_strto ## FSUF (void) \ ++{ \ ++ int status = 0; \ ++ \ ++ for (int i = 0; \ ++ i < sizeof (tests_strto ## FSUF) / sizeof (tests_strto ## FSUF[0]); \ ++ ++i) \ ++ { \ ++ char *ep; \ ++ FTYPE r = strto ## FSUF (tests_strto ## FSUF[i].in, &ep); \ ++ \ ++ if (*ep != '\0') \ ++ { \ ++ printf ("%d: got rest string \"%s\", expected \"\"\n", i, ep); \ ++ status = 1; \ ++ } \ ++ \ ++ if (r != tests_strto ## FSUF[i].expected \ ++ || (copysign ## CSUF (10.0 ## LSUF, r) \ ++ != copysign ## CSUF (10.0 ## LSUF, \ ++ tests_strto ## FSUF[i].expected))) \ ++ { \ ++ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ ++ FTOSTR (buf1, sizeof (buf1), "%g", r); \ ++ FTOSTR (buf2, sizeof (buf2), "%g", \ ++ tests_strto ## FSUF[i].expected); \ ++ printf ("%d: got wrong results %s, expected %s\n", \ ++ i, buf1, buf2); \ ++ status = 1; \ ++ } \ ++ } \ ++ \ ++ return status; \ ++} + ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) + + static int + do_test (void) +@@ -61,29 +101,7 @@ do_test (void) + return 1; + } + +- int status = 0; +- +- for (int i = 0; i < NTESTS; ++i) +- { +- char *ep; +- double r = strtod (tests[i].in, &ep); +- +- if (*ep != '\0') +- { +- printf ("%d: got rest string \"%s\", expected \"\"\n", i, ep); +- status = 1; +- } +- +- if (r != tests[i].expected +- || copysign (10.0, r) != copysign (10.0, tests[i].expected)) +- { +- printf ("%d: got wrong results %g, expected %g\n", +- i, r, tests[i].expected); +- status = 1; +- } +- } +- +- return status; ++ return STRTOD_TEST_FOREACH (test_strto); + } + + #include + +commit 8f40dfbe2ad8a4a2d2fc3bbe01d289037d113ced +Author: Joseph Myers +Date: Fri Sep 20 23:24:02 2024 +0000 + + Add more tests of strtod end pointer + + Although there are some tests in tst-strtod2 and tst-strtod3 for the + end pointer provided by strtod when it doesn't parse the whole string, + they aren't very thorough. Add tests of more such cases to + tst-strtod2. + + Tested for x86_64. + + (cherry picked from commit b5d3737b305525315e0c7c93ca49eadc868eabd5) + +diff --git a/stdlib/tst-strtod2.c b/stdlib/tst-strtod2.c +index 2cb0953fa9..c84bd792c1 100644 +--- a/stdlib/tst-strtod2.c ++++ b/stdlib/tst-strtod2.c +@@ -1,3 +1,4 @@ ++#include + #include + #include + +@@ -17,10 +18,46 @@ struct test_strto ## FSUF \ + { "0x.0y", 0.0 ## LSUF, 4 }, \ + { ".y", 0.0 ## LSUF, 0 }, \ + { "0.y", 0.0 ## LSUF, 2 }, \ +- { ".0y", 0.0 ## LSUF, 2 } \ ++ { ".0y", 0.0 ## LSUF, 2 }, \ ++ { "1.0e", 1.0 ## LSUF, 3 }, \ ++ { "1.0e+", 1.0 ## LSUF, 3 }, \ ++ { "1.0e-", 1.0 ## LSUF, 3 }, \ ++ { "1.0ex", 1.0 ## LSUF, 3 }, \ ++ { "1.0e+x", 1.0 ## LSUF, 3 }, \ ++ { "1.0e-x", 1.0 ## LSUF, 3 }, \ ++ { "0x1p", 1.0 ## LSUF, 3 }, \ ++ { "0x1p+", 1.0 ## LSUF, 3 }, \ ++ { "0x1p-", 1.0 ## LSUF, 3 }, \ ++ { "0x1px", 1.0 ## LSUF, 3 }, \ ++ { "0x1p+x", 1.0 ## LSUF, 3 }, \ ++ { "0x1p-x", 1.0 ## LSUF, 3 }, \ ++ { "INFx", INFINITY, 3 }, \ ++ { "infx", INFINITY, 3 }, \ ++ { "INFINITx", INFINITY, 3 }, \ ++ { "infinitx", INFINITY, 3 }, \ ++ { "INFINITYY", INFINITY, 8 }, \ ++ { "infinityy", INFINITY, 8 }, \ ++ { "NANx", NAN, 3 }, \ ++ { "nanx", NAN, 3 }, \ ++ { "NAN(", NAN, 3 }, \ ++ { "nan(", NAN, 3 }, \ ++ { "NAN(x", NAN, 3 }, \ ++ { "nan(x", NAN, 3 }, \ ++ { "NAN(x)y", NAN, 6 }, \ ++ { "nan(x)y", NAN, 6 }, \ ++ { "NAN(*)y", NAN, 3 }, \ ++ { "nan(*)y", NAN, 3 } \ + }; \ + \ + static int \ ++compare_strto ## FSUF (FTYPE x, FTYPE y) \ ++{ \ ++ if (isnan (x) && isnan (y)) \ ++ return 1; \ ++ return x == y; \ ++} \ ++ \ ++static int \ + test_strto ## FSUF (void) \ + { \ + int status = 0; \ +@@ -30,7 +67,7 @@ test_strto ## FSUF (void) \ + { \ + char *ep; \ + FTYPE r = strto ## FSUF (tests_strto ## FSUF[i].str, &ep); \ +- if (r != tests_strto ## FSUF[i].result) \ ++ if (!compare_strto ## FSUF (r, tests_strto ## FSUF[i].result)) \ + { \ + char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ + FTOSTR (buf1, sizeof (buf1), "%g", r); \ + +commit cc256952ecb07789c423dff9712eb7a38f80e963 +Author: Joseph Myers +Date: Fri Sep 20 23:24:45 2024 +0000 + + Add tests of more strtod special cases + + There is very little test coverage of inputs to strtod-family + functions that don't contain anything that can be parsed as a number + (one test of ".y" in tst-strtod2), and none that I can see of skipping + initial whitespace. Add some tests of these things to tst-strtod2. + + Tested for x86_64. + + (cherry picked from commit 378039ca578c2ea93095a1e710d96f58c68a3997) + +diff --git a/stdlib/tst-strtod2.c b/stdlib/tst-strtod2.c +index c84bd792c1..d00bc13323 100644 +--- a/stdlib/tst-strtod2.c ++++ b/stdlib/tst-strtod2.c +@@ -31,6 +31,20 @@ struct test_strto ## FSUF \ + { "0x1px", 1.0 ## LSUF, 3 }, \ + { "0x1p+x", 1.0 ## LSUF, 3 }, \ + { "0x1p-x", 1.0 ## LSUF, 3 }, \ ++ { "", 0.0 ## LSUF, 0 }, \ ++ { ".", 0.0 ## LSUF, 0 }, \ ++ { "-", 0.0 ## LSUF, 0 }, \ ++ { "-.", 0.0 ## LSUF, 0 }, \ ++ { ".e", 0.0 ## LSUF, 0 }, \ ++ { "-.e", 0.0 ## LSUF, 0 }, \ ++ { " \t", 0.0 ## LSUF, 0 }, \ ++ { " \t.", 0.0 ## LSUF, 0 }, \ ++ { " \t-", 0.0 ## LSUF, 0 }, \ ++ { " \t-.", 0.0 ## LSUF, 0 }, \ ++ { " \t.e", 0.0 ## LSUF, 0 }, \ ++ { " \t-.e", 0.0 ## LSUF, 0 }, \ ++ { " \t\f\r\n\v1", 1.0 ## LSUF, 7 }, \ ++ { " \t\f\r\n\v-1.5e2", -150.0 ## LSUF, 12 }, \ + { "INFx", INFINITY, 3 }, \ + { "infx", INFINITY, 3 }, \ + { "INFINITx", INFINITY, 3 }, \ + +commit 5c06c6e0b5078ffb0aa0c09bac79f086145e0897 +Author: H.J. Lu +Date: Sat Sep 7 08:32:32 2024 -0700 + + libio: Set _vtable_offset before calling _IO_link_in [BZ #32148] + + Since _IO_vtable_offset is used to detect the old binaries, set it + in _IO_old_file_init_internal before calling _IO_link_in which checks + _IO_vtable_offset. Add a glibc 2.0 test with copy relocation on + _IO_stderr_@GLIBC_2.0 to verify that fopen won't cause memory corruption. + This fixes BZ #32148. + + Signed-off-by: H.J. Lu + Reviewed-by: Noah Goldstein + (cherry picked from commit 9dfea3de7f690bff70e3c6eb346b9ad082bb2e35) + +diff --git a/libio/Makefile b/libio/Makefile +index 6a507b67ea..5292baa4e0 100644 +--- a/libio/Makefile ++++ b/libio/Makefile +@@ -286,11 +286,18 @@ endif + ifeq ($(build-shared),yes) + aux += oldfileops oldstdfiles + tests += \ ++ tst-fopen-compat \ + tst-stderr-compat \ + # tests + tests-2.0 += \ ++ tst-fopen-compat \ + tst-stderr-compat \ + # tests-2.0 ++ ++tst-fopen-compat-ARGS = tst-fopen-compat.c ++# Disable PIE to trigger copy relocation. ++CFLAGS-tst-fopen-compat.c += -fno-pie ++tst-fopen-compat-no-pie = yes + endif + + shared-only-routines = oldiofopen oldiofdopen oldiofclose oldfileops \ +diff --git a/libio/oldfileops.c b/libio/oldfileops.c +index 97148dba9b..8f775c9094 100644 +--- a/libio/oldfileops.c ++++ b/libio/oldfileops.c +@@ -103,9 +103,11 @@ _IO_old_file_init_internal (struct _IO_FILE_plus *fp) + fp->file._old_offset = _IO_pos_BAD; + fp->file._flags |= CLOSED_FILEBUF_FLAGS; + +- _IO_link_in (fp); ++ /* NB: _vtable_offset must be set before calling _IO_link_in since ++ _IO_vtable_offset is used to detect the old binaries. */ + fp->file._vtable_offset = ((int) sizeof (struct _IO_FILE) + - (int) sizeof (struct _IO_FILE_complete)); ++ _IO_link_in (fp); + fp->file._fileno = -1; + + if (&_IO_stdin_used != NULL || !_IO_legacy_file ((FILE *) fp)) +diff --git a/libio/tst-fopen-compat.c b/libio/tst-fopen-compat.c +new file mode 100644 +index 0000000000..f241b61043 +--- /dev/null ++++ b/libio/tst-fopen-compat.c +@@ -0,0 +1,85 @@ ++/* Verify that fopen works with copy relocation on _IO_stderr_ in binaries ++ linked with glibc 2.0. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) ++# define _LIBC ++# define _IO_USE_OLD_IO_FILE ++# include ++# include ++# include ++# include ++# include ++# include ++ ++struct _IO_jump_t; ++ ++struct _IO_FILE_plus ++{ ++ FILE file; ++ const struct _IO_jump_t *vtable; ++}; ++ ++extern struct _IO_FILE_plus _IO_stderr_; ++compat_symbol_reference (libc, _IO_stderr_, _IO_stderr_, GLIBC_2_0); ++compat_symbol_reference (libc, fopen, fopen, GLIBC_2_0); ++compat_symbol_reference (libc, fclose, fclose, GLIBC_2_0); ++ ++static int ++do_test (int argc, char *argv[]) ++{ ++ static char filename[PATH_MAX + 1]; ++ struct stat st; ++ char *name = NULL; ++ int i; ++ ++ /* Try to trigger copy relocation. */ ++ TEST_VERIFY_EXIT (_IO_stderr_.file._fileno == STDERR_FILENO); ++ ++ for (i = 1; i < argc; i++) ++ { ++ name = argv[i]; ++ if (stat (name, &st) == 0) ++ { ++ TEST_VERIFY_EXIT (strlen (name) <= PATH_MAX); ++ break; ++ } ++ } ++ TEST_VERIFY_EXIT (name != NULL); ++ ++ strcpy (filename, name); ++ FILE *fp = fopen (filename, "r"); ++ TEST_VERIFY_EXIT (strcmp (filename, name) == 0); ++ TEST_VERIFY_EXIT (fp != NULL); ++ TEST_VERIFY_EXIT (fclose (fp) == 0); ++ return 0; ++} ++#else ++# include ++ ++static int ++do_test (int argc, char *argv[]) ++{ ++ return EXIT_UNSUPPORTED; ++} ++#endif ++ ++#define TEST_FUNCTION_ARGV do_test ++#include + +commit 85e5850f2f4ea5f304be5356ecb7a15998766a4e +Author: Joseph Myers +Date: Fri Sep 20 23:25:32 2024 +0000 + + Make tst-strtod-underflow type-generic + + The test tst-strtod-underflow covers various edge cases close to the + underflow threshold for strtod (especially cases where underflow on + architectures with after-rounding tininess detection depends on the + rounding mode). Make it use the type-generic machinery, with + corresponding test inputs for each supported floating-point format, so + that other functions in the strtod family are tested for underflow + edge cases as well. + + Tested for x86_64. + + (cherry picked from commit 94ca2c0894f0e1b62625c369cc598a2b9236622c) + +diff --git a/stdlib/tst-strtod-underflow.c b/stdlib/tst-strtod-underflow.c +index a5ced18599..8598b95b6d 100644 +--- a/stdlib/tst-strtod-underflow.c ++++ b/stdlib/tst-strtod-underflow.c +@@ -17,6 +17,10 @@ + License along with the GNU C Library; if not, see + . */ + ++/* Defining _LIBC_TEST ensures long double math functions are ++ declared in the headers. */ ++#define _LIBC_TEST 1 ++#define __STDC_WANT_IEC_60559_TYPES_EXT__ + #include + #include + #include +@@ -25,6 +29,60 @@ + #include + #include + ++#include "tst-strtod.h" ++ ++/* Logic for selecting between tests for different formats is as in ++ tst-strtod-skeleton.c, but here it is selecting string inputs with ++ different underflow properties, rather than generated test ++ data. */ ++ ++#define _CONCAT(a, b) a ## b ++#define CONCAT(a, b) _CONCAT (a, b) ++ ++#define MEMBER(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++ const char *s_ ## FSUF; ++ ++#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 ++# define CHOOSE_ld(f,d,...) d ++#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && LDBL_MIN_EXP == -16381 ++# define CHOOSE_ld(f,d,ld64i,...) ld64i ++#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && LDBL_MIN_EXP == -16382 ++# define CHOOSE_ld(f,d,ld64i,ld64m,...) ld64m ++#elif LDBL_MANT_DIG == 106 && LDBL_MAX_EXP == 1024 ++# define CHOOSE_ld(f,d,ld64i,ld64m,ld106,...) ld106 ++#elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 ++# define CHOOSE_ld(f,d,ld64i,ld64m,ld106,ld113,...) ld113 ++#else ++# error "unknown long double format" ++#endif ++ ++#define CHOOSE_f(f,...) f ++#define CHOOSE_f32(f,...) f ++#define CHOOSE_d(f,d,...) d ++#define CHOOSE_f64(f,d,...) d ++#define CHOOSE_f32x(f,d,...) d ++#define CHOOSE_f128(f,d,ld64i,ld64m,ld106,ld113,...) ld113 ++ ++#if __HAVE_FLOAT64X ++# if FLT64X_MANT_DIG == 113 && FLT64X_MAX_EXP == 16384 ++# define CHOOSE_f64x(f,d,ld64i,ld64m,ld106,ld113,...) ld113 ++# elif (FLT64X_MANT_DIG == 64 \ ++ && FLT64X_MAX_EXP == 16384 \ ++ && FLT64X_MIN_EXP == -16381) ++# define CHOOSE_f64x(f,d,ld64i,...) ld64i ++# else ++# error "unknown _Float64x format" ++# endif ++#endif ++ ++#define _XNTRY(FSUF, FTYPE, FTOSTR, LSUF, CSUF, ...) \ ++ CHOOSE_ ## FSUF (__VA_ARGS__), ++#define XNTRY(...) \ ++ GEN_TEST_STRTOD_FOREACH (_XNTRY, __VA_ARGS__) ++ ++#define TEST(f, d, ld64i, ld64m, ld106, ld113, u) \ ++ { XNTRY(f, d, ld64i, ld64m, ld106, ld113) u } ++ + enum underflow_case + { + /* Result is exact or outside the subnormal range. */ +@@ -55,38 +113,194 @@ enum underflow_case + + struct test + { +- const char *s; ++ GEN_TEST_STRTOD_FOREACH (MEMBER) + enum underflow_case c; + }; + + static const struct test tests[] = + { +- { "0x1p-1022", UNDERFLOW_NONE }, +- { "-0x1p-1022", UNDERFLOW_NONE }, +- { "0x0p-10000000000000000000000000", UNDERFLOW_NONE }, +- { "-0x0p-10000000000000000000000000", UNDERFLOW_NONE }, +- { "0x1p-10000000000000000000000000", UNDERFLOW_ALWAYS }, +- { "-0x1p-10000000000000000000000000", UNDERFLOW_ALWAYS }, +- { "0x1.000000000000000000001p-1022", UNDERFLOW_NONE }, +- { "-0x1.000000000000000000001p-1022", UNDERFLOW_NONE }, +- { "0x1p-1075", UNDERFLOW_ALWAYS }, +- { "-0x1p-1075", UNDERFLOW_ALWAYS }, +- { "0x1p-1023", UNDERFLOW_NONE }, +- { "-0x1p-1023", UNDERFLOW_NONE }, +- { "0x1p-1074", UNDERFLOW_NONE }, +- { "-0x1p-1074", UNDERFLOW_NONE }, +- { "0x1.ffffffffffffep-1023", UNDERFLOW_NONE }, +- { "-0x1.ffffffffffffep-1023", UNDERFLOW_NONE }, +- { "0x1.fffffffffffffp-1023", UNDERFLOW_ALWAYS }, +- { "-0x1.fffffffffffffp-1023", UNDERFLOW_ALWAYS }, +- { "0x1.fffffffffffff0001p-1023", UNDERFLOW_EXCEPT_UPWARD }, +- { "-0x1.fffffffffffff0001p-1023", UNDERFLOW_EXCEPT_DOWNWARD }, +- { "0x1.fffffffffffff7fffp-1023", UNDERFLOW_EXCEPT_UPWARD }, +- { "-0x1.fffffffffffff7fffp-1023", UNDERFLOW_EXCEPT_DOWNWARD }, +- { "0x1.fffffffffffff8p-1023", UNDERFLOW_ONLY_DOWNWARD_ZERO }, +- { "-0x1.fffffffffffff8p-1023", UNDERFLOW_ONLY_UPWARD_ZERO }, +- { "0x1.fffffffffffffffffp-1023", UNDERFLOW_ONLY_DOWNWARD_ZERO }, +- { "-0x1.fffffffffffffffffp-1023", UNDERFLOW_ONLY_UPWARD_ZERO }, ++ TEST ("0x1p-126", ++ "0x1p-1022", ++ "0x1p-16382", ++ "0x1p-16383", ++ "0x1p-969", ++ "0x1p-16382", ++ UNDERFLOW_NONE), ++ TEST ("-0x1p-126", ++ "-0x1p-1022", ++ "-0x1p-16382", ++ "-0x1p-16383", ++ "-0x1p-969", ++ "-0x1p-16382", ++ UNDERFLOW_NONE), ++ TEST ("0x0p-10000000000000000000000000", ++ "0x0p-10000000000000000000000000", ++ "0x0p-10000000000000000000000000", ++ "0x0p-10000000000000000000000000", ++ "0x0p-10000000000000000000000000", ++ "0x0p-10000000000000000000000000", ++ UNDERFLOW_NONE), ++ TEST ("-0x0p-10000000000000000000000000", ++ "-0x0p-10000000000000000000000000", ++ "-0x0p-10000000000000000000000000", ++ "-0x0p-10000000000000000000000000", ++ "-0x0p-10000000000000000000000000", ++ "-0x0p-10000000000000000000000000", ++ UNDERFLOW_NONE), ++ TEST ("0x1p-10000000000000000000000000", ++ "0x1p-10000000000000000000000000", ++ "0x1p-10000000000000000000000000", ++ "0x1p-10000000000000000000000000", ++ "0x1p-10000000000000000000000000", ++ "0x1p-10000000000000000000000000", ++ UNDERFLOW_ALWAYS), ++ TEST ("-0x1p-10000000000000000000000000", ++ "-0x1p-10000000000000000000000000", ++ "-0x1p-10000000000000000000000000", ++ "-0x1p-10000000000000000000000000", ++ "-0x1p-10000000000000000000000000", ++ "-0x1p-10000000000000000000000000", ++ UNDERFLOW_ALWAYS), ++ TEST ("0x1.000000000000000000001p-126", ++ "0x1.000000000000000000001p-1022", ++ "0x1.000000000000000000001p-16382", ++ "0x1.000000000000000000001p-16383", ++ "0x1.000000000000000000001p-969", ++ "0x1.00000000000000000000000000000000000000001p-16382", ++ UNDERFLOW_NONE), ++ TEST ("-0x1.000000000000000000001p-126", ++ "-0x1.000000000000000000001p-1022", ++ "-0x1.000000000000000000001p-16382", ++ "-0x1.000000000000000000001p-16383", ++ "-0x1.000000000000000000001p-969", ++ "-0x1.00000000000000000000000000000000000000001p-16382", ++ UNDERFLOW_NONE), ++ TEST ("0x1p-150", ++ "0x1p-1075", ++ "0x1p-16446", ++ "0x1p-16447", ++ "0x1p-1075", ++ "0x1p-16495", ++ UNDERFLOW_ALWAYS), ++ TEST ("-0x1p-150", ++ "-0x1p-1075", ++ "-0x1p-16446", ++ "-0x1p-16447", ++ "-0x1p-1075", ++ "-0x1p-16495", ++ UNDERFLOW_ALWAYS), ++ TEST ("0x1p-127", ++ "0x1p-1023", ++ "0x1p-16383", ++ "0x1p-16384", ++ "0x1p-970", ++ "0x1p-16383", ++ UNDERFLOW_NONE), ++ TEST ("-0x1p-127", ++ "-0x1p-1023", ++ "-0x1p-16383", ++ "-0x1p-16384", ++ "-0x1p-970", ++ "-0x1p-16383", ++ UNDERFLOW_NONE), ++ TEST ("0x1p-149", ++ "0x1p-1074", ++ "0x1p-16445", ++ "0x1p-16446", ++ "0x1p-1074", ++ "0x1p-16494", ++ UNDERFLOW_NONE), ++ TEST ("-0x1p-149", ++ "-0x1p-1074", ++ "-0x1p-16445", ++ "-0x1p-16446", ++ "-0x1p-1074", ++ "-0x1p-16494", ++ UNDERFLOW_NONE), ++ TEST ("0x1.fffffcp-127", ++ "0x1.ffffffffffffep-1023", ++ "0x1.fffffffffffffffcp-16383", ++ "0x1.fffffffffffffffcp-16384", ++ "0x1.ffffffffffffffffffffffffffp-970", ++ "0x1.fffffffffffffffffffffffffffep-16383", ++ UNDERFLOW_NONE), ++ TEST ("-0x1.fffffcp-127", ++ "-0x1.ffffffffffffep-1023", ++ "-0x1.fffffffffffffffcp-16383", ++ "-0x1.fffffffffffffffcp-16384", ++ "-0x1.ffffffffffffffffffffffffffp-970", ++ "-0x1.fffffffffffffffffffffffffffep-16383", ++ UNDERFLOW_NONE), ++ TEST ("0x1.fffffep-127", ++ "0x1.fffffffffffffp-1023", ++ "0x1.fffffffffffffffep-16383", ++ "0x1.fffffffffffffffep-16384", ++ "0x1.ffffffffffffffffffffffffff8p-970", ++ "0x1.ffffffffffffffffffffffffffffp-16383", ++ UNDERFLOW_ALWAYS), ++ TEST ("-0x1.fffffep-127", ++ "-0x1.fffffffffffffp-1023", ++ "-0x1.fffffffffffffffep-16383", ++ "-0x1.fffffffffffffffep-16384", ++ "-0x1.ffffffffffffffffffffffffff8p-970", ++ "-0x1.ffffffffffffffffffffffffffffp-16383", ++ UNDERFLOW_ALWAYS), ++ TEST ("0x1.fffffe0001p-127", ++ "0x1.fffffffffffff0001p-1023", ++ "0x1.fffffffffffffffe0001p-16383", ++ "0x1.fffffffffffffffe0001p-16384", ++ "0x1.ffffffffffffffffffffffffff80001p-970", ++ "0x1.ffffffffffffffffffffffffffff0001p-16383", ++ UNDERFLOW_EXCEPT_UPWARD), ++ TEST ("-0x1.fffffe0001p-127", ++ "-0x1.fffffffffffff0001p-1023", ++ "-0x1.fffffffffffffffe0001p-16383", ++ "-0x1.fffffffffffffffe0001p-16384", ++ "-0x1.ffffffffffffffffffffffffff80001p-970", ++ "-0x1.ffffffffffffffffffffffffffff0001p-16383", ++ UNDERFLOW_EXCEPT_DOWNWARD), ++ TEST ("0x1.fffffeffffp-127", ++ "0x1.fffffffffffff7fffp-1023", ++ "0x1.fffffffffffffffeffffp-16383", ++ "0x1.fffffffffffffffeffffp-16384", ++ "0x1.ffffffffffffffffffffffffffbffffp-970", ++ "0x1.ffffffffffffffffffffffffffff7fffp-16383", ++ UNDERFLOW_EXCEPT_UPWARD), ++ TEST ("-0x1.fffffeffffp-127", ++ "-0x1.fffffffffffff7fffp-1023", ++ "-0x1.fffffffffffffffeffffp-16383", ++ "-0x1.fffffffffffffffeffffp-16384", ++ "-0x1.ffffffffffffffffffffffffffbffffp-970", ++ "-0x1.ffffffffffffffffffffffffffff7fffp-16383", ++ UNDERFLOW_EXCEPT_DOWNWARD), ++ TEST ("0x1.ffffffp-127", ++ "0x1.fffffffffffff8p-1023", ++ "0x1.ffffffffffffffffp-16383", ++ "0x1.ffffffffffffffffp-16384", ++ "0x1.ffffffffffffffffffffffffffcp-970", ++ "0x1.ffffffffffffffffffffffffffff8p-16383", ++ UNDERFLOW_ONLY_DOWNWARD_ZERO), ++ TEST ("-0x1.ffffffp-127", ++ "-0x1.fffffffffffff8p-1023", ++ "-0x1.ffffffffffffffffp-16383", ++ "-0x1.ffffffffffffffffp-16384", ++ "-0x1.ffffffffffffffffffffffffffcp-970", ++ "-0x1.ffffffffffffffffffffffffffff8p-16383", ++ UNDERFLOW_ONLY_UPWARD_ZERO), ++ TEST ("0x1.ffffffffffp-127", ++ "0x1.fffffffffffffffffp-1023", ++ "0x1.ffffffffffffffffffffp-16383", ++ "0x1.ffffffffffffffffffffp-16384", ++ "0x1.ffffffffffffffffffffffffffffffp-970", ++ "0x1.ffffffffffffffffffffffffffffffffp-16383", ++ UNDERFLOW_ONLY_DOWNWARD_ZERO), ++ TEST ("-0x1.ffffffffffp-127", ++ "-0x1.fffffffffffffffffp-1023", ++ "-0x1.ffffffffffffffffffffp-16383", ++ "-0x1.ffffffffffffffffffffp-16384", ++ "-0x1.ffffffffffffffffffffffffffffffp-970", ++ "-0x1.ffffffffffffffffffffffffffffffffp-16383", ++ UNDERFLOW_ONLY_UPWARD_ZERO), + }; + + /* Return whether to expect underflow from a particular testcase, in a +@@ -133,39 +347,62 @@ static bool support_underflow_exception = false; + volatile double d = DBL_MIN; + volatile double dd; + +-static int +-test_in_one_mode (const char *s, enum underflow_case c, int rm, +- const char *mode_name) ++static bool ++test_got_fe_underflow (void) + { +- int result = 0; +- feclearexcept (FE_ALL_EXCEPT); +- errno = 0; +- double d = strtod (s, NULL); +- int got_errno = errno; + #ifdef FE_UNDERFLOW +- bool got_fe_underflow = fetestexcept (FE_UNDERFLOW) != 0; ++ return fetestexcept (FE_UNDERFLOW) != 0; + #else +- bool got_fe_underflow = false; ++ return false; + #endif +- printf ("strtod (%s) (%s) returned %a, errno = %d, %sunderflow exception\n", +- s, mode_name, d, got_errno, got_fe_underflow ? "" : "no "); +- bool this_expect_underflow = expect_underflow (c, rm); +- if (got_errno != 0 && got_errno != ERANGE) +- { +- puts ("FAIL: errno neither 0 nor ERANGE"); +- result = 1; +- } +- else if (this_expect_underflow != (errno == ERANGE)) +- { +- puts ("FAIL: underflow from errno differs from expectations"); +- result = 1; +- } +- if (support_underflow_exception && got_fe_underflow != this_expect_underflow) +- { +- puts ("FAIL: underflow from exceptions differs from expectations"); +- result = 1; +- } +- return result; ++} ++ ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++static int \ ++test_strto ## FSUF (int i, int rm, const char *mode_name) \ ++{ \ ++ const char *s = tests[i].s_ ## FSUF; \ ++ enum underflow_case c = tests[i].c; \ ++ int result = 0; \ ++ feclearexcept (FE_ALL_EXCEPT); \ ++ errno = 0; \ ++ FTYPE d = strto ## FSUF (s, NULL); \ ++ int got_errno = errno; \ ++ bool got_fe_underflow = test_got_fe_underflow (); \ ++ char buf[FSTRLENMAX]; \ ++ FTOSTR (buf, sizeof (buf), "%a", d); \ ++ printf ("strto" #FSUF \ ++ " (%s) (%s) returned %s, errno = %d, " \ ++ "%sunderflow exception\n", \ ++ s, mode_name, buf, got_errno, \ ++ got_fe_underflow ? "" : "no "); \ ++ bool this_expect_underflow = expect_underflow (c, rm); \ ++ if (got_errno != 0 && got_errno != ERANGE) \ ++ { \ ++ puts ("FAIL: errno neither 0 nor ERANGE"); \ ++ result = 1; \ ++ } \ ++ else if (this_expect_underflow != (errno == ERANGE)) \ ++ { \ ++ puts ("FAIL: underflow from errno differs from expectations"); \ ++ result = 1; \ ++ } \ ++ if (support_underflow_exception \ ++ && got_fe_underflow != this_expect_underflow) \ ++ { \ ++ puts ("FAIL: underflow from exceptions " \ ++ "differs from expectations"); \ ++ result = 1; \ ++ } \ ++ return result; \ ++} ++ ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) ++ ++static int ++test_in_one_mode (size_t i, int rm, const char *mode_name) ++{ ++ return STRTOD_TEST_FOREACH (test_strto, i, rm, mode_name); + } + + static int +@@ -191,12 +428,12 @@ do_test (void) + #endif + for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); i++) + { +- result |= test_in_one_mode (tests[i].s, tests[i].c, fe_tonearest, ++ result |= test_in_one_mode (i, fe_tonearest, + "default rounding mode"); + #ifdef FE_DOWNWARD + if (!fesetround (FE_DOWNWARD)) + { +- result |= test_in_one_mode (tests[i].s, tests[i].c, FE_DOWNWARD, ++ result |= test_in_one_mode (i, FE_DOWNWARD, + "FE_DOWNWARD"); + fesetround (save_round_mode); + } +@@ -204,7 +441,7 @@ do_test (void) + #ifdef FE_TOWARDZERO + if (!fesetround (FE_TOWARDZERO)) + { +- result |= test_in_one_mode (tests[i].s, tests[i].c, FE_TOWARDZERO, ++ result |= test_in_one_mode (i, FE_TOWARDZERO, + "FE_TOWARDZERO"); + fesetround (save_round_mode); + } +@@ -212,7 +449,7 @@ do_test (void) + #ifdef FE_UPWARD + if (!fesetround (FE_UPWARD)) + { +- result |= test_in_one_mode (tests[i].s, tests[i].c, FE_UPWARD, ++ result |= test_in_one_mode (i, FE_UPWARD, + "FE_UPWARD"); + fesetround (save_round_mode); + } + +commit 3a34851103d554b2c9b269ecae111648f9d7bb6d +Author: Florian Weimer +Date: Mon Oct 28 14:45:30 2024 +0100 + + elf: Change ldconfig auxcache magic number (bug 32231) + + In commit c628c2296392ed3bf2cb8d8470668e64fe53389f (elf: Remove + ldconfig kernel version check), the layout of auxcache entries + changed because the osversion field was removed from + struct aux_cache_file_entry. However, AUX_CACHEMAGIC was not + changed, so existing files are still used, potentially leading + to unintended ldconfig behavior. This commit changes AUX_CACHEMAGIC, + so that the file is regenerated. + + Reported-by: DJ Delorie + Reviewed-by: Adhemerval Zanella + (cherry picked from commit 0a536f6e2f76e3ef581b3fd9af1e5cf4ddc7a5a2) + +diff --git a/NEWS b/NEWS +index 9033335db1..928c516bec 100644 +--- a/NEWS ++++ b/NEWS +@@ -17,6 +17,7 @@ The following bugs are resolved with this release: + [32026] strerror/strsignal TLS not handled correctly for secondary namespaces + [32052] Name space violation in fortify wrappers + [32137] libio: Attempt wide backup free only for non-legacy code ++ [32231] elf: Change ldconfig auxcache magic number + + Version 2.40 + +diff --git a/elf/cache.c b/elf/cache.c +index 8a618e11fa..62d681df42 100644 +--- a/elf/cache.c ++++ b/elf/cache.c +@@ -820,7 +820,7 @@ struct aux_cache_entry + struct aux_cache_entry *next; + }; + +-#define AUX_CACHEMAGIC "glibc-ld.so.auxcache-1.0" ++#define AUX_CACHEMAGIC "glibc-ld.so.auxcache-2.0" + + struct aux_cache_file_entry + { + +commit 234458024300f0b4b430785999f33eddf059af6a +Author: Michael Karcher +Date: Sun Jul 28 15:30:57 2024 +0200 + + Mitigation for "clone on sparc might fail with -EFAULT for no valid reason" (bz 31394) + + It seems the kernel can not deal with uncommitted stack space in the area intended + for the register window when executing the clone() system call. So create a nested + frame (proxy for the kernel frame) and flush it from the processor to memory to + force committing pages to the stack before invoking the system call. + + Bug: https://www.mail-archive.com/debian-glibc@lists.debian.org/msg62592.html + Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31394 + See-also: https://lore.kernel.org/sparclinux/62f9be9d-a086-4134-9a9f-5df8822708af@mkarcher.dialup.fu-berlin.de/ + Signed-off-by: Michael Karcher + Reviewed-by: DJ Delorie + (cherry picked from commit faeaa3bc9f76030b9882ccfdee232fc0ca6dcb06) + +diff --git a/NEWS b/NEWS +index 928c516bec..dc815fb6d3 100644 +--- a/NEWS ++++ b/NEWS +@@ -11,6 +11,7 @@ The following bugs are resolved with this release: + + [27821] ungetc: Fix backup buffer leak on program exit + [30081] resolv: Do not wait for non-existing second DNS response after error ++ [31394] clone on sparc might fail with -EFAULT for no valid reason + [31717] elf: Avoid re-initializing already allocated TLS in dlopen + [31890] resolv: Allow short error responses to match any DNS query + [31968] mremap implementation in C does not handle arguments correctly +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S +index 748d25fcfe..c9cf9bb055 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S +@@ -28,6 +28,9 @@ + .text + ENTRY (__clone) + save %sp,-96,%sp ++ save %sp,-96,%sp ++ flushw ++ restore + cfi_def_cfa_register(%fp) + cfi_window_save + cfi_register(%o7, %i7) +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S b/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S +index e5ff2cf1a0..370d51fda2 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S +@@ -32,6 +32,9 @@ + + ENTRY (__clone) + save %sp, -192, %sp ++ save %sp, -192, %sp ++ flushw ++ restore + cfi_def_cfa_register(%fp) + cfi_window_save + cfi_register(%o7, %i7) + +commit efb710034e4c5e734d100cc4ef1b1e27d4315825 +Author: Adhemerval Zanella +Date: Mon Sep 2 16:58:51 2024 -0300 + + linux: sparc: Fix clone for LEON/sparcv8 (BZ 31394) + + The sparc clone mitigation (faeaa3bc9f76030) added the use of + flushw, which is not support by LEON/sparcv8. As discussed on + the libc-alpha, 'ta 3' is a working alternative [1]. + + [1] https://sourceware.org/pipermail/libc-alpha/2024-August/158905.html + + Checked with a build for sparcv8-linux-gnu targetting leon. + + Acked-by: John Paul Adrian Glaubitz + (cherry picked from commit 5e8cfc5d625e6dd000a0371d21d792836ea7951a) + +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S +index c9cf9bb055..c84244f56b 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S +@@ -29,7 +29,11 @@ + ENTRY (__clone) + save %sp,-96,%sp + save %sp,-96,%sp ++#ifdef __sparcv9 + flushw ++#else ++ ta 3 ++#endif + restore + cfi_def_cfa_register(%fp) + cfi_window_save + +commit 626c048f32a979f77662bdcb1cca477c11d3f9c1 +Author: Aurelien Jarno +Date: Sun Nov 10 10:50:34 2024 +0100 + + elf: handle addition overflow in _dl_find_object_update_1 [BZ #32245] + + The remaining_to_add variable can be 0 if (current_used + count) wraps, + This is caught by GCC 14+ on hppa, which determines from there that + target_seg could be be NULL when remaining_to_add is zero, which in + turns causes a -Wstringop-overflow warning: + + In file included from ../include/atomic.h:49, + from dl-find_object.c:20: + In function '_dlfo_update_init_seg', + inlined from '_dl_find_object_update_1' at dl-find_object.c:689:30, + inlined from '_dl_find_object_update' at dl-find_object.c:805:13: + ../sysdeps/unix/sysv/linux/hppa/atomic-machine.h:44:4: error: '__atomic_store_4' writing 4 bytes into a region of size 0 overflows the destination [-Werror=stringop-overflow=] + 44 | __atomic_store_n ((mem), (val), __ATOMIC_RELAXED); \ + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + dl-find_object.c:644:3: note: in expansion of macro 'atomic_store_relaxed' + 644 | atomic_store_relaxed (&seg->size, new_seg_size); + | ^~~~~~~~~~~~~~~~~~~~ + In function '_dl_find_object_update': + cc1: note: destination object is likely at address zero + + In practice, this is not possible as it represent counts of link maps. + Link maps have sizes larger than 1 byte, so the sum of any two link map + counts will always fit within a size_t without wrapping around. + + This patch therefore adds a check on remaining_to_add == 0 and tell GCC + that this can not happen using __builtin_unreachable. + + Thanks to Andreas Schwab for the investigation. + + Closes: BZ #32245 + Signed-off-by: Aurelien Jarno + Tested-by: John David Anglin + Reviewed-by: Florian Weimer + (cherry picked from commit 6c915c73d08028987232f6dc718f218c61113240) + +diff --git a/NEWS b/NEWS +index dc815fb6d3..bd0b3bd66a 100644 +--- a/NEWS ++++ b/NEWS +@@ -19,6 +19,7 @@ The following bugs are resolved with this release: + [32052] Name space violation in fortify wrappers + [32137] libio: Attempt wide backup free only for non-legacy code + [32231] elf: Change ldconfig auxcache magic number ++ [32245] glibc -Wstringop-overflow= build failure on hppa + + Version 2.40 + +diff --git a/elf/dl-find_object.c b/elf/dl-find_object.c +index 449302eda3..ae18b438d3 100644 +--- a/elf/dl-find_object.c ++++ b/elf/dl-find_object.c +@@ -662,6 +662,14 @@ _dl_find_object_update_1 (struct link_map **loaded, size_t count) + = _dlfo_loaded_mappings[!active_idx]; + size_t remaining_to_add = current_used + count; + ++ /* remaining_to_add can be 0 if (current_used + count) wraps, but in practice ++ this is not possible as it represent counts of link maps. Link maps have ++ sizes larger than 1 byte, so the sum of any two link map counts will ++ always fit within a size_t without wrapping around. This check ensures ++ that target_seg is not erroneously considered potentially NULL by GCC. */ ++ if (remaining_to_add == 0) ++ __builtin_unreachable (); ++ + /* Ensure that the new segment chain has enough space. */ + { + size_t new_allocated + +commit 9b9545ba27613fa41efdfa7965b6fc580bf1b919 +Author: Michael Jeanson +Date: Thu Nov 7 22:23:49 2024 +0100 + + nptl: initialize rseq area prior to registration + + Per the rseq syscall documentation, 3 fields are required to be + initialized by userspace prior to registration, they are 'cpu_id', + 'rseq_cs' and 'flags'. Since we have no guarantee that 'struct pthread' + is cleared on all architectures, explicitly set those 3 fields prior to + registration. + + Signed-off-by: Michael Jeanson + Reviewed-by: Florian Weimer + (cherry picked from commit 97f60abd25628425971f07e9b0e7f8eec0741235) + +diff --git a/nptl/descr.h b/nptl/descr.h +index 8cef95810c..c4bdd7757a 100644 +--- a/nptl/descr.h ++++ b/nptl/descr.h +@@ -414,6 +414,8 @@ struct pthread + { + uint32_t cpu_id_start; + uint32_t cpu_id; ++ uint64_t rseq_cs; ++ uint32_t flags; + }; + char pad[32]; /* Original rseq area size. */ + } rseq_area __attribute__ ((aligned (32))); +diff --git a/sysdeps/unix/sysv/linux/rseq-internal.h b/sysdeps/unix/sysv/linux/rseq-internal.h +index 7ea935b4ad..37a8f630b6 100644 +--- a/sysdeps/unix/sysv/linux/rseq-internal.h ++++ b/sysdeps/unix/sysv/linux/rseq-internal.h +@@ -51,11 +51,21 @@ rseq_register_current_thread (struct pthread *self, bool do_rseq) + /* The initial implementation used only 20 bytes out of 32, + but still expected size 32. */ + size = RSEQ_AREA_SIZE_INITIAL; ++ ++ /* Initialize the rseq fields that are read by the kernel on ++ registration, there is no guarantee that struct pthread is ++ cleared on all architectures. */ ++ THREAD_SETMEM (self, rseq_area.cpu_id, RSEQ_CPU_ID_UNINITIALIZED); ++ THREAD_SETMEM (self, rseq_area.rseq_cs, 0); ++ THREAD_SETMEM (self, rseq_area.flags, 0); ++ + int ret = INTERNAL_SYSCALL_CALL (rseq, &self->rseq_area, + size, 0, RSEQ_SIG); + if (!INTERNAL_SYSCALL_ERROR_P (ret)) + return true; + } ++ /* When rseq is disabled by tunables or the registration fails, inform ++ userspace by setting 'cpu_id' to RSEQ_CPU_ID_REGISTRATION_FAILED. */ + THREAD_SETMEM (self, rseq_area.cpu_id, RSEQ_CPU_ID_REGISTRATION_FAILED); + return false; + } + +commit 091dd12831792cef16eee24fe240c73a25b47a1d +Author: Michael Jeanson +Date: Wed Nov 20 14:15:42 2024 -0500 + + nptl: initialize cpu_id_start prior to rseq registration + + When adding explicit initialization of rseq fields prior to + registration, I glossed over the fact that 'cpu_id_start' is also + documented as initialized by user-space. + + While current kernels don't validate the content of this field on + registration, future ones could. + + Signed-off-by: Michael Jeanson + Reviewed-by: Mathieu Desnoyers + (cherry picked from commit d9f40387d3305d97e30a8cf8724218c42a63680a) + +diff --git a/sysdeps/unix/sysv/linux/rseq-internal.h b/sysdeps/unix/sysv/linux/rseq-internal.h +index 37a8f630b6..ef3eab1fef 100644 +--- a/sysdeps/unix/sysv/linux/rseq-internal.h ++++ b/sysdeps/unix/sysv/linux/rseq-internal.h +@@ -56,6 +56,7 @@ rseq_register_current_thread (struct pthread *self, bool do_rseq) + registration, there is no guarantee that struct pthread is + cleared on all architectures. */ + THREAD_SETMEM (self, rseq_area.cpu_id, RSEQ_CPU_ID_UNINITIALIZED); ++ THREAD_SETMEM (self, rseq_area.cpu_id_start, 0); + THREAD_SETMEM (self, rseq_area.rseq_cs, 0); + THREAD_SETMEM (self, rseq_area.flags, 0); + + +commit c6cdab1e01bc11bc4036dc5b1be6086f6259c123 +Author: Sam James +Date: Mon Dec 9 23:11:25 2024 +0000 + + malloc: add indirection for malloc(-like) functions in tests [BZ #32366] + + GCC 15 introduces allocation dead code removal (DCE) for PR117370 in + r15-5255-g7828dc070510f8. This breaks various glibc tests which want + to assert various properties of the allocator without doing anything + obviously useful with the allocated memory. + + Alexander Monakov rightly pointed out that we can and should do better + than passing -fno-malloc-dce to paper over the problem. Not least because + GCC 14 already does such DCE where there's no testing of malloc's return + value against NULL, and LLVM has such optimisations too. + + Handle this by providing malloc (and friends) wrappers with a volatile + function pointer to obscure that we're calling malloc (et. al) from the + compiler. + + Reviewed-by: Paul Eggert + (cherry picked from commit a9944a52c967ce76a5894c30d0274b824df43c7a) + +diff --git a/malloc/tst-aligned-alloc.c b/malloc/tst-aligned-alloc.c +index 91167d1392..b0f05a8fec 100644 +--- a/malloc/tst-aligned-alloc.c ++++ b/malloc/tst-aligned-alloc.c +@@ -25,6 +25,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + static int + do_test (void) + { +diff --git a/malloc/tst-compathooks-off.c b/malloc/tst-compathooks-off.c +index d0106f3fb7..4cce6e5a80 100644 +--- a/malloc/tst-compathooks-off.c ++++ b/malloc/tst-compathooks-off.c +@@ -25,6 +25,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + extern void (*volatile __free_hook) (void *, const void *); + extern void *(*volatile __malloc_hook)(size_t, const void *); + extern void *(*volatile __realloc_hook)(void *, size_t, const void *); +diff --git a/malloc/tst-malloc-aux.h b/malloc/tst-malloc-aux.h +new file mode 100644 +index 0000000000..54908b4a24 +--- /dev/null ++++ b/malloc/tst-malloc-aux.h +@@ -0,0 +1,41 @@ ++/* Wrappers for malloc-like functions to allow testing the implementation ++ without optimization. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; see the file COPYING.LIB. If ++ not, see . */ ++ ++#ifndef TST_MALLOC_AUX_H ++#define TST_MALLOC_AUX_H ++ ++#include ++#include ++ ++static void *(*volatile aligned_alloc_indirect)(size_t, size_t) = aligned_alloc; ++static void *(*volatile calloc_indirect)(size_t, size_t) = calloc; ++static void *(*volatile malloc_indirect)(size_t) = malloc; ++static void *(*volatile realloc_indirect)(void*, size_t) = realloc; ++ ++#undef aligned_alloc ++#undef calloc ++#undef malloc ++#undef realloc ++ ++#define aligned_alloc aligned_alloc_indirect ++#define calloc calloc_indirect ++#define malloc malloc_indirect ++#define realloc realloc_indirect ++ ++#endif /* TST_MALLOC_AUX_H */ +diff --git a/malloc/tst-malloc-check.c b/malloc/tst-malloc-check.c +index fde8863ad7..cc88bff3b3 100644 +--- a/malloc/tst-malloc-check.c ++++ b/malloc/tst-malloc-check.c +@@ -20,6 +20,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + static int errors = 0; + + static void +diff --git a/malloc/tst-malloc-too-large.c b/malloc/tst-malloc-too-large.c +index 8e9e0d5fa2..2b91377e54 100644 +--- a/malloc/tst-malloc-too-large.c ++++ b/malloc/tst-malloc-too-large.c +@@ -43,6 +43,7 @@ + #include + #include + ++#include "tst-malloc-aux.h" + + /* This function prepares for each 'too-large memory allocation' test by + performing a small successful malloc/free and resetting errno prior to +diff --git a/malloc/tst-malloc.c b/malloc/tst-malloc.c +index f7a6e4654c..68af399022 100644 +--- a/malloc/tst-malloc.c ++++ b/malloc/tst-malloc.c +@@ -22,6 +22,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + static int errors = 0; + + static void +diff --git a/malloc/tst-realloc.c b/malloc/tst-realloc.c +index f50499ecb1..74a28fb45e 100644 +--- a/malloc/tst-realloc.c ++++ b/malloc/tst-realloc.c +@@ -23,6 +23,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + static int + do_test (void) + { +diff --git a/support/support.h b/support/support.h +index ba21ec9b5a..1a77f79793 100644 +--- a/support/support.h ++++ b/support/support.h +@@ -113,7 +113,7 @@ void *xposix_memalign (size_t alignment, size_t n) + __attribute_malloc__ __attribute_alloc_align__ ((1)) + __attribute_alloc_size__ ((2)) __attr_dealloc_free __returns_nonnull; + char *xasprintf (const char *format, ...) +- __attribute__ ((format (printf, 1, 2), malloc)) __attr_dealloc_free ++ __attribute__ ((format (printf, 1, 2), __malloc__)) __attr_dealloc_free + __returns_nonnull; + char *xstrdup (const char *) __attr_dealloc_free __returns_nonnull; + char *xstrndup (const char *, size_t) __attr_dealloc_free __returns_nonnull; +diff --git a/test-skeleton.c b/test-skeleton.c +index ae185a4f28..690f26e7cf 100644 +--- a/test-skeleton.c ++++ b/test-skeleton.c +@@ -27,7 +27,6 @@ + #include + #include + #include +-#include + #include + #include + #include + +commit 846e64257e5fc9b5b723c2eec2b7155ab5944d1f +Author: Adhemerval Zanella +Date: Fri Sep 13 11:10:05 2024 -0300 + + support: Make support_process_state_wait return the found state + + So caller can check which state was found if multiple ones are + asked. + + Checked on x86_64-linux-gnu. + + Reviewed-by: Florian Weimer + (cherry picked from commit 38316352e0f742f3a2b5816a61a4b603cb5573f8) + (cherry picked from commit 2e38c5a090b3a54040b6e508d42e5a76e492c6e8) + +diff --git a/support/process_state.h b/support/process_state.h +index 1cf902e91b..9541d8c343 100644 +--- a/support/process_state.h ++++ b/support/process_state.h +@@ -31,13 +31,16 @@ enum support_process_state + support_process_state_dead = 0x20, /* X (dead). */ + support_process_state_zombie = 0x40, /* Z (zombie). */ + support_process_state_parked = 0x80, /* P (parked). */ ++ support_process_state_invalid = 0x100 /* Invalid state. */ + }; + + /* Wait for process PID to reach state STATE. It can be a combination of + multiple possible states ('process_state_running | process_state_sleeping') + where the function return when any of these state are observed. + For an invalid state not represented by SUPPORT_PROCESS_STATE, it fallbacks +- to a 2 second sleep. */ +-void support_process_state_wait (pid_t pid, enum support_process_state state); ++ to a 2 second sleep. ++ Return the found process state. */ ++enum support_process_state ++support_process_state_wait (pid_t pid, enum support_process_state state); + + #endif +diff --git a/support/support_process_state.c b/support/support_process_state.c +index 062335234f..ae8e0a531c 100644 +--- a/support/support_process_state.c ++++ b/support/support_process_state.c +@@ -27,7 +27,7 @@ + #include + #include + +-void ++enum support_process_state + support_process_state_wait (pid_t pid, enum support_process_state state) + { + #ifdef __linux__ +@@ -75,7 +75,7 @@ support_process_state_wait (pid_t pid, enum support_process_state state) + { + free (line); + xfclose (fstatus); +- return; ++ return process_states[i].s; + } + + rewind (fstatus); +@@ -90,4 +90,6 @@ support_process_state_wait (pid_t pid, enum support_process_state state) + /* Fallback to nanosleep if an invalid state is found. */ + #endif + nanosleep (&(struct timespec) { 1, 0 }, NULL); ++ ++ return support_process_state_invalid; + } +diff --git a/support/tst-support-process_state.c b/support/tst-support-process_state.c +index d73269320f..4a88eae3a7 100644 +--- a/support/tst-support-process_state.c ++++ b/support/tst-support-process_state.c +@@ -68,28 +68,39 @@ do_test (void) + if (test_verbose) + printf ("info: waiting pid %d, state_stopped/state_tracing_stop\n", + (int) pid); +- support_process_state_wait (pid, stop_state); ++ { ++ enum support_process_state state = ++ support_process_state_wait (pid, stop_state); ++ TEST_VERIFY (state == support_process_state_stopped ++ || state == support_process_state_tracing_stop); ++ } + + if (kill (pid, SIGCONT) != 0) + FAIL_RET ("kill (%d, SIGCONT): %m\n", pid); + + if (test_verbose) + printf ("info: waiting pid %d, state_sleeping\n", (int) pid); +- support_process_state_wait (pid, support_process_state_sleeping); ++ TEST_COMPARE (support_process_state_wait (pid, ++ support_process_state_sleeping), ++ support_process_state_sleeping); + + if (kill (pid, SIGUSR1) != 0) + FAIL_RET ("kill (%d, SIGUSR1): %m\n", pid); + + if (test_verbose) + printf ("info: waiting pid %d, state_running\n", (int) pid); +- support_process_state_wait (pid, support_process_state_running); ++ TEST_COMPARE (support_process_state_wait (pid, ++ support_process_state_running), ++ support_process_state_running); + + if (kill (pid, SIGKILL) != 0) + FAIL_RET ("kill (%d, SIGKILL): %m\n", pid); + + if (test_verbose) + printf ("info: waiting pid %d, state_zombie\n", (int) pid); +- support_process_state_wait (pid, support_process_state_zombie); ++ TEST_COMPARE (support_process_state_wait (pid, ++ support_process_state_zombie), ++ support_process_state_zombie);; + + siginfo_t info; + int r = waitid (P_PID, pid, &info, WEXITED); + +commit 11d9f49cebe64939f50e16a59c9ebefb80a294ab +Author: Adhemerval Zanella +Date: Fri Sep 13 11:11:56 2024 -0300 + + sparc: Fix restartable syscalls (BZ 32173) + + The commit 'sparc: Use Linux kABI for syscall return' + (86c5d2cf0ce046279baddc7faa27da71f1a89fde) did not take into account + a subtle sparc syscall kABI constraint. For syscalls that might block + indefinitely, on an interrupt (like SIGCONT) the kernel will set the + instruction pointer to just before the syscall: + + arch/sparc/kernel/signal_64.c + 476 static void do_signal(struct pt_regs *regs, unsigned long orig_i0) + 477 { + [...] + 525 if (restart_syscall) { + 526 switch (regs->u_regs[UREG_I0]) { + 527 case ERESTARTNOHAND: + 528 case ERESTARTSYS: + 529 case ERESTARTNOINTR: + 530 /* replay the system call when we are done */ + 531 regs->u_regs[UREG_I0] = orig_i0; + 532 regs->tpc -= 4; + 533 regs->tnpc -= 4; + 534 pt_regs_clear_syscall(regs); + 535 fallthrough; + 536 case ERESTART_RESTARTBLOCK: + 537 regs->u_regs[UREG_G1] = __NR_restart_syscall; + 538 regs->tpc -= 4; + 539 regs->tnpc -= 4; + 540 pt_regs_clear_syscall(regs); + 541 } + + However, on a SIGCONT it seems that 'g1' register is being clobbered after the + syscall returns. Before 86c5d2cf0ce046279, the 'g1' was always placed jus + before the 'ta' instruction which then reloads the syscall number and restarts + the syscall. + + On master, where 'g1' might be placed before 'ta': + + $ cat test.c + #include + + int main () + { + pause (); + } + $ gcc test.c -o test + $ strace -f ./t + [...] + ppoll(NULL, 0, NULL, NULL, 0 + + On another terminal + + $ kill -STOP 2262828 + + $ strace -f ./t + [...] + --- SIGSTOP {si_signo=SIGSTOP, si_code=SI_USER, si_pid=2521813, si_uid=8289} --- + --- stopped by SIGSTOP --- + + And then + + $ kill -CONT 2262828 + + Results in: + + --- SIGCONT {si_signo=SIGCONT, si_code=SI_USER, si_pid=2521813, si_uid=8289} --- + restart_syscall(<... resuming interrupted ppoll ...>) = -1 EINTR (Interrupted system call) + + Where the expected behaviour would be: + + $ strace -f ./t + [...] + ppoll(NULL, 0, NULL, NULL, 0) = ? ERESTARTNOHAND (To be restarted if no handler) + --- SIGSTOP {si_signo=SIGSTOP, si_code=SI_USER, si_pid=2521813, si_uid=8289} --- + --- stopped by SIGSTOP --- + --- SIGCONT {si_signo=SIGCONT, si_code=SI_USER, si_pid=2521813, si_uid=8289} --- + ppoll(NULL, 0, NULL, NULL, 0 + + Just moving the 'g1' setting near the syscall asm is not suffice, + the compiler might optimize it away (as I saw on cancellation.c by + trying this fix). Instead, I have change the inline asm to put the + 'g1' setup in ithe asm block. This would require to change the asm + constraint for INTERNAL_SYSCALL_NCS, since the syscall number is not + constant. + + Checked on sparc64-linux-gnu. + + Reported-by: René Rebe + Tested-by: Sam James + Reviewed-by: Sam James + (cherry picked from commit 2c1903cbbac0022153a67776f474c221250ad6ed) + (cherry picked from commit 1cd7e13289b91e1495a1865c1f678196d1bb7be4) + +diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile +index 59998c7af4..34890ef69a 100644 +--- a/sysdeps/unix/sysv/linux/Makefile ++++ b/sysdeps/unix/sysv/linux/Makefile +@@ -227,6 +227,7 @@ tests += \ + tst-scm_rights \ + tst-sigtimedwait \ + tst-sync_file_range \ ++ tst-syscall-restart \ + tst-sysconf-iov_max \ + tst-sysvmsg-linux \ + tst-sysvsem-linux \ +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h +index d2d68f5312..c2ffbb5c8f 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h ++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h +@@ -107,6 +107,7 @@ ENTRY(name); \ + #else /* __ASSEMBLER__ */ + + #define __SYSCALL_STRING \ ++ "mov %[scn], %%g1;" \ + "ta 0x10;" \ + "bcc 1f;" \ + " nop;" \ +@@ -114,7 +115,7 @@ ENTRY(name); \ + "1:" + + #define __SYSCALL_CLOBBERS \ +- "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ ++ "g1", "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ + "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", \ + "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", \ + "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", \ +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h +index 96047424e9..5598fab08a 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h ++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h +@@ -106,6 +106,7 @@ ENTRY(name); \ + #else /* __ASSEMBLER__ */ + + #define __SYSCALL_STRING \ ++ "mov %[scn], %%g1;" \ + "ta 0x6d;" \ + "bcc,pt %%xcc, 1f;" \ + " nop;" \ +@@ -113,7 +114,7 @@ ENTRY(name); \ + "1:" + + #define __SYSCALL_CLOBBERS \ +- "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ ++ "g1", "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ + "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", \ + "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", \ + "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", \ +diff --git a/sysdeps/unix/sysv/linux/sparc/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sysdep.h +index dcabb57fe2..c287740a8c 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sysdep.h ++++ b/sysdeps/unix/sysv/linux/sparc/sysdep.h +@@ -50,97 +50,109 @@ + + #undef INTERNAL_SYSCALL_NCS + #define INTERNAL_SYSCALL_NCS(name, nr, args...) \ +- internal_syscall##nr(__SYSCALL_STRING, name, args) ++ _internal_syscall##nr(__SYSCALL_STRING, "p", name, args) + +-#define internal_syscall0(string,name,dummy...) \ ++#define _internal_syscall0(string,nc,name,dummy...) \ + ({ \ +- register long int __g1 __asm__ ("g1") = (name); \ + register long __o0 __asm__ ("o0"); \ ++ long int _name = (long int) (name); \ + __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1) : \ ++ [scn] nc (_name) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall0(string,name,args...) \ ++ _internal_syscall0(string, "i", name, args) + +-#define internal_syscall1(string,name,arg1) \ ++#define _internal_syscall1(string,nc,name,arg1) \ + ({ \ + long int _arg1 = (long int) (arg1); \ +- register long int __g1 __asm__("g1") = (name); \ ++ long int _name = (long int) (name); \ + register long int __o0 __asm__ ("o0") = _arg1; \ +- __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1), "0" (__o0) : \ ++ __asm __volatile (string : "+r" (__o0) : \ ++ [scn] nc (_name) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall1(string,name,args...) \ ++ _internal_syscall1(string, "i", name, args) + +-#define internal_syscall2(string,name,arg1,arg2) \ ++#define _internal_syscall2(string,nc,name,arg1,arg2) \ + ({ \ + long int _arg1 = (long int) (arg1); \ + long int _arg2 = (long int) (arg2); \ +- register long int __g1 __asm__("g1") = (name); \ ++ long int _name = (long int) (name); \ + register long int __o0 __asm__ ("o0") = _arg1; \ + register long int __o1 __asm__ ("o1") = _arg2; \ +- __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1), "0" (__o0), "r" (__o1) : \ ++ __asm __volatile (string : "+r" (__o0) : \ ++ [scn] nc (_name), "r" (__o1) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall2(string,name,args...) \ ++ _internal_syscall2(string, "i", name, args) + +-#define internal_syscall3(string,name,arg1,arg2,arg3) \ ++#define _internal_syscall3(string,nc,name,arg1,arg2,arg3) \ + ({ \ + long int _arg1 = (long int) (arg1); \ + long int _arg2 = (long int) (arg2); \ + long int _arg3 = (long int) (arg3); \ +- register long int __g1 __asm__("g1") = (name); \ ++ long int _name = (long int) (name); \ + register long int __o0 __asm__ ("o0") = _arg1; \ + register long int __o1 __asm__ ("o1") = _arg2; \ + register long int __o2 __asm__ ("o2") = _arg3; \ +- __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1), "0" (__o0), "r" (__o1), \ ++ __asm __volatile (string : "+r" (__o0) : \ ++ [scn] nc (_name), "r" (__o1), \ + "r" (__o2) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall3(string,name,args...) \ ++ _internal_syscall3(string, "i", name, args) + +-#define internal_syscall4(string,name,arg1,arg2,arg3,arg4) \ ++#define _internal_syscall4(string,nc,name,arg1,arg2,arg3,arg4) \ + ({ \ + long int _arg1 = (long int) (arg1); \ + long int _arg2 = (long int) (arg2); \ + long int _arg3 = (long int) (arg3); \ + long int _arg4 = (long int) (arg4); \ +- register long int __g1 __asm__("g1") = (name); \ ++ long int _name = (long int) (name); \ + register long int __o0 __asm__ ("o0") = _arg1; \ + register long int __o1 __asm__ ("o1") = _arg2; \ + register long int __o2 __asm__ ("o2") = _arg3; \ + register long int __o3 __asm__ ("o3") = _arg4; \ +- __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1), "0" (__o0), "r" (__o1), \ ++ __asm __volatile (string : "+r" (__o0) : \ ++ [scn] nc (_name), "r" (__o1), \ + "r" (__o2), "r" (__o3) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall4(string,name,args...) \ ++ _internal_syscall4(string, "i", name, args) + +-#define internal_syscall5(string,name,arg1,arg2,arg3,arg4,arg5) \ ++#define _internal_syscall5(string,nc,name,arg1,arg2,arg3,arg4,arg5) \ + ({ \ + long int _arg1 = (long int) (arg1); \ + long int _arg2 = (long int) (arg2); \ + long int _arg3 = (long int) (arg3); \ + long int _arg4 = (long int) (arg4); \ + long int _arg5 = (long int) (arg5); \ +- register long int __g1 __asm__("g1") = (name); \ ++ long int _name = (long int) (name); \ + register long int __o0 __asm__ ("o0") = _arg1; \ + register long int __o1 __asm__ ("o1") = _arg2; \ + register long int __o2 __asm__ ("o2") = _arg3; \ + register long int __o3 __asm__ ("o3") = _arg4; \ + register long int __o4 __asm__ ("o4") = _arg5; \ +- __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1), "0" (__o0), "r" (__o1), \ ++ __asm __volatile (string : "+r" (__o0) : \ ++ [scn] nc (_name), "r" (__o1), \ + "r" (__o2), "r" (__o3), "r" (__o4) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall5(string,name,args...) \ ++ _internal_syscall5(string, "i", name, args) + +-#define internal_syscall6(string,name,arg1,arg2,arg3,arg4,arg5,arg6) \ ++#define _internal_syscall6(string,nc,name,arg1,arg2,arg3,arg4,arg5,arg6)\ + ({ \ + long int _arg1 = (long int) (arg1); \ + long int _arg2 = (long int) (arg2); \ +@@ -148,20 +160,22 @@ + long int _arg4 = (long int) (arg4); \ + long int _arg5 = (long int) (arg5); \ + long int _arg6 = (long int) (arg6); \ +- register long int __g1 __asm__("g1") = (name); \ ++ long int _name = (long int) (name); \ + register long int __o0 __asm__ ("o0") = _arg1; \ + register long int __o1 __asm__ ("o1") = _arg2; \ + register long int __o2 __asm__ ("o2") = _arg3; \ + register long int __o3 __asm__ ("o3") = _arg4; \ + register long int __o4 __asm__ ("o4") = _arg5; \ + register long int __o5 __asm__ ("o5") = _arg6; \ +- __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1), "0" (__o0), "r" (__o1), \ ++ __asm __volatile (string : "+r" (__o0) : \ ++ [scn] nc (_name), "r" (__o1), \ + "r" (__o2), "r" (__o3), "r" (__o4), \ + "r" (__o5) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall6(string,name,args...) \ ++ _internal_syscall6(string, "i", name, args) + + #define INLINE_CLONE_SYSCALL(arg1,arg2,arg3,arg4,arg5) \ + ({ \ +@@ -170,15 +184,15 @@ + long int _arg3 = (long int) (arg3); \ + long int _arg4 = (long int) (arg4); \ + long int _arg5 = (long int) (arg5); \ ++ long int _name = __NR_clone; \ + register long int __o0 __asm__ ("o0") = _arg1; \ + register long int __o1 __asm__ ("o1") = _arg2; \ + register long int __o2 __asm__ ("o2") = _arg3; \ + register long int __o3 __asm__ ("o3") = _arg4; \ + register long int __o4 __asm__ ("o4") = _arg5; \ +- register long int __g1 __asm__ ("g1") = __NR_clone; \ + __asm __volatile (__SYSCALL_STRING : \ + "=r" (__o0), "=r" (__o1) : \ +- "r" (__g1), "0" (__o0), "1" (__o1), \ ++ [scn] "i" (_name), "0" (__o0), "1" (__o1), \ + "r" (__o2), "r" (__o3), "r" (__o4) : \ + __SYSCALL_CLOBBERS); \ + if (__glibc_unlikely ((unsigned long int) (__o0) > -4096UL)) \ +diff --git a/sysdeps/unix/sysv/linux/tst-syscall-restart.c b/sysdeps/unix/sysv/linux/tst-syscall-restart.c +new file mode 100644 +index 0000000000..84a8a41b5c +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/tst-syscall-restart.c +@@ -0,0 +1,112 @@ ++/* Test if a syscall is correctly restarted. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int ++check_pid (pid_t pid) ++{ ++ /* Wait until the child has called pause and it blocking on kernel. */ ++ support_process_state_wait (pid, support_process_state_sleeping); ++ ++ TEST_COMPARE (kill (pid, SIGSTOP), 0); ++ ++ /* Adding process_state_tracing_stop ('t') allows the test to work under ++ trace programs such as ptrace. */ ++ support_process_state_wait (pid, support_process_state_stopped ++ | support_process_state_tracing_stop); ++ ++ TEST_COMPARE (kill (pid, SIGCONT), 0); ++ ++ enum support_process_state state ++ = support_process_state_wait (pid, support_process_state_sleeping ++ | support_process_state_zombie); ++ ++ TEST_COMPARE (state, support_process_state_sleeping); ++ ++ TEST_COMPARE (kill (pid, SIGTERM), 0); ++ ++ siginfo_t info; ++ TEST_COMPARE (waitid (P_PID, pid, &info, WEXITED), 0); ++ TEST_COMPARE (info.si_signo, SIGCHLD); ++ TEST_COMPARE (info.si_code, CLD_KILLED); ++ TEST_COMPARE (info.si_status, SIGTERM); ++ TEST_COMPARE (info.si_pid, pid); ++ ++ return 0; ++} ++ ++static void * ++tf (void *) ++{ ++ pause (); ++ return NULL; ++} ++ ++static void ++child_mt (void) ++{ ++ /* Let only the created thread to handle signals. */ ++ sigset_t set; ++ sigfillset (&set); ++ xpthread_sigmask (SIG_BLOCK, &set, NULL); ++ ++ sigdelset (&set, SIGSTOP); ++ sigdelset (&set, SIGCONT); ++ sigdelset (&set, SIGTERM); ++ ++ pthread_attr_t attr; ++ xpthread_attr_init (&attr); ++ TEST_COMPARE (pthread_attr_setsigmask_np (&attr, &set), 0); ++ ++ xpthread_join (xpthread_create (&attr, tf, NULL)); ++} ++ ++static void ++do_test_syscall (bool multithread) ++{ ++ pid_t pid = xfork (); ++ if (pid == 0) ++ { ++ if (multithread) ++ child_mt (); ++ else ++ pause (); ++ _exit (127); ++ } ++ ++ check_pid (pid); ++} ++ ++static int ++do_test (void) ++{ ++ /* Check for both single and multi thread, since they use different syscall ++ mechanisms. */ ++ do_test_syscall (false); ++ do_test_syscall (true); ++ ++ return 0; ++} ++ ++#include + +commit 9af64ca64c532b7e42a40b48fe5e01726a9b7943 +Author: H.J. Lu +Date: Thu Dec 5 08:39:44 2024 +0800 + + math: Exclude internal math symbols for tests [BZ #32414] + + Since internal tests don't have access to internal symbols in libm, + exclude them for internal tests. Also make tst-strtod5 and tst-strtod5i + depend on $(libm) to support older versions of GCC which can't inline + copysign family functions. This fixes BZ #32414. + + Signed-off-by: H.J. Lu + Reviewed-by: Sunil K Pandey + (cherry picked from commit 5df09b444835fca6e64b3d4b4a5beb19b3b2ba21) + +diff --git a/include/math.h b/include/math.h +index fa11a710a6..035fd160ff 100644 +--- a/include/math.h ++++ b/include/math.h +@@ -130,7 +130,10 @@ fabsf128 (_Float128 x) + } + # endif + +-# if !(defined __FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) ++ ++/* NB: Internal tests don't have access to internal symbols. */ ++# if !IS_IN (testsuite_internal) \ ++ && !(defined __FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) + # ifndef NO_MATH_REDIRECT + /* Declare some functions for use within GLIBC. Compilers typically + inline those functions as a single instruction. Use an asm to +diff --git a/stdlib/Makefile b/stdlib/Makefile +index 8b0ac63ddb..8213fa83ef 100644 +--- a/stdlib/Makefile ++++ b/stdlib/Makefile +@@ -603,6 +603,8 @@ $(objpfx)bug-strtod2: $(libm) + $(objpfx)tst-strtod-round: $(libm) + $(objpfx)tst-tininess: $(libm) + $(objpfx)tst-strtod-underflow: $(libm) ++$(objpfx)tst-strtod5: $(libm) ++$(objpfx)tst-strtod5i: $(libm) + $(objpfx)tst-strtod6: $(libm) + $(objpfx)tst-strtod-nan-locale: $(libm) + $(objpfx)tst-strtod-nan-sign: $(libm) + +commit 0b39fe801208e805cc911f64a2fdd25d04b7151e +Author: Adhemerval Zanella +Date: Fri Oct 18 08:48:22 2024 -0300 + + linux: Fix tst-syscall-restart.c on old gcc (BZ 32283) + + To avoid a parameter name omitted error. + + (cherry picked from commit ab564362d0470d10947c24155ec048c4e14a009d) + +diff --git a/sysdeps/unix/sysv/linux/tst-syscall-restart.c b/sysdeps/unix/sysv/linux/tst-syscall-restart.c +index 84a8a41b5c..0ee7dc8517 100644 +--- a/sysdeps/unix/sysv/linux/tst-syscall-restart.c ++++ b/sysdeps/unix/sysv/linux/tst-syscall-restart.c +@@ -57,7 +57,7 @@ check_pid (pid_t pid) + } + + static void * +-tf (void *) ++tf (void *closure) + { + pause (); + return NULL; + +commit 94e4a8c7d68129075f1b494a0b26151a4f989b36 +Author: Florian Weimer +Date: Tue Dec 17 18:12:03 2024 +0100 + + x86: Avoid integer truncation with large cache sizes (bug 32470) + + Some hypervisors report 1 TiB L3 cache size. This results + in some variables incorrectly getting zeroed, causing crashes + in memcpy/memmove because invariants are violated. + + (cherry picked from commit 61c3450db96dce96ad2b24b4f0b548e6a46d68e5) + +diff --git a/NEWS b/NEWS +index bd0b3bd66a..97a1e1f5d4 100644 +--- a/NEWS ++++ b/NEWS +@@ -20,6 +20,7 @@ The following bugs are resolved with this release: + [32137] libio: Attempt wide backup free only for non-legacy code + [32231] elf: Change ldconfig auxcache magic number + [32245] glibc -Wstringop-overflow= build failure on hppa ++ [32470] x86: Avoid integer truncation with large cache sizes + + Version 2.40 + +diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h +index a1c03b8903..ac97414b5b 100644 +--- a/sysdeps/x86/dl-cacheinfo.h ++++ b/sysdeps/x86/dl-cacheinfo.h +@@ -961,11 +961,11 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + non_temporal_threshold = maximum_non_temporal_threshold; + + /* NB: The REP MOVSB threshold must be greater than VEC_SIZE * 8. */ +- unsigned int minimum_rep_movsb_threshold; ++ unsigned long int minimum_rep_movsb_threshold; + /* NB: The default REP MOVSB threshold is 4096 * (VEC_SIZE / 16) for + VEC_SIZE == 64 or 32. For VEC_SIZE == 16, the default REP MOVSB + threshold is 2048 * (VEC_SIZE / 16). */ +- unsigned int rep_movsb_threshold; ++ unsigned long int rep_movsb_threshold; + if (CPU_FEATURE_USABLE_P (cpu_features, AVX512F) + && !CPU_FEATURE_PREFERRED_P (cpu_features, Prefer_No_AVX512)) + { + +commit 9fbfbd924f718663d5303858f34d1f857c375093 +Author: John David Anglin +Date: Thu Dec 19 11:30:09 2024 -0500 + + hppa: Fix strace detach-vfork test + + This change implements vfork.S for direct support of the vfork + syscall. clone.S is revised to correct child support for the + vfork case. + + The main bug was creating a frame prior to the clone syscall. + This was done to allow the rp and r4 registers to be saved and + restored from the stack frame. r4 was used to save and restore + the PIC register, r19, across the system call and the call to + set errno. But in the vfork case, it is undefined behavior + for the child to return from the function in which vfork was + called. It is surprising that this usually worked. + + Syscalls on hppa save and restore rp and r19, so we don't need + to create a frame prior to the clone syscall. We only need a + frame when __syscall_error is called. We also don't need to + save and restore r19 around the call to $$dyncall as r19 is not + used in the code after $$dyncall. + + This considerably simplifies clone.S. + + Signed-off-by: John David Anglin + +diff --git a/sysdeps/unix/sysv/linux/hppa/clone.S b/sysdeps/unix/sysv/linux/hppa/clone.S +index a31afea429..c18163d0f7 100644 +--- a/sysdeps/unix/sysv/linux/hppa/clone.S ++++ b/sysdeps/unix/sysv/linux/hppa/clone.S +@@ -59,16 +59,6 @@ + + .text + ENTRY(__clone) +- /* Prologue */ +- stwm %r4, 64(%sp) +- .cfi_def_cfa_offset -64 +- .cfi_offset 4, 0 +- stw %sp, -4(%sp) +-#ifdef PIC +- stw %r19, -32(%sp) +- .cfi_offset 19, 32 +-#endif +- + /* Sanity check arguments. */ + comib,=,n 0,%arg0,.LerrorSanity /* no NULL function pointers */ + comib,=,n 0,%arg1,.LerrorSanity /* no NULL stack pointers */ +@@ -87,54 +77,34 @@ ENTRY(__clone) + /* User stack pointer is in the correct register already */ + + /* Load args from stack... */ +- ldw -116(%sp), %r24 /* Load parent_tidptr */ +- ldw -120(%sp), %r23 /* Load newtls */ +- ldw -124(%sp), %r22 /* Load child_tidptr */ +- +- /* Save the PIC register. */ +-#ifdef PIC +- copy %r19, %r4 /* parent */ +-#endif ++ ldw -52(%sp), %r24 /* Load parent_tidptr */ ++ ldw -56(%sp), %r23 /* Load newtls */ ++ ldw -60(%sp), %r22 /* Load child_tidptr */ + + /* Do the system call */ + ble 0x100(%sr2, %r0) + ldi __NR_clone, %r20 + + ldi -4096, %r1 +- comclr,>>= %r1, %ret0, %r0 /* Note: unsigned compare. */ +- b,n .LerrorRest +- +- /* Restore the PIC register. */ +-#ifdef PIC +- copy %r4, %r19 /* parent */ +-#endif +- ++ comb,<<,n %r1, %ret0, .LerrorRest /* Note: unsigned compare. */ + comib,=,n 0, %ret0, .LthreadStart +- +- /* Successful return from the parent +- No need to restore the PIC register, +- since we return immediately. */ +- +- ldw -84(%sp), %rp +- bv %r0(%rp) +- ldwm -64(%sp), %r4 ++ bv,n %r0(%rp) + + .LerrorRest: +- /* Something bad happened -- no child created */ ++ /* Something bad happened -- no child created -- need a frame */ ++ ldo 64(%sp),%sp ++ .cfi_def_cfa_offset -64 + bl __syscall_error, %rp + sub %r0, %ret0, %arg0 + ldw -84(%sp), %rp + /* Return after setting errno, ret0 is set to -1 by __syscall_error. */ + bv %r0(%rp) +- ldwm -64(%sp), %r4 ++ ldo -64(%sp), %sp + + .LerrorSanity: + /* Sanity checks failed, return -1, and set errno to EINVAL. */ +- bl __syscall_error, %rp +- ldi EINVAL, %arg0 +- ldw -84(%sp), %rp +- bv %r0(%rp) +- ldwm -64(%sp), %r4 ++ b .LerrorRest ++ ldi -EINVAL, %ret0 + + .LthreadStart: + /* Load up the arguments. */ +@@ -144,14 +114,8 @@ ENTRY(__clone) + /* $$dyncall fixes child's PIC register */ + + /* Call the user's function */ +-#ifdef PIC +- copy %r19, %r4 +-#endif + bl $$dyncall, %r31 + copy %r31, %rp +-#ifdef PIC +- copy %r4, %r19 +-#endif + copy %r28, %r26 + ble 0x100(%sr2, %r0) + ldi __NR_exit, %r20 +diff --git a/sysdeps/unix/sysv/linux/hppa/vfork.S b/sysdeps/unix/sysv/linux/hppa/vfork.S +new file mode 100644 +index 0000000000..5fd368f3cf +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/hppa/vfork.S +@@ -0,0 +1,53 @@ ++/* Copyright (C) 1999-2024 Free Software Foundation, Inc. ++ ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#define _ERRNO_H 1 ++#include ++ ++/* Clone the calling process, but without copying the whole address space. ++ The calling process is suspended until the new process exits or is ++ replaced by a call to `execve'. Return -1 for errors, 0 to the new process, ++ and the process ID of the new process to the old process. */ ++ ++ENTRY (__vfork) ++ ble 0x100(%sr2, %r0) ++ ldi __NR_vfork, %r20 ++ ++ ldi -4096, %r1 ++ comclr,<< %r1, %ret0, %r0 /* Note: unsigned compare. */ ++ bv,n %r0(%rp) ++ ++ /* Something bad happened -- no child created -- we need a frame */ ++ ldo 64(%sp), %sp ++ .cfi_def_cfa_offset -64 ++ ++ /* Set errno */ ++ bl __syscall_error, %rp ++ sub %r0, %ret0, %arg0 ++ ++ /* ret0 is set to -1 by __syscall_error */ ++ ldw -84(%sp), %rp ++ bv %r0(%rp) ++ ldo -64(%sp), %sp ++ ++PSEUDO_END (__vfork) ++libc_hidden_def (__vfork) ++ ++weak_alias (__vfork, vfork) ++strong_alias (__vfork, __libc_vfork) + +commit 7648e3c8e80b3f1b3b43506b2fbe370e4824ab97 +Author: John David Anglin +Date: Sun Dec 22 09:58:02 2024 -0500 + + hppa: Simplify handling of sanity check errors in clone.S. + + This simplifies the handling of sanity check errors in clone.S. + Adjusted a couple of comments to reflect current code. + + Signed-off-by: John David Anglin + +diff --git a/sysdeps/unix/sysv/linux/hppa/clone.S b/sysdeps/unix/sysv/linux/hppa/clone.S +index c18163d0f7..e85e7f517f 100644 +--- a/sysdeps/unix/sysv/linux/hppa/clone.S ++++ b/sysdeps/unix/sysv/linux/hppa/clone.S +@@ -90,6 +90,10 @@ ENTRY(__clone) + comib,=,n 0, %ret0, .LthreadStart + bv,n %r0(%rp) + ++.LerrorSanity: ++ /* Sanity checks failed, set errno to EINVAL. */ ++ ldi -EINVAL, %ret0 ++ + .LerrorRest: + /* Something bad happened -- no child created -- need a frame */ + ldo 64(%sp),%sp +@@ -101,11 +105,6 @@ ENTRY(__clone) + bv %r0(%rp) + ldo -64(%sp), %sp + +-.LerrorSanity: +- /* Sanity checks failed, return -1, and set errno to EINVAL. */ +- b .LerrorRest +- ldi -EINVAL, %ret0 +- + .LthreadStart: + /* Load up the arguments. */ + ldw -60(%sp), %arg0 +@@ -121,7 +120,7 @@ ENTRY(__clone) + ldi __NR_exit, %r20 + + /* We should not return from exit. +- We do not restore r4, or the stack state. */ ++ We do not restore the stack state. */ + iitlbp %r0, (%sr0, %r0) + + PSEUDO_END(__clone) + +commit 473597d8167f86afee3544215db108b170ec13c0 +Author: Andreas Schwab +Date: Wed Sep 25 11:49:30 2024 +0200 + + Fix missing randomness in __gen_tempname (bug 32214) + + Make sure to update the random value also if getrandom fails. + + Fixes: 686d542025 ("posix: Sync tempname with gnulib") + (cherry picked from commit 5f62cf88c4530c11904482775b7582bd7f6d80d2) + +diff --git a/NEWS b/NEWS +index 97a1e1f5d4..57feba81cd 100644 +--- a/NEWS ++++ b/NEWS +@@ -18,6 +18,7 @@ The following bugs are resolved with this release: + [32026] strerror/strsignal TLS not handled correctly for secondary namespaces + [32052] Name space violation in fortify wrappers + [32137] libio: Attempt wide backup free only for non-legacy code ++ [32214] Fix missing randomness in __gen_tempname + [32231] elf: Change ldconfig auxcache magic number + [32245] glibc -Wstringop-overflow= build failure on hppa + [32470] x86: Avoid integer truncation with large cache sizes +diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c +index c00fe0c181..fc30958a0c 100644 +--- a/sysdeps/posix/tempname.c ++++ b/sysdeps/posix/tempname.c +@@ -117,6 +117,8 @@ random_bits (random_value *r, random_value s) + succeed. */ + #if !_LIBC + *r = mix_random_values (v, clock ()); ++#else ++ *r = v; + #endif + return false; + } + +commit 7d4b6bcae91f29d7b4daf15bab06b66cf1d2217c +Author: Siddhesh Poyarekar +Date: Tue Jan 21 16:11:06 2025 -0500 + + Fix underallocation of abort_msg_s struct (CVE-2025-0395) + + Include the space needed to store the length of the message itself, in + addition to the message string. This resolves BZ #32582. + + Signed-off-by: Siddhesh Poyarekar + Reviewed: Adhemerval Zanella + (cherry picked from commit 68ee0f704cb81e9ad0a78c644a83e1e9cd2ee578) + +diff --git a/assert/assert.c b/assert/assert.c +index c29629f5f6..b6e37d694c 100644 +--- a/assert/assert.c ++++ b/assert/assert.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -65,7 +66,8 @@ __assert_fail_base (const char *fmt, const char *assertion, const char *file, + (void) __fxprintf (NULL, "%s", str); + (void) fflush (stderr); + +- total = (total + 1 + GLRO(dl_pagesize) - 1) & ~(GLRO(dl_pagesize) - 1); ++ total = ALIGN_UP (total + sizeof (struct abort_msg_s) + 1, ++ GLRO(dl_pagesize)); + struct abort_msg_s *buf = __mmap (NULL, total, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE, -1, 0); + if (__glibc_likely (buf != MAP_FAILED)) +diff --git a/sysdeps/posix/libc_fatal.c b/sysdeps/posix/libc_fatal.c +index f9e3425e04..089c47b04b 100644 +--- a/sysdeps/posix/libc_fatal.c ++++ b/sysdeps/posix/libc_fatal.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -105,7 +106,8 @@ __libc_message_impl (const char *fmt, ...) + { + WRITEV_FOR_FATAL (fd, iov, iovcnt, total); + +- total = (total + 1 + GLRO(dl_pagesize) - 1) & ~(GLRO(dl_pagesize) - 1); ++ total = ALIGN_UP (total + sizeof (struct abort_msg_s) + 1, ++ GLRO(dl_pagesize)); + struct abort_msg_s *buf = __mmap (NULL, total, + PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE, -1, 0); diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 4e2c245dddce..5117d420463b 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -50,7 +50,7 @@ let version = "2.40"; - patchSuffix = "-36"; + patchSuffix = "-66"; sha256 = "sha256-GaiQF16SY9dI9ieZPeb0sa+c0h4D8IDkv7Oh+sECBaI="; in @@ -68,8 +68,8 @@ stdenv.mkDerivation ( [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. - $ git fetch --all -p && git checkout origin/release/2.39/master && git describe - glibc-2.40-36-g7073164add + $ git fetch --all -p && git checkout origin/release/2.40/master && git describe + glibc-2.40-66-g7d4b6bcae9 $ git show --minimal --reverse glibc-2.40.. ':!ADVISORIES' > 2.40-master.patch To compare the archive contents zdiff can be used. From b2416f44850769715167c68a7e5d28d756dc23d6 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 23 Jan 2025 15:59:18 -0800 Subject: [PATCH 240/280] no-broken-symlinks: restrict checks to symlinks pointing inside the store --- doc/stdenv/stdenv.chapter.md | 4 ++++ .../setup-hooks/no-broken-symlinks.sh | 5 +++++ pkgs/test/stdenv/no-broken-symlinks.nix | 14 ++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 868a7543d9ad..ed29d8459c33 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1377,6 +1377,10 @@ This setup hook checks for, reports, and (by default) fails builds when "broken" This hook can be disabled by setting `dontCheckForBrokenSymlinks`. +::: {.note} +The hook only considers symlinks with targets inside the Nix store. +::: + ::: {.note} The check for reflexivity is direct and does not account for transitivity, so this hook will not prevent cycles in symlinks. ::: diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh index e4acaa1ec114..6609c08e8436 100644 --- a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -45,6 +45,11 @@ noBrokenSymlinks() { symlinkTarget="$(realpath --no-symlinks --canonicalize-missing "$pathParent/$symlinkTarget")" fi + if [[ $symlinkTarget != "$NIX_STORE"/* ]]; then + nixInfoLog "symlink $path points outside the Nix store; ignoring" + continue + fi + if [[ $path == "$symlinkTarget" ]]; then nixErrorLog "the symlink $path is reflexive $symlinkTarget" numReflexiveSymlinks+=1 diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix index 0eb0ef0f982e..dfc25745f471 100644 --- a/pkgs/test/stdenv/no-broken-symlinks.nix +++ b/pkgs/test/stdenv/no-broken-symlinks.nix @@ -22,6 +22,10 @@ let ln -s${if absolute then "r" else ""} "$out/valid" "$out/valid-symlink" ''; + mkValidSymlinkOutsideNixStore = absolute: '' + ln -s${if absolute then "r" else ""} "/etc/my_file" "$out/valid-symlink" + ''; + testBuilder = { name, @@ -188,4 +192,14 @@ in name = "pass-valid-symlink-absolute"; commands = [ (mkValidSymlink true) ]; }; + + pass-valid-symlink-outside-nix-store-relative = testBuilder { + name = "pass-valid-symlink-outside-nix-store-relative"; + commands = [ (mkValidSymlinkOutsideNixStore false) ]; + }; + + pass-valid-symlink-outside-nix-store-absolute = testBuilder { + name = "pass-valid-symlink-outside-nix-store-absolute"; + commands = [ (mkValidSymlinkOutsideNixStore true) ]; + }; } From c2df62d50e280933c9fbc88528a078e3baebfe7f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 18 Jan 2025 02:16:20 +0000 Subject: [PATCH 241/280] =?UTF-8?q?libsecret:=200.21.4=20=E2=86=92=200.21.?= =?UTF-8?q?6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libsecret/-/compare/0.21.4...0.21.6 --- pkgs/by-name/li/libsecret/package.nix | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/li/libsecret/package.nix b/pkgs/by-name/li/libsecret/package.nix index 95552812f508..f422de359ca2 100644 --- a/pkgs/by-name/li/libsecret/package.nix +++ b/pkgs/by-name/li/libsecret/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchurl, - fetchpatch2, glib, meson, ninja, @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.21.4"; + version = "0.21.6"; outputs = [ "out" @@ -37,18 +36,10 @@ stdenv.mkDerivation rec { ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-Fj0I14O+bUq5qXnOtaT+y8HZZg08NBaMWBMBzVORKyA="; + url = "mirror://gnome/sources/libsecret/${lib.versions.majorMinor version}/libsecret-${version}.tar.xz"; + hash = "sha256-dHuMF1vhCMiA0637nDU36mblIOStLcz13OWAA67soJA="; }; - patches = [ - # https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/141 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/libsecret/-/commit/208989323211c756dff690115e5cbde5ef7491ce.patch"; - hash = "sha256-DtRbqyyoMttEYf6B16m9O72Yjurv6rpbnqH7AlrAU4k="; - }) - ]; - depsBuildBuild = [ pkg-config ]; @@ -90,6 +81,7 @@ stdenv.mkDerivation rec { mesonFlags = [ (lib.mesonBool "introspection" withIntrospection) (lib.mesonBool "gtk_doc" withIntrospection) + (lib.mesonOption "bashcompdir" "share/bash-completion/completions") ]; doCheck = stdenv.hostPlatform.isLinux && withIntrospection; @@ -97,6 +89,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs ./tool/test-*.sh + + # dbus-run-session defaults to FHS path + substituteInPlace meson.build --replace-fail \ + "exe_wrapper: dbus_run_session," \ + "exe_wrapper: [dbus_run_session, '--config-file=${dbus}/share/dbus-1/session.conf']," ''; preCheck = '' @@ -112,9 +109,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - meson test --print-errorlogs --timeout-multiplier 0 + meson test --print-errorlogs --timeout-multiplier 0 runHook postCheck ''; @@ -131,7 +126,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libsecret"; # Does not seem to use the odd-unstable policy: https://gitlab.gnome.org/GNOME/libsecret/issues/30 versionPolicy = "none"; }; From a311406e18a5454d46db031c0155c14e8a28ff8f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 18 Jan 2025 02:15:27 +0000 Subject: [PATCH 242/280] =?UTF-8?q?gtk4:=204.16.7=20=E2=86=92=204.16.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.16.7...4.16.12 --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index a5129480ea13..c89cbce621a1 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.16.7"; + version = "4.16.12"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - hash = "sha256-UwPHYk4VpIiAWRud3UM4mvuj3k+5KiGXGVGbsWQs49w="; + hash = "sha256-7zG9vW8ILEQBY0ogyFCwBQyb8lLvHgeXZO6VoqDEyVo="; }; depsBuildBuild = [ From b59741c885d5ab95f7c981f61676acfb4c7623d0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 18 Jan 2025 02:13:21 +0000 Subject: [PATCH 243/280] =?UTF-8?q?at-spi2-core:=202.54.0=20=E2=86=92=202.?= =?UTF-8?q?54.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/at-spi2-core/-/compare/AT_SPI2_CORE_2_54_0...2.54.1 --- pkgs/by-name/at/at-spi2-core/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index 97486d5bd03f..761b2a5741f1 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.54.0"; + version = "2.54.1"; outputs = [ "out" @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { separateDebugInfo = true; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-1+7n51vt3MJyztwrYFNWAPOq5uSBWJ68Znr8Q3wKYHk="; + url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz"; + hash = "sha256-8HKeXIdl/rGWm7bB+6GK+iWCEmsDWap1oXP9oaz5PEw="; }; nativeBuildInputs = @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "at-spi2-core"; versionPolicy = "odd-unstable"; }; }; From 50c8d8ae5fba89357b0c73777c9d39bb2eeba099 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 18 Jan 2025 02:17:04 +0000 Subject: [PATCH 244/280] =?UTF-8?q?pango:=201.55.5=20=E2=86=92=201.56.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `documentation` feature started to depend on docutils, might as well enable man pages which share the dependency https://gitlab.gnome.org/GNOME/pango/-/commit/62b42d97f854f01b3c5a15c3d369090e4ba097cf https://gitlab.gnome.org/GNOME/pango/-/compare/1.55.5...1.56.0 https://gitlab.gnome.org/GNOME/pango/-/compare/1.56.0...1.56.1 --- pkgs/development/libraries/pango/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index e9ac9cc0d7e8..b79c697fa414 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -17,6 +17,7 @@ ninja, glib, python3, + docutils, x11Support ? !stdenv.hostPlatform.isDarwin, libXft, withIntrospection ? @@ -29,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pango"; - version = "1.55.5"; + version = "1.56.1"; outputs = [ "bin" @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/pango/${lib.versions.majorMinor finalAttrs.version}/pango-${finalAttrs.version}.tar.xz"; - hash = "sha256-45YSbqCCA8vY7xJjjmIi4uH9iqnKxnQwcv7cXy2CDdg="; + hash = "sha256-QmvmZGDJi4N4Vz5/awsqtFD2u20ux87MM66BF48kZIA="; }; depsBuildBuild = [ @@ -53,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { glib # for glib-mkenum pkg-config python3 + docutils # for rst2man, rst2html5 ] ++ lib.optionals withIntrospection [ gi-docgen @@ -87,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonBool "documentation" withIntrospection) + (lib.mesonBool "man-pages" true) (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "xft" x11Support) ]; From dc5c49ec45b5cec5142a1b666f85c7aa7bc7dd2d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 18 Jan 2025 02:17:07 +0000 Subject: [PATCH 245/280] =?UTF-8?q?pangomm=5F2=5F48:=202.54.0=20=E2=86=92?= =?UTF-8?q?=202.56.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pangomm/-/compare/2.54.0...2.56.1 --- pkgs/development/libraries/pangomm/2.48.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix index 748b961c6531..79d65cfab329 100644 --- a/pkgs/development/libraries/pangomm/2.48.nix +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version = "2.54.0"; + version = "2.56.1"; outputs = [ "out" @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-Slsf0bfEehr0UnfqgrWr6sqOCPsQon2qY5TPiNdOes8="; + url = "mirror://gnome/sources/pangomm/${lib.versions.majorMinor version}/pangomm-${version}.tar.xz"; + hash = "sha256-U59apg6b3GuVW7RI4qYswUVidE32kCWAQPu3S/iFdV0="; }; nativeBuildInputs = @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "${pname}_2_48"; + packageName = "pangomm"; + attrPath = "pangomm_2_48"; versionPolicy = "odd-unstable"; }; }; From b1031483d5ec2415950e80365f8ffa39422a51d4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 18 Jan 2025 02:14:01 +0000 Subject: [PATCH 246/280] =?UTF-8?q?glib-networking:=202.80.0=20=E2=86=92?= =?UTF-8?q?=202.80.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib-networking/-/compare/2.80.0...2.80.1 --- pkgs/by-name/gl/glib-networking/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gl/glib-networking/package.nix b/pkgs/by-name/gl/glib-networking/package.nix index 7aa64f0b0acf..3a05bbc47a20 100644 --- a/pkgs/by-name/gl/glib-networking/package.nix +++ b/pkgs/by-name/gl/glib-networking/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.80.0"; + version = "2.80.1"; outputs = [ "out" @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-2PTxqrITF5rjNRYXtZ2rXea8yeeFAh7uF4mY69S7Os8="; + url = "mirror://gnome/sources/glib-networking/${lib.versions.majorMinor version}/glib-networking-${version}.tar.xz"; + hash = "sha256-uA4odBV81VBx8bZxD6C5EdWsXeEGqe4qTJx77mF4L44="; }; patches = [ @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "glib-networking"; versionPolicy = "odd-unstable"; }; From 7d06938916ccf9c0db09a7733746efed2c3328bb Mon Sep 17 00:00:00 2001 From: Sander Date: Fri, 24 Jan 2025 13:07:15 +0000 Subject: [PATCH 247/280] curl: fix line endings in patched test 2005 --- .../curlMinimal/fix-password-only-netrc.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch b/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch index fced57221dc9..c0a442cc8f69 100644 --- a/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch +++ b/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch @@ -23,7 +23,7 @@ Closes #15768 create mode 100644 tests/data/test2005 diff --git a/lib/netrc.c b/lib/netrc.c -index cbc86484f6f..b517c1dfab6 100644 +index cbc86484f6f8..b517c1dfab67 100644 --- a/lib/netrc.c +++ b/lib/netrc.c @@ -267,7 +267,8 @@ static int parsenetrc(struct store_netrc *store, @@ -48,7 +48,7 @@ index cbc86484f6f..b517c1dfab6 100644 keyword = NONE; found = 0; diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am -index bd9a0bbaaff..105108309d5 100644 +index bd9a0bbaaff1..105108309d52 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -238,7 +238,7 @@ test1941 test1942 test1943 test1944 test1945 test1946 test1947 test1948 \ @@ -62,7 +62,7 @@ index bd9a0bbaaff..105108309d5 100644 test2024 test2025 test2026 test2027 test2028 test2029 test2030 test2031 \ diff --git a/tests/data/test2005 b/tests/data/test2005 new file mode 100644 -index 00000000000..91e256298a4 +index 000000000000..91e256298a40 --- /dev/null +++ b/tests/data/test2005 @@ -0,0 +1,55 @@ @@ -112,12 +112,12 @@ index 00000000000..91e256298a4 +# Verify data after the test has been "shot" + + -+GET / HTTP/1.1 -+Host: %HOSTIP:%HTTPPORT -+Authorization: Basic %b64[:5up3r53cr37]b64% -+User-Agent: curl/%VERSION -+Accept: */* -+ ++GET / HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic %b64[:5up3r53cr37]b64% ++User-Agent: curl/%VERSION ++Accept: */* ++ + + + From d175d8a4c55ce11c61e70f6d0d0458e7801441c8 Mon Sep 17 00:00:00 2001 From: Patryk Sondej Date: Wed, 22 Jan 2025 14:16:32 +0100 Subject: [PATCH 248/280] llvmPackages.tblgen: add missing lldb-tblgen --- pkgs/development/compilers/llvm/common/tblgen.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/tblgen.nix b/pkgs/development/compilers/llvm/common/tblgen.nix index 49cbcb0af2ca..3ff4fbdb5624 100644 --- a/pkgs/development/compilers/llvm/common/tblgen.nix +++ b/pkgs/development/compilers/llvm/common/tblgen.nix @@ -50,6 +50,7 @@ let cp -r ${monorepoSrc}/clang "$out" cp -r ${monorepoSrc}/clang-tools-extra "$out" cp -r ${monorepoSrc}/mlir "$out" + cp -r ${monorepoSrc}/lldb "$out" '' ) else @@ -86,6 +87,7 @@ let "llvm" "clang" "clang-tools-extra" + "lldb" ] ++ lib.optionals (lib.versionAtLeast release_version "16") [ "mlir" @@ -99,6 +101,7 @@ let [ "clang-tblgen" "llvm-tblgen" + "lldb-tblgen" ] ++ lib.optionals (lib.versionAtLeast release_version "15") [ "clang-tidy-confusable-chars-gen" @@ -114,6 +117,10 @@ let installPhase = '' mkdir -p $out + + # Remove useless files + rm -f bin/{lldb-dotest,lldb-repro,llvm-lit,update_core_linalg_named_ops.sh} + cp -ar bin $out/bin ''; }); From 1166b63c1d53a10322266ddbca000735ee0e90af Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 24 Jan 2025 16:29:48 +0000 Subject: [PATCH 249/280] test.stdenv.hooks.no-broken-symlinks: correct inverted absolute path option --- pkgs/test/stdenv/no-broken-symlinks.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix index dfc25745f471..9c8ea72a2c7d 100644 --- a/pkgs/test/stdenv/no-broken-symlinks.nix +++ b/pkgs/test/stdenv/no-broken-symlinks.nix @@ -5,25 +5,25 @@ }: let - inherit (lib.strings) concatStringsSep; + inherit (lib.strings) concatStringsSep optionalString; inherit (pkgs) runCommand; inherit (pkgs.testers) testBuildFailure; mkDanglingSymlink = absolute: '' - ln -s${if absolute then "r" else ""} "$out/dangling" "$out/dangling-symlink" + ln -s${optionalString (!absolute) "r"} "$out/dangling" "$out/dangling-symlink" ''; mkReflexiveSymlink = absolute: '' - ln -s${if absolute then "r" else ""} "$out/reflexive-symlink" "$out/reflexive-symlink" + ln -s${optionalString (!absolute) "r"} "$out/reflexive-symlink" "$out/reflexive-symlink" ''; mkValidSymlink = absolute: '' touch "$out/valid" - ln -s${if absolute then "r" else ""} "$out/valid" "$out/valid-symlink" + ln -s${optionalString (!absolute) "r"} "$out/valid" "$out/valid-symlink" ''; mkValidSymlinkOutsideNixStore = absolute: '' - ln -s${if absolute then "r" else ""} "/etc/my_file" "$out/valid-symlink" + ln -s${optionalString (!absolute) "r"} "/etc/my_file" "$out/valid-symlink" ''; testBuilder = From 9ac23506d5562f37733a26f7c534f770a1c2bc81 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 11 Jan 2025 18:57:29 -0700 Subject: [PATCH 250/280] libgit2: 1.8.4 -> 1.9.0 --- pkgs/development/libraries/libgit2/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 72c52ea899eb..354424444f65 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgit2"; - version = "1.8.4"; + version = "1.9.0"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib outputs = ["lib" "dev" "out"]; @@ -31,12 +31,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "libgit2"; repo = "libgit2"; rev = "v${finalAttrs.version}"; - hash = "sha256-AVhDq9nC2ccwFYJmejr0hmnyV4AxZLamuHktYPlkzUs="; + hash = "sha256-v32yGMo5oFEl6HUdg8czCsCLDL+sy9PPT0AEWmKxUhk="; }; cmakeFlags = [ "-DREGEX_BACKEND=pcre2" - "-DUSE_HTTP_PARSER=system" + "-DUSE_HTTP_PARSER=llhttp" "-DUSE_SSH=ON" (lib.cmakeBool "USE_GSSAPI" withGssapi) "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}" @@ -44,6 +44,9 @@ stdenv.mkDerivation (finalAttrs: { "-DDLLTOOL=${stdenv.cc.bintools.targetPrefix}dlltool" # For ws2_32, refered to by a `*.pc` file "-DCMAKE_LIBRARY_PATH=${stdenv.cc.libc}/lib" + ] ++ lib.optionals stdenv.hostPlatform.isOpenBSD [ + # openbsd headers fail with default c90 + "-DCMAKE_C_STANDARD=99" ]; nativeBuildInputs = [ cmake python3 pkg-config ]; From 396775bc8df7d6c9043009438928e6aa53b47d69 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 11 Jan 2025 18:58:08 -0700 Subject: [PATCH 251/280] python3Packages.pygit2: 1.16.0 -> 1.17.0 --- .../python-modules/pygit2/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 9f0e68834fc1..30630b83e3b4 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -6,7 +6,6 @@ cached-property, cffi, fetchPypi, - fetchpatch, isPyPy, libgit2, pycparser, @@ -17,29 +16,16 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.16.0"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-eymmeWuqFfyJ1EOsjVF3VBHZseWwbcQNRYxWyFdrSKI="; + hash = "sha256-+ivAULLC0+c7VNbVQceSF4Vho0TwfkCfUy1buXrHuJQ="; }; - patches = [ - # fix for GCC 14 - (fetchpatch { - url = "https://github.com/libgit2/pygit2/commit/eba710e45bb40e18641c6531394bb46631e7f295.patch"; - hash = "sha256-GFFzGVd/9+AcwicwOtBghhonijMp08svXTUZ/4/LmtI="; - }) - # temp fix for Python 3.13 until next release after 1.16.0 - (fetchpatch { - url = "https://github.com/libgit2/pygit2/commit/7f143e1c5beec01ec3429aa4db12435ac02977d3.patch"; - hash = "sha256-2SiFFPWVVo9urKRu64AejjTZMoXo2r+v1OwEIF+AzNo="; - }) - ]; - preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; From dbb5895438288b947d3989b5eb1563d0efc4c4df Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 22 Jan 2025 04:07:42 +0000 Subject: [PATCH 252/280] libgit2-glib: add patch for libgit2 1.9.0 --- .../li/libgit2-glib/libgit2-1.9.0.patch | 153 ++++++++++++++++++ pkgs/by-name/li/libgit2-glib/package.nix | 10 +- 2 files changed, 157 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/li/libgit2-glib/libgit2-1.9.0.patch diff --git a/pkgs/by-name/li/libgit2-glib/libgit2-1.9.0.patch b/pkgs/by-name/li/libgit2-glib/libgit2-1.9.0.patch new file mode 100644 index 000000000000..e4d8f8f1915a --- /dev/null +++ b/pkgs/by-name/li/libgit2-glib/libgit2-1.9.0.patch @@ -0,0 +1,153 @@ +From 46bad01581bca5bc64f6499eb1222ff067721a63 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Fri, 5 Apr 2024 10:28:16 +0200 +Subject: [PATCH 1/2] build: Fix build against, and require, libgit2 1.8.0 + +--- + libgit2-glib/ggit-clone-options.c | 1 + + libgit2-glib/ggit-cred-ssh-interactive.c | 2 +- + libgit2-glib/ggit-remote-callbacks.h | 1 + + libgit2-glib/ggit-repository.c | 4 ++-- + libgit2-glib/ggit-types.h | 3 ++- + meson.build | 2 +- + 6 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/libgit2-glib/ggit-clone-options.c b/libgit2-glib/ggit-clone-options.c +index b47fdb1..30c7d86 100644 +--- a/libgit2-glib/ggit-clone-options.c ++++ b/libgit2-glib/ggit-clone-options.c +@@ -19,6 +19,7 @@ + */ + + #include ++#include + #include + + #include "ggit-clone-options.h" +diff --git a/libgit2-glib/ggit-cred-ssh-interactive.c b/libgit2-glib/ggit-cred-ssh-interactive.c +index 4f60f8b..0bdca95 100644 +--- a/libgit2-glib/ggit-cred-ssh-interactive.c ++++ b/libgit2-glib/ggit-cred-ssh-interactive.c +@@ -191,7 +191,7 @@ callback_wrapper (const char *name, + { + gchar *text; + +- text = g_strndup (prompts[i].text, prompts[i].length); ++ text = g_strndup ((const gchar *)prompts[i].text, prompts[i].length); + + wprompts[i] = ggit_cred_ssh_interactive_prompt_new (wname, + winstruction, +diff --git a/libgit2-glib/ggit-remote-callbacks.h b/libgit2-glib/ggit-remote-callbacks.h +index 3005ff4..2340712 100644 +--- a/libgit2-glib/ggit-remote-callbacks.h ++++ b/libgit2-glib/ggit-remote-callbacks.h +@@ -24,6 +24,7 @@ + + #include + #include ++#include + #include + + G_BEGIN_DECLS +diff --git a/libgit2-glib/ggit-repository.c b/libgit2-glib/ggit-repository.c +index bf099f6..936c6fc 100644 +--- a/libgit2-glib/ggit-repository.c ++++ b/libgit2-glib/ggit-repository.c +@@ -3182,7 +3182,7 @@ ggit_repository_create_commit (GgitRepository *repository, + message, + _ggit_native_get (tree), + parent_count, +- (const git_commit **)parents_native); ++ (gpointer)parents_native); + + g_free (parents_native); + +@@ -3323,7 +3323,7 @@ ggit_repository_create_commit_buffer(GgitRepository *repository, + message, + _ggit_tree_get_tree (tree), + parent_count, +- (git_commit const **)parents_native); ++ (gpointer)parents_native); + + g_free (parents_native); + +diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h +index 7e28975..2a2ed99 100644 +--- a/libgit2-glib/ggit-types.h ++++ b/libgit2-glib/ggit-types.h +@@ -355,7 +355,8 @@ typedef enum + GGIT_CONFIG_LEVEL_XDG = 3, + GGIT_CONFIG_LEVEL_GLOBAL = 4, + GGIT_CONFIG_LEVEL_LOCAL = 5, +- GGIT_CONFIG_LEVEL_APP = 6, ++ GGIT_CONFIG_LEVEL_WORKTREE = 6, ++ GGIT_CONFIG_LEVEL_APP = 7, + GGIT_CONFIG_LEVEL_HIGHEST = -1 + } GgitConfigLevel; + +diff --git a/meson.build b/meson.build +index e54a8b4..c21107d 100644 +--- a/meson.build ++++ b/meson.build +@@ -126,7 +126,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib_req) + gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req) + gio_dep = dependency('gio-2.0', version: '>=' + glib_req) + +-libgit2_dep = dependency('libgit2', version: '>= 0.25.0') ++libgit2_dep = dependency('libgit2', version: '>= 1.8.0') + + # XXX: Not nice, but probably our best option + enable_gir = get_option('introspection') and find_program('g-ir-scanner', required: false).found() +-- +GitLab + + +From 93685d4297e425af67ac6888d6b66dfbcd4b95c8 Mon Sep 17 00:00:00 2001 +From: Rui Chen +Date: Mon, 13 Jan 2025 21:23:50 -0500 +Subject: [PATCH 2/2] chore: support libgit2 1.9 + +Signed-off-by: Rui Chen +--- + libgit2-glib/ggit-types.h | 4 ++-- + meson.build | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h +index 2a2ed99..184c3e6 100644 +--- a/libgit2-glib/ggit-types.h ++++ b/libgit2-glib/ggit-types.h +@@ -990,8 +990,7 @@ typedef enum + + typedef enum + { +- GGIT_CHECKOUT_NONE = 0, +- GGIT_CHECKOUT_SAFE = (1u << 0), ++ GGIT_CHECKOUT_SAFE = 0, + GGIT_CHECKOUT_FORCE = (1u << 1), + GGIT_CHECKOUT_RECREATE_MISSING = (1u << 2), + GGIT_CHECKOUT_ALLOW_CONFLICTS = (1u << 4), +@@ -1010,6 +1009,7 @@ typedef enum + GGIT_CHECKOUT_CONFLICT_STYLE_DIFF3 = (1u << 21), + GGIT_CHECKOUT_DONT_REMOVE_EXISTING = (1u << 22), + GGIT_CHECKOUT_DONT_WRITE_INDEX = (1u << 23), ++ GGIT_CHECKOUT_NONE = (1u << 30), + GGIT_CHECKOUT_UPDATE_SUBMODULES = (1u << 16), + GGIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED = (1u << 17) + } GgitCheckoutStrategy; +diff --git a/meson.build b/meson.build +index c21107d..9cd26f8 100644 +--- a/meson.build ++++ b/meson.build +@@ -126,7 +126,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib_req) + gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req) + gio_dep = dependency('gio-2.0', version: '>=' + glib_req) + +-libgit2_dep = dependency('libgit2', version: '>= 1.8.0') ++libgit2_dep = dependency('libgit2', version: '>= 1.9.0') + + # XXX: Not nice, but probably our best option + enable_gir = get_option('introspection') and find_program('g-ir-scanner', required: false).found() +-- +GitLab + diff --git a/pkgs/by-name/li/libgit2-glib/package.nix b/pkgs/by-name/li/libgit2-glib/package.nix index aad8fec365cd..0cf43dd93429 100644 --- a/pkgs/by-name/li/libgit2-glib/package.nix +++ b/pkgs/by-name/li/libgit2-glib/package.nix @@ -33,12 +33,10 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { - name = "support-libgit2-1.8.patch"; - # https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40 - url = "https://gitlab.gnome.org/GNOME/libgit2-glib/-/commit/a76fdf96c3af9ce9d21a3985c4be8a1aa6eea661.patch"; - hash = "sha256-ysU8pAixyftensfEC9bE0RUFMPMei0jYT26WKN5uOFE="; - }) + # See: + # * + # * + ./libgit2-1.9.0.patch ]; nativeBuildInputs = [ From 8d1b72de7e150e4acbcca0da4faed3ec4140f50e Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 21 Jan 2025 17:38:33 +0000 Subject: [PATCH 253/280] =?UTF-8?q?libgit2:=20add=20upstream=20patch=20for?= =?UTF-8?q?=20case=E2=80=90sensitive=20build=20directories?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libgit2/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 354424444f65..e38522173160 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , python3 @@ -34,6 +35,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-v32yGMo5oFEl6HUdg8czCsCLDL+sy9PPT0AEWmKxUhk="; }; + patches = [ + (fetchpatch { + name = "libgit2-darwin-case-sensitive-build.patch"; + url = "https://github.com/libgit2/libgit2/commit/1b348a31349e847b1d8548281aa92f26b9783f2f.patch"; + hash = "sha256-CBaUuEr3nPdUuOdyJtmPgyqR0MNnVyOFYbYXF3ncupU="; + }) + ]; + cmakeFlags = [ "-DREGEX_BACKEND=pcre2" "-DUSE_HTTP_PARSER=llhttp" From 5a47d957a54c8fd8758169a939a9ff35bb24888f Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 21 Jan 2025 16:50:27 +0000 Subject: [PATCH 254/280] nixVersions.{nix_2_25,git}: remove obsolete `libgit2` patches --- pkgs/tools/package-management/nix/default.nix | 24 - .../libgit2-mempack-thin-packfile.patch | 282 ------ ...2-packbuilder-callback-interruptible.patch | 930 ------------------ 3 files changed, 1236 deletions(-) delete mode 100644 pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch delete mode 100644 pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5abbfb440ca2..d44115464f36 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -8,7 +8,6 @@ , fetchFromGitHub , fetchpatch2 , runCommand -, buildPackages , Security , storeDir ? "/nix/store" @@ -85,28 +84,6 @@ let requiredSystemFeatures = [ ]; }; - libgit2-thin-packfile = libgit2.overrideAttrs (args: { - nativeBuildInputs = args.nativeBuildInputs or [] - # gitMinimal does not build on Windows. See packbuilder patch. - ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ - # Needed for `git apply`; see `prePatch` - buildPackages.gitMinimal - ]; - # Only `git apply` can handle git binary patches - prePatch = args.prePatch or "" - + lib.optionalString (!stdenv.hostPlatform.isWindows) '' - patch() { - git apply - } - ''; - # taken from https://github.com/NixOS/nix/tree/master/packaging/patches - patches = (args.patches or []) ++ [ - ./patches/libgit2-mempack-thin-packfile.patch - ] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ - ./patches/libgit2-packbuilder-callback-interruptible.patch - ]; - }); - common = args: callPackage (import ./common.nix ({ inherit lib fetchFromGitHub; } // args)) @@ -114,7 +91,6 @@ let inherit Security storeDir stateDir confDir; boehmgc = boehmgc-nix; aws-sdk-cpp = if lib.versionAtLeast args.version "2.12pre" then aws-sdk-cpp-nix else aws-sdk-cpp-old-nix; - libgit2 = if lib.versionAtLeast args.version "2.25.0" then libgit2-thin-packfile else libgit2; }; # https://github.com/NixOS/nix/pull/7585 diff --git a/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch b/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch deleted file mode 100644 index fb74b1683136..000000000000 --- a/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch +++ /dev/null @@ -1,282 +0,0 @@ -commit 9bacade4a3ef4b6b26e2c02f549eef0e9eb9eaa2 -Author: Robert Hensing -Date: Sun Aug 18 20:20:36 2024 +0200 - - Add unoptimized git_mempack_write_thin_pack - -diff --git a/include/git2/sys/mempack.h b/include/git2/sys/mempack.h -index 17da590a3..3688bdd50 100644 ---- a/include/git2/sys/mempack.h -+++ b/include/git2/sys/mempack.h -@@ -44,6 +44,29 @@ GIT_BEGIN_DECL - */ - GIT_EXTERN(int) git_mempack_new(git_odb_backend **out); - -+/** -+ * Write a thin packfile with the objects in the memory store. -+ * -+ * A thin packfile is a packfile that does not contain its transitive closure of -+ * references. This is useful for efficiently distributing additions to a -+ * repository over the network, but also finds use in the efficient bulk -+ * addition of objects to a repository, locally. -+ * -+ * This operation performs the (shallow) insert operations into the -+ * `git_packbuilder`, but does not write the packfile to disk; -+ * see `git_packbuilder_write_buf`. -+ * -+ * It also does not reset the memory store; see `git_mempack_reset`. -+ * -+ * @note This function may or may not write trees and blobs that are not -+ * referenced by commits. Currently everything is written, but this -+ * behavior may change in the future as the packer is optimized. -+ * -+ * @param backend The mempack backend -+ * @param pb The packbuilder to use to write the packfile -+ */ -+GIT_EXTERN(int) git_mempack_write_thin_pack(git_odb_backend *backend, git_packbuilder *pb); -+ - /** - * Dump all the queued in-memory writes to a packfile. - * -diff --git a/src/libgit2/odb_mempack.c b/src/libgit2/odb_mempack.c -index 6f27f45f8..0b61e2b66 100644 ---- a/src/libgit2/odb_mempack.c -+++ b/src/libgit2/odb_mempack.c -@@ -132,6 +132,35 @@ cleanup: - return err; - } - -+int git_mempack_write_thin_pack(git_odb_backend *backend, git_packbuilder *pb) -+{ -+ struct memory_packer_db *db = (struct memory_packer_db *)backend; -+ const git_oid *oid; -+ size_t iter = 0; -+ int err = -1; -+ -+ /* TODO: Implement the recency heuristics. -+ For this it probably makes sense to only write what's referenced -+ through commits, an option I've carved out for you in the docs. -+ wrt heuristics: ask your favorite LLM to translate https://git-scm.com/docs/pack-heuristics/en -+ to actual normal reference documentation. */ -+ while (true) { -+ err = git_oidmap_iterate(NULL, db->objects, &iter, &oid); -+ if (err == GIT_ITEROVER) { -+ err = 0; -+ break; -+ } -+ if (err != 0) -+ return err; -+ -+ err = git_packbuilder_insert(pb, oid, NULL); -+ if (err != 0) -+ return err; -+ } -+ -+ return 0; -+} -+ - int git_mempack_dump( - git_buf *pack, - git_repository *repo, -diff --git a/tests/libgit2/mempack/thinpack.c b/tests/libgit2/mempack/thinpack.c -new file mode 100644 -index 000000000..604a4dda2 ---- /dev/null -+++ b/tests/libgit2/mempack/thinpack.c -@@ -0,0 +1,196 @@ -+#include "clar_libgit2.h" -+#include "git2/indexer.h" -+#include "git2/odb_backend.h" -+#include "git2/tree.h" -+#include "git2/types.h" -+#include "git2/sys/mempack.h" -+#include "git2/sys/odb_backend.h" -+#include "util.h" -+ -+static git_repository *_repo; -+static git_odb_backend * _mempack_backend; -+ -+void test_mempack_thinpack__initialize(void) -+{ -+ git_odb *odb; -+ -+ _repo = cl_git_sandbox_init_new("mempack_thinpack_repo"); -+ -+ cl_git_pass(git_mempack_new(&_mempack_backend)); -+ cl_git_pass(git_repository_odb(&odb, _repo)); -+ cl_git_pass(git_odb_add_backend(odb, _mempack_backend, 999)); -+ git_odb_free(odb); -+} -+ -+void _mempack_thinpack__cleanup(void) -+{ -+ cl_git_sandbox_cleanup(); -+} -+ -+/* -+ Generating a packfile for an unchanged repo works and produces an empty packfile. -+ Even if we allow this scenario to be detected, it shouldn't misbehave if the -+ application is unaware of it. -+*/ -+void test_mempack_thinpack__empty(void) -+{ -+ git_packbuilder *pb; -+ int version; -+ int n; -+ git_buf buf = GIT_BUF_INIT; -+ -+ git_packbuilder_new(&pb, _repo); -+ -+ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); -+ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); -+ cl_assert_in_range(12, buf.size, 1024 /* empty packfile is >0 bytes, but certainly not that big */); -+ cl_assert(buf.ptr[0] == 'P'); -+ cl_assert(buf.ptr[1] == 'A'); -+ cl_assert(buf.ptr[2] == 'C'); -+ cl_assert(buf.ptr[3] == 'K'); -+ version = (buf.ptr[4] << 24) | (buf.ptr[5] << 16) | (buf.ptr[6] << 8) | buf.ptr[7]; -+ /* Subject to change. https://git-scm.com/docs/pack-format: Git currently accepts version number 2 or 3 but generates version 2 only.*/ -+ cl_assert_equal_i(2, version); -+ n = (buf.ptr[8] << 24) | (buf.ptr[9] << 16) | (buf.ptr[10] << 8) | buf.ptr[11]; -+ cl_assert_equal_i(0, n); -+ git_buf_dispose(&buf); -+ -+ git_packbuilder_free(pb); -+} -+ -+#define LIT_LEN(x) x, sizeof(x) - 1 -+ -+/* -+ Check that git_mempack_write_thin_pack produces a thin packfile. -+*/ -+void test_mempack_thinpack__thin(void) -+{ -+ /* Outline: -+ - Create tree 1 -+ - Flush to packfile A -+ - Create tree 2 -+ - Flush to packfile B -+ -+ Tree 2 has a new blob and a reference to a blob from tree 1. -+ -+ Expectation: -+ - Packfile B is thin and does not contain the objects from packfile A -+ */ -+ -+ -+ git_oid oid_blob_1; -+ git_oid oid_blob_2; -+ git_oid oid_blob_3; -+ git_oid oid_tree_1; -+ git_oid oid_tree_2; -+ git_treebuilder *tb; -+ -+ git_packbuilder *pb; -+ git_buf buf = GIT_BUF_INIT; -+ git_indexer *indexer; -+ git_indexer_progress stats; -+ char pack_dir_path[1024]; -+ -+ char sbuf[1024]; -+ const char * repo_path; -+ const char * pack_name_1; -+ const char * pack_name_2; -+ git_str pack_path_1 = GIT_STR_INIT; -+ git_str pack_path_2 = GIT_STR_INIT; -+ git_odb_backend * pack_odb_backend_1; -+ git_odb_backend * pack_odb_backend_2; -+ -+ -+ cl_assert_in_range(0, snprintf(pack_dir_path, sizeof(pack_dir_path), "%s/objects/pack", git_repository_path(_repo)), sizeof(pack_dir_path)); -+ -+ /* Create tree 1 */ -+ -+ cl_git_pass(git_blob_create_from_buffer(&oid_blob_1, _repo, LIT_LEN("thinpack blob 1"))); -+ cl_git_pass(git_blob_create_from_buffer(&oid_blob_2, _repo, LIT_LEN("thinpack blob 2"))); -+ -+ -+ cl_git_pass(git_treebuilder_new(&tb, _repo, NULL)); -+ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob1", &oid_blob_1, GIT_FILEMODE_BLOB)); -+ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob2", &oid_blob_2, GIT_FILEMODE_BLOB)); -+ cl_git_pass(git_treebuilder_write(&oid_tree_1, tb)); -+ -+ /* Flush */ -+ -+ cl_git_pass(git_packbuilder_new(&pb, _repo)); -+ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); -+ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); -+ cl_git_pass(git_indexer_new(&indexer, pack_dir_path, 0, NULL, NULL)); -+ cl_git_pass(git_indexer_append(indexer, buf.ptr, buf.size, &stats)); -+ cl_git_pass(git_indexer_commit(indexer, &stats)); -+ pack_name_1 = strdup(git_indexer_name(indexer)); -+ cl_assert(pack_name_1); -+ git_buf_dispose(&buf); -+ git_mempack_reset(_mempack_backend); -+ git_indexer_free(indexer); -+ git_packbuilder_free(pb); -+ -+ /* Create tree 2 */ -+ -+ cl_git_pass(git_treebuilder_clear(tb)); -+ /* blob 1 won't be used, but we add it anyway to test that just "declaring" an object doesn't -+ necessarily cause its inclusion in the next thin packfile. It must only be included if new. */ -+ cl_git_pass(git_blob_create_from_buffer(&oid_blob_1, _repo, LIT_LEN("thinpack blob 1"))); -+ cl_git_pass(git_blob_create_from_buffer(&oid_blob_3, _repo, LIT_LEN("thinpack blob 3"))); -+ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob1", &oid_blob_1, GIT_FILEMODE_BLOB)); -+ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob3", &oid_blob_3, GIT_FILEMODE_BLOB)); -+ cl_git_pass(git_treebuilder_write(&oid_tree_2, tb)); -+ -+ /* Flush */ -+ -+ cl_git_pass(git_packbuilder_new(&pb, _repo)); -+ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); -+ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); -+ cl_git_pass(git_indexer_new(&indexer, pack_dir_path, 0, NULL, NULL)); -+ cl_git_pass(git_indexer_append(indexer, buf.ptr, buf.size, &stats)); -+ cl_git_pass(git_indexer_commit(indexer, &stats)); -+ pack_name_2 = strdup(git_indexer_name(indexer)); -+ cl_assert(pack_name_2); -+ git_buf_dispose(&buf); -+ git_mempack_reset(_mempack_backend); -+ git_indexer_free(indexer); -+ git_packbuilder_free(pb); -+ git_treebuilder_free(tb); -+ -+ /* Assertions */ -+ -+ assert(pack_name_1); -+ assert(pack_name_2); -+ -+ repo_path = git_repository_path(_repo); -+ -+ snprintf(sbuf, sizeof(sbuf), "objects/pack/pack-%s.pack", pack_name_1); -+ git_str_joinpath(&pack_path_1, repo_path, sbuf); -+ snprintf(sbuf, sizeof(sbuf), "objects/pack/pack-%s.pack", pack_name_2); -+ git_str_joinpath(&pack_path_2, repo_path, sbuf); -+ -+ /* If they're the same, something definitely went wrong. */ -+ cl_assert(strcmp(pack_name_1, pack_name_2) != 0); -+ -+ cl_git_pass(git_odb_backend_one_pack(&pack_odb_backend_1, pack_path_1.ptr)); -+ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_1)); -+ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_2)); -+ cl_assert(!pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_3)); -+ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_tree_1)); -+ cl_assert(!pack_odb_backend_1->exists(pack_odb_backend_1, &oid_tree_2)); -+ -+ cl_git_pass(git_odb_backend_one_pack(&pack_odb_backend_2, pack_path_2.ptr)); -+ /* blob 1 is already in the packfile 1, so packfile 2 must not include it, in order to be _thin_. */ -+ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_1)); -+ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_2)); -+ cl_assert(pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_3)); -+ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_tree_1)); -+ cl_assert(pack_odb_backend_2->exists(pack_odb_backend_2, &oid_tree_2)); -+ -+ pack_odb_backend_1->free(pack_odb_backend_1); -+ pack_odb_backend_2->free(pack_odb_backend_2); -+ free((void *)pack_name_1); -+ free((void *)pack_name_2); -+ git_str_dispose(&pack_path_1); -+ git_str_dispose(&pack_path_2); -+ -+} diff --git a/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch b/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch deleted file mode 100644 index c67822ff755e..000000000000 --- a/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch +++ /dev/null @@ -1,930 +0,0 @@ -commit e9823c5da4fa977c46bcb97167fbdd0d70adb5ff -Author: Robert Hensing -Date: Mon Aug 26 20:07:04 2024 +0200 - - Make packbuilder interruptible using progress callback - - Forward errors from packbuilder->progress_cb - - This allows the callback to terminate long-running operations when - the application is interrupted. - -diff --git a/include/git2/pack.h b/include/git2/pack.h -index 0f6bd2ab9..bee72a6c0 100644 ---- a/include/git2/pack.h -+++ b/include/git2/pack.h -@@ -247,6 +247,9 @@ typedef int GIT_CALLBACK(git_packbuilder_progress)( - * @param progress_cb Function to call with progress information during - * pack building. Be aware that this is called inline with pack building - * operations, so performance may be affected. -+ * When progress_cb returns an error, the pack building process will be -+ * aborted and the error will be returned from the invoked function. -+ * `pb` must then be freed. - * @param progress_cb_payload Payload for progress callback. - * @return 0 or an error code - */ -diff --git a/src/libgit2/pack-objects.c b/src/libgit2/pack-objects.c -index b2d80cba9..7c331c2d5 100644 ---- a/src/libgit2/pack-objects.c -+++ b/src/libgit2/pack-objects.c -@@ -932,6 +932,9 @@ static int report_delta_progress( - { - int ret; - -+ if (pb->failure) -+ return pb->failure; -+ - if (pb->progress_cb) { - uint64_t current_time = git_time_monotonic(); - uint64_t elapsed = current_time - pb->last_progress_report_time; -@@ -943,8 +946,10 @@ static int report_delta_progress( - GIT_PACKBUILDER_DELTAFICATION, - count, pb->nr_objects, pb->progress_cb_payload); - -- if (ret) -+ if (ret) { -+ pb->failure = ret; - return git_error_set_after_callback(ret); -+ } - } - } - -@@ -976,7 +981,10 @@ static int find_deltas(git_packbuilder *pb, git_pobject **list, - } - - pb->nr_deltified += 1; -- report_delta_progress(pb, pb->nr_deltified, false); -+ if ((error = report_delta_progress(pb, pb->nr_deltified, false)) < 0) { -+ GIT_ASSERT(git_packbuilder__progress_unlock(pb) == 0); -+ goto on_error; -+ } - - po = *list++; - (*list_size)--; -@@ -1124,6 +1132,10 @@ struct thread_params { - size_t depth; - size_t working; - size_t data_ready; -+ -+ /* A pb->progress_cb can stop the packing process by returning an error. -+ When that happens, all threads observe the error and stop voluntarily. */ -+ bool stopped; - }; - - static void *threaded_find_deltas(void *arg) -@@ -1133,7 +1145,12 @@ static void *threaded_find_deltas(void *arg) - while (me->remaining) { - if (find_deltas(me->pb, me->list, &me->remaining, - me->window, me->depth) < 0) { -- ; /* TODO */ -+ me->stopped = true; -+ GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_lock(me->pb) == 0, NULL); -+ me->working = false; -+ git_cond_signal(&me->pb->progress_cond); -+ GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_unlock(me->pb) == 0, NULL); -+ return NULL; - } - - GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_lock(me->pb) == 0, NULL); -@@ -1175,8 +1192,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - pb->nr_threads = git__online_cpus(); - - if (pb->nr_threads <= 1) { -- find_deltas(pb, list, &list_size, window, depth); -- return 0; -+ return find_deltas(pb, list, &list_size, window, depth); - } - - p = git__mallocarray(pb->nr_threads, sizeof(*p)); -@@ -1195,6 +1211,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - p[i].depth = depth; - p[i].working = 1; - p[i].data_ready = 0; -+ p[i].stopped = 0; - - /* try to split chunks on "path" boundaries */ - while (sub_size && sub_size < list_size && -@@ -1262,7 +1279,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - (!victim || victim->remaining < p[i].remaining)) - victim = &p[i]; - -- if (victim) { -+ if (victim && !target->stopped) { - sub_size = victim->remaining / 2; - list = victim->list + victim->list_size - sub_size; - while (sub_size && list[0]->hash && -@@ -1286,7 +1303,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - } - target->list_size = sub_size; - target->remaining = sub_size; -- target->working = 1; -+ target->working = 1; /* even when target->stopped, so that we don't process this thread again */ - GIT_ASSERT(git_packbuilder__progress_unlock(pb) == 0); - - if (git_mutex_lock(&target->mutex)) { -@@ -1299,7 +1316,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - git_cond_signal(&target->cond); - git_mutex_unlock(&target->mutex); - -- if (!sub_size) { -+ if (target->stopped || !sub_size) { - git_thread_join(&target->thread, NULL); - git_cond_free(&target->cond); - git_mutex_free(&target->mutex); -@@ -1308,7 +1325,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - } - - git__free(p); -- return 0; -+ return pb->failure; - } - - #else -@@ -1319,6 +1336,7 @@ int git_packbuilder__prepare(git_packbuilder *pb) - { - git_pobject **delta_list; - size_t i, n = 0; -+ int error; - - if (pb->nr_objects == 0 || pb->done) - return 0; /* nothing to do */ -@@ -1327,8 +1345,10 @@ int git_packbuilder__prepare(git_packbuilder *pb) - * Although we do not report progress during deltafication, we - * at least report that we are in the deltafication stage - */ -- if (pb->progress_cb) -- pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload); -+ if (pb->progress_cb) { -+ if ((error = pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload)) < 0) -+ return git_error_set_after_callback(error); -+ } - - delta_list = git__mallocarray(pb->nr_objects, sizeof(*delta_list)); - GIT_ERROR_CHECK_ALLOC(delta_list); -@@ -1345,31 +1365,33 @@ int git_packbuilder__prepare(git_packbuilder *pb) - - if (n > 1) { - git__tsort((void **)delta_list, n, type_size_sort); -- if (ll_find_deltas(pb, delta_list, n, -+ if ((error = ll_find_deltas(pb, delta_list, n, - GIT_PACK_WINDOW + 1, -- GIT_PACK_DEPTH) < 0) { -+ GIT_PACK_DEPTH)) < 0) { - git__free(delta_list); -- return -1; -+ return error; - } - } - -- report_delta_progress(pb, pb->nr_objects, true); -+ error = report_delta_progress(pb, pb->nr_objects, true); - - pb->done = true; - git__free(delta_list); -- return 0; -+ return error; - } - --#define PREPARE_PACK if (git_packbuilder__prepare(pb) < 0) { return -1; } -+#define PREPARE_PACK error = git_packbuilder__prepare(pb); if (error < 0) { return error; } - - int git_packbuilder_foreach(git_packbuilder *pb, int (*cb)(void *buf, size_t size, void *payload), void *payload) - { -+ int error; - PREPARE_PACK; - return write_pack(pb, cb, payload); - } - - int git_packbuilder__write_buf(git_str *buf, git_packbuilder *pb) - { -+ int error; - PREPARE_PACK; - - return write_pack(pb, &write_pack_buf, buf); -diff --git a/src/libgit2/pack-objects.h b/src/libgit2/pack-objects.h -index bbc8b9430..380a28ebe 100644 ---- a/src/libgit2/pack-objects.h -+++ b/src/libgit2/pack-objects.h -@@ -100,6 +100,10 @@ struct git_packbuilder { - uint64_t last_progress_report_time; - - bool done; -+ -+ /* A non-zero error code in failure causes all threads to shut themselves -+ down. Some functions will return this error code. */ -+ volatile int failure; - }; - - int git_packbuilder__write_buf(git_str *buf, git_packbuilder *pb); -diff --git a/tests/libgit2/pack/cancel.c b/tests/libgit2/pack/cancel.c -new file mode 100644 -index 000000000..a0aa9716a ---- /dev/null -+++ b/tests/libgit2/pack/cancel.c -@@ -0,0 +1,240 @@ -+#include "clar_libgit2.h" -+#include "futils.h" -+#include "pack.h" -+#include "hash.h" -+#include "iterator.h" -+#include "vector.h" -+#include "posix.h" -+#include "hash.h" -+#include "pack-objects.h" -+ -+static git_repository *_repo; -+static git_revwalk *_revwalker; -+static git_packbuilder *_packbuilder; -+static git_indexer *_indexer; -+static git_vector _commits; -+static int _commits_is_initialized; -+static git_indexer_progress _stats; -+ -+extern bool git_disable_pack_keep_file_checks; -+ -+static void pack_packbuilder_init(const char *sandbox) { -+ _repo = cl_git_sandbox_init(sandbox); -+ /* cl_git_pass(p_chdir(sandbox)); */ -+ cl_git_pass(git_revwalk_new(&_revwalker, _repo)); -+ cl_git_pass(git_packbuilder_new(&_packbuilder, _repo)); -+ cl_git_pass(git_vector_init(&_commits, 0, NULL)); -+ _commits_is_initialized = 1; -+ memset(&_stats, 0, sizeof(_stats)); -+ p_fsync__cnt = 0; -+} -+ -+void test_pack_cancel__initialize(void) -+{ -+ pack_packbuilder_init("small.git"); -+} -+ -+void test_pack_cancel__cleanup(void) -+{ -+ git_oid *o; -+ unsigned int i; -+ -+ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_FSYNC_GITDIR, 0)); -+ cl_git_pass(git_libgit2_opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, false)); -+ -+ if (_commits_is_initialized) { -+ _commits_is_initialized = 0; -+ git_vector_foreach(&_commits, i, o) { -+ git__free(o); -+ } -+ git_vector_free(&_commits); -+ } -+ -+ git_packbuilder_free(_packbuilder); -+ _packbuilder = NULL; -+ -+ git_revwalk_free(_revwalker); -+ _revwalker = NULL; -+ -+ git_indexer_free(_indexer); -+ _indexer = NULL; -+ -+ /* cl_git_pass(p_chdir("..")); */ -+ cl_git_sandbox_cleanup(); -+ _repo = NULL; -+} -+ -+static int seed_packbuilder(void) -+{ -+ int error; -+ git_oid oid, *o; -+ unsigned int i; -+ -+ git_revwalk_sorting(_revwalker, GIT_SORT_TIME); -+ cl_git_pass(git_revwalk_push_ref(_revwalker, "HEAD")); -+ -+ while (git_revwalk_next(&oid, _revwalker) == 0) { -+ o = git__malloc(sizeof(git_oid)); -+ cl_assert(o != NULL); -+ git_oid_cpy(o, &oid); -+ cl_git_pass(git_vector_insert(&_commits, o)); -+ } -+ -+ git_vector_foreach(&_commits, i, o) { -+ if((error = git_packbuilder_insert(_packbuilder, o, NULL)) < 0) -+ return error; -+ } -+ -+ git_vector_foreach(&_commits, i, o) { -+ git_object *obj; -+ cl_git_pass(git_object_lookup(&obj, _repo, o, GIT_OBJECT_COMMIT)); -+ error = git_packbuilder_insert_tree(_packbuilder, -+ git_commit_tree_id((git_commit *)obj)); -+ git_object_free(obj); -+ if (error < 0) -+ return error; -+ } -+ -+ return 0; -+} -+ -+static int fail_stage; -+ -+static int packbuilder_cancel_after_n_calls_cb(int stage, uint32_t current, uint32_t total, void *payload) -+{ -+ -+ /* Force the callback to run again on the next opportunity regardless -+ of how fast we're running. */ -+ _packbuilder->last_progress_report_time = 0; -+ -+ if (stage == fail_stage) { -+ int *calls = (int *)payload; -+ int n = *calls; -+ /* Always decrement, including past zero. This way the error is only -+ triggered once, making sure it is picked up immediately. */ -+ --*calls; -+ if (n == 0) -+ return GIT_EUSER; -+ } -+ -+ return 0; -+} -+ -+static void test_cancel(int n) -+{ -+ -+ int calls_remaining = n; -+ int err; -+ git_buf buf = GIT_BUF_INIT; -+ -+ /* Switch to a small repository, so that `packbuilder_cancel_after_n_calls_cb` -+ can hack the time to call the callback on every opportunity. */ -+ -+ cl_git_pass(git_packbuilder_set_callbacks(_packbuilder, &packbuilder_cancel_after_n_calls_cb, &calls_remaining)); -+ err = seed_packbuilder(); -+ if (!err) -+ err = git_packbuilder_write_buf(&buf, _packbuilder); -+ -+ cl_assert_equal_i(GIT_EUSER, err); -+} -+void test_pack_cancel__cancel_after_add_0(void) -+{ -+ fail_stage = GIT_PACKBUILDER_ADDING_OBJECTS; -+ test_cancel(0); -+} -+ -+void test_pack_cancel__cancel_after_add_1(void) -+{ -+ cl_skip(); -+ fail_stage = GIT_PACKBUILDER_ADDING_OBJECTS; -+ test_cancel(1); -+} -+ -+void test_pack_cancel__cancel_after_delta_0(void) -+{ -+ fail_stage = GIT_PACKBUILDER_DELTAFICATION; -+ test_cancel(0); -+} -+ -+void test_pack_cancel__cancel_after_delta_1(void) -+{ -+ fail_stage = GIT_PACKBUILDER_DELTAFICATION; -+ test_cancel(1); -+} -+ -+void test_pack_cancel__cancel_after_delta_0_threaded(void) -+{ -+#ifdef GIT_THREADS -+ git_packbuilder_set_threads(_packbuilder, 8); -+ fail_stage = GIT_PACKBUILDER_DELTAFICATION; -+ test_cancel(0); -+#else -+ cl_skip(); -+#endif -+} -+ -+void test_pack_cancel__cancel_after_delta_1_threaded(void) -+{ -+#ifdef GIT_THREADS -+ git_packbuilder_set_threads(_packbuilder, 8); -+ fail_stage = GIT_PACKBUILDER_DELTAFICATION; -+ test_cancel(1); -+#else -+ cl_skip(); -+#endif -+} -+ -+static int foreach_cb(void *buf, size_t len, void *payload) -+{ -+ git_indexer *idx = (git_indexer *) payload; -+ cl_git_pass(git_indexer_append(idx, buf, len, &_stats)); -+ return 0; -+} -+ -+void test_pack_cancel__foreach(void) -+{ -+ git_indexer *idx; -+ -+ seed_packbuilder(); -+ -+#ifdef GIT_EXPERIMENTAL_SHA256 -+ cl_git_pass(git_indexer_new(&idx, ".", GIT_OID_SHA1, NULL)); -+#else -+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL)); -+#endif -+ -+ cl_git_pass(git_packbuilder_foreach(_packbuilder, foreach_cb, idx)); -+ cl_git_pass(git_indexer_commit(idx, &_stats)); -+ git_indexer_free(idx); -+} -+ -+static int foreach_cancel_cb(void *buf, size_t len, void *payload) -+{ -+ git_indexer *idx = (git_indexer *)payload; -+ cl_git_pass(git_indexer_append(idx, buf, len, &_stats)); -+ return (_stats.total_objects > 2) ? -1111 : 0; -+} -+ -+void test_pack_cancel__foreach_with_cancel(void) -+{ -+ git_indexer *idx; -+ -+ seed_packbuilder(); -+ -+#ifdef GIT_EXPERIMENTAL_SHA256 -+ cl_git_pass(git_indexer_new(&idx, ".", GIT_OID_SHA1, NULL)); -+#else -+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL)); -+#endif -+ -+ cl_git_fail_with( -+ git_packbuilder_foreach(_packbuilder, foreach_cancel_cb, idx), -1111); -+ git_indexer_free(idx); -+} -+ -+void test_pack_cancel__keep_file_check(void) -+{ -+ assert(!git_disable_pack_keep_file_checks); -+ cl_git_pass(git_libgit2_opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, true)); -+ assert(git_disable_pack_keep_file_checks); -+} -diff --git a/tests/resources/small.git/HEAD b/tests/resources/small.git/HEAD -new file mode 100644 -index 0000000000000000000000000000000000000000..cb089cd89a7d7686d284d8761201649346b5aa1c -GIT binary patch -literal 23 -ecmXR)O|w!cN=+-)&qz&7Db~+TEG|hc;sO9;xClW2 - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/config b/tests/resources/small.git/config -new file mode 100644 -index 0000000000000000000000000000000000000000..07d359d07cf1ed0c0074fdad71ffff5942f0adfa -GIT binary patch -literal 66 -zcmaz}&M!)h<>D+#Eyypk5{uv*03B5png9R* - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/description b/tests/resources/small.git/description -new file mode 100644 -index 0000000000000000000000000000000000000000..498b267a8c7812490d6479839c5577eaaec79d62 -GIT binary patch -literal 73 -zcmWH|%S+5nO;IRHEyyp$t+PQ$;d2LNXyJgRZve!Elw`VEGWs$&r??@ -Q$yWgB0LrH#Y0~2Y0PnOK(EtDd - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/applypatch-msg.sample b/tests/resources/small.git/hooks/applypatch-msg.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..dcbf8167fa503f96ff6a39c68409007eadc9b1f3 -GIT binary patch -literal 535 -zcmY+AX;Q;542A#a6e8^~FyI8r&I~hf2QJ{GO6(?HuvEG*+#R{4EI%zhfA8r{j%sh$ -zHE~E-UtQd8{bq4@*S%jq3@bmxwQDXGv#o!N`o3AHMw3xD)hy0#>&E&zzl%vRffomqo=v6>_2NRa#TwDdYvTVQyueO*15Nlo%=#DXgC0bhF3vTa`LQGaO9;jeD$OP?~ -za$G4Q{z+Q_{5V?5h;a-noM$P{<>Q~j4o7u%#P6^o^16{y*jU=-K8GYD_dUtdj4FSx -zSC0C!DvAnv%S!4dgk -XB^)11aoGMJPCqWs%IS0YSv(eBT&%T6 - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/commit-msg.sample b/tests/resources/small.git/hooks/commit-msg.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..f3780f92349638ebe32f6baf24c7c3027675d7c9 -GIT binary patch -literal 953 -zcmaJy@-{3h^^Cx;#d0zEA@DDc$nY4ez&|=%jTg@_HU*ub=!!y$xW09TSjlj -z(`I@QCsM`!9&80$I98wsQ8yK#)Orb<8re8FjkKh630D$QUDwi~(gkX=RunYm$rDjk -zlp%RUSnzA#6yjdG5?T?2DcYKp+v_lts0ljn&bh3J0bD5@N@1UKZ190O6ZeWr-BuZ^ -zWRebCX%(%=Xoj#(xYk1Cjtr!=tyBesf@m6}8zY6Ijbz9i9ziI_jG9MvR -zDH*e>^ga9IR?2wrSrAVm;eButj4Y>7(E2?b~jsu>& -zRKCJ7bp#19sqYh627wD%D9R$8=Ml$TNlumDypl~$jBu*G>5fIR^FB0h0Ex&TGZNr> -zL5hs1_K>taRb!|ThN9ns7^@4MXKP+6aGI_UK)T-M#rcP$;kN(Vcf#P)+5GzWa{l@J -z>-E{`$1iiNVYxq27}j;uo%;)r3kJI2xCFF~Ux;$Q%) -wjbk6JlDCM`jU&P+UVOvg`|iYl<7~9k>HHB4I;pdlQ=I-^$DrHaN$@lH1?P!0U;qFB - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/fsmonitor-watchman.sample b/tests/resources/small.git/hooks/fsmonitor-watchman.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..41184ebc318c159f51cd1ebe2290559805df89d8 -GIT binary patch -literal 4777 -zcmbtYYi}F368$Xwipg4lq(BeHMvzvH-4;n7DGJBPqq#tw3aed8+IU5-m)yvL>;Cqh -z8FFRGj$`9CA8aoJ?j^$%==FV``-=rhLcPW`McSytRm~mEO7_&_cAVZrf1fFy*ha@8oe%*-aBYE -zcjzZg>LOkgxuUr-XJnHyD;zmPnRaSc#!k_P*d_BttRdc+J6G7za5#+^Y1nkc2Oowk`ya47uUR3Feu?B(w;S{(VYzxh}q-=#zP@uxSx{wbyPUMFU;K(06)$o{07&3yI?q{GqMcQ1c_^M<0< -zF4acAV)Il-V(rCTC1(;bsZ*}bl8dmejAk~yb`B}!^0;g^(o9kGUfZfDOvyp@x4OQt -zSgWh6T|3eq;9MFs8-#z+FDM1h(IjRUP|``PxupgJ7CUHOH90gbgl^2~97`?_X{P)) -zB*$r1cDlF-%azKND}?Gv`2K8-9v5e`gQoft=j?T<&a13c^!wY_$D`5z-X1g?ty&6- -zQN50{8?bUk9AI->^W@~~nkOghHIC2YN+AXkLQG_2-{Pq3%{`3KUMeG$iIn%%^6*NYb -zn|_BdV#C)n4565VccX;uT8&z3vSi!HXGbUj2B!R -zdz~&#fk#L-&k$fLwo$4?>12g@AXOKFekuo#6EHB%gmpD?1eyh%N8s{2wGoTu -z*@6cEZ^ZW!FAF_|JL`NkV7k}0ow|-2jHwbgH0;c@Dq*o?@&c*HnGdyx6^su8Qk%2{ -z*ye(dxO*6-&>qn1+zw}tc6;=sOX{4WB=VqjTS^))y1jlX2Q;=e!qMmFA5lC$#;BxC -z=Y%tRpWxb+_uQAvAw7Q{HGV#R$xb&udLCzZ+HN?kTyB};1EJ8UlQ5!>5eGW@)RX0n -zkjj>EF!3=0Gl^8dzv$B^NMGRxJoqN4A`xq-@wCbrx*u2NmIJ1xZ%H -zh;{|4T3(!E9sY#Ni(wUJYs1MmIc9bl)(4Nl3_wD_BWB>i<1S(LX7m*{Q7PU$muMS* -zM!%0EZx-Vw=Zey;erC?SNxF;pY@^A%-krqzfLV2meBp1vWdyArFYn`DD19T)Hw(?n -z)}{NP(Lk(o*?gl#B@pP7^*r|=;PIDT4|F#{2Hzh-AL0Rv$6uT;n|WzE4=slK?on@(fZeGhRgQCu56qB -z{+n81Az96qnQjMY*-*r-KV*7;Z#4QuJRJJV$M^KdldiMhj?ImK6~FvwJ*L5a){QoM=L5TYHkGO1$UrO3`a>{?Opw|b -zG(#59NQ#jFL9v~vgOVkM@^^(^A}onOE))yWEwhIlk&{ZyseZ^O0b=w8&O=BK{k<5B -k^Q-B@eG}LeHrquz%(SVEp_N)VhYZikCW__82JXfD17`J9Qvd(} - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/pre-applypatch.sample b/tests/resources/small.git/hooks/pre-applypatch.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..625837e25f91421b8809a097f4a3103dd387ef31 -GIT binary patch -literal 481 -zcmY+ATTa6;5Jms9iouO45IBJXEg&Jm9@v1LPHMM_ZR|;#6tQh$71hSXq*MxP;V& -zj0cY7SCL=x4`a46sF)C>94Gk%=3q$W2s;j6iHtB2$R0%gix4oK@&T~=ALd_o*CKxt -I-`Pv{1Bpzc>;M1& - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/pre-commit.sample b/tests/resources/small.git/hooks/pre-commit.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..10b39b2e26981b8f87ea424e735ef87359066dbb -GIT binary patch -literal 1706 -zcmZuxU2ohr5PY_N#pZ0-F<{-v&v-X^RA+u>k}E$4d&uD7=g_fA8+pNNV=4s0|iD3p<=DTXClTS -zXV23tJ;ECmN@M0j@zUAKEYW@3bv!SeYZ8ZH`YQNTApFVNc;F|9r5p4TqGs=>8E?6y -zi|gY{iM#PG1nL?UE9YCnWTk72kgZPG*Usqw!~Qd3c?~@w2?%eg@~)+VlSs6N5Yf2^ -zz;owF#K#r^&KMq1A`oqVGFpD&-!Pv|Rc -zO3KSqA@h9nSc%bm`0)Amk6*J}@14J*1-219l%%7D!Pl}UK>|lVi0Dfgu2jN3WC!uL -z0ej??b2iSehVgdnWHmZV4kUo*QL#aiIp}U=9x)IXk}JJ7VQ;CI9Rtn5e0VcjbYcVt+`x5D+svCGD;Z5hm*E$jSEQZ%SQ(}oLgslTvrKK@9Qf#b!hajVFnp9@oIix;NcI9Wk -xjnh0ya!AWet{I7YpD;y6HXyzI*lfSvH=o6*7mJZPkuaYpm>vzZ`wyGEBtOQPo|pgt - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/pre-push.sample b/tests/resources/small.git/hooks/pre-push.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..02cbd80c287f959fe33975bb66c56293e3f5b396 -GIT binary patch -literal 1431 -zcmaJ>U60!~5PUX&#a1@z9B{IIZkjLT0t5kq9#8~D(I5{+8&J~9;#ndUk~-ZT`r|uG -z$#K$$J{TsKs*LP1}9!GoZ@4I4myMMG_di|of -z%?llx{O8TS-#^;(OioEmPy%kwWQBA1OMzV{hsQ8XFzS1k!~YQoLa5 -zhtP1fA$q6VmMbbAC_9)4I628k*O5J$NR19uHe4QYDK<==I~SQk)Nu%xQ~KH -z53w=!ke(FGb_PpnZfd*+hnXDTn;2*`u^~;?+5C~cn?bRka7NR%06%e6O91{MAgN6J -zmlO8{Biw4&wr&&(z4p3eln`E}XR9m9bNYZ7Ibrg(4yZIXrfgD7N*AFD7L3YSM#j}% -zo__rOS5fr;@8UM<6cl+cv_$YB$PQ&9dv($eM*))g!_cu!QcSh-mqE9i#QDZT)=o#` -z?8!RtE?w6p?GkGZ-6yt_p~5~4ecu|Sf^)6096%h*q-eNiEA1;Xwg)p~Q&iGSG7-IQ -z9aII&`ps$WOojFA`*bjGkFk|E@sHHuD}W^d`7YJ3YE^zrQnqR -zGoq?;YGKe)93o|_=^f%3U1KYZGPOXRRxK7w`UUbMMa3<86OmVH!EKP$8RCrn9mWX+ -zC?9yF!fRVLmud3hF<}x;;sR}f(*r}6Gap3fR6zLHR~kbMgD{98N`L+r&?3p~*0+FX -zcAL%j=(SO}xTJUTvA`&Lf`2mv4koPG9&|;2+68$XxiXKL@ma;l5d2^5Ba_rPh_DHI-u1#&_upttZXp;no03$20|NFiM -zK#D#xQ>!Z3JkX8T-LDVm!B5j7y_{;JDmmTTef+K1oIiPzeEr+Ai*<2PUgnG4^ZB>p -z_fkAvoR1emuf~ri^K$-px=4#D-vY9w& -z`bCv#2zVn=YnJyeNey(Y -zRh`9vtLw~A+5zsjp|W0Nsa|29Rm!B>OoG5a+vi;ari8O>KkU!KAWg_fa3btK2x*_@ -z0bEc7J;Ubghm}n9bOi(Sv_B66nQ7U)J7f0fO}8Wuf*uorcIgEG -zOHc|-V6+HlRhOP}?Cn?@5iwSl43abmBA^2lyL$+cpabCGVES+v^j^FO_}?FIp%En%Ll?Z*7*}TwrZyg5OSZ9rY-`aU~Mc-jjv{Ll)FLMgtB4ujktfQ`Xhqrka -zT=P!A;9w^;Z?PqpLwOLu=cj3L>TdUKw2;DMu)`oVkj}#bcDx4tYg=j%D`+i{W~fVM -zVmZ>W9VMyin9c-0KzI_;iZ-g|OyzuG`Yq%(%dvl;ifnVr0;jWE&S`z|rQu=!yHBBO -zx`OJ;oOQ(KKM<$(bC38o>pD0%|HA(E0TRw7qj$fJ_pRN+7Nm>dSC(gLg{(`t+5Z=?o+}wXU4tHy+&%F&aRhFebeEhR2R5|$#Ycbp^w@t -zTl%=f1t=w+WpJzF<|CE@?SCNAz)%9?w33lQ8vrHJqPfH9@}qs*QXOG71W=ylx;wOB -zcx!Bj^)Yy6WX$a^vBkBJ5CobqlaDx_B0c<3b+8)f84LCrt;e;qxc+7>VbwVK{skNv!wvBiTa^9Iu -zkwP;VK)jH$WJ{`MRwAA9fal!y0dtV;FWg8PTkWU>CwnqD>1ZX2B@;$DlX%C5MI+}{ -z9xQVnffR*~v2KAUj*hCdgul~`bk#mk`o>zk9)<2Uc8?hUZAEvd!`9em)~$Z)zev>w^8 -zyAgCP_$&Y)7HSQ84`xG}OeTavaEswwF|8Xpi5iZzZa@hCiv(J-%bfFC&)HLlO+Rhw -zG6g?9eL5&A!SuJnQ6}LxG%tU+@vZ`i+!+Rz6iYvsTdhnPo7lW{m-}{hya@viX4)XZ -zngaw+j;gloB#|UwI@8sOmQpc`h+bicQJnQIB5eifIMQNgD2+oai33m!34~xU|0Azj -zhu$8z+T5^;Pxx@d{N)pzOJLSa^e;aDf$W%N5XcOf!mGC9l9j$Ev2h6N+6ZQC+CJzl -zaM7?S!SrFLS2DASjj(h6y1WN3N?|bmqmyzm!&nLoE|`rKBOc_yDF$a#FsUn!IQf(t -zdC&Us(kQz*7mvH^j*^MC@>wTDb}g%~sx*ng#>{@lR=XG-Z5_ -z#<9*Oh0joMzt;nS)ObAp)347`D=}r-;nV!TbIq&xrGRGsF6fZg+!VkfUei@_&l-M& -zPqQ+Dw)RV}+)I8RuqAxa`Pv8e&!_gXS=e2-un>=Ktn}-;%lLZxaVn?Q>yZCb2R3Wk -z77zr%;Rq&h|2ncqyKYmFI0148JVY7Q$V5p=dWj+Qqpu%i|xp2C=WaOb2Wudn^h0EcD%$p9YVU1fnoRV9`(cy(vv6K>FXS!2jY>1GnU--7)4usH&K -zao*&P^@9~YmUe|ZdLW@C>H;!*Vt3>Nw4M*;=?j(TBD#O@XCv0|MEhA;z}kTFRv@`tPHhp=&Yh -zg%Zhg4i7o_k{a5i&f5;tZ==%}^Sn4aD_6%qs_XAuJt&EumdH4Yu`UjT<-+XHTuHss+b -YOmM2;hq8Egm*4=7_P9T{21QBYH*F=mfB*mh - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/prepare-commit-msg.sample b/tests/resources/small.git/hooks/prepare-commit-msg.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..b1970da1b6d3f42f00069fd17c325de72cda812e -GIT binary patch -literal 1702 -zcmb_cTW{Mo6n>t6#i?x6xmZ$SFLf{QfG*3r0L?Pg?px55l8$UTGO3bO;spKi{V3XX -z))weX0X>M9bNMcZ-6yG%>(n}JI2|25dr}WZBP@ih?JX^+@ -zu#5O48P>yRX(mfDIhYP)doc1&TADZa@ZGpusJ$6G+e$ZMcmC -zoOosDQPS}l{H?YPsq(4;0SGkATa9eeqAaDcjq8n2wALbFwU@2i@FAaRV!=uw-nwx1gKn2SvY -z>Ff>;2sg!+Hxfkwv1lsiii=p6WenF=5)6LZcQaZ=aS_}+-4Y&?!@HWh|<^gJ21!|T@+%On#w6azxPHV}XsRbe*w -zR_TZ2XEsQa1lPK~biYqg@0-RW@5J1@=<87cFzEUABdCoFH2CZo?}l(Z*!OFqUxo>K -z_d`l#4d9|H6;VPT{X?^{VJ>oL|D7K{BJwwqB>`YcPoGk+9hbvHnoQ{EM|kPgD_`wk -zKm4#2xu;-y`RAm!=L_BnLvJ8$AZm8@?)v<%vwvsw8AF2x6!mTT;c72A_~U9nIq0ST -zv)N0!I!^1p=g8-RQfx5)E_Mb_4I2vtQpI30XZ&t-9h5!Hn - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/push-to-checkout.sample b/tests/resources/small.git/hooks/push-to-checkout.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..a80611e18896f212c390d845e49a3f6d5693b41d -GIT binary patch -literal 2840 -zcmai0U31$u5PXh)#YOS7cE^-rw@uolNhe9&aUS|HtvhX>G$45tVUYj>fRdF?|9kfU -zNR~aG=E)WbEbeyq7JTw}ZuHIE2kUtL<AoeCNptd-NM1aZLhESzC;I`+Ns -zfmNNjdAp^W8#Q*}l>CT7RB9F5(BbI8ly2l~+E};JW|>&d1)=epZ-8vm8ppkbEVn#R -zt30a5A-c(YQR8eM5%;|UAnO>rt!&@x@G@yp+92%w-}%(5P_+P&Wf_zb$f-Qrl5(7z -z2ah(bkE;!DK(&aAMuQ%1TS>ai?wSXCOCSj=_}8x4IbCx^$}9q)whwv)SBt| -zg#MX4;;Oau`m=MI9(^&zPbueY@~>3*ixX%mvR5m_1&nAg@ZKvY1E$O}&EtLiG;mhV -z1xhMIm~fGjmf_#{62f`y;09?I7M1W2tWQvz<}i9lR>OpQyUJi45_&*pQus&EkwY<> -zI|ZAx=*3i9a-)g)hXkvO7>UJ5MNgL(Z+-wpXVcgbSgpmFmbf1~DPA(OVGI&FNLeIE -zNH!_aiH$vsif$_j7=T2{cS(!DOI`~bn@)vSd-0d7xL=DF;UNP|tW}4ih>DvHtu9tY_pbJ6x(6E*hxgC -zzNDao%qlr-IE%YGbS4hF!n!on7#W3$bX-_hbZAaws^nHu#)Dx=WzdbJ>AKzAy@T$x -zSWE^x9+|TEHVEPyaPYa0DOChp?AeHSBBDbZNokQpAY{lE!7geZI=jV)G^2@l)&91Zb1+`T+oq9wWF -zRV~kGTGce0O~p^6mj{kT5kL(pv>r;Lvd7VDX*P>A^Th`$3cWO0L81p4Ysdo3ZP1(SrR-peEdTo;-@bkB((G -zPHYQXUL!@Q$e(OQ;R9r%@Afz+50I7>*^^c&&|E*r-jN)LH=pM4AqMwWxSv|nqjddE -Z4{_hwv8!W(T -zYw`X3V>TCdnSD1ru8&`j=2DIPbCT@SnIgUw>$+lEYP}+x8(BMYnr=iT3*ndq)xzaV -z>I+qjv}vC#8_9M+b1p#uNS0M0)q

8!3p_LRQ0MA3M`!2foxzRUjbFY@}O~(ki=S -zqscnq8cU*dY)D$$cqE}n)V0yIk>CNKHCrndOtSP*HbOb;nbwAHSb;R+gs^?^Dve%) -zoW}t(*D}$>O3ab0TS^-;J|u&sb-PkZzo#kn*#xYt(;FGuwzSb^g&RDiGcOz9TB;Hu`nJh)$W=C=XCSm2AY=$w3G3P-V#Oo+N*;#2 -z4ijJ-pBZ=;T(RTgp_HYrD!uW-dTMfkuqY5jwOy)~gM;#=P^i{!l7`pXTS^s(&^{RU -zydaw}OpS#^D1cXM8?FW+fh`t7D(g;yr6|}fdaNtZBx3hlK~IpkTu3!Qq%R+zAo#t}Bs8^3$vHD+-TGT@`F>H1Cc#WAVW;&$S6%fE2d6@kLS0g&ihIM{}0z -z8#XhD>b>3{(BH|Px7}&lJ4%y1v(CihZJx@8MPoGdl*BJGD;usf*iS7%;{Joe; -zNFuBa>*~o&qETDPo~u&~$FxE1xb^x&(CbE`Y3GfsibL2rl+L;>P6j&Y3U>K$mkp*6 -zd`Q{<^+^&;GskGjwD-%!boR&i-TCA9UOR|@=GYb5x#+dhd7fkaVIR^pol`Mv+rUbmZ43dVL6^S7g3{NsPiG$iy$5EDB% -z6KIgnb$H(n&t3e4E6d4V7w^B?JS}JkG)PM6+X3Co`SQs($O*AA+MG~{S7RJ=cy-l& -z>~%3y`tjfx2>uOutB_^s -ziwG=e=ch|FQ0IkN91US7rhdQkXhwwt$gU0WEVDjo=IPb+?6PC=s8}J*ua(Ms))`UL -fi$|vMHn?H_tSE3ettp-hLlsZCxaLX8(nU;bVRB;Ce6@s#eu2|WvLz>- -zvy(&>Gyfp@+BtKnpqWkKi^+v{4jn_pNw_zeuxETifiGO|)w}OANj2n2D^K=o3j6P6uOL70#cbA{uzWXDlk1wr9GV1X(2W{RuTvjXV -zCmd8u -zH%V`94=q3)Dk)PHNrnFC(T1)Om6f{Usj;u1R->&XoCYVK2V3ZlgZuF?N}1+33OER*x -z*9Z=L=zI8CN>A_^jYjt0F$psO$sL=38q5q|SG)qCN6{^>RFh5E&l5GZ$pEahnF&d+ -z5c>64t}uJPkf~_!VUj#&N%nC-gUMj%=@B=!V>&}xtj2%@-mOm#rQUSJ3(ccmc+fza -znZ#uxF>N?QN5UrIEd!5RgHEfW#;(nKYF+D<*rdshJ$X-z2OZ2X;)nn@KSVdVhaA?}@3;6gZxb4v -zozoWSr{{+!h}zGpumG3H`=AvWpm^9kW;J$Jp^Xl*?8ckr`fqN%c|Z;VC0|cM4vSrk -zH_O8Yvh85nvJp^;``wo8=z0f`FWg?`>gO#y1hjX1{}rTlg9rwIKia8eyGexA3GnuR -z`Rg~XZoW;0pA)vI8=p5!+6sIn#C^FCvR>ffv39h6SCNi9v);%WD;WZ`of_MgwyRWy -z-yY%n*Y>X89W-v4`Ff%bx$Vkn}$!Ay}rnY6F$m-Kg*KD_+;Lx#g4|^&N -I02NaX#p`nv=Kufz - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/objects/af/5626b4a114abcb82d63db7c8082c3c4756e51b b/tests/resources/small.git/objects/af/5626b4a114abcb82d63db7c8082c3c4756e51b -new file mode 100644 -index 0000000000000000000000000000000000000000..822bc151862ec3763cf2d3fa2372b93bbd3a4b65 -GIT binary patch -literal 30 -mcmb>0i}&W3IZ_@1U=^!a~EV1casc=c+{&un1qQN*i9hD|0|m(2n|iwp*q%W -z%N;b$hu%cM`$TMo*~EnC1BFP&Pfj~;jZVKXQ96s_PhV<-XAROi+@-v8dBLUa`!;GB -k^iXlEv8$>R)1G>9th&t3j;s7J{?^9n|7U^`%mXoWC24Q^m!3%@{ - -literal 0 -HcmV?d00001 - From a6ef617de7a7b1514095bbf19e53e8ed80495c7a Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 21 Jan 2025 19:04:43 +0000 Subject: [PATCH 255/280] jujutsu: add patch for libgit2 1.9.0 --- pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch | 52 +++++++++++++++++++++ pkgs/by-name/ju/jujutsu/package.nix | 8 +++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch diff --git a/pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch b/pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch new file mode 100644 index 000000000000..fc68f2ffe0f4 --- /dev/null +++ b/pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch @@ -0,0 +1,52 @@ +From b4f936ac302ee835aa274e4dd186b436781d5d2f Mon Sep 17 00:00:00 2001 +From: Rui Chen +Date: Thu, 9 Jan 2025 09:51:47 -0500 +Subject: [PATCH] chore(deps): update git2 to use libgit2 1.9 + +Signed-off-by: Rui Chen +--- + Cargo.lock | 8 ++++---- + Cargo.toml | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 69398f4d6d..3ec8dfdacc 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -913,9 +913,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + + [[package]] + name = "git2" +-version = "0.19.0" ++version = "0.20.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" ++checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff" + dependencies = [ + "bitflags", + "libc", +@@ -2109,9 +2109,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + + [[package]] + name = "libgit2-sys" +-version = "0.17.0+1.8.1" ++version = "0.18.0+1.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" ++checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec" + dependencies = [ + "cc", + "libc", +diff --git a/Cargo.toml b/Cargo.toml +index 0fc4393cb5..b955fd6aa1 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -46,7 +46,7 @@ dirs = "5.0.1" + dunce = "1.0.5" + either = "1.13.0" + futures = "0.3.31" +-git2 = { version = "0.19.0", features = [ ++git2 = { version = "0.20.0", features = [ + # Do *not* disable this feature even if you'd like dynamic linking. Instead, + # set the environment variable `LIBGIT2_NO_VENDOR=1` if dynamic linking must + # be used (this will override the Cargo feature), and allow static linking diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 2ed77e026942..2811ed8d2d68 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -36,7 +36,13 @@ rustPlatform.buildRustPackage { }; useFetchCargoVendor = true; - cargoHash = "sha256-NmffqayPfRZhNCihEsjKhoVi5KeMCNbmsGAzC/oKcHs="; + + cargoPatches = [ + # + ./libgit2-1.9.0.patch + ]; + + cargoHash = "sha256-RiiIF9XFwXDgGSPvUMFOft4nH8PR1L3nZ+0s4QPobs8="; nativeBuildInputs = [ installShellFiles From 3a051e393cb8cc9cc82c14c5ee8f67b39dfea14c Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 22 Jan 2025 04:28:10 +0000 Subject: [PATCH 256/280] cargo-update: 16.0.0 -> 16.1.0 Diff: https://diff.rs/cargo-update/16.0.0/16.1.0 Changelog: https://github.com/nabijaczleweli/cargo-update/releases/tag/v16.1.0 --- pkgs/by-name/ca/cargo-update/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index 42afbf23a748..5b389029c897 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "16.0.0"; + version = "16.1.0"; src = fetchCrate { inherit pname version; - hash = "sha256-jLv/9Fvg+1HNIhfm0D/vvMR9J+Enztj9rXQE1kZITGI="; + hash = "sha256-bdIFenNMW5iDQaKS2+lMYVVfc0zpbYNOHQqczpjBNC4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-uoLs1CMNI0N0MpjTdpxDFubg6dgK57DVrxltF4HvG1k="; + cargoHash = "sha256-KujJB9o5+yHu6mEQOvzGUcBS6/fh/jcnt7/FbUPLefg="; nativeBuildInputs = [ From 6b2fda72283edd3b593ea7baae0a7694ba66eae2 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 22 Jan 2025 13:47:28 -0700 Subject: [PATCH 257/280] gex: bump version of libgit2 --- pkgs/by-name/ge/gex/package.nix | 2 +- pkgs/by-name/ge/gex/patch-libgit2.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix index 2003ac6fc200..53a20c7308a3 100644 --- a/pkgs/by-name/ge/gex/package.nix +++ b/pkgs/by-name/ge/gex/package.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-LCmc0yYuy51r2wHEzsJMfssCElG1AbnLLWYYnbk0Ddw="; + cargoHash = "sha256-4ejtMCuJOwT5bJQZaPQ1OjrB5O70we77yEXk9RmhywE="; meta = with lib; { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; diff --git a/pkgs/by-name/ge/gex/patch-libgit2.patch b/pkgs/by-name/ge/gex/patch-libgit2.patch index df7bd7cdff24..d540c71fa456 100644 --- a/pkgs/by-name/ge/gex/patch-libgit2.patch +++ b/pkgs/by-name/ge/gex/patch-libgit2.patch @@ -17,10 +17,10 @@ index 5101c2e..0cb59d2 100644 [[package]] name = "git2" -version = "0.18.1" -+version = "0.19.0" ++version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" -+checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" ++checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff" dependencies = [ "bitflags 2.3.3", "libc", @@ -29,10 +29,10 @@ index 5101c2e..0cb59d2 100644 [[package]] name = "libgit2-sys" -version = "0.16.1+1.7.1" -+version = "0.17.0+1.8.1" ++version = "0.18.0+1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" -+checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" ++checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec" dependencies = [ "cc", "libc", @@ -45,7 +45,7 @@ index 26cef3f..f947945 100644 crossterm = { version = "0.27.0", features = ["serde"] } dirs = "5.0.1" -git2 = { version = "0.18.1", default-features = false } -+git2 = { version = "0.19.0", default-features = false } ++git2 = { version = "0.20.0", default-features = false } itertools = "0.11.0" nom = "7.1.3" paste = "1.0.14" From e57355e04054979b1ee976c472a73cd87884e158 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 22 Jan 2025 14:12:17 -0700 Subject: [PATCH 258/280] cargo-generate: add upstream patch to bump libgit2 version --- pkgs/by-name/ca/cargo-generate/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix index a6a013570c64..3c4d01d28f37 100644 --- a/pkgs/by-name/ca/cargo-generate/package.nix +++ b/pkgs/by-name/ca/cargo-generate/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch, pkg-config, libgit2, openssl, @@ -22,7 +23,16 @@ rustPlatform.buildRustPackage rec { }; useFetchCargoVendor = true; - cargoHash = "sha256-bYxUqgFiO0SuttVFvHIX+Dorno5n4jK+2ck89ngssBM="; + + cargoPatches = [ + (fetchpatch { + name = "git2-version.patch"; + url = "https://github.com/cargo-generate/cargo-generate/commit/be2237177ee7ae996e2991189b07a5d211cd0d01.patch"; + hash = "sha256-F/o1EeDBfRhIB8atpOHoc6ZnUFCyD1QkCERv4m/YeWE="; + }) + ]; + + cargoHash = "sha256-5cfROJQWIhQNMbDhaCs2bfv4I3KDWcXBsmbbbDQ331s="; nativeBuildInputs = [ pkg-config ]; From 9ef4c2889647ea36466c44b0d248011307f20b52 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 22 Jan 2025 15:04:13 -0700 Subject: [PATCH 259/280] git-mit: add upstream patch for libgit2 version bump --- pkgs/by-name/gi/git-mit/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix index f065a7964fa3..41511664af93 100644 --- a/pkgs/by-name/gi/git-mit/package.nix +++ b/pkgs/by-name/gi/git-mit/package.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch , pkg-config , libgit2 , openssl @@ -24,7 +25,16 @@ rustPlatform.buildRustPackage { }; useFetchCargoVendor = true; - cargoHash = "sha256-sdAs8zJlmTqapWJNDck9YUHIiXhi0Ji6smejE5jEQXQ="; + + cargoPatches = [ + (fetchpatch { + name = "libgit2-update.patch"; + url = "https://github.com/PurpleBooth/git-mit/pull/1543/commits/3e82a4f5017972c7d28151a468bb71fe7d2279e0.patch"; + hash = "sha256-M9RpZHjOpZZqdHQe57LwMZ9zX6/4BNg3ymz8H3qupFk="; + }) + ]; + + cargoHash = "sha256-uoS6vmHmOVkHS81mrsbbXqP/dAC/FNHAlpTDHSa632k="; nativeBuildInputs = [ pkg-config ]; From c868f57c9a71dea5bb905aacff9772622f5c0568 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 22 Jan 2025 16:18:05 -0700 Subject: [PATCH 260/280] edopro: add patch from upstream to fix libgit2 version bump --- pkgs/by-name/ed/edopro/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix index adf1c896b0d3..f77e13b18949 100644 --- a/pkgs/by-name/ed/edopro/package.nix +++ b/pkgs/by-name/ed/edopro/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, fetchzip, makeWrapper, premake5, @@ -140,6 +141,14 @@ let sqlite ]; + patches = [ + (fetchpatch { + name = "libgit2-version.patch"; + url = "https://github.com/edo9300/edopro/commit/f8ddbfff51231827a8dd1dcfcb2dda85f50a56d9.patch"; + hash = "sha256-w9VTmWfw6vEyVvsOH+AK9lAbUOV+MagzGQ3Wa5DCS/U="; + }) + ]; + # nixpkgs' gcc stack currently appears to not support LTO postPatch = '' substituteInPlace premake5.lua \ From 97975c25ad1492f9d920959b014086a0af6467ca Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 22 Jan 2025 23:15:51 +0000 Subject: [PATCH 261/280] git-warp-time: 0.8.4 -> 0.8.5 Diff: https://github.com/alerque/git-warp-time/compare/None...v0.8.5 Changelog: https://github.com/alerque/git-warp-time/raw/v0.8.5/CHANGELOG.md --- pkgs/by-name/gi/git-warp-time/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-warp-time/package.nix b/pkgs/by-name/gi/git-warp-time/package.nix index ff50317d8ec8..a4f19641adf0 100644 --- a/pkgs/by-name/gi/git-warp-time/package.nix +++ b/pkgs/by-name/gi/git-warp-time/package.nix @@ -17,17 +17,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "git-warp-time"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "https://github.com/alerque/git-warp-time/releases/download/v${finalAttrs.version}/git-warp-time-${finalAttrs.version}.tar.zst"; - hash = "sha256-Xh30nA77cJ7+UfKlIslnyD+93AtnQ+8P3sCFsG0DAUk="; + hash = "sha256-bt94Y1EIcLzz1v2Nwyde63y6FWD+iaFkoEYoQpWVWGY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; nativeBuildInputs = [ zstd ]; - hash = "sha256-bmClqtH1xU2KOKVbCOrgN14jpLKiA2ZMzWwrOiufwnQ="; + hash = "sha256-qUhMTuvli4hUyHrFWmyaB1Rc/DS9Epae9S/mp6c9LSw="; }; nativeBuildInputs = [ From a6e9cf8cb3c8e27d9ccdea1f2268aed25f2acdf2 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 22 Jan 2025 23:37:28 +0000 Subject: [PATCH 262/280] guile-git: add patches for `libgit2` 1.9.0 --- ...e-field-from-config-entry-on-libgit2.patch | 80 ++++++++++++++++++ ...te-refs-field-to-remote-callbacks-on.patch | 84 +++++++++++++++++++ pkgs/by-name/gu/guile-git/package.nix | 5 ++ 3 files changed, 169 insertions(+) create mode 100644 pkgs/by-name/gu/guile-git/0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch create mode 100644 pkgs/by-name/gu/guile-git/0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch diff --git a/pkgs/by-name/gu/guile-git/0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch b/pkgs/by-name/gu/guile-git/0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch new file mode 100644 index 000000000000..ce3db57c0bf9 --- /dev/null +++ b/pkgs/by-name/gu/guile-git/0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch @@ -0,0 +1,80 @@ +From cc70ed70b19a712babd834806d6fc700b20c020a Mon Sep 17 00:00:00 2001 +From: Emily +Date: Wed, 22 Jan 2025 23:25:51 +0000 +Subject: [PATCH 1/2] =?UTF-8?q?structs:=20Omit=20=E2=80=98free=E2=80=99=20?= + =?UTF-8?q?field=20from=20=E2=80=98%config-entry=E2=80=99=20on=20libgit2?= + =?UTF-8?q?=201.9+.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* configure.ac: Check for the ‘free’ field of ‘git_config_entry’. +* git/configuration.scm.in (%have-config-entry-free?): New variable. +* git/structs.scm (%config-entry): Omit ‘free’ field conditionally. +--- + configure.ac | 10 ++++++++++ + git/configuration.scm.in | 4 ++++ + git/structs.scm | 4 +++- + 3 files changed, 17 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b04ca6b..7f8f0b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -87,6 +87,16 @@ else + fi + AC_SUBST([HAVE_CONFIG_ENTRY_BACKEND_TYPE]) + ++dnl Does 'git_config_entry' have 'free'? Removed in 1.9. ++AC_CHECK_MEMBER([git_config_entry.free], [], [], ++ [[#include ]]) ++if test "x$ac_cv_member_git_config_entry_free" = "xyes"; then ++ HAVE_CONFIG_ENTRY_FREE="#true" ++else ++ HAVE_CONFIG_ENTRY_FREE="#false" ++fi ++AC_SUBST([HAVE_CONFIG_ENTRY_FREE]) ++ + dnl Does 'git_diff_options' have 'oid_type'? It's new in 1.7. + AC_CHECK_MEMBER([git_diff_options.oid_type], [], [], + [[#include ]]) +diff --git a/git/configuration.scm.in b/git/configuration.scm.in +index e10b195..864b9ff 100644 +--- a/git/configuration.scm.in ++++ b/git/configuration.scm.in +@@ -24,6 +24,7 @@ + %have-fetch-options-depth? + %have-diff-options-oid-type? + %have-config-entry-backend-type? ++ %have-config-entry-free? + %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT? + %have-GIT_OPT_SET_HOMEDIR? + %have-GIT_OPT_SET_USER_AGENT_PRODUCT?)) +@@ -48,6 +49,9 @@ + (define %have-config-entry-backend-type? + @HAVE_CONFIG_ENTRY_BACKEND_TYPE@) + ++(define %have-config-entry-free? ++ @HAVE_CONFIG_ENTRY_FREE@) ++ + (define %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT? + @HAVE_GIT_OPT_SET_SERVER_CONNECT_TIMEOUT@) + +diff --git a/git/structs.scm b/git/structs.scm +index beebd11..b35ae6d 100644 +--- a/git/structs.scm ++++ b/git/structs.scm +@@ -505,7 +505,9 @@ + '()) + (include-depth ,unsigned-int) + (level ,int) ;git_config_level_t +- (free ,(bs:pointer int)) ++ ,@(if %have-config-entry-free? ++ `(free ,(bs:pointer int)) ++ '()) + ,@(if %have-config-entry-backend-type? + '() + `((payload ,(bs:pointer int))))))) ;removed in 1.8 +-- +2.47.0 + diff --git a/pkgs/by-name/gu/guile-git/0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch b/pkgs/by-name/gu/guile-git/0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch new file mode 100644 index 000000000000..34de2004bb43 --- /dev/null +++ b/pkgs/by-name/gu/guile-git/0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch @@ -0,0 +1,84 @@ +From 595b850c85f55592b94d2218a12084fd7050b508 Mon Sep 17 00:00:00 2001 +From: Emily +Date: Wed, 22 Jan 2025 23:55:45 +0000 +Subject: [PATCH 2/2] =?UTF-8?q?structs:=20Add=20=E2=80=98update-refs?= + =?UTF-8?q?=E2=80=99=20field=20to=20=E2=80=98%remote-callbacks=E2=80=99=20?= + =?UTF-8?q?on=20libgit2=201.9+.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* configure.ac: Check for the ‘update_refs’ field of +‘git_remote_callbacks’. +* git/configuration.scm.in (%have-remote-callbacks-update-refs?): New +variable. +* git/structs.scm (%remote-callbacks): Add ‘update-refs’ field +conditionally. +--- + configure.ac | 10 ++++++++++ + git/configuration.scm.in | 4 ++++ + git/structs.scm | 5 ++++- + 3 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7f8f0b9..a2575f4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -107,6 +107,16 @@ else + fi + AC_SUBST([HAVE_DIFF_OPTIONS_OID_TYPE]) + ++dnl Does 'git_remote_callbacks' have 'update_refs'? New in 1.9. ++AC_CHECK_MEMBER([git_remote_callbacks.update_refs], [], [], ++ [[#include ]]) ++if test "x$ac_cv_member_git_remote_callbacks_update_refs" = "xyes"; then ++ HAVE_REMOTE_CALLBACKS_UPDATE_REFS="#true" ++else ++ HAVE_REMOTE_CALLBACKS_UPDATE_REFS="#false" ++fi ++AC_SUBST([HAVE_REMOTE_CALLBACKS_UPDATE_REFS]) ++ + dnl 'GIT_OPT_SET_SERVER_CONNECT_TIMEOUT' & co. are new in 1.7. + GUILE_GIT_CHECK_DECLARATION([GIT_OPT_SET_SERVER_CONNECT_TIMEOUT]) + +diff --git a/git/configuration.scm.in b/git/configuration.scm.in +index 864b9ff..1e82c24 100644 +--- a/git/configuration.scm.in ++++ b/git/configuration.scm.in +@@ -25,6 +25,7 @@ + %have-diff-options-oid-type? + %have-config-entry-backend-type? + %have-config-entry-free? ++ %have-remote-callbacks-update-refs? + %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT? + %have-GIT_OPT_SET_HOMEDIR? + %have-GIT_OPT_SET_USER_AGENT_PRODUCT?)) +@@ -52,6 +53,9 @@ + (define %have-config-entry-free? + @HAVE_CONFIG_ENTRY_FREE@) + ++(define %have-remote-callbacks-update-refs? ++ @HAVE_REMOTE_CALLBACKS_UPDATE_REFS@) ++ + (define %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT? + @HAVE_GIT_OPT_SET_SERVER_CONNECT_TIMEOUT@) + +diff --git a/git/structs.scm b/git/structs.scm +index b35ae6d..664a7c1 100644 +--- a/git/structs.scm ++++ b/git/structs.scm +@@ -670,7 +670,10 @@ type to 'specified for this to take effect." + (transport ,(bs:pointer uint8)) + (remote-ready ,(bs:pointer void)) + (payload ,(bs:pointer uint8)) +- (resolve-url ,(bs:pointer uint8))))) ++ (resolve-url ,(bs:pointer uint8)) ++ ,@(if %have-remote-callbacks-update-refs? ++ `((update-refs ,(bs:pointer uint8))) ++ '())))) + + (define-record-type + (%make-remote-callbacks bytestructure) +-- +2.47.0 + diff --git a/pkgs/by-name/gu/guile-git/package.nix b/pkgs/by-name/gu/guile-git/package.nix index d7ee5344530e..3765bc06f034 100644 --- a/pkgs/by-name/gu/guile-git/package.nix +++ b/pkgs/by-name/gu/guile-git/package.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { hash = "sha256-lFBoA1VBJRHcZkP3h2gnlXQrMjDFWS4jl9RlF8VVf/Q="; }; + patches = [ + ./0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch + ./0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch + ]; + strictDeps = true; nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo From a50178ff9bda96cbda4519321a0122f11e0b2fb9 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 22 Jan 2025 23:37:28 +0000 Subject: [PATCH 263/280] guile-git: enable tests on Darwin --- pkgs/by-name/gu/guile-git/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gu/guile-git/package.nix b/pkgs/by-name/gu/guile-git/package.nix index 3765bc06f034..dd4f15c50af2 100644 --- a/pkgs/by-name/gu/guile-git/package.nix +++ b/pkgs/by-name/gu/guile-git/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgit2 scheme-bytestructures ]; - doCheck = !stdenv.hostPlatform.isDarwin; + doCheck = true; makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; enableParallelBuilding = true; @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { sed -i -e '94i (test-skip 1)' ./tests/proxy.scm ''; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Bindings to Libgit2 for GNU Guile"; homepage = "https://gitlab.com/guile-git/guile-git"; From e3ad49cbc42c2afcaa30de300e58d142effd03cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 25 Jan 2025 09:41:17 +0100 Subject: [PATCH 264/280] python3Packages.uvloop: avoid test_dns Example issues: https://hydra.nixos.org/build/286095873/nixlog/2/tail --- pkgs/development/python-modules/uvloop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 5bfc3509d174..5976e3249e2e 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -69,6 +69,8 @@ buildPythonPackage rec { "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect" # Depends on performance of builder "--deselect=tests/test_base.py::TestBaseUV.test_call_at" + # Pointless and flaky (at least on darwin, depending on the sandbox perhaps) + "--deselect=tests/test_dns.py" ] ++ lib.optionals (pythonOlder "3.11") [ "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat" From a2e518fc9193b5e99aaba517cb0f537c7c57ff6e Mon Sep 17 00:00:00 2001 From: scraptux Date: Sat, 25 Jan 2025 13:44:15 +0100 Subject: [PATCH 265/280] grpc: 1.69.0 -> 1.70.0 --- pkgs/by-name/gr/grpc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index ee3780a42bc9..72bc6a1de42d 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/pkgs/by-name/gr/grpc/package.nix @@ -24,7 +24,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "grpc"; - version = "1.69.0"; # N.B: if you change this, please update: + version = "1.70.0"; # N.B: if you change this, please update: # pythonPackages.grpcio # pythonPackages.grpcio-channelz # pythonPackages.grpcio-health-checking @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-rRiPUcr6of/sjqB+qr7eOkKVFGTnu8UjluULmcn8df4="; + hash = "sha256-kJhGAhqu25Q2g6BWkVGp6nGYrWdBnMhoMu6e7ifNbgk="; fetchSubmodules = true; }; From b5b0f37c7f28c16d38bb2da1b9e7a747a13c2147 Mon Sep 17 00:00:00 2001 From: scraptux Date: Sat, 25 Jan 2025 13:51:05 +0100 Subject: [PATCH 266/280] python312Packages.grpcio: 1.69.0 -> 1.70.0 --- pkgs/development/python-modules/grpcio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 6d294ad9243c..9e5a11ee27e6 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -18,14 +18,14 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio"; - version = "1.69.0"; + version = "1.70.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-k2+kQkG1N5xa/DROEmDUZ77klXR+r0eN6CW6snkdpvU="; + hash = "sha256-jRWEpo1ZIjMAJYgeY6bBtUzIEXKR04Lk+mkzm22RTFY="; }; outputs = [ From de3521888a3cd29d10d0526473b2b73d14793bc0 Mon Sep 17 00:00:00 2001 From: scraptux Date: Sat, 25 Jan 2025 13:51:38 +0100 Subject: [PATCH 267/280] python312Packages.grpcio-channelz: 1.69.0 -> 1.70.0 --- pkgs/development/python-modules/grpcio-channelz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index cbb83238b8fc..b077c6610a94 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.69.0"; + version = "1.70.0"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-x7WQCm08PoIp5lrktjE9ZMFpPfqnZ/Ww4cbRkVMkgg8="; + hash = "sha256-eTNOJ/bZv7/FNq36KkEIoawEik0FIVjxzB32zDWedIo="; }; build-system = [ setuptools ]; From cd2eaccc3f48dc22004c0b29012968d5fd5bc850 Mon Sep 17 00:00:00 2001 From: scraptux Date: Sat, 25 Jan 2025 13:52:07 +0100 Subject: [PATCH 268/280] python312Packages.grpcio-health-checking: 1.69.0 -> 1.70.0 --- .../python-modules/grpcio-health-checking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index cb08d814fe6f..510918fe10d8 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -11,13 +11,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.69.0"; + version = "1.70.0"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-/24dOMKjALG70paRb72RZWZ7xLWoVX+Z3UIm1Pno9ME="; + hash = "sha256-yl/IanxgmEjDh30RtdLS7SfikjFR4r9h5HBRx9PBDRs="; }; propagatedBuildInputs = [ From 1865b26c156a12a655da610cddea59463236db8b Mon Sep 17 00:00:00 2001 From: scraptux Date: Sat, 25 Jan 2025 13:52:54 +0100 Subject: [PATCH 269/280] python312Packages.grpcio-reflection: 1.69.0 -> 1.70.0 --- pkgs/development/python-modules/grpcio-reflection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 4678c3e2fdbb..056c70c1369e 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.69.0"; + version = "1.70.0"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-NHSq7fsQ2NpVAxNaL7n7tOH3IEStfuLQvyIJCTToCQg="; + hash = "sha256-r0bOE+V/12At6u9bHRkD9mRPiYLMAPYvqfpbkorPakk="; }; build-system = [ setuptools ]; From 2d35fd37468b646e28d67c02579ffc5f629f6a0e Mon Sep 17 00:00:00 2001 From: scraptux Date: Sat, 25 Jan 2025 13:53:10 +0100 Subject: [PATCH 270/280] python312Packages.grpcio-status: 1.69.0 -> 1.70.0 --- pkgs/development/python-modules/grpcio-status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 8207553e80b1..e621a4a6769d 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-status"; - version = "1.69.0"; + version = "1.70.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-WV74TlF41igcqnMsz2j/gyWSQWCNJrDpxApeZu7iotI="; + hash = "sha256-DntCgWUSQzsYuddkKF/wKb3gWenUH4/hCmBjG9g0gQE="; }; postPatch = '' From cbb2cfb4b8d66f442b1edd5858d203d3d1e84539 Mon Sep 17 00:00:00 2001 From: scraptux Date: Sat, 25 Jan 2025 13:53:23 +0100 Subject: [PATCH 271/280] python312Packages.grpcio-testing: 1.69.0 -> 1.70.0 --- pkgs/development/python-modules/grpcio-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 7d06b0816a3b..4e15540acbf9 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.69.0"; + version = "1.70.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-PEOmf3VnSK7E2bCoWLCO7/JGZYcrDEa1CRX5emTeL0A="; + hash = "sha256-XrVNt0zgW8l+4VuzrgDt36ACuD9YBoE1cv2ceYAD4HU="; }; postPatch = '' From 139fecb15242f2e92c005f505106cb1e1c8a4441 Mon Sep 17 00:00:00 2001 From: scraptux Date: Sat, 25 Jan 2025 13:53:41 +0100 Subject: [PATCH 272/280] python312Packages.grpcio-tools: 1.69.0 -> 1.70.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 019db2b4ac1d..10f80525183f 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.69.0"; + version = "1.70.0"; pyproject = true; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-PhqY9Nney4SXnh3dPesJwKM6hLbjwHdtW95Al+OrZt0="; + hash = "sha256-5Xj+58HCE8jkcXUNkmMdAPF4oVR5+yyzuTmgf8ElzNM="; }; outputs = [ From 61e396f19da1e7ea4d5b2e01f8d7e628e18c05f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 24 Jan 2025 15:12:28 +0100 Subject: [PATCH 273/280] qemu-utils: enable crypto support This is required for qemu-img to support luks. This was discovered when trying to fix a failing build with python3Packages.oslo-utils on at least version 7.4.0. Both (lib)gcrypt and nettle together with hogweed are fallbacks when gnutls is not found and are not used despite the convoluted build script suggesting it. Configure output before this patch: ... Crypto TLS priority : NORMAL GNUTLS support : YES 3.8.6 GNUTLS crypto : YES libgcrypt : NO nettle : NO SM4 ALG support : NO SM3 ALG support : NO AF_ALG support : NO rng-none : NO Linux keyring : YES Linux keyutils : NO ... and after this patch: ... Crypto TLS priority : NORMAL GNUTLS support : YES 3.8.6 GNUTLS crypto : YES libgcrypt : NO nettle : NO SM4 ALG support : NO SM3 ALG support : NO AF_ALG support : NO rng-none : NO Linux keyring : YES Linux keyutils : NO ... This can be easily tested by building qemu-utils and running qemu-img create -f luks --object secret,id=sec0,data=secret-passphrase -o key-secret=sec0 tmp.img 536870912 which is the command that failed in oslo-utils --- pkgs/applications/virtualization/qemu/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 9aa0c637d2b6..5853f258c4f0 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, overrideSDK, buildPackages , pixman, vde2, alsa-lib, flex, pcre2 -, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson, perl +, bison, lzo, snappy, libaio, libtasn1, gnutls, curl, dtc, ninja, meson, perl , sigtool , makeWrapper, removeReferencesTo , attr, libcap, libcap_ng, socat, libslirp @@ -94,8 +94,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool rez setfile ] ++ lib.optionals (!userOnly) [ dtc ]; - buildInputs = [ glib zlib ] - ++ lib.optionals (!minimal) [ dtc pixman vde2 lzo snappy libtasn1 gnutls nettle libslirp ] + # gnutls is required for crypto support (luks) in qemu-img + buildInputs = [ glib gnutls zlib ] + ++ lib.optionals (!minimal) [ dtc pixman vde2 lzo snappy libtasn1 libslirp ] ++ lib.optionals (!userOnly) [ curl ] ++ lib.optionals ncursesSupport [ ncurses ] ++ lib.optionals stdenv.hostPlatform.isDarwin darwinSDK @@ -166,6 +167,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-strip" # We'll strip ourselves after separating debug info. + "--enable-gnutls" # auto detection only works when building with --enable-system (lib.enableFeature enableDocs "docs") (lib.enableFeature enableTools "tools") "--localstatedir=/var" From 44bbc61a12717710fb8478ab1285733bbd6350c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 25 Jan 2025 16:54:21 +0100 Subject: [PATCH 274/280] qemu: drop unused inputs --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 5853f258c4f0..63675696b3b3 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, overrideSDK, buildPackages -, pixman, vde2, alsa-lib, flex, pcre2 +{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages +, pixman, vde2, alsa-lib, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, curl, dtc, ninja, meson, perl , sigtool , makeWrapper, removeReferencesTo From cace2b6eae83f813290074bc572ade8dff09c4fe Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 23 Jan 2025 16:07:59 +0100 Subject: [PATCH 275/280] treewide: migrate to fetchCargoVendor, batch 4 Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. It should be possible to reproduce this diff. To generate it, I first ran: xargs sed -i 's/fetchCargoTarball/fetchCargoVendor/g' The following manually identified list of files were given as standard input: pkgs/applications/graphics/drawpile/default.nix pkgs/applications/graphics/gnome-decoder/default.nix pkgs/applications/graphics/gnome-obfuscate/default.nix pkgs/applications/misc/openbangla-keyboard/default.nix pkgs/applications/version-management/git-cinnabar/default.nix pkgs/applications/version-management/mercurial/default.nix pkgs/applications/version-management/silver-platter/default.nix pkgs/applications/virtualization/krunvm/default.nix pkgs/development/libraries/librsvg/default.nix pkgs/development/python-modules/aardwolf/default.nix pkgs/development/python-modules/adblock/default.nix pkgs/development/python-modules/ahocorasick-rs/default.nix pkgs/development/python-modules/bcrypt/default.nix pkgs/development/python-modules/biliass/default.nix pkgs/development/python-modules/chromadb/default.nix pkgs/development/python-modules/clarabel/default.nix pkgs/development/python-modules/cmsis-pack-manager/default.nix pkgs/development/python-modules/copykitten/default.nix pkgs/development/python-modules/cramjam/default.nix pkgs/development/python-modules/cryptg/default.nix pkgs/development/python-modules/cryptography/default.nix pkgs/development/python-modules/css-inline/default.nix pkgs/development/python-modules/deebot-client/default.nix pkgs/development/python-modules/deltalake/default.nix pkgs/development/python-modules/etebase/default.nix pkgs/development/python-modules/evtx/default.nix pkgs/development/python-modules/fastcrc/default.nix pkgs/development/python-modules/flaxlib/default.nix pkgs/development/python-modules/gb-io/default.nix pkgs/development/python-modules/glean-sdk/default.nix pkgs/development/python-modules/hf-transfer/default.nix pkgs/development/python-modules/jh2/default.nix pkgs/development/python-modules/johnnycanencrypt/default.nix pkgs/development/python-modules/kurbopy/default.nix pkgs/development/python-modules/libcst/default.nix pkgs/development/python-modules/lzallright/default.nix pkgs/development/python-modules/netifaces2/default.nix pkgs/development/python-modules/nlpo3/default.nix pkgs/development/python-modules/nutils-poly/default.nix pkgs/development/python-modules/nutpie/default.nix pkgs/development/python-modules/orjson/default.nix pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix pkgs/development/python-modules/pendulum/default.nix pkgs/development/python-modules/primp/default.nix pkgs/development/python-modules/py-sr25519-bindings/default.nix pkgs/development/python-modules/pycddl/default.nix pkgs/development/python-modules/pydantic-core/default.nix pkgs/development/python-modules/pyperscan/default.nix pkgs/development/python-modules/pysequoia/default.nix pkgs/development/python-modules/python-bidi/default.nix pkgs/development/python-modules/python-kadmin-rs/default.nix pkgs/development/python-modules/qiskit-terra/default.nix pkgs/development/python-modules/regress/default.nix pkgs/development/python-modules/rpds-py/default.nix pkgs/development/python-modules/rtoml/default.nix pkgs/development/python-modules/rustworkx/default.nix pkgs/development/python-modules/safetensors/default.nix pkgs/development/python-modules/skytemple-rust/default.nix pkgs/development/python-modules/sourmash/default.nix pkgs/development/python-modules/spacy-alignments/default.nix pkgs/development/python-modules/sudachipy/default.nix pkgs/development/python-modules/test-results-parser/default.nix pkgs/development/python-modules/tiktoken/default.nix pkgs/development/python-modules/tokenizers/default.nix pkgs/development/python-modules/tree-sitter-make/default.nix pkgs/development/python-modules/whenever/default.nix pkgs/development/python-modules/y-py/default.nix pkgs/development/python-modules/zxcvbn-rs-py/default.nix pkgs/development/r-modules/default.nix pkgs/games/ddnet/default.nix pkgs/servers/matrix-synapse/plugins/rendezvous.nix pkgs/tools/filesystems/ceph/default.nix pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix Then I ran: xargs -n 1 nix-update --version=skip With this list of attributes corresponding to the changed files given as standard input: drawpile gnome-decoder gnome-obfuscate ibus-engines.openbangla-keyboard git-cinnabar mercurial silver-platter krunvm librsvg python3Packages.aardwolf python3Packages.adblock python3Packages.ahocorasick-rs python3Packages.bcrypt python3Packages.biliass python3Packages.chromadb python3Packages.clarabel python3Packages.cmsis-pack-manager python3Packages.copykitten python3Packages.cramjam python3Packages.cryptg python3Packages.cryptography python3Packages.css-inline python3Packages.deebot-client python3Packages.deltalake python3Packages.etebase python3Packages.evtx python3Packages.fastcrc python3Packages.flaxlib python3Packages.gb-io python3Packages.glean-sdk python3Packages.hf-transfer python3Packages.jh2 python3Packages.johnnycanencrypt python3Packages.kurbopy python3Packages.libcst python3Packages.lzallright python3Packages.netifaces2 python3Packages.nlpo3 python3Packages.nutils-poly python3Packages.nutpie python3Packages.orjson python3Packages.pdoc-pyo3-sample-library python3Packages.pendulum python3Packages.primp python3Packages.py-sr25519-bindings python3Packages.pycddl python3Packages.pydantic-core python3Packages.pyperscan python3Packages.pysequoia python3Packages.python-bidi python3Packages.python-kadmin-rs python3Packages.qiskit-terra python3Packages.regress python3Packages.rpds-py python3Packages.rtoml python3Packages.rustworkx python3Packages.safetensors python3Packages.skytemple-rust python3Packages.sourmash python3Packages.spacy-alignments python3Packages.sudachipy python3Packages.test-results-parser python3Packages.tiktoken python3Packages.tokenizers python3Packages.tree-sitter-make python3Packages.whenever python3Packages.y-py python3Packages.zxcvbn-rs-py rPackages.gifski rPackages.timeless ddnet matrix-synapse-plugins.matrix-http-rendezvous-synapse ceph.python.pkgs.bcrypt ceph.python.pkgs.cryptography The list of files for the first command and the list of attributes for the second command are in the same order, so it should be easy enough to check their correspondence by putting them side by side. It might be possible to parallelize the nix-update operations using xargs' -P option. I haven't tested it. I also manually removed the now-outdated comment in pkgs/development/libraries/librsvg/default.nix. --- pkgs/applications/graphics/drawpile/default.nix | 4 ++-- pkgs/applications/graphics/gnome-decoder/default.nix | 4 ++-- pkgs/applications/graphics/gnome-obfuscate/default.nix | 4 ++-- pkgs/applications/misc/openbangla-keyboard/default.nix | 4 ++-- .../version-management/git-cinnabar/default.nix | 4 ++-- .../applications/version-management/mercurial/default.nix | 4 ++-- .../version-management/silver-platter/default.nix | 4 ++-- pkgs/applications/virtualization/krunvm/default.nix | 4 ++-- pkgs/development/libraries/librsvg/default.nix | 5 ++--- pkgs/development/python-modules/aardwolf/default.nix | 4 ++-- pkgs/development/python-modules/adblock/default.nix | 4 ++-- .../development/python-modules/ahocorasick-rs/default.nix | 4 ++-- pkgs/development/python-modules/bcrypt/default.nix | 4 ++-- pkgs/development/python-modules/biliass/default.nix | 4 ++-- pkgs/development/python-modules/chromadb/default.nix | 4 ++-- pkgs/development/python-modules/clarabel/default.nix | 4 ++-- .../python-modules/cmsis-pack-manager/default.nix | 4 ++-- pkgs/development/python-modules/copykitten/default.nix | 4 ++-- pkgs/development/python-modules/cramjam/default.nix | 4 ++-- pkgs/development/python-modules/cryptg/default.nix | 4 ++-- pkgs/development/python-modules/cryptography/default.nix | 4 ++-- pkgs/development/python-modules/css-inline/default.nix | 4 ++-- pkgs/development/python-modules/deebot-client/default.nix | 4 ++-- pkgs/development/python-modules/deltalake/default.nix | 4 ++-- pkgs/development/python-modules/etebase/default.nix | 4 ++-- pkgs/development/python-modules/evtx/default.nix | 4 ++-- pkgs/development/python-modules/fastcrc/default.nix | 4 ++-- pkgs/development/python-modules/flaxlib/default.nix | 4 ++-- pkgs/development/python-modules/gb-io/default.nix | 4 ++-- pkgs/development/python-modules/glean-sdk/default.nix | 4 ++-- pkgs/development/python-modules/hf-transfer/default.nix | 4 ++-- pkgs/development/python-modules/jh2/default.nix | 4 ++-- .../python-modules/johnnycanencrypt/default.nix | 4 ++-- pkgs/development/python-modules/kurbopy/default.nix | 4 ++-- pkgs/development/python-modules/libcst/default.nix | 4 ++-- pkgs/development/python-modules/lzallright/default.nix | 4 ++-- pkgs/development/python-modules/netifaces2/default.nix | 4 ++-- pkgs/development/python-modules/nlpo3/default.nix | 4 ++-- pkgs/development/python-modules/nutils-poly/default.nix | 4 ++-- pkgs/development/python-modules/nutpie/default.nix | 4 ++-- pkgs/development/python-modules/orjson/default.nix | 4 ++-- .../python-modules/pdoc-pyo3-sample-library/default.nix | 4 ++-- pkgs/development/python-modules/pendulum/default.nix | 4 ++-- pkgs/development/python-modules/primp/default.nix | 4 ++-- .../python-modules/py-sr25519-bindings/default.nix | 4 ++-- pkgs/development/python-modules/pycddl/default.nix | 4 ++-- pkgs/development/python-modules/pydantic-core/default.nix | 4 ++-- pkgs/development/python-modules/pyperscan/default.nix | 4 ++-- pkgs/development/python-modules/pysequoia/default.nix | 4 ++-- pkgs/development/python-modules/python-bidi/default.nix | 4 ++-- .../python-modules/python-kadmin-rs/default.nix | 4 ++-- pkgs/development/python-modules/qiskit-terra/default.nix | 4 ++-- pkgs/development/python-modules/regress/default.nix | 4 ++-- pkgs/development/python-modules/rpds-py/default.nix | 4 ++-- pkgs/development/python-modules/rtoml/default.nix | 4 ++-- pkgs/development/python-modules/rustworkx/default.nix | 4 ++-- pkgs/development/python-modules/safetensors/default.nix | 4 ++-- .../development/python-modules/skytemple-rust/default.nix | 4 ++-- pkgs/development/python-modules/sourmash/default.nix | 4 ++-- .../python-modules/spacy-alignments/default.nix | 4 ++-- pkgs/development/python-modules/sudachipy/default.nix | 4 ++-- .../python-modules/test-results-parser/default.nix | 4 ++-- pkgs/development/python-modules/tiktoken/default.nix | 4 ++-- pkgs/development/python-modules/tokenizers/default.nix | 4 ++-- .../python-modules/tree-sitter-make/default.nix | 4 ++-- pkgs/development/python-modules/whenever/default.nix | 4 ++-- pkgs/development/python-modules/y-py/default.nix | 4 ++-- pkgs/development/python-modules/zxcvbn-rs-py/default.nix | 4 ++-- pkgs/development/r-modules/default.nix | 8 ++++---- pkgs/games/ddnet/default.nix | 4 ++-- pkgs/servers/matrix-synapse/plugins/rendezvous.nix | 4 ++-- pkgs/tools/filesystems/ceph/default.nix | 4 ++-- .../filesystems/ceph/old-python-packages/cryptography.nix | 4 ++-- 73 files changed, 148 insertions(+), 149 deletions(-) diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index b8a9339f5ecf..2b51e4cf207b 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -76,9 +76,9 @@ mkDerivation rec { sha256 = "sha256-NS1aQlWpn3f+SW0oUjlYwHtOS9ZgbjFTrE9grjK5REM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-V36yiwraXK7qlJd1r8EtEA4ULxlgvMEmpn/ka3m9GjA="; + hash = "sha256-rY4zWSCBfVXvl6p9GvtDg/PFZfLkWTl8FTYdlKTzWYM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix index 3114262e765f..abaaf14cfd10 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -38,10 +38,10 @@ clangStdenv.mkDerivation rec { hash = "sha256-qSPuEVW+FwC9OJa+dseIy4/2bhVdTryJSJNSpes9tpY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-MbfukvqlzZPnWNtWCwYn7lABqBxtZWvPDba9Deah+w8="; + hash = "sha256-xQlzSsvwDNK3Z8xnUQgCU6Q8+ls0Urks778pYwN2X1Y="; }; preFixup = '' diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 5c8a61a5d25c..6e5641cafd2a 100644 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-/Plvvn1tle8t/bsPcsamn5d81CqnyGCyGYPF6j6U5NI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-9lrxK2psdIPGsOC6p8T+3AGPrX6PjrK9mFirdJqBSMM="; + hash = "sha256-Llgn+dYNKZ9Mles9f9Xor+GZoCCQ0cERkXz4MicZglY="; }; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index f257eff50a32..a059a14df05a 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { zstd ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; postPatch = '' cp ${./Cargo.lock} Cargo.lock ''; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-XMleyP2h1aBhtjXhuGHyU0BN+tuL12CGoj+kLY5uye0="; + hash = "sha256-qZMTZi7eqEp5kSmVx7qdS7eDKOzSv9fMjWT0h/MGyeY="; }; cmakeFlags = diff --git a/pkgs/applications/version-management/git-cinnabar/default.nix b/pkgs/applications/version-management/git-cinnabar/default.nix index a2419364cdec..73619ecf6df6 100644 --- a/pkgs/applications/version-management/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-cinnabar/default.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: { zstd ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-fTwHwZsBvp2F4w5reF94imaXnsw7xfgJQlGRZ3ztnK8="; + hash = "sha256-B2wLxSedFEgL+DPH4D6qL46ovcBZhPSacsYJKscKDYQ="; }; ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index de5ccce0025b..8806d8bec6d4 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -52,10 +52,10 @@ let cargoDeps = if rustSupport then - rustPlatform.fetchCargoTarball { + rustPlatform.fetchCargoVendor { inherit src; name = "mercurial-${version}"; - hash = "sha256-E8Q0hMLPLkUZ5W5iqe4w5t/71HQuRBTF3SRUBN8EMik="; + hash = "sha256-k/K1BupCqnlB++2T7hJxu82yID0jG8HwLNmb2eyx29o="; sourceRoot = "mercurial-${version}/rust"; } else diff --git a/pkgs/applications/version-management/silver-platter/default.nix b/pkgs/applications/version-management/silver-platter/default.nix index cf449383a9ac..8c585b7e6f8e 100644 --- a/pkgs/applications/version-management/silver-platter/default.nix +++ b/pkgs/applications/version-management/silver-platter/default.nix @@ -30,10 +30,10 @@ buildPythonApplication rec { hash = "sha256-k+C4jrC4FO/yy9Eb6x4lv1zyyp/eGkpMcDqZ0KoxfBs="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-+EUj6iBnHF4zlOAAfaHy5V/z6CCD/LFksBClE4FaHHc="; + hash = "sha256-hZQfzaLvHSN/hGR5vn+/2TRH6GwDTTp+UcnePXY7JlM="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index 24c806589db7..8d100b93d439 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { hash = "sha256-IXofYsOmbrjq8Zq9+a6pvBYsvZFcKzN5IvCuHaxwazI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-Y0FNi/+HuN5SqexHTKjcW6lEaeis7xZDYc2/FOAANIA="; + hash = "sha256-Vmb5IgGyKGekuL018/Xiz9QroWIwTIUxVB57fb0X7Kw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 7a71acada504..78f83a9a9d0f 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -61,11 +61,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-SfKaCpL0wtGaLLQelqsvzn61veQYUMipFPz2VeMRCUQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-pTd3H4ZYwsCb4C6gijE0gRWZ4Mq6gGGmwXE3nKGILhw="; - # TODO: move this to fetchCargoTarball + hash = "sha256-cO79X3M0B6WN4w0JeBh00EyaIdHcthOkeKhaYdTn2BQ="; dontConfigure = true; }; diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 903ef62b62d2..100cced60f23 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -36,11 +36,11 @@ buildPythonPackage rec { hash = "sha256-daDxkQ7N0+yS2JOLfXJq4jv+5VQNnwtqIMy2p8j+Sag="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${src.name}/aardwolf/utils/rlers"; name = "${pname}-${version}"; - hash = "sha256-dGWPgyg8Ibyz3KcrMUI7xL7gTJ7iZ4sN0zOxFxcIrhM="; + hash = "sha256-doBraJQtekrO/ZZV9KFz7BdIgBVVWtQztUS2Gz8dDdA="; }; cargoRoot = "aardwolf/utils/rlers"; diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 9ad1bd40b79b..011c47f6c286 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -45,10 +45,10 @@ buildPythonPackage rec { --replace "0.0.0" "${version}" ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-1xmYmF5P7a5O9MilxDy+CVhmWMGRetdM2fGvTPy7JmM="; + hash = "sha256-fetJX6HQxRZ/Az7rJeU9S+s8ttgNPnJEvTLfzGt4xjk="; }; nativeBuildInputs = diff --git a/pkgs/development/python-modules/ahocorasick-rs/default.nix b/pkgs/development/python-modules/ahocorasick-rs/default.nix index 2f81eb4ccc4d..b5eb2652ac8c 100644 --- a/pkgs/development/python-modules/ahocorasick-rs/default.nix +++ b/pkgs/development/python-modules/ahocorasick-rs/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { hash = "sha256-lzRwODlJlymMSih3CqNIeR+HrUbgVhroM1JuHFfW848="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-CIt/ChNcoqKln6PgeTGp9pfmIWlJj+c5SCPtBhsnT6U="; + hash = "sha256-Oslf85uI3pO9br7s1J9Y9I/UZ5KDOvJZ/30BMudVBZ0="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 93e4a7addef2..ec81d53cf141 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -32,11 +32,11 @@ buildPythonPackage rec { }; cargoRoot = "src/_bcrypt"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-dOS9A3pTwXYkzPFFNh5emxJw7pSdDyY+mNIoHdwNdmg="; + hash = "sha256-TD1Qacr2BS3CutGzDcUSweTrlMuKy0U/eIS/oBLxTlI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index db4c6571cb24..cb49963d25bc 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { sourceRoot = "source/packages/biliass"; cargoRoot = "rust"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src ; sourceRoot = "${sourceRoot}/${cargoRoot}"; - hash = "sha256-fXYjIJNrNQSXEACSa/FwxGlBYq5SxfIVIt4LtP0taFc="; + hash = "sha256-yR2eVsomepIh9ILon7PrAj2EBgI/vwN3JgRSR/3R1Mk="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index e10e42a6d22b..842688a6434f 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -64,10 +64,10 @@ buildPythonPackage rec { hash = "sha256-DQHkgCHtrn9xi7Kp7TZ5NP1EtFtTH5QOvne9PUvxsWc="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-vHH7Uq4Jf8/5Vc8oZ5nvAeq/dFVWywsQYbp7yJkfX7Q="; + hash = "sha256-ZtCTg8qNCiqlH7RsZxaWUNAoazdgmXP2GtpjDpRdvbk="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/clarabel/default.nix b/pkgs/development/python-modules/clarabel/default.nix index f6e4e09edc7c..22b49396269d 100644 --- a/pkgs/development/python-modules/clarabel/default.nix +++ b/pkgs/development/python-modules/clarabel/default.nix @@ -20,10 +20,10 @@ buildPythonPackage rec { hash = "sha256-DW0/6IAL5bS11AqOFL1JJmez5GzF2+N2d85e0l8HGdQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-NNvrDXBodrO3bxr4X1HEn5uHmHDJ1s9C70lPv7OkSCo="; + hash = "sha256-a8BXdA5rOjQRvacPRmobHxedHWNFZVyNN1xit+N8q3Y="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 40a821b80eee..29e2664034f6 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -27,9 +27,9 @@ buildPythonPackage rec { hash = "sha256-PeyJf3TGUxv8/MKIQUgWrenrK4Hb+4cvtDA2h3r6kGg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-dO4qw5Jx0exwb4RuOhu6qvGxQZ+LayHtXDHZKADLTEI="; + hash = "sha256-OBh5WWSekrqdLLmxEXS0LfPIfy4QWKYgO+8o6PYWjN4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/copykitten/default.nix b/pkgs/development/python-modules/copykitten/default.nix index 385cfe79401e..53922dc8f298 100644 --- a/pkgs/development/python-modules/copykitten/default.nix +++ b/pkgs/development/python-modules/copykitten/default.nix @@ -18,9 +18,9 @@ buildPythonPackage rec { hash = "sha256-S4IPVhYk/o15LQK1AB8VpdrHwIwTZyvmI2+e27/vDLs="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-Qgg2S1nRwWs2O81huj1g4wq7v4G377T+V8/1rjhz1ZE="; + hash = "sha256-kWhZzX/OI+05rvVFD+lOFvpKbNH/gMROFufcCzYDyko="; }; build-system = [ diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index 091842c392b6..dc35cbc2c6ff 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -23,9 +23,9 @@ buildPythonPackage rec { hash = "sha256-1KD5/oZjfdXav1ZByQoyyiDSzbmY4VJsSJg/FtUFdDE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-Bp7EtyuLdLUfU3yvouNVE42klfqYt9QOwt+iGe521yI="; + hash = "sha256-Gpj/LUCx/ivYlmxNJnEZr8caEfV4OaQwEPNjz7vobsw="; }; buildAndTestSubdir = "cramjam-python"; diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix index 517e66eb565d..0639c1e021bb 100644 --- a/pkgs/development/python-modules/cryptg/default.nix +++ b/pkgs/development/python-modules/cryptg/default.nix @@ -24,9 +24,9 @@ buildPythonPackage rec { hash = "sha256-GCTVxCJQvpvHpzaU+OaFM/AKoRvxLyA0u6VIV+94UTY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-BqtswBTurZoKw7DR3S7woDKLqAqIjKdSS5TBwCI+Bps="; + hash = "sha256-+RNH9h40UTGUcr0PPJLllhAg81LM1IQnYKmrNxfPPv8="; }; build-system = [ diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 0a8ebbc5d9f6..b503255f1565 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -36,10 +36,10 @@ buildPythonPackage rec { hash = "sha256-A+qYW8GksYk+FQG8ZJHNYrjcouE1CsVH0Lko2ahoYUI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-LJIY2O8ul36JQmhiW8VhLCQ0BaX+j+HGr3e8RUkZpc8="; + hash = "sha256-Ni/i21JgAemDXsJOXLL6IKjrJdBkw5jxBB0IdETBPcs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index 0f6ed18338a6..39a304460bd1 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { # call `cargo build --release` in bindings/python and copy the # resulting lock file - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; postPatch = '' cd bindings/python ln -s ${./Cargo.lock} Cargo.lock ''; name = "${pname}-${version}"; - hash = "sha256-FvkVwd681EhEHRJ8ip97moEkRE3VcuIPbi+F1SjXz8E="; + hash = "sha256-IQDICT/etlwnVqAo7es9PqwOqna48QdVYrHJq/aRsJo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 2260e5ce30a7..80b03160ad6f 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -34,9 +34,9 @@ buildPythonPackage rec { hash = "sha256-G8NLirz81+b2YJBvxmfCEPpy2M9MMvs3n6JmdXR+3oc="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-9rXd5FFR+Ma0LJfKXwkDqZp096PA34V7TzPe/tahE7c="; + hash = "sha256-mpm5TYYWb8hENhRPAiE9KbprdtdlKZx12cLZQ+UbziE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix index 74622f890144..c072a5c82098 100644 --- a/pkgs/development/python-modules/deltalake/default.nix +++ b/pkgs/development/python-modules/deltalake/default.nix @@ -28,9 +28,9 @@ buildPythonPackage rec { hash = "sha256-serMb6Rirmw+QLpET3NT2djBoFBW/TGu1/5qYjiYpKE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-NkXovFsX+qbca+gYeBMQnacNzubloWNW/GrXNeWquE8="; + hash = "sha256-WGnjVYws8ZZMv0MvBrohozxQuyOImktaLxuvAIiH+U0="; }; env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index 5157aa329dcd..10e71d28cb2f 100644 --- a/pkgs/development/python-modules/etebase/default.nix +++ b/pkgs/development/python-modules/etebase/default.nix @@ -41,10 +41,10 @@ buildPythonPackage rec { }) ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-We19laZd6b2fLSPNLegyNp0eQSeCvUJeTIXqvG7o08c="; + hash = "sha256-tFOZJFrNge3N+ux2Hp4Mlm9K/AXYxuuBzEQdQYGGDjg="; inherit patches; }; diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix index 7a8339ee3da7..8cd18b628502 100644 --- a/pkgs/development/python-modules/evtx/default.nix +++ b/pkgs/development/python-modules/evtx/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { hash = "sha256-wo6CeHlEBbu3klzzC4dUbjSfu7XwLo/cmtmZsVIKgS8="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-qBpc3PwvAceOMuRH4vrgURCsvKYhG2Id62n7sxW5AAg="; + hash = "sha256-Zdj0trB0wIVC9xg64wVOIrstdG7LGMOhWcRFXQJGNls="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/fastcrc/default.nix b/pkgs/development/python-modules/fastcrc/default.nix index c53d84054879..d1ae326e96ea 100644 --- a/pkgs/development/python-modules/fastcrc/default.nix +++ b/pkgs/development/python-modules/fastcrc/default.nix @@ -30,10 +30,10 @@ buildPythonPackage { maturinBuildHook ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-wSE7548L+ymNjN9TfygAGY1BrssXOPGXlmE83wV7zb4="; + hash = "sha256-9Vap8E71TkBIf4eIB2lapUqcMukdsHX4LR7U8AD77SU="; }; pythonImportsCheck = [ "fastcrc" ]; diff --git a/pkgs/development/python-modules/flaxlib/default.nix b/pkgs/development/python-modules/flaxlib/default.nix index 1a3a35ac30c5..30c8e7617e76 100644 --- a/pkgs/development/python-modules/flaxlib/default.nix +++ b/pkgs/development/python-modules/flaxlib/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { fi ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src sourceRoot ; - hash = "sha256-RPbMHnRdJaWKLU9Rkz39lmfibO20dnfZmLZqehHM3w4="; + hash = "sha256-CN/ZbDxdCQPEuLfxPh/m+JtlFDkerO8aWgAaUwhixjQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix index 233d12f3eac6..df7477fe8ddc 100644 --- a/pkgs/development/python-modules/gb-io/default.nix +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -22,10 +22,10 @@ buildPythonPackage rec { hash = "sha256-1B7BUJ8H+pTtmDtazfPfYtlXzL/x4rAHtRIFAAsSoWs="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src sourceRoot; name = "${pname}-${version}"; - hash = "sha256-lPnOFbEJgcaPPl9bTngugubhW//AUFp9RAjyiFHxC70="; + hash = "sha256-xHptfXQXtIz7swaPIgua8VpHHMqDtlDerTNtIL6VGSo="; }; sourceRoot = src.name; diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 11b7157f4b12..0a1375fbac99 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { hash = "sha256-C3wQdxPNBPQN6eUK6Vq0bA6Wpqb28e9BTBf7c/hTQxU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-XqOCHnvM64kZNifU5Wt/bFAvyRVy28ozWSwlvm/sMk8="; + hash = "sha256-KYli1SxrWAm6TnU0dAKOXzBtBInnschCEHZmYctPlhI="; }; build-system = [ diff --git a/pkgs/development/python-modules/hf-transfer/default.nix b/pkgs/development/python-modules/hf-transfer/default.nix index e448bf020085..4e581ffe9f4d 100644 --- a/pkgs/development/python-modules/hf-transfer/default.nix +++ b/pkgs/development/python-modules/hf-transfer/default.nix @@ -28,10 +28,10 @@ buildPythonPackage rec { hash = "sha256-Uh8q14OeN0fYsywYyNrH8C3wq/qRjQKEAIufi/a5RXA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-I4APdz1r2KJ8pTfKAg8g240wYy8gtMlHwmBye4796Tk="; + hash = "sha256-q+tAqpPubQ7P/KiBcVpAjOh8i12EfIcdcRjyEQNQQFI="; }; build-system = [ diff --git a/pkgs/development/python-modules/jh2/default.nix b/pkgs/development/python-modules/jh2/default.nix index de3b7403b69f..694eb3ca0116 100644 --- a/pkgs/development/python-modules/jh2/default.nix +++ b/pkgs/development/python-modules/jh2/default.nix @@ -25,10 +25,10 @@ buildPythonPackage rec { fetchSubmodules = true; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-E/Ah1sEqKrJd49ZvvbhqWtV1Abd0S1Ab/AF4tOn2RPY="; + hash = "sha256-nzLU6QhoJGNCqFF6pzzMr7FHbrLnNq7PvPC42VOrYo8="; }; build-system = [ diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index da1b52bdd224..14d62ebd0f3c 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -29,10 +29,10 @@ buildPythonPackage rec { hash = "sha256-tbHW3x+vwFz0nqFGWvgxjhw8XH6/YKz1uagU339SZyk="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-vDlMdzZgmaRkviEk8IjIN+Q5x95gnpQiW5c8fT+dats="; + hash = "sha256-2kgp3RD2QbxL/Xk4iljjJZ8yEfo2umFtcN5CEtheyw8="; }; build-system = with rustPlatform; [ diff --git a/pkgs/development/python-modules/kurbopy/default.nix b/pkgs/development/python-modules/kurbopy/default.nix index 3ced53fcde02..24be0cb520b2 100644 --- a/pkgs/development/python-modules/kurbopy/default.nix +++ b/pkgs/development/python-modules/kurbopy/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-W0BebCXC1wqwtQP+zHjISxSJjXHD9U6p9eNS12Nfb2Y="; + hash = "sha256-EPSaMIZqXrFzXAwNr1AtvmntkCLePXwAVzGMj8dWbTQ="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 6abcf4ed9cae..295420bc8f16 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -35,10 +35,10 @@ buildPythonPackage rec { hash = "sha256-OuokZvdaCTgZI1VoXInqs6YNLsVUohaat5IjYYvUeVE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-+sCBkCR2CxgG/NuWch8sZTCitKynZmF221mR16TbQKI="; + hash = "sha256-PrWcnhfhc3ZTVwTjzp7cIVlUYeXo164AO687rBI/IoY="; }; cargoRoot = "native"; diff --git a/pkgs/development/python-modules/lzallright/default.nix b/pkgs/development/python-modules/lzallright/default.nix index ee5be2d8dc44..bb6138bb7d16 100644 --- a/pkgs/development/python-modules/lzallright/default.nix +++ b/pkgs/development/python-modules/lzallright/default.nix @@ -19,10 +19,10 @@ buildPythonPackage rec { hash = "sha256-6Dez14qlZ7cnVQfaiTHGuiTSAHvBoKtolgKF7ne9ASw="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-ZYFAWkcDdX10024hc+gdARyaJFpNNcXf+gGLxBP5VlA="; + hash = "sha256-pMYmPnL2bCqYkE3FJhZLOO4fGUXmDaFeDzTeAGRDRuI="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/netifaces2/default.nix b/pkgs/development/python-modules/netifaces2/default.nix index d6dfdd941442..df51595fc2a5 100644 --- a/pkgs/development/python-modules/netifaces2/default.nix +++ b/pkgs/development/python-modules/netifaces2/default.nix @@ -23,9 +23,9 @@ buildPythonPackage { disabled = pythonOlder "3.7"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-dkqI0P61ciGqPtBc/6my7osaxxO9pEgovZhlpo1HdkU="; + hash = "sha256-n8IDl1msu2wn6YSsRJDy48M8qo96cXD8n+2HeU2WspE="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/nlpo3/default.nix b/pkgs/development/python-modules/nlpo3/default.nix index a88dceb9f8b4..c0fc956df12f 100644 --- a/pkgs/development/python-modules/nlpo3/default.nix +++ b/pkgs/development/python-modules/nlpo3/default.nix @@ -32,9 +32,9 @@ buildPythonPackage rec { sourceRoot = "${src.name}/nlpo3-python"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src sourceRoot; - hash = "sha256-PDDlG5nLedgA+HFZzkrxtfUjTwwioQhpsk5qlbAe3ws="; + hash = "sha256-S5nDOz/3ZenvMs8ruybEu5ULefeYGPIKO8kCW3dTa+E="; }; preCheck = '' diff --git a/pkgs/development/python-modules/nutils-poly/default.nix b/pkgs/development/python-modules/nutils-poly/default.nix index adbe9a34ed6f..e59a281ee7a9 100644 --- a/pkgs/development/python-modules/nutils-poly/default.nix +++ b/pkgs/development/python-modules/nutils-poly/default.nix @@ -24,10 +24,10 @@ buildPythonPackage rec { hash = "sha256-dxFv4Az3uz6Du5dk5KZJ+unVbt3aZjxXliAQZhmBWDM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "${pname}-${version}"; inherit src; - hash = "sha256-+fnKvlSwM197rsyusFH7rs1W6livxel45UGbi1sB05k="; + hash = "sha256-3UBQJfMPVo37V7mJnN9loF1+vKh3JxFJWgynwsOnAg4="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook ]; diff --git a/pkgs/development/python-modules/nutpie/default.nix b/pkgs/development/python-modules/nutpie/default.nix index 9155ca59753e..a37f5b50c79d 100644 --- a/pkgs/development/python-modules/nutpie/default.nix +++ b/pkgs/development/python-modules/nutpie/default.nix @@ -40,10 +40,10 @@ buildPythonPackage rec { hash = "sha256-XyUMCnHm5V7oFaf3W+nGpcHfq1ZFppeGMIMCU5OB87s="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-9lM1S42Bmnlb0opstZN2aOKYhBnP87Frq+fQxk0ez+c="; + hash = "sha256-mLoMbIy3Chmby+c6j3dg+bQvIHuhDgt3ZzPIXB3WxuE="; }; build-system = [ diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index f05df1c82144..6ad23bc0e203 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -42,10 +42,10 @@ buildPythonPackage rec { hash = "sha256-RJcTyLf2pLb1kHd7+5K9dGMWja4KFdKIwdRAp6Ud+Ps="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-HlvsV3Bsxa4Ud1+RrEnDWKX82DRyfgBS7GvK9827/wE="; + hash = "sha256-sxUp3q9S1PmwUmbmXWj235MB+qAFzTCu8x1OXOzVUpY="; }; nativeBuildInputs = diff --git a/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix b/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix index 9e74fa519175..c563f8990559 100644 --- a/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix +++ b/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix @@ -20,9 +20,9 @@ buildPythonPackage rec { hash = "sha256-ZGMo7WgymkSDQu8tc4rTfWNsIWO0AlDPG0OzpKRq3oA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-KrEBr998AV/bKcIoq0tX72/QwPD9bQplrS0Zw+JiSMQ="; + hash = "sha256-XqXkheK8OEzlLEbq09KMRFxrjJBnFaxvj4rIL2gmydA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 718377eefd6f..b74866ffd026 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -43,11 +43,11 @@ buildPythonPackage rec { ''; cargoRoot = "rust"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${src.name}/rust"; name = "${pname}-${version}"; - hash = "sha256-6fw0KgnPIMfdseWcunsGjvjVB+lJNoG3pLDqkORPJ0I="; + hash = "sha256-6WgGIfz9I+xRJqXWhjfGDZM1umYwVlUEpLAiecZNZmI="; postPatch = '' substituteInPlace Cargo.lock \ --replace "3.0.0-beta-1" "3.0.0" diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix index 4b5f55fefd80..fc0e7d96ab97 100644 --- a/pkgs/development/python-modules/primp/default.nix +++ b/pkgs/development/python-modules/primp/default.nix @@ -35,10 +35,10 @@ buildPythonPackage rec { hash = "sha256-dexJdeNGpRsPLk8b/gNeQc1dsQLOiXNL5zgDEN9qHfQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-0mkrs50l0JEUH1WsM/Bp8AblCy6nkuohZKDsp6OVQpM="; + hash = "sha256-s+LAuZmnmTDPIFDSi9AkyWposFFnboJCmog1kiEBnrw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix index 123562c8d21a..f20cb4695e0b 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -24,10 +24,10 @@ buildPythonPackage rec { hash = "sha256-mxNmiFvMbV9WQhGNIQXxTkOcJHYs0vyOPM6Nd5367RE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-7fDlEYWOiRVpG3q0n3ZSS1dfNCOh0/4pX/PbcDBvoMI="; + hash = "sha256-OSnPGRZwuAzcvu80GgTXdc740SfhDIsXrQZq9a/BCdE="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/pycddl/default.nix b/pkgs/development/python-modules/pycddl/default.nix index 660006c9c12a..6f7407f0a8fb 100644 --- a/pkgs/development/python-modules/pycddl/default.nix +++ b/pkgs/development/python-modules/pycddl/default.nix @@ -39,10 +39,10 @@ buildPythonPackage rec { rm tests/test_benchmarks.py ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-VpJ/PLAwwuakwsNAtLDdWGXCxl6jGMTvsEhzIHk6a0g="; + hash = "sha256-Qep5YD4LQ+r118L5H+hUqeS00SibyvsbtLWDrJJBNc0="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index a9e059a7c8e3..cd97f297c21f 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -30,10 +30,10 @@ let patches = [ ./01-remove-benchmark-flags.patch ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-kY+XSiwfh1ao0vvqz1M23CONeh/T8uN8YpHf/GOphTk="; + hash = "sha256-4mwhe+e2xgFMYZAv+Nblj3AAnDinLvuGGYs8KAHT2Sw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyperscan/default.nix b/pkgs/development/python-modules/pyperscan/default.nix index 7f2bde698eb8..99511047b1a5 100644 --- a/pkgs/development/python-modules/pyperscan/default.nix +++ b/pkgs/development/python-modules/pyperscan/default.nix @@ -21,10 +21,10 @@ buildPythonPackage rec { hash = "sha256-uGZ0XFxnZHSLEWcwoHVd+xMulDRqEIrQ5Lf7886GdlM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-a4jNofPIHoKwsD82y2hG2QPu+eM5D7FSGCm2nDo2cLA="; + hash = "sha256-9kKHLYD0tXMGJFhsCBgO/NpWB4J5QZh0qKIuI3PFn2c="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix index f2c07cd5e418..3b6ffd79b45a 100644 --- a/pkgs/development/python-modules/pysequoia/default.nix +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -25,10 +25,10 @@ buildPythonPackage rec { hash = "sha256-sLGPVyUVh1MxAJz8933xGAxaI9+0L/D6wViy5ARLe44="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-DLMAL1pJwJ5xU9XzJXlrqfNGloK9VNGxnapnh34bRhI="; + hash = "sha256-Qch6g39iuTEdHHehaBrbiVX5PcnEwwzdJmWgkmBSdCU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix index 6dca1f802885..1ea595a2f452 100644 --- a/pkgs/development/python-modules/python-bidi/default.nix +++ b/pkgs/development/python-modules/python-bidi/default.nix @@ -19,10 +19,10 @@ buildPythonPackage rec { hash = "sha256-LrXt9qaXfy8Rn9HjU4YSTFT4WsqzwCgh0flcxXOTF6E="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-34R8T8cXiX1iRx/Zb51Eb/nf0wLpN38hz0VnsmzPzws="; + hash = "sha256-4uNdglNaOpIX55xWTr7GkzhjgcyqOTUz4KUGy1fJx4A="; }; buildInputs = [ libiconv ]; diff --git a/pkgs/development/python-modules/python-kadmin-rs/default.nix b/pkgs/development/python-modules/python-kadmin-rs/default.nix index 25acb0f5eea7..c029b6bd7547 100644 --- a/pkgs/development/python-modules/python-kadmin-rs/default.nix +++ b/pkgs/development/python-modules/python-kadmin-rs/default.nix @@ -27,9 +27,9 @@ buildPythonPackage rec { hash = "sha256-5sbYnEoT0/3BTJBipEy+DpIDbX6mRIpAE6CuAoJ5bw4="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-QLj7RDoyn8QzExUSnofT8XqHZmh72j87HlzOksBvk7Q="; + hash = "sha256-1J2aaEj/G7TE+EptWNwb5Vj048W6DOJNUBWPd9F4DqU="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index eb433a22e8ef..1ab2a1d1f543 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -82,10 +82,10 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-f5VLNxv9DKwfRy5zacydfz4Zrkbiee7JecOAbVelSto="; + hash = "sha256-nTYrNH3h1kAwwPx7OMw6eI61vYy8iFhm4eWDTGhWxt4="; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/regress/default.nix b/pkgs/development/python-modules/regress/default.nix index e59496b767d1..e790699314d1 100644 --- a/pkgs/development/python-modules/regress/default.nix +++ b/pkgs/development/python-modules/regress/default.nix @@ -25,10 +25,10 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-wHObfXWgcbSYxk5d17s44+1qIGYD/Ygefxp+el0fsEc="; + hash = "sha256-I6aUSGeosVYrFcHw0w6hprIL++c7ocYEorrQhe4ib+Y="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index 2626b10ff5ad..8db7f97929bb 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -21,10 +21,10 @@ buildPythonPackage rec { hash = "sha256-4y/uirRdPC222hmlMjvDNiI3yLZTxwGUQUuJL9BqCA0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-m01OB4CqDowlTAiDQx6tJ7SeP3t+EtS9UZ7Jad6Ccvc="; + hash = "sha256-2skrDC80g0EKvTEeBI4t4LD7ZXb6jp2Gw+owKFrkZzc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index fe83ca2e32dc..24aa686c807c 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -24,10 +24,10 @@ buildPythonPackage rec { hash = "sha256-1movtKMQkQ6PEpKpSkK0Oy4AV0ee7XrS0P9m6QwZTaM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-BWcOIZMl4yHxxKxCn6Qh69MlMdz3REp3izN0A1eFX3o="; + hash = "sha256-/elui0Rf3XwvD2jX+NGoJgf9S3XSp16qzdwkGZbKaZg="; }; build-system = with rustPlatform; [ diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index d2ee15fa36b1..cdf4143afb04 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -28,9 +28,9 @@ buildPythonPackage rec { hash = "sha256-0WYgShihTBM0e+MIhON0dnhZug6l280tZcVp3KF1Jq0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-AgHfCKLna30WERAFGEs8yRxxZHwvLzR+/S+ivwKHXXE="; + hash = "sha256-TfBDyh4cc1gt29I6wEKuF1QWczgeK+naApSD1aFDcvs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix index d06a56bc30ba..2a5e5648765d 100644 --- a/pkgs/development/python-modules/safetensors/default.nix +++ b/pkgs/development/python-modules/safetensors/default.nix @@ -29,10 +29,10 @@ buildPythonPackage rec { hash = "sha256-dtHHLiTgrg/a/SQ/Z1w0BsuFDClgrMsGiSTCpbJasUs="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${src.name}/bindings/python"; - hash = "sha256-GL8tSXyP9xIWOLPCWiI5lUyfZXQRo77lJ2BmJCcj3uw="; + hash = "sha256-hjV2cfS/0WFyAnATt+A8X8sQLzQViDzkNI7zN0ltgpU="; }; sourceRoot = "${src.name}/bindings/python"; diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index 8b29df693088..f635aa35f9ec 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -24,10 +24,10 @@ buildPythonPackage rec { hash = "sha256-0hIwFJn/cwtKHKoD+upeorC52YnDlej3TrWf3PmAQAQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-Gdypi9DJAXQgNaRCLEt4LTqUhBJC8plH0YhgNOIOGvA="; + hash = "sha256-CU1z+N9GK/mcMomkyQI+gNsYQbE2MQ/tg7lKhj949kw="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index 12174d9862a2..ab29e4bc7fac 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -37,10 +37,10 @@ buildPythonPackage rec { hash = "sha256-M/0Z+yVwoDxN1wSM0yqurUl2AKAIDNZV5nvRy8bwBSQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-5MCAnWtbs6+UkJLcxyfwwxnSA4wcbDWewgNqKqu42n0="; + hash = "sha256-vzt5z3OoMrtMDZTCfVHhUd7N6m/kyVbbizfMwvlVlRY="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix index 9315953b5a25..226853535576 100644 --- a/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { hash = "sha256-jcNYghWR9Xbu97/hAYe8ewa5oMQ4ofNGFwY4cY7/EmM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-I5uI+qFyb4/ArpUZi4yS/E/bmwoW7+CalMq02Gnm9S8="; + hash = "sha256-0U1ELUMh4YV6M+zrrZGuzvY8SdgyN66F7bJ6sMhOdXs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sudachipy/default.nix b/pkgs/development/python-modules/sudachipy/default.nix index 9882ef2fc164..1aae53dafc49 100644 --- a/pkgs/development/python-modules/sudachipy/default.nix +++ b/pkgs/development/python-modules/sudachipy/default.nix @@ -18,10 +18,10 @@ buildPythonPackage rec { pname = "sudachipy"; inherit (sudachi-rs) src version; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-VuwDZaPtAgyMQGQ2eYyLAlXB8M8ZwGD5J/Nv+yysfiU="; + hash = "sha256-/VKveTtB8BbWgRBEzWBjrSrW84uFcz08cz6tZTuMMeE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/test-results-parser/default.nix b/pkgs/development/python-modules/test-results-parser/default.nix index c14c5cff4180..547cde74bf1f 100644 --- a/pkgs/development/python-modules/test-results-parser/default.nix +++ b/pkgs/development/python-modules/test-results-parser/default.nix @@ -17,9 +17,9 @@ buildPythonPackage rec { hash = "sha256-DaUSTu4Hg9SbJwBd3PlMcIAm/o63Q1yM5E7dVxbOwM8="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-dhreAWm/Hses/N3XocYX7IZru9nYJqDrmTnJPkKaOwY="; + hash = "sha256-BpklLxmtw+ztaOPlR6czDR9H6mnNpH5iodgLqi5+6hA="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/tiktoken/default.nix b/pkgs/development/python-modules/tiktoken/default.nix index 7999fe4a66ed..c0398cd5c7c8 100644 --- a/pkgs/development/python-modules/tiktoken/default.nix +++ b/pkgs/development/python-modules/tiktoken/default.nix @@ -41,10 +41,10 @@ buildPythonPackage { setuptools-rust ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src postPatch; name = "${pname}-${version}"; - hash = "sha256-XzUEqiUdi70bgQwARGHsgti36cFOh7QDiEkccjxlwls="; + hash = "sha256-/JwhH0Is2yNwJ0CAY3SKoH1JWhmY3JtGusQkj3k5bQY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 92039063cb8e..f2df5f3e37be 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -80,14 +80,14 @@ buildPythonPackage rec { hash = "sha256-G65XiVlvJXOC9zqcVr9vWamUnpC0aa4kyYkE2v1K2iY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src sourceRoot ; - hash = "sha256-5cw63ydyhpMup2tOe/hpG2W6YZ+cvT75MJBkE5Wap4s="; + hash = "sha256-jj5nuwxlfJm1ugYd5zW+wjyczOZHWCmRGYpmiMDqFlk="; }; sourceRoot = "${src.name}/bindings/python"; diff --git a/pkgs/development/python-modules/tree-sitter-make/default.nix b/pkgs/development/python-modules/tree-sitter-make/default.nix index a91fa5fbd913..3a2abf3d04ee 100644 --- a/pkgs/development/python-modules/tree-sitter-make/default.nix +++ b/pkgs/development/python-modules/tree-sitter-make/default.nix @@ -20,10 +20,10 @@ buildPythonPackage rec { hash = "sha256-WiuhAp9JZKLd0wKCui9MV7AYFOW9dCbUp+kkVl1OEz0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-RI/wBnapWdr4kYshx9d9iN9nB30bR91uQ063yqNy4aA="; + hash = "sha256-75jtur5rmG4zpNXSE3OpPVR+/lf4SICsh+kgzIKfbd4="; }; build-system = [ diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index e76cd05cffab..034cefa6dec3 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -32,9 +32,9 @@ buildPythonPackage rec { hash = "sha256-aTFbO3mBcX+a9Zqp7SXjEx2+ix+J8g4n8V3KEyatAXY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-8xSw7VEfRKXMpwn7HKhrvgLV3Sy3TAmLHjm0WZF/2aY="; + hash = "sha256-32IQYJSSzBl3Uew+4jYt2tk0Q8Yf1Gn35EYWN/V7xng="; }; build-system = [ diff --git a/pkgs/development/python-modules/y-py/default.nix b/pkgs/development/python-modules/y-py/default.nix index b01d8f5dcca3..9c50b845958e 100644 --- a/pkgs/development/python-modules/y-py/default.nix +++ b/pkgs/development/python-modules/y-py/default.nix @@ -21,10 +21,10 @@ buildPythonPackage rec { hash = "sha256-R1eoKlBAags6MzqgEiAZozG9bxbkn+1n3KQj+Siz/U0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-RXwrDSPU0wiprsUJwoDzti14H/+bSwy4hK4tYhNVfYw="; + hash = "sha256-Wh25tLOVhAYFLqjOrKSu4klB1hGSOMconC1xZG31Dbw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zxcvbn-rs-py/default.nix b/pkgs/development/python-modules/zxcvbn-rs-py/default.nix index dcfc2f8d6640..1a8aece7881d 100644 --- a/pkgs/development/python-modules/zxcvbn-rs-py/default.nix +++ b/pkgs/development/python-modules/zxcvbn-rs-py/default.nix @@ -26,10 +26,10 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "${pname}-${version}"; inherit src; - hash = "sha256-OA6iyojBMAG9GtjHaIQ9cM0SEMwMa2bKFRIXmqp4OBE="; + hash = "sha256-Tzd0XEbrvXrX7oMT41R5kUJi7equhdL7/pUHp7ghyeg="; }; pythonImportsCheck = [ "zxcvbn_rs_py" ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index eeed47dc2152..e5c559883c67 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1044,10 +1044,10 @@ let }); gifski = old.gifski.overrideAttrs (attrs: { - cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { src = attrs.src; sourceRoot = "gifski/src/myrustlib"; - hash = "sha256-tVbuYzGdBzWVeQ26Imq6y5gA0R/CjuNCZtQgfd3/qwA="; + hash = "sha256-yz6M3qDQPfT0HJHyK2wgzgl5sBh7EmdJ5zW8SJkk+wY="; }; cargoRoot = "src/myrustlib"; @@ -1061,10 +1061,10 @@ let timeless = old.timeless.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; - cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { src = attrs.src; sourceRoot = "timeless/src/rust"; - hash = "sha256-AccuRY3lfTXzaMnaYieKCEJErKo5132oSXgILbFhePI="; + hash = "sha256-5TV7iCzaaFwROfJNO6pvSUbJBzV+wZlU5+ZK4AMT6X0="; }; cargoRoot = "src/rust"; diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index a9874dce375b..5967d6098852 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { hash = "sha256-aJzNfo7K5OOo14XJRmDOYzXFF5fZK0aXgIfVvjvzjrU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "${pname}-${version}"; inherit src; - hash = "sha256-WN8hYl3L1z+yAfxQnDKnr/zC+0GOYvjzM8YL5XQgVJg="; + hash = "sha256-VKGc4LQjt2FHbELLBKtV8rKpxjGBrzlA3m9BSdZ/6Z0="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/matrix-synapse/plugins/rendezvous.nix b/pkgs/servers/matrix-synapse/plugins/rendezvous.nix index 921a62adf9cb..ab4bb4aa8e78 100644 --- a/pkgs/servers/matrix-synapse/plugins/rendezvous.nix +++ b/pkgs/servers/matrix-synapse/plugins/rendezvous.nix @@ -22,10 +22,10 @@ buildPythonPackage rec { cp ${./rendezvous-Cargo.lock} Cargo.lock ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src postPatch; name = "${pname}-${version}"; - hash = "sha256-TyxDq6YxZUArRj5gpjB1afDQgtUlCVer3Uhq6YKvVYM="; + hash = "sha256-CDUyH08s96xUy0VhK+4ym0w9IgAq9P1UjUipVjlpl9c="; }; nativeBuildInputs = diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index c7c84a716dd6..097c4b9ebb55 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -231,11 +231,11 @@ let hash = "sha256-J9N1kDrIJhz+QEf2cJ0W99GNObHskqr3KvmJVSplDr0="; }; cargoRoot = "src/_bcrypt"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-lDWX69YENZFMu7pyBmavUZaalGvFqbHSHfkwkzmDQaY="; + hash = "sha256-8PyCgh/rUO8uynzGdgylAsb5k55dP9fCnf40UOTCR/M="; }; }); diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix index 4da68dfb751b..8cf82b0db8f1 100644 --- a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix +++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix @@ -41,11 +41,11 @@ buildPythonPackage rec { hash = "sha256-KAPy+LHpX2FEGZJsfm9V2CivxhTKXtYVQ4d65mjMNHI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU="; + hash = "sha256-pZHu3Oo9DWRAtldU0UvrH1FIg0bEvyfizPUhj9IBL58="; }; # Since Cryptography v40 is quite outdated, we need to backport From 745c9a501585235837dd6de6014230a41afaf93a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 21:51:27 +0100 Subject: [PATCH 276/280] treewide: migrate to fetchCargoVendor, batch 5 Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. These are a few cases that could have been in batch 1, but weren't for whatever reason. Maybe there were merge conflicts, or a transient network failure. It should be possible to reproduce this diff. To do so, get the list of files changed by this commit, e.g. with git diff --name-only, then run the following two commands, each with that list of files as their standard input: xargs sed -i 's/^\(. *\)\(cargoHash\)\b/\1useFetchCargoVendor = true;\n\1cargoHash/' cut -d / -f 4 | xargs -n 1 nix-update --version=skip --- pkgs/by-name/ai/airshipper/package.nix | 3 ++- pkgs/by-name/ar/ares-rs/package.nix | 3 ++- pkgs/by-name/ca/cargo-hack/package.nix | 3 ++- pkgs/by-name/ch/charasay/package.nix | 3 ++- pkgs/by-name/de/deno/package.nix | 3 ++- pkgs/by-name/ez/eza/package.nix | 3 ++- pkgs/by-name/fl/flake-checker/package.nix | 3 ++- pkgs/by-name/pa/pay-respects/package.nix | 3 ++- pkgs/by-name/pi/pineflash/package.nix | 3 ++- pkgs/by-name/rb/rbw/package.nix | 3 ++- pkgs/by-name/re/release-plz/package.nix | 3 ++- pkgs/by-name/sl/slint-lsp/package.nix | 3 ++- pkgs/by-name/te/tex-fmt/package.nix | 3 ++- 13 files changed, 26 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ai/airshipper/package.nix b/pkgs/by-name/ai/airshipper/package.nix index 0ab441dd13fb..8af0c22d137a 100644 --- a/pkgs/by-name/ai/airshipper/package.nix +++ b/pkgs/by-name/ai/airshipper/package.nix @@ -66,7 +66,8 @@ rustPlatform.buildRustPackage { hash = "sha256-MHwyXCAqdBzdJlYzSeUXr6bJdTVHcjJ/kGcuAsZCCW8="; }; - cargoHash = "sha256-mdII6CcSQkKZRWLiTJFCrhhkiqJJ5aTQ6vuf9uYGj/I="; + useFetchCargoVendor = true; + cargoHash = "sha256-TkeB939zV5VvqICFqJd/7uX+ydXyEQOJ3sYQbHbZhP0="; buildInputs = [ fontconfig diff --git a/pkgs/by-name/ar/ares-rs/package.nix b/pkgs/by-name/ar/ares-rs/package.nix index 29c9b9d26fc2..1baa066de083 100644 --- a/pkgs/by-name/ar/ares-rs/package.nix +++ b/pkgs/by-name/ar/ares-rs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J+q7KeBthF9Wd08MNv0aHyLHgLUKg3mzQ8ic6+ashto="; }; - cargoHash = "sha256-iJ04WPViqtafINkjn3PD8cE55LVdJZQXodAl3KlxweA="; + useFetchCargoVendor = true; + cargoHash = "sha256-K4qAUEVdi7OqpKAxyEMnKkGTuxSjrdE+UQaYosnUo70="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix index 3ad640f72079..e2a556b4f75d 100644 --- a/pkgs/by-name/ca/cargo-hack/package.nix +++ b/pkgs/by-name/ca/cargo-hack/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FAcKzLr835FxgcnWmAe1JirzlRc3fvxGXMKxnSmgCzA="; }; - cargoHash = "sha256-zWIXIoKgLVu7EZLe1IrR3Rl5szrN0zbyKJWK2BvD7kQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-3M+UK0+lvnRH7j1vbqMgpE7mnz8YnPO3MEjQWnPRy8c="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/by-name/ch/charasay/package.nix b/pkgs/by-name/ch/charasay/package.nix index 4ca0e2e78546..1dcdd9a1ef26 100644 --- a/pkgs/by-name/ch/charasay/package.nix +++ b/pkgs/by-name/ch/charasay/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NB2GDDFH9IW/c0acMojYHuzPrx0J3tjlDqjQa6ZRbN4="; }; - cargoHash = "sha256-K6roydkLHvs+xg2LjrSHw8IcYEyOFcrsh4u6Fz7yYKQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-i2CvwQXKKfYLdK0tKf/w4TepPyMo99v1I+kIr00PWcY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index c1726a36d1ea..551c90005dbc 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FSip1EY6DCgmIgpkhzEF6h3yV8tJqZKnBpqgBDg1TKQ="; }; - cargoHash = "sha256-35XKqVBXlK6iPHec1ALhymYCD1GG1ZnCU2ET3PRGidk="; + useFetchCargoVendor = true; + cargoHash = "sha256-uLGdrPTXAHwZrevGPgZGiNorxVNkYiHn6mPyxd8O8zw="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 23c2ab56f271..260aaa6e554e 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XJ8RYfBduTK5CkvFjVRF6yGkgBdojuewFUrEvRcTJsA="; }; - cargoHash = "sha256-FUd2dtSwZEBJDCs5EbgrtHfO2oquZP/4wxhVreCaayg="; + useFetchCargoVendor = true; + cargoHash = "sha256-38RQsr7bYIf/6edIcDwjHtDEI2lnB3Mp+qaOu7Dh41A="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index b3b7eb211a60..f7c9e3511fcc 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-K5E1sarWIUl4QavHBoS8sPr5Cp8ZndWjLYDLm++d7v0="; }; - cargoHash = "sha256-TPF4usEIhgkGUJ16pxq0OhQoJJHLzeRXNQvbP8isWM4="; + useFetchCargoVendor = true; + cargoHash = "sha256-FDfsA87VATJ4CpXoJ0eFoFl5z9Jtv6tPjkCf7kz6g00="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index 09ccbb3cb88c..fb8e85c98aa1 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4m8/sp6r2Xb2SsNcatMv0+mWHBx+XKD0LEzrEwuWIEA="; }; - cargoHash = "sha256-obuMixkXqWUuZFqs3mJyMpHx4RY70ZpE3H9GzqFmt6k="; + useFetchCargoVendor = true; + cargoHash = "sha256-uE3nS5XAn20iB7VQuYpFryIhQ7WMAEFGrD+KHJb1H5I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pi/pineflash/package.nix b/pkgs/by-name/pi/pineflash/package.nix index d19f28b583c9..d5c422fb9000 100644 --- a/pkgs/by-name/pi/pineflash/package.nix +++ b/pkgs/by-name/pi/pineflash/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4tcwEok36vuXbtlZNUkLNw1kHFQPBEJM/gWRhRWNLPg="; }; - cargoHash = "sha256-l01It6mUflENlADW6PpOQvK1o4qOjbTsMLB6n+OIl0U="; + useFetchCargoVendor = true; + cargoHash = "sha256-OgUWOtqgGCRNYCrdMa8IAfxbbYqv+1WwubvfYybuAQU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix index a26c4ce551f3..e596d75b0a59 100644 --- a/pkgs/by-name/rb/rbw/package.nix +++ b/pkgs/by-name/rb/rbw/package.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ebLbdIF+BybK7ssNtZacGWmAEwdNZh8b94QYgvcwzmM="; }; - cargoHash = "sha256-230jJr2EQua9iI4jz+LxrTZn4TtVAsmPYB8JMLAylzc="; + useFetchCargoVendor = true; + cargoHash = "sha256-xDb4shDHCbd0yuTSAt80i1aqyuhpkfd/fYF98CfXdcM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 8d8020b4248e..fa77c246f039 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-m33tBLNOU2+vjIICU0ggnNxLvD/fxJVSxT6bRih9e7U="; }; - cargoHash = "sha256-d7CltWp1RfQ8cJ6eLXF8spaWXBBEtla46FiRrzG5EVg="; + useFetchCargoVendor = true; + cargoHash = "sha256-XPe5lQMKTGWlt9E3JSsCT1g7VTFBo/aYrVSf0VNOpVk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix index 641348eb810e..d6f3b9dfd75a 100644 --- a/pkgs/by-name/sl/slint-lsp/package.nix +++ b/pkgs/by-name/sl/slint-lsp/package.nix @@ -44,7 +44,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1yXyf/9St03B8mZPfw8GVUIFOX/nWbwwCs/8ON3uBDw="; }; - cargoHash = "sha256-iuLTqrYq3mXjZ1bUQvEwWUNOxdg21Yn5NWmiQTAtdIA="; + useFetchCargoVendor = true; + cargoHash = "sha256-FFNMI6mGYAqHPpdVo8iA2i8R2JNz8F5oQFXh7rk6wdI="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/te/tex-fmt/package.nix b/pkgs/by-name/te/tex-fmt/package.nix index 7a03a3760d26..58f6b21a2eca 100644 --- a/pkgs/by-name/te/tex-fmt/package.nix +++ b/pkgs/by-name/te/tex-fmt/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3kRtBfIT6QcdZ1+h2WwvxsAv/UJLtwSodF5zvCUDbHQ="; }; - cargoHash = "sha256-A8bRimM8eHUM86HLzReo4WFzaz6P9hnKuyhg0h0db9I="; + useFetchCargoVendor = true; + cargoHash = "sha256-4kx3co9doFYD9SjJhL17hgf6ll4niKnF57evv/eNeM0="; nativeBuildInputs = [ installShellFiles ]; From e2afb6a831940aba237b16cd33c9b595b1fcf911 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 21:53:46 +0100 Subject: [PATCH 277/280] treewide: migrate to fetchCargoVendor, batch 6 Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. These cases could have been included in batch 1, except that nix-update also changes the formatting of source hash. It should be possible to verify this in the same way as batch 1, except that the commands will additionally result in non-functional source hash changes that I didn't include here. --- pkgs/by-name/ca/cargo-espmonitor/package.nix | 3 ++- pkgs/by-name/co/colorpanes/package.nix | 3 ++- pkgs/by-name/co/commit-formatter/package.nix | 3 ++- pkgs/by-name/dd/ddh/package.nix | 3 ++- pkgs/by-name/di/didu/package.nix | 3 ++- pkgs/by-name/nu/nux/package.nix | 3 ++- pkgs/by-name/pe/peertube-viewer/package.nix | 3 ++- pkgs/by-name/pr/present-cli/package.nix | 3 ++- pkgs/by-name/pr/proton-vpn-local-agent/package.nix | 3 ++- pkgs/by-name/to/todo/package.nix | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ca/cargo-espmonitor/package.nix b/pkgs/by-name/ca/cargo-espmonitor/package.nix index 4d81694e385e..af6658d63559 100644 --- a/pkgs/by-name/ca/cargo-espmonitor/package.nix +++ b/pkgs/by-name/ca/cargo-espmonitor/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { sha256 = "hWFdim84L2FfG6p9sEf+G5Uq4yhp5kv1ZMdk4sMHa+4="; }; - cargoHash = "sha256-d0tN6NZiAd+RkRy941fIaVEw/moz6tkpL0rN8TZew3g="; + useFetchCargoVendor = true; + cargoHash = "sha256-Fb/xJLhmInYOanJC6XGsxxsCJNCLvHDe04+wtvXMecE="; meta = with lib; { description = "Cargo tool for monitoring ESP32/ESP8266 execution"; diff --git a/pkgs/by-name/co/colorpanes/package.nix b/pkgs/by-name/co/colorpanes/package.nix index 534b153aa95e..15d818037786 100644 --- a/pkgs/by-name/co/colorpanes/package.nix +++ b/pkgs/by-name/co/colorpanes/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "qaOH+LXNDq+utwyI1yzHWNt25AvdAXCTAziGV9ElroU="; }; - cargoHash = "sha256-eJne4OmV4xHxntTb8HE+2ghX1hZLE3WQ3QqsjVm9E4M="; + useFetchCargoVendor = true; + cargoHash = "sha256-+ltcTuLksNwe7KIt8apYNZkMoA2w4EObG5dhJliRb6Y="; postInstall = '' ln -s $out/bin/colp $out/bin/colorpanes diff --git a/pkgs/by-name/co/commit-formatter/package.nix b/pkgs/by-name/co/commit-formatter/package.nix index 640a952d1262..3f24dc99fe70 100644 --- a/pkgs/by-name/co/commit-formatter/package.nix +++ b/pkgs/by-name/co/commit-formatter/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "EYzhb9jJ4MzHxIbaTb1MxeXUgoxTwcnq5JdxAv2uNcA="; }; - cargoHash = "sha256-AeHQCoP1HOftlOt/Yala3AXocMlwwIXIO2i1AsFSvGQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-uW+mmArQZ5Pl2TlKIRd00dB6615Nn/Q8KtRE/ahl5V4="; meta = with lib; { description = "CLI tool to help you write git commit"; diff --git a/pkgs/by-name/dd/ddh/package.nix b/pkgs/by-name/dd/ddh/package.nix index ecfa8c702ab9..61cd4ae7c79f 100644 --- a/pkgs/by-name/dd/ddh/package.nix +++ b/pkgs/by-name/dd/ddh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "XFfTpX4c821pcTAJZFUjdqM940fRoBwkJC6KTknXtCw="; }; - cargoHash = "sha256-6yPDkbag81TZ4k72rbmGT6HWKdGK4yfKxjGNFKEWXPI="; + useFetchCargoVendor = true; + cargoHash = "sha256-rl9+3JSFkqZwaIWCuZBDhDF0QBr+aB2I7kB1o9LWCEw="; meta = with lib; { description = "Fast duplicate file finder"; diff --git a/pkgs/by-name/di/didu/package.nix b/pkgs/by-name/di/didu/package.nix index bdf1b51a7cb8..f9f7e7fc1f14 100644 --- a/pkgs/by-name/di/didu/package.nix +++ b/pkgs/by-name/di/didu/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "szYWRN1NZbfpshipwMMJSWJw/NG4w7I+aqwtmqpT0R0="; }; - cargoHash = "sha256-O1kkfrwv7xiOh3wCV/ce6cqpkMPRRzcXOFESYMAhiKA="; + useFetchCargoVendor = true; + cargoHash = "sha256-NDri4VuTI/ZsY3ZvpWmu/2I5GpmldQaoUSzyjGlq9lE="; meta = with lib; { description = "Duration conversion between units"; diff --git a/pkgs/by-name/nu/nux/package.nix b/pkgs/by-name/nu/nux/package.nix index a457bbd7b001..b682cde9c6c2 100644 --- a/pkgs/by-name/nu/nux/package.nix +++ b/pkgs/by-name/nu/nux/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-k3HRaWN8/MTZRGWBxI8RRK0tcSYBbSLs3vHkUdLGTc8"; }; - cargoHash = "sha256-wfUr3dcdALMEgJ6CaXhK4Gqk6xflCnov9tELA63drV4="; + useFetchCargoVendor = true; + cargoHash = "sha256-iemfLIiT2BOsf0Q4X8fmEHmgHMd0WQk1t2rmRUuF5pY="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/pe/peertube-viewer/package.nix b/pkgs/by-name/pe/peertube-viewer/package.nix index 749948f2ccf2..4aa5dca89d33 100644 --- a/pkgs/by-name/pe/peertube-viewer/package.nix +++ b/pkgs/by-name/pe/peertube-viewer/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-ZzeWk01migUrKR7GndtNo0kLYSCUXCg0H0eCXgrDXaM=="; }; - cargoHash = "sha256-5u5240PL5cKhnHsT7sRdccrbZBAbRN+fa+FhJP1gX/4=="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pf8Jj8XGYbNOAyYEBdAysOK92S3S7bZHerQh/2UlrbQ="; meta = with lib; { description = "A simple CLI browser for the peertube federated video platform"; diff --git a/pkgs/by-name/pr/present-cli/package.nix b/pkgs/by-name/pr/present-cli/package.nix index 8df4ea1e21fc..1898477156fb 100644 --- a/pkgs/by-name/pr/present-cli/package.nix +++ b/pkgs/by-name/pr/present-cli/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "+kCHe84ikdCLd7j5YwP2j3xz+XTzzo/kLy+b9YUFDnI="; }; - cargoHash = "sha256-VKY/FQUrFWtLxKoK6LP6qPMqNN4absZvnAbH9mha1fI="; + useFetchCargoVendor = true; + cargoHash = "sha256-NZUxgS4iCmXsQa2bOdFiw7EqAAT22bgJjYaDZjJgL6I="; # required for tests postPatch = '' diff --git a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix index 28447625151c..d4d7fb7a68b4 100644 --- a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix +++ b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix @@ -9,7 +9,8 @@ rustPlatform.buildRustPackage rec { pname = "proton-vpn-local-agent"; version = "1.2.0"; - cargoHash = "sha256-qxNbHM6KmBmLbruOhbFIp3klz6RuKWBLioVsBPDQiLI="; + useFetchCargoVendor = true; + cargoHash = "sha256-KD+cTEmezTiGL+OmMryS/Q1mRR0n9jx80o3hb5X3ZYM="; src = fetchFromGitHub { owner = "ProtonVPN"; diff --git a/pkgs/by-name/to/todo/package.nix b/pkgs/by-name/to/todo/package.nix index 222eef329a7d..34d97ea887d7 100644 --- a/pkgs/by-name/to/todo/package.nix +++ b/pkgs/by-name/to/todo/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "oyRdXvVnCfdFM8lI1eCDHHYNWcJc0Qg0TKxQXUqNo40="; }; - cargoHash = "sha256-B0tecuBx/FFQokhfI6+xpppyG5DD8WS2+MkmPaZfMhI="; + useFetchCargoVendor = true; + cargoHash = "sha256-mRLTQYkKXxhcwI2Ra/HCkxejDl3nnraJw+VCqRgCUig="; nativeBuildInputs = [ pkg-config ]; From 82506de0d72de67eeba6c6d123480d7f456b95a7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 26 Jan 2025 17:47:50 +0100 Subject: [PATCH 278/280] protobuf_25: 25.5 -> 25.6 Diff: https://github.com/protocolbuffers/protobuf/compare/v25.5...v25.6 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v25.6 --- pkgs/development/libraries/protobuf/25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/25.nix b/pkgs/development/libraries/protobuf/25.nix index d5569ec3ce20..908252beab26 100644 --- a/pkgs/development/libraries/protobuf/25.nix +++ b/pkgs/development/libraries/protobuf/25.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "25.5"; - hash = "sha256-DFLlk4T8ODo3lmvrANlkIsrmDXZHmqMPTYxDWaz56qA="; + version = "25.6"; + hash = "sha256-pXZGffQXjAUXworfcr75BrkADamC9pKZXNK0l/Bvk9g="; } // args ) From da864ab387b3b5d1682dd96bca7f0ef0dcedaab8 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sun, 26 Jan 2025 15:21:01 -0800 Subject: [PATCH 279/280] swtpm: fixup darwin builds --- pkgs/by-name/sw/swtpm/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sw/swtpm/package.nix b/pkgs/by-name/sw/swtpm/package.nix index 55b82abe0335..3b3246aa689a 100644 --- a/pkgs/by-name/sw/swtpm/package.nix +++ b/pkgs/by-name/sw/swtpm/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { # stat: invalid option -- '%' # This is caused by the stat program not being the BSD version, # as is expected by the test - substituteInPlace tests/common --replace \ + substituteInPlace tests/common tests/sed-inplace --replace \ 'if [[ "$(uname -s)" =~ (Linux|CYGWIN_NT-) ]]; then' \ 'if [[ "$(uname -s)" =~ (Linux|Darwin|CYGWIN_NT-) ]]; then' From bba2501df87a9bf7cf9d864861876dfd2fce2d35 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 26 Jan 2025 23:40:31 +0000 Subject: [PATCH 280/280] Revert "llvmPackages.tblgen: add missing lldb-tblgen" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Breaks Darwin bootstrap: CMake Error at /tmp/nix-build-llvm-tblgen-19.1.7.drv-0/llvm-tblgen-src-19.1.7/lldb/test/CMakeLists.txt:197 (message): LLDB test suite requires libc++, but it is currently disabled. Please add `libcxx` to `LLVM_ENABLE_RUNTIMES` or disable tests via `LLDB_INCLUDE_TESTS=OFF`. It’s probably not too hard to fix but I don’t really understand the details of this derivation and it’s blocking Darwin `stdenv` builds with a few days to go until the next cycle, so reverting for now. This reverts commit d175d8a4c55ce11c61e70f6d0d0458e7801441c8. --- pkgs/development/compilers/llvm/common/tblgen.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/tblgen.nix b/pkgs/development/compilers/llvm/common/tblgen.nix index 3ff4fbdb5624..49cbcb0af2ca 100644 --- a/pkgs/development/compilers/llvm/common/tblgen.nix +++ b/pkgs/development/compilers/llvm/common/tblgen.nix @@ -50,7 +50,6 @@ let cp -r ${monorepoSrc}/clang "$out" cp -r ${monorepoSrc}/clang-tools-extra "$out" cp -r ${monorepoSrc}/mlir "$out" - cp -r ${monorepoSrc}/lldb "$out" '' ) else @@ -87,7 +86,6 @@ let "llvm" "clang" "clang-tools-extra" - "lldb" ] ++ lib.optionals (lib.versionAtLeast release_version "16") [ "mlir" @@ -101,7 +99,6 @@ let [ "clang-tblgen" "llvm-tblgen" - "lldb-tblgen" ] ++ lib.optionals (lib.versionAtLeast release_version "15") [ "clang-tidy-confusable-chars-gen" @@ -117,10 +114,6 @@ let installPhase = '' mkdir -p $out - - # Remove useless files - rm -f bin/{lldb-dotest,lldb-repro,llvm-lit,update_core_linalg_named_ops.sh} - cp -ar bin $out/bin ''; });