From 76abaee704b870870c50b8969bd353b5e5525e1b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 19 Jan 2025 07:59:46 +0000 Subject: [PATCH 001/157] lzip: 1.24.1 -> 1.25 --- pkgs/by-name/lz/lzip/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lz/lzip/package.nix b/pkgs/by-name/lz/lzip/package.nix index 9609ed801fdc9..d291478ca7325 100644 --- a/pkgs/by-name/lz/lzip/package.nix +++ b/pkgs/by-name/lz/lzip/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "lzip"; - version = "1.24.1"; + version = "1.25"; outputs = [ "out" "man" @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/lzip/${pname}-${version}.tar.gz"; - hash = "sha256-MMnLagYF9HnElsN262KaSLChaW0WfjweCQxd76SBsWI="; + hash = "sha256-CUGKbY+4P1ET9b2FbglwPfXTe64DCMZo0PNG49PwpW8="; }; patches = lib.optionals stdenv.hostPlatform.isMinGW [ From e0e12010414f7976a58ddc1a1e883b0bf5af00a1 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 28 Dec 2024 10:35:43 -0500 Subject: [PATCH 002/157] darwin.stdenv: drop libtapi from allowedRequisites ld64 no longer links against libtapi, so dropping it from the bootstrap saves an unnecessary build. --- pkgs/stdenv/darwin/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index dd5993b366950..af32a7e549cd4 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -287,7 +287,6 @@ let coreutils gmp gnugrep - libtapi openssl pcre2 xar @@ -1197,7 +1196,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ld64.lib ld64.out libffi.out - libtapi.out libxml2.out ncurses.dev ncurses.man From 5690ef052935a730f064d6232dba74f78ce4226c Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 4 Feb 2025 15:37:03 +0000 Subject: [PATCH 003/157] tree-sitter: 0.24.6 -> 0.25.1 --- .../tools/parsing/tree-sitter/default.nix | 6 +++--- .../tree-sitter/remove-web-interface.patch | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index b89c62871c020..a3cebcbed7169 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -28,8 +28,8 @@ let # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions) # 4) run the ./result script that is output by that (it updates ./grammars) - version = "0.24.6"; - hash = "sha256-L7F2/S22knqEdB2hxfqLe5Tcgk0WQqBdFQ7BvHFl4EI="; + version = "0.25.1"; + hash = "sha256-xnUhiIeRxD4ZKMUQ6pNEetDqiFqiJsa57BRM2zqNFro="; src = fetchFromGitHub { owner = "tree-sitter"; @@ -171,7 +171,7 @@ rustPlatform.buildRustPackage { inherit src version; useFetchCargoVendor = true; - cargoHash = "sha256-wrMqeJxOj9Jp3luy6ir6UzNQClRglqP8pfoqWk+Ky+w="; + cargoHash = "sha256-YaXeApg0U97Bm+kBdFdmfnkgg9GBxxYdaDzgCVN2sbY="; buildInputs = [ installShellFiles ]; nativeBuildInputs = [ which ] ++ lib.optionals webUISupport [ emscripten ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch b/pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch index 02b3d432a5e10..9f3504f33b533 100644 --- a/pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch +++ b/pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch @@ -2,8 +2,9 @@ diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 4a00747e..e17d253b 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs -@@ -5,7 +5,6 @@ pub mod highlight; +@@ -6,7 +6,6 @@ pub mod highlight; pub mod init; + pub mod input; pub mod logger; pub mod parse; -pub mod playground; @@ -15,15 +16,15 @@ index 1758fada..4bc56cc2 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -23,7 +23,7 @@ use tree_sitter_cli::{ - init::{generate_grammar_files, get_root_path, migrate_package_json, JsonConfigOpts}, + input::{get_input, get_tmp_source_file, CliInput}, logger, - parse::{self, ParseFileOptions, ParseOutput}, -- playground, query, tags, -+ query, tags, - test::{self, TestOptions}, - test_highlight, test_tags, util, wasm, - }; -@@ -1205,10 +1205,8 @@ impl Tags { + parse::{self, ParseDebugType, ParseFileOptions, ParseOutput, ParseTheme}, +- playground, query, ++ query, + tags::{self, TagsOptions}, + test::{self, TestOptions, TestStats}, + test_highlight, test_tags, util, version, wasm, +@@ -1614,10 +1614,8 @@ impl Tags { impl Playground { fn run(self, current_dir: &Path) -> Result<()> { From 53dbcddc09619e88a8d115a6ffb3dbf9b44c3fbe Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 4 Feb 2025 15:41:35 +0000 Subject: [PATCH 004/157] tree-sitter: fix grammar update doc comment --- pkgs/development/tools/parsing/tree-sitter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index a3cebcbed7169..b60d48a6430a6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -26,7 +26,7 @@ let # to update: # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars - # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions) + # 3) Set NIXPKGS_GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions) # 4) run the ./result script that is output by that (it updates ./grammars) version = "0.25.1"; hash = "sha256-xnUhiIeRxD4ZKMUQ6pNEetDqiFqiJsa57BRM2zqNFro="; From 17c01aad84c52457a5dd20fa609d872d156fa5be Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 8 Feb 2025 12:07:15 +0300 Subject: [PATCH 005/157] gcc: explicitly disallow cross + multilib, extract targetLibDir to variable --- .../compilers/gcc/common/builder.nix | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 633251910dbe1..0b3847f8a1675 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -8,8 +8,12 @@ let forceLibgccToBuildCrtStuff = import ./libgcc-buildstuff.nix { inherit lib stdenv; }; + isCross = with stdenv; targetPlatform.config != hostPlatform.config; in +# We don't support multilib and cross at the same time +assert !(enableMultilib && isCross); + originalAttrs: (stdenv.mkDerivation ( finalAttrs: @@ -244,30 +248,34 @@ originalAttrs: ''; postInstall = '' - # Move runtime libraries to lib output. - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.so*" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.la" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dylib" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll.a" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll" "''${!outputLib}" + # Move target runtime libraries to lib output. + # For non-cross, they're in $out/lib; for cross, they're in $out/$targetConfig/lib. + targetLibDir="''${targetConfig+$targetConfig/}lib" + + moveToOutput "$targetLibDir/lib*.so*" "''${!outputLib}" + moveToOutput "$targetLibDir/lib*.la" "''${!outputLib}" + moveToOutput "$targetLibDir/lib*.dylib" "''${!outputLib}" + moveToOutput "$targetLibDir/lib*.dll.a" "''${!outputLib}" + moveToOutput "$targetLibDir/lib*.dll" "''${!outputLib}" moveToOutput "share/gcc-*/python" "''${!outputLib}" if [ -z "$enableShared" ]; then - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.a" "''${!outputLib}" + moveToOutput "$targetLibDir/lib*.a" "''${!outputLib}" fi - for i in "''${!outputLib}/''${targetConfig}"/lib/*.{la,py}; do + for i in "''${!outputLib}"/$targetLibDir/*.{la,py}; do substituteInPlace "$i" --replace "$out" "''${!outputLib}" done + # Multilib and cross can't exist at the same time, so just use lib64 here if [ -n "$enableMultilib" ]; then - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.so*" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.la" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dylib" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll.a" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll" "''${!outputLib}" + moveToOutput "lib64/lib*.so*" "''${!outputLib}" + moveToOutput "lib64/lib*.la" "''${!outputLib}" + moveToOutput "lib64/lib*.dylib" "''${!outputLib}" + moveToOutput "lib64/lib*.dll.a" "''${!outputLib}" + moveToOutput "lib64/lib*.dll" "''${!outputLib}" - for i in "''${!outputLib}/''${targetConfig}"/lib64/*.{la,py}; do + for i in "''${!outputLib}"/lib64/*.{la,py}; do substituteInPlace "$i" --replace "$out" "''${!outputLib}" done fi From 5e2e98f3b71f1b7e0168e5c071bc9dff029287cb Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 8 Feb 2025 12:09:49 +0300 Subject: [PATCH 006/157] gcc: document, clean up, undangle install symlink hacks --- .../compilers/gcc/common/builder.nix | 87 +++++++++++++------ 1 file changed, 61 insertions(+), 26 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 0b3847f8a1675..e7cc919cdeb2f 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -214,40 +214,66 @@ originalAttrs: ''; preInstall = + # What follows is a horribly cursed hack. + # + # GCC will install its libraries to $out/lib, $out/lib32, $out/lib64, + # $out/$targetConfig/lib, $out/$targetConfig/lib32 or $out/$targetConfig/lib64, + # depending on whether it's built as native or cross, and the exact target spec. + # + # We can't predict what it's actually going to do, and we also can't just tell it + # to always install to lib, but we want everything to end up in lib + # for consistency (multilib weirdness aside). + # + # So, we create a bunch of symlinks before we run GCC's install phase, + # redirecting every possible directory it may want to write to to the place + # we actually want things to be installed. + # We will then nuke the symlinks in postInstall. + # + # FIXME: there must be a better way to do this. '' - mkdir -p "$out/''${targetConfig}/lib" - mkdir -p "''${!outputLib}/''${targetConfig}/lib" + declare -ga compatibilitySymlinks=() + + makeCompatibilitySymlink() { + declare -a outputsToLink=("$out") + + if [ -n "$lib" ]; then + outputsToLink+=("$lib") + fi + + for output in "''${outputsToLink[@]}"; do + local linkTarget="$1" + local linkName="$output/$2" + + echo "Creating compatibility symlink: $linkTarget -> $linkName" + + mkdir -p "$(dirname "$linkName")" + ln -s "$linkTarget" "$linkName" + compatibilitySymlinks+=("$linkName") + done + } '' + - # if cross-compiling, link from $lib/lib to $lib/${targetConfig}. - # since native-compiles have $lib/lib as a directory (not a - # symlink), this ensures that in every case we can assume that - # $lib/lib contains the .so files - lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' - ln -Ts "''${!outputLib}/''${targetConfig}/lib" $lib/lib + # This will redirect $output/lib{32,64} to $output/lib. + # Multilib is special, because it creates $out/lib (for 32-bit) + # and $out/lib64 (for 64-bit). No other targets can have both. + lib.optionalString (!enableMultilib) '' + makeCompatibilitySymlink lib lib32 + makeCompatibilitySymlink lib lib64 '' + - # Make `lib64` symlinks to `lib`. - lib.optionalString - (!enableMultilib && stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isMips64n32) - '' - ln -s lib "$out/''${targetConfig}/lib64" - ln -s lib "''${!outputLib}/''${targetConfig}/lib64" - '' - + - # On mips platforms, gcc follows the IRIX naming convention: - # - # $PREFIX/lib = mips32 - # $PREFIX/lib32 = mips64n32 - # $PREFIX/lib64 = mips64 - # - # Make `lib32` symlinks to `lib`. - lib.optionalString (!enableMultilib && stdenv.targetPlatform.isMips64n32) '' - ln -s lib "$out/''${targetConfig}/lib32" - ln -s lib "''${!outputLib}/''${targetConfig}/lib32" + # This will redirect $output/$targetConfig/lib{,32,64} to $output/$targetConfig/lib. + lib.optionalString isCross '' + makeCompatibilitySymlink lib $targetConfig/lib32 + makeCompatibilitySymlink lib $targetConfig/lib64 ''; postInstall = '' + # Clean up our compatibility symlinks (see above) + for link in "''${compatibilitySymlinks[@]}"; do + echo "Removing compatibility symlink: $link" + rm -f "$link" + done + # Move target runtime libraries to lib output. # For non-cross, they're in $out/lib; for cross, they're in $out/$targetConfig/lib. targetLibDir="''${targetConfig+$targetConfig/}lib" @@ -321,6 +347,15 @@ originalAttrs: ln -sf "$man_prefix"gcc.1 "$i" fi done + '' + # if cross-compiling, link from $lib/lib to $lib/${targetConfig}. + # since native-compiles have $lib/lib as a directory (not a + # symlink), this ensures that in every case we can assume that + # $lib/lib contains the .so files + + lib.optionalString isCross '' + if [ -e "$lib/$targetConfig/lib" ]; then + ln -s "$lib/$targetConfig/lib" "$lib/lib" + fi ''; } // lib.optionalAttrs ((stdenv.targetPlatform.config != stdenv.hostPlatform.config) && withoutTargetLibc) { From a820a1b67b71c2d6c5f2e0d922acf06f4fae8244 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 2 Feb 2025 09:49:23 +0300 Subject: [PATCH 007/157] Revert "gcc: disable symlink checks on cross + nolibc for now" This reverts commit 3fd43d5d7494068b2c8a9d904406f64d430dd029. The proper fix is now in. --- pkgs/development/compilers/gcc/common/builder.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index e7cc919cdeb2f..47b3ed1d3adc1 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -3,7 +3,6 @@ stdenv, enableMultilib, targetConfig, - withoutTargetLibc, }: let @@ -358,7 +357,4 @@ originalAttrs: fi ''; } - // lib.optionalAttrs ((stdenv.targetPlatform.config != stdenv.hostPlatform.config) && withoutTargetLibc) { - dontCheckForBrokenSymlinks = true; - } )) From 50319982e02a215128107b5b30ad310fd4dc5ee3 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 8 Feb 2025 13:43:37 +0300 Subject: [PATCH 008/157] Revert "libgccjit, gccgo*: remove a reflexive symlink" This reverts commit c3c1643d8af3092f2defffa138dc907ddfcff803. Fixed properly now. --- pkgs/development/compilers/gcc/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 66affd84a5932..91d27aba7e2b7 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -391,13 +391,5 @@ pipe ((callFile ./common/builder.nix {}) ({ (callPackage ./common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared libcCross; }) ] ++ optionals atLeast11 [ (callPackage ./common/checksum.nix { inherit langC langCC; }) -] - # This symlink points to itself, and we disallow that now by noBrokenSymlinks (#370750) - # TODO: find how exactly this happens and solve it in a better way. - ++ optional langJit (pkg: pkg.overrideAttrs (attrs: { - postInstall = attrs.postInstall or "" + '' - rm "$out/lib/lib" - ''; - })) -) +]) From 17037d293ae5e94ae2709db6701d7bc70e91480d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 11 Feb 2025 13:04:19 +0100 Subject: [PATCH 009/157] taglib: 1.13.1 -> 2.0.2, taglib_1: init at 1.13.1 --- pkgs/applications/audio/ardour/7.nix | 4 +- .../applications/audio/clementine/default.nix | 4 +- .../audio/soundkonverter/default.nix | 4 +- .../obs-studio/plugins/obs-tuna/default.nix | 2 - pkgs/by-name/ca/cantata/package.nix | 4 +- pkgs/by-name/ea/easytag/package.nix | 4 +- pkgs/by-name/lo/loudgain/package.nix | 4 +- pkgs/by-name/ta/taglib/package.nix | 14 ++--- pkgs/by-name/ta/taglib_1/package.nix | 58 +++++++++++++++++++ pkgs/by-name/ta/taglib_extras/package.nix | 12 +++- pkgs/by-name/vl/vlc/package.nix | 4 +- .../deepin/apps/deepin-music/default.nix | 4 +- .../deepin/core/dde-grand-search/default.nix | 4 +- .../services/lomiri-thumbnailer/default.nix | 9 +++ .../lomiri/services/mediascanner2/default.nix | 8 +++ .../compilers/chicken/5/overrides.nix | 4 +- .../ocaml-modules/taglib/default.nix | 4 +- .../python-modules/pytaglib/default.nix | 4 +- .../ruby-modules/gem-config/default.nix | 4 +- pkgs/top-level/ocaml-packages.nix | 2 +- 20 files changed, 120 insertions(+), 37 deletions(-) create mode 100644 pkgs/by-name/ta/taglib_1/package.nix diff --git a/pkgs/applications/audio/ardour/7.nix b/pkgs/applications/audio/ardour/7.nix index 66be0adf0de97..0830ff4ddf54e 100644 --- a/pkgs/applications/audio/ardour/7.nix +++ b/pkgs/applications/audio/ardour/7.nix @@ -52,7 +52,7 @@ soundtouch, sratom, suil, - taglib, + taglib_1, vamp-plugin-sdk, wafHook, xjadeo, @@ -166,7 +166,7 @@ stdenv.mkDerivation rec { soundtouch sratom suil - taglib + taglib_1 vamp-plugin-sdk ] ++ lib.optionals videoSupport [ diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 2422511f12755..d3a39fa521d9b 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -11,7 +11,7 @@ qtbase, qtx11extras, qttools, - taglib, + taglib_1, fftw, glew, qjson, @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { qtx11extras qttools sqlite - taglib + taglib_1 alsa-lib ] # gst_plugins needed for setup-hooks diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index 1155ba492ddf8..60e1759847800 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -19,7 +19,7 @@ kxmlgui, qtbase, phonon, - taglib, + taglib_1, # optional backends withCD ? true, cdparanoia, @@ -131,7 +131,7 @@ mkDerivation rec { qtbase phonon ]; - buildInputs = [ taglib ] ++ runtimeDeps; + buildInputs = [ taglib_1 ] ++ runtimeDeps; # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5 cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ]; sourceRoot = "${src.name}/src"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix index 78087e4ed446b..7aa5e936ef351 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix @@ -6,7 +6,6 @@ cmake, zlib, curl, - taglib, dbus, pkg-config, qtbase, @@ -27,7 +26,6 @@ stdenv.mkDerivation (finalAttrs: { qtbase zlib curl - taglib dbus ]; diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix index 7bb809dae7eef..cb96570ca55bb 100644 --- a/pkgs/by-name/ca/cantata/package.nix +++ b/pkgs/by-name/ca/cantata/package.nix @@ -19,7 +19,7 @@ libmusicbrainz5, withTaglib ? true, - taglib, + taglib_1, taglib_extras, withHttpStream ? true, withReplaygain ? true, @@ -139,7 +139,7 @@ let ]; enable = withTaglib; pkgs = [ - taglib + taglib_1 taglib_extras ]; } diff --git a/pkgs/by-name/ea/easytag/package.nix b/pkgs/by-name/ea/easytag/package.nix index d90735294d446..9978861a68730 100644 --- a/pkgs/by-name/ea/easytag/package.nix +++ b/pkgs/by-name/ea/easytag/package.nix @@ -8,7 +8,7 @@ glib, libid3tag, id3lib, - taglib, + taglib_1, libvorbis, libogg, opusfile, @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { glib libid3tag id3lib - taglib + taglib_1 libvorbis libogg opusfile diff --git a/pkgs/by-name/lo/loudgain/package.nix b/pkgs/by-name/lo/loudgain/package.nix index 85480eccdbdf4..0a29ea0e7e3d3 100644 --- a/pkgs/by-name/lo/loudgain/package.nix +++ b/pkgs/by-name/lo/loudgain/package.nix @@ -7,7 +7,7 @@ ffmpeg, libebur128, libresample, - taglib, + taglib_1, zlib, }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ffmpeg libebur128 libresample - taglib + taglib_1 zlib ]; diff --git a/pkgs/by-name/ta/taglib/package.nix b/pkgs/by-name/ta/taglib/package.nix index 865ee774ddee2..1f93bf749102e 100644 --- a/pkgs/by-name/ta/taglib/package.nix +++ b/pkgs/by-name/ta/taglib/package.nix @@ -3,33 +3,33 @@ stdenv, fetchFromGitHub, cmake, + utf8cpp, zlib, testers, }: stdenv.mkDerivation (finalAttrs: { pname = "taglib"; - version = "1.13.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "taglib"; repo = "taglib"; rev = "v${finalAttrs.version}"; - hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; + hash = "sha256-3cJwCo2nUSRYkk8H8dzyg7UswNPhjfhyQ704Fn9yNV8="; }; strictDeps = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib ]; + buildInputs = [ + zlib + utf8cpp + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) - # Workaround unconditional ${prefix} until upstream is fixed: - # https://github.com/taglib/taglib/issues/1098 - (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") - (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/by-name/ta/taglib_1/package.nix b/pkgs/by-name/ta/taglib_1/package.nix new file mode 100644 index 0000000000000..865ee774ddee2 --- /dev/null +++ b/pkgs/by-name/ta/taglib_1/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + zlib, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "taglib"; + version = "1.13.1"; + + src = fetchFromGitHub { + owner = "taglib"; + repo = "taglib"; + rev = "v${finalAttrs.version}"; + hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ zlib ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + # Workaround unconditional ${prefix} until upstream is fixed: + # https://github.com/taglib/taglib/issues/1098 + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + ]; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + homepage = "https://taglib.org/"; + description = "Library for reading and editing audio file metadata"; + mainProgram = "taglib-config"; + longDescription = '' + TagLib is a library for reading and editing the meta-data of several + popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 + files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, + Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files. + ''; + license = with lib.licenses; [ + lgpl21Only + mpl11 + ]; + maintainers = with lib.maintainers; [ ttuegel ]; + pkgConfigModules = [ + "taglib" + "taglib_c" + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ta/taglib_extras/package.nix b/pkgs/by-name/ta/taglib_extras/package.nix index 163f9afe3805f..03af392d0c0df 100644 --- a/pkgs/by-name/ta/taglib_extras/package.nix +++ b/pkgs/by-name/ta/taglib_extras/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, cmake, taglib, zlib, @@ -11,9 +12,18 @@ stdenv.mkDerivation rec { pname = "taglib-extras"; version = "1.0.1"; src = fetchurl { - url = "https://ftp.rz.uni-wuerzburg.de/pub/unix/kde/taglib-extras/${version}/src/${pname}-${version}.tar.gz"; + url = "https://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"; sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y"; }; + + patches = [ + (fetchurl { + name = "2001-taglib-extras-Fix-taglib-2.x-compat.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/taglib-2.0.diff?h=taglib-extras&id=5826657b841b138c501e0633d1c9333fe9197b00"; + hash = "sha256-yhme2KcIS5SPXz+mx/R2OiLV57WHz6WW8LJtYab4h5I="; + }) + ]; + buildInputs = [ taglib ]; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index 4b9269bf4b90b..f286972bf63d5 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -81,7 +81,7 @@ srt, stdenv, systemd, - taglib, + taglib_1, unzip, wayland, wayland-protocols, @@ -194,7 +194,7 @@ stdenv.mkDerivation (finalAttrs: { speex srt systemd - taglib + taglib_1 xcbutilkeysyms wayland-scanner # only required for configure script zlib diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix index 95cd7cf4664d8..11482fe170d2f 100644 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -12,7 +12,7 @@ ffmpeg_6, libvlc, qt6Packages, - taglib, + taglib_1, SDL2, gst_all_1, }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { qt6Packages.qtmultimedia ffmpeg_6 libvlc - taglib + taglib_1 SDL2 ] ++ (with gst_all_1; [ diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix index 89e22adcd0fe1..66fe532c9f0ca 100644 --- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix +++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix @@ -11,7 +11,7 @@ deepin-pdfium, qt5integration, qt5platform-plugins, - taglib, + taglib_1, ffmpeg, ffmpegthumbnailer, pcre, @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { deepin-pdfium qt5integration qt5platform-plugins - taglib + taglib_1 ffmpeg ffmpegthumbnailer pcre diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix index a9cb0b7da1d9c..b07f8a7c3c79f 100644 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, nixosTests, testers, @@ -48,6 +49,14 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ + # Fix compat with taglib 2.x + # Remove when version > 3.0.4 + (fetchpatch { + name = "0001-lomiri-thumbnailer-Fix-taglib-2.x-compat.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/b7f1055e36cd6e33314bb9f6648f93e977a33267.patch"; + hash = "sha256-9RHtxqsgdMkgIyswaeL5yS6+o/YvzT+HgRD8KL/RfNM="; + }) + # Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/23 merged & in release ./1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch ./1002-Re-enable-documentation.patch diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index 86172e2774c6b..1467119fb2042 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -52,6 +52,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/ubports/development/core/mediascanner2/-/commit/1e65b32e32a0536b9e2f283ba563fa78b6ef6d61.patch"; hash = "sha256-Xhm5+/E/pP+mn+4enqdsor1oRqfYTzabg1ODVfIhra4="; }) + + # Fix taglib 2.x compat + # Remove when version > 0.117 + (fetchpatch { + name = "0002-mediascanner2-Fix-taglib-2.x-compat.patch"; + url = "https://gitlab.com/ubports/development/core/mediascanner2/-/commit/0ce744ecb32abb39516d1b9f98d47c3e86690158.patch"; + hash = "sha256-hz/EB83yNoxhxkEcg7ZMezknpKajhH1BNkYD3wrf/eY="; + }) ]; postPatch = '' diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 5af2874d33940..92b1104d90399 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -188,10 +188,10 @@ in old: (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old) // (addToCscOptions "-L -lncurses" old); taglib = old: - (addToBuildInputs [ pkgs.zlib pkgs.taglib ] old) + (addToBuildInputs [ pkgs.zlib pkgs.taglib_1 ] old) // ( # needed for tablib-config to be in PATH - addToNativeBuildInputs pkgs.taglib old + addToNativeBuildInputs pkgs.taglib_1 old ); uuid-lib = addToBuildInputs pkgs.libuuid; webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk_4_0; diff --git a/pkgs/development/ocaml-modules/taglib/default.nix b/pkgs/development/ocaml-modules/taglib/default.nix index 58bfb599272a7..ca0a47a356b01 100644 --- a/pkgs/development/ocaml-modules/taglib/default.nix +++ b/pkgs/development/ocaml-modules/taglib/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, dune-configurator, pkg-config, - taglib, + taglib_1, zlib, }: @@ -24,7 +24,7 @@ buildDunePackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ - taglib + taglib_1 zlib ]; diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index a05c94958e6b8..9a490952ec020 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - taglib, + taglib_1, cython, pytestCheckHook, pythonOlder, @@ -24,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ cython - taglib + taglib_1 ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 86feb7df0703c..85c14b2731d8e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre2, gecode_3, curl , libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk3, lerc, buildRubyGem , cairo, expat, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz +, file, libvirt, glib, vips, taglib_1, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook3, atk , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libepoxy, libxkbcommon, libmaxminddb, libyaml @@ -848,7 +848,7 @@ in }; taglib-ruby = attrs: { - buildInputs = [ taglib ]; + buildInputs = [ taglib_1 ]; }; timfel-krb5-auth = attrs: { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7c216103317ce..c01100df295be 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1834,7 +1834,7 @@ let ### T ### taglib = callPackage ../development/ocaml-modules/taglib { - inherit (pkgs) taglib; + inherit (pkgs) taglib_1; }; tar = callPackage ../development/ocaml-modules/tar { }; From eac18d2059ab89969eac8dce1bbb758807a37b34 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Wed, 12 Feb 2025 14:06:48 +0100 Subject: [PATCH 010/157] go, buildGoModule: default to 1.24 Signed-off-by: Paul Meyer --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcccdf4dd0179..1f5bccd162a75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10935,8 +10935,8 @@ with pkgs; ### DEVELOPMENT / GO # the unversioned attributes should always point to the same go version - go = go_1_23; - buildGoModule = buildGo123Module; + go = go_1_24; + buildGoModule = buildGo124Module; go_1_22 = callPackage ../development/compilers/go/1.22.nix { }; buildGo122Module = callPackage ../build-support/go/module.nix { From df15e5ec57deaae1f88e2848556d17dd247ac4de Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 9 Feb 2025 12:01:38 -0500 Subject: [PATCH 011/157] python312Packages.pytest-datadir: 1.5.0 -> 1.6.1 --- pkgs/development/python-modules/pytest-datadir/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index f7f098449e6bf..034bb795f1b03 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-datadir"; - version = "1.5.0"; + version = "1.6.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "gabrielcnr"; repo = "pytest-datadir"; tag = "v${version}"; - hash = "sha256-sRLqL+8Jf5Kz+qscuG3hClUuPA+33PQa+ob1ht/7CJE="; + hash = "sha256-qyJlg9Ck128NpJhLw2x7LuNtdSx3AaTQEUQ7fb2Aglg="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin for manipulating test data directories and files"; homepage = "https://github.com/gabrielcnr/pytest-datadir"; - changelog = "https://github.com/gabrielcnr/pytest-datadir/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/gabrielcnr/pytest-datadir/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau ]; }; From b58db91905cbc253218532bb9feb55addc9d47b5 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 13 Feb 2025 09:07:50 +0100 Subject: [PATCH 012/157] curl: 8.12.0 -> 8.12.1 https://github.com/curl/curl/releases/tag/curl-8_12_1 https://curl.se/ch/8.12.1.html Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/cu/curlMinimal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 8eb3e93a4d21d..636da4097bc1b 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -53,14 +53,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.12.0"; + version = "8.12.1"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-mkYox2S+axqZCVZ8E+jncQQWCd9DshWPysTgXqcJfl0="; + hash = "sha256-A0Hx7ZeibIEauuvTfWK4M5VnkrdgfqPxXQAWE8dt4gI="; }; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion From 6977084aa998457e275f5f9f77ec8a40efac3d53 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 13 Feb 2025 16:20:13 +0100 Subject: [PATCH 013/157] x264: 0-unstable-2023-10-01 -> 0-unstable-2025-01-03 --- pkgs/by-name/x2/x264/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/x2/x264/package.nix b/pkgs/by-name/x2/x264/package.nix index de4a3d8d78435..6b8d8ccd7bd19 100644 --- a/pkgs/by-name/x2/x264/package.nix +++ b/pkgs/by-name/x2/x264/package.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "x264"; - version = "0-unstable-2023-10-01"; + version = "0-unstable-2025-01-03"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; - rev = "31e19f92f00c7003fa115047ce50978bc98c3a0d"; - hash = "sha256-7/FaaDFmoVhg82BIhP3RbFq4iKGNnhviOPxl3/8PWCM="; + rev = "373697b467f7cd0af88f1e9e32d4f10540df4687"; + hash = "sha256-WWtS/UfKA4i1yakHErUnyT/3/+Wy2H5F0U0CmxW4ick="; }; patches = [ From 0d91765b9e122fed0bc5c96571a4b581f4cf87e0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 13 Feb 2025 16:20:01 +0100 Subject: [PATCH 014/157] x264: reformat --- pkgs/by-name/x2/x264/package.nix | 38 ++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/x2/x264/package.nix b/pkgs/by-name/x2/x264/package.nix index 6b8d8ccd7bd19..11239d2cb2fe2 100644 --- a/pkgs/by-name/x2/x264/package.nix +++ b/pkgs/by-name/x2/x264/package.nix @@ -1,8 +1,9 @@ -{ stdenv -, lib -, fetchFromGitLab -, nasm -, enableShared ? !stdenv.hostPlatform.isStatic +{ + stdenv, + lib, + fetchFromGitLab, + nasm, + enableShared ? !stdenv.hostPlatform.isStatic, }: stdenv.mkDerivation rec { @@ -29,18 +30,27 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - outputs = [ "out" "lib" "dev" ]; + outputs = [ + "out" + "lib" + "dev" + ]; - preConfigure = lib.optionalString stdenv.hostPlatform.isx86 '' - # `AS' is set to the binutils assembler, but we need nasm - unset AS - '' + lib.optionalString stdenv.hostPlatform.isAarch '' - export AS=$CC - ''; + preConfigure = + lib.optionalString stdenv.hostPlatform.isx86 '' + # `AS' is set to the binutils assembler, but we need nasm + unset AS + '' + + lib.optionalString stdenv.hostPlatform.isAarch '' + export AS=$CC + ''; - configureFlags = lib.optional enableShared "--enable-shared" + configureFlags = + lib.optional enableShared "--enable-shared" ++ lib.optional (!stdenv.hostPlatform.isi686) "--enable-pic" - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; + ++ lib.optional ( + stdenv.buildPlatform != stdenv.hostPlatform + ) "--cross-prefix=${stdenv.cc.targetPrefix}"; makeFlags = [ "BASHCOMPLETIONSDIR=$(out)/share/bash-completion/completions" From c8661c685a5b9ba6509da28701c3eeb47c6129f2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 4 Jan 2025 12:05:25 +1000 Subject: [PATCH 015/157] go: remove `xcbuild` --- pkgs/development/compilers/go/1.22.nix | 5 ----- pkgs/development/compilers/go/1.23.nix | 5 ----- pkgs/development/compilers/go/1.24.nix | 5 ----- 3 files changed, 15 deletions(-) diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index 471d398358a8d..c32a87ce96ffd 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -5,7 +5,6 @@ tzdata, replaceVars, iana-etc, - xcbuild, mailcap, buildPackages, pkgsBuildTarget, @@ -62,10 +61,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ - xcbuild - ]; - depsBuildTarget = lib.optional isCross targetCC; depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index dfeffaac77843..12875bc47349e 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -5,7 +5,6 @@ tzdata, replaceVars, iana-etc, - xcbuild, mailcap, buildPackages, pkgsBuildTarget, @@ -62,10 +61,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ - xcbuild - ]; - depsBuildTarget = lib.optional isCross targetCC; depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 4afafbdbc747f..3433b036671c0 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -5,7 +5,6 @@ tzdata, replaceVars, iana-etc, - xcbuild, mailcap, buildPackages, pkgsBuildTarget, @@ -62,10 +61,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ - xcbuild - ]; - depsBuildTarget = lib.optional isCross targetCC; depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; From d1d09dcd1ecb0c5709b3f5486d61f1d18cca5ccc Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 10 Feb 2025 17:36:35 -0500 Subject: [PATCH 016/157] checkpolicy: 3.7 -> 3.8 --- pkgs/by-name/ch/checkpolicy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkpolicy/package.nix b/pkgs/by-name/ch/checkpolicy/package.nix index 1703e5db68cee..bb563e7f0d033 100644 --- a/pkgs/by-name/ch/checkpolicy/package.nix +++ b/pkgs/by-name/ch/checkpolicy/package.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { pname = "checkpolicy"; - version = "3.7"; + version = "3.8"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/checkpolicy-${version}.tar.gz"; - sha256 = "sha256-/T4ZJUd9SZRtERaThmGvRMH4bw1oFGb9nwLqoGACoH8="; + sha256 = "sha256-ZforqKJR1tQvAwZGcU5eLegHrhbgIx3isDuUCq2636U="; }; nativeBuildInputs = [ From 27e825694ee1a97fdf222a884dbe89d960f287bc Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 10 Feb 2025 17:36:54 -0500 Subject: [PATCH 017/157] libselinux: 3.7 -> 3.8 --- pkgs/by-name/li/libselinux/package.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/li/libselinux/package.nix b/pkgs/by-name/li/libselinux/package.nix index 4d5cbbb11e32a..c4d5b7addae88 100644 --- a/pkgs/by-name/li/libselinux/package.nix +++ b/pkgs/by-name/li/libselinux/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, buildPackages, pcre2, pkg-config, @@ -19,7 +18,7 @@ assert enablePython -> swig != null && python3 != null; stdenv.mkDerivation ( rec { pname = "libselinux"; - version = "3.7"; + version = "3.8"; inherit (libsepol) se_url; outputs = [ @@ -31,7 +30,7 @@ stdenv.mkDerivation ( src = fetchurl { url = "${se_url}/${version}/libselinux-${version}.tar.gz"; - hash = "sha256-6gP0LROk+VdXmX26jPCyYyH6xdLxZEGLTMhWqS0rF70="; + hash = "sha256-DDdWvKBHyScCgdfE3N7NAAty44oYPJMGYeupaQg5tUE="; }; patches = [ @@ -45,8 +44,8 @@ stdenv.mkDerivation ( # This is a static email, so we shouldn't have to worry about # normalizing the patch. (fetchurl { - url = "https://lore.kernel.org/selinux/20211113141616.361640-1-hi@alyssa.is/raw"; - hash = "sha256-dqxiupaJK4o00YERGWGIEIhM7sPelxBFQomAFKXQQpk="; + url = "https://lore.kernel.org/selinux/20250211211651.1297357-3-hi@alyssa.is/raw"; + hash = "sha256-a0wTSItj5vs8GhIkfD1OPSjGmAJlK1orptSE7T3Hx20="; postFetch = '' mv "$out" $TMPDIR/patch ${buildPackages.patchutils_0_3_3}/bin/filterdiff \ @@ -58,13 +57,6 @@ stdenv.mkDerivation ( url = "https://git.yoctoproject.org/meta-selinux/plain/recipes-security/selinux/libselinux/0003-libselinux-restore-drop-the-obsolete-LSF-transitiona.patch?id=62b9c816a5000dc01b28e78213bde26b58cbca9d"; hash = "sha256-RiEUibLVzfiRU6N/J187Cs1iPAih87gCZrlyRVI2abU="; }) - - # libselinux: fix swig bindings for 4.3.0 - (fetchpatch { - url = "https://github.com/SELinuxProject/selinux/commit/8e0e718bae53fff30831b92cd784151d475a20da.patch"; - stripLen = 1; - hash = "sha256-8Nd6ketQ7/r5W0sRdheqyGWHJRZ1RfGC4ehTqnHau04="; - }) ]; nativeBuildInputs = From c87b3e5dab71b09d0beb4d66ab2a34100cfd5806 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 10 Feb 2025 17:38:16 -0500 Subject: [PATCH 018/157] policycoreutils: 3.7 -> 3.8 --- pkgs/by-name/po/policycoreutils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/policycoreutils/package.nix b/pkgs/by-name/po/policycoreutils/package.nix index b06be84ccd702..d494f85809a5b 100644 --- a/pkgs/by-name/po/policycoreutils/package.nix +++ b/pkgs/by-name/po/policycoreutils/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "policycoreutils"; - version = "3.7"; + version = "3.8"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/policycoreutils-${version}.tar.gz"; - hash = "sha256-WP5OSB7ftEVsEUklRC4ROJ3xc5SSWs26PeIRFFzl6pg="; + hash = "sha256-LEMLhmKq+zp1clHp2NYuyqvBwkvisqasbofT+giwTiI="; }; postPatch = '' From 3f29923fb3959c154fd1edb35c019b4c38e0d742 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 10 Feb 2025 17:38:36 -0500 Subject: [PATCH 019/157] libsemanage: 3.7 -> 3.8 --- pkgs/os-specific/linux/libsemanage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index f5b3a71b9545e..105eb5ac43e18 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { pname = "libsemanage"; - version = "3.7"; + version = "3.8"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/libsemanage-${version}.tar.gz"; - sha256 = "sha256-4WbK4ppBfasAjbnKCHQCPzU6MBewdpOgNu2XSH7aNbE="; + sha256 = "sha256-qslZiKVyzIl6GsG+d9NgvhFx/AstfGYZWnRWAbryW+8="; }; outputs = [ From 1488f3a320f8c875665571e14a922d07d5e73b7f Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 14 Feb 2025 18:04:31 +0900 Subject: [PATCH 020/157] systemd: 257.2 -> 257.3 --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 11492bd163e34..7561fb90a0bfb 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -193,7 +193,7 @@ assert withBootloader -> withEfi; let wantCurl = withRemote || withImportd; - version = "257.2"; + version = "257.3"; # Use the command below to update `releaseTimestamp` on every (major) version # change. More details in the commentary at mesonFlags. @@ -211,7 +211,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd"; rev = "v${version}"; - hash = "sha256-A64RK+EIea98dpq8qzXld4kbDGvYsKf/vDnNtMmwSBM="; + hash = "sha256-GvRn55grHWR6M+tA86RMzqinuXNpPZzRB4ApuGN/ZvU="; }; # On major changes, or when otherwise required, you *must* : From 2822faf8160d3572516aa390f9309574a2e1286d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 11:06:30 +0000 Subject: [PATCH 021/157] vim: 9.1.1046 -> 9.1.1111 --- 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 e91d213913e92..d5e1998628e2d 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.1046"; + version = "9.1.1111"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-bH3p78fWUNQRhluUvqQ5uJ+PxNhz7T7wA/4zxUDH130="; + hash = "sha256-9U5JCilCGgqTBdrTrz7Ba28/ser9quzHYoly5/IKzZA="; }; enableParallelBuilding = true; From 75229802d802fcac4d89ca17659cb5e5d8aa0eb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 12:52:43 +0000 Subject: [PATCH 022/157] double-conversion: 3.3.0 -> 3.3.1 --- pkgs/by-name/do/double-conversion/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix index 40f87f1ec4442..508a6d576cb20 100644 --- a/pkgs/by-name/do/double-conversion/package.nix +++ b/pkgs/by-name/do/double-conversion/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "double-conversion"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "sha256-DkMoHHoHwV4p40IINEqEPzKsCa0LHrJAFw2Yftw7zHo="; + sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM="; }; nativeBuildInputs = [ cmake ]; From fc223e48a00c4c4ba5947335eef5970263d0f12a Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 14 Feb 2025 18:31:14 +0900 Subject: [PATCH 023/157] python3Packages.click: 8.1.7 -> 8.1.8 Signed-off-by: misilelab --- pkgs/development/python-modules/click/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index cf69beff04014..ec105f1ef7d5e 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -12,12 +12,13 @@ magic-wormhole, mitmproxy, typer, + flit-core, }: buildPythonPackage rec { pname = "click"; - version = "8.1.7"; - format = "setuptools"; + version = "8.1.8"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,10 +26,11 @@ buildPythonPackage rec { owner = "pallets"; repo = "click"; tag = version; - hash = "sha256-8YqIKRyw5MegnRwAO7YTCZateEFQFTH2PHpE8gTPTow="; + hash = "sha256-pAAqf8jZbDfVZUoltwIFpov/1ys6HSYMyw3WV2qcE/M="; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + build-system = [ flit-core ]; + dependencies = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; nativeCheckInputs = [ pytestCheckHook ]; From ed810899551e35da6ecf626f51e03576990e216d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 15 Feb 2025 10:11:36 +0900 Subject: [PATCH 024/157] python312Packages.ipython: 8.31.0 -> 8.32.0 Changelog: https://github.com/ipython/ipython/blob/8.32.0/docs/source/whatsnew/version8.rst --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index b9e1c4d69b628..0b8e9977050e7 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -43,13 +43,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.31.0"; + version = "8.32.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-tqInRga+xhZkBf8F5Uky7W5c/srKH8BfLKzee7B01ws="; + hash = "sha256-viyRiVsLnqe6SdM7I+IEDDUrM+tqUZzKfObgx0NEQlE="; }; build-system = [ setuptools ]; From e41e61c973cc6dc14b4b57cb5b5ca0073a0444e3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 13 Feb 2025 22:42:10 +0000 Subject: [PATCH 025/157] qemu: 9.2.0 -> 9.2.1 --- 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 63675696b3b3b..9f211d3b85226 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -70,11 +70,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "9.2.0"; + version = "9.2.1"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-+FnwvGXh9TPQQLvoySvP7O5a8skhpmh8ZS+0TQib2JQ="; + hash = "sha256-t7B4Lq1jpTc/3+COCE05Sak5XsGWGAKGuEH3ikZNFpw="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] From 1c3ad5fe4cfb22dc52388ad3260a6387b2f5c5b6 Mon Sep 17 00:00:00 2001 From: Robbe Van Petegem Date: Sat, 15 Feb 2025 09:29:05 +0100 Subject: [PATCH 026/157] ruby_3_4: 3.4.1 -> 3.4.2 --- pkgs/development/interpreters/ruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 78665913fdd70..befb945e1fe42 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -442,8 +442,8 @@ in }; ruby_3_4 = generic { - version = rubyVersion "3" "4" "1" ""; - hash = "sha256-PTheXSLTaLBkyBehPtjjzD9xp3BdftG654ATwzqnyH8="; + version = rubyVersion "3" "4" "2" ""; + hash = "sha256-QTKKwh8r/dfeazVl708N11QzVNN+lvFXoVUqa9DrNks="; cargoHash = "sha256-5Tp8Kth0yO89/LIcU8K01z6DdZRr8MAA0DPKqDEjIt0="; }; } From da04c5b5bfd5a87366dc56f506394fd8e9354166 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 15:05:28 +0000 Subject: [PATCH 027/157] publicsuffix-list: 0-unstable-2025-01-16 -> 0-unstable-2025-02-12 --- 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 1345543b7f162..ca99e248714a3 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-2025-01-16"; + version = "0-unstable-2025-02-12"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "4f2d3b20034a6c7a0ad4400716f1e0f752e2c737"; - hash = "sha256-1U+CS5ER4b/mI9Ox2gJQfEOVeDHBt1C3UbG5sDAs8Mk="; + rev = "560007a8aea8267f15cad9abcdbcff7848186bd8"; + hash = "sha256-/5O0ac0mJZzOgy8h1NE0dTt0jzAEkymBbh5hJmc1+qk="; }; dontBuild = true; From 3e7917fc454b53fda7a479100f36adb1dfdb1b2b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 15 Feb 2025 18:52:32 +0200 Subject: [PATCH 028/157] python312Packages.numpy: 2.2.2 -> 2.2.3 Changelog: https://github.com/numpy/numpy/releases/tag/v2.2.3 --- 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 d2dec4459d92d..4ba4d0c2b2304 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.2"; + version = "2.2.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -67,7 +67,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-7WkG9hg01odzjSWYiuEXaDcFY2k2zGBb4LsgiyPfTY8="; + hash = "sha256-29wV8MgWEZJfOC36l7O9C8LBzhnU/lBILLDdwSujACA="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From d10b4d690f1ade567eaeec792abafceaff703b6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 18:07:23 +0000 Subject: [PATCH 029/157] pyright: 1.1.392 -> 1.1.394 --- 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 0a7dd4deefe33..fb5b99f841dd4 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.392"; + version = "1.1.394"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-/Js9w6wxoJLqJxcRkpdwk2i9bR7jw/dtGkUvwxkv/qA="; + hash = "sha256-zOJtv9ETolo3XmH+ztNJEmX319rV/CABDIw2crSxqqw="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -44,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-xGEX6Dvhhch0PWjO+LDQqTH3IRRfVbQPMXUjbL/KYpE="; + npmDepsHash = "sha256-RE1ZwMKgWu686/ejMB0E1CRix8MLv6lNoEkyAkvOC6U="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -58,7 +58,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-TK05a3Ys3Q8s/2c2HOjh1EdnL1jFttjdApggeZLQUzw="; + npmDepsHash = "sha256-sQeHXfhm6u0at4vhFjGPwMmTdDomU6cJnolOFO6ynXA="; postPatch = '' chmod +w ../../ From 0dd251e2471bb1913663f4ac93963be47bbe62ec Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 1 Feb 2025 16:18:16 -0500 Subject: [PATCH 030/157] darwin.libffi: fix a memory leak See https://github.com/libffi/libffi/pull/621#discussion_r955298301 --- .../darwin/apple-source-releases/libffi/package.nix | 2 ++ .../patches/fix-tramponline-memory-leak.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libffi/patches/fix-tramponline-memory-leak.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix index 2a684a729f3e4..5e9ea766bdd24 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix @@ -25,6 +25,8 @@ mkAppleDerivation (finalAttrs: { patches = [ # Clang 18 requires that no non-private symbols by defined after cfi_startproc. Apply the upstream libffi fix. ./patches/llvm-18-compatibility.patch + # Fix a memory leak when using the trampoline dylib. See https://github.com/libffi/libffi/pull/621#discussion_r955298301. + ./patches/fix-tramponline-memory-leak.patch ]; # Make sure libffi is using the trampolines dylib in this package not the system one. diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/fix-tramponline-memory-leak.patch b/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/fix-tramponline-memory-leak.patch new file mode 100644 index 0000000000000..9bc54c5c29ac5 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/fix-tramponline-memory-leak.patch @@ -0,0 +1,13 @@ +diff --git a/src/closures.c b/src/closures.c +index 01f9950cd0..1dfd375cff 100644 +--- a/src/closures.c ++++ b/src/closures.c +@@ -329,7 +329,7 @@ + table->next->prev = table->prev; + + /* Deallocate pages */ +- vm_deallocate (mach_task_self (), table->config_page, PAGE_MAX_SIZE * 2); ++ vm_deallocate (mach_task_self (), table->config_page, FFI_TRAMPOLINE_ALLOCATION_PAGE_COUNT * PAGE_MAX_SIZE); + + /* Deallocate free list */ + free (table->free_list_pool); From 5fee99715e45ca513a566cb4c07f33af712d203e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 1 Feb 2025 16:18:16 -0500 Subject: [PATCH 031/157] darwin.libffi: drop `--enable-pax_emutramp` configure flag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It doesn’t appear to do anything on Darwin, so drop it. --- pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix index 5e9ea766bdd24..10ef20f67cf2a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix @@ -48,7 +48,6 @@ mkAppleDerivation (finalAttrs: { configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= - "--enable-pax_emutramp" ]; # Make sure aarch64-darwin is using the trampoline dylib. From 99de8ee9a601329a63c9f72526fd514423598330 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 1 Feb 2025 16:18:16 -0500 Subject: [PATCH 032/157] darwin.libffi: align trampoline dylib linker flags with Xcode project --- .../darwin/apple-source-releases/libffi/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix index 10ef20f67cf2a..c50bbfd8c5a03 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix @@ -56,7 +56,8 @@ mkAppleDerivation (finalAttrs: { ''; postBuild = lib.optionalString stdenv.hostPlatform.isAarch64 '' - $CC src/aarch64/trampoline.S -dynamiclib -o libffi-trampolines.dylib \ + $CC -Os -Wl,-allowable_client,! -Wl,-not_for_dyld_shared_cache -Wl,-no_compact_unwind \ + src/aarch64/trampoline.S -dynamiclib -o libffi-trampolines.dylib \ -Iinclude -Iaarch64-apple-darwin -Iaarch64-apple-darwin/include \ -install_name "$out/lib/libffi-trampoline.dylib" -Wl,-compatibility_version,1 -Wl,-current_version,1 ''; From e26ff7f8a2f71d1037d53fac35498492deb4c62d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Feb 2025 19:36:14 -0500 Subject: [PATCH 033/157] python312Packages.botocore: 1.35.99 -> 1.36.21 Changelog: https://github.com/boto/botocore/blob/1.36.21/CHANGELOG.rst --- .../python-modules/botocore/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index a16af885a508f..41709defbe1c4 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -2,7 +2,7 @@ lib, awscrt, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system setuptools, @@ -19,17 +19,19 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.35.99"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.36.21"; # N.B: if you change this, change boto3 and awscli to a matching version pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-HqtE6WnDnF89mjEEoINsJHFVeaRV8Ss5eaMdfN5Rs8M="; + src = fetchFromGitHub { + owner = "boto"; + repo = "botocore"; + tag = version; + hash = "sha256-wk3KCRagEju4ywJfoBR8/4dH3xYgzGgaSHavDYCd5XY="; }; - pythonRelaxDeps = [ "urllib3" ]; - - build-system = [ setuptools ]; + build-system = [ + setuptools + ]; dependencies = [ jmespath From de5081c707237a425517c015c7b16c0ee8dee94e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Feb 2025 19:42:45 -0500 Subject: [PATCH 034/157] python312Packages.boto3: 1.35.99 -> 1.36.21 --- pkgs/development/python-modules/boto3/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index eb783eff89316..ad414dbdecae8 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { owner = "boto"; repo = "boto3"; tag = version; - hash = "sha256-b08tC8EA6iW0O/7rseD9pTkKh/cJ2fe3xJZkEqxS6VI="; + hash = "sha256-89GUr0isFEKmBevWgPW5z4uU1zOTQ1kM8RX1mlsvdXw="; }; - build-system = [ setuptools ]; - - pythonRelaxDeps = [ "s3transfer" ]; + build-system = [ + setuptools + ]; dependencies = [ botocore @@ -51,7 +51,7 @@ buildPythonPackage rec { ]; optional-dependencies = { - crt = [ botocore.optional-dependencies.crt ]; + crt = botocore.optional-dependencies.crt; }; meta = { From 609dcd86e06f6f1455978cb51aea8d6c84e7139e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Feb 2025 19:47:41 -0500 Subject: [PATCH 035/157] python312Packages.s3transfer: 0.10.1 -> 0.11.2 Diff: https://github.com/boto/s3transfer/compare/refs/tags/0.10.1...0.11.2 Changelog: https://github.com/boto/s3transfer/blob/0.11.2/CHANGELOG.rst --- .../python-modules/s3transfer/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 97aac3a17bfea..dcf80fc53d4e4 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.10.1"; + version = "0.11.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,14 +20,20 @@ buildPythonPackage rec { owner = "boto"; repo = "s3transfer"; tag = version; - hash = "sha256-EHNkYviafnuU8AADp9oyaDuAnoPOdOVNSLCcoONnHPY="; + hash = "sha256-59uyCgormgRX1JnOUtZv6wRXQiy5CvM/2sSzSC3h1Rc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ botocore ]; + dependencies = [ + botocore + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTestPaths = [ @@ -43,14 +49,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "s3transfer" ]; optional-dependencies = { - crt = [ botocore.optional-dependencies.crt ]; + crt = botocore.optional-dependencies.crt; }; - meta = with lib; { + meta = { description = "Library for managing Amazon S3 transfers"; homepage = "https://github.com/boto/s3transfer"; changelog = "https://github.com/boto/s3transfer/blob/${version}/CHANGELOG.rst"; - license = licenses.asl20; - maintainers = with maintainers; [ nickcao ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nickcao ]; }; } From 06deeb63dc93fa1a9233dded32b94641596893aa Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Feb 2025 19:43:10 -0500 Subject: [PATCH 036/157] awscli: 1.36.40 -> 1.37.21 Changelog: https://github.com/aws/aws-cli/blob/1.37.21/CHANGELOG.rst --- pkgs/by-name/aw/awscli/package.nix | 32 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/aw/awscli/package.nix b/pkgs/by-name/aw/awscli/package.nix index 73925189d362d..daa7e88c83e9e 100644 --- a/pkgs/by-name/aw/awscli/package.nix +++ b/pkgs/by-name/aw/awscli/package.nix @@ -1,7 +1,7 @@ { lib, - python3, - fetchPypi, + python3Packages, + fetchFromGitHub, groff, less, nix-update-script, @@ -10,36 +10,38 @@ }: let - self = python3.pkgs.buildPythonApplication rec { + self = python3Packages.buildPythonApplication rec { pname = "awscli"; # N.B: if you change this, change botocore and boto3 to a matching version too # check e.g. https://github.com/aws/aws-cli/blob/1.33.21/setup.py - version = "1.36.40"; + version = "1.37.21"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-4qiPiNwW1cDyY3mv1vJUCX5T6LNMghZOWfQWXbbubfo="; + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-cli"; + tag = version; + hash = "sha256-gKRWhOhZjGhPVIG6KgCyDqxuyBGbaS8bHD7vnJ4gA+o="; }; pythonRelaxDeps = [ # botocore must not be relaxed - "colorama" "docutils" "rsa" ]; - build-system = [ - python3.pkgs.setuptools + build-system = with python3Packages; [ + setuptools ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ botocore + docutils s3transfer + pyyaml colorama - docutils rsa - pyyaml + groff less ]; @@ -59,14 +61,14 @@ let installCheckPhase = '' runHook preInstallCheck - $out/bin/aws --version | grep "${python3.pkgs.botocore.version}" + $out/bin/aws --version | grep "${python3Packages.botocore.version}" $out/bin/aws --version | grep "${version}" runHook postInstallCheck ''; passthru = { - python = python3; # for aws_shell + python = python3Packages.python; # for aws_shell updateScript = nix-update-script { extraArgs = [ "--version=skip" ]; }; From 39887b09505c6dd0af476ff0efe75177617b5930 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Feb 2025 19:57:39 -0500 Subject: [PATCH 037/157] python312Packages.moto: 5.0.26 -> 5.0.28 Changelog: https://github.com/getmoto/moto/blob/5.0.28/CHANGELOG.md --- .../python-modules/moto/default.nix | 227 +++++++++++++----- 1 file changed, 173 insertions(+), 54 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 970791484b51a..d824661a8bcdf 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -9,15 +9,15 @@ crc32c, cryptography, docker, - fetchPypi, + fetchFromGitHub, flask-cors, flask, freezegun, graphql-core, jinja2, joserfc, - jsondiff, jsonpath-ng, + jsonschema, multipart, openapi-spec-validator, py-partiql-parser, @@ -37,17 +37,21 @@ buildPythonPackage rec { pname = "moto"; - version = "5.0.26"; + version = "5.0.28"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-aCn1imcKCH58W2P4GDxrctZKFETkIMISJQtzJraakYM="; + src = fetchFromGitHub { + owner = "getmoto"; + repo = "moto"; + tag = version; + hash = "sha256-++kkPiI3AOTF+VlvPWhjhuiIjiHQPa3M0Nmh3+1PHSE="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + ]; dependencies = [ boto3 @@ -64,56 +68,54 @@ buildPythonPackage rec { optional-dependencies = { all = [ antlr4-python3-runtime - aws-xray-sdk - cfn-lint - docker - flask - flask-cors - graphql-core joserfc - jsondiff jsonpath-ng - multipart + docker + graphql-core + pyyaml + cfn-lint + jsonschema openapi-spec-validator - py-partiql-parser pyparsing - pyyaml + py-partiql-parser + aws-xray-sdk setuptools + multipart ]; proxy = [ antlr4-python3-runtime - aws-xray-sdk - cfn-lint - docker - graphql-core joserfc - jsondiff jsonpath-ng - multipart + docker + graphql-core + pyyaml + cfn-lint openapi-spec-validator - py-partiql-parser pyparsing - pyyaml + py-partiql-parser + aws-xray-sdk setuptools + multipart ]; server = [ antlr4-python3-runtime - aws-xray-sdk - cfn-lint - docker - flask - flask-cors - graphql-core joserfc - jsondiff jsonpath-ng + docker + graphql-core + pyyaml + cfn-lint openapi-spec-validator - py-partiql-parser pyparsing - pyyaml + py-partiql-parser + aws-xray-sdk setuptools + flask + flask-cors ]; - cognitoidp = [ joserfc ]; + acm = [ ]; + acmpca = [ ]; + amp = [ ]; apigateway = [ pyyaml joserfc @@ -123,19 +125,53 @@ buildPythonPackage rec { pyyaml openapi-spec-validator ]; + applicationautoscaling = [ ]; + appsync = [ + graphql-core + ]; + athena = [ ]; + autoscaling = [ ]; + awslambda = [ + docker + ]; + awslambda_simple = [ ]; + backup = [ ]; + batch = [ + docker + ]; + batch_simple = [ ]; + budgets = [ ]; + ce = [ ]; cloudformation = [ - aws-xray-sdk - cfn-lint + joserfc docker graphql-core - joserfc - jsondiff + pyyaml + cfn-lint openapi-spec-validator - py-partiql-parser pyparsing - pyyaml + py-partiql-parser + aws-xray-sdk setuptools ]; + cloudfront = [ ]; + cloudtrail = [ ]; + cloudwatch = [ ]; + codebuild = [ ]; + codecommit = [ ]; + codepipeline = [ ]; + cognitoidentity = [ ]; + cognitoidp = [ + joserfc + ]; + comprehend = [ ]; + config = [ ]; + databrew = [ ]; + datapipeline = [ ]; + datasync = [ ]; + dax = [ ]; + dms = [ ]; + ds = [ ]; dynamodb = [ docker py-partiql-parser @@ -144,33 +180,116 @@ buildPythonPackage rec { docker py-partiql-parser ]; - events = [ jsonpath-ng ]; - glue = [ pyparsing ]; - iotdata = [ jsondiff ]; + ebs = [ ]; + ec2 = [ ]; + ec2instanceconnect = [ ]; + ecr = [ ]; + ecs = [ ]; + efs = [ ]; + eks = [ ]; + elasticache = [ ]; + elasticbeanstalk = [ ]; + elastictranscoder = [ ]; + elb = [ ]; + elbv2 = [ ]; + emr = [ ]; + emrcontainers = [ ]; + emrserverless = [ ]; + es = [ ]; + events = [ + jsonpath-ng + ]; + firehose = [ ]; + forecast = [ ]; + glacier = [ ]; + glue = [ + pyparsing + ]; + greengrass = [ ]; + guardduty = [ ]; + iam = [ ]; + inspector2 = [ ]; + iot = [ ]; + iotdata = [ ]; + ivs = [ ]; + kinesis = [ ]; + kinesisvideo = [ ]; + kinesisvideoarchivedmedia = [ ]; + kms = [ ]; + logs = [ ]; + managedblockchain = [ ]; + mediaconnect = [ ]; + medialive = [ ]; + mediapackage = [ ]; + mediastore = [ ]; + mediastoredata = [ ]; + meteringmarketplace = [ ]; + mq = [ ]; + opsworks = [ ]; + organizations = [ ]; + panorama = [ ]; + personalize = [ ]; + pinpoint = [ ]; + polly = [ ]; + quicksight = [ + jsonschema + ]; + ram = [ ]; + rds = [ ]; + redshift = [ ]; + redshiftdata = [ ]; + rekognition = [ ]; + resourcegroups = [ ]; resourcegroupstaggingapi = [ - cfn-lint + joserfc docker graphql-core - joserfc - jsondiff + pyyaml + cfn-lint openapi-spec-validator - py-partiql-parser pyparsing - pyyaml + py-partiql-parser ]; + route53 = [ ]; + route53resolver = [ ]; s3 = [ pyyaml py-partiql-parser ]; + s3crc32c = [ + pyyaml + py-partiql-parser + crc32c + ]; + s3control = [ ]; + sagemaker = [ ]; + sdb = [ ]; + scheduler = [ ]; + secretsmanager = [ ]; + servicediscovery = [ ]; + servicequotas = [ ]; + ses = [ ]; + signer = [ ]; sns = [ ]; + sqs = [ ]; + ssm = [ + pyyaml + ]; + ssoadmin = [ ]; stepfunctions = [ antlr4-python3-runtime jsonpath-ng ]; - s3crc32c = [ - pyyaml - py-partiql-parser - crc32c + sts = [ ]; + support = [ ]; + swf = [ ]; + textract = [ ]; + timestreamwrite = [ ]; + transcribe = [ ]; + wafv2 = [ ]; + xray = [ + aws-xray-sdk + setuptools ]; }; @@ -181,7 +300,7 @@ buildPythonPackage rec { pytest-order pytest-xdist pytestCheckHook - ] ++ optional-dependencies.all; + ] ++ optional-dependencies.server; # Some tests depend on AWS credentials environment variables to be set. env.AWS_ACCESS_KEY_ID = "ak"; From 0b161bcd9ed574e16e7fe3e5e5a81d996c8a4c0a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Feb 2025 19:54:00 -0500 Subject: [PATCH 038/157] python312Packages.aiobotocore: 2.18.0 -> 2.19.0 Diff: https://github.com/aio-libs/aiobotocore/compare/refs/tags/2.18.0...2.19.0 Changelog: https://github.com/aio-libs/aiobotocore/releases/tag/2.19.0 --- .../python-modules/aiobotocore/default.nix | 72 +++++++++---------- 1 file changed, 32 insertions(+), 40 deletions(-) diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 99c5e93203985..75cbc510ccf0f 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -1,27 +1,30 @@ { lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, aiohttp, aioitertools, botocore, - buildPythonPackage, + python-dateutil, + jmespath, + multidict, + urllib3, + wrapt, dill, - fetchFromGitHub, - flask, - flask-cors, - awscli, moto, + pytest-asyncio, + time-machine, + werkzeug, + awscli, boto3, setuptools, - pytest-asyncio, pytestCheckHook, - pythonAtLeast, - pythonOlder, - wrapt, }: buildPythonPackage rec { pname = "aiobotocore"; - version = "2.18.0"; + version = "2.19.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,19 +33,25 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiobotocore"; tag = version; - hash = "sha256-4S0CZtk5k+xke2WVwYrNyvP2up32xrOcdKNP72kO6zQ="; + hash = "sha256-8wtWIkGja4zb2OoYALH9hTR6i90sIjIjYWTUulfYIYA="; }; # Relax version constraints: aiobotocore works with newer botocore versions # the pinning used to match some `extras_require` we're not using. pythonRelaxDeps = [ "botocore" ]; - build-system = [ setuptools ]; + build-system = [ + setuptools + ]; dependencies = [ aiohttp aioitertools botocore + python-dateutil + jmespath + multidict + urllib3 wrapt ]; @@ -53,57 +62,40 @@ buildPythonPackage rec { nativeCheckInputs = [ dill - flask - flask-cors moto pytest-asyncio + time-machine + werkzeug pytestCheckHook - ]; + ] ++ moto.optional-dependencies.server; pythonImportsCheck = [ "aiobotocore" ]; disabledTestPaths = [ - # Tests require network access - "tests/python3.8/" + # Test requires network access + "tests/test_version.py" + # Test not compatible with latest moto + "tests/boto_tests/unit/test_eventstream.py" + "tests/python3.8/test_eventstreams.py" "tests/test_basic_s3.py" "tests/test_batch.py" "tests/test_dynamodb.py" "tests/test_ec2.py" - "tests/test_eventstreams.py" "tests/test_lambda.py" "tests/test_monitor.py" - "tests/test_mturk.py" "tests/test_patches.py" "tests/test_sns.py" "tests/test_sqs.py" - "tests/test_version.py" "tests/test_waiter.py" - # moto compat issues - "tests/boto_tests/unit/test_signers.py" ]; - disabledTests = - [ - "test_get_credential" - "test_load_sso_credentials_without_cache" - "test_load_sso_credentials" - "test_required_config_not_set" - "test_sso_cred_fetcher_raises_helpful_message_on_unauthorized_exception" - "test_sso_credential_fetcher_can_fetch_credentials" - ] - ++ lib.optionals (pythonAtLeast "3.12.") [ - # AttributeError: 'called_with' is not a valid assertion. Use a spec for the mock if 'called_with' is meant to be an attribute. - "test_max_rate_updated_on_success_response" - "test_max_rate_cant_exceed_20_percent_max" - ]; - __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Python client for amazon services"; homepage = "https://github.com/aio-libs/aiobotocore"; changelog = "https://github.com/aio-libs/aiobotocore/releases/tag/${src.tag}"; - license = licenses.asl20; - maintainers = with maintainers; [ teh ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ teh ]; }; } From d01c14493612983f6c2375318876fed2ef00b3d9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Feb 2025 20:46:10 -0500 Subject: [PATCH 039/157] python312Packages.aioboto3: 13.1.1 -> 13.4.0 Diff: https://github.com/terrycain/aioboto3/compare/refs/tags/v13.1.1...v13.4.0 Changelog: https://github.com/terrycain/aioboto3/blob/refs/tags/v13.4.0/CHANGELOG.rst --- .../python-modules/aioboto3/default.nix | 43 ++++++++----------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix index 469573ab4da82..e96167296eab1 100644 --- a/pkgs/development/python-modules/aioboto3/default.nix +++ b/pkgs/development/python-modules/aioboto3/default.nix @@ -13,12 +13,11 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - requests, }: buildPythonPackage rec { pname = "aioboto3"; - version = "13.1.1"; + version = "13.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,16 +26,18 @@ buildPythonPackage rec { owner = "terrycain"; repo = "aioboto3"; tag = "v${version}"; - hash = "sha256-g86RKQxTcfG1CIH3gfgn9Vl9JxUkeC1ztmLk4q/MVn0="; + hash = "sha256-o3PynPW6nPvbBrsw+HU2fJheVRpCHCb0EnJdmseorsE="; }; + pythonRelaxDeps = [ + "aiobotocore" + ]; + build-system = [ poetry-core poetry-dynamic-versioning ]; - pythonRelaxDeps = [ "aiobotocore" ]; - dependencies = [ aiobotocore aiofiles @@ -47,31 +48,23 @@ buildPythonPackage rec { s3cse = [ cryptography ]; }; - nativeCheckInputs = [ - dill - moto - pytest-asyncio - pytestCheckHook - requests - ] ++ lib.flatten (builtins.attrValues optional-dependencies); + nativeCheckInputs = + [ + dill + moto + pytest-asyncio + pytestCheckHook + ] + ++ moto.optional-dependencies.server + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "aioboto3" ]; - disabledTests = [ - # Our moto package is not ready to support more tests - "encrypt_decrypt_aes_cbc" - "test_chalice_async" - "test_dynamo" - "test_flush_doesnt_reset_item_buffer" - "test_kms" - "test_s3" - ]; - - meta = with lib; { + meta = { description = "Wrapper to use boto3 resources with the aiobotocore async backend"; homepage = "https://github.com/terrycain/aioboto3"; changelog = "https://github.com/terrycain/aioboto3/blob/${src.rev}/CHANGELOG.rst"; - license = licenses.asl20; - maintainers = with maintainers; [ mbalatsko ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mbalatsko ]; }; } From 84b2a4b8c02eda0268c7090d13f2d1b5e6d419e7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Feb 2025 01:02:27 +0100 Subject: [PATCH 040/157] python312Packages.fsspec: 2024.12.0 -> 2025.2.0 Diff: https://github.com/fsspec/filesystem_spec/compare/refs/tags/2024.12.0...2025.2.0 Changelog: https://github.com/fsspec/filesystem_spec/raw/2025.2.0/docs/source/changelog.rst --- .../python-modules/fsspec/default.nix | 85 +++++++------------ 1 file changed, 33 insertions(+), 52 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index f50260858afdb..15da101a6dec5 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -1,47 +1,51 @@ { lib, stdenv, - aiohttp, buildPythonPackage, fetchFromGitHub, + + # build-system hatchling, hatch-vcs, - numpy, - paramiko, - pytest-asyncio, - pytest-mock, - pytest-vcr, - pytestCheckHook, - pythonOlder, - requests, - smbprotocol, - tqdm, + + # optional-dependencies adlfs, + pyarrow, dask, distributed, + requests, dropbox, + aiohttp, fusepy, gcsfs, libarchive-c, ocifs, panel, - pyarrow, + paramiko, pygit2, s3fs, + smbprotocol, + tqdm, + + # tests + numpy, + pytest-asyncio, + pytest-mock, + pytest-vcr, + pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "fsspec"; - version = "2024.12.0"; + version = "2025.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "fsspec"; repo = "filesystem_spec"; tag = version; - hash = "sha256-Vc0vBayPg6zZ4+pxJsHChSGg0kjA0Q16+Gk0bO0IEpI="; + hash = "sha256-vJYnPbGbEMAe1p0EUBxSRZYtvBdJzjzDOesyTJsFJbU="; }; build-system = [ @@ -58,9 +62,9 @@ buildPythonPackage rec { distributed ]; dropbox = [ - # missing dropboxdrivefs - requests dropbox + # dropboxdrivefs + requests ]; entrypoints = [ ]; full = [ @@ -90,10 +94,7 @@ buildPythonPackage rec { gs = [ gcsfs ]; gui = [ panel ]; hdfs = [ pyarrow ]; - http = [ - aiohttp - requests - ]; + http = [ aiohttp ]; libarchive = [ libarchive-c ]; oci = [ ocifs ]; s3 = [ s3fs ]; @@ -110,39 +111,19 @@ buildPythonPackage rec { pytest-mock pytest-vcr pytestCheckHook + writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - __darwinAllowLocalNetworking = true; - disabledTests = - [ - # Test assumes user name is part of $HOME - # AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar' - "test_strip_protocol_expanduser" - # test accesses this remote ftp server: - # https://ftp.fau.de/debian-cd/current/amd64/log/success - "test_find" - # Tests want to access S3 - "test_urlpath_inference_errors" - "test_mismatch" - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - # works locally on APFS, fails on hydra with AssertionError comparing timestamps - # darwin hydra builder uses HFS+ and has only one second timestamp resolution - # this two tests however, assume nanosecond resolution - "test_modified" - "test_touch" - # tries to access /home, ignores $HOME - "test_directories" - ]; - - disabledTestPaths = [ - # JSON decoding issues - "fsspec/implementations/tests/test_dbfs.py" + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin) [ + # works locally on APFS, fails on hydra with AssertionError comparing timestamps + # darwin hydra builder uses HFS+ and has only one second timestamp resolution + # this two tests however, assume nanosecond resolution + "test_modified" + "test_touch" + # tries to access /home, ignores $HOME + "test_directories" ]; pythonImportsCheck = [ "fsspec" ]; @@ -152,6 +133,6 @@ buildPythonPackage rec { homepage = "https://github.com/fsspec/filesystem_spec"; changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst"; license = lib.licenses.bsd3; - maintainers = [ ]; + maintainers = with lib.maintainers; [ nickcao ]; }; } From 90bfc1de229298c58b8b108912456051136a810a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 14:18:42 +0100 Subject: [PATCH 041/157] python312Packages.s3fs: enable fixed tests --- .../python-modules/s3fs/default.nix | 92 ++----------------- 1 file changed, 8 insertions(+), 84 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index af5ae376c84fe..71832865e313f 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -3,9 +3,6 @@ buildPythonPackage, fetchFromGitHub, - # buildInputs - docutils, - # build-system setuptools, @@ -33,20 +30,21 @@ buildPythonPackage rec { hash = "sha256-nnfvccORDspj54sRxL3d0hn4MpzKYGKE2Kl0v/wLaNw="; }; - buildInputs = [ docutils ]; - - build-system = [ setuptools ]; - - pythonRelaxDeps = [ - "fsspec" + build-system = [ + setuptools ]; dependencies = [ aiobotocore - aiohttp fsspec + aiohttp ]; + optional-dependencies = { + awscli = aiobotocore.optional-dependencies.awscli; + boto3 = aiobotocore.optional-dependencies.boto3; + }; + pythonImportsCheck = [ "s3fs" ]; nativeCheckInputs = [ @@ -59,80 +57,6 @@ buildPythonPackage rec { disabledTests = [ # require network access "test_async_close" - - # AssertionError: assert ['x', 'y'] == [] - "test_with_data" - - # AssertionError: assert ['1', 'x', 'y'] == [] - "test_clear_empty" - "test_no_dircache" - - # KeyError: 'ChecksumAlgorithm' - "test_info" - - # KeyError: - # del d[1] - "test_complex_keys" - - # TypeError: string indices must be integers, not 'str' - "test_bucket_versioning" - "test_bulk_delete" - "test_copy_with_source_and_destination_as_list" - "test_cp_directory_recursive" - "test_dynamic_add_rm" - "test_get_directory_to_existing_directory" - "test_get_directory_to_new_directory" - "test_get_directory_without_files_with_same_name_prefix" - "test_get_file_info_with_selector" - "test_get_file_to_existing_directory" - "test_get_file_to_file_in_existing_directory" - "test_get_file_to_file_in_new_directory" - "test_get_file_to_new_directory" - "test_get_glob_edge_cases" - "test_get_glob_to_existing_directory" - "test_get_glob_to_new_directory" - "test_get_list_of_files_to_existing_directory" - "test_get_list_of_files_to_new_directory" - "test_get_with_source_and_destination_as_list" - "test_move[False]" - "test_move[True]" - "test_new_bucket" - "test_new_bucket_auto" - "test_pipe_exclusive" - "test_put_directory_recursive" - "test_put_directory_to_existing_directory" - "test_put_directory_to_new_directory" - "test_put_directory_without_files_with_same_name_prefix" - "test_put_file_to_existing_directory" - "test_put_file_to_file_in_existing_directory" - "test_put_file_to_file_in_new_directory" - "test_put_file_to_new_directory" - "test_put_glob_edge_cases" - "test_put_glob_to_existing_directory" - "test_put_glob_to_new_directory" - "test_put_list_of_files_to_existing_directory" - "test_put_list_of_files_to_new_directory" - "test_rm" - "test_rm_invalidates_cache" - "test_rm_recursive_folder" - "test_s3_big_ls" - "test_s3fs_etag_preserving_multipart_copy" - "test_tags" - - # ExceptionGroup: errors while tearing down (2 sub-exceptions) - "test_copy_directory_to_existing_directory" - "test_copy_directory_to_new_directory" - "test_copy_directory_without_files_with_same_name_prefix" - "test_copy_file_to_existing_directory" - "test_copy_file_to_file_in_existing_directory" - "test_copy_file_to_file_in_new_directory" - "test_copy_file_to_new_directory" - "test_copy_glob_edge_cases" - "test_copy_glob_to_existing_directory" - "test_copy_glob_to_new_directory" - "test_copy_list_of_files_to_existing_directory" - "test_copy_list_of_files_to_new_directory" - "test_copy_two_files_new_directory" ]; __darwinAllowLocalNetworking = true; From ab0eef871df33db880bd185f4d41670195414243 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Feb 2025 21:09:31 -0500 Subject: [PATCH 042/157] python312Packages.gcsfs: 2024.2.0 -> 2025.2.0 Diff: https://github.com/fsspec/gcsfs/compare/refs/tags/2024.2.0...2025.2.0 Changelog: https://github.com/fsspec/gcsfs/raw/2025.2.0/docs/source/changelog.rst --- .../python-modules/gcsfs/default.nix | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index e1cb3e8cc1641..a6d230bbe8d39 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -4,51 +4,57 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, google-auth, google-auth-oauthlib, google-cloud-storage, requests, decorator, fsspec, - ujson, + fusepy, aiohttp, crcmod, pytest-timeout, - pytest-vcr, - vcrpy, + pytest-asyncio, }: buildPythonPackage rec { pname = "gcsfs"; - version = "2024.2.0"; - format = "setuptools"; + version = "2025.2.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fsspec"; - repo = pname; + repo = "gcsfs"; tag = version; - hash = "sha256-6O09lP2cWLzeMTBathb3O/tVGZPEHSqujfUPWZIBUJI="; + hash = "sha256-1nPhttEmGI8jreMe5hwOZRALJa5QTNOw2McisV+cR54="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp - crcmod decorator fsspec google-auth google-auth-oauthlib google-cloud-storage requests - ujson ]; + optional-dependencies = { + gcsfuse = [ fusepy ]; + crc = [ crcmod ]; + }; + nativeCheckInputs = [ - pytest-vcr pytest-timeout + pytest-asyncio pytestCheckHook - vcrpy ]; disabledTests = [ @@ -65,15 +71,13 @@ buildPythonPackage rec { "gcsfs/tests/test_inventory_report_listing.py" ]; - pytestFlagsArray = [ "-x" ]; - pythonImportsCheck = [ "gcsfs" ]; - meta = with lib; { + meta = { description = "Convenient Filesystem interface over GCS"; homepage = "https://github.com/fsspec/gcsfs"; changelog = "https://github.com/fsspec/gcsfs/raw/${version}/docs/source/changelog.rst"; - license = licenses.bsd3; - maintainers = with maintainers; [ nbren12 ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nbren12 ]; }; } From 4b1914205359b77f48cc6d50ab5cfcd7de06c618 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 15 Feb 2025 18:50:30 +0100 Subject: [PATCH 043/157] libpq: fix pg_config --libdir With the same reasoning as for postgresql's pg_config, we need to make adjustments to libpq's variant. Otherwise it would not return the correct LIBDIR, pointing at the -dev output instead of -out. --- pkgs/servers/sql/postgresql/libpq.nix | 15 +++++++++++++++ pkgs/top-level/php-packages.nix | 2 -- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix index 0c064e45cf99d..59e7bfd8dba00 100644 --- a/pkgs/servers/sql/postgresql/libpq.nix +++ b/pkgs/servers/sql/postgresql/libpq.nix @@ -12,6 +12,7 @@ # build dependencies bison, flex, + makeWrapper, perl, pkg-config, @@ -62,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ bison flex + makeWrapper perl pkg-config ]; @@ -111,7 +113,20 @@ stdenv.mkDerivation (finalAttrs: { make -C src/interfaces/libpq install make -C src/port install + # Pretend pg_config is located in $out/bin to return correct paths, but + # actually have it in -dev to avoid pulling in all other outputs. moveToOutput bin/pg_config "$dev" + wrapProgram "$dev/bin/pg_config" --argv0 "$out/bin/pg_config" + + # To prevent a "pg_config: could not find own program executable" error, we fake + # pg_config in the default output. + mkdir -p "$out/bin" + cat << EOF > "$out/bin/pg_config" && chmod +x "$out/bin/pg_config" + #!${stdenv.shell} + echo The real pg_config can be found in the -dev output. + exit 1 + EOF + moveToOutput "lib/*.a" "$dev" rm -rfv $out/share diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 978c42a0d3052..8f3add1a34f0f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -636,7 +636,6 @@ lib.makeScope pkgs.newScope ( { name = "pdo_pgsql"; internalDeps = [ php.extensions.pdo ]; - buildInputs = [ libpq ]; configureFlags = [ "--with-pdo-pgsql=${lib.getDev libpq}" ]; doCheck = false; } @@ -651,7 +650,6 @@ lib.makeScope pkgs.newScope ( name = "pgsql"; buildInputs = [ pcre2 - libpq ]; configureFlags = [ "--with-pgsql=${lib.getDev libpq}" ]; doCheck = false; From 9f527b1e27c6b934e5fd88aaf4063220b674f3e4 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 1 Feb 2025 16:18:16 -0500 Subject: [PATCH 044/157] =?UTF-8?q?darwin.libffi:=20install=20Apple?= =?UTF-8?q?=E2=80=99s=20`ffi.h`=20header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This header contains availability annotations for libffi functions, which some packages (such as Python’s) check to determine whether they are building against Apple’s libffi fork. --- .../darwin/apple-source-releases/libffi/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix index c50bbfd8c5a03..4b9250ff97cde 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix @@ -66,6 +66,9 @@ mkAppleDerivation (finalAttrs: { # The Darwin SDK puts the headers in `include/ffi`. Add a symlink for compatibility. '' ln -s "$dev/include" "$dev/include/ffi" + # Make sure Apple’s header with availability annotations is installed in place of the generated one. + # Use `macCatalyst` instead of `iosmac` to avoid errors due to invalid availability annotations. + substitute darwin/include/ffi.h "$dev/include/ffi.h" --replace-fail iosmac macCatalyst '' # Install the trampoline dylib since it is build manually. + lib.optionalString stdenv.hostPlatform.isAarch64 '' From 741de2bc6396974cdc03ca0f0413fae3993df2ca Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 15 Feb 2025 14:36:48 -0500 Subject: [PATCH 045/157] Revert "Revert "python312Packages.cffi: remove unnecessary Darwin patch"" This reverts commit 340c3f68329b191bef56ad0eafa6b0a8c9fac85c. --- .../cffi/darwin-use-libffi-closures.diff | 29 ------------------- .../python-modules/cffi/default.nix | 14 --------- 2 files changed, 43 deletions(-) delete mode 100644 pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff diff --git a/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff b/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff deleted file mode 100644 index 4ef51274aa289..0000000000000 --- a/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/c/_cffi_backend.c b/src/c/_cffi_backend.c -index 537271f..9c3bf94 100644 ---- a/src/c/_cffi_backend.c -+++ b/src/c/_cffi_backend.c -@@ -103,11 +103,11 @@ - # define CFFI_CHECK_FFI_PREP_CIF_VAR 0 - # define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 0 - --#elif defined(__APPLE__) && defined(FFI_AVAILABLE_APPLE) -+#elif defined(__APPLE__) - --# define CFFI_CHECK_FFI_CLOSURE_ALLOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) -+# define CFFI_CHECK_FFI_CLOSURE_ALLOC 1 - # define CFFI_CHECK_FFI_CLOSURE_ALLOC_MAYBE 1 --# define CFFI_CHECK_FFI_PREP_CLOSURE_LOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) -+# define CFFI_CHECK_FFI_PREP_CLOSURE_LOC 1 - # define CFFI_CHECK_FFI_PREP_CLOSURE_LOC_MAYBE 1 --# define CFFI_CHECK_FFI_PREP_CIF_VAR __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) -+# define CFFI_CHECK_FFI_PREP_CIF_VAR 1 - # define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 1 -@@ -6422,7 +6422,7 @@ static PyObject *b_callback(PyObject *self, PyObject *args) - else - #endif - { --#if defined(__APPLE__) && defined(FFI_AVAILABLE_APPLE) && !FFI_LEGACY_CLOSURE_API -+#if defined(__APPLE__) && !FFI_LEGACY_CLOSURE_API - PyErr_Format(PyExc_SystemError, "ffi_prep_closure_loc() is missing"); - goto error; - #else diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index bbdd6bf08cfc2..0daa51b3810ae 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -44,20 +44,6 @@ else hash = "sha256-HDnGAWwyvEjdVFYZUOvWg24WcPKuRhKPZ89J54nFKCQ="; }; - patches = [ - # - # Trusts the libffi library inside of nixpkgs on Apple devices. - # - # Based on some analysis I did: - # - # https://groups.google.com/g/python-cffi/c/xU0Usa8dvhk - # - # I believe that libffi already contains the code from Apple's fork that is - # deemed safe to trust in cffi. - # - ./darwin-use-libffi-closures.diff - ]; - nativeBuildInputs = [ pkg-config ]; build-system = [ setuptools ]; From 887f678075639b356c7f00d517283fe031c9b80c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 21:48:06 +0000 Subject: [PATCH 046/157] minio: 2025-01-20T14-49-07Z -> 2025-02-07T23-21-09Z --- pkgs/servers/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index ec82f3e895a28..1a38294ebac57 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -30,13 +30,13 @@ let in buildGoModule rec { pname = "minio"; - version = "2025-01-20T14-49-07Z"; + version = "2025-02-07T23-21-09Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-0lYRMNPnXVncTrYP87T76eV4wkgH/ODNL6pvhs17pr4="; + hash = "sha256-oqyNBAF8gbaDbKUbkiwJTw1/5SpZ338FOAHY2CDSMAw="; }; vendorHash = "sha256-zb/A7vOsZIMLkGVmgVbrCt/lY2K8v7ofTgSA0Z3dvXA="; From 9b5f0234be2bbe1497672d619df9b5d584989a19 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Feb 2025 04:19:00 +0100 Subject: [PATCH 047/157] python313Packages.poetry-core: 2.0.1 -> 2.1.1 https://github.com/python-poetry/poetry-core/blob/2.1.1/CHANGELOG.md --- pkgs/development/python-modules/poetry-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 2d7696c1c70ff..73c431d4c8e7c 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "2.0.1"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = "poetry-core"; tag = version; - hash = "sha256-X3HFvnjbQ8An856QwSsWm5bmzs9KuscPE9LaVebNfgk="; + hash = "sha256-DeDfDaP+jPrN6F/lv6shVOG6+4VdD1nL9mz1wJn55Sc="; }; nativeCheckInputs = [ From 73ee9e57e830a3bb7cb5d4afba747f246637b6ab Mon Sep 17 00:00:00 2001 From: Ivy Fan-Chiang Date: Tue, 11 Feb 2025 18:44:12 -0500 Subject: [PATCH 048/157] qt6.qtdeclarative: add qtsvg as propagated build input --- .../libraries/qt-6/modules/qtdeclarative/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix index e45fce5893651..2606c678880c5 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix @@ -3,6 +3,7 @@ qtbase, qtlanguageserver, qtshadertools, + qtsvg, openssl, stdenv, lib, @@ -17,6 +18,7 @@ qtModule { qtbase qtlanguageserver qtshadertools + qtsvg openssl ]; strictDeps = true; From 48cf59783eef765403705d1d484178c83f5b09e4 Mon Sep 17 00:00:00 2001 From: misilelab Date: Sun, 16 Feb 2025 12:32:34 +0900 Subject: [PATCH 049/157] python3Packages.cryptography: 44.0.0 -> 44.0.1 Signed-off-by: misilelab --- pkgs/development/python-modules/cryptography/default.nix | 6 +++--- pkgs/development/python-modules/cryptography/vectors.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index b503255f15658..ec87fbe89d235 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "cryptography"; - version = "44.0.0"; # Also update the hash in vectors.nix + version = "44.0.1"; # Also update the hash in vectors.nix pyproject = true; disabled = pythonOlder "3.7"; @@ -33,13 +33,13 @@ buildPythonPackage rec { owner = "pyca"; repo = "cryptography"; tag = version; - hash = "sha256-A+qYW8GksYk+FQG8ZJHNYrjcouE1CsVH0Lko2ahoYUI="; + hash = "sha256-PM7InFrRY0ho8qcBcVqqcXV9eVP8fF0ma/y4C0gx1Ic="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-Ni/i21JgAemDXsJOXLL6IKjrJdBkw5jxBB0IdETBPcs="; + hash = "sha256-hjfSjmwd/mylVZKyXsj/pP2KvAGDpfthuT+w219HAiA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 0e404d57a6650..d623211886763 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-EGIodmxFuaX/0aiz4lTwVgyCHaedXNf9EToX43U1gKs="; + hash = "sha256-WphmsURl3PrxK837wzkph7tVnzesi4pMm2NZvno9fqA="; }; nativeBuildInputs = [ flit-core ]; From b80ba0a9906767b4e3b93087de8738260584d94c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 17 Feb 2025 16:15:10 +0200 Subject: [PATCH 050/157] python312Packages.scipy: 1.15.1 -> 1.15.2 Changelog: https://github.com/scipy/scipy/releases/tag/v1.15.2 --- 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 862fdf57be719..4e152650f8742 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.1"; - srcHash = "sha256-pQfOiK/i/Nz1mCGdDA7ivnzHxqee1WVD62CxxgetGLg="; + version = "1.15.2"; + srcHash = "sha256-JcCLMWjvlA4KYd42VcEJuXBpxuMKZ4BXC0q5Li/baOA="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; From fdae7b2b9bab8325bbb0b4c361e7e1ea3d6d74fb Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 17 Feb 2025 20:57:15 +0800 Subject: [PATCH 051/157] wayland-protocols: 1.40 -> 1.41 Changes: https://lists.freedesktop.org/archives/wayland-devel/2025-February/043980.html --- pkgs/development/libraries/wayland/protocols.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 9ec92e7ea20c2..1b686725694b7 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayland-protocols"; - version = "1.40"; + version = "1.41"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-shcReTJHwsQnY5FDkt+p/LnjcoyktKoRCtuNkV/ABok="; + hash = "sha256-J4a2sbeZZeMT8sKJwSB1ue1wDUGESBDFGv2hDuMpV2s="; }; postPatch = lib.optionalString finalAttrs.doCheck '' From 7712700b18f5c5f3e390af679fddb2b5afa4a95f Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 18 Feb 2025 19:11:42 +0800 Subject: [PATCH 052/157] wrapQtAppsHook: actually use makeQtWrapper for symlinks Since -f implies -h, -h needs to be checked first. --- .../libraries/qt-5/hooks/wrap-qt-apps-hook.sh | 10 +++++----- .../libraries/qt-6/hooks/wrap-qt-apps-hook.sh | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index 413368268aa20..42b685e7f7925 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -87,16 +87,16 @@ wrapQtAppsHook() { do isELF "$file" || isMachO "$file" || continue - if [ -f "$file" ] - then - echo "wrapping $file" - wrapQtApp "$file" - elif [ -h "$file" ] + if [ -h "$file" ] then target="$(readlink -e "$file")" echo "wrapping $file -> $target" rm "$file" makeQtWrapper "$target" "$file" + elif [ -f "$file" ] + then + echo "wrapping $file" + wrapQtApp "$file" fi done done diff --git a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh index 39b8635e264de..b510d1b514058 100644 --- a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh @@ -81,14 +81,14 @@ if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then [ -d "$targetDir" ] || continue find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file; do - if [ -f "$file" ]; then - echo "wrapping $file" - wrapQtApp "$file" - elif [ -h "$file" ]; then + if [ -h "$file" ]; then target="$(readlink -e "$file")" echo "wrapping $file -> $target" rm "$file" makeQtWrapper "$target" "$file" + elif [ -f "$file" ]; then + echo "wrapping $file" + wrapQtApp "$file" fi done done From d5f0bd426a44178e22fc201ad129a65a2ee58633 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 18 Feb 2025 11:25:23 -0500 Subject: [PATCH 053/157] Revert "icu: make darwin.ICU the default on Darwin" This reverts commit d85513502835d4ab055c567b0d17e91347221ce7. --- pkgs/top-level/all-packages.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad435889e8d46..b5b80166882e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9231,12 +9231,7 @@ with pkgs; icu76 ; - # Use Apple’s fork of ICU by default, which provides additional APIs that are not present in upstream ICU. - # - # `icuReal` is provided in case the upstream icu package is needed on Darwin instead of the fork. - # Note that the versioned icu packages always correspond to the upstream versions. - icuReal = icu76; - icu = if stdenv.hostPlatform.isDarwin then darwin.ICU else icuReal; + icu = icu76; idasen = with python3Packages; toPythonApplication idasen; From 6273901d0db3fe64590204a97f37263aeed21022 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Fri, 14 Feb 2025 17:10:03 +0000 Subject: [PATCH 054/157] tree-sitter: update all grammars --- .../parsing/tree-sitter/grammars/tree-sitter-c.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-css.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-cuda.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-cue.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-dart.json | 10 +++++----- .../tree-sitter/grammars/tree-sitter-earthfile.json | 10 +++++----- .../tree-sitter/grammars/tree-sitter-elixir.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-fish.json | 10 +++++----- .../tree-sitter/grammars/tree-sitter-fortran.json | 10 +++++----- .../tree-sitter/grammars/tree-sitter-gleam.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-go.json | 10 +++++----- .../grammars/tree-sitter-godot-resource.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-heex.json | 10 +++++----- .../tree-sitter/grammars/tree-sitter-janet-simple.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-java.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-just.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-koka.json | 10 +++++----- .../tree-sitter/grammars/tree-sitter-ledger.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-nix.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-nu.json | 10 +++++----- .../tree-sitter/grammars/tree-sitter-ocaml.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-php.json | 10 +++++----- .../tree-sitter/grammars/tree-sitter-prisma.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-pug.json | 10 +++++----- .../tree-sitter/grammars/tree-sitter-python.json | 10 +++++----- .../tree-sitter/grammars/tree-sitter-query.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-rust.json | 10 +++++----- .../tree-sitter/grammars/tree-sitter-scala.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-sql.json | 10 +++++----- .../tree-sitter/grammars/tree-sitter-templ.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-tera.json | 10 +++++----- .../parsing/tree-sitter/grammars/tree-sitter-twig.json | 10 +++++----- pkgs/development/tools/parsing/tree-sitter/update.nix | 2 ++ 33 files changed, 162 insertions(+), 160 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 0d894b7c53be3..35988b2c081aa 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "df6ac34d5eb1dccfac8f2a9011a8491300818d7c", - "date": "2024-01-22T11:11:13-05:00", - "path": "/nix/store/7v5nz25dl0qph3f75ipxv0g6y4kxmc4f-tree-sitter-c", - "sha256": "0ih9rqxxjzd9v0h6h42vzmnc5ixl3rfzznq0p8ka9mqdyznrx5xa", - "hash": "sha256-qpee7fcN16QmugDb/10etMfCbP1bEGgg2Kl92TvOCUY=", + "rev": "2a265d69a4caf57108a73ad2ed1e6922dd2f998c", + "date": "2025-02-08T10:48:10-06:00", + "path": "/nix/store/0xnd082cryjnml9iaibcfgbp3bc5svxb-tree-sitter-c", + "sha256": "1vw7jd3wrb4vnigfllfmqxa8fwcpvgp1invswizz0grxv249piza", + "hash": "sha256-6sebiNg9P/B/5HrbGO7bl3GHVMfVUepetJuszEeTh+8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json index 3d58abd6884ac..bb9cc18588eda 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-css", - "rev": "66b4aad81acb269e7e98b2ed4b0c7f7252b23c5e", - "date": "2024-11-11T00:20:16-05:00", - "path": "/nix/store/s5672w3y7gfk99xb7q1s5vmqfj3frk7n-tree-sitter-css", - "sha256": "0p9n2sgjyrnvd4yr7z1kb63hq80w8aaxsiwx27f87nc78l950h0d", - "hash": "sha256-DUBQEkWH2YPcEZ1H3ZVCHCAMh1kz/JM9adtmL58WNl0=", + "rev": "c0d581e32d183a536731ed6c3a72758b27e20411", + "date": "2025-01-11T19:52:10-05:00", + "path": "/nix/store/hdsw4wgq4rnp5nr6wjywmkhpa79b16my-tree-sitter-css", + "sha256": "0c5j9zyjcykmraix1agbc0gdk85zs2v379q0aykr10fi9w2r9z9c", + "hash": "sha256-LP2UBU/RgZCnVwCnM7bQv6DZHmDrqdCjynV6Jv1PsjA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json index 4b64224bcb865..19ed0721d3525 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json @@ -1,10 +1,10 @@ { "url": "https://github.com/thehamsta/tree-sitter-cuda", - "rev": "cbce8aedc6fa35313a4cecd206196011a08a85c4", - "date": "2024-08-22T22:57:54+02:00", - "path": "/nix/store/4ygv7b9ap52kb03cv7mihsq86g6vgfpc-tree-sitter-cuda", - "sha256": "12q2zpfll8n72yccxkqjh36cmmpj2fyivkq6fghzbs9kf4mvwy12", - "hash": "sha256-Ini+K3Ez6fXhcwbPHb0T8tbKzIASz86YF8ciSt39Aos=", + "rev": "9cdfe2d453e5f60fd818935a5895f223e2e6feed", + "date": "2025-01-25T13:03:37+01:00", + "path": "/nix/store/xz5zddyszj1sgr3lp17f021n2x13dmj7-tree-sitter-cuda", + "sha256": "0krk5f0g87cp1mkdn2x6sadldqnvhxxy8zsvc8z2bxc50vb4lw9m", + "hash": "sha256-NXFK1gaF9SU+Ylt/5HuH2+JGm9KmC9tmDZcd9IArM08=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json index 96341f8b54d3e..a5738d305587b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json @@ -1,10 +1,10 @@ { "url": "https://github.com/eonpatapon/tree-sitter-cue", - "rev": "8a5f273bfa281c66354da562f2307c2d394b6c81", - "date": "2024-03-12T11:22:48+01:00", - "path": "/nix/store/58ar5h99vkn7f012hks83a6x8xnpdp3y-tree-sitter-cue", - "sha256": "16djln3n1cpi5vxv9dg9ysrg46z74rwzgflnp2y4y2aginbx6pmr", - "hash": "sha256-uV7Tl41PCU+8uJa693km5xvysvbptbT7LvGyYIelspk=", + "rev": "770737bcff2c4aa3f624d439e32b07dbb07102d3", + "date": "2025-02-03T09:13:36+01:00", + "path": "/nix/store/mavr89l8mjvpv866an6s60yyi18byimd-tree-sitter-cue", + "sha256": "19wqgzpd22b6f62ck4qs1dqibpcgxy6bgv8i2spc53m70cxq2d5s", + "hash": "sha256-ujSBOwOnjsKuFhHtt4zvj90VcQsak8mEcWYJ0e5/mKc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json index 15521af83a8ba..6a993f0f47356 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json @@ -1,10 +1,10 @@ { "url": "https://github.com/usernobody14/tree-sitter-dart", - "rev": "a7496b9d562be91e6588eecd5d7045832f575cd0", - "date": "2024-11-03T15:26:25-08:00", - "path": "/nix/store/wh7md297c0617dnjm3rpssbmn39xzksh-tree-sitter-dart", - "sha256": "1l6i04g8cskb2y21p9qsaixzwbqsg0kj18xw6jwhxgigkbaa0iqw", - "hash": "sha256-HEeg1Jovvg65NLyjICd4Gi/+e1QapxuEF2tqhh4B0dA=", + "rev": "e81af6ab94a728ed99c30083be72d88e6d56cf9e", + "date": "2024-11-16T21:53:35-07:00", + "path": "/nix/store/jb7wiv90s78p45pj9mqvmbgk06xhjlj5-tree-sitter-dart", + "sha256": "0zl46vkm4p1jmivmnpyyzc58fwhx5frfgi0rfxna43h0qxdv62wy", + "hash": "sha256-nguzW8cADqJsdxnE57IrHXKHCvveX1t3rDJcUuc2hH4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json index f762eee5eb347..887be0651b9de 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json @@ -1,10 +1,10 @@ { "url": "https://github.com/glehmann/tree-sitter-earthfile", - "rev": "059fb087247bef8789e938629388c3e7af32c986", - "date": "2024-11-09T21:50:50+01:00", - "path": "/nix/store/907d7p3lzbc22yvx1lw8qjinyviw87ja-tree-sitter-earthfile", - "sha256": "1yx4vxhyqwskfidbxbz3m7x9l18jnavrnp5f2xxwaaq75cbccyav", - "hash": "sha256-W3nGFisHK8V7F65cm7eyEgWa+qnjr75adFNz7GHfpPs=", + "rev": "ae378d9d1306e9a967698516041f6f8803db5592", + "date": "2025-02-18T21:51:34+01:00", + "path": "/nix/store/wy3w667k4gdxvj6rx83f64r7jbmal4dn-tree-sitter-earthfile", + "sha256": "112vc8rv5dzvvbhf7n01qnacvjfpyi9kfzdbsm0gzkpnhk52rah4", + "hash": "sha256-BKosyoT2zv9A1at9N1P018nNlMUB2OPg2vu3sjNiW4Q=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json index 9d04a9f924d9f..628e919cf8357 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json @@ -1,10 +1,10 @@ { "url": "https://github.com/elixir-lang/tree-sitter-elixir", - "rev": "ef124b83a3f3572b0af23db4efae3f8de06a15e1", - "date": "2024-09-28T16:06:03+07:00", - "path": "/nix/store/ra2sdascd7h53icvbyh8wv0y2l9pr6pb-tree-sitter-elixir", - "sha256": "08nqlhw5c43b92agh7y2mlw27bjsz6qc3dgqa8vxr5gysgqlmxp5", - "hash": "sha256-5fZK8dP+ldw3Uvi1wbD5Wq4jOK3CH/iUSGsQVjik2CI=", + "rev": "86ec2ed45d6d9433b4e0b88cd3d96796bd45625f", + "date": "2025-02-07T01:27:08+07:00", + "path": "/nix/store/ng72gkvc7dfgir6gvxrd5l7vrzcq3zvh-tree-sitter-elixir", + "sha256": "12i0z8afdzcznn5dzrssr7b7jx4h7wss4xvbh3nz12j6makc7kzl", + "hash": "sha256-9M/DpqpGivDtgGt3ojU/kHR51sla59+KtZ/95hT6IIo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json index f1e8bc7ccaf1c..78ec184a9b8c6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -1,10 +1,10 @@ { "url": "https://github.com/ram02z/tree-sitter-fish", - "rev": "a78aef9abc395c600c38a037ac779afc7e3cc9e0", - "date": "2024-04-02T18:45:18+01:00", - "path": "/nix/store/v0bvl4iadrl1fzr617s72rlk2d214ak9-tree-sitter-fish", - "sha256": "0nmdwxw8wbqc9nm1p30s91p6mh8qp7w5wnw7lpz6fy6hq5k3gfqg", - "hash": "sha256-D7s3ZsHQeGf+pYdbXvi5GMFqbkgajBuqTQwvjnjnrVo=", + "rev": "70640c0696abde32622afc43291a385681afbd32", + "date": "2025-01-18T10:06:56Z", + "path": "/nix/store/f3yngwj4xrr9v6nchnl9sj3q7bx2463y-tree-sitter-fish", + "sha256": "12gga8gm7dyfa6srvi5sympszy647qcw7a9warrld5z71vgziv3p", + "hash": "sha256-d+z43w7nl0ZzVjypwxk+xPivb/W6xJ21Uc63Ux9S74k=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json index 6bb6b7a531609..cfc6a0ff44bd9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json @@ -1,10 +1,10 @@ { "url": "https://github.com/stadelmanma/tree-sitter-fortran", - "rev": "e9fbb3acbfc62b051616e53b17ab97b9823e8617", - "date": "2024-10-28T20:57:25-04:00", - "path": "/nix/store/4rjmcmphqkc8pv3k9vxx794wrzbqsrcz-tree-sitter-fortran", - "sha256": "1a2ahzm1ld1wvhr45ql98rykh6fvxdvjxpxxp9fv74xninf6rfqv", - "hash": "sha256-G7tsnI22k7Ndur3fLnfr2xk4fUaJ4kIy3Dw0GuqHSqg=", + "rev": "022b032d31299c5d8336cdfd0ece97de20a609c0", + "date": "2025-01-23T13:28:14-05:00", + "path": "/nix/store/vncpfx5db12ish9rzf26phj25373nqs4-tree-sitter-fortran", + "sha256": "1mncdji60qa9r8jbiywmcid714ylc3gniq25l8mxj1p4zq95nd29", + "hash": "sha256-STRbEv7kBtkrokXgaN9g1JNwWmSV+7gkyklhYKJszNY=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json index 3ebbfca362e83..945973f934bde 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json @@ -1,10 +1,10 @@ { "url": "https://github.com/gleam-lang/tree-sitter-gleam", - "rev": "2702fe84b986e4403a071bcb112d48e3dcde0ca4", - "date": "2024-10-30T19:13:15Z", - "path": "/nix/store/7gfpns8qclascf3d32ablmqw9nx81iq5-tree-sitter-gleam", - "sha256": "0cqsazqvl1hwpsayl39cz7j9jibbcql56rivwiwbvafrx4qgv3hd", - "hash": "sha256-DY79MOnZqb145DtmUyhma0WZ5PksDeqVvhwGuvFXGjM=", + "rev": "af6043419f5aa0f8b6c2a26db0187aefa46c7f5f", + "date": "2025-02-07T14:27:03Z", + "path": "/nix/store/k54xiiqza536lzgvdw8yizsp6czdalln-tree-sitter-gleam", + "sha256": "0b7k2ah7a29simvvzm3f01vna5lzvv1mi7idvzpc056wjbgnvrg8", + "hash": "sha256-6OVt35LcFMDu3y2eWMPenxZldwBu1L93jToJdaAS8yw=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index b6fbb0de84bdd..4efe2cc2b3acb 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "5f564e3d6c85c1caa311227448a9839532013840", - "date": "2024-11-11T00:58:30-05:00", - "path": "/nix/store/1bc05y21im7ybmg1bkxbjilqg90miqfy-tree-sitter-go", - "sha256": "1pcryir0g1mkr8sla90l6c4ra2xb89sa7qyibr5j8fqlhyrz2hyg", - "hash": "sha256-z0Pxs4cUOyRLXtHjo3RCqwuVCTMUJEU1yrOGB3L0md0=", + "rev": "3c3775faa968158a8b4ac190a7fda867fd5fb748", + "date": "2024-11-24T14:34:38-05:00", + "path": "/nix/store/zqi5mm5lx2jq40650gljdvn3sq0y34c1-tree-sitter-go", + "sha256": "0yi8if9mqzzcs4qflflz90hhaxkzlq54wia3s0iiqzfqxk24a61g", + "hash": "sha256-LxhFxOzYfRwj0ENFTgqmf3YFIUifOuow0ex/XJOLKHo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json index 06e95d787663e..28902ff10907d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json @@ -1,10 +1,10 @@ { "url": "https://github.com/prestonknopp/tree-sitter-godot-resource", - "rev": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a", - "date": "2021-12-20T22:40:16-08:00", - "path": "/nix/store/3lmwkk16jmjnkx8lrl33i7a19hjca2jz-tree-sitter-godot-resource", - "sha256": "0agnvg95fx60xkr5fivl1x3yhcw6ca58f7bpx3dq6fl7pyfgrky2", - "hash": "sha256-ws/8nL+HOoPb6Hcdh4pihjPoRw90R1fy7MB0V9Lb9ik=", + "rev": "479bfc12579ba54ac5b4dcb320fd0cb81eaabe7d", + "date": "2025-01-02T02:55:15-08:00", + "path": "/nix/store/3mvxmgjpkr02vxr6iwhqivqkajzzywkb-tree-sitter-godot-resource", + "sha256": "18fjf4fj3fyfsq6nvmi5qy1ddwlfcz8sxiq8wq8qrvc7fvfwni1q", + "hash": "sha256-OETL3XaH7YwR5gjHrtFnjvLWgscl1m0N1s67IR1x0qE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json index 273dc4f69ecd7..3be25c4f63911 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json @@ -1,10 +1,10 @@ { "url": "https://github.com/connorlay/tree-sitter-heex", - "rev": "881f1c805f51485a26ecd7865d15c9ef8d606a78", - "date": "2022-09-24T18:53:08-07:00", - "path": "/nix/store/vb6x1b9lc90ys55cwshdz5dxmwvzyjvv-tree-sitter-heex", - "sha256": "00330rgg67fq0d9gk1yswj78d9mn1jvvjmmy1k7cxpvm5993p3sw", - "hash": "sha256-XI87Uip1387ODL5WubcMtqaGjuTah/lSA9gd814GYwA=", + "rev": "a63c69c20fd88d1e5614a02b4a6b48cfb7e54a45", + "date": "2025-01-16T08:02:36-05:00", + "path": "/nix/store/a73dii220p8jj60an971c330gxlx5cqp-tree-sitter-heex", + "sha256": "0d0ljmxrvmr8k1wc0hd3qrjzwb31f1jaw6f1glamw1r948dxh9xf", + "hash": "sha256-rifYGyIpB14VfcEZrmRwYSz+ZcajQcB4mCjXnXuVFDQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json index 7673c1c21f81a..1cf76f6cd3b1f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json @@ -1,10 +1,10 @@ { "url": "https://github.com/sogaiu/tree-sitter-janet-simple", - "rev": "12bfab7db8a5f5b1d774ef84b5831acd34936071", - "date": "2024-08-27T15:31:21+09:00", - "path": "/nix/store/v5rcba220xk49qj3ghh9ggdpfqc91snv-tree-sitter-janet-simple", - "sha256": "05df573vih9p8nlqahlijgg66xr6rvzjd0g7n0qhdlzkcwd63p4x", - "hash": "sha256-ndxhGmfz0wYxsOeBJv/OJndj3pORQoWpRTfBuMcprhU=", + "rev": "b08b402207fba0037d5152ce7c521351147f4388", + "date": "2025-02-03T20:32:35+09:00", + "path": "/nix/store/w0rsgjajpifbl7ygy1kwr87l42gcsh52-tree-sitter-janet-simple", + "sha256": "0bqk72915yg6vfby7179rxacbla7if8rzq4zhy1d0g98pyx4qqzn", + "hash": "sha256-9mNMur8oPdCCh5/gn5GLR9HFVM/phOOX2+b5EpI4Ey8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index 32f2c01ba4937..c23f7c315443c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-java", - "rev": "a1bbe92a6370bb4c15386735fbda12f2b812a923", - "date": "2024-11-11T01:04:02-05:00", - "path": "/nix/store/y7sylnz0igvnq70g3dzcv0l1qy93jhjy-tree-sitter-java", - "sha256": "009nhnn4dv1p8yvhamhr8xh6q0mqj844725l9k81rkzzxqlv4q82", - "hash": "sha256-AmGyKe7/zxzQTLSIQwiSuAJsYEcZVgW3RzfsRqyFNgE=", + "rev": "94703d5a6bed02b98e438d7cad1136c01a60ba2c", + "date": "2024-12-21T13:21:37-05:00", + "path": "/nix/store/y4x8qyssrxlcpmjxza0n3fpjlp1nh13y-tree-sitter-java", + "sha256": "11j4ifhl5hsmb2sa651cp5xds9cjgjynl86yivvk6bnr2ba0xw9s", + "hash": "sha256-OvEO1BLZLjP3jt4gar18kiXderksFKO0WFXDQqGLRIY=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json index ee7bb27bb365e..572143e5e2aef 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json @@ -1,10 +1,10 @@ { "url": "https://github.com/IndianBoy42/tree-sitter-just", - "rev": "1014d2fd6396856c312054d6c30df4d78b62966c", - "date": "2024-10-27T18:37:31-05:00", - "path": "/nix/store/niwnwg8nb4084y8vy50s818cxbl6gzwa-tree-sitter-just", - "sha256": "02df3cbcbf300n3hy98l8rwbz9ivdyd5s6yghmcrqf2973kzkypj", - "hash": "sha256-8vr55zhJOJxZhc8bXZpvO6a/eEYUJQ+HBWC4xRYbrgk=", + "rev": "bb0c898a80644de438e6efe5d88d30bf092935cd", + "date": "2025-01-05T22:55:31Z", + "path": "/nix/store/jvkr4jxfrv3nps36v4qnry831kvhgx5v-tree-sitter-just", + "sha256": "15bx2v03a4d9f7dzhc5y2pkzlfsibrim8np1n9iqxvwizlgjw08p", + "hash": "sha256-FwEuH/2R745jsuFaVGNeUTv65xW+MPjbcakRNcAWfZU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json index 56153f9ac2a58..83f57b4c4cd9f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json @@ -1,10 +1,10 @@ { "url": "https://github.com/mtoohey31/tree-sitter-koka", - "rev": "96d070c3700692858035f3524cc0ad944cef2594", - "date": "2024-01-21T20:56:11-05:00", - "path": "/nix/store/n0cy7vhsiw6i2s9i2hzwcm0ddj7d4ffi-tree-sitter-koka", - "sha256": "1bxmflc8ynqpdkzwc74fqqcjhzkggkzxbzhbx0ji4g7kfknc0ldk", - "hash": "sha256-s1HA7HTzPBIl6Av+1f98b34oGcaOHMb/bBdbjxh1ta8=", + "rev": "33c333f7ff4cac4138c0786198481b33d2880656", + "date": "2025-01-26T11:30:06-05:00", + "path": "/nix/store/dh0v9y2qc9dz8lqqpspnwbxvpikfjzpv-tree-sitter-koka", + "sha256": "12vr8xdsy8gpgwzcnvc2p5mzd4fsgv0lgqdwmzhs1b9hy7bvdkd6", + "hash": "sha256-ps221/EwraDhr7zhR8F+2pH2a7mCbcs+f/chr1tHeYs=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json index d48735c541cf2..4d5c43e8209b0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json @@ -1,10 +1,10 @@ { "url": "https://github.com/cbarrete/tree-sitter-ledger", - "rev": "a2eff7fee59ee6adfc4a3646e2f41ba3b340a97d", - "date": "2024-10-13T19:47:52-04:00", - "path": "/nix/store/5szmgha7pgir3w8n558482fr60nxnhvv-tree-sitter-ledger", - "sha256": "0r9r05g14i29sb3mrx7gvi9finbim5vyb17pqpk9vds3d5ikwczd", - "hash": "sha256-7TM+Y2lDt53mxfeE5XepcdnoUtzv9FzH0klEEl4BOWU=", + "rev": "d313153eef68c557ba4538b20de2d0e92f3ef6f8", + "date": "2024-12-01T20:38:56-05:00", + "path": "/nix/store/msd18izp2w9lwsz0i7n1r3r007xaqgvx-tree-sitter-ledger", + "sha256": "0k880rxgknlr9gfya9fafi3gmv7gcdph5kxqnpbf9kmrm193glgx", + "hash": "sha256-/dE3Uqi5zuTWtbjPAm9j7+z6RnTKJeXdS5na+XoGCE0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index aac43a34076e8..fc10495be349a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,10 +1,10 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "0240bbfce72d155823c3b7edec622dedd580bf02", - "date": "2024-11-12T12:58:37Z", - "path": "/nix/store/4cnv6lk60fxy7hlx18xzmd0y9gvfc2qq-tree-sitter-nix", - "sha256": "0814a5vbk71b4hnl5zr5pc5qgls2rifl1xh5cakl3sj4nxh7js37", - "hash": "sha256-Z2h5YLdE6kGnYgX2QF3MQtOHC7sl/0ItJCucuXZRJCA=", + "rev": "b3a88cf3e597d48c33657deca4fda7a75c0069c1", + "date": "2025-01-31T17:04:23Z", + "path": "/nix/store/lvw6n2174vjd5g7jmylpk84040gpsyj6-tree-sitter-nix", + "sha256": "16gkm286jvkv7kygs6ap9h06dvp96akahjdvqrdjzzp1vlsqlf5s", + "hash": "sha256-ujiKNd3h/i9bxrtJqKYy6e5mAExXGf38PHtuaZCo85k=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json index 13af8c7b5d11e..a13f59babed24 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nushell/tree-sitter-nu", - "rev": "7e0f16f608a9e804fae61430ade734f9f849fb80", - "date": "2024-11-09T07:02:51-06:00", - "path": "/nix/store/2ddk19m7asfq34bwgy6ivad1dx1m4bnc-tree-sitter-nu", - "sha256": "0zlqf7mxcgy6552bhiiiy11qrgw5xhnbhjx0awj416psrs8vaw85", - "hash": "sha256-BXG1kc76mkAkV6BLuCzshb+MQ/AxRrhEKcY/1utxmH4=", + "rev": "2a153c88d5d44d96653057c7cc14292f4e641bef", + "date": "2025-02-14T22:21:43-06:00", + "path": "/nix/store/di072yk2yrla0fw45sxa0niy5dd7a8gw-tree-sitter-nu", + "sha256": "1jyd7xvnxv5c9i7ankxslmgarvmnhaam6ylhzk2v5lcfjk21gzij", + "hash": "sha256-Mv4XxJSO0bLF/JB6U5WCtu6sXqW6T6tOTKzsbnc/zcs=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json index aa124ec03c2f2..c75060f12fa92 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ocaml", - "rev": "26bc61c206e7820f9f804b206f7765ffc55cd039", - "date": "2024-11-10T23:21:59-05:00", - "path": "/nix/store/dlkj7hw4sy5zywabkr67hgajpnsaw48c-tree-sitter-ocaml", - "sha256": "1rcvy51swpz6wpdk45z3m8xkrc03xl0hypwgbrnivsi9zizf14zj", - "hash": "sha256-8pPgfvwp6h1tXo9fDwHtA7A8O6rjFzLb5eZfrkPxm+U=", + "rev": "a45fda5fe73cda92f2593d16340b3f6bd46674b8", + "date": "2025-01-11T22:05:51+01:00", + "path": "/nix/store/jl174nzwf7fb982fyfwczc4ilmsis4sd-tree-sitter-ocaml", + "sha256": "17g2ynqhjf1nyhdidz9j9s0s12iys3b2vbywxkygwyccj7rb8zdi", + "hash": "sha256-sX208pGMef787NyvLdbQPoqggU4y/RYb9DY4CbH14p0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 975daf866b420..fabb7c2e806c9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "89e256dab1a990366e7931911fe144a14ffa539e", - "date": "2024-11-10T19:37:58-05:00", - "path": "/nix/store/v7j420hslh44ljw09m8jq22vw0gg2avz-tree-sitter-php", - "sha256": "1s12lrxv3arpx22vja2ig4za7wnfk5p8l4wsbpm8rkymm9z5v28z", - "hash": "sha256-H4ldfqrVz4zqXZoTim6ZzvKjPnlRKLmF6DersXumIug=", + "rev": "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8", + "date": "2024-11-19T21:55:55-06:00", + "path": "/nix/store/nl2r9rkvhnhdd3f9zn59nv7k4d1j6m68-tree-sitter-php", + "sha256": "0qkjp5n3ys0jckg67zcdf4mkb01ilnkqx61wga13ys2infgd8agq", + "hash": "sha256-+CnUnrNRaD+CejyYjqelMYA1K3GN/WPeZBJoP2y5cmI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json index 84f6abe3e4be3..c2d65eb704c8d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json @@ -1,10 +1,10 @@ { "url": "https://github.com/victorhqc/tree-sitter-prisma", - "rev": "eca2596a355b1a9952b4f80f8f9caed300a272b5", - "date": "2023-01-05T15:24:25+01:00", - "path": "/nix/store/hj6bbz4zdfwi7ps72zbbv0hg132g13gr-tree-sitter-prisma", - "sha256": "19zb3dkwp2kpyivygqxk8yph0jpl7hn9zzcry15mshn2n0rs9sih", - "hash": "sha256-MOqkM7DCQl1L8Jn9nyw89EoAr0ez4+d39HeKy2cb66c=", + "rev": "4e8ea36ed2138166cf0edc7ff91f092a3497a147", + "date": "2025-01-24T15:28:23+01:00", + "path": "/nix/store/hwhm7jw1k8cxmf4z4ldsq658xngzlg0a-tree-sitter-prisma", + "sha256": "144l2w7ky5imd7yvp1n6lgbyy5kq6kx4c2ja43yk15k3258pf52v", + "hash": "sha256-WxR3URFjljD9IEoKRvo0eBbv16PGhrv9aTUWPw8XlJA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json index ca5e0cfebaa02..dcdaf0ad6a3bd 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json @@ -1,10 +1,10 @@ { "url": "https://github.com/zealot128/tree-sitter-pug", - "rev": "a7ff31a38908df9b9f34828d21d6ca5e12413e18", - "date": "2023-07-27T08:31:48+02:00", - "path": "/nix/store/g068db1k301bva5rxcmkrm7gm616m4pw-tree-sitter-pug", - "sha256": "0iz5gsw7m887i7kps2kqaz2mf55gj3xcb4x705p95f7ia9ipcg2q", - "hash": "sha256-WDx2Y1LxuJJuAaeTxfqQrxRXxVd4Cn3niQeherh+5Uc=", + "rev": "13e9195370172c86a8b88184cc358b23b677cc46", + "date": "2024-11-17T14:49:11+01:00", + "path": "/nix/store/37aiadjp8j15bibqg4h4jpi969zg3z9w-tree-sitter-pug", + "sha256": "0pvrpnwbr04bq7hp4vm0k8ivnbnk66f1awlvby83z5s5zw36hkb2", + "hash": "sha256-Yk1oBv9Flz+QX5tyFZwx0y67I5qgbnLhwYuAvLi9eV8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index ee7922207b950..6d8279cf9e5ea 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "6d14e44ea217bc5bb1c1804180e9818d7d1b8d91", - "date": "2024-11-11T01:55:16-05:00", - "path": "/nix/store/3w1qnipkm727n9bm679k6vngl6fnrsy7-tree-sitter-python", - "sha256": "0dzy60m16qb0i9xrwi3vnii3gy1k50prbbgq3362gcm4dj5hcdpy", - "hash": "sha256-/jYGi2yksifMGPitlS8oM/g3YrR7RJ57imBhEyow/jc=", + "rev": "bffb65a8cfe4e46290331dfef0dbf0ef3679de11", + "date": "2024-12-22T18:06:13-05:00", + "path": "/nix/store/qr60c80rwd98hzbhlsfjbk0fninvbjr4-tree-sitter-python", + "sha256": "0a108sfqcsxrp54lapk7k3kq6fmz8745z5q99wpn3i1cqpi9slzg", + "hash": "sha256-71Od4sUsxGEvTwmXX8hBvzqD55hnXkVJublrhp1GICg=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json index c2ab4fb278de8..4c2825dafb4ee 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nvim-treesitter/tree-sitter-query", - "rev": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0", - "date": "2024-05-26T11:54:30+02:00", - "path": "/nix/store/rr9wn6900c73csv01czjnq609nwzyhqk-tree-sitter-query", - "sha256": "0wi01kmvb5axavfm6jp3rd6dd9pnq551w9lgwcgs02amxp6z8ymj", - "hash": "sha256-snr0ze1VCaAf448mHkrB9qbWTMvjSlPdVl2VtesMIHI=", + "rev": "0555ac0da902abff06076e40501102cee3ba68bd", + "date": "2025-02-02T17:30:49+01:00", + "path": "/nix/store/ab5v1pf3vckwhnix7r0c1l5g8x30v4zl-tree-sitter-query", + "sha256": "0dqy7i2jdd9dqf1ppqzcmkzd9yndb11r78l0pv1zyl7dm7h5g76q", + "hash": "sha256-2JxX4KntUP/DvoCik0NYzfrU/qzs43uDwy21JkU8Hjc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index eece08fd37885..5cfe2a766547c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "48eef06e8d806413d9a617f4a3f4d3168c4e5918", - "date": "2024-11-10T00:44:07-05:00", - "path": "/nix/store/8w8d3p1zn5dxlmkn3z03jk7f3bp8g0yh-tree-sitter-rust", - "sha256": "09piqnxiyhms8503m6jxqr0mwimd75mvh3j2g51jv5796kjy3alz", - "hash": "sha256-n6rh5TTplC1DeUIOuGs5rUZeQcZdmjpAQbpCH7vF8SY=", + "rev": "cad8a206f2e4194676b9699f26f6560d07130d3f", + "date": "2024-11-24T13:48:58-05:00", + "path": "/nix/store/2xxvslz0q5vl8z94hs1g8cb4x2ri2pan-tree-sitter-rust", + "sha256": "1xxxysiwj0r97sp4wsdmm23pcgsngiw39gsa9jm0achan6basgv9", + "hash": "sha256-aT+tlrEKMgWqTEq/NHh8Vj92h6i1aU6uPikDyaP2vfc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index 19c28b7eff356..b2de7e082f840 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "28c3be045afe1e293b5ba1a74e759601e74050c3", - "date": "2024-11-11T00:29:53-05:00", - "path": "/nix/store/zypc1jvywxz21dbik2awcmhxrpl94k60-tree-sitter-scala", - "sha256": "0iyy6273ki4fgbmxn2xaksiw2nq9czhh7azdm9fn29qf7sda55y4", - "hash": "sha256-xJeimj4OJ2Fdqu2rA+FnCVvBo56qC9vreo7EOY4w3kc=", + "rev": "d3b9553b47d7ab413a146c4b6498e527265b966e", + "date": "2024-12-26T23:42:00-05:00", + "path": "/nix/store/qzbrl51l89izishri72bjc59al88dy0a-tree-sitter-scala", + "sha256": "02awiraj5mmgyi31yzxyxarkkl41qksm3lm41pq9c6bmyqpir2y6", + "hash": "sha256-xoscL/Z1GZbwDaTSUfXEgdA5s+q+fx9G9K/WIlWOXAk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json index ad70caa2684c4..3c950cdb7ffd3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json @@ -1,10 +1,10 @@ { "url": "https://github.com/derekstride/tree-sitter-sql", - "rev": "53623157a27f787cab12b2545f43ddd34f3fb5f7", - "date": "2024-08-09T22:12:06+02:00", - "path": "/nix/store/vlm9y5gcjih5scd3iyaxynr79gbfqha8-tree-sitter-sql", - "sha256": "1hjb75rsqnrs0ca1zq17bv4r7skmvra7jw69lk94ncjk8sbhh30w", - "hash": "sha256-HAwIl0ZTMkvSpMlweVTedeqTyV4n4B8UAzpbrHM5S8I=", + "rev": "8a4578bd200fd1ed73e8cbecbe3c5053a4bcf2f8", + "date": "2025-02-13T11:02:24-05:00", + "path": "/nix/store/jd7y0qspfvy7sc01i7awjwkr8dl3cnj0-tree-sitter-sql", + "sha256": "0cp0iaryxmshqdc4x8xg98ck096bqpk1xjg34dycbvkw7mpmn1zj", + "hash": "sha256-8gdbbz187sV8I+PJHubFyyQwGUqvo05Yw1DX7rOK4DI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json index 0a61c5a22ebcd..fae3c615dce4a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json @@ -1,10 +1,10 @@ { "url": "https://github.com/vrischmann/tree-sitter-templ", - "rev": "73a558744fff7c4560f4801e14a467811f608556", - "date": "2024-11-11T15:28:15+01:00", - "path": "/nix/store/anf5z6bmmwrqqwjirylamcc94h2vki8l-tree-sitter-templ", - "sha256": "0rb08502gf91z1pw2q3gvzv890i8v7q1bdva2raf8kn8v05bgnsr", - "hash": "sha256-Wdu3CtjITuRUFmq3FfDZKIKE9t9vYMFv+CG5J0BBYGU=", + "rev": "def9849184de71a797c4e2b2837df85abeccf92c", + "date": "2025-02-06T21:56:41+01:00", + "path": "/nix/store/qjzb3snk7m49qhfhdd1z7lhjlhwgg4mk-tree-sitter-templ", + "sha256": "1035mfjikzy9c6w4wf59z91vyh0m36gdcw8xj4qa5i0k9ma8pq1d", + "hash": "sha256-LeCLVE0TxKIwkR1x1p4ZFUC/Q/qpOE64Ycn/GaWrZYA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json index 8624f790709ed..74a2a35cbe52d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json @@ -1,10 +1,10 @@ { "url": "https://github.com/uncenter/tree-sitter-tera", - "rev": "e8d679a29c03e64656463a892a30da626e19ed8e", - "date": "2024-12-29T18:16:18-05:00", - "path": "/nix/store/r0cf0nb4r9wvy0f1pb207f3yj0sx3j4z-tree-sitter-tera", - "sha256": "0lz6x2yd9rjklc1821x6jd577820izv5bmwhf957gxj0nlrixhj7", - "hash": "sha256-R8IeM7VA9ndKcpDXVfaPQKBzSpOmB4ECo1Pm1Lzo5lM=", + "rev": "284840b9809741c7fe474204c62f687b04da8104", + "date": "2025-02-07T10:08:29-05:00", + "path": "/nix/store/lzcz6qpp4cz3ki1ray05fgii7m48zf84-tree-sitter-tera", + "sha256": "1mrrl47gk8zzi6l9k65h53xpwharni1k6k2bm90is96sxiq883n3", + "hash": "sha256-ww6EcOzaJB1BqktMM0O0WUF++yiwmJmoif+j+Q6hOdc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json index bb283c7ca6200..67d49b9507e04 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json @@ -1,10 +1,10 @@ { "url": "https://github.com/kaermorchen/tree-sitter-twig", - "rev": "082de47a4a9bab710a4b5284324bd9b60655859b", - "date": "2023-07-29T12:16:03+03:00", - "path": "/nix/store/0mgjx9hzgdnn8svyc89flhr2g6gav473-tree-sitter-twig", - "sha256": "0n9dgm9gld69k8x505y00lh922pacq51vzvfzn62claahvmq5kc2", - "hash": "sha256-gs2C64ZKUSaM/W7/HQpm6gqRIAXAF1A6msk0+lJ9LVk=", + "rev": "40d17f0eb990215e12531abe29ee7691d7ca99a5", + "date": "2024-12-06T17:47:37+03:00", + "path": "/nix/store/q05mc4lj16wirwm724m1q39sblb5yq5q-tree-sitter-twig", + "sha256": "06a6rfgh9mmzqvs7bp8y92axa4fni4c72s82bdin7j3a0x5mxwi6", + "hash": "sha256-JvJeSwdqyGNjWwJpcRiJ1hHVlUge3XX0xr/WBJ/LRhk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 3e78029a0074e..1ebdd083b0b57 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -77,6 +77,8 @@ let "tree-sitter-graph" # abandoned "tree-sitter-swift" + # this is the swift language bindings, tree-sitter-swift is the (abandoned) grammar + "swift-tree-sitter" # abandoned "tree-sitter-agda" # abandoned From 29e1bcac1f990e674d82047823f7a617f344100e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 19 Feb 2025 10:53:31 +0100 Subject: [PATCH 055/157] libxml: 2.13.5 -> 2.13.6 Fixes CVE-2025-24928 and CVE-2024-56171. https://discourse.gnome.org/t/libxml2-2-13-6-released/27138 --- pkgs/development/libraries/libxml2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index d95edee18c96b..021d30a843469 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxml2"; - version = "2.13.5"; + version = "2.13.6"; outputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor finalAttrs.version}/libxml2-${finalAttrs.version}.tar.xz"; - hash = "sha256-dPwWMhejlkJX0745r5Q+CIYSY8QjH571tJa29tTHsrY="; + hash = "sha256-9FNIAwdSSWj3oE7GXmTyqDqCWXO80mCi52kb6CrnDJY="; }; strictDeps = true; From 1e6c310bc4466679e7a51da1871551a3d02b07cd Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 19 Feb 2025 11:02:05 +0100 Subject: [PATCH 056/157] vim: 9.1.1111 -> 9.1.1122 Fixes CVE-2025-26603 / https://github.com/vim/vim/security/advisories/GHSA-63p5-mwg2-787v --- 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 d5e1998628e2d..68147dd144a1a 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.1111"; + version = "9.1.1122"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-9U5JCilCGgqTBdrTrz7Ba28/ser9quzHYoly5/IKzZA="; + hash = "sha256-Eaxia/FLRCnr8MVDvt+ZUFwIQD5Pqq7SsmWZeQdjuXs="; }; enableParallelBuilding = true; From 5d808d3150c9d7e4a43d54ad440a105bc2ac1d50 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Sat, 15 Feb 2025 00:05:00 +0100 Subject: [PATCH 057/157] rustc: use indented string for buildPhase --- pkgs/development/compilers/rust/rustc.nix | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index d7a1ee625f9ce..e3aa4e7725118 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -236,19 +236,19 @@ stdenv.mkDerivation (finalAttrs: { # library and reuse compiler buildPhase = if fastCross then - " - runHook preBuild - - mkdir -p build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-{std,rustc}/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/ - ln -s ${rustc.unwrapped}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/libstd-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/libstd.so - ln -s ${rustc.unwrapped}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/librustc_driver-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc.so - ln -s ${rustc.unwrapped}/bin/rustc build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/rustc-main - touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.libstd.stamp - touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.librustc.stamp - python ./x.py --keep-stage=0 --stage=1 build library - - runHook postBuild - " + '' + runHook preBuild + + mkdir -p build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-{std,rustc}/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/ + ln -s ${rustc.unwrapped}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/libstd-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/libstd.so + ln -s ${rustc.unwrapped}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/librustc_driver-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc.so + ln -s ${rustc.unwrapped}/bin/rustc build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/rustc-main + touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.libstd.stamp + touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.librustc.stamp + python ./x.py --keep-stage=0 --stage=1 build library + + runHook postBuild + '' else null; From ea706f9895e46129746c9309d8bda2dbb4330ced Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Sat, 15 Feb 2025 00:06:57 +0100 Subject: [PATCH 058/157] rustc: fix combining no_std targets with other targets --- pkgs/development/compilers/rust/1_84.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/compilers/rust/1_84.nix b/pkgs/development/compilers/rust/1_84.nix index 5a076c84c88c5..149d43e99ef7f 100644 --- a/pkgs/development/compilers/rust/1_84.nix +++ b/pkgs/development/compilers/rust/1_84.nix @@ -28,6 +28,7 @@ llvm_19, wrapCCWith, overrideCC, + fetchpatch, }@args: let llvmSharedFor = @@ -50,6 +51,16 @@ import ./default.nix rustcVersion = "1.84.1"; rustcSha256 = "Xi+11JYopUn3Zxssz5hVqzef1EKDGnwq8W4M3MMbs3U="; + rustcPatches = [ + # Fix for including no_std targets by default, shipping in Rust 1.87 + # https://github.com/rust-lang/rust/pull/137073 + (fetchpatch { + name = "bootstrap-skip-nostd-docs"; + url = "https://github.com/rust-lang/rust/commit/97962d7643300b91c102496ba3ab6d9279d2c536.patch"; + hash = "sha256-DKl9PWqJP3mX4B1pFeRLQ8/sO6mx1JhbmVLTOOMLZI4="; + }) + ]; + llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; llvmSharedForHost = llvmSharedFor pkgsBuildHost; llvmSharedForTarget = llvmSharedFor pkgsBuildTarget; @@ -135,5 +146,6 @@ import ./default.nix "wrapCCWith" "overrideCC" "pkgsHostTarget" + "fetchpatch" ] ) From 0289aa115c32a2b4b6c4b17daa791de10ab20161 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Sat, 15 Feb 2025 00:09:02 +0100 Subject: [PATCH 059/157] rustc: enable bpfe library targets --- pkgs/development/compilers/rust/rustc.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index e3aa4e7725118..6e8dfcc023c94 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -157,23 +157,22 @@ stdenv.mkDerivation (finalAttrs: { concatStringsSep "," ( [ stdenv.targetPlatform.rust.rustcTargetSpec - - # Other targets that don't need any extra dependencies to build. ] + # Other targets that don't need any extra dependencies to build. ++ optionals (!fastCross) [ "wasm32-unknown-unknown" - - # (build!=target): When cross-building a compiler we need to add - # the build platform as well so rustc can compile build.rs - # scripts. + "bpfel-unknown-none" + "bpfeb-unknown-none" ] + # (build!=target): When cross-building a compiler we need to add + # the build platform as well so rustc can compile build.rs + # scripts. ++ optionals (stdenv.buildPlatform != stdenv.targetPlatform && !fastCross) [ stdenv.buildPlatform.rust.rustcTargetSpec - - # (host!=target): When building a cross-targeting compiler we - # need to add the host platform as well so rustc can compile - # build.rs scripts. ] + # (host!=target): When building a cross-targeting compiler we + # need to add the host platform as well so rustc can compile + # build.rs scripts. ++ optionals (stdenv.hostPlatform != stdenv.targetPlatform && !fastCross) [ stdenv.hostPlatform.rust.rustcTargetSpec ] From b885ef3fa80f038290cefb8bb62f77cac7435692 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Sat, 15 Feb 2025 00:33:32 +0100 Subject: [PATCH 060/157] rust: remove obsolete darwin frameworks --- pkgs/development/compilers/rust/1_84.nix | 3 --- pkgs/development/compilers/rust/cargo.nix | 4 +--- pkgs/development/compilers/rust/clippy.nix | 3 +-- pkgs/development/compilers/rust/default.nix | 4 ---- pkgs/development/compilers/rust/rustfmt.nix | 3 +-- pkgs/top-level/all-packages.nix | 1 - 6 files changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/rust/1_84.nix b/pkgs/development/compilers/rust/1_84.nix index 149d43e99ef7f..d2cc3cfa11daf 100644 --- a/pkgs/development/compilers/rust/1_84.nix +++ b/pkgs/development/compilers/rust/1_84.nix @@ -14,9 +14,6 @@ lib, newScope, callPackage, - CoreFoundation, - Security, - SystemConfiguration, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 7000f1daadd45..4461d87f08533 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,7 +1,6 @@ { lib, stdenv, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, rustPlatform, rustc -, CoreFoundation, Security , auditable ? !cargo-auditable.meta.broken , cargo-auditable , pkgsBuildBuild @@ -32,8 +31,7 @@ rustPlatform.buildRustPackage.override { (lib.getDev pkgsHostHost.curl) zlib ]; - buildInputs = [ file curl python3 openssl zlib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; + buildInputs = [ file curl python3 openssl zlib ]; # cargo uses git-rs which is made for a version of libgit2 from recent master that # is not compatible with the current version in nixpkgs. diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 42b285cd72ab6..8bb0fec433c17 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -3,7 +3,6 @@ lib, rustPlatform, rustc, - Security, }: rustPlatform.buildRustPackage { @@ -19,7 +18,7 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - buildInputs = [ rustc.llvm ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ rustc.llvm ]; # fixes: error: the option `Z` is only accepted on the nightly compiler RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 788f8e67da08a..b79b17c6164f0 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -13,7 +13,6 @@ }: { stdenv, lib , newScope, callPackage -, CoreFoundation, Security, SystemConfiguration , pkgsBuildBuild , pkgsBuildHost , pkgsBuildTarget @@ -87,13 +86,11 @@ in sysroot = if fastCross then self.rustc-unwrapped else null; }; rustfmt = self.callPackage ./rustfmt.nix { - inherit Security; inherit (self.buildRustPackages) rustc; }; cargo = if (!fastCross) then self.callPackage ./cargo.nix { # Use boot package set to break cycle rustPlatform = bootRustPlatform; - inherit CoreFoundation Security; } else self.callPackage ./cargo_cross.nix {}; cargo-auditable = self.callPackage ./cargo-auditable.nix { }; cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { }; @@ -102,7 +99,6 @@ in # buildPackages.clippy uses the cross compiler and supports # linting for the target platform. rustPlatform = makeRustPlatform self; - inherit Security; }; }); }; diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index a0652b127c37f..1c18c7afc3039 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -5,7 +5,6 @@ makeWrapper, rustPlatform, rustc, - Security, asNightly ? false, }: @@ -26,7 +25,7 @@ rustPlatform.buildRustPackage { buildInputs = [ rustc.llvm - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; # rustfmt uses the rustc_driver and std private libraries, and Rust's build process forces them to have # an install name of `@rpath/...` [0] [1] instead of the standard on macOS, which is an absolute path diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f87b63bd5ff96..48dda355ecfe8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6539,7 +6539,6 @@ with pkgs; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; 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_84; From 8233c9ceb11c086be059d0744437bbeec55fd39d Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 19 Feb 2025 12:18:59 -0500 Subject: [PATCH 061/157] mercurial: 6.9 -> 6.9.1 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index b01036d2292ec..dac493910d9aa 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -39,11 +39,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.9"; + version = "6.9.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-YpYEKT3yvoFx7IVr9Pi0+qjkMFrxNgfc4PifdBMoNtY="; + hash = "sha256-5XdXfumpep+E08NNU8y4uTVCY9arlkR1JQlPPgpWcnA="; }; format = "other"; From a73201e9724d0ce6170cc728a1cf9ad1f7bc6190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 18 Feb 2025 16:24:16 +0100 Subject: [PATCH 062/157] python3Packages.mitmproxy-linux: init at 0.11.5 --- .../mitmproxy-linux/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/mitmproxy-linux/default.nix diff --git a/pkgs/development/python-modules/mitmproxy-linux/default.nix b/pkgs/development/python-modules/mitmproxy-linux/default.nix new file mode 100644 index 0000000000000..6e6478127324d --- /dev/null +++ b/pkgs/development/python-modules/mitmproxy-linux/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + bpf-linker, + fetchFromGitHub, + rustPlatform, + mitmproxy, +}: + +buildPythonPackage rec { + pname = "mitmproxy-linux"; + version = "0.11.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mitmproxy"; + repo = "mitmproxy_rs"; + tag = "v${version}"; + hash = "sha256-vC+Vsv7UWjkO+6lm7gAb91Ig04Y7r9gYQoz6R9xpxsA="; + }; + + postPatch = '' + substituteInPlace mitmproxy-linux/build.rs \ + --replace-fail '"-Z",' "" \ + --replace-fail '"build-std=core",' "" + + substituteInPlace mitmproxy-linux-ebpf/.cargo/config.toml \ + --replace-fail 'build-std = ["core"]' "" + ''; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-CFsefq1zQLIYjZcfoy3afYfP/0MlBoi9kVx7FVGEKr0="; + }; + + RUSTFLAGS = "-C target-feature="; + RUSTC_BOOTSTRAP = 1; + + buildAndTestSubdir = "mitmproxy-linux"; + + nativeBuildInputs = [ + bpf-linker + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + # repo has no python tests + doCheck = false; + + pythonImportsCheck = [ "mitmproxy_linux" ]; + + meta = { + description = "Rust bits in mitmproxy"; + homepage = "https://github.com/mitmproxy/mitmproxy_rs/tree/main/mitmproxy-linux"; + changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md#${ + lib.replaceStrings [ "." ] [ "" ] version + }"; + license = lib.licenses.mit; + inherit (mitmproxy.meta) maintainers; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4258565766fd8..1592f27c963af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8345,6 +8345,8 @@ self: super: with self; { mitmproxy = callPackage ../development/python-modules/mitmproxy { }; + mitmproxy-linux = callPackage ../development/python-modules/mitmproxy-linux { }; + mitmproxy-macos = callPackage ../development/python-modules/mitmproxy-macos { }; mitmproxy-rs = callPackage ../development/python-modules/mitmproxy-rs { }; From cdc2ee0cd494dbad47dacd2723efd6b712353e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 18 Feb 2025 16:50:56 +0100 Subject: [PATCH 063/157] python313Packages.mitmproxy-macos: 0.9.2 -> 0.11.5 --- .../python-modules/mitmproxy-macos/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy-macos/default.nix b/pkgs/development/python-modules/mitmproxy-macos/default.nix index 5178b9584e923..16c0f3160649a 100644 --- a/pkgs/development/python-modules/mitmproxy-macos/default.nix +++ b/pkgs/development/python-modules/mitmproxy-macos/default.nix @@ -2,25 +2,25 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, }: buildPythonPackage rec { pname = "mitmproxy-macos"; - version = "0.9.2"; + version = "0.11.5"; format = "wheel"; - disabled = pythonOlder "3.10"; - src = fetchPypi { pname = "mitmproxy_macos"; inherit version; format = "wheel"; dist = "py3"; python = "py3"; - hash = "sha256-Q19gQF6qnoF0TDmeZIxu90A5/ur7N7sDcoeBi2LaNrg="; + hash = "sha256-j3qqZGrMZLpHkKf01Gy5+/18sEEbm3pWfbBASGS/8o0="; }; + # repo has no python tests + doCheck = false; + pythonImportsCheck = [ "mitmproxy_macos" ]; meta = with lib; { From 413ba94fdfa421f9297d37aadba908e45e47a6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 18 Feb 2025 16:18:40 +0100 Subject: [PATCH 064/157] python313Packages.mitmproxy-rs: 0.10.7 -> 0.11.5 --- .../python-modules/mitmproxy-rs/Cargo.lock | 3506 ----------------- .../python-modules/mitmproxy-rs/default.nix | 36 +- 2 files changed, 17 insertions(+), 3525 deletions(-) delete mode 100644 pkgs/development/python-modules/mitmproxy-rs/Cargo.lock diff --git a/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock b/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock deleted file mode 100644 index e48a17ae16641..0000000000000 --- a/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock +++ /dev/null @@ -1,3506 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "anstream" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" - -[[package]] -name = "anstyle-parse" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" -dependencies = [ - "backtrace", -] - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "axum" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" -dependencies = [ - "async-trait", - "axum-core", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper 1.0.1", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper 0.1.2", - "tower-layer", - "tower-service", -] - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest", -] - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite", - "piper", -] - -[[package]] -name = "boringtun" -version = "0.6.0" -source = "git+https://github.com/cloudflare/boringtun?rev=e3252d9c4f4c8fc628995330f45369effd4660a1#e3252d9c4f4c8fc628995330f45369effd4660a1" -dependencies = [ - "aead", - "base64 0.13.1", - "blake2", - "chacha20poly1305", - "hex", - "hmac", - "ip_network", - "ip_network_table", - "libc", - "nix 0.25.1", - "parking_lot", - "rand_core", - "ring", - "tracing", - "untrusted", - "x25519-dalek", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytemuck" -version = "1.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "c2rust-bitfields" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "367e5d1b30f28be590b6b3868da1578361d29d9bfac516d22f497d28ed7c9055" -dependencies = [ - "c2rust-bitfields-derive", -] - -[[package]] -name = "c2rust-bitfields-derive" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a279db9c50c4024eeca1a763b6e0f033848ce74e83e47454bcf8a8a98f7b0b56" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "chacha20" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "chacha20poly1305" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" -dependencies = [ - "aead", - "chacha20", - "cipher", - "poly1305", - "zeroize", -] - -[[package]] -name = "ciborium" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", - "zeroize", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" -dependencies = [ - "anstyle", - "clap_lex 0.7.1", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" - -[[package]] -name = "cocoa" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" -dependencies = [ - "bitflags 2.6.0", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" -dependencies = [ - "bitflags 2.6.0", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", -] - -[[package]] -name = "colorchoice" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "console-api" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ed14aa9c9f927213c6e4f3ef75faaad3406134efe84ba2cb7983431d5f0931" -dependencies = [ - "futures-core", - "prost", - "prost-types", - "tonic", - "tracing-core", -] - -[[package]] -name = "console-subscriber" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e3a111a37f3333946ebf9da370ba5c5577b18eb342ec683eb488dd21980302" -dependencies = [ - "console-api", - "crossbeam-channel", - "crossbeam-utils", - "futures-task", - "hdrhistogram", - "humantime", - "hyper-util", - "prost", - "prost-types", - "serde", - "serde_json", - "thread_local", - "tokio", - "tokio-stream", - "tonic", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "core-foundation" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "core-graphics" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap 4.5.8", - "criterion-plot", - "is-terminal", - "itertools", - "num-traits", - "once_cell", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "rand_core", - "typenum", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "fiat-crypto", - "rustc_version", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "defmt" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a99dd22262668b887121d4672af5a64b238f026099f1a2a1b322066c9ecfe9e0" -dependencies = [ - "bitflags 1.3.2", - "defmt-macros", -] - -[[package]] -name = "defmt-macros" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a9f309eff1f79b3ebdf252954d90ae440599c26c2c553fe87a2d17195f2dcb" -dependencies = [ - "defmt-parser", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "defmt-parser" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4a5fefe330e8d7f31b16a318f9ce81000d8e35e69b93eae154d16d2278f70f" -dependencies = [ - "thiserror", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "enum-as-inner" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "etherparse" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827292ea592108849932ad8e30218f8b1f21c0dfd0696698a18b5d0aed62d990" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener", - "pin-project-lite", -] - -[[package]] -name = "fastrand" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "flate2" -version = "1.0.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "h2" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "hash32" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "hdrhistogram" -version = "7.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" -dependencies = [ - "base64 0.21.7", - "byteorder", - "flate2", - "nom", - "num-traits", -] - -[[package]] -name = "heapless" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" -dependencies = [ - "hash32", - "stable_deref_trait", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hickory-proto" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "hickory-resolver" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" -dependencies = [ - "cfg-if", - "futures-util", - "hickory-proto", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot", - "rand", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "hickory-server" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be0e43c556b9b3fdb6c7c71a9a32153a2275d02419e3de809e520bfcfe40c37" -dependencies = [ - "async-trait", - "bytes", - "cfg-if", - "enum-as-inner", - "futures-util", - "hickory-proto", - "serde", - "thiserror", - "time", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-timeout" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" -dependencies = [ - "hyper", - "hyper-util", - "pin-project-lite", - "tokio", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" -dependencies = [ - "bytemuck", - "byteorder-lite", - "num-traits", - "png", - "tiff", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", -] - -[[package]] -name = "indoc" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "internet-checksum" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6d6206008e25125b1f97fbe5d309eb7b85141cf9199d52dbd3729a1584dd16" - -[[package]] -name = "internet-packet" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0273209b868758e751e5db7f59f72d152750d3e30f08f6eb06722357dcfe453" -dependencies = [ - "internet-checksum", - "smoltcp", -] - -[[package]] -name = "inventory" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" - -[[package]] -name = "ip_network" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" - -[[package]] -name = "ip_network_table" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4099b7cfc5c5e2fe8c5edf3f6f7adf7a714c9cc697534f63a5a5da30397cb2c0" -dependencies = [ - "ip_network", - "ip_network_table-deps-treebitmap", -] - -[[package]] -name = "ip_network_table-deps-treebitmap" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e537132deb99c0eb4b752f0346b6a836200eaaa3516dd7e5514b63930a09e5d" - -[[package]] -name = "ipconfig" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" -dependencies = [ - "socket2", - "widestring", - "windows-sys 0.48.0", - "winreg", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "is-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libloading" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "lru_time_cache" -version = "0.11.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd" - -[[package]] -name = "macos-certificate-truster" -version = "0.10.7" -dependencies = [ - "security-framework", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "managed" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "mitm-wg-test-client" -version = "0.10.7" -dependencies = [ - "anyhow", - "boringtun", - "data-encoding", - "hex", - "smoltcp", -] - -[[package]] -name = "mitmproxy" -version = "0.10.7" -dependencies = [ - "anyhow", - "boringtun", - "cocoa", - "console-subscriber", - "core-foundation", - "core-graphics", - "criterion", - "data-encoding", - "env_logger", - "futures-util", - "hickory-resolver", - "hickory-server", - "image", - "internet-packet", - "log", - "lru_time_cache", - "nix 0.29.0", - "objc", - "once_cell", - "pretty-hex", - "prost", - "rand", - "rand_core", - "security-framework", - "smoltcp", - "socket2", - "sysinfo", - "tokio", - "tokio-util", - "tun2", - "windows 0.57.0", - "x25519-dalek", -] - -[[package]] -name = "mitmproxy_rs" -version = "0.10.7" -dependencies = [ - "anyhow", - "boringtun", - "console-subscriber", - "data-encoding", - "env_logger", - "log", - "mitmproxy", - "once_cell", - "pyo3", - "pyo3-asyncio-0-21", - "pyo3-log", - "rand_core", - "tar", - "tokio", -] - -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "libc", -] - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases", - "libc", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "object" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - -[[package]] -name = "parking" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.5.2", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - -[[package]] -name = "plotters" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" - -[[package]] -name = "plotters-svg" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "poly1305" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" -dependencies = [ - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "pretty-hex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc83ee4a840062f368f9096d80077a9841ec117e17e7f700df81958f1451254" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prost" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "prost-types" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" -dependencies = [ - "prost", -] - -[[package]] -name = "pyo3" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" -dependencies = [ - "anyhow", - "cfg-if", - "indoc", - "libc", - "memoffset", - "parking_lot", - "portable-atomic", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-asyncio-0-21" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fde289486f7d5cee0ac7c20b2637a0657654681079cc5eedc90d9a2a79af1e5" -dependencies = [ - "clap 3.2.25", - "futures", - "inventory", - "once_cell", - "pin-project-lite", - "pyo3", - "pyo3-asyncio-macros-0-21", - "tokio", -] - -[[package]] -name = "pyo3-asyncio-macros-0-21" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5ffc4e987e866bf54b781235a6c3b91e7e67df14f73ce716625ee78728554a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pyo3-build-config" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" -dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-log" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac84e6eec1159bc2a575c9ae6723baa6ee9d45873e9bebad1e3ad7e8d28a443" -dependencies = [ - "arc-swap", - "log", - "pyo3", -] - -[[package]] -name = "pyo3-macros" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" -dependencies = [ - "proc-macro2", - "pyo3-macros-backend", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" -dependencies = [ - "heck", - "proc-macro2", - "pyo3-build-config", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "regex" -version = "1.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "resolv-conf" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" -dependencies = [ - "hostname", - "quick-error", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "security-framework" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d0283c0a4a22a0f1b0e4edca251aa20b92fc96eaa09b84bec052f9415e9d71" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "serde_json" -version = "1.0.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smoltcp" -version = "0.11.0" -source = "git+https://github.com/smoltcp-rs/smoltcp?rev=ef67e7b46cabf49783053cbf68d8671ed97ff8d4#ef67e7b46cabf49783053cbf68d8671ed97ff8d4" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "cfg-if", - "defmt", - "heapless", - "libc", - "log", - "managed", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" - -[[package]] -name = "sysinfo" -version = "0.29.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "winapi", -] - -[[package]] -name = "tar" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "num-conv", - "powerfmt", - "serde", - "time-core", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "tonic" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.22.1", - "bytes", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-timeout", - "hyper-util", - "percent-encoding", - "pin-project", - "prost", - "socket2", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "once_cell", - "regex", - "sharded-slab", - "thread_local", - "tracing", - "tracing-core", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "tun2" -version = "3.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "294ac0e21fef392b8952f1dd538bc5752fd7c2ebfde1c204b0dd09aaa5489cd0" -dependencies = [ - "bytes", - "cfg-if", - "futures", - "futures-core", - "ipnet", - "libc", - "log", - "nix 0.29.0", - "thiserror", - "tokio", - "tokio-util", - "windows-sys 0.59.0", - "wintun-bindings", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unindent" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" - -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna 0.5.0", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.68", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windivert" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6b6833a760d1c36b489314a5541a12a39d162dc8341d8f6f400212b96d3df1" -dependencies = [ - "etherparse", - "thiserror", - "windivert-sys", - "windows 0.48.0", -] - -[[package]] -name = "windivert-sys" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832bc4af9272458a8a64395b3aabe10dc4089546486fcbd0e19b9b6d28ba6e54" -dependencies = [ - "cc", - "thiserror", - "windows 0.48.0", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" -dependencies = [ - "windows-core", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "windows-interface" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "windows-redirector" -version = "0.10.7" -dependencies = [ - "anyhow", - "env_logger", - "hex", - "internet-packet", - "log", - "lru_time_cache", - "mitmproxy", - "prost", - "tokio", - "windivert", - "winres", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "winres" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" -dependencies = [ - "toml", -] - -[[package]] -name = "wintun-bindings" -version = "0.7.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74675b7fccee92389d38c3d120445864d1085c421ee91c7ed05d66fb9bb76050" -dependencies = [ - "blocking", - "c2rust-bitfields", - "futures", - "libloading", - "log", - "thiserror", - "windows-sys 0.59.0", -] - -[[package]] -name = "x25519-dalek" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" -dependencies = [ - "curve25519-dalek", - "rand_core", - "serde", - "zeroize", -] - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] diff --git a/pkgs/development/python-modules/mitmproxy-rs/default.nix b/pkgs/development/python-modules/mitmproxy-rs/default.nix index ec433ca357f36..e5f9300a38d12 100644 --- a/pkgs/development/python-modules/mitmproxy-rs/default.nix +++ b/pkgs/development/python-modules/mitmproxy-rs/default.nix @@ -3,46 +3,44 @@ stdenv, buildPythonPackage, fetchFromGitHub, - rustPlatform, - darwin, - libiconv, mitmproxy, + mitmproxy-linux, mitmproxy-macos, + rustPlatform, }: buildPythonPackage rec { pname = "mitmproxy-rs"; - version = "0.10.7"; + version = "0.11.5"; pyproject = true; src = fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy_rs"; rev = "v${version}"; - hash = "sha256-YRiaslXdpRGJfuZAHQ4zX+6DgH+IPkeyD8RA7TYgmBY="; - }; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "boringtun-0.6.0" = "sha256-fx2lY6q1ZdO5STvf7xnbVG64tn0BC4yWPFy4ICPJgEg="; - "smoltcp-0.11.0" = "sha256-KC9nTKd2gfZ1ICjrkLK//M2bbqYlfcCK18gBdN0RqWQ="; - }; + hash = "sha256-vC+Vsv7UWjkO+6lm7gAb91Ig04Y7r9gYQoz6R9xpxsA="; }; buildAndTestSubdir = "mitmproxy-rs"; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-CFsefq1zQLIYjZcfoy3afYfP/0MlBoi9kVx7FVGEKr0="; + }; + nativeBuildInputs = [ rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.AppKit - libiconv - mitmproxy-macos - ]; + dependencies = + lib.optionals stdenv.hostPlatform.isLinux [ mitmproxy-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ mitmproxy-macos ]; + # not packaged yet + # ++ lib.optionals stdenv.hostPlatform.isWindows [ mitmproxy-windows ] + + # repo has no python tests + doCheck = false; pythonImportsCheck = [ "mitmproxy_rs" ]; From e7ae5710400b229a6dbd25abfc971cbc9a6bb67c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 18 Feb 2025 15:44:11 +0100 Subject: [PATCH 065/157] python313Packages.mitmproxy: 11.0.2 -> 11.1.3 Co-Authored-By: misilelab --- .../python-modules/mitmproxy/default.nix | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 2e7c2bf7848b7..0b24d3e1a41b3 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -1,13 +1,11 @@ { lib, - stdenv, fetchFromGitHub, buildPythonPackage, - pythonOlder, # Mitmproxy requirements aioquic, + argon2-cffi, asgiref, - blinker, brotli, certifi, cryptography, @@ -17,11 +15,9 @@ hyperframe, kaitaistruct, ldap3, - mitmproxy-macos, mitmproxy-rs, msgpack, passlib, - protobuf5, publicsuffix2, pyopenssl, pyparsing, @@ -35,7 +31,6 @@ zstandard, # Additional check requirements hypothesis, - parver, pytest-asyncio, pytest-timeout, pytest-xdist, @@ -45,16 +40,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "11.0.2"; + version = "11.1.3"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy"; tag = "v${version}"; - hash = "sha256-qcsPOISQjHVHh4TrQ/UihZaxB/jWBfq7AVI4U1gQPVs="; + hash = "sha256-gTeXxNQWVMQYiGdIyy7SS6JcuYG16KLnjxBBdjhi+lE="; }; pythonRelaxDeps = [ @@ -65,10 +58,12 @@ buildPythonPackage rec { "urwid" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aioquic + argon2-cffi asgiref - blinker brotli certifi cryptography @@ -81,23 +76,20 @@ buildPythonPackage rec { mitmproxy-rs msgpack passlib - protobuf5 publicsuffix2 pyopenssl pyparsing pyperclip ruamel-yaml - setuptools sortedcontainers tornado urwid wsproto zstandard - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ mitmproxy-macos ]; + ]; nativeCheckInputs = [ hypothesis - parver pytest-asyncio pytest-timeout pytest-xdist From 7cc771f350a08c796a90105c8258d9425a150a83 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 19 Feb 2025 18:42:10 -0500 Subject: [PATCH 066/157] Revert "darwin.ICU: add `stdenv` for compatibility with Tensorflow override" This reverts commit d8a222f4b5b8cc358d4000809a8de63f272b26be. --- pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix index 134002567ecd0..c2a326c99ba9e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix @@ -5,7 +5,6 @@ fixDarwinDylibNames, mkAppleDerivation, python3, - stdenv, # Necessary for compatibility with python3Packages.tensorflow, which tries to override the stdenv testers, }: From f3cb6dcdc08533e796fa039561d2cdd56281a674 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 19 Feb 2025 18:41:48 -0500 Subject: [PATCH 067/157] Revert "darwin.ICU: enable the C++ API by default" This reverts out commit 49936d62185923e0a0c5752bd64c325139638b49. --- .../apple-source-releases/ICU/package.nix | 2 - .../patches/enable-cxx-api-by-default.patch | 54 ------------------- 2 files changed, 56 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/ICU/patches/enable-cxx-api-by-default.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix index c2a326c99ba9e..8b660a99b09b4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix @@ -28,8 +28,6 @@ let # but nixpkgs needs `char16_t` for compatibility with packages that expect upstream ICU with `char16_t`. # According to `unicode/umachine.h`, these types are bit-compatible but distinct in C++. ./patches/define-uchar-as-char16_t.patch - # Enable the C++ API by default to match the upstream ICU packaging in nixpkgs - ./patches/enable-cxx-api-by-default.patch # Skip MessageFormatTest test, which is known to crash sometimes and should be suppressed if it does. ./patches/suppress-icu-check-crash.patch ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/patches/enable-cxx-api-by-default.patch b/pkgs/os-specific/darwin/apple-source-releases/ICU/patches/enable-cxx-api-by-default.patch deleted file mode 100644 index 3b324aeca4ec8..0000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/patches/enable-cxx-api-by-default.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/icu/icu4c/source/common/unicode/utypes.h b/icu/icu4c/source/common/unicode/utypes.h -index a3e0ec911c..e361c658ef 100644 ---- a/common/unicode/utypes.h -+++ b/common/unicode/utypes.h -@@ -66,20 +66,6 @@ - * \def U_SHOW_CPLUSPLUS_API - * @internal - */ --#if APPLE_ICU_CHANGES --// rdar://60884991 #58 Replace installsrc patching with changes directly in header files --// Apple modifies the default to be 0, not 1 --#ifdef __cplusplus --# ifndef U_SHOW_CPLUSPLUS_API --# define U_SHOW_CPLUSPLUS_API 0 --# endif --#else --# undef U_SHOW_CPLUSPLUS_API --# define U_SHOW_CPLUSPLUS_API 0 --#endif -- --#else -- - #ifdef __cplusplus - # ifndef U_SHOW_CPLUSPLUS_API - # define U_SHOW_CPLUSPLUS_API 1 -@@ -89,28 +75,6 @@ - # define U_SHOW_CPLUSPLUS_API 0 - #endif - --#endif // APPLE_ICU_CHANGES -- -- --#if APPLE_ICU_CHANGES --// rdar://30624081 64b8ed9b89.. Add #if U_SHOW_CPLUSPLUS_API..#endif around C++ interfaces that don’t have it --// rdar://24075048 0f5f76d43c.. update ICU for AAS to use VS2015, remove old ICU 4.0 shims, fix build issues --/* -- * Apple-specific warning if U_SHOW_CPLUSPLUS_API set and the compile -- * is not for a build of ICU itself (ICU_DATA_DIR is always defined -- * for ICU builds, and is unlikely to be defined for client builds). -- * Windows VSC compliler does not like #warning, skip for it. -- */ --#if U_SHOW_CPLUSPLUS_API --#ifndef ICU_DATA_DIR --#if U_PLATFORM!=U_PF_WINDOWS --#warning Do not set U_SHOW_CPLUSPLUS_API for code that ships with the OS, it is only for local tools. --#warning ICU C++ functionality may not be used by any OS client, it is not binary compatible across updates. --#endif --#endif --#endif --#endif // APPLE_ICU_CHANGES -- - /** @{ API visibility control */ - - /** From c5912ba233b4201f89d9c44a25ec4128444f0487 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 19 Feb 2025 18:42:17 -0500 Subject: [PATCH 068/157] Revert "darwin.ICU: use char16_t instead of uint16_t in the C++ API" This reverts out commit 56fc42191ee4b43c2adacf7b36cc7cc4c896857f. --- .../apple-source-releases/ICU/package.nix | 4 -- .../patches/define-uchar-as-char16_t.patch | 53 ------------------- 2 files changed, 57 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/ICU/patches/define-uchar-as-char16_t.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix index 8b660a99b09b4..a4a5cb4975243 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix @@ -24,10 +24,6 @@ let sourceRoot = "source/icu/icu4c/source"; patches = [ - # Apple defaults to `uint16_t` for compatibility with building one of their private frameworks, - # but nixpkgs needs `char16_t` for compatibility with packages that expect upstream ICU with `char16_t`. - # According to `unicode/umachine.h`, these types are bit-compatible but distinct in C++. - ./patches/define-uchar-as-char16_t.patch # Skip MessageFormatTest test, which is known to crash sometimes and should be suppressed if it does. ./patches/suppress-icu-check-crash.patch ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/patches/define-uchar-as-char16_t.patch b/pkgs/os-specific/darwin/apple-source-releases/ICU/patches/define-uchar-as-char16_t.patch deleted file mode 100644 index 65437d4cb5f23..0000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/patches/define-uchar-as-char16_t.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/icu/icu4c/source/common/unicode/umachine.h b/icu/icu4c/source/common/unicode/umachine.h -index 9483031569..e451ad7c02 100644 ---- a/common/unicode/umachine.h -+++ b/common/unicode/umachine.h -@@ -387,39 +387,6 @@ - * @stable ICU 4.4 - */ - --#if APPLE_ICU_CHANGES --// rdar://121241618 (StarlightE: VideosUI-883.40.54#24 has failed to build in install; cannot initialize a variable of type 'const UChar *' (aka 'const char16_t) --#if 0 -- // #if 1 is normal (Apple uses 0 to force us to still use uint16_t). UChar defaults to char16_t in C++. -- // For configuration testing of UChar=uint16_t temporarily change this to #if 0. -- // The intltest Makefile #defines UCHAR_TYPE=char16_t, -- // so we only #define it to uint16_t if it is undefined so far. --#elif !defined(UCHAR_TYPE) --# define UCHAR_TYPE uint16_t --#endif -- --#if defined(U_COMBINED_IMPLEMENTATION) || defined(U_COMMON_IMPLEMENTATION) || \ -- defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || \ -- defined (U_TOOLUTIL_IMPLEMENTATION) -- // Inside the ICU library code, never configurable. -- typedef char16_t UChar; --#elif defined(T_CTEST_IMPLEMENTATION) -- // internally to ctestfw, we want to use char16_t in C++ and uint_16 in C -- #if U_CPLUSPLUS_VERSION != 0 -- typedef char16_t UChar; // C++ -- #else -- typedef uint16_t UChar; // C -- #endif --#elif defined(UCHAR_TYPE) -- typedef UCHAR_TYPE UChar; --#elif U_CPLUSPLUS_VERSION != 0 -- typedef char16_t UChar; // C++ --#else -- typedef uint16_t UChar; // C --#endif -- --#else -- - #if 1 - // #if 1 is normal. UChar defaults to char16_t in C++. - // For configuration testing of UChar=uint16_t temporarily change this to #if 0. -@@ -441,8 +408,6 @@ - typedef uint16_t UChar; // C - #endif - --#endif // APPLE_ICU_CHANGES -- - /** - * \var OldUChar - * Default ICU 58 definition of UChar. From 593da3b9c697e4cba9e05b7494dcf28fdcedb0c6 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 18 Feb 2025 11:25:27 -0500 Subject: [PATCH 069/157] Revert "python312Packages.pyicu: skip test for sjd locale" This reverts commit c015fc274fb877c991d02d740863a61f5a5b6f93. --- pkgs/development/python-modules/pyicu/default.nix | 7 ------- .../python-modules/pyicu/skip-sjd-local.diff | 13 ------------- 2 files changed, 20 deletions(-) delete mode 100644 pkgs/development/python-modules/pyicu/skip-sjd-local.diff diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 81a8a7df239f2..7702f8c027b3b 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -19,12 +18,6 @@ buildPythonPackage rec { hash = "sha256-rMfrkr1cVU7VdyScaXhFCk/toKpvAUcBUrOns4KgITI="; }; - patches = lib.optionals stdenv.hostPlatform.isDarwin [ - # fails testExemplarSet2 test due to sjd locale not having an auxiliary - # esType. icuReal doesn't have an sjd locale - ./skip-sjd-local.diff - ]; - nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config buildInputs = [ icu ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pyicu/skip-sjd-local.diff b/pkgs/development/python-modules/pyicu/skip-sjd-local.diff deleted file mode 100644 index 995b0d5f57dc5..0000000000000 --- a/pkgs/development/python-modules/pyicu/skip-sjd-local.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/test_LocaleData.py b/test/test_LocaleData.py -index 76410e7..7db6f13 100644 ---- a/test/test_LocaleData.py -+++ b/test/test_LocaleData.py -@@ -126,6 +126,7 @@ class TestLocaleData(TestCase): - ld = LocaleData(locale) - scriptCodes = Script.getCode(locale) - exemplarSets = [] -+ if locale == 'sjd': continue - for k in range(2): # for casing option in (normal, uncased) - # it seems USET_CASE_INSENSITIVE = 2 - option = 0 if k == 0 else 2 - From 027345fc85cc977d4ae4081b65ec580cc9de1971 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 18 Feb 2025 11:55:36 -0500 Subject: [PATCH 070/157] bun: ensure that only libicucore.dylib is in DYLD_LIBRARY_PATH --- pkgs/by-name/bu/bun/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index ca220dac871cc..acee5b4816d78 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -10,7 +10,9 @@ , curl , jq , common-updater-scripts +, cctools , darwin +, rcodesign }: stdenvNoCC.mkDerivation rec { @@ -43,8 +45,9 @@ stdenvNoCC.mkDerivation rec { postPhases = [ "postPatchelf"]; postPatchelf = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' - wrapProgram $out/bin/bun \ - --prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ darwin.ICU ]} + '${lib.getExe' cctools "${cctools.targetPrefix}install_name_tool"}' $out/bin/bun \ + -change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib' + '${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/bin/bun '' # We currently cannot generate completions for x86_64-darwin because bun requires avx support to run, which is: # 1. Not currently supported by the version of Rosetta on our aarch64 builders From 13de18d402837124dfa9cc64b2d581b7539e27ef Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 18 Feb 2025 11:58:40 -0500 Subject: [PATCH 071/157] icuReal: add to aliases.nix --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b72754e4697d4..ca82d35e62521 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -596,6 +596,7 @@ mapAliases { i3nator = throw "'i3nator' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 ib-tws = throw "ib-tws has been removed from nixpkgs as it was broken"; # Added 2024-07-15 ib-controller = throw "ib-controller has been removed from nixpkgs as it was broken"; # Added 2024-07-15 + icuReal = throw "icuReal has been removed from nixpkgs as a mistake"; # Added 2025-02-18 imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17 imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17 imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17 From 31d699a4e7211ed68ed66c3bad0eb9e27dc159e3 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 19 Feb 2025 07:55:15 -0500 Subject: [PATCH 072/157] darwin.libffi: match upstream configuration This ensures that the installed headers match those shipped with the system libffi, which may enable or disable certain features depending on the platform (such as the legacy closure API on x86_64-darwin). --- .../apple-source-releases/libffi/package.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix index 4b9250ff97cde..176455d15f117 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix @@ -50,9 +50,15 @@ mkAppleDerivation (finalAttrs: { "--with-gcc-arch=generic" # no detection of -march= or -mtune= ]; - # Make sure aarch64-darwin is using the trampoline dylib. - postConfigure = lib.optionalString stdenv.hostPlatform.isAarch64 '' - echo '#define FFI_TRAMPOLINE_WHOLE_DYLIB 1' >> aarch64-apple-darwin/fficonfig.h + postConfigure = '' + # Use Apple’s configuration instead of the one generated by the `configure` script. + cp darwin/include/fficonfig_${stdenv.hostPlatform.darwinArch}.h ${stdenv.hostPlatform.config}/fficonfig.h + cp darwin/include/ffitarget_${ + if stdenv.hostPlatform.isAarch64 then "arm64" else "x86" + }.h ${stdenv.hostPlatform.config}/include/ffitarget.h + # Use `macCatalyst` instead of `iosmac` to avoid errors due to invalid availability annotations. + substitute darwin/include/ffi.h ${stdenv.hostPlatform.config}/include/ffi.h \ + --replace-fail iosmac macCatalyst ''; postBuild = lib.optionalString stdenv.hostPlatform.isAarch64 '' @@ -66,9 +72,6 @@ mkAppleDerivation (finalAttrs: { # The Darwin SDK puts the headers in `include/ffi`. Add a symlink for compatibility. '' ln -s "$dev/include" "$dev/include/ffi" - # Make sure Apple’s header with availability annotations is installed in place of the generated one. - # Use `macCatalyst` instead of `iosmac` to avoid errors due to invalid availability annotations. - substitute darwin/include/ffi.h "$dev/include/ffi.h" --replace-fail iosmac macCatalyst '' # Install the trampoline dylib since it is build manually. + lib.optionalString stdenv.hostPlatform.isAarch64 '' From 5032ae475b1706dbb78859b4ff90c9b12c53fc16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 19 Feb 2025 16:45:17 -0800 Subject: [PATCH 073/157] gpgme: 1.24.1 -> 1.24.2 Changelog: https://dev.gnupg.org/T7524 --- pkgs/development/libraries/gpgme/default.nix | 4 ++-- pkgs/development/python-modules/gpgme/default.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 8e58fa128aeec..a4dccb593338e 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.24.1"; + version = "1.24.2"; pyproject = true; outputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnupg/gpgme/gpgme-${version}.tar.bz2"; - hash = "sha256-6gXQJY5xBh1hcWWE7DTO9ZMwqRNAVx7cRreDdJc7qF8="; + hash = "sha256-4RsaDjYXd+nlX0igPYkJbiq/CMY9hLcBfP4dzgZjlYE="; }; patches = [ diff --git a/pkgs/development/python-modules/gpgme/default.nix b/pkgs/development/python-modules/gpgme/default.nix index d2ede05b7fc2f..b260516accd00 100644 --- a/pkgs/development/python-modules/gpgme/default.nix +++ b/pkgs/development/python-modules/gpgme/default.nix @@ -12,9 +12,7 @@ buildPythonPackage { inherit (gpgme) version src; pyproject = true; - patches = gpgme.patches or [ ] ++ [ - ./python313-support.patch - ]; + patches = gpgme.patches or [ ]; postPatch = '' substituteInPlace lang/python/setup.py.in \ From 3433550d61f8fddffd7d99633490fbfcfabcc3a6 Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Wed, 12 Feb 2025 03:28:19 +0900 Subject: [PATCH 074/157] gnutls: 3.8.6 -> 3.8.9 --- pkgs/development/libraries/gnutls/default.nix | 4 ++-- pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index da726e64dbb84..293d011f9db49 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -60,11 +60,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.8.6"; + version = "3.8.9"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - hash = "sha256-LhWIquU8sy1Dk38fTsoo/r2cDHqhc0/F3WGn6B4OvN0="; + hash = "sha256-aeET2ALRZwxNWsG5kECx8tXHwF2uxQA4E8BJtRhIIO0="; }; outputs = [ "bin" "dev" "out" ] diff --git a/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch b/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch index c0f27f7b5a45b..12b3507cf9913 100644 --- a/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch +++ b/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch @@ -2,9 +2,9 @@ allow overriding system trust store location via $NIX_SSL_CERT_FILE --- a/lib/system/certs.c +++ b/lib/system/certs.c -@@ -404,6 +404,10 @@ gnutls_x509_trust_list_add_system_trust(gnutls_x509_trust_list_t list, - unsigned int tl_flags, - unsigned int tl_vflags) +@@ -381,6 +381,10 @@ int gnutls_x509_trust_list_add_system_trust(gnutls_x509_trust_list_t list, + unsigned int tl_flags, + unsigned int tl_vflags) { - return add_system_trust(list, tl_flags | GNUTLS_TL_NO_DUPLICATES, - tl_vflags); From 10304c30e9c46398b8c58acefeb60b9e20204374 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Feb 2025 17:58:45 +0100 Subject: [PATCH 075/157] python312Packages.flit: 3.10.1 -> 3.11.0 https://github.com/pypa/flit/blob/3.11.0/doc/history.rst --- pkgs/development/python-modules/flit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 1850efab822d0..2bf1e93072d2c 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "flit"; - version = "3.10.1"; + version = "3.11.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "flit"; rev = version; - hash = "sha256-GOup/iiR0zKM07dFiTFNzBEVBwzNp4ERWp1l4w9hOME="; + hash = "sha256-AK5iuR1l/i2Cgj8D4CnyV6mQkSNbFw4sHGQF2OdwNkU="; }; build-system = [ flit-core ]; From 2092b1f45c650e07c4ef96fa38fbd8f2cae53c56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Feb 2025 18:36:05 +0000 Subject: [PATCH 076/157] libassuan: 2.5.7 -> 3.0.2 --- pkgs/by-name/li/libassuan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libassuan/package.nix b/pkgs/by-name/li/libassuan/package.nix index 25cd5a2ed485c..8f95ba1ee5d11 100644 --- a/pkgs/by-name/li/libassuan/package.nix +++ b/pkgs/by-name/li/libassuan/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libassuan"; - version = "2.5.7"; + version = "3.0.2"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-AQMIH/wng4ouUEeRU8oQXoc9PWXYqVkygunJTH5q+3Y="; + sha256 = "sha256-0pMc2tJm5jNRD5lw4aLzRgVeNRuxn5t4kSR1uAdMNvY="; }; outputs = [ From f3a3e607170647cebae857eedb8b3a965f30f876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 14 Dec 2024 12:52:08 -0800 Subject: [PATCH 077/157] gnupg-pkcs11-scd: 0.10.0 -> 0.11.0 Diff: https://github.com/alonbl/gnupg-pkcs11-scd/compare/gnupg-pkcs11-scd-0.10.0...gnupg-pkcs11-scd-0.11.0 Changelog: https://github.com/alonbl/gnupg-pkcs11-scd/blob/gnupg-pkcs11-scd-0.11.0/ChangeLog --- pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix b/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix index 750efe12ff778..d4423c3c2f541 100644 --- a/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix +++ b/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix @@ -12,26 +12,31 @@ stdenv.mkDerivation rec { pname = "gnupg-pkcs11-scd"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://github.com/alonbl/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Kb8p53gPkhxtOhH2COKwSDwbtRDFr6hHMJAkndV8Ukk="; + url = "https://github.com/alonbl/gnupg-pkcs11-scd/releases/download/gnupg-pkcs11-scd-${version}/gnupg-pkcs11-scd-${version}.tar.bz2"; + hash = "sha256-lUeH5WLys9kpQhLDLdDYGizTesolDmaFAC0ok7uVkIc="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + libassuan + libgcrypt + libgpg-error pkcs11helper openssl ]; configureFlags = [ - "--with-libgpg-error-prefix=${libgpg-error.dev}" - "--with-libassuan-prefix=${libassuan.dev}" "--with-libgcrypt-prefix=${libgcrypt.dev}" ]; meta = with lib; { + changelog = "https://github.com/alonbl/gnupg-pkcs11-scd/blob/gnupg-pkcs11-scd-${version}/ChangeLog"; description = "Smart-card daemon to enable the use of PKCS#11 tokens with GnuPG"; mainProgram = "gnupg-pkcs11-scd"; longDescription = '' From 87f6382ecaa916d55de86b9d6f738a7c0a2a8b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 14 Dec 2024 13:01:13 -0800 Subject: [PATCH 078/157] gpa: 0.10.0 -> 0.11.0 Changelog: https://dev.gnupg.org/source/gpa/browse/master/NEWS%3Bgpa-0.11.0?view=raw --- pkgs/by-name/gp/gpa/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gp/gpa/package.nix b/pkgs/by-name/gp/gpa/package.nix index 79b9268842883..07f66d22bdf86 100644 --- a/pkgs/by-name/gp/gpa/package.nix +++ b/pkgs/by-name/gp/gpa/package.nix @@ -4,7 +4,7 @@ fetchurl, intltool, pkg-config, - gtk2, + gtk3, gpgme, libgpg-error, libassuan, @@ -12,25 +12,27 @@ stdenv.mkDerivation rec { pname = "gpa"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "mirror://gnupg/gpa/gpa-${version}.tar.bz2"; - sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm"; + hash = "sha256-Jqj6W/cFQct0Hwxxt8/ikbHqVuq2jusHqpYs71zfM8w="; }; nativeBuildInputs = [ intltool pkg-config ]; + buildInputs = [ - gtk2 + gtk3 gpgme libgpg-error libassuan ]; meta = with lib; { + changelog = "https://dev.gnupg.org/source/gpa/browse/master/NEWS;gpa-${version}?view=raw"; description = "Graphical user interface for the GnuPG"; homepage = "https://www.gnupg.org/related_software/gpa/"; license = licenses.gpl3Plus; From 5e6e65caa883f83be096b1967e45fec963f43f5e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 15 Dec 2024 09:32:28 -0500 Subject: [PATCH 079/157] pinentry_mac: fix build with libassuan 3.0 The autoconf macros shipped with the source need updating to correctly detect libassuan 3.0. Once they are updated, pinentry_mac builds again. --- pkgs/tools/security/pinentry/mac.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index a6c8395b0a568..28a2750f8a97f 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { cp -r ${./mac/Main.nib} macosx/Main.nib cp -r ${./mac/Pinentry.nib} macosx/Pinentry.nib chmod -R u+w macosx/*.nib + # pinentry_mac requires updated macros to correctly detect v2 API support in libassuan 3.x. + cp '${lib.getDev libassuan}/share/aclocal/libassuan.m4' m4/libassuan.m4 ''; # Unfortunately, PlistBuddy from xcbuild is not compatible enough pinentry-mac’s build process. From 8853e2ccca9bb585383c50ab4aa391f5b9757282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 20 Feb 2025 16:25:49 -0800 Subject: [PATCH 080/157] libassuan: modernize --- pkgs/by-name/li/libassuan/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libassuan/package.nix b/pkgs/by-name/li/libassuan/package.nix index 8f95ba1ee5d11..4c6fbea829515 100644 --- a/pkgs/by-name/li/libassuan/package.nix +++ b/pkgs/by-name/li/libassuan/package.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { version = "3.0.2"; src = fetchurl { - url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-0pMc2tJm5jNRD5lw4aLzRgVeNRuxn5t4kSR1uAdMNvY="; + url = "mirror://gnupg/libassuan/libassuan-${version}.tar.bz2"; + hash = "sha256-0pMc2tJm5jNRD5lw4aLzRgVeNRuxn5t4kSR1uAdMNvY="; }; outputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ignoredVersions = ".*-base"; }; - meta = with lib; { + meta = { description = "IPC library used by GnuPG and related software"; mainProgram = "libassuan-config"; longDescription = '' @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://gnupg.org/software/libassuan/"; changelog = "https://dev.gnupg.org/source/libassuan/browse/master/NEWS;libassuan-${version}"; - license = licenses.lgpl2Plus; - platforms = platforms.all; + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.all; maintainers = [ ]; }; } From 4ec86479c0b4ad8846fe9844e46874c41e4f902b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Feb 2025 01:59:54 +0100 Subject: [PATCH 081/157] python313Packages.aiohappyeyeballs: 2.4.4 -> 2.4.6 https://github.com/bdraco/aiohappyeyeballs/blob/v2.4.6/CHANGELOG.md --- 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 53759949277b5..8dc49726eebf5 100644 --- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix +++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohappyeyeballs"; - version = "2.4.4"; + version = "2.4.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aiohappyeyeballs"; tag = "v${version}"; - hash = "sha256-zf1EkS+cdCkttce2jCjRf1693AlBYkmAuLX5IysWeUs="; + hash = "sha256-qTbneCb8XsZ+/Tg7JfFT/q67g7vzd11riZn5lI44Ei8="; }; outputs = [ From 7839982f9d51953c880aa06b9b5b9debdf745e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 20 Feb 2025 21:01:39 -0800 Subject: [PATCH 082/157] gpa: fix build --- pkgs/by-name/gp/gpa/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/gp/gpa/package.nix b/pkgs/by-name/gp/gpa/package.nix index 07f66d22bdf86..ac4678022c3dc 100644 --- a/pkgs/by-name/gp/gpa/package.nix +++ b/pkgs/by-name/gp/gpa/package.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { libassuan ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + meta = with lib; { changelog = "https://dev.gnupg.org/source/gpa/browse/master/NEWS;gpa-${version}?view=raw"; description = "Graphical user interface for the GnuPG"; From 6771697393252f3d9f0f3e28a7c96aad54280ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 21 Feb 2025 11:20:08 +0000 Subject: [PATCH 083/157] cargo,clippy,rustfmt,rustc: 1.84.1 -> 1.85.0 --- .../compilers/rust/{1_84.nix => 1_85.nix} | 34 +++++++++---------- pkgs/top-level/all-packages.nix | 8 ++--- 2 files changed, 21 insertions(+), 21 deletions(-) rename pkgs/development/compilers/rust/{1_84.nix => 1_85.nix} (73%) diff --git a/pkgs/development/compilers/rust/1_84.nix b/pkgs/development/compilers/rust/1_85.nix similarity index 73% rename from pkgs/development/compilers/rust/1_84.nix rename to pkgs/development/compilers/rust/1_85.nix index d2cc3cfa11daf..68309a58b497d 100644 --- a/pkgs/development/compilers/rust/1_84.nix +++ b/pkgs/development/compilers/rust/1_85.nix @@ -45,8 +45,8 @@ let in import ./default.nix { - rustcVersion = "1.84.1"; - rustcSha256 = "Xi+11JYopUn3Zxssz5hVqzef1EKDGnwq8W4M3MMbs3U="; + rustcVersion = "1.85.0"; + rustcSha256 = "L08xQv+3yEAhOc+geW4kuqrIuf0/lrLe7DuUtARcaoo="; rustcPatches = [ # Fix for including no_std targets by default, shipping in Rust 1.87 @@ -114,26 +114,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.84.1"; + bootstrapVersion = "1.85.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "9a2f107b35ca55439a7de0a74a893ff285766e086f96fb1d7049301b196c5da8"; - x86_64-unknown-linux-gnu = "106c89f23ce1c763fcbea8e2714b2ba869bf7af70804813987a4483896398933"; - x86_64-unknown-linux-musl = "e52236e269ce8f713691d78895365a376002980c011b4bbdd27e4bee0ec1ee9a"; - arm-unknown-linux-gnueabihf = "02273a6326639dedf0c627421851f85b88884d3811de2a7390f189575d23b4b4"; - armv7-unknown-linux-gnueabihf = "434895ed6cf922a3c0fe11a6af7f4e382093cc9edf6c250e49fbfcecd25ada59"; - aarch64-unknown-linux-gnu = "be89f6ad9b70cc4b25182ae299f94ab047a713a51fddf95284823c8afe4aef85"; - aarch64-unknown-linux-musl = "8a80398ed1942e8020599b8f1c53ae9775a6c8bed6af252c48a5fb967accd5f1"; - x86_64-apple-darwin = "c2c80ffef15946abfb08dac6ad54c07f9d95ae56c65fc94c4c10e07b60acb883"; - aarch64-apple-darwin = "49be10fa1a1de14e36d37cc412b7c44e01896c0a86a2d0d35ee26704a59adba7"; - powerpc64le-unknown-linux-gnu = "7c56d9b5e2dfbd6a0a18307d96b703d6d70d1cf7bb337ea8865dfdd5e0a38d84"; - riscv64gc-unknown-linux-gnu = "0e07fe7a0df2220cea37581061ed52576a44dec10866ec8f860f71a98bf41412"; - s390x-unknown-linux-gnu = "9d6ab731c0cb315349cf5cbbeb88149adbd7165dbeec76f7c723d0b9796c4422"; - x86_64-unknown-freebsd = "7aa4089315d3ac9eefd7f885283df99b2c4cb930316f0be3bf867d41217b6d05"; + i686-unknown-linux-gnu = "bbfdbd15ee6a8414baad487c98d448805d2fa7074107e4eded770926ff5f2545"; + x86_64-unknown-linux-gnu = "be4ba7b777100c851ab268e95f70f405d28d7813ba60a9bdcf4e88c88acf8602"; + x86_64-unknown-linux-musl = "aec38e0eb03cde68f255959cfb389cccf321c7a020d103ea9174d01ab5acba65"; + arm-unknown-linux-gnueabihf = "8a716247a8fe15a6c820d64d25d19c7d0b899a2dadd812bc080e92ebff4fdea5"; + armv7-unknown-linux-gnueabihf = "91d0c9693b218fac740449fa9c3f37e71a680e4be5d27135ac1385f40eb148e0"; + aarch64-unknown-linux-gnu = "0306c30bee00469fbec4b07bb04ea0308c096454354c3dc96a92b729f1c2acd1"; + aarch64-unknown-linux-musl = "390de2f3aff938d04275302d6cb47c92f425b141c9cb68cb6cf237f702298627"; + x86_64-apple-darwin = "69a36d239e38cc08c6366d1d85071847406645346c6f2d2e0dfaf64b58050d3d"; + aarch64-apple-darwin = "3ff45cefaf9a002069902acf3a6332113b76b530bb31803fe5cfd30f7ef8ba03"; + powerpc64le-unknown-linux-gnu = "d0761bf0e1786a46dddfe60cc9397b899f680b86e6aebd7ca16b2a70a9dd631b"; + riscv64gc-unknown-linux-gnu = "5f27e7ed95ccd49fd53e92d6be62042dfdd2861faecad20bf61b0c186ff24df1"; + s390x-unknown-linux-gnu = "7f6ee970e31e448c31c92175684380a73ec7078b15d7a99eac5d445bef1c4b3a"; + x86_64-unknown-freebsd = "6ad090d188079450b1d65e4d539833affac54cfeb504e022b1b56d6d98bb4cbe"; }; - selectRustPackage = pkgs: pkgs.rust_1_84; + selectRustPackage = pkgs: pkgs.rust_1_85; } ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fa08123a3b8a..433e478fce9a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6535,10 +6535,10 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_84 = callPackage ../development/compilers/rust/1_84.nix { + rust_1_85 = callPackage ../development/compilers/rust/1_85.nix { llvm_19 = llvmPackages_19.libllvm; }; - rust = rust_1_84; + rust = rust_1_85; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -6546,8 +6546,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_84 = rust_1_84.packages.stable; - rustPackages = rustPackages_1_84; + rustPackages_1_85 = rust_1_85.packages.stable; + rustPackages = rustPackages_1_85; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; From ffcffac14d5b2e9513bb600acf7267b501acd725 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Fri, 21 Feb 2025 21:22:56 +0100 Subject: [PATCH 084/157] openh264: 2.5.0 -> 2.6.0 Fixes heap overflow vulnerability https://github.com/cisco/openh264/security/advisories/GHSA-m99q-5j7x-7m9x Signed-off-by: Markus Theil --- pkgs/by-name/op/openh264/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix index 4776ab1031631..c4518d3124ae2 100644 --- a/pkgs/by-name/op/openh264/package.nix +++ b/pkgs/by-name/op/openh264/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openh264"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "cisco"; repo = "openh264"; rev = "v${finalAttrs.version}"; - hash = "sha256-K8p94P4XO6bUWCJuT6jR5Kmz3lamNDyclGWgsV6Lf9I="; + hash = "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg="; }; outputs = [ @@ -26,10 +26,6 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - postPatch = '' - substituteInPlace meson.build --replace-fail "'-Werror'," "" - ''; - nativeBuildInputs = [ meson nasm From d791d5d18254e0c5fab66b689fcbbc5e503a8ee3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Feb 2025 01:02:57 +0000 Subject: [PATCH 085/157] socat: 1.8.0.2 -> 1.8.0.3 --- pkgs/by-name/so/socat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix index 2efbe1244772d..a741a2f7cbea1 100644 --- a/pkgs/by-name/so/socat/package.nix +++ b/pkgs/by-name/so/socat/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "socat"; - version = "1.8.0.2"; + version = "1.8.0.3"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2"; - hash = "sha256-rcB6nCcjUnz2Vo0vuWVZeUz5wlSkvC7dNvfzeJ6fdiU="; + hash = "sha256-AesBc2HZW7OmlB6EC1nkRjo/q/kt9BVO0CsWou1qAJU="; }; postPatch = '' From d6555f8567c92cccb74f951c2ccbb3bc2b3055de Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 21 Nov 2024 22:32:09 -0700 Subject: [PATCH 086/157] ncurses: provide openbsd version number in host triple --- pkgs/development/libraries/ncurses/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 0ee09d2416cd8..cd1196aee3fcc 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" "man" ]; setOutputFlags = false; # some aren't supported + # see other isOpenBSD clause below + configurePlatforms = if stdenv.hostPlatform.isOpenBSD then ["build"] else ["build" "host"]; + configureFlags = [ (lib.withFeature (!enableStatic) "shared") "--without-debug" @@ -64,7 +67,12 @@ stdenv.mkDerivation (finalAttrs: { # # For now we allow this with `--undefined-version`: "LDFLAGS=-Wl,--undefined-version" - ]); + ]) ++ lib.optionals stdenv.hostPlatform.isOpenBSD [ + # If you don't specify the version number in the host specification, a branch gets taken in configure + # which assumes that your openbsd is from the 90s, leading to a truly awful compiler/linker configuration. + # No, autoreconfHook doesn't work. + "--host=${stdenv.hostPlatform.config}${stdenv.cc.libc.version}" + ]; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; From 9787f192fe9cffc836263be44d231b333e2c9e66 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 21 Nov 2024 23:12:59 -0700 Subject: [PATCH 087/157] readline: add library symlinks on OpenBSD to compensate for old libtool --- pkgs/development/libraries/readline/8.2.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/readline/8.2.nix b/pkgs/development/libraries/readline/8.2.nix index 7bf5caf4060f1..0e072d80d7c1e 100644 --- a/pkgs/development/libraries/readline/8.2.nix +++ b/pkgs/development/libraries/readline/8.2.nix @@ -68,6 +68,13 @@ stdenv.mkDerivation rec { }) ]; + # This install error is caused by a very old libtool. We can't autoreconfHook this package, + # so this is the best we've got! + postInstall = lib.optionalString stdenv.hostPlatform.isOpenBSD '' + ln -s $out/lib/libhistory.so* $out/lib/libhistory.so + ln -s $out/lib/libreadline.so* $out/lib/libreadline.so + ''; + meta = with lib; { description = "Library for interactive line editing"; From 8ae9d18333c3f7d631b365d784e73b6cb00b962c Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 23 Feb 2025 21:45:38 +0800 Subject: [PATCH 088/157] go: add missing VERSION file --- pkgs/development/compilers/go/1.22.nix | 2 +- pkgs/development/compilers/go/1.23.nix | 2 +- pkgs/development/compilers/go/1.24.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index 471d398358a8d..c7fb6d6719fe3 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc go.env $GOROOT_FINAL + cp -a bin pkg src lib misc api doc go.env VERSION $GOROOT_FINAL mkdir -p $out/bin ln -s $GOROOT_FINAL/bin/* $out/bin runHook postInstall diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index dfeffaac77843..cb290b85f4d95 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -166,7 +166,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall mkdir -p $out/share/go - cp -a bin pkg src lib misc api doc go.env $out/share/go + cp -a bin pkg src lib misc api doc go.env VERSION $out/share/go mkdir -p $out/bin ln -s $out/share/go/bin/* $out/bin runHook postInstall diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 4afafbdbc747f..6d9a81a30c5af 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -166,7 +166,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall mkdir -p $out/share/go - cp -a bin pkg src lib misc api doc go.env $out/share/go + cp -a bin pkg src lib misc api doc go.env VERSION $out/share/go mkdir -p $out/bin ln -s $out/share/go/bin/* $out/bin runHook postInstall From b8d7e46ef32c00e79a66005746dc2c36efdde3c2 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sun, 23 Feb 2025 15:28:52 -0700 Subject: [PATCH 089/157] libcdio: 2.1.0 -> 2.2.0 --- .../development/libraries/libcdio/default.nix | 27 +++---------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 51a94bab3ce2b..29e8df6736733 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, libcddb, pkg-config, ncurses, @@ -14,29 +13,13 @@ stdenv.mkDerivation rec { pname = "libcdio"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "mirror://gnu/libcdio/libcdio-${version}.tar.bz2"; - sha256 = "0avi6apv5ydjy6b9c3z9a46rvp5i57qyr09vr7x4nndxkmcfjl45"; + url = "https://github.com/libcdio/libcdio/releases/download/${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-b4+99NGJz2Pyp6FUnFFs1yDHsiLHqq28kkom50WkhTk="; }; - patches = [ - # Fixes test failure of realpath test with glibc-2.36 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/libcdio/raw/d49ccdd9c8b4e9d57c01539f4c8948f28ce82bca/f/realpath-test-fix.patch"; - sha256 = "sha256-ldAGlcf79uQ8QAt4Au8Iv6jsI6ICZXtXOKZBpyELtN8="; - }) - - # pull pending upstream patch to fix build on ncurses-6.3: - # https://savannah.gnu.org/patch/index.php?10130 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://savannah.gnu.org/patch/download.php?file_id=52179"; - sha256 = "1v15gxhpi4bgcr12pb3d9c3hiwj0drvc832vic7sham34lhjmcbb"; - }) - ]; - postPatch = '' patchShebangs . ''; @@ -58,10 +41,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - env = lib.optionalAttrs stdenv.cc.isGNU { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { From a2818d9068dad0cf9e59a77fb5457f47322de531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 23 Feb 2025 19:00:26 -0800 Subject: [PATCH 090/157] python313Packages.flake8: 7.1.1 -> 7.1.2 Diff: https://github.com/PyCQA/flake8/compare/7.1.1...7.1.2 Changelog: https://github.com/PyCQA/flake8/blob/7.1.2/docs/source/release-notes/7.1.2.rst --- .../python-modules/flake8/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 6f2a8c49d5704..ca60957189b14 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, isPyPy, - pythonOlder, fetchFromGitHub, setuptools, mccabe, @@ -13,17 +12,14 @@ buildPythonPackage rec { pname = "flake8"; - version = "7.1.1"; - - disabled = pythonOlder "3.8"; - + version = "7.1.2"; pyproject = true; src = fetchFromGitHub { owner = "PyCQA"; repo = "flake8"; - rev = version; - hash = "sha256-6iCZEapftHqd9okJS1wMzIjjmWahrmmZtXd7SUMVcmE="; + tag = version; + hash = "sha256-VhHWGO8UIf77IzVxz9SCpg6Z/ebRmIJQLlSGsKY9Y0E="; }; build-system = [ setuptools ]; @@ -42,12 +38,12 @@ buildPythonPackage rec { "test_tokenization_error_but_not_syntax_error" ]; - meta = with lib; { - changelog = "https://github.com/PyCQA/flake8/blob/${src.rev}/docs/source/release-notes/${version}.rst"; + meta = { + changelog = "https://github.com/PyCQA/flake8/blob/${src.tag}/docs/source/release-notes/${version}.rst"; description = "Modular source code checker: pep8, pyflakes and co"; homepage = "https://github.com/PyCQA/flake8"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; mainProgram = "flake8"; }; } From 96dd72e53112da8ef08490696a4a2569d0ec7c8a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 23 Feb 2025 20:28:30 +0000 Subject: [PATCH 091/157] llvmPackages_{12..18}.tblgen: backport `gcc-15` fix (add ``) --- pkgs/development/compilers/llvm/common/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 42a6c950a39c4..8fdf98d2c9ded 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -427,6 +427,18 @@ let stripLen = 1; } ) + ++ + lib.optional + (lib.versionAtLeast metadata.release_version "12" && lib.versionOlder metadata.release_version "19") + # Add missing include headers to build against gcc-15: + # https://github.com/llvm/llvm-project/pull/101761 + ( + fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/7e44305041d96b064c197216b931ae3917a34ac1.patch"; + hash = "sha256-1htuzsaPHbYgravGc1vrR8sqpQ/NSQ8PUZeAU8ucCFk="; + stripLen = 1; + } + ) ++ lib.optional (lib.versionOlder metadata.release_version "16") # Fix musl build. From b8de2d206adc5f57f254ba3c4b70ae0328a0453d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 21 Feb 2025 09:47:54 +0000 Subject: [PATCH 092/157] rustc: add wasm32v1-none target --- pkgs/development/compilers/rust/rustc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 6e8dfcc023c94..ffaa711e7cd21 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -161,6 +161,7 @@ stdenv.mkDerivation (finalAttrs: { # Other targets that don't need any extra dependencies to build. ++ optionals (!fastCross) [ "wasm32-unknown-unknown" + "wasm32v1-none" "bpfel-unknown-none" "bpfeb-unknown-none" ] From 08a243cb4ddc9b85e7159ccda9a17eca679aaa7b Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Mon, 24 Feb 2025 16:56:02 -0500 Subject: [PATCH 093/157] python3Packages.pytaglib: update taglib --- pkgs/development/python-modules/pytaglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index 9a490952ec020..a05c94958e6b8 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - taglib_1, + taglib, cython, pytestCheckHook, pythonOlder, @@ -24,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ cython - taglib_1 + taglib ]; nativeCheckInputs = [ pytestCheckHook ]; From a6c31358a096fabb230d5111a9131d2f55f4feb6 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 24 Feb 2025 23:34:53 +0100 Subject: [PATCH 094/157] gtk4: add patch fixing glitches on asahi vulkan driver (#383350) --- pkgs/development/libraries/gtk/4.x.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 3c5cb9e863c1f..52805b086661b 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -3,6 +3,7 @@ , buildPackages , replaceVars , fetchurl +, fetchpatch , pkg-config , docutils , gettext @@ -82,6 +83,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7zG9vW8ILEQBY0ogyFCwBQyb8lLvHgeXZO6VoqDEyVo="; }; + patches = [ + # Fix rendering glitches on vulkan drivers which do not support mipmaps for VK_IMAGE_TILING_LINEAR (Asahi Honeykrisp) + # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/8058 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/c9a3cdd396c5646382612ed25e93bb5f9664d043.patch"; + hash = "sha256-K774FFu6eyyjnxBTy7oTDygkh8+7qp5/KssHkyEwRR8="; + }) + ]; + depsBuildBuild = [ pkg-config ]; From 99431585d68b296ad0d6bc8195037016f5d95075 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 22 Feb 2025 08:34:20 -0500 Subject: [PATCH 095/157] pkgs/stdenv/darwin: update bootstrap tools Updates bootstrap tools to latest fresh tools (includes LLVM 19 and ld64 954.16). --- .../bootstrap-files/aarch64-apple-darwin.nix | 18 +++++++++--------- .../bootstrap-files/x86_64-apple-darwin.nix | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/stdenv/darwin/bootstrap-files/aarch64-apple-darwin.nix b/pkgs/stdenv/darwin/bootstrap-files/aarch64-apple-darwin.nix index c3f2d88395474..0af9115a32e35 100644 --- a/pkgs/stdenv/darwin/bootstrap-files/aarch64-apple-darwin.nix +++ b/pkgs/stdenv/darwin/bootstrap-files/aarch64-apple-darwin.nix @@ -2,20 +2,20 @@ # $ ./refresh-tarballs.bash --targets=aarch64-apple-darwin # # Metadata: -# - nixpkgs revision: d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f +# - nixpkgs revision: d8657587c0c1ce2191b4b489299c386b5b7148c6 # - hydra build: https://hydra.nixos.org/job/nixpkgs/trunk/stdenvBootstrapTools.aarch64-apple-darwin.build/latest -# - resolved hydra build: https://hydra.nixos.org/build/255282138 -# - instantiated derivation: /nix/store/cahnprnkg9z2aij3hj4rkbkc4l8190mf-stdenv-bootstrap-tools.drv -# - output directory: /nix/store/zxxcz7sza5ypy061rsg7cmr7h0a96hbb-stdenv-bootstrap-tools -# - build time: Wed, 03 Apr 2024 07:59:44 +0000 +# - resolved hydra build: https://hydra.nixos.org/build/290554342 +# - instantiated derivation: /nix/store/g4x0vd6rfvr124sbxqfphkf8l06sy4pc-stdenv-bootstrap-tools.drv +# - output directory: /nix/store/8wbnh6accpx3fcf20jvbnapcalvm1cmd-stdenv-bootstrap-tools +# - build time: Thu, 20 Feb 2025 12:38:34 +0000 { bootstrapTools = import { - url = "http://tarballs.nixos.org/stdenv/aarch64-apple-darwin/d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f/bootstrap-tools.tar.xz"; - hash = "sha256-a37OgMdTHjFyKs4UTxoD7zx6Te3A7zsSjhbFHzbNxQ8="; + url = "http://tarballs.nixos.org/stdenv/aarch64-apple-darwin/d8657587c0c1ce2191b4b489299c386b5b7148c6/bootstrap-tools.tar.xz"; + hash = "sha256-i+KwTIY6P3dKfNmE42BWC9+qUomoDxazO50uvrzNlpE="; }; unpack = import { - url = "http://tarballs.nixos.org/stdenv/aarch64-apple-darwin/d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f/unpack.nar.xz"; - hash = "sha256-XCVy6TMDJ1DKFnhIT1NHzdQUjY/TPKLV67Zi/ANIpms="; + url = "http://tarballs.nixos.org/stdenv/aarch64-apple-darwin/d8657587c0c1ce2191b4b489299c386b5b7148c6/unpack.nar.xz"; + hash = "sha256-mzql+dmvqtn663HvzWZORA8f9d9RPShwPJNIk9VGEvU="; name = "unpack"; unpack = true; }; diff --git a/pkgs/stdenv/darwin/bootstrap-files/x86_64-apple-darwin.nix b/pkgs/stdenv/darwin/bootstrap-files/x86_64-apple-darwin.nix index bbef3ec3345bb..1f4bf0b7cf1f2 100644 --- a/pkgs/stdenv/darwin/bootstrap-files/x86_64-apple-darwin.nix +++ b/pkgs/stdenv/darwin/bootstrap-files/x86_64-apple-darwin.nix @@ -2,20 +2,20 @@ # $ ./refresh-tarballs.bash --targets=x86_64-apple-darwin # # Metadata: -# - nixpkgs revision: d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f +# - nixpkgs revision: d8657587c0c1ce2191b4b489299c386b5b7148c6 # - hydra build: https://hydra.nixos.org/job/nixpkgs/trunk/stdenvBootstrapTools.x86_64-apple-darwin.build/latest -# - resolved hydra build: https://hydra.nixos.org/build/255281731 -# - instantiated derivation: /nix/store/44wnr0ikrbcxkakfqhhm2cz6gsh6wjni-stdenv-bootstrap-tools.drv -# - output directory: /nix/store/lsl9rl3zj9nr318w471vvmlvxzj21b2k-stdenv-bootstrap-tools -# - build time: Wed, 03 Apr 2024 07:56:15 +0000 +# - resolved hydra build: https://hydra.nixos.org/build/290554343 +# - instantiated derivation: /nix/store/38sk9c8s4zyhjrifcr9cd3a8d9hyi4zj-stdenv-bootstrap-tools.drv +# - output directory: /nix/store/y617yisg19x2pj34hzxg9zcm3wlsfj29-stdenv-bootstrap-tools +# - build time: Thu, 20 Feb 2025 12:38:34 +0000 { bootstrapTools = import { - url = "http://tarballs.nixos.org/stdenv/x86_64-apple-darwin/d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f/bootstrap-tools.tar.xz"; - hash = "sha256-3OBigzlbu/Z6g8r7hsOWg95HTv7IJw9Nvbamwvw+88w="; + url = "http://tarballs.nixos.org/stdenv/x86_64-apple-darwin/d8657587c0c1ce2191b4b489299c386b5b7148c6/bootstrap-tools.tar.xz"; + hash = "sha256-gtkeaUaV8ZXY8JxEkyd7ZeB75MESpsBPjaux0B2c0lE="; }; unpack = import { - url = "http://tarballs.nixos.org/stdenv/x86_64-apple-darwin/d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f/unpack.nar.xz"; - hash = "sha256-93GK8LjjgUBknxsylfGVr0DG4AbWVIQEIWrwxhDW07k="; + url = "http://tarballs.nixos.org/stdenv/x86_64-apple-darwin/d8657587c0c1ce2191b4b489299c386b5b7148c6/unpack.nar.xz"; + hash = "sha256-vgfZGKo6I565ORLZ/AGKh6SUpgLhgaanFuhYk897+zw="; name = "unpack"; unpack = true; }; From 95af103be7bdbb6ac7c5027062cbe538a00d1931 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 22 Feb 2025 08:35:35 -0500 Subject: [PATCH 096/157] pkgs/stdenv/darwin: add jq to stage 0 --- pkgs/stdenv/darwin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index fd59a52ea1122..ed03321ecf068 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -417,7 +417,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check gnugrep = bootstrapTools; pbzx = bootstrapTools; - jq = null; + jq = bootstrapTools; cctools = bootstrapTools // { libtool = bootstrapTools; From 1b86a6d935f51e787f77d389a61ea232927f37f5 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 22 Feb 2025 08:35:35 -0500 Subject: [PATCH 097/157] pkgs/stdenv/darwin: link `llvm-readtapi` in stage 0 --- pkgs/stdenv/darwin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index ed03321ecf068..f2e16c9ff103b 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -537,6 +537,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check fi done ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil + ln -s ${bootstrapTools}/bin/llvm-readtapi $out/bin/llvm-readtapi ln -s ${bootstrapTools}/lib/libLLVM* $out/lib ''; passthru.isFromBootstrapFiles = true; From 3768d3f5c3f87c056a8b7a0675e7ce52dcb15e8c Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 22 Feb 2025 08:35:35 -0500 Subject: [PATCH 098/157] pkgs/stdenv/darwin: simplify SDK version expression --- pkgs/stdenv/darwin/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f2e16c9ff103b..b24bd1e4f5836 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1265,8 +1265,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check patch ; - # TODO: Simplify when dropping support for macOS < 11. - "apple-sdk_${builtins.replaceStrings [ "." ] [ "_" ] sdkMajorVersion}" = self.apple-sdk; + "apple-sdk_${sdkMajorVersion}" = self.apple-sdk; darwin = super.darwin.overrideScope ( _: _: From 07c75bb1f4b1e74c40382c67382d192854eb8513 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 22 Feb 2025 08:35:35 -0500 Subject: [PATCH 099/157] pkgs/stdenv/darwin: remove old bootstrap tools workarounds * The versions of cctools and ld64 in the bootstrap tools now support code-signing, so rely on them to do that instead of using a post-link hook that can sometimes fail to sign binaries; * Drop the manual SDK header and library paths now that `clang` and `ld64` in the bootstrap tools correctly handle sysroots on Darwin. --- pkgs/stdenv/darwin/default.nix | 54 ---------------------------------- 1 file changed, 54 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b24bd1e4f5836..6dd2d5497a227 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -126,17 +126,6 @@ let ln -s "${compiler-rt.out}/lib" "$rsrc/lib" ln -s "${compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' - + lib.optionalString (isFromBootstrapFiles prevStage.llvmPackages.clang-unwrapped) '' - # Work around the `-nostdlibinc` patch in the bootstrap tools. - # TODO: Remove after the bootstrap tools have been updated. - substituteAll ${builtins.toFile "add-flags-extra.sh" '' - if [ "@darwinMinVersion@" ]; then - NIX_CFLAGS_COMPILE_@suffixSalt@+=" -idirafter $SDKROOT/usr/include" - NIX_CFLAGS_COMPILE_@suffixSalt@+=" -iframework $SDKROOT/System/Library/Frameworks" - fi - ''} add-flags-extra.sh - cat add-flags-extra.sh >> $out/nix-support/add-flags.sh ''; cc = prevStage.llvmPackages.clang-unwrapped; @@ -446,28 +435,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check runtimeShell = self.stdenvNoCC.shell; bintools = selfDarwin.binutils-unwrapped; - - # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly, - # and additional linker flags to work around a since‐removed patch. - # This can be dropped once the bootstrap tools cctools has been updated to 1010.6. - extraBuildCommands = '' - printf %s ${lib.escapeShellArg '' - extraBefore+=("-F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks") - extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib") - ''} >> $out/nix-support/add-local-ldflags-before.sh - - echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook - - export signingUtils=${selfDarwin.signingUtils} - - wrap \ - install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \ - "${selfDarwin.binutils-unwrapped}/bin/install_name_tool" - - wrap \ - strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \ - "${selfDarwin.binutils-unwrapped}/bin/strip" - ''; }; binutils-unwrapped = @@ -688,27 +655,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check inherit (self) coreutils; bintools = selfDarwin.binutils-unwrapped; libc = selfDarwin.libSystem; - - # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly. - # This can be dropped once the bootstrap tools cctools has been updated to 1010.6. - extraBuildCommands = '' - printf %s ${lib.escapeShellArg '' - extraBefore+=("-F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks") - extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib") - ''} >> $out/nix-support/add-local-ldflags-before.sh - - echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook - - export signingUtils=${selfDarwin.signingUtils} - - wrap \ - install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \ - "${selfDarwin.binutils-unwrapped}/bin/install_name_tool" - - wrap \ - strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \ - "${selfDarwin.binutils-unwrapped}/bin/strip" - ''; }; # Avoid building unnecessary Python dependencies due to building LLVM manpages. From 8ddfc53f2ae1d102786c72cbca09b9b3eeefac8e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 22 Feb 2025 12:12:54 -0500 Subject: [PATCH 100/157] pkgs/stdenv/darwin: drop llvm-manpages from bootstrap Building the LLVM man pages requires a bunch of Python dependencies, which are annoying to build during the bootstrap. --- pkgs/stdenv/darwin/default.nix | 36 +++++++++++++--------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 6dd2d5497a227..2a66a0c572b75 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -888,35 +888,21 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # Rebuild darwin.binutils with the new LLVM, so only inherit libSystem from the previous stage. // { inherit (prevStage.darwin) libSystem; + + # Disable building the documentation due to the dependency on llvm-manpages, + # which brings in a bunch of Python dependencies. + binutils-unwrapped = superDarwin.binutils-unwrapped.override { + inherit (self) cctools ld64; + enableManpages = false; + }; } ); llvmPackages = let - tools = super.llvmPackages.tools.extend ( - _: superTools: { - # darwin.binutils-unwrapped needs to build the LLVM man pages, which requires a lot of Python stuff - # that ultimately ends up depending on git. Fortunately, the git dependency is only for check - # inputs. The following set of overrides allow the LLVM documentation to be built without - # pulling curl (and other packages like ffmpeg) into the stdenv bootstrap. - # - # However, even without darwin.binutils-unwrapped, this has to be overridden in the LLVM package set - # because otherwise llvmPackages.llvm-manpages on its own is broken. - llvm-manpages = superTools.llvm-manpages.override { - python3Packages = self.python3.pkgs.overrideScope ( - _: superPython: { - hatch-vcs = superPython.hatch-vcs.overrideAttrs { doInstallCheck = false; }; - markdown-it-py = superPython.markdown-it-py.overrideAttrs { doInstallCheck = false; }; - mdit-py-plugins = superPython.mdit-py-plugins.overrideAttrs { doInstallCheck = false; }; - myst-parser = superPython.myst-parser.overrideAttrs { doInstallCheck = false; }; - } - ); - }; - } - ); libraries = super.llvmPackages.libraries.extend (_: _: llvmLibrariesPackages prevStage); in - super.llvmPackages // { inherit tools libraries; } // tools // libraries; + super.llvmPackages // { inherit libraries; } // libraries; } ]; @@ -1243,6 +1229,12 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check libraries = super."llvmPackages_${llvmVersion}".libraries.extend ( _: _: llvmLibrariesPackages prevStage + # Avoid depending on llvm-manpages from the bootstrap, which brings a bunch of Python dependencies + # into the bootstrap. This means that there are no man pages in darwin.binutils, but they are still + # available from llvm-manpages, ld64, and cctools. + // { + inherit (super."llvmPackages_${llvmVersion}") llvm-manpages; + } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { inherit (prevStage.llvmPackages) clang; } From 18c8cb56112a13f76e3cb6b434ef8f9a1b8dea51 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 22 Feb 2025 16:27:54 -0500 Subject: [PATCH 101/157] pkgs/stdenv/darwin: drop openbsm from the bootstrap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s not actually used by anything in the bootstrap, so avoid building it unnecessarily. --- pkgs/stdenv/darwin/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 2a66a0c572b75..cfb99f5937063 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -321,7 +321,6 @@ let libxml2 libxo ncurses - openbsm openpam xcbuild zlib @@ -1133,7 +1132,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ncurses.dev ncurses.man ncurses.out - openbsm openpam openssl.out patch From 5ced6bb1964a8f9e4f44d312ade003c8111b9bcf Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 22 Feb 2025 08:43:38 -0500 Subject: [PATCH 102/157] apple-sdk: remove old bootstrap tools workaround The stubs can unconditionally be processed now that the bootstrap tools have both `jq` and `llvm-readtapi`. --- .../apple-sdk/common/remove-disallowed-packages.nix | 11 +---------- pkgs/by-name/ap/apple-sdk/package.nix | 6 +----- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/common/remove-disallowed-packages.nix b/pkgs/by-name/ap/apple-sdk/common/remove-disallowed-packages.nix index c771b2ccb9f59..e413f92892499 100644 --- a/pkgs/by-name/ap/apple-sdk/common/remove-disallowed-packages.nix +++ b/pkgs/by-name/ap/apple-sdk/common/remove-disallowed-packages.nix @@ -1,7 +1,5 @@ let - # This can be made unconditional once jq is available in the bootstrap tools. If corecrypto is not removed from - # the umbrella framework, linking will fail in stage 1 because it can’t find the tbd. - disallowedPackages' = builtins.fromJSON (builtins.readFile ../metadata/disallowed-packages.json); + disallowedPackages = builtins.fromJSON (builtins.readFile ../metadata/disallowed-packages.json); in { @@ -10,13 +8,6 @@ in stdenv, }: -let - disallowedPackages = - if jq == null then - lib.filter (p: p.package != "corecrypto") disallowedPackages' - else - disallowedPackages'; -in self: super: { # Remove headers and stubs for packages that are available in nixpkgs. buildPhase = diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix index 7470adbbcc130..f413de4603ecc 100644 --- a/pkgs/by-name/ap/apple-sdk/package.nix +++ b/pkgs/by-name/ap/apple-sdk/package.nix @@ -36,12 +36,8 @@ let (callPackage ./common/passthru-private-frameworks.nix { inherit sdkVersion; }) (callPackage ./common/passthru-source-release-files.nix { inherit sdkVersion; }) (callPackage ./common/remove-disallowed-packages.nix { }) + (callPackage ./common/process-stubs.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 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 83ee31f348641cc2526fe8952fa1794d65afb639 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 22 Feb 2025 12:48:37 -0500 Subject: [PATCH 103/157] darwin.copyfile: remove old bootstrap tools workaround The version of `clang` in the bootstrap tools now supports C23 empty initializers. --- .../darwin/apple-source-releases/copyfile/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix index 1edde5a1d8c65..b2c02c05e6247 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix @@ -78,10 +78,6 @@ mkAppleDerivation { --replace-fail '__ptrcheck_abi_assume_single()' "" \ --replace-fail '__unsafe_indexable' "" done - - # clang 16 does not support C23 empty initializers. This can be removed once the bootstrap tools are updated. - substituteInPlace copyfile.c \ - --replace-fail 'filesec_t fsec_tmp = {};' 'filesec_t fsec_tmp = {0};' ''; env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; From 87ed486d4289df9b79f2f56b7f81a5229eb9d3d9 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 23 Feb 2025 02:09:52 -0500 Subject: [PATCH 104/157] darwin.postLinkSignHook: drop and add to darwin-aliases.nix The ld64 in the updated bootstrap tools is capable of code-signing, so this hook is no longer needed. --- .../signing-utils/post-link-sign-hook.nix | 17 ----------------- pkgs/stdenv/darwin/default.nix | 2 -- pkgs/top-level/darwin-aliases.nix | 3 +++ pkgs/top-level/darwin-packages.nix | 2 -- 4 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 pkgs/os-specific/darwin/signing-utils/post-link-sign-hook.nix diff --git a/pkgs/os-specific/darwin/signing-utils/post-link-sign-hook.nix b/pkgs/os-specific/darwin/signing-utils/post-link-sign-hook.nix deleted file mode 100644 index 7857669842087..0000000000000 --- a/pkgs/os-specific/darwin/signing-utils/post-link-sign-hook.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - writeTextFile, - cctools, - sigtool, -}: - -writeTextFile { - name = "post-link-sign-hook"; - executable = true; - - text = '' - if [ "$linkerOutput" != "/dev/null" ]; then - CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate \ - ${sigtool}/bin/codesign -f -s - "$linkerOutput" - fi - ''; -} diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index cfb99f5937063..941da31b0cb56 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -647,8 +647,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check selfDarwin: superDarwin: { signingUtils = prevStage.darwin.signingUtils.override { inherit (selfDarwin) sigtool; }; - postLinkSignHook = prevStage.darwin.postLinkSignHook.override { inherit (selfDarwin) sigtool; }; - # Rewrap binutils with the real libSystem binutils = superDarwin.binutils.override { inherit (self) coreutils; diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index 5a6ac1b1eed61..2859188ccaab7 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -85,4 +85,7 @@ mapAliases ({ ### O ### opencflite = pkgs.opencflite; # added 2024-05-02 + + ### P ### + postLinkSignHook = throw "'darwin.postLinkSignHook' has been removed because it is obsolete"; # added 2025-02-23 }) diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 91f6d001d877c..1a1a457dcc38a 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -192,8 +192,6 @@ makeScopeWithSplicing' { signingUtils = callPackage ../os-specific/darwin/signing-utils { }; - postLinkSignHook = callPackage ../os-specific/darwin/signing-utils/post-link-sign-hook.nix { }; - autoSignDarwinBinariesHook = pkgs.makeSetupHook { name = "auto-sign-darwin-binaries-hook"; propagatedBuildInputs = [ self.signingUtils ]; From 069f2754d5fa3577a3909ef4d2e41b3923703ea0 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 22 Feb 2025 08:43:38 -0500 Subject: [PATCH 105/157] ld64: remove old bootstrap tools workaround Now that the `clang` in the bootstrap tools supports C23 `#embed`, the patch can be applied unconditionally. --- pkgs/by-name/ld/ld64/package.nix | 61 ++++++++++++-------------------- 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index 3e590bb5e67e0..172eaf4eff8f5 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -15,10 +15,6 @@ }: let - # ld64 uses `#embed` to embed `compile_stubs`, which is only implemented in Clang 19. - # This can be done unconditionally once the bootstrap tools have been updated. - hasEmbed = lib.versionAtLeast (lib.getVersion stdenv.cc) "19"; - # Copy the files from their original sources instead of using patches to reduce the size of the patch set in nixpkgs. otherSrcs = { # The last version of ld64 to have dyldinfo @@ -55,31 +51,28 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-CVIyL2J9ISZnI4+r+wp4QtOb3+3Tmz2z2Z7/qeRqHS0="; }; - patches = - [ - # These patches are vendored from https://github.com/reckenrode/ld64/tree/ld64-951.9-nixpkgs. - # See their comments for more on what they do. - ./patches/0001-Always-use-write-instead-of-mmap.patch - ./patches/0003-Inline-missing-definitions-instead-of-using-private-.patch - ./patches/0004-Removed-unused-Blob-clone-method.patch - ./patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch - ./patches/0006-Add-Meson-build-system.patch - ./patches/0007-Add-CrashReporterClient-header.patch - ./patches/0008-Provide-mach-compatibility-headers-based-on-LLVM-s-h.patch - ./patches/0009-Support-LTO-in-nixpkgs.patch - ./patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch - ./patches/0011-Modify-vendored-libtapi-to-build-with-upstream-LLVM.patch - ./patches/0012-Move-libcodedirectory-to-its-own-subproject.patch - ./patches/0013-Set-the-version-string-in-the-build.patch - ./patches/0014-Replace-corecrypto-and-CommonCrypto-with-OpenSSL.patch - ./patches/0015-Add-libcd_is_blob_a_linker_signature-implementation.patch - ./patches/0016-Add-dyldinfo-to-the-ld64-build.patch - ./patches/0017-Fix-dyldinfo-build.patch - ./patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch - ] - ++ lib.optionals (hasEmbed) [ - ./patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch - ]; + patches = [ + # These patches are vendored from https://github.com/reckenrode/ld64/tree/ld64-951.9-nixpkgs. + # See their comments for more on what they do. + ./patches/0001-Always-use-write-instead-of-mmap.patch + ./patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch + ./patches/0003-Inline-missing-definitions-instead-of-using-private-.patch + ./patches/0004-Removed-unused-Blob-clone-method.patch + ./patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch + ./patches/0006-Add-Meson-build-system.patch + ./patches/0007-Add-CrashReporterClient-header.patch + ./patches/0008-Provide-mach-compatibility-headers-based-on-LLVM-s-h.patch + ./patches/0009-Support-LTO-in-nixpkgs.patch + ./patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch + ./patches/0011-Modify-vendored-libtapi-to-build-with-upstream-LLVM.patch + ./patches/0012-Move-libcodedirectory-to-its-own-subproject.patch + ./patches/0013-Set-the-version-string-in-the-build.patch + ./patches/0014-Replace-corecrypto-and-CommonCrypto-with-OpenSSL.patch + ./patches/0015-Add-libcd_is_blob_a_linker_signature-implementation.patch + ./patches/0016-Add-dyldinfo-to-the-ld64-build.patch + ./patches/0017-Fix-dyldinfo-build.patch + ./patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch + ]; prePatch = '' # Copy dyldinfo source files @@ -106,16 +99,6 @@ stdenv.mkDerivation (finalAttrs: { done ''; - # Clang 16 doesn’t support C23, but the patchset expects a compiler that supports it. Only `#embed` is used, so stub - # out its usage and request an older C standard version. This can be dropped once the bootstrap tools are updated. - postPatch = lib.optionalString (!hasEmbed) '' - for meson_build in meson.build subprojects/libcodedirectory/meson.build subprojects/libtapi/meson.build; do - substituteInPlace $meson_build --replace-fail c23 c2x - done - echo '#pragma once' > src/ld/compile_stubs.h - echo 'static const char compile_stubs[] = "";' >> src/ld/compile_stubs.h - ''; - xcodeHash = "sha256-qip/1eiGn8PdLThonhPq3oq2veN4E1zOiamDPBfTeNE="; xcodeProject = "ld64.xcodeproj"; From d98c91b6b81713b5144b2d04c9a0d4700e087e70 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 25 Feb 2025 15:37:24 +0100 Subject: [PATCH 106/157] jemalloc: disable parallel building to fix reproducibility --- pkgs/development/libraries/jemalloc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 4939d25579085..9c2eeadd676e5 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -58,7 +58,8 @@ stdenv.mkDerivation rec { # Tries to link test binaries binaries dynamically and fails doCheck = !stdenv.hostPlatform.isStatic; - enableParallelBuilding = true; + # Parallel builds break reproducibility. + enableParallelBuilding = false; meta = with lib; { homepage = "https://jemalloc.net/"; From 6576f1a5cdb1f09828a51bc9860bae6f7aebe2d8 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 21 Feb 2025 20:24:12 -0800 Subject: [PATCH 107/157] pythonPackages.eventlet: skip test_send_timeout --- pkgs/development/python-modules/eventlet/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index e49970321f690..29beefc37d4d7 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -67,6 +67,8 @@ buildPythonPackage rec { "test_server_connection_timeout_exception" # broken with openssl 3.4 "test_ssl_close" + # flaky test + "test_send_timeout" ]; pythonImportsCheck = [ "eventlet" ]; From 97dee36a9e1d7a00caa3a1eafe8d13e2517a4cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 Feb 2025 10:28:43 -0800 Subject: [PATCH 108/157] python313Packages.aiohttp: 3.11.12 -> 3.11.13 Diff: https://github.com/aio-libs/aiohttp/compare/refs/tags/v3.11.12...v3.11.13 Changelog: https://github.com/aio-libs/aiohttp/blob/v3.11.13/CHANGES.rst --- pkgs/development/python-modules/aiohttp/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 028cceefc3636..e9e1980ad9b44 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, replaceVars, isPy310, isPyPy, @@ -46,14 +45,14 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.11.12"; + version = "3.11.13"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp"; tag = "v${version}"; - hash = "sha256-GveluMxw100ZllDF+MT4QkZVD9q7UWHwF7IBK85J/j0="; + hash = "sha256-VY7Q8m1mOppI/sUgL0Zy/jisR/Vy3zZQBMhgrBYophs="; }; patches = [ @@ -61,12 +60,6 @@ buildPythonPackage rec { llhttpDev = lib.getDev llhttp; llhttpLib = lib.getLib llhttp; }) - (fetchpatch2 { - # https://github.com/aio-libs/aiohttp/issues/10421 - # https://github.com/aio-libs/aiohttp/pull/10423 - url = "https://github.com/aio-libs/aiohttp/commit/51daf7190e7674773c22011a4e443df8b5e66437.patch"; - hash = "sha256-fADetk2tqg92J2sSgzKVTEhbQRSYl6430dxdVZuFx5I="; - }) ]; postPatch = '' From 0cfeec58f68ba623f679702de150dc1da686e3e5 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jan 2025 16:23:03 +0000 Subject: [PATCH 109/157] =?UTF-8?q?apple-sdk:=20don=E2=80=99t=20remove=20L?= =?UTF-8?q?DAP=20framework=20headers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apple ships a 13‐year‐old fork of OpenLDAP. The very few things that use it, like Meson tests, have been adding dependencies on our up‐to‐date OpenLDAP package to get headers. That’s not reliable to mix with the `.tbd` Apple ships, and pulls OpenLDAP into the bootstrap unnecessarily. We continue to strip the `.dylib`s to avoid accidental dependencies on the old version. Packages can still link to Apple’s version with `-framework LDAP`. As very little seems to want the system version, hopefully this won’t have any major compatibility impact. --- .../ap/apple-sdk/metadata/disallowed-packages.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/metadata/disallowed-packages.json b/pkgs/by-name/ap/apple-sdk/metadata/disallowed-packages.json index 2b31160e00738..f407c114fe8e6 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/disallowed-packages.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/disallowed-packages.json @@ -390,18 +390,6 @@ }, { "package": "openldap", - "headers": [ - "lber.h", - "lber_types.h", - "ldap.h", - "ldap_cdefs.h", - "ldap_features.h", - "ldap_schema.h", - "ldap_utf8.h", - "ldif.h", - "openldap.h", - "slapi-plugin.h" - ], "libraries": [ "liblber.*", "liblber_r.*", From 9fde026a60100abfabb6522b457682e9541d44ac Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 14 Jan 2025 18:52:55 +0000 Subject: [PATCH 110/157] meson: remove OpenLDAP dependency No longer necessary now that the SDK retains the Apple OpenLDAP fork headers. --- pkgs/by-name/me/meson/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 581f844c8b6c6..dcf1fa020c2f6 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -8,7 +8,6 @@ libblocksruntime, llvmPackages, libxcrypt, - openldap, ninja, pkg-config, python3, @@ -104,7 +103,6 @@ python3.pkgs.buildPythonApplication rec { LDAP OpenAL OpenGL - openldap ] ++ lib.optionals (stdenv.cc.isClang && !stdenv.hostPlatform.isDarwin) [ # https://github.com/mesonbuild/meson/blob/bd3f1b2e0e70ef16dfa4f441686003212440a09b/test%20cases/common/184%20openmp/meson.build From 2d0f3e7d6ae6abeea23847ac80412855cddb6095 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 14 Jan 2025 18:54:17 +0000 Subject: [PATCH 111/157] meson: remove bitcode patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Shouldn’t be necessary. We do still disable the test, because `ld64` refuses to compile bitcode (and `ld-prime` just ignores the option); Apple dropped support for bitcode quite a while ago. --- .../me/meson/006-disable-bitcode.patch | 30 ------------------- pkgs/by-name/me/meson/package.nix | 3 -- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/by-name/me/meson/006-disable-bitcode.patch diff --git a/pkgs/by-name/me/meson/006-disable-bitcode.patch b/pkgs/by-name/me/meson/006-disable-bitcode.patch deleted file mode 100644 index d4aa6a271aa65..0000000000000 --- a/pkgs/by-name/me/meson/006-disable-bitcode.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py -index d99dc3abf..6b8f75165 100644 ---- a/mesonbuild/compilers/mixins/clang.py -+++ b/mesonbuild/compilers/mixins/clang.py -@@ -54,11 +54,7 @@ class ClangCompiler(GnuLikeCompiler): - {OptionKey('b_colorout'), OptionKey('b_lto_threads'), OptionKey('b_lto_mode'), OptionKey('b_thinlto_cache'), - OptionKey('b_thinlto_cache_dir')}) - -- # TODO: this really should be part of the linker base_options, but -- # linkers don't have base_options. -- if isinstance(self.linker, AppleDynamicLinker): -- self.base_options.add(OptionKey('b_bitcode')) -- elif isinstance(self.linker, MSVCDynamicLinker): -+ if isinstance(self.linker, MSVCDynamicLinker): - self.base_options.add(OptionKey('b_vscrt')) - # All Clang backends can also do LLVM IR - self.can_compile_suffixes.add('ll') -diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py -index 4eec82edd..6db5c6af0 100644 ---- a/mesonbuild/linkers/linkers.py -+++ b/mesonbuild/linkers/linkers.py -@@ -796,7 +796,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker): - return self._apply_prefix('-headerpad_max_install_names') - - def bitcode_args(self) -> T.List[str]: -- return self._apply_prefix('-bitcode_bundle') -+ raise MesonException('Nixpkgs cctools does not support bitcode bundles') - - def fatal_warnings(self) -> T.List[str]: - return self._apply_prefix('-fatal_warnings') diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index dcf1fa020c2f6..8511a3240ef58 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -74,9 +74,6 @@ python3.pkgs.buildPythonApplication rec { # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 ./005-boost-Do-not-add-system-paths-on-nix.patch - # Nixpkgs cctools does not have bitcode support. - ./006-disable-bitcode.patch - # This edge case is explicitly part of meson but is wrong for nix ./007-freebsd-pkgconfig-path.patch ]; From fe9275e3d1c024192225c699c21d342ceb4b65b2 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 14 Jan 2025 18:55:47 +0000 Subject: [PATCH 112/157] meson: remove conditional `libxcrypt` dependency We no longer ship Python < 3.9. --- pkgs/by-name/me/meson/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 8511a3240ef58..6836bf698dab2 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -7,7 +7,6 @@ darwin, libblocksruntime, llvmPackages, - libxcrypt, ninja, pkg-config, python3, @@ -78,10 +77,6 @@ python3.pkgs.buildPythonApplication rec { ./007-freebsd-pkgconfig-path.patch ]; - buildInputs = lib.optionals (python3.pythonOlder "3.9") [ - libxcrypt - ]; - nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = [ From ee6e82cd061dd68727328dd724bb4c57e55d2fbf Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 14 Jan 2025 18:56:20 +0000 Subject: [PATCH 113/157] meson: remove old Darwin SDK pattern detritus --- pkgs/by-name/me/meson/package.nix | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 6836bf698dab2..b8acdb939ab73 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, coreutils, - darwin, libblocksruntime, llvmPackages, ninja, @@ -14,16 +13,6 @@ zlib, }: -let - inherit (darwin.apple_sdk.frameworks) - AppKit - Cocoa - Foundation - LDAP - OpenAL - OpenGL - ; -in python3.pkgs.buildPythonApplication rec { pname = "meson"; version = "1.7.0"; @@ -88,14 +77,6 @@ python3.pkgs.buildPythonApplication rec { [ zlib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa - Foundation - LDAP - OpenAL - OpenGL - ] ++ lib.optionals (stdenv.cc.isClang && !stdenv.hostPlatform.isDarwin) [ # https://github.com/mesonbuild/meson/blob/bd3f1b2e0e70ef16dfa4f441686003212440a09b/test%20cases/common/184%20openmp/meson.build llvmPackages.openmp From fa423a9ab883d5eaa5d8e0c6796d6f396b2cbb89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 26 Feb 2025 09:42:54 +0100 Subject: [PATCH 114/157] xorg.xorgserver: 21.1.15 -> 21.1.16 (security) https://lists.x.org/archives/xorg/2025-February/061894.html https://lists.x.org/archives/xorg/2025-February/061895.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ec00bd98bf0d4..24863ebaf41a3 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4143,11 +4143,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.15"; + version = "21.1.16"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.15.tar.xz"; - sha256 = "12g0g9ksswzx1kgn23gvrpa570fnpkdkmw1dfqjjg4422a884744"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.16.tar.xz"; + sha256 = "b14a116d2d805debc5b5b2aac505a279e69b217dae2fae2dfcb62400471a9970"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 90ad945d7fdab..a995b1a7d2aa7 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -217,4 +217,4 @@ mirror://xorg/individual/util/lndir-1.0.5.tar.xz mirror://xorg/individual/util/makedepend-1.0.9.tar.xz mirror://xorg/individual/util/util-macros-1.20.2.tar.xz mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz -mirror://xorg/individual/xserver/xorg-server-21.1.15.tar.xz +mirror://xorg/individual/xserver/xorg-server-21.1.16.tar.xz From 281541f86a4e77519b74faa0371ded25febdab17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 27 Feb 2025 07:37:47 +0100 Subject: [PATCH 115/157] Revert "qemu: 9.2.0 -> 9.2.1" This reverts commit e41e61c973cc6dc14b4 / PR #381882. The hash is wrong now, so let's instead continue in PR #385474. --- 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 b719a1136f9cf..fb87e95a95351 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -70,11 +70,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "9.2.1"; + version = "9.2.0"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-t7B4Lq1jpTc/3+COCE05Sak5XsGWGAKGuEH3ikZNFpw="; + hash = "sha256-+FnwvGXh9TPQQLvoySvP7O5a8skhpmh8ZS+0TQib2JQ="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] From a74921dc761f6054dee0bca87220ba20bacfae9e Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Thu, 27 Feb 2025 09:04:55 +0400 Subject: [PATCH 116/157] qemu: 9.2.0 -> 9.2.2 Fixes: #385407 The hash seems to have changed between #381882 being committed and now. and it is stuck in staging https://nixpk.gs/pr-tracker.html?pr=381882 and use this opportunity to bump to 9.2.2 Signed-off-by: Brian McGillion --- 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 fb87e95a95351..a803fa1f9e0f8 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -70,11 +70,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "9.2.0"; + version = "9.2.2"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-+FnwvGXh9TPQQLvoySvP7O5a8skhpmh8ZS+0TQib2JQ="; + hash = "sha256-dS6u63cpI6c9U2sjHgW8wJybH1FpCkGtmXPZAOTsn78="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] From 5adcf0a44d628b1b18c578f8b63d67680d708ac4 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 14 Jan 2025 18:57:32 +0000 Subject: [PATCH 117/157] stdenv/darwin: remove OpenLDAP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This wasn’t being built in the bootstrap anyway. We still can’t run the Meson tests because of issues with pkgconf, which I’ll try to address another time. --- pkgs/stdenv/darwin/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 941da31b0cb56..a13eb2cd7816d 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -249,7 +249,6 @@ let m4 meson ninja - openldap openssh patchutils pbzx @@ -604,8 +603,10 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. libxml2 = super.libxml2.override { pythonSupport = false; }; - # Avoid pulling in openldap just to run Meson’s tests. + # TODO: The Meson tests fail when using pkgconf, as we do in + # the bootstrap. Remove this once that’s fixed. meson = super.meson.overrideAttrs { doInstallCheck = false; }; + ninja = super.ninja.override { buildDocs = false; }; # pkg-config builds glib, which checks for `arpa/nameser.h` and fails to build if it can’t find it. From 047f40a64b94fc1e4aecbc4bad4c48466222d6d4 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 00:39:45 +0000 Subject: [PATCH 118/157] darwin.network_cmds: remove obsolete `TARGET_OS_*` workaround --- .../darwin/apple-source-releases/network_cmds/meson.build.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in index d0d0d08e559e4..f0dc469eb1423 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in @@ -4,7 +4,6 @@ # Project settings project('network_cmds', 'c', version : '@version@') add_global_arguments( - '-DTARGET_OS_OSX=1', # Needed for static builds. # Many programs use old prototypes '-Wno-deprecated-non-prototype', # Suppresses suffixing symbols with '$UNIX2003', which causes link failures. @@ -116,7 +115,6 @@ executable( c_args : [ '-DUSE_BONDS', '-DUSE_VLANS', - '-DTARGET_OS_IPHONE=0', # Silence error related to undefined target macro ], install : true, sources : [ From 1613e88dab8b5db3963d565da9c0e3542da22077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rolf=20Schr=C3=B6der?= Date: Mon, 3 Feb 2025 09:17:18 +0100 Subject: [PATCH 119/157] rustPlatform.{importCargoLock,fetchCargoVendor}: remove broken symlinks before copying tree See https://github.com/NixOS/nixpkgs/issues/376590 See https://github.com/NixOS/nixpkgs/commit/5ce282e57e6f265ac81b964ecc0e6cf16c5aa07f --- pkgs/build-support/rust/fetch-cargo-vendor-util.py | 2 +- pkgs/build-support/rust/import-cargo-lock.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/fetch-cargo-vendor-util.py b/pkgs/build-support/rust/fetch-cargo-vendor-util.py index a0c1104cedf3f..6f2f767256019 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor-util.py +++ b/pkgs/build-support/rust/fetch-cargo-vendor-util.py @@ -198,7 +198,7 @@ def copy_and_patch_git_crate_subtree(git_tree: Path, crate_name: str, crate_out_ crate_tree = crate_manifest_path.parent eprint(f"Copying to {crate_out_dir}") - shutil.copytree(crate_tree, crate_out_dir) + shutil.copytree(crate_tree, crate_out_dir, ignore_dangling_symlinks=True) crate_out_dir.chmod(0o755) with open(crate_manifest_path, "r") as f: diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index b39b56f4ccb5e..2213a24183f09 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -195,7 +195,7 @@ let echo Found crate ${pkg.name} at $crateCargoTOML tree=$(dirname $crateCargoTOML) - cp -prvL "$tree/" $out + ${python3Packages.python.interpreter} -c 'import sys, shutil; shutil.copytree(sys.argv[1], sys.argv[2], ignore_dangling_symlinks=True)' "$tree" "$out" chmod u+w $out if grep -q workspace "$out/Cargo.toml"; then From 903c34a9ea4aaf3e0c77d9282b2792ab7d3f56e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Feb 2025 19:23:46 +0100 Subject: [PATCH 120/157] python313Packages.eventlet: use libredirect.hook --- pkgs/development/python-modules/eventlet/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index e49970321f690..647e6c78ccf85 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -43,16 +43,17 @@ buildPythonPackage rec { six ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + libredirect.hook + pytestCheckHook + ]; - # libredirect is not available on darwin # tests hang on pypy indefinitely - doCheck = !stdenv.hostPlatform.isDarwin && !isPyPy; + doCheck = !isPyPy; preCheck = lib.optionalString doCheck '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) - export LD_PRELOAD=${libredirect}/lib/libredirect.so export EVENTLET_IMPORT_VERSION_ONLY=0 ''; From c8eb80c5c6133383b57dab99725ba3280302f789 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 22 Feb 2025 19:53:49 +0100 Subject: [PATCH 121/157] python3Packages.psycopg2{,cffi}: use libpq instead of postgresql We don't need the whole server to link against. We still use it in the checkPhase do run tests against, but this will later be replaced by a test-only derivation of the server. --- pkgs/development/python-modules/psycopg2/default.nix | 12 ++++++++---- .../python-modules/psycopg2cffi/default.nix | 7 ++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 5b8501a29cdb7..4ffb1ab4b9cf9 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -5,6 +5,7 @@ pythonOlder, isPyPy, fetchPypi, + libpq, postgresql, postgresqlTestHook, openssl, @@ -37,7 +38,7 @@ buildPythonPackage rec { # some linker flags are added but the linker ignores them because they're incompatible # https://github.com/psycopg/psycopg2/blob/89005ac5b849c6428c05660b23c5a266c96e677d/setup.py substituteInPlace setup.py \ - --replace-fail "self.pg_config_exe = self.build_ext.pg_config" 'self.pg_config_exe = "${lib.getDev buildPackages.postgresql}/bin/pg_config"' + --replace-fail "self.pg_config_exe = self.build_ext.pg_config" 'self.pg_config_exe = "${lib.getDev buildPackages.libpq}/bin/pg_config"' ''; nativeBuildInputs = [ @@ -45,7 +46,7 @@ buildPythonPackage rec { sphinx-better-theme ]; - buildInputs = [ postgresql ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; + buildInputs = [ libpq ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; sphinxRoot = "doc/src"; @@ -53,7 +54,10 @@ buildPythonPackage rec { # current transaction is aborted, commands ignored until end of transaction block doCheck = false; - nativeCheckInputs = [ postgresqlTestHook ]; + nativeCheckInputs = [ + postgresql + postgresqlTestHook + ]; env = { PGDATABASE = "psycopg2_test"; @@ -62,7 +66,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "psycopg2" ]; disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - buildPackages.postgresql + buildPackages.libpq ]; meta = with lib; { diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix index f2954a44d3016..c787f7cb3bc16 100644 --- a/pkgs/development/python-modules/psycopg2cffi/default.nix +++ b/pkgs/development/python-modules/psycopg2cffi/default.nix @@ -3,6 +3,7 @@ cffi, fetchFromGitHub, lib, + libpq, postgresql, postgresqlTestHook, pytestCheckHook, @@ -29,8 +30,11 @@ buildPythonPackage rec { --replace-fail "sysconfig.get_python_inc()" "sysconfig.get_path('include')" ''; + buildInputs = [ libpq ]; + # To find pg_config + nativeBuildInputs = [ libpq ]; + build-system = [ - postgresql setuptools ]; @@ -43,6 +47,7 @@ buildPythonPackage rec { doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ + postgresql postgresqlTestHook pytestCheckHook ]; From d31542841abdf3765017e02465adf46a6d8f2ff2 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Sun, 2 Mar 2025 02:41:26 +0800 Subject: [PATCH 122/157] sphinxygen: 1.0.4 -> 1.0.10 (#386089) --- pkgs/by-name/sp/sphinxygen/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sp/sphinxygen/package.nix b/pkgs/by-name/sp/sphinxygen/package.nix index 4ef1ad7d628bf..2d227085768a8 100644 --- a/pkgs/by-name/sp/sphinxygen/package.nix +++ b/pkgs/by-name/sp/sphinxygen/package.nix @@ -6,19 +6,17 @@ python3.pkgs.buildPythonApplication rec { pname = "sphinxygen"; - version = "1.0.4"; + version = "1.0.10"; pyproject = true; src = fetchFromGitLab { owner = "drobilla"; repo = "sphinxygen"; - rev = "v${version}"; - hash = "sha256-TIACg89E/BaMwPgFqj6JUncq7BI5xQ9jUDe4nQ9YiI4="; + tag = "v${version}"; + hash = "sha256-Xii5pDa1eHrHUKERC2gDif/NIkpab/IZYBRvMq9YKtE="; }; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; pythonImportsCheck = [ "sphinxygen" ]; From cc6ed6d74296a7ab629d89f07975846a8aba5189 Mon Sep 17 00:00:00 2001 From: Alex James Date: Thu, 27 Feb 2025 12:59:13 -0600 Subject: [PATCH 123/157] cargo: avoid using system curl on darwin (again) Modern versions of macOS link the system-provided curl library against the system-provided libressl library. On recent versions of macOS, the system libressl library reads from /private/etc/ssl/openssl.cnf. As this path is not included in the default Nix sandbox profile, applications that use the system curl library will report a permission error [1]. PR #300521 previously addressed this for the prebuilt cargo binary used by the bootstrap version of cargo. It appears that rustc-unwrapped, which includes its own cargo binary, has the same issue [2]. Similarly patch it with `install_name_tool` to replace use of the system curl library with one from nixpkgs. [1]: https://github.com/NixOS/nix/issues/9625 [2]: https://gist.github.com/al3xtjames/645c8be2c23021aadfe062cfc319c8c4 --- pkgs/development/compilers/rust/binary.nix | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 05cd7c213d915..89190a3a69f65 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -53,16 +53,21 @@ rec { patchShebangs . ''; - installPhase = '' - ./install.sh --prefix=$out \ - --components=${installComponents} - - # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc - # (or similar) here. It causes strange effects where rustc loads - # the wrong libraries in a bootstrap-build causing failures that - # are very hard to track down. For details, see - # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 - ''; + installPhase = + '' + ./install.sh --prefix=$out \ + --components=${installComponents} + + # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc + # (or similar) here. It causes strange effects where rustc loads + # the wrong libraries in a bootstrap-build causing failures that + # are very hard to track down. For details, see + # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -change "/usr/lib/libcurl.4.dylib" \ + "${lib.getLib curl}/lib/libcurl.4.dylib" "$out/bin/cargo" + ''; # The strip tool in cctools 973.0.1 and up appears to break rlibs in the # binaries. The lib.rmeta object inside the ar archive should contain an @@ -166,7 +171,7 @@ rec { '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change "/usr/lib/libcurl.4.dylib" \ - "${curl.out}/lib/libcurl.4.dylib" "$out/bin/cargo" + "${lib.getLib curl}/lib/libcurl.4.dylib" "$out/bin/cargo" '' + '' wrapProgram "$out/bin/cargo" \ From 1158cd5c13e25d742af6611277efb2825d5586ad Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Feb 2025 15:47:26 +0100 Subject: [PATCH 124/157] glibc: install C.utf8 into locale dir instead of archive Addresses further comments in #347965 On a Ubuntu machine with only C.utf-8 installed, you'd still get perl: warning: Setting locale failed since C.utf-8 is installed into `/usr/lib/locale` directly rather than the archive. `glibc` will first try to find a locate in the archive[1] and then fall back to `lib/locale`[2]. This means that Ubuntu applications still find C.utf-8 since its glibc finds it in `/usr/lib/locale`. However, Nix built applications don't since they fall back to the system-wide archive in `/usr/lib/locale/locale-archive`. This patch changes our glibc to do the same what Ubuntu does: C.utf-8 is installed into `$out/lib/locale`. If the systemd-wide locale archive doesn't have C.utf-8, glibc now falls back to looking in `$out/lib/locale`. I confirmed on an Ubuntu 24.04 VM with empty locale archive that a `cowsay` built on this branch falls back to `$out/lib/locale`: /* exists, but empty */ openat(AT_FDCWD, "/usr/lib/locale/locale-archive", O_RDONLY|O_CLOEXEC) = 3 [...] /* fallback */ openat(AT_FDCWD, "/nix/store/vckzn6k0648yas09c58aq05bav82l46x-glibc-2.40-66/lib/locale/C.utf8/LC_IDENTIFICATION", O_RDONLY|O_CLOEXEC) = 3 I checked that this doesn't have obvious regressions on NixOS by building the synapse test on this branch since synapse explicitly depends on C.utf8 in PostgreSQL. [1] https://sourceware.org/git/?p=glibc.git;a=blob;f=locale/findlocale.c;h=e5e2bd3974fe4fd31ae3567d411f1f84dccf8573;hb=HEAD#l152 [2] https://sourceware.org/git/?p=glibc.git;a=blob;f=locale/findlocale.c;h=e5e2bd3974fe4fd31ae3567d411f1f84dccf8573;hb=HEAD#l167 --- pkgs/development/libraries/glibc/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 46d28aea307c8..d165cb8fff628 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -119,7 +119,10 @@ in if stdenv.buildPlatform.canExecute stdenv.hostPlatform then '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED - make -j''${NIX_BUILD_CORES:-1} localedata/install-locales + # Don't install C.utf-8 into the archive, but into $out/lib/locale: on non-NixOS + # systems with an empty /usr/lib/locale/locale-archive, glibc would fall back to + # $libdir/locale/C.utf-8 instead of the locale archive of pkgs.glibc. See also #347965. + make -j''${NIX_BUILD_CORES:-1} localedata/install-locale-files '' else lib.optionalString stdenv.buildPlatform.isLinux From 80c2fa60a461086bf252507e8abc8f4ec63f2cab Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Jan 2025 06:31:58 +0000 Subject: [PATCH 125/157] yara: 4.5.0 -> 4.5.2 Changes: - https://github.com/VirusTotal/yara/releases/tag/v4.5.1 - https://github.com/VirusTotal/yara/releases/tag/v4.5.2 --- pkgs/by-name/ya/yara/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ya/yara/package.nix b/pkgs/by-name/ya/yara/package.nix index 547a88162d312..bd6108e8da5d9 100644 --- a/pkgs/by-name/ya/yara/package.nix +++ b/pkgs/by-name/ya/yara/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoreconfHook, pcre, pkg-config, @@ -21,23 +20,15 @@ stdenv.mkDerivation rec { pname = "yara"; - version = "4.5.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; tag = "v${version}"; - hash = "sha256-AecHsUBtBleUkWuYMQ4Tx/PY8cs9j7JwqncBziJD0hA="; + hash = "sha256-ryRbLXnhC7nAxtlhr4bARxmNdtPhpvGKwlOiYPYPXOE="; }; - patches = [ - (fetchpatch { - name = "LFS64.patch"; - url = "https://github.com/VirusTotal/yara/commit/833a580430abe0fbc9bc17a21fb95bf36dacf367.patch"; - hash = "sha256-EmwyDsxaNd9zfpAOu6ZB9kzg04qB7LAD7UJB3eAuKd8="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config From 41143fe5d693bf9630e0bf2bf57a4938bd47ad2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 3 Mar 2025 10:53:09 +0100 Subject: [PATCH 126/157] gnutls: adapt linking after 3.8.8 Upstream: ** build: More flexible library linking options for compression libraries, TPM, and liboqs support The configure options, --with-zstd, --with-brotli, --with-zlib, --with-tpm2, and --with-liboqs now take 4 states: yes/link/dlopen/no, to specify how the libraries are linked or loaded. I haven't figure out how to easily avoid ENABLE_DLOPEN from configure, but we don't have the other libraries so far, so it's simple anyway. --- pkgs/development/libraries/gnutls/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 293d011f9db49..09f11e5a9c5c3 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -76,15 +76,6 @@ stdenv.mkDerivation rec { patches = [ ./nix-ssl-cert-file.patch - # Revert https://gitlab.com/gnutls/gnutls/-/merge_requests/1800 - # dlopen isn't as easy in NixPkgs, as noticed in tests broken by this. - # Without getting the libs into RPATH they won't be found. - (fetchpatch2 { - name = "revert-dlopen-compression.patch"; - url = "https://gitlab.com/gnutls/gnutls/-/commit/8584908d6b679cd4e7676de437117a793e18347c.diff"; - revert = true; - hash = "sha256-r/+Gmwqy0Yc1LHL/PdPLXlErUBC5JxquLzCBAN3LuRM="; - }) ]; # Skip some tests: @@ -122,6 +113,8 @@ stdenv.mkDerivation rec { "--disable-doc" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && tpmSupport) [ "--with-trousers-lib=${trousers}/lib/libtspi.so" + ] ++ [ # do not dlopen in nixpkgs + "--with-zlib=link" ]; enableParallelBuilding = true; From 6e03606720679a4728dd8dc96edd39c2f2f4cc4c Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 4 Mar 2025 08:39:22 +0300 Subject: [PATCH 127/157] qt6.qtbase: add Vulkan loader to rpath for QtGui Otherwise it can't be found. --- pkgs/development/libraries/qt-6/modules/qtbase/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 2fec3fff2a6c1..7654ec8ebb476 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -311,9 +311,9 @@ stdenv.mkDerivation rec { fixQtBuiltinPaths "$out" '*.pr?' '' + lib.optionalString stdenv.hostPlatform.isLinux '' - # FIXME: not sure why this isn't added automatically? patchelf --add-rpath "${libmysqlclient}/lib/mariadb" $out/${qtPluginPrefix}/sqldrivers/libqsqlmysql.so + patchelf --add-rpath "${vulkan-loader}/lib" --add-needed "libvulkan.so" $out/lib/libQt6Gui.so ''; dontWrapQtApps = true; From a061c58897a56171387d2e38692ef8b63e41c558 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Wed, 5 Mar 2025 08:13:57 +0100 Subject: [PATCH 128/157] go_1_23: 1.23.6 -> 1.23.7 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 d3c1e19830566..640fa15e1efe3 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -48,11 +48,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.6"; + version = "1.23.7"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-A5xbBOZSedrO7opvcecL0Fz1uAF4K293xuGeLtBREiI="; + hash = "sha256-fPq9Rrc+tMJrGdaVFd0EPXGDplWazM1c/bJetrJmpFg="; }; strictDeps = true; From d7635b9849e2d88c59e502996565fd63a158e00d Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Wed, 5 Mar 2025 21:21:46 +0100 Subject: [PATCH 129/157] python3Packages.cfn-lint: 1.22.5 -> 1.27.0 The build is broken with the staging-next update, updating is the easiest fix. 1.27.0 is the first working version. --- pkgs/development/python-modules/cfn-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 6fe93f7eec169..f5d698dc0532b 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "1.22.5"; + version = "1.27.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "aws-cloudformation"; repo = "cfn-lint"; tag = "v${version}"; - hash = "sha256-OkgnwZwcRzwYmBq8yCR89iTB3vm0BHWPMTszrr1tYLU="; + hash = "sha256-UUbIDThzjlypwHvAv6ry2ppBTQp3/4EXRnn570/s0Xo="; }; build-system = [ setuptools ]; From 7439d1c3ba4d18939029300c42bee2c576107d52 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Mar 2025 12:04:56 +0300 Subject: [PATCH 130/157] libgbm: 24.3.4 -> 25.0.1, add small patch for The Future --- pkgs/development/libraries/mesa/gbm-header.patch | 13 +++++++++++++ pkgs/development/libraries/mesa/gbm.nix | 11 +++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/mesa/gbm-header.patch diff --git a/pkgs/development/libraries/mesa/gbm-header.patch b/pkgs/development/libraries/mesa/gbm-header.patch new file mode 100644 index 0000000000000..e7811db3e4fb3 --- /dev/null +++ b/pkgs/development/libraries/mesa/gbm-header.patch @@ -0,0 +1,13 @@ +diff --git a/src/gbm/meson.build b/src/gbm/meson.build +index eaed028d049..1a826c8792d 100644 +--- a/src/gbm/meson.build ++++ b/src/gbm/meson.build +@@ -43,7 +43,7 @@ if with_tests + test('gbm-abi-check', abi_check, suite : ['gbm']) + endif + +-install_headers('main/gbm.h') ++install_headers('main/gbm.h', 'main/gbm_backend_abi.h') + + pkg.generate( + name : 'gbm', diff --git a/pkgs/development/libraries/mesa/gbm.nix b/pkgs/development/libraries/mesa/gbm.nix index 42d8f1b48b646..92b26b2a74da2 100644 --- a/pkgs/development/libraries/mesa/gbm.nix +++ b/pkgs/development/libraries/mesa/gbm.nix @@ -20,16 +20,23 @@ stdenv.mkDerivation rec { # 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"; + version = "25.0.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-1RUHbTgcCxdDrWjqB0EG4Ny/nwdjQHHpyPauiW/yogU="; + hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo="; }; + # Install gbm_backend_abi.h header - this is to simplify future iteration + # on building Mesa and friends with system libgbm. + # See also: + # - https://github.com/NixOS/nixpkgs/pull/387292 + # - https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33890 + patches = [ ./gbm-header.patch ]; + mesonAutoFeatures = "disabled"; mesonFlags = [ From 57cc1b49faeb8d6e67b0e353847ccd70d790b31d Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Mar 2025 16:48:36 +0300 Subject: [PATCH 131/157] pipewire: 1.2.7 -> 1.4.0 --- pkgs/development/libraries/pipewire/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 44cf13bddebea..7693d9866569b 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -34,6 +34,7 @@ libdrm, gst_all_1, ffmpeg, + fftwFloat, bluez, sbc, libfreeaptx, @@ -56,6 +57,7 @@ ffadoSupport ? x11Support && lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform, ffado, libselinux, + libebur128, }: let @@ -67,7 +69,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "pipewire"; - version = "1.2.7"; + version = "1.4.0"; outputs = [ "out" @@ -83,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-TV+2nz44a742bUfGnWt7zJAnO15eED5kAwyAgE5CQZ0="; + sha256 = "sha256-xhlRwodW79mD6Vj+NLvcWxuK9+W+4M5DeZUaU36OiQE="; }; patches = [ @@ -112,10 +114,12 @@ stdenv.mkDerivation (finalAttrs: { dbus fdk_aac ffmpeg + fftwFloat glib gst_all_1.gst-plugins-base gst_all_1.gstreamer libcamera + libebur128 libjack2 libfreeaptx liblc3 From c63e1d1dafd34f47f93e15c52f83fbf1528b16ba Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Mar 2025 16:53:44 +0300 Subject: [PATCH 132/157] nixos/pipewire: remove client-rt.conf support --- .../services/desktops/pipewire/pipewire.nix | 40 +++++-------------- 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 91ac32e79c35b..bc7072361777e 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -58,15 +58,12 @@ let configPackages = cfg.configPackages; - extraConfigPkg = - extraConfigPkgFromFiles [ "pipewire" "client" "client-rt" "jack" "pipewire-pulse" ] - ( - mapToFiles "pipewire" cfg.extraConfig.pipewire - // mapToFiles "client" cfg.extraConfig.client - // mapToFiles "client-rt" cfg.extraConfig.client-rt - // mapToFiles "jack" cfg.extraConfig.jack - // mapToFiles "pipewire-pulse" cfg.extraConfig.pipewire-pulse - ); + extraConfigPkg = extraConfigPkgFromFiles [ "pipewire" "client" "jack" "pipewire-pulse" ] ( + mapToFiles "pipewire" cfg.extraConfig.pipewire + // mapToFiles "client" cfg.extraConfig.client + // mapToFiles "jack" cfg.extraConfig.jack + // mapToFiles "pipewire-pulse" cfg.extraConfig.pipewire-pulse + ); configs = pkgs.buildEnv { name = "pipewire-configs"; @@ -205,27 +202,6 @@ in [wiki]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-client ''; }; - client-rt = mkOption { - type = attrsOf json.type; - default = { }; - example = { - "10-alsa-linear-volume" = { - "alsa.properties" = { - "alsa.volume-method" = "linear"; - }; - }; - }; - description = '' - Additional configuration for the PipeWire client library, used by real-time applications and legacy ALSA clients. - - Every item in this attrset becomes a separate drop-in file in `/etc/pipewire/client-rt.conf.d`. - - See the [PipeWire wiki][wiki] for examples of general configuration, and [PipeWire wiki - ALSA][wiki-alsa] for ALSA clients. - - [wiki]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-client - [wiki-alsa]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-ALSA - ''; - }; jack = mkOption { type = attrsOf json.type; default = { }; @@ -341,6 +317,10 @@ in pipewire-media-session is no longer supported upstream and has been removed. Please switch to `services.pipewire.wireplumber` instead. '') + (mkRemovedOptionModule [ "services" "pipewire" "extraConfig" "client-rt" ] '' + `services.pipewire.extraConfig.client-rt` is no longer applicable, as `client-rt.conf` has been + removed upstream. Please move your customizations to `services.pipewire.extraConfig.client`. + '') ]; ###### implementation From 8efa6b714a4c3faa1fec31420c14ee479dda7f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 7 Mar 2025 10:02:25 +0100 Subject: [PATCH 133/157] SDL2: upstream patch needed after pipewire update --- pkgs/development/libraries/SDL2/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d88431bca7dfb..24f7aaafa3e32 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -3,6 +3,7 @@ stdenv, config, fetchFromGitHub, + fetchpatch, nix-update-script, pkg-config, mesa, @@ -91,6 +92,11 @@ stdenv.mkDerivation (finalAttrs: { # but on NixOS they're spread across different paths. # This patch + the setup-hook will ensure that `sdl2-config --cflags` works correctly. ./find-headers.patch + # https://github.com/libsdl-org/SDL/issues/12224 + (fetchpatch { + url = "https://github.com/libsdl-org/SDL/commit/9e079fe9c7931738ed63d257b1d7fb8a07b66824.diff"; + hash = "sha256-G8gAivCtw5zuPVI9wvEq2oIo/NxFdnPqyLwrmHG1EJ4="; + }) ]; postPatch = '' From 8a731da52d8421f2545008e507dc59bf1a0fc78e Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 7 Mar 2025 19:33:22 +0300 Subject: [PATCH 134/157] libcdio: build with large file aware on 32-bit --- pkgs/development/libraries/libcdio/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 29e8df6736733..85a3fbbcd33aa 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { hash = "sha256-b4+99NGJz2Pyp6FUnFFs1yDHsiLHqq28kkom50WkhTk="; }; + env = lib.optionalAttrs stdenv.is32bit { + NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE"; + }; + postPatch = '' patchShebangs . ''; From 6f4dcfc8dcbfb09059b48b63cdeb9faa5167a498 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 7 Mar 2025 19:34:11 +0300 Subject: [PATCH 135/157] tailscale: cherry-pick patch to fix build with Go 1.24 --- pkgs/by-name/ta/tailscale/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 8598867513ec6..7050f6d18a203 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -47,6 +47,12 @@ buildGoModule { url = "https://github.com/tailscale/tailscale/commit/325ca13c4549c1af58273330744d160602218af9.patch"; hash = "sha256-SMwqZiGNVflhPShlHP+7Gmn0v4b6Gr4VZGIF/oJAY8M="; }) + # Fix build with Go 1.24 + (fetchpatch { + url = "https://github.com/tailscale/tailscale/commit/836c01258de01a38fdd267957eeedab7faf0f4f2.patch"; + includes = ["cmd/testwrapper/*" "cmd/tsconnect/*"]; + hash = "sha256-e+IQB2nlJmJCzCTbASiqX2sXKmwVNXb+d87DdwTdJ+I="; + }) ]; vendorHash = "sha256-81UOjoC5GJqhNs4vWcQ2/B9FMaDWtl0rbuFXmxbu5dI="; From 9ed9eaa0edd27ff3ae421e1a2322be50f110eede Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 7 Mar 2025 19:54:48 +0300 Subject: [PATCH 136/157] telegram-desktop: fix tg_owt build with Pipewire 1.4 --- .../tg_owt-pipewire-1.4.patch | 22 +++++++++++++++++++ .../telegram/telegram-desktop/tg_owt.nix | 5 +++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch new file mode 100644 index 0000000000000..fca4c441b8bf2 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch @@ -0,0 +1,22 @@ +diff --git a/src/modules/video_capture/linux/pipewire_session.cc b/src/modules/video_capture/linux/pipewire_session.cc +index 4d1b200a..c1443440 100644 +--- a/src/modules/video_capture/linux/pipewire_session.cc ++++ b/src/modules/video_capture/linux/pipewire_session.cc +@@ -60,7 +60,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, + .param = OnNodeParam, + }; + +- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); ++ pw_node_add_listener((pw_node*)proxy_, &node_listener_, &node_events, this); + } + + PipeWireNode::~PipeWireNode() { +@@ -94,7 +94,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) { + uint32_t id = info->params[i].id; + if (id == SPA_PARAM_EnumFormat && + info->params[i].flags & SPA_PARAM_INFO_READ) { +- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); ++ pw_node_enum_params((pw_node*)that->proxy_, 0, id, 0, UINT32_MAX, nullptr); + break; + } + } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 60f4a0128ab8b..5d73fd8c3274b 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + # Fix build with Pipewire 1.4 + ./tg_owt-pipewire-1.4.patch + ]; + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \ From 662dddf88daeccd59ec5e120c27cf26638b9fb58 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 7 Mar 2025 20:01:49 +0300 Subject: [PATCH 137/157] paperless-ngx: fix tests in March --- pkgs/by-name/pa/paperless-ngx/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 91603b6b219d2..969e9c651d716 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, buildNpmPackage, nodejs_20, nixosTests, @@ -35,6 +36,14 @@ let hash = "sha256-p3eUEb/ZPK11NbqE4LU+3TE1Xny9sjfYvVVmABkoAEQ="; }; + patches = [ + # Fix frontend tests in March (yes, it's date dependent) + (fetchpatch { + url = "https://github.com/paperless-ngx/paperless-ngx/commit/bc90ccc5551f184a683128def772652ad74c65e3.patch"; + hash = "sha256-KArPyKZLi5LfaTDTY3DxA3cdQYYadpQo052Xk9eH14c="; + }) + ]; + # subpath installation is broken with uvicorn >= 0.26 # https://github.com/NixOS/nixpkgs/issues/298719 # https://github.com/paperless-ngx/paperless-ngx/issues/5494 @@ -78,7 +87,7 @@ let frontend = buildNpmPackage { pname = "paperless-ngx-frontend"; - inherit version src; + inherit version src patches; nodejs = nodejs_20; # does not build with 22 @@ -134,7 +143,7 @@ python.pkgs.buildPythonApplication rec { pname = "paperless-ngx"; pyproject = false; - inherit version src; + inherit version src patches; postPatch = '' # pytest-xdist with to many threads makes the tests flaky From 6d54093c79d24134ec0b489a1072ae9dec32ba88 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 7 Mar 2025 20:55:57 +0300 Subject: [PATCH 138/157] oauth2-proxy: pin go 1.23 --- pkgs/by-name/oa/oauth2-proxy/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index 5b0aaaff4a183..ac5162cea6b16 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -1,10 +1,11 @@ { lib, - buildGoModule, + buildGo123Module, fetchFromGitHub, }: -buildGoModule rec { +# tests fail in a weird way on 1.24 +buildGo123Module rec { pname = "oauth2-proxy"; version = "7.8.1"; From 9f156e0ec61a209ca8d18b7d23ec53b913107653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 7 Mar 2025 20:29:16 +0100 Subject: [PATCH 139/157] oauth2-proxy: fix tests on go 1.24, go back to go 1.24 --- pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff | 13 +++++++++++++ pkgs/by-name/oa/oauth2-proxy/package.nix | 9 ++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff diff --git a/pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff b/pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff new file mode 100644 index 0000000000000..47162b625f41a --- /dev/null +++ b/pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff @@ -0,0 +1,13 @@ +diff --git a/pkg/apis/options/load_test.go b/pkg/apis/options/load_test.go +index 32d52fb8..ef343fd1 100644 +--- a/pkg/apis/options/load_test.go ++++ b/pkg/apis/options/load_test.go +@@ -470,7 +470,7 @@ func(in loadYAMLTableInput) { + configFile: []byte(`stringSliceOption: "a"`), + input: &TestOptions{}, + expectedOutput: &TestOptions{}, +- expectedErr: errors.New("error unmarshalling config: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal string into Go struct field TestOptions.StringSliceOption of type []string"), ++ expectedErr: errors.New("error unmarshalling config: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal string into Go struct field TestOptions.TestOptionSubStruct.StringSliceOption of type []string"), + }), + Entry("with a config file containing environment variable references", loadYAMLTableInput{ + configFile: []byte("stringOption: ${TESTUSER}"), diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index ac5162cea6b16..b463c5d0695b8 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -1,11 +1,10 @@ { lib, - buildGo123Module, + buildGoModule, fetchFromGitHub, }: -# tests fail in a weird way on 1.24 -buildGo123Module rec { +buildGoModule rec { pname = "oauth2-proxy"; version = "7.8.1"; @@ -16,6 +15,10 @@ buildGo123Module rec { rev = "v${version}"; }; + patches = [ + ./fix-tests-go-1.24.diff + ]; + vendorHash = "sha256-t/SJjh9bcsIevr3S0ysDlvtaIGzkks+qvfXF5/SEidE="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile From fb1ee07776e0d8079c6a7a3874f52d01c4371926 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 9 Mar 2025 09:47:35 +0300 Subject: [PATCH 140/157] kodi: fix build with Pipewire 1.4 --- pkgs/applications/video/kodi/unwrapped.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 3974536067c13..5db55fe2ef509 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchzip +{ stdenv, lib, fetchFromGitHub, fetchzip, fetchpatch , autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring @@ -97,6 +97,15 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-RdTJcq6FPerQx05dU3r8iyaorT4L7162hg5RdywsA88="; }; + patches = [ + # Backport to fix build with Pipewire 1.4 + # FIXME: remove in the next update + (fetchpatch { + url = "https://github.com/xbmc/xbmc/commit/269053ebbfd3cc4a3156a511f54ab7f08a09a730.patch"; + hash = "sha256-JzzrMJvAufrxTxtWnzknUS9JLJEed+qdtVnIYYe9LCw="; + }) + ]; + # make derivations declared in the let binding available here, so # they can be overridden inherit libdvdcss libdvdnav libdvdread groovy From c14f73cc5bdc2647814ba3987eae566b0103041d Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 9 Mar 2025 09:48:15 +0300 Subject: [PATCH 141/157] tg_owt: update patch to version submitted upstream Changes a C style cast to reinterpret_cast to match upstream code style. --- .../telegram-desktop/tg_owt-pipewire-1.4.patch | 12 +++++------- .../telegram/telegram-desktop/tg_owt.nix | 1 + 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch index fca4c441b8bf2..1ab4d314f7dfe 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch @@ -1,22 +1,20 @@ -diff --git a/src/modules/video_capture/linux/pipewire_session.cc b/src/modules/video_capture/linux/pipewire_session.cc -index 4d1b200a..c1443440 100644 --- a/src/modules/video_capture/linux/pipewire_session.cc +++ b/src/modules/video_capture/linux/pipewire_session.cc -@@ -60,7 +60,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, +@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, .param = OnNodeParam, }; - pw_node_add_listener(proxy_, &node_listener_, &node_events, this); -+ pw_node_add_listener((pw_node*)proxy_, &node_listener_, &node_events, this); ++ pw_node_add_listener(reinterpret_cast(proxy_), &node_listener_, &node_events, this); } - PipeWireNode::~PipeWireNode() { -@@ -94,7 +94,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) { + // static +@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) { uint32_t id = info->params[i].id; if (id == SPA_PARAM_EnumFormat && info->params[i].flags & SPA_PARAM_INFO_READ) { - pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); -+ pw_node_enum_params((pw_node*)that->proxy_, 0, id, 0, UINT32_MAX, nullptr); ++ pw_node_enum_params(reinterpret_cast(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); break; } } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 5d73fd8c3274b..2efad14fef672 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation { patches = [ # Fix build with Pipewire 1.4 + # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500 ./tg_owt-pipewire-1.4.patch ]; From 66c52804ae9d85fb4ce8fd7d38c600a39ff2a83c Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 9 Mar 2025 10:44:55 +0300 Subject: [PATCH 142/157] chromium: fix build with Pipewire 1.4 --- .../networking/browsers/chromium/common.nix | 3 +++ .../patches/webrtc-pipewire-1.4.patch | 20 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/webrtc-pipewire-1.4.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7c1c6d40b4f55..c61236fd8e25c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -445,6 +445,9 @@ let ./patches/cross-compile.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): ./patches/no-build-timestamps.patch + # Fix build with Pipewire 1.4 + # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500 + ./patches/webrtc-pipewire-1.4.patch ] ++ lib.optionals (packageName == "chromium") [ # This patch is limited to chromium and ungoogled-chromium because electron-source sets diff --git a/pkgs/applications/networking/browsers/chromium/patches/webrtc-pipewire-1.4.patch b/pkgs/applications/networking/browsers/chromium/patches/webrtc-pipewire-1.4.patch new file mode 100644 index 0000000000000..a614188a96897 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/webrtc-pipewire-1.4.patch @@ -0,0 +1,20 @@ +--- a/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc ++++ b/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc +@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, + .param = OnNodeParam, + }; + +- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); ++ pw_node_add_listener(reinterpret_cast(proxy_), &node_listener_, &node_events, this); + } + + // static +@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) { + uint32_t id = info->params[i].id; + if (id == SPA_PARAM_EnumFormat && + info->params[i].flags & SPA_PARAM_INFO_READ) { +- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); ++ pw_node_enum_params(reinterpret_cast(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); + break; + } + } From 25ac6d5db296a5e0ee84c8496f4b3f09e06b4039 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 9 Mar 2025 10:58:25 +0300 Subject: [PATCH 143/157] python312Packages.eventlet: disable tests on Darwin --- pkgs/development/python-modules/eventlet/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 130465894f71a..638d7c0a695a8 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -49,7 +49,8 @@ buildPythonPackage rec { ]; # tests hang on pypy indefinitely - doCheck = !isPyPy; + # most tests also fail/flake on Darwin + doCheck = !isPyPy && !stdenv.hostPlatform.isDarwin; preCheck = lib.optionalString doCheck '' echo "nameserver 127.0.0.1" > resolv.conf From c5d327cc9732d5303eaef084b25ebed8f76881e5 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 9 Mar 2025 15:29:23 +0300 Subject: [PATCH 144/157] linux_6_12: patch to fix build with Rust 1.85 --- .../linux/kernel/linux-612-rust-185.patch | 13 +++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 5 +++++ pkgs/top-level/linux-kernels.nix | 1 + 3 files changed, 19 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/linux-612-rust-185.patch diff --git a/pkgs/os-specific/linux/kernel/linux-612-rust-185.patch b/pkgs/os-specific/linux/kernel/linux-612-rust-185.patch new file mode 100644 index 0000000000000..b858f274d3eef --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-612-rust-185.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/gpu/drm/drm_panic_qr.rs b/drivers/gpu/drm/drm_panic_qr.rs +index 447740d79d3d..da405d18d8a8 100644 +--- a/drivers/gpu/drm/drm_panic_qr.rs ++++ b/drivers/gpu/drm/drm_panic_qr.rs +@@ -931,7 +931,7 @@ fn draw_all(&mut self, data: impl Iterator) { + /// They must remain valid for the duration of the function call. + #[no_mangle] + pub unsafe extern "C" fn drm_panic_qr_generate( +- url: *const i8, ++ url: *const core::ffi::c_char, + data: *mut u8, + data_len: usize, + data_size: usize, diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index ddda525e70b0d..a39070c4a6c23 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -76,4 +76,9 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; + + linux-612-rust-185 = { + name = "linux-612-rust-185"; + patch = ./linux-612-rust-185.patch; + }; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d66f9dd5c4acc..5d207580bfcea 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -194,6 +194,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.linux-612-rust-185 ]; }; From 3948577e2aa7e4ea642543e32157786758e7f997 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:39:22 +0100 Subject: [PATCH 145/157] samsung-unified-linux-driver (all): use `finalAttrs` pattern --- .../sa/samsung-unified-linux-driver_1_00_36/package.nix | 6 +++--- pkgs/misc/cups/drivers/samsung/1.00.37.nix | 6 +++--- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix index 1e9b34579ba66..7afc96ee7cef7 100644 --- a/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix +++ b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix @@ -13,13 +13,13 @@ let arch = if stdenv.system == "x86_64-linux" then "x86_64" else "i386"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "samsung-unified-linux-driver"; version = "1.00.36"; src = fetchurl { sha256 = "1a7ngd03x0bkdl7pszy5zqqic0plxvdxqm5w7klr6hbdskx1lir9"; - url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${finalAttrs.version}.tar.gz"; }; buildInputs = [ @@ -124,4 +124,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index 4d0bb0e96a24e..fbf0501eff2c9 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -12,13 +12,13 @@ let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "samsung-unified-linux-driver"; version = "1.00.37"; src = fetchurl { sha256 = "0r66l9zp0p1qgakh4j08hynwsr4lsgq5yrpxyr0x4ldvl0z2b1bb"; - url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${finalAttrs.version}.tar.gz"; }; buildInputs = [ @@ -105,4 +105,4 @@ stdenv.mkDerivation rec { # Probably won't work on anything else. platforms = platforms.linux; }; -} +}) diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 05bf9c263d154..ea768cf8d9b90 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -32,12 +32,12 @@ let ] + ":$out/lib:${lib.getLib stdenv.cc.cc}/lib${appendPath}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "samsung-UnifiedLinuxDriver"; version = "4.01.17"; src = fetchurl { - url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${finalAttrs.version}.tar.gz"; sha256 = "1vv3pzvqpg1dq3xjr8161x2yp3v7ca75vil56ranhw5pkjwq66x0"; }; @@ -100,4 +100,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ joko ]; }; -} +}) From fea4433fb57db29a867e96b536b8d405289f0843 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:46:00 +0100 Subject: [PATCH 146/157] samsung-unified-linux-driver (all): resolve `with lib;` in `meta` https://github.com/NixOS/nixpkgs/issues/371862 --- .../samsung-unified-linux-driver_1_00_36/package.nix | 8 ++++---- pkgs/misc/cups/drivers/samsung/1.00.37.nix | 8 ++++---- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix index 7afc96ee7cef7..e45dfa5cc1b91 100644 --- a/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix +++ b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix @@ -112,16 +112,16 @@ stdenv.mkDerivation (finalAttrs: { # we did this in prefixup already dontPatchELF = true; - meta = with lib; { + meta = { description = "Unified Linux Driver for Samsung printers and scanners"; homepage = "http://www.bchemnet.com/suldr"; downloadPage = "http://www.bchemnet.com/suldr/driver/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; # Tested on linux-x86_64. Might work on linux-i386. # Probably won't work on anything else. - platforms = platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; }) diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index fbf0501eff2c9..18461b8436c16 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -94,15 +94,15 @@ stdenv.mkDerivation (finalAttrs: { # we did this in prefixup already dontPatchELF = true; - meta = with lib; { + meta = { description = "Unified Linux Driver for Samsung printers and scanners"; homepage = "http://www.bchemnet.com/suldr"; downloadPage = "http://www.bchemnet.com/suldr/driver/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; # Tested on linux-x86_64. Might work on linux-i386. # Probably won't work on anything else. - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index ea768cf8d9b90..47ab13fecbe43 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -92,12 +92,12 @@ stdenv.mkDerivation (finalAttrs: { "rastertospl" ]; - meta = with lib; { + meta = { description = "Samsung's Linux printing drivers; includes binaries without source code"; homepage = "http://www.samsung.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ joko ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ joko ]; }; }) From 0b59ddc82dd9c427128fd7dc94f125dfa7a381a6 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:47:19 +0100 Subject: [PATCH 147/157] samsung-unified-linux-driver 4.01.17: unify derivation name Change the name of the derivation in `pkgs/misc/cups/drivers/samsung/4.01.17.nix` from "samsung-UnifiedLinuxDriver" to "samsung-unified-linux-driver", so that it matches the names of the other versions declared in `pkgs/misc/cups/drivers/samsung/1.00.37.nix` and in `pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix`. --- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 47ab13fecbe43..77e83c32aa69e 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -33,7 +33,7 @@ let + ":$out/lib:${lib.getLib stdenv.cc.cc}/lib${appendPath}"; in stdenv.mkDerivation (finalAttrs: { - pname = "samsung-UnifiedLinuxDriver"; + pname = "samsung-unified-linux-driver"; version = "4.01.17"; src = fetchurl { From eb8cee29f97ef3fc22f4f30b30e63a5f33f2498a Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:48:39 +0100 Subject: [PATCH 148/157] samsung-unified-linux-driver 4.01.17: fix library path On x86-64, the executables were looking for libraries in `${lib.getLib stdenv.cc.cc}/lib64`, but that path apparently changed with https://github.com/NixOS/nixpkgs/commit/5e2e98f3b71f1b7e0168e5c071bc9dff029287cb , resulting in a runtime error: > /nix/store/0z8gd4fmjknwswx0pp5kzqnrhj1k9q8x-samsung-UnifiedLinuxDriver-4.01.17/lib/cups/filter/rastertospl: error while loading shared libraries: libstdc++.so.6: cannot open shared object file: No such file or directory Affected programs are `$out/lib/cups/filter/{ps,raster}tospl{,c}`. The commit at hand fixes the library lookup path. --- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 77e83c32aa69e..c4ddc3a98f8c0 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -30,7 +30,7 @@ let cups libusb-compat-0_1 ] - + ":$out/lib:${lib.getLib stdenv.cc.cc}/lib${appendPath}"; + + ":$out/lib:${lib.getLib stdenv.cc.cc}/lib"; in stdenv.mkDerivation (finalAttrs: { pname = "samsung-unified-linux-driver"; From f597c68e7ba0d6d5740ac89d5c56e69463d82b58 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 10 Mar 2025 22:27:41 +0530 Subject: [PATCH 149/157] nixos/boot/systemd: enable tracefs tracefs is a special-purpose filesystem in Linux used for tracing filesystem and kernel operations. This was added to the kernel back in 2015 to replace debugfs. For security reasons, some system do not mount debugfs at all. Tracefs reduces the attack surface by allowing to trace without mounting debugfs. Additionally it provides features not supported by debugfs (such as calls for mkdir and rmdir Debian and Arch Linux both enable this by default. RHEL 8 and later, they enable tracefs by default. Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- nixos/modules/system/boot/systemd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 8b3f2a1bc49fc..3096517c0b08e 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -88,6 +88,7 @@ let "sys-fs-fuse-connections.mount" ] ++ (optional (!config.boot.isContainer) "sys-kernel-config.mount") ++ [ "sys-kernel-debug.mount" + "sys-kernel-tracing.mount" # Maintaining state across reboots. "systemd-random-seed.service" From 98b086d6d318d9c6fc5303b50e9e8c5f0c32a135 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Mon, 23 Dec 2024 01:40:14 +0800 Subject: [PATCH 150/157] xdg-desktop-portal: 1.18.4 -> 1.20.0 - remove unneeded dependencies - switch to wrapGAppsNoGuiHook - add patch to fix sound validation similar to icon validation - rebase other patches - use a single python env with all test dependencies, as pytest path is hardcoded into installed tests - fix installed tests, reenable location test (it works now) - clean up a bunch of old hacks Co-authored-by: aucub <78630225+aucub@users.noreply.github.com> Co-authored-by: Jan Tojnar --- .../installed-tests/xdg-desktop-portal.nix | 36 ++++-- .../libraries/xdg-desktop-portal/default.nix | 122 ++++++++---------- .../fix-icon-validation.patch | 33 +++++ .../fix-sound-validation.patch | 32 +++++ .../installed-tests-path.patch | 23 ++-- .../installed-tests-share.patch | 9 -- .../nix-pkgdatadir-env.patch | 10 +- .../xdg-desktop-portal/trash-test.patch | 16 +-- 8 files changed, 164 insertions(+), 117 deletions(-) create mode 100644 pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch create mode 100644 pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch delete mode 100644 pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch diff --git a/nixos/tests/installed-tests/xdg-desktop-portal.nix b/nixos/tests/installed-tests/xdg-desktop-portal.nix index d40317faeb015..a85203fe3edaf 100644 --- a/nixos/tests/installed-tests/xdg-desktop-portal.nix +++ b/nixos/tests/installed-tests/xdg-desktop-portal.nix @@ -1,22 +1,32 @@ -{ pkgs, makeInstalledTest, ... }: +{ + lib, + pkgs, + makeInstalledTest, + ... +}: makeInstalledTest { tested = pkgs.xdg-desktop-portal; - # Red herring - # Failed to load RealtimeKit property: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.freedesktop.RealtimeKit1 was not provided by any .service files - # Maybe a red herring, enabling PipeWire doesn't fix the location test. - # Failed connect to PipeWire: Couldn't connect to PipeWire testConfig = { environment.variables = { - TEST_IN_CI = 1; - XDG_DATA_DIRS = "${pkgs.xdg-desktop-portal.installedTests}/share/installed-tests/xdg-desktop-portal/share"; + GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" [ + pkgs.glib.out + pkgs.umockdev.out + ]; + # need to set this ourselves, because the tests will set LD_PRELOAD=libumockdev-preload.so, + # which can't be found because it's not in default rpath + LD_PRELOAD = "${pkgs.umockdev.out}/lib/libumockdev-preload.so"; + XDP_TEST_IN_CI = 1; }; - # Broken, see comment in the package file. - #services.geoclue2 = { - # enable = true; - # enableDemoAgent = true; - #}; - #location.provider = "geoclue2"; + environment.systemPackages = with pkgs; [ + umockdev + wireless-regdb + ]; + services.geoclue2 = { + enable = true; + enableDemoAgent = true; + }; + location.provider = "geoclue2"; }; } diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 79c7633a5576b..1b4ec15a1b93c 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -4,17 +4,12 @@ flatpak, fuse3, bubblewrap, - docbook_xml_dtd_412, - docbook_xml_dtd_43, - docbook_xsl, docutils, systemdMinimal, geoclue2, glib, gsettings-desktop-schemas, json-glib, - libportal, - libxml2, meson, ninja, nixosTests, @@ -26,16 +21,20 @@ pkg-config, stdenv, runCommand, - wrapGAppsHook3, - xmlto, + wrapGAppsNoGuiHook, bash, + dbus, + gst_all_1, + libgudev, + umockdev, + substituteAll, enableGeoLocation ? true, enableSystemd ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal"; - version = "1.18.4"; + version = "1.20.0"; outputs = [ "out" @@ -45,18 +44,23 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "flatpak"; repo = "xdg-desktop-portal"; - rev = finalAttrs.version; - hash = "sha256-o+aO7uGewDPrtgOgmp/CE2uiqiBLyo07pVCFrtlORFQ="; + tag = finalAttrs.version; + hash = "sha256-FHMa8fTr8qNEM5WptuMjMs/XOsvmFxi8pDaCrwJ3/ww="; }; patches = [ # The icon validator copied from Flatpak needs to access the gdk-pixbuf loaders # in the Nix store and cannot bind FHS paths since those are not available on NixOS. - (runCommand "icon-validator.patch" { } '' - # Flatpak uses a different path - substitute "${flatpak.icon-validator-patch}" "$out" \ - --replace "/icon-validator/validate-icon.c" "/src/validate-icon.c" - '') + (substituteAll { + src = ./fix-icon-validation.patch; + inherit (builtins) storeDir; + }) + + # Same for the sound validator, except the gdk-pixbuf part. + (substituteAll { + src = ./fix-sound-validation.patch; + inherit (builtins) storeDir; + }) # Allow installing installed tests to a separate output. ./installed-tests-path.patch @@ -68,23 +72,14 @@ stdenv.mkDerivation (finalAttrs: { # test tries to read /proc/cmdline, which is not intended to be accessible in the sandbox ./trash-test.patch - - # Install files required to be in XDG_DATA_DIR of the installed tests - # Merged PR https://github.com/flatpak/xdg-desktop-portal/pull/1444 - ./installed-tests-share.patch ]; nativeBuildInputs = [ - docbook_xml_dtd_412 - docbook_xml_dtd_43 - docbook_xsl docutils # for rst2man - libxml2 meson ninja pkg-config - wrapGAppsHook3 - xmlto + wrapGAppsNoGuiHook ]; buildInputs = @@ -95,19 +90,14 @@ stdenv.mkDerivation (finalAttrs: { glib gsettings-desktop-schemas json-glib - libportal pipewire + gst_all_1.gst-plugins-base + libgudev + umockdev # For icon validator gdk-pixbuf librsvg - - # For document-fuse installed test. - (python3.withPackages ( - pp: with pp; [ - pygobject3 - ] - )) bash ] ++ lib.optionals enableGeoLocation [ @@ -118,11 +108,22 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeCheckInputs = [ + dbus + gdk-pixbuf + gst_all_1.gstreamer + gst_all_1.gst-plugins-good gobject-introspection - python3.pkgs.pytest - python3.pkgs.python-dbusmock - python3.pkgs.pygobject3 - python3.pkgs.dbus-python + + # NB: this Python is used both for build-time tests + # and for installed (VM) tests, so it includes dependencies + # for both + (python3.withPackages (ps: [ + ps.pytest + ps.python-dbusmock + ps.pygobject3 + ps.dbus-python + ])) + umockdev ]; mesonFlags = @@ -130,13 +131,14 @@ stdenv.mkDerivation (finalAttrs: { "--sysconfdir=/etc" "-Dinstalled-tests=true" "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Ddocumentation=disabled" # pulls in a whole lot of extra stuff (lib.mesonEnable "systemd" enableSystemd) ] ++ lib.optionals (!enableGeoLocation) [ "-Dgeoclue=disabled" ] ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ - "-Dpytest=disabled" + "-Dtests=disabled" ]; strictDeps = true; @@ -148,13 +150,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace meson.build \ --replace-fail "find_program('bwrap'" "find_program('${lib.getExe bubblewrap}'" - # Disable test failing with libportal 0.9.0 - ${ - assert (lib.versionOlder finalAttrs.version "1.20.0"); - "# TODO: Remove when updating to x-d-p 1.20.0" - } - substituteInPlace tests/test-portals.c \ - --replace-fail 'g_test_add_func ("/portal/notification/bad-arg", test_notification_bad_arg);' "" + patchShebangs src/generate-method-info.py + patchShebangs tests/run-test.sh ''; preCheck = '' @@ -165,42 +162,29 @@ stdenv.mkDerivation (finalAttrs: { # be flaky. Let's disable those downstream as hydra exhibits similar # flakes: # https://github.com/NixOS/nixpkgs/pull/270085#issuecomment-1840053951 - export TEST_IN_CI=1 - ''; + export XDP_TEST_IN_CI=1 - postFixup = - let - documentFuse = "${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal/test-document-fuse.py"; - testPortals = "${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal/test-portals"; - - in - '' - if [ -x '${documentFuse}' ] ; then - wrapGApp '${documentFuse}' - wrapGApp '${testPortals}' - # (xdg-desktop-portal:995): xdg-desktop-portal-WARNING **: 21:21:55.673: Failed to get GeoClue client: Timeout was reached - # xdg-desktop-portal:ERROR:../tests/location.c:22:location_cb: 'res' should be TRUE - # https://github.com/flatpak/xdg-desktop-portal/blob/1d6dfb57067dec182b546dfb60c87aa3452c77ed/tests/location.c#L21 - rm $installedTests/share/installed-tests/xdg-desktop-portal/test-portals-location.test - fi - ''; + # need to set this ourselves, because the tests will set LD_PRELOAD=libumockdev-preload.so, + # which can't be found because it's not in default rpath + export LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so + ''; passthru = { tests = { installedTests = nixosTests.installed-tests.xdg-desktop-portal; validate-icon = runCommand "test-icon-validation" { } '' - ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --sandbox 512 512 ${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out" + ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --ruleset=desktop --sandbox --path=${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out" grep format=svg "$out" ''; }; }; - meta = with lib; { + meta = { description = "Desktop integration portals for sandboxed apps"; - homepage = "https://flatpak.github.io/xdg-desktop-portal/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + homepage = "https://flatpak.github.io/xdg-desktop-portal"; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ jtojnar ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch new file mode 100644 index 0000000000000..08b7a3c0b3b02 --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch @@ -0,0 +1,33 @@ +diff --git a/src/validate-icon.c b/src/validate-icon.c +index c42265b..320f028 100644 +--- a/src/validate-icon.c ++++ b/src/validate-icon.c +@@ -254,7 +254,7 @@ flatpak_get_bwrap (void) + static int + rerun_in_sandbox (int input_fd) + { +- const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" }; ++ const char * const usrmerged_dirs[] = { }; + g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free); + g_autofree char* arg_input_fd = NULL; + char validate_icon[PATH_MAX + 1]; +@@ -276,8 +276,7 @@ rerun_in_sandbox (int input_fd) + "--unshare-ipc", + "--unshare-net", + "--unshare-pid", +- "--ro-bind", "/usr", "/usr", +- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", ++ "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", validate_icon, validate_icon, + NULL); + +@@ -320,6 +319,9 @@ rerun_in_sandbox (int input_fd) + if (g_getenv ("G_MESSAGES_PREFIXED")) + add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); + ++ if (g_getenv ("GDK_PIXBUF_MODULE_FILE")) ++ add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL); ++ + arg_input_fd = g_strdup_printf ("%d", input_fd); + add_args (args, + validate_icon, diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch new file mode 100644 index 0000000000000..bfc6982d2dfdc --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch @@ -0,0 +1,32 @@ +diff --git a/src/validate-sound.c b/src/validate-sound.c +index 7348d46..8b87c78 100644 +--- a/src/validate-sound.c ++++ b/src/validate-sound.c +@@ -234,7 +234,7 @@ flatpak_get_bwrap (void) + static int + rerun_in_sandbox (int input_fd) + { +- const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" }; ++ const char * const usrmerged_dirs[] = { }; + int i; + g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free); + char validate_sound[PATH_MAX + 1]; +@@ -255,8 +255,7 @@ rerun_in_sandbox (int input_fd) + "--unshare-ipc", + "--unshare-net", + "--unshare-pid", +- "--ro-bind", "/usr", "/usr", +- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", ++ "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", validate_sound, validate_sound, + NULL); + +@@ -299,6 +298,8 @@ rerun_in_sandbox (int input_fd) + if (g_getenv ("G_MESSAGES_PREFIXED")) + add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); + ++ if (g_getenv ("GST_PLUGIN_SYSTEM_PATH_1_0")) ++ add_args (args, "--setenv", "GST_PLUGIN_SYSTEM_PATH_1_0", g_getenv ("GST_PLUGIN_SYSTEM_PATH_1_0"), NULL); + + arg_input_fd = g_strdup_printf ("%d", input_fd); + add_args (args, validate_sound, "--fd", arg_input_fd, NULL); diff --git a/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch b/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch index 0a9547ba3628e..9de427d86307b 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch +++ b/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index b25f9ef..7975f85 100644 +index 4238adb..d3f89fd 100644 --- a/meson.build +++ b/meson.build -@@ -40,8 +40,8 @@ if dataroot_dir == '' +@@ -43,8 +43,8 @@ if dataroot_dir == '' dataroot_dir = datadir endif @@ -14,17 +14,14 @@ index b25f9ef..7975f85 100644 summary({ diff --git a/meson_options.txt b/meson_options.txt -index fccada3..ca87600 100644 +index ed8c311..0a2bf7e 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -38,6 +38,10 @@ option('installed-tests', - type: 'boolean', - value: false, - description: 'Enable installation of some test cases') +@@ -54,3 +54,7 @@ option('sandboxed-sound-validation', + type: 'feature', + value: 'enabled', + description: 'Use Bubblewrap to sandbox sound validation. Disabling this option may lead to security vulnerabilities.') +option('installed_test_prefix', -+ type: 'string', -+ value: '', -+ description: 'Prefix for installed tests') - option('pytest', - type: 'feature', - value: 'auto', ++ type: 'string', ++ value: '', ++ description: 'Prefix for installed tests') diff --git a/pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch b/pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch deleted file mode 100644 index ba9a3822e59e3..0000000000000 --- a/pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/tests/share/applications/meson.build b/tests/share/applications/meson.build -index d56b633..3ad3371 100644 ---- a/tests/share/applications/meson.build -+++ b/tests/share/applications/meson.build -@@ -1,2 +1,2 @@ --configure_file(input: 'furrfix.desktop', output: '@PLAINNAME@', copy: true) --configure_file(input: 'mimeinfo.cache', output: '@PLAINNAME@', copy: true) -+configure_file(input: 'furrfix.desktop', output: '@PLAINNAME@', copy: true, install: enable_installed_tests, install_dir: installed_tests_data_dir / 'share' / 'applications') -+configure_file(input: 'mimeinfo.cache', output: '@PLAINNAME@', copy: true, install: enable_installed_tests, install_dir: installed_tests_data_dir / 'share' / 'applications') diff --git a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch b/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch index b099c4ad56f5b..b7ca73e5afedf 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch +++ b/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch @@ -1,8 +1,8 @@ -diff --git a/src/portal-impl.c b/src/portal-impl.c -index 85b3a23..6d43636 100644 ---- a/src/portal-impl.c -+++ b/src/portal-impl.c -@@ -275,6 +275,8 @@ load_installed_portals (gboolean opt_verbose) +diff --git a/src/xdp-portal-impl.c b/src/xdp-portal-impl.c +index 770c265..a34ca8e 100644 +--- a/src/xdp-portal-impl.c ++++ b/src/xdp-portal-impl.c +@@ -277,6 +277,8 @@ load_installed_portals (gboolean opt_verbose) /* We need to override this in the tests */ portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR"); diff --git a/pkgs/development/libraries/xdg-desktop-portal/trash-test.patch b/pkgs/development/libraries/xdg-desktop-portal/trash-test.patch index 3bfa885972813..23991fd87020b 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/trash-test.patch +++ b/pkgs/development/libraries/xdg-desktop-portal/trash-test.patch @@ -1,18 +1,18 @@ diff --git a/tests/test_trash.py b/tests/test_trash.py -index d745cd2..173e3e5 100644 +index 2637256..e89d45c 100644 --- a/tests/test_trash.py +++ b/tests/test_trash.py -@@ -24,13 +24,6 @@ class TestTrash: - def test_version(self, portal_mock): - portal_mock.check_version(1) +@@ -13,13 +13,6 @@ class TestTrash: + def test_version(self, portals, dbus_con): + xdp.check_version(dbus_con, "Trash", 1) -- def test_trash_file_fails(self, portal_mock): -- trash_intf = portal_mock.get_dbus_interface() +- def test_trash_file_fails(self, portals, dbus_con): +- trash_intf = xdp.get_portal_iface(dbus_con, "Trash") - with open("/proc/cmdline") as fd: - result = trash_intf.TrashFile(fd.fileno()) - - assert result == 0 - - def test_trash_file(self, portal_mock): - trash_intf = portal_mock.get_dbus_interface() + def test_trash_file(self, portals, dbus_con): + trash_intf = xdp.get_portal_iface(dbus_con, "Trash") From 6d7508279e263243e1915121ef0afbb2f90b7010 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Sun, 9 Mar 2025 13:14:49 -0400 Subject: [PATCH 151/157] gleam: 1.8.1 -> 1.9.1 --- pkgs/development/compilers/gleam/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index f190cb7490c65..82728fe8a8230 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -7,6 +7,9 @@ pkg-config, openssl, erlang, + nodejs, + bun, + deno, Security, nix-update-script, SystemConfiguration, @@ -14,24 +17,27 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; tag = "v${version}"; - hash = "sha256-Qt2VQhbiNNORrGUR5LHeBb0q/EIqPNPz/adljj6xpS4="; + hash = "sha256-6vYVUdQST49TNctO9Y/XrRFyJ6hXng85SsO+4JBn1GA="; }; nativeBuildInputs = [ git pkg-config + erlang + nodejs + bun + deno ]; buildInputs = [ openssl - erlang ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security @@ -39,7 +45,12 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-7oawxv1s8BJsOxGuADKjf4XqJ/UT+zYOrPQCbQljArM="; + cargoHash = "sha256-arVtNxcYDVKRTGe9won6zb30wCxMD6MtsGs25UmOPjM="; + + checkFlags = [ + # Makes a network request + "--skip=tests::echo::echo_dict" + ]; passthru.updateScript = nix-update-script { }; From 1f5a39ac7b49182ef8db9496db43ab973b0f9a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Mon, 10 Mar 2025 21:15:56 +0100 Subject: [PATCH 152/157] nilaway: 0-unstable-2024-10-10 -> 0-unstable-2025-03-07 Also fixes build after the Go 1.24 upgrade in staging-next: https://hydra.nixos.org/build/291836003/log/tail --- pkgs/by-name/ni/nilaway/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ni/nilaway/package.nix b/pkgs/by-name/ni/nilaway/package.nix index 4a899e7ef6902..f333cb03e103d 100644 --- a/pkgs/by-name/ni/nilaway/package.nix +++ b/pkgs/by-name/ni/nilaway/package.nix @@ -4,18 +4,18 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule { pname = "nilaway"; - version = "0-unstable-2024-10-10"; + version = "0-unstable-2025-03-07"; src = fetchFromGitHub { owner = "uber-go"; repo = "nilaway"; - rev = "ba14292918d814eeaea4de62da2ad0daae92f8b0"; - hash = "sha256-HAfuhGxmnMJvkz2vxBZ5kWsgSIw5KKlZp36HCLfCRxo="; + rev = "19305c7c699bd0d370acd26d6769df1d7af8fb29"; + hash = "sha256-99L9dF76vZbh1NdXtKu5Bcnnca94Roybm3q18SDmZAk="; }; - vendorHash = "sha256-5qaEvQoK5S0svqzFAbJb8wy8yApyRpz4QE8sOhcjdaA="; + vendorHash = "sha256-pthCLpy5pISKwdmeaJxPq8BxJLUwLwS2/hGMBt6/O4I="; subPackages = [ "cmd/nilaway" ]; excludedPackages = [ "tools" ]; From 9f8e3a12baf61d6987fc45aacee3e4c639d1bd37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Mon, 10 Mar 2025 21:26:29 +0100 Subject: [PATCH 153/157] unparam: 0-unstable-2024-05-28 -> 0-unstable-2025-03-01 Also fixes build after the Go 1.24 upgrade in staging-next: https://hydra.nixos.org/build/291869108/nixlog/3/tail --- pkgs/by-name/un/unparam/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/un/unparam/package.nix b/pkgs/by-name/un/unparam/package.nix index 2f36ffff605cb..f3c39840e674e 100644 --- a/pkgs/by-name/un/unparam/package.nix +++ b/pkgs/by-name/un/unparam/package.nix @@ -4,18 +4,18 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule { pname = "unparam"; - version = "0-unstable-2024-05-28"; + version = "0-unstable-2025-03-01"; src = fetchFromGitHub { owner = "mvdan"; repo = "unparam"; - rev = "8a5130ca722ffad18c95cc467b561f1668b9b0d2"; - hash = "sha256-CYCXTriGUd4bNY6ZPfkX4puE1imcqYHnX1SXVdnXPGM="; + rev = "0df0534333a487d07b143c1b2c2e0046671d2d63"; + hash = "sha256-k/BgHvjB3fXz4CWTHRFja/EiGlof/c80jhRb91FaINs="; }; - vendorHash = "sha256-2lNC4V1WQkJdkagIlBu6tj4SA4KJKstHXc+B4emKu6s="; + vendorHash = "sha256-Q7q0NZgofxChaSpYL5dS4NDadwfrXlLtkG/F7tGJuhA="; subPackages = [ "." ]; From bdf5956a8719ab6fc2312730d0ff53a6b6228bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 11 Mar 2025 09:19:31 +0100 Subject: [PATCH 154/157] libnvidia-container: fixup build by pinning to go 1.23 https://hydra.nixos.org/build/291823634/nixlog/3/tail --- pkgs/by-name/li/libnvidia-container/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libnvidia-container/package.nix b/pkgs/by-name/li/libnvidia-container/package.nix index 954e3f796d00c..f3d4764bed74c 100644 --- a/pkgs/by-name/li/libnvidia-container/package.nix +++ b/pkgs/by-name/li/libnvidia-container/package.nix @@ -12,11 +12,14 @@ makeWrapper, removeReferencesTo, replaceVars, - go, + go_1_23, applyPatches, nvidia-modprobe, }: let + # https://github.com/NVIDIA/libnvidia-container/pull/297 + go = go_1_23; + modprobeVersion = "550.54.14"; patchedModprobe = applyPatches { src = nvidia-modprobe.src.override { From aca1e446e2d348c7e88aaf0dcb750d0a0d45c286 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 11 Mar 2025 20:32:43 +0300 Subject: [PATCH 155/157] treewide: apply hack to packages that fail after GCC symlink changes --- pkgs/by-name/bo/bonmin/package.nix | 6 ++++++ pkgs/by-name/ec/eclib/package.nix | 7 +++++++ pkgs/by-name/gi/giac/package.nix | 6 ++++++ pkgs/desktops/mate/caja/default.nix | 6 ++++++ pkgs/development/libraries/gtk-sharp/3.0.nix | 6 ++++++ 5 files changed, 31 insertions(+) diff --git a/pkgs/by-name/bo/bonmin/package.nix b/pkgs/by-name/bo/bonmin/package.nix index 8104e34ad4bdb..a38f3a6b4de59 100644 --- a/pkgs/by-name/bo/bonmin/package.nix +++ b/pkgs/by-name/bo/bonmin/package.nix @@ -57,6 +57,12 @@ stdenv.mkDerivation rec { "--with-asl-lib=-lipoptamplinterface -lamplsolver" ]; + # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 + postConfigure = '' + substituteInPlace libtool \ + --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' + ''; + # Fix doc install. Should not be necessary after next release # ref https://github.com/coin-or/Bonmin/commit/4f665bc9e489a73cb867472be9aea518976ecd28 sourceRoot = "${src.name}/Bonmin"; diff --git a/pkgs/by-name/ec/eclib/package.nix b/pkgs/by-name/ec/eclib/package.nix index 8eb4a1f0bab0b..17765450dd382 100644 --- a/pkgs/by-name/ec/eclib/package.nix +++ b/pkgs/by-name/ec/eclib/package.nix @@ -41,6 +41,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + + # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 + postConfigure = '' + substituteInPlace libtool \ + --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' + ''; + doCheck = true; meta = with lib; { description = "Elliptic curve tools"; diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix index cf218da403a01..0341f051d14a8 100644 --- a/pkgs/by-name/gi/giac/package.nix +++ b/pkgs/by-name/gi/giac/package.nix @@ -106,6 +106,12 @@ stdenv.mkDerivation rec { substituteInPlace src/global.cc --replace 'browser="mozilla"' 'browser="xdg-open"' ''; + # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 + postConfigure = '' + substituteInPlace libtool \ + --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' + ''; + nativeBuildInputs = [ autoreconfHook texliveSmall diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index b39f302274a33..4b2026436f4b6 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -46,6 +46,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-update-mimedb" ]; + # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 + postConfigure = '' + substituteInPlace libtool \ + --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' + ''; + enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 89121db3b5d49..fed79a27f8d8a 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; }; + # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 + postConfigure = '' + substituteInPlace libtool \ + --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono From 8503e5613fad9f08f5090212ead1357899d8a71f Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 11 Mar 2025 20:37:14 +0300 Subject: [PATCH 156/157] glusterfs: also apply hack --- pkgs/by-name/gl/glusterfs/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/gl/glusterfs/package.nix b/pkgs/by-name/gl/glusterfs/package.nix index 7c367cd2ad09d..7122f77bf6407 100644 --- a/pkgs/by-name/gl/glusterfs/package.nix +++ b/pkgs/by-name/gl/glusterfs/package.nix @@ -159,6 +159,12 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; + # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 + postConfigure = '' + substituteInPlace libtool \ + --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' + ''; + nativeBuildInputs = [ autoconf automake From 8974afacaab65eb301800283a5030539e7dd27cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 11 Mar 2025 18:46:13 +0100 Subject: [PATCH 157/157] ko: fixup build by pinning to go 1.23 https://hydra.nixos.org/build/291822453/nixlog/3/tail --- pkgs/by-name/ko/ko/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/ko/package.nix b/pkgs/by-name/ko/ko/package.nix index c16bb3de59b55..7a2b5d143b45c 100644 --- a/pkgs/by-name/ko/ko/package.nix +++ b/pkgs/by-name/ko/ko/package.nix @@ -1,12 +1,13 @@ { lib, - buildGoModule, + # broken with go 1.24 for some reason + buildGo123Module, fetchFromGitHub, gitMinimal, installShellFiles, }: -buildGoModule rec { +buildGo123Module rec { pname = "ko"; version = "0.15.4";